Skip to content

L
linux
Commit 65b29f50 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files
Options

[ALSA] Remove xxx_t typedefs: PowerMac 

Remove xxx_t typedefs from the PowerMac driver.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent bbe85bbd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 503 additions and 436 deletions
sound/ppc/awacs.c
View file @ 65b29f50
This diff is collapsed.
sound/ppc/beep.c
View file @ 65b29f50
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <sound/control.h> #include <sound/control.h>
#include "pmac.h" #include "pmac.h"
struct snd_pmac_beep { struct pmac_beep {
int running; /* boolean */ int running; /* boolean */
int volume; /* mixer volume: 0-100 */ int volume; /* mixer volume: 0-100 */
int volume_play; /* currently playing volume */ int volume_play; /* currently playing volume */
...@@ -44,9 +44,9 @@ struct snd_pmac_beep { ...@@ -44,9 +44,9 @@ struct snd_pmac_beep {
/* /*
* stop beep if running * stop beep if running
*/ */
void snd_pmac_beep_stop(pmac_t *chip) void snd_pmac_beep_stop(struct snd_pmac *chip)
{ {
pmac_beep_t *beep = chip->beep; struct pmac_beep *beep = chip->beep;
if (beep && beep->running) { if (beep && beep->running) {
beep->running = 0; beep->running = 0;
snd_pmac_beep_dma_stop(chip); snd_pmac_beep_dma_stop(chip);
...@@ -97,10 +97,11 @@ static short beep_wform[256] = { ...@@ -97,10 +97,11 @@ static short beep_wform[256] = {
#define BEEP_BUFLEN 512 #define BEEP_BUFLEN 512
#define BEEP_VOLUME 15 /* 0 - 100 */ #define BEEP_VOLUME 15 /* 0 - 100 */
static int snd_pmac_beep_event(struct input_dev *dev, unsigned int type, unsigned int code, int hz) static int snd_pmac_beep_event(struct input_dev *dev, unsigned int type,
unsigned int code, int hz)
{ {
pmac_t *chip; struct snd_pmac *chip;
pmac_beep_t *beep; struct pmac_beep *beep;
unsigned long flags; unsigned long flags;
int beep_speed = 0; int beep_speed = 0;
int srate; int srate;
...@@ -171,7 +172,8 @@ static int snd_pmac_beep_event(struct input_dev *dev, unsigned int type, unsigne ...@@ -171,7 +172,8 @@ static int snd_pmac_beep_event(struct input_dev *dev, unsigned int type, unsigne
* beep volume mixer * beep volume mixer
*/ */
static int snd_pmac_info_beep(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) static int snd_pmac_info_beep(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = 1; uinfo->count = 1;
...@@ -180,17 +182,19 @@ static int snd_pmac_info_beep(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uin ...@@ -180,17 +182,19 @@ static int snd_pmac_info_beep(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uin
return 0; return 0;
} }
static int snd_pmac_get_beep(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int snd_pmac_get_beep(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
snd_assert(chip->beep, return -ENXIO); snd_assert(chip->beep, return -ENXIO);
ucontrol->value.integer.value[0] = chip->beep->volume; ucontrol->value.integer.value[0] = chip->beep->volume;
return 0; return 0;
} }
static int snd_pmac_put_beep(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int snd_pmac_put_beep(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
int oval; int oval;
snd_assert(chip->beep, return -ENXIO); snd_assert(chip->beep, return -ENXIO);
oval = chip->beep->volume; oval = chip->beep->volume;
...@@ -198,7 +202,7 @@ static int snd_pmac_put_beep(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uco ...@@ -198,7 +202,7 @@ static int snd_pmac_put_beep(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uco
return oval != chip->beep->volume; return oval != chip->beep->volume;
} }
static snd_kcontrol_new_t snd_pmac_beep_mixer = { static struct snd_kcontrol_new snd_pmac_beep_mixer = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Beep Playback Volume", .name = "Beep Playback Volume",
.info = snd_pmac_info_beep, .info = snd_pmac_info_beep,
...@@ -207,9 +211,9 @@ static snd_kcontrol_new_t snd_pmac_beep_mixer = { ...@@ -207,9 +211,9 @@ static snd_kcontrol_new_t snd_pmac_beep_mixer = {
}; };
/* Initialize beep stuff */ /* Initialize beep stuff */
int __init snd_pmac_attach_beep(pmac_t *chip) int __init snd_pmac_attach_beep(struct snd_pmac *chip)
{ {
pmac_beep_t *beep; struct pmac_beep *beep;
struct input_dev *input_dev; struct input_dev *input_dev;
void *dmabuf; void *dmabuf;
int err = -ENOMEM; int err = -ENOMEM;
...@@ -255,7 +259,7 @@ int __init snd_pmac_attach_beep(pmac_t *chip) ...@@ -255,7 +259,7 @@ int __init snd_pmac_attach_beep(pmac_t *chip)
return err; return err;
} }
void snd_pmac_detach_beep(pmac_t *chip) void snd_pmac_detach_beep(struct snd_pmac *chip)
{ {
if (chip->beep) { if (chip->beep) {
input_unregister_device(chip->beep->dev); input_unregister_device(chip->beep->dev);
......
sound/ppc/burgundy.c
View file @ 65b29f50
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
/* Waits for busy flag to clear */ /* Waits for busy flag to clear */
static inline void static inline void
snd_pmac_burgundy_busy_wait(pmac_t *chip) snd_pmac_burgundy_busy_wait(struct snd_pmac *chip)
{ {
int timeout = 50; int timeout = 50;
while ((in_le32(&chip->awacs->codec_ctrl) & MASK_NEWECMD) && timeout--) while ((in_le32(&chip->awacs->codec_ctrl) & MASK_NEWECMD) && timeout--)
...@@ -41,7 +41,7 @@ snd_pmac_burgundy_busy_wait(pmac_t *chip) ...@@ -41,7 +41,7 @@ snd_pmac_burgundy_busy_wait(pmac_t *chip)
} }
static inline void static inline void
snd_pmac_burgundy_extend_wait(pmac_t *chip) snd_pmac_burgundy_extend_wait(struct snd_pmac *chip)
{ {
int timeout; int timeout;
timeout = 50; timeout = 50;
...@@ -57,7 +57,7 @@ snd_pmac_burgundy_extend_wait(pmac_t *chip) ...@@ -57,7 +57,7 @@ snd_pmac_burgundy_extend_wait(pmac_t *chip)
} }
static void static void
snd_pmac_burgundy_wcw(pmac_t *chip, unsigned addr, unsigned val) snd_pmac_burgundy_wcw(struct snd_pmac *chip, unsigned addr, unsigned val)
{ {
out_le32(&chip->awacs->codec_ctrl, addr + 0x200c00 + (val & 0xff)); out_le32(&chip->awacs->codec_ctrl, addr + 0x200c00 + (val & 0xff));
snd_pmac_burgundy_busy_wait(chip); snd_pmac_burgundy_busy_wait(chip);
...@@ -70,7 +70,7 @@ snd_pmac_burgundy_wcw(pmac_t *chip, unsigned addr, unsigned val) ...@@ -70,7 +70,7 @@ snd_pmac_burgundy_wcw(pmac_t *chip, unsigned addr, unsigned val)
} }
static unsigned static unsigned
snd_pmac_burgundy_rcw(pmac_t *chip, unsigned addr) snd_pmac_burgundy_rcw(struct snd_pmac *chip, unsigned addr)
{ {
unsigned val = 0; unsigned val = 0;
unsigned long flags; unsigned long flags;
...@@ -103,14 +103,14 @@ snd_pmac_burgundy_rcw(pmac_t *chip, unsigned addr) ...@@ -103,14 +103,14 @@ snd_pmac_burgundy_rcw(pmac_t *chip, unsigned addr)
} }
static void static void
snd_pmac_burgundy_wcb(pmac_t *chip, unsigned int addr, unsigned int val) snd_pmac_burgundy_wcb(struct snd_pmac *chip, unsigned int addr, unsigned int val)
{ {
out_le32(&chip->awacs->codec_ctrl, addr + 0x300000 + (val & 0xff)); out_le32(&chip->awacs->codec_ctrl, addr + 0x300000 + (val & 0xff));
snd_pmac_burgundy_busy_wait(chip); snd_pmac_burgundy_busy_wait(chip);
} }
static unsigned static unsigned
snd_pmac_burgundy_rcb(pmac_t *chip, unsigned int addr) snd_pmac_burgundy_rcb(struct snd_pmac *chip, unsigned int addr)
{ {
unsigned val = 0; unsigned val = 0;
unsigned long flags; unsigned long flags;
...@@ -131,7 +131,8 @@ snd_pmac_burgundy_rcb(pmac_t *chip, unsigned int addr) ...@@ -131,7 +131,8 @@ snd_pmac_burgundy_rcb(pmac_t *chip, unsigned int addr)
* Burgundy volume: 0 - 100, stereo * Burgundy volume: 0 - 100, stereo
*/ */
static void static void
snd_pmac_burgundy_write_volume(pmac_t *chip, unsigned int address, long *volume, int shift) snd_pmac_burgundy_write_volume(struct snd_pmac *chip, unsigned int address,
long *volume, int shift)
{ {
int hardvolume, lvolume, rvolume; int hardvolume, lvolume, rvolume;
...@@ -146,7 +147,8 @@ snd_pmac_burgundy_write_volume(pmac_t *chip, unsigned int address, long *volume, ...@@ -146,7 +147,8 @@ snd_pmac_burgundy_write_volume(pmac_t *chip, unsigned int address, long *volume,
} }
static void static void
snd_pmac_burgundy_read_volume(pmac_t *chip, unsigned int address, long *volume, int shift) snd_pmac_burgundy_read_volume(struct snd_pmac *chip, unsigned int address,
long *volume, int shift)
{ {
int wvolume; int wvolume;
...@@ -171,7 +173,8 @@ snd_pmac_burgundy_read_volume(pmac_t *chip, unsigned int address, long *volume, ...@@ -171,7 +173,8 @@ snd_pmac_burgundy_read_volume(pmac_t *chip, unsigned int address, long *volume,
#define BASE2ADDR(base) ((base) << 12) #define BASE2ADDR(base) ((base) << 12)
#define ADDR2BASE(addr) ((addr) >> 12) #define ADDR2BASE(addr) ((addr) >> 12)
static int snd_pmac_burgundy_info_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) static int snd_pmac_burgundy_info_volume(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = 2; uinfo->count = 2;
...@@ -180,23 +183,27 @@ static int snd_pmac_burgundy_info_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_ ...@@ -180,23 +183,27 @@ static int snd_pmac_burgundy_info_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_
return 0; return 0;
} }
static int snd_pmac_burgundy_get_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int snd_pmac_burgundy_get_volume(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff); unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff);
int shift = (kcontrol->private_value >> 8) & 0xff; int shift = (kcontrol->private_value >> 8) & 0xff;
snd_pmac_burgundy_read_volume(chip, addr, ucontrol->value.integer.value, shift); snd_pmac_burgundy_read_volume(chip, addr, ucontrol->value.integer.value,
shift);
return 0; return 0;
} }
static int snd_pmac_burgundy_put_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int snd_pmac_burgundy_put_volume(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff); unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff);
int shift = (kcontrol->private_value >> 8) & 0xff; int shift = (kcontrol->private_value >> 8) & 0xff;
long nvoices[2]; long nvoices[2];
snd_pmac_burgundy_write_volume(chip, addr, ucontrol->value.integer.value, shift); snd_pmac_burgundy_write_volume(chip, addr, ucontrol->value.integer.value,
shift);
snd_pmac_burgundy_read_volume(chip, addr, nvoices, shift); snd_pmac_burgundy_read_volume(chip, addr, nvoices, shift);
return (nvoices[0] != ucontrol->value.integer.value[0] || return (nvoices[0] != ucontrol->value.integer.value[0] ||
nvoices[1] != ucontrol->value.integer.value[1]); nvoices[1] != ucontrol->value.integer.value[1]);
...@@ -211,7 +218,8 @@ static int snd_pmac_burgundy_put_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_v ...@@ -211,7 +218,8 @@ static int snd_pmac_burgundy_put_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_v
/* lineout/speaker */ /* lineout/speaker */
static int snd_pmac_burgundy_info_switch_out(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) static int snd_pmac_burgundy_info_switch_out(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{ {
int stereo = (kcontrol->private_value >> 24) & 1; int stereo = (kcontrol->private_value >> 24) & 1;
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
...@@ -221,9 +229,10 @@ static int snd_pmac_burgundy_info_switch_out(snd_kcontrol_t *kcontrol, snd_ctl_e ...@@ -221,9 +229,10 @@ static int snd_pmac_burgundy_info_switch_out(snd_kcontrol_t *kcontrol, snd_ctl_e
return 0; return 0;
} }
static int snd_pmac_burgundy_get_switch_out(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int snd_pmac_burgundy_get_switch_out(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
int lmask = kcontrol->private_value & 0xff; int lmask = kcontrol->private_value & 0xff;
int rmask = (kcontrol->private_value >> 8) & 0xff; int rmask = (kcontrol->private_value >> 8) & 0xff;
int stereo = (kcontrol->private_value >> 24) & 1; int stereo = (kcontrol->private_value >> 24) & 1;
...@@ -234,9 +243,10 @@ static int snd_pmac_burgundy_get_switch_out(snd_kcontrol_t *kcontrol, snd_ctl_el ...@@ -234,9 +243,10 @@ static int snd_pmac_burgundy_get_switch_out(snd_kcontrol_t *kcontrol, snd_ctl_el
return 0; return 0;
} }
static int snd_pmac_burgundy_put_switch_out(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int snd_pmac_burgundy_put_switch_out(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
int lmask = kcontrol->private_value & 0xff; int lmask = kcontrol->private_value & 0xff;
int rmask = (kcontrol->private_value >> 8) & 0xff; int rmask = (kcontrol->private_value >> 8) & 0xff;
int stereo = (kcontrol->private_value >> 24) & 1; int stereo = (kcontrol->private_value >> 24) & 1;
...@@ -259,7 +269,8 @@ static int snd_pmac_burgundy_put_switch_out(snd_kcontrol_t *kcontrol, snd_ctl_el ...@@ -259,7 +269,8 @@ static int snd_pmac_burgundy_put_switch_out(snd_kcontrol_t *kcontrol, snd_ctl_el
.private_value = ((lmask) | ((rmask) << 8) | ((stereo) << 24)) } .private_value = ((lmask) | ((rmask) << 8) | ((stereo) << 24)) }
/* line/speaker output volume */ /* line/speaker output volume */
static int snd_pmac_burgundy_info_volume_out(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) static int snd_pmac_burgundy_info_volume_out(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{ {
int stereo = (kcontrol->private_value >> 24) & 1; int stereo = (kcontrol->private_value >> 24) & 1;
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
...@@ -269,9 +280,10 @@ static int snd_pmac_burgundy_info_volume_out(snd_kcontrol_t *kcontrol, snd_ctl_e ...@@ -269,9 +280,10 @@ static int snd_pmac_burgundy_info_volume_out(snd_kcontrol_t *kcontrol, snd_ctl_e
return 0; return 0;
} }
static int snd_pmac_burgundy_get_volume_out(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int snd_pmac_burgundy_get_volume_out(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff); unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff);
int stereo = (kcontrol->private_value >> 24) & 1; int stereo = (kcontrol->private_value >> 24) & 1;
int oval; int oval;
...@@ -283,9 +295,10 @@ static int snd_pmac_burgundy_get_volume_out(snd_kcontrol_t *kcontrol, snd_ctl_el ...@@ -283,9 +295,10 @@ static int snd_pmac_burgundy_get_volume_out(snd_kcontrol_t *kcontrol, snd_ctl_el
return 0; return 0;
} }
static int snd_pmac_burgundy_put_volume_out(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int snd_pmac_burgundy_put_volume_out(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff); unsigned int addr = BASE2ADDR(kcontrol->private_value & 0xff);
int stereo = (kcontrol->private_value >> 24) & 1; int stereo = (kcontrol->private_value >> 24) & 1;
int oval, val; int oval, val;
...@@ -308,7 +321,7 @@ static int snd_pmac_burgundy_put_volume_out(snd_kcontrol_t *kcontrol, snd_ctl_el ...@@ -308,7 +321,7 @@ static int snd_pmac_burgundy_put_volume_out(snd_kcontrol_t *kcontrol, snd_ctl_el
.put = snd_pmac_burgundy_put_volume_out,\ .put = snd_pmac_burgundy_put_volume_out,\
.private_value = (ADDR2BASE(addr) | ((stereo) << 24)) } .private_value = (ADDR2BASE(addr) | ((stereo) << 24)) }
static snd_kcontrol_new_t snd_pmac_burgundy_mixers[] __initdata = { static struct snd_kcontrol_new snd_pmac_burgundy_mixers[] __initdata = {
BURGUNDY_VOLUME("Master Playback Volume", 0, MASK_ADDR_BURGUNDY_MASTER_VOLUME, 8), BURGUNDY_VOLUME("Master Playback Volume", 0, MASK_ADDR_BURGUNDY_MASTER_VOLUME, 8),
BURGUNDY_VOLUME("Line Playback Volume", 0, MASK_ADDR_BURGUNDY_VOLLINE, 16), BURGUNDY_VOLUME("Line Playback Volume", 0, MASK_ADDR_BURGUNDY_VOLLINE, 16),
BURGUNDY_VOLUME("CD Playback Volume", 0, MASK_ADDR_BURGUNDY_VOLCD, 16), BURGUNDY_VOLUME("CD Playback Volume", 0, MASK_ADDR_BURGUNDY_VOLCD, 16),
...@@ -317,9 +330,9 @@ static snd_kcontrol_new_t snd_pmac_burgundy_mixers[] __initdata = { ...@@ -317,9 +330,9 @@ static snd_kcontrol_new_t snd_pmac_burgundy_mixers[] __initdata = {
/*BURGUNDY_OUTPUT_VOLUME("PCM Playback Volume", 0, MASK_ADDR_BURGUNDY_ATTENLINEOUT, 1),*/ /*BURGUNDY_OUTPUT_VOLUME("PCM Playback Volume", 0, MASK_ADDR_BURGUNDY_ATTENLINEOUT, 1),*/
BURGUNDY_OUTPUT_VOLUME("Headphone Playback Volume", 0, MASK_ADDR_BURGUNDY_ATTENSPEAKER, 1), BURGUNDY_OUTPUT_VOLUME("Headphone Playback Volume", 0, MASK_ADDR_BURGUNDY_ATTENSPEAKER, 1),
}; };
static snd_kcontrol_new_t snd_pmac_burgundy_master_sw __initdata = static struct snd_kcontrol_new snd_pmac_burgundy_master_sw __initdata =
BURGUNDY_OUTPUT_SWITCH("Headphone Playback Switch", 0, BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1); BURGUNDY_OUTPUT_SWITCH("Headphone Playback Switch", 0, BURGUNDY_OUTPUT_LEFT, BURGUNDY_OUTPUT_RIGHT, 1);
static snd_kcontrol_new_t snd_pmac_burgundy_speaker_sw __initdata = static struct snd_kcontrol_new snd_pmac_burgundy_speaker_sw __initdata =
BURGUNDY_OUTPUT_SWITCH("PC Speaker Playback Switch", 0, BURGUNDY_OUTPUT_INTERN, 0, 0); BURGUNDY_OUTPUT_SWITCH("PC Speaker Playback Switch", 0, BURGUNDY_OUTPUT_INTERN, 0, 0);
...@@ -327,12 +340,12 @@ BURGUNDY_OUTPUT_SWITCH("PC Speaker Playback Switch", 0, BURGUNDY_OUTPUT_INTERN, ...@@ -327,12 +340,12 @@ BURGUNDY_OUTPUT_SWITCH("PC Speaker Playback Switch", 0, BURGUNDY_OUTPUT_INTERN,
/* /*
* auto-mute stuffs * auto-mute stuffs
*/ */
static int snd_pmac_burgundy_detect_headphone(pmac_t *chip) static int snd_pmac_burgundy_detect_headphone(struct snd_pmac *chip)
{ {
return (in_le32(&chip->awacs->codec_stat) & chip->hp_stat_mask) ? 1 : 0; return (in_le32(&chip->awacs->codec_stat) & chip->hp_stat_mask) ? 1 : 0;
} }
static void snd_pmac_burgundy_update_automute(pmac_t *chip, int do_notify) static void snd_pmac_burgundy_update_automute(struct snd_pmac *chip, int do_notify)
{ {
if (chip->auto_mute) { if (chip->auto_mute) {
int reg, oreg; int reg, oreg;
...@@ -361,7 +374,7 @@ static void snd_pmac_burgundy_update_automute(pmac_t *chip, int do_notify) ...@@ -361,7 +374,7 @@ static void snd_pmac_burgundy_update_automute(pmac_t *chip, int do_notify)
/* /*
* initialize burgundy * initialize burgundy
*/ */
int __init snd_pmac_burgundy_init(pmac_t *chip) int __init snd_pmac_burgundy_init(struct snd_pmac *chip)
{ {
int i, err; int i, err;
......
sound/ppc/daca.c
View file @ 65b29f50
...@@ -40,18 +40,18 @@ ...@@ -40,18 +40,18 @@
#define DACA_VOL_MAX 0x38 #define DACA_VOL_MAX 0x38
typedef struct pmac_daca_t { struct pmac_daca {
pmac_keywest_t i2c; struct pmac_keywest i2c;
int left_vol, right_vol; int left_vol, right_vol;
unsigned int deemphasis : 1; unsigned int deemphasis : 1;
unsigned int amp_on : 1; unsigned int amp_on : 1;
} pmac_daca_t; };
/* /*
* initialize / detect DACA * initialize / detect DACA
*/ */
static int daca_init_client(pmac_keywest_t *i2c) static int daca_init_client(struct pmac_keywest *i2c)
{ {
unsigned short wdata = 0x00; unsigned short wdata = 0x00;
/* SR: no swap, 1bit delay, 32-48kHz */ /* SR: no swap, 1bit delay, 32-48kHz */
...@@ -66,7 +66,7 @@ static int daca_init_client(pmac_keywest_t *i2c) ...@@ -66,7 +66,7 @@ static int daca_init_client(pmac_keywest_t *i2c)
/* /*
* update volume * update volume
*/ */
static int daca_set_volume(pmac_daca_t *mix) static int daca_set_volume(struct pmac_daca *mix)
{ {
unsigned char data[2]; unsigned char data[2];
...@@ -92,7 +92,8 @@ static int daca_set_volume(pmac_daca_t *mix) ...@@ -92,7 +92,8 @@ static int daca_set_volume(pmac_daca_t *mix)
/* deemphasis switch */ /* deemphasis switch */
static int daca_info_deemphasis(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) static int daca_info_deemphasis(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo->count = 1; uinfo->count = 1;
...@@ -101,20 +102,22 @@ static int daca_info_deemphasis(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *u ...@@ -101,20 +102,22 @@ static int daca_info_deemphasis(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *u
return 0; return 0;
} }
static int daca_get_deemphasis(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int daca_get_deemphasis(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
pmac_daca_t *mix; struct pmac_daca *mix;
if (! (mix = chip->mixer_data)) if (! (mix = chip->mixer_data))
return -ENODEV; return -ENODEV;
ucontrol->value.integer.value[0] = mix->deemphasis ? 1 : 0; ucontrol->value.integer.value[0] = mix->deemphasis ? 1 : 0;
return 0; return 0;
} }
static int daca_put_deemphasis(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int daca_put_deemphasis(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
pmac_daca_t *mix; struct pmac_daca *mix;
int change; int change;
if (! (mix = chip->mixer_data)) if (! (mix = chip->mixer_data))
...@@ -128,7 +131,8 @@ static int daca_put_deemphasis(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *u ...@@ -128,7 +131,8 @@ static int daca_put_deemphasis(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *u
} }
/* output volume */ /* output volume */
static int daca_info_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) static int daca_info_volume(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_info *uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = 2; uinfo->count = 2;
...@@ -137,10 +141,11 @@ static int daca_info_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo ...@@ -137,10 +141,11 @@ static int daca_info_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo
return 0; return 0;
} }
static int daca_get_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int daca_get_volume(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
pmac_daca_t *mix; struct pmac_daca *mix;
if (! (mix = chip->mixer_data)) if (! (mix = chip->mixer_data))
return -ENODEV; return -ENODEV;
ucontrol->value.integer.value[0] = mix->left_vol; ucontrol->value.integer.value[0] = mix->left_vol;
...@@ -148,10 +153,11 @@ static int daca_get_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucont ...@@ -148,10 +153,11 @@ static int daca_get_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucont
return 0; return 0;
} }
static int daca_put_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int daca_put_volume(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
pmac_daca_t *mix; struct pmac_daca *mix;
int change; int change;
if (! (mix = chip->mixer_data)) if (! (mix = chip->mixer_data))
...@@ -169,20 +175,22 @@ static int daca_put_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucont ...@@ -169,20 +175,22 @@ static int daca_put_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucont
/* amplifier switch */ /* amplifier switch */
#define daca_info_amp daca_info_deemphasis #define daca_info_amp daca_info_deemphasis
static int daca_get_amp(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int daca_get_amp(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
pmac_daca_t *mix; struct pmac_daca *mix;
if (! (mix = chip->mixer_data)) if (! (mix = chip->mixer_data))
return -ENODEV; return -ENODEV;
ucontrol->value.integer.value[0] = mix->amp_on ? 1 : 0; ucontrol->value.integer.value[0] = mix->amp_on ? 1 : 0;
return 0; return 0;
} }
static int daca_put_amp(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) static int daca_put_amp(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
pmac_daca_t *mix; struct pmac_daca *mix;
int change; int change;
if (! (mix = chip->mixer_data)) if (! (mix = chip->mixer_data))
...@@ -196,7 +204,7 @@ static int daca_put_amp(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol ...@@ -196,7 +204,7 @@ static int daca_put_amp(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol
return change; return change;
} }
static snd_kcontrol_new_t daca_mixers[] = { static struct snd_kcontrol_new daca_mixers[] = {
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Deemphasis Switch", .name = "Deemphasis Switch",
.info = daca_info_deemphasis, .info = daca_info_deemphasis,
...@@ -219,9 +227,9 @@ static snd_kcontrol_new_t daca_mixers[] = { ...@@ -219,9 +227,9 @@ static snd_kcontrol_new_t daca_mixers[] = {
#ifdef CONFIG_PM #ifdef CONFIG_PM
static void daca_resume(pmac_t *chip) static void daca_resume(struct snd_pmac *chip)
{ {
pmac_daca_t *mix = chip->mixer_data; struct pmac_daca *mix = chip->mixer_data;
i2c_smbus_write_byte_data(mix->i2c.client, DACA_REG_SR, 0x08); i2c_smbus_write_byte_data(mix->i2c.client, DACA_REG_SR, 0x08);
i2c_smbus_write_byte_data(mix->i2c.client, DACA_REG_GCFG, i2c_smbus_write_byte_data(mix->i2c.client, DACA_REG_GCFG,
mix->amp_on ? 0x05 : 0x04); mix->amp_on ? 0x05 : 0x04);
...@@ -230,9 +238,9 @@ static void daca_resume(pmac_t *chip) ...@@ -230,9 +238,9 @@ static void daca_resume(pmac_t *chip)
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
static void daca_cleanup(pmac_t *chip) static void daca_cleanup(struct snd_pmac *chip)
{ {
pmac_daca_t *mix = chip->mixer_data; struct pmac_daca *mix = chip->mixer_data;
if (! mix) if (! mix)
return; return;
snd_pmac_keywest_cleanup(&mix->i2c); snd_pmac_keywest_cleanup(&mix->i2c);
...@@ -241,10 +249,10 @@ static void daca_cleanup(pmac_t *chip) ...@@ -241,10 +249,10 @@ static void daca_cleanup(pmac_t *chip)
} }
/* exported */ /* exported */
int __init snd_pmac_daca_init(pmac_t *chip) int __init snd_pmac_daca_init(struct snd_pmac *chip)
{ {
int i, err; int i, err;
pmac_daca_t *mix; struct pmac_daca *mix;
#ifdef CONFIG_KMOD #ifdef CONFIG_KMOD
if (current->fs->root) if (current->fs->root)
......
sound/ppc/keywest.c
View file @ 65b29f50
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
* we have to keep a static variable here since i2c attach_adapter * we have to keep a static variable here since i2c attach_adapter
* callback cannot pass a private data. * callback cannot pass a private data.
*/ */
static pmac_keywest_t *keywest_ctx; static struct pmac_keywest *keywest_ctx;
#define I2C_DRIVERID_KEYWEST 0xFEBA #define I2C_DRIVERID_KEYWEST 0xFEBA
...@@ -106,7 +106,7 @@ static int keywest_detach_client(struct i2c_client *client) ...@@ -106,7 +106,7 @@ static int keywest_detach_client(struct i2c_client *client)
} }
/* exported */ /* exported */
void snd_pmac_keywest_cleanup(pmac_keywest_t *i2c) void snd_pmac_keywest_cleanup(struct pmac_keywest *i2c)
{ {
if (keywest_ctx && keywest_ctx == i2c) { if (keywest_ctx && keywest_ctx == i2c) {
i2c_del_driver(&keywest_driver); i2c_del_driver(&keywest_driver);
...@@ -126,7 +126,7 @@ int __init snd_pmac_tumbler_post_init(void) ...@@ -126,7 +126,7 @@ int __init snd_pmac_tumbler_post_init(void)
} }
/* exported */ /* exported */
int __init snd_pmac_keywest_init(pmac_keywest_t *i2c) int __init snd_pmac_keywest_init(struct pmac_keywest *i2c)
{ {
int err; int err;
......
sound/ppc/pmac.c
View file @ 65b29f50
This diff is collapsed.
sound/ppc/pmac.h
View file @ 65b29f50
...@@ -46,19 +46,10 @@ ...@@ -46,19 +46,10 @@
#define PMAC_SUPPORT_AUTOMUTE #define PMAC_SUPPORT_AUTOMUTE
/*
* typedefs
*/
typedef struct snd_pmac pmac_t;
typedef struct snd_pmac_stream pmac_stream_t;
typedef struct snd_pmac_beep pmac_beep_t;
typedef struct snd_pmac_dbdma pmac_dbdma_t;
/* /*
* DBDMA space * DBDMA space
*/ */
struct snd_pmac_dbdma { struct pmac_dbdma {
dma_addr_t dma_base; dma_addr_t dma_base;
dma_addr_t addr; dma_addr_t addr;
struct dbdma_cmd __iomem *cmds; struct dbdma_cmd __iomem *cmds;
...@@ -69,7 +60,7 @@ struct snd_pmac_dbdma { ...@@ -69,7 +60,7 @@ struct snd_pmac_dbdma {
/* /*
* playback/capture stream * playback/capture stream
*/ */
struct snd_pmac_stream { struct pmac_stream {
int running; /* boolean */ int running; /* boolean */
int stream; /* PLAYBACK/CAPTURE */ int stream; /* PLAYBACK/CAPTURE */
...@@ -79,10 +70,10 @@ struct snd_pmac_stream { ...@@ -79,10 +70,10 @@ struct snd_pmac_stream {
int buffer_size; /* in kbytes */ int buffer_size; /* in kbytes */
int nperiods, cur_period; int nperiods, cur_period;
pmac_dbdma_t cmd; struct pmac_dbdma cmd;
volatile struct dbdma_regs __iomem *dma; volatile struct dbdma_regs __iomem *dma;
snd_pcm_substream_t *substream; struct snd_pcm_substream *substream;
unsigned int cur_freqs; /* currently available frequencies */ unsigned int cur_freqs; /* currently available frequencies */
unsigned int cur_formats; /* currently available formats */ unsigned int cur_formats; /* currently available formats */
...@@ -98,7 +89,7 @@ enum snd_pmac_model { ...@@ -98,7 +89,7 @@ enum snd_pmac_model {
}; };
struct snd_pmac { struct snd_pmac {
snd_card_t *card; struct snd_card *card;
/* h/w info */ /* h/w info */
struct device_node *node; struct device_node *node;
...@@ -140,75 +131,75 @@ struct snd_pmac { ...@@ -140,75 +131,75 @@ struct snd_pmac {
unsigned char __iomem *latch_base; unsigned char __iomem *latch_base;
unsigned char __iomem *macio_base; unsigned char __iomem *macio_base;
pmac_stream_t playback; struct pmac_stream playback;
pmac_stream_t capture; struct pmac_stream capture;
pmac_dbdma_t extra_dma; struct pmac_dbdma extra_dma;
int irq, tx_irq, rx_irq; int irq, tx_irq, rx_irq;
snd_pcm_t *pcm; struct snd_pcm *pcm;
pmac_beep_t *beep; struct pmac_beep *beep;
unsigned int control_mask; /* control mask */ unsigned int control_mask; /* control mask */
/* mixer stuffs */ /* mixer stuffs */
void *mixer_data; void *mixer_data;
void (*mixer_free)(pmac_t *); void (*mixer_free)(struct snd_pmac *);
snd_kcontrol_t *master_sw_ctl; struct snd_kcontrol *master_sw_ctl;
snd_kcontrol_t *speaker_sw_ctl; struct snd_kcontrol *speaker_sw_ctl;
snd_kcontrol_t *drc_sw_ctl; /* only used for tumbler -ReneR */ struct snd_kcontrol *drc_sw_ctl; /* only used for tumbler -ReneR */
snd_kcontrol_t *hp_detect_ctl; struct snd_kcontrol *hp_detect_ctl;
snd_kcontrol_t *lineout_sw_ctl; struct snd_kcontrol *lineout_sw_ctl;
/* lowlevel callbacks */ /* lowlevel callbacks */
void (*set_format)(pmac_t *chip); void (*set_format)(struct snd_pmac *chip);
void (*update_automute)(pmac_t *chip, int do_notify); void (*update_automute)(struct snd_pmac *chip, int do_notify);
int (*detect_headphone)(pmac_t *chip); int (*detect_headphone)(struct snd_pmac *chip);
#ifdef CONFIG_PM #ifdef CONFIG_PM
void (*suspend)(pmac_t *chip); void (*suspend)(struct snd_pmac *chip);
void (*resume)(pmac_t *chip); void (*resume)(struct snd_pmac *chip);
#endif #endif
}; };
/* exported functions */ /* exported functions */
int snd_pmac_new(snd_card_t *card, pmac_t **chip_return); int snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return);
int snd_pmac_pcm_new(pmac_t *chip); int snd_pmac_pcm_new(struct snd_pmac *chip);
int snd_pmac_attach_beep(pmac_t *chip); int snd_pmac_attach_beep(struct snd_pmac *chip);
void snd_pmac_detach_beep(pmac_t *chip); void snd_pmac_detach_beep(struct snd_pmac *chip);
void snd_pmac_beep_stop(pmac_t *chip); void snd_pmac_beep_stop(struct snd_pmac *chip);
unsigned int snd_pmac_rate_index(pmac_t *chip, pmac_stream_t *rec, unsigned int rate); unsigned int snd_pmac_rate_index(struct snd_pmac *chip, struct pmac_stream *rec, unsigned int rate);
void snd_pmac_beep_dma_start(pmac_t *chip, int bytes, unsigned long addr, int speed); void snd_pmac_beep_dma_start(struct snd_pmac *chip, int bytes, unsigned long addr, int speed);
void snd_pmac_beep_dma_stop(pmac_t *chip); void snd_pmac_beep_dma_stop(struct snd_pmac *chip);
/* initialize mixer */ /* initialize mixer */
int snd_pmac_awacs_init(pmac_t *chip); int snd_pmac_awacs_init(struct snd_pmac *chip);
int snd_pmac_burgundy_init(pmac_t *chip); int snd_pmac_burgundy_init(struct snd_pmac *chip);
int snd_pmac_daca_init(pmac_t *chip); int snd_pmac_daca_init(struct snd_pmac *chip);
int snd_pmac_tumbler_init(pmac_t *chip); int snd_pmac_tumbler_init(struct snd_pmac *chip);
int snd_pmac_tumbler_post_init(void); int snd_pmac_tumbler_post_init(void);
int snd_pmac_toonie_init(pmac_t *chip); int snd_pmac_toonie_init(struct snd_pmac *chip);
/* i2c functions */ /* i2c functions */
typedef struct snd_pmac_keywest { struct pmac_keywest {
int addr; int addr;
struct i2c_client *client; struct i2c_client *client;
int id; int id;
int (*init_client)(struct snd_pmac_keywest *i2c); int (*init_client)(struct pmac_keywest *i2c);
char *name; char *name;
} pmac_keywest_t; };
int snd_pmac_keywest_init(pmac_keywest_t *i2c); int snd_pmac_keywest_init(struct pmac_keywest *i2c);
void snd_pmac_keywest_cleanup(pmac_keywest_t *i2c); void snd_pmac_keywest_cleanup(struct pmac_keywest *i2c);
/* misc */ /* misc */
int snd_pmac_boolean_stereo_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo); int snd_pmac_boolean_stereo_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
int snd_pmac_boolean_mono_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo); int snd_pmac_boolean_mono_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);
int snd_pmac_add_automute(pmac_t *chip); int snd_pmac_add_automute(struct snd_pmac *chip);
#endif /* __PMAC_H */ #endif /* __PMAC_H */
sound/ppc/powermac.c
View file @ 65b29f50
...@@ -49,15 +49,15 @@ MODULE_PARM_DESC(enable_beep, "Enable beep using PCM."); ...@@ -49,15 +49,15 @@ MODULE_PARM_DESC(enable_beep, "Enable beep using PCM.");
* card entry * card entry
*/ */
static snd_card_t *snd_pmac_card = NULL; static struct snd_card *snd_pmac_card = NULL;
/* /*
*/ */
static int __init snd_pmac_probe(void) static int __init snd_pmac_probe(void)
{ {
snd_card_t *card; struct snd_card *card;
pmac_t *chip; struct snd_pmac *chip;
char *name_ext; char *name_ext;
int err; int err;
......
sound/ppc/toonie.c
View file @ 65b29f50
...@@ -101,10 +101,10 @@ static int read_audio_gpio(struct pmac_gpio *gp) ...@@ -101,10 +101,10 @@ static int read_audio_gpio(struct pmac_gpio *gp)
enum { TOONIE_MUTE_HP, TOONIE_MUTE_AMP }; enum { TOONIE_MUTE_HP, TOONIE_MUTE_AMP };
static int toonie_get_mute_switch(snd_kcontrol_t *kcontrol, static int toonie_get_mute_switch(struct snd_kcontrol *kcontrol,
snd_ctl_elem_value_t *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
struct pmac_toonie *mix = chip->mixer_data; struct pmac_toonie *mix = chip->mixer_data;
struct pmac_gpio *gp; struct pmac_gpio *gp;
...@@ -124,10 +124,10 @@ static int toonie_get_mute_switch(snd_kcontrol_t *kcontrol, ...@@ -124,10 +124,10 @@ static int toonie_get_mute_switch(snd_kcontrol_t *kcontrol,
return 0; return 0;
} }
static int toonie_put_mute_switch(snd_kcontrol_t *kcontrol, static int toonie_put_mute_switch(struct snd_kcontrol *kcontrol,
snd_ctl_elem_value_t *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
pmac_t *chip = snd_kcontrol_chip(kcontrol); struct snd_pmac *chip = snd_kcontrol_chip(kcontrol);
struct pmac_toonie *mix = chip->mixer_data; struct pmac_toonie *mix = chip->mixer_data;
struct pmac_gpio *gp; struct pmac_gpio *gp;
int val; int val;
...@@ -156,7 +156,7 @@ static int toonie_put_mute_switch(snd_kcontrol_t *kcontrol, ...@@ -156,7 +156,7 @@ static int toonie_put_mute_switch(snd_kcontrol_t *kcontrol,
return 0; return 0;
} }
static snd_kcontrol_new_t toonie_hp_sw __initdata = { static struct snd_kcontrol_new toonie_hp_sw __initdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Headphone Playback Switch", .name = "Headphone Playback Switch",
.info = snd_pmac_boolean_mono_info, .info = snd_pmac_boolean_mono_info,
...@@ -164,7 +164,7 @@ static snd_kcontrol_new_t toonie_hp_sw __initdata = { ...@@ -164,7 +164,7 @@ static snd_kcontrol_new_t toonie_hp_sw __initdata = {
.put = toonie_put_mute_switch, .put = toonie_put_mute_switch,
.private_value = TOONIE_MUTE_HP, .private_value = TOONIE_MUTE_HP,
}; };
static snd_kcontrol_new_t toonie_speaker_sw __initdata = { static struct snd_kcontrol_new toonie_speaker_sw __initdata = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "PC Speaker Playback Switch", .name = "PC Speaker Playback Switch",
.info = snd_pmac_boolean_mono_info, .info = snd_pmac_boolean_mono_info,
...@@ -176,7 +176,7 @@ static snd_kcontrol_new_t toonie_speaker_sw __initdata = { ...@@ -176,7 +176,7 @@ static snd_kcontrol_new_t toonie_speaker_sw __initdata = {
/* /*
* auto-mute stuffs * auto-mute stuffs
*/ */
static int toonie_detect_headphone(pmac_t *chip) static int toonie_detect_headphone(struct snd_pmac *chip)
{ {
struct pmac_toonie *mix = chip->mixer_data; struct pmac_toonie *mix = chip->mixer_data;
int detect = 0; int detect = 0;
...@@ -186,8 +186,8 @@ static int toonie_detect_headphone(pmac_t *chip) ...@@ -186,8 +186,8 @@ static int toonie_detect_headphone(pmac_t *chip)
return detect; return detect;
} }
static void toonie_check_mute(pmac_t *chip, struct pmac_gpio *gp, int val, static void toonie_check_mute(struct snd_pmac *chip, struct pmac_gpio *gp, int val,
int do_notify, snd_kcontrol_t *sw) int do_notify, struct snd_kcontrol *sw)
{ {
if (check_audio_gpio(gp) != val) { if (check_audio_gpio(gp) != val) {
write_audio_gpio(gp, val); write_audio_gpio(gp, val);
...@@ -199,7 +199,7 @@ static void toonie_check_mute(pmac_t *chip, struct pmac_gpio *gp, int val, ...@@ -199,7 +199,7 @@ static void toonie_check_mute(pmac_t *chip, struct pmac_gpio *gp, int val,
static void toonie_detect_handler(void *self) static void toonie_detect_handler(void *self)
{ {
pmac_t *chip = (pmac_t*) self; struct snd_pmac *chip = (struct snd_pmac *) self;
struct pmac_toonie *mix; struct pmac_toonie *mix;
int headphone; int headphone;
...@@ -232,7 +232,7 @@ static void toonie_detect_handler(void *self) ...@@ -232,7 +232,7 @@ static void toonie_detect_handler(void *self)
} }
} }
static void toonie_update_automute(pmac_t *chip, int do_notify) static void toonie_update_automute(struct snd_pmac *chip, int do_notify)
{ {
if (chip->auto_mute) { if (chip->auto_mute) {
struct pmac_toonie *mix; struct pmac_toonie *mix;
...@@ -246,7 +246,7 @@ static void toonie_update_automute(pmac_t *chip, int do_notify) ...@@ -246,7 +246,7 @@ static void toonie_update_automute(pmac_t *chip, int do_notify)
/* interrupt - headphone plug changed */ /* interrupt - headphone plug changed */
static irqreturn_t toonie_hp_intr(int irq, void *devid, struct pt_regs *regs) static irqreturn_t toonie_hp_intr(int irq, void *devid, struct pt_regs *regs)
{ {
pmac_t *chip = devid; struct snd_pmac *chip = devid;
if (chip->update_automute && chip->initialized) { if (chip->update_automute && chip->initialized) {
chip->update_automute(chip, 1); chip->update_automute(chip, 1);
...@@ -325,7 +325,7 @@ static int find_audio_gpio(const char *name, const char *platform, ...@@ -325,7 +325,7 @@ static int find_audio_gpio(const char *name, const char *platform,
return (np->n_intrs > 0) ? np->intrs[0].line : 0; return (np->n_intrs > 0) ? np->intrs[0].line : 0;
} }
static void toonie_cleanup(pmac_t *chip) static void toonie_cleanup(struct snd_pmac *chip)
{ {
struct pmac_toonie *mix = chip->mixer_data; struct pmac_toonie *mix = chip->mixer_data;
if (! mix) if (! mix)
...@@ -336,7 +336,7 @@ static void toonie_cleanup(pmac_t *chip) ...@@ -336,7 +336,7 @@ static void toonie_cleanup(pmac_t *chip)
chip->mixer_data = NULL; chip->mixer_data = NULL;
} }
int snd_pmac_toonie_init(pmac_t *chip) int snd_pmac_toonie_init(struct snd_pmac *chip)
{ {
struct pmac_toonie *mix; struct pmac_toonie *mix;
......
sound/ppc/tumbler.c
View file @ 65b29f50
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7