Skip to content

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

[ALSA] Remove xxx_t typedefs: ISA ES18xx 

Modules: ES18xx driver

Remove xxx_t typedefs from the ISA ES18xx driver.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent e3561703
Show whitespace changes
Inline Side-by-side
Showing with 140 additions and 142 deletions
sound/isa/es18xx.c
View file @ 8047c910
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
#define PFX "es18xx: " #define PFX "es18xx: "
struct _snd_es18xx { struct snd_es18xx {
unsigned long port; /* port of ESS chip */ unsigned long port; /* port of ESS chip */
unsigned long mpu_port; /* MPU-401 port of ESS chip */ unsigned long mpu_port; /* MPU-401 port of ESS chip */
unsigned long fm_port; /* FM port */ unsigned long fm_port; /* FM port */
...@@ -107,18 +107,18 @@ struct _snd_es18xx { ...@@ -107,18 +107,18 @@ struct _snd_es18xx {
unsigned int dma1_shift; unsigned int dma1_shift;
unsigned int dma2_shift; unsigned int dma2_shift;
snd_card_t *card; struct snd_card *card;
snd_pcm_t *pcm; struct snd_pcm *pcm;
snd_pcm_substream_t *playback_a_substream; struct snd_pcm_substream *playback_a_substream;
snd_pcm_substream_t *capture_a_substream; struct snd_pcm_substream *capture_a_substream;
snd_pcm_substream_t *playback_b_substream; struct snd_pcm_substream *playback_b_substream;
snd_rawmidi_t *rmidi; struct snd_rawmidi *rmidi;
snd_kcontrol_t *hw_volume; struct snd_kcontrol *hw_volume;
snd_kcontrol_t *hw_switch; struct snd_kcontrol *hw_switch;
snd_kcontrol_t *master_volume; struct snd_kcontrol *master_volume;
snd_kcontrol_t *master_switch; struct snd_kcontrol *master_switch;
spinlock_t reg_lock; spinlock_t reg_lock;
spinlock_t mixer_lock; spinlock_t mixer_lock;
...@@ -155,8 +155,6 @@ struct _snd_es18xx { ...@@ -155,8 +155,6 @@ struct _snd_es18xx {
#define ES18XX_PM_FM 0x020 #define ES18XX_PM_FM 0x020
#define ES18XX_PM_SUS 0x080 #define ES18XX_PM_SUS 0x080
typedef struct _snd_es18xx es18xx_t;
/* Lowlevel */ /* Lowlevel */
#define DAC1 0x01 #define DAC1 0x01
...@@ -164,7 +162,7 @@ typedef struct _snd_es18xx es18xx_t; ...@@ -164,7 +162,7 @@ typedef struct _snd_es18xx es18xx_t;
#define DAC2 0x04 #define DAC2 0x04
#define MILLISECOND 10000 #define MILLISECOND 10000
static int snd_es18xx_dsp_command(es18xx_t *chip, unsigned char val) static int snd_es18xx_dsp_command(struct snd_es18xx *chip, unsigned char val)
{ {
int i; int i;
...@@ -177,7 +175,7 @@ static int snd_es18xx_dsp_command(es18xx_t *chip, unsigned char val) ...@@ -177,7 +175,7 @@ static int snd_es18xx_dsp_command(es18xx_t *chip, unsigned char val)
return -EINVAL; return -EINVAL;
} }
static int snd_es18xx_dsp_get_byte(es18xx_t *chip) static int snd_es18xx_dsp_get_byte(struct snd_es18xx *chip)
{ {
int i; int i;
...@@ -191,7 +189,7 @@ static int snd_es18xx_dsp_get_byte(es18xx_t *chip) ...@@ -191,7 +189,7 @@ static int snd_es18xx_dsp_get_byte(es18xx_t *chip)
#undef REG_DEBUG #undef REG_DEBUG
static int snd_es18xx_write(es18xx_t *chip, static int snd_es18xx_write(struct snd_es18xx *chip,
unsigned char reg, unsigned char data) unsigned char reg, unsigned char data)
{ {
unsigned long flags; unsigned long flags;
...@@ -210,7 +208,7 @@ static int snd_es18xx_write(es18xx_t *chip, ...@@ -210,7 +208,7 @@ static int snd_es18xx_write(es18xx_t *chip,
return ret; return ret;
} }
static int snd_es18xx_read(es18xx_t *chip, unsigned char reg) static int snd_es18xx_read(struct snd_es18xx *chip, unsigned char reg)
{ {
unsigned long flags; unsigned long flags;
int ret, data; int ret, data;
...@@ -232,7 +230,7 @@ static int snd_es18xx_read(es18xx_t *chip, unsigned char reg) ...@@ -232,7 +230,7 @@ static int snd_es18xx_read(es18xx_t *chip, unsigned char reg)
} }
/* Return old value */ /* Return old value */
static int snd_es18xx_bits(es18xx_t *chip, unsigned char reg, static int snd_es18xx_bits(struct snd_es18xx *chip, unsigned char reg,
unsigned char mask, unsigned char val) unsigned char mask, unsigned char val)
{ {
int ret; int ret;
...@@ -270,7 +268,7 @@ static int snd_es18xx_bits(es18xx_t *chip, unsigned char reg, ...@@ -270,7 +268,7 @@ static int snd_es18xx_bits(es18xx_t *chip, unsigned char reg,
return ret; return ret;
} }
static inline void snd_es18xx_mixer_write(es18xx_t *chip, static inline void snd_es18xx_mixer_write(struct snd_es18xx *chip,
unsigned char reg, unsigned char data) unsigned char reg, unsigned char data)
{ {
unsigned long flags; unsigned long flags;
...@@ -283,7 +281,7 @@ static inline void snd_es18xx_mixer_write(es18xx_t *chip, ...@@ -283,7 +281,7 @@ static inline void snd_es18xx_mixer_write(es18xx_t *chip,
#endif #endif
} }
static inline int snd_es18xx_mixer_read(es18xx_t *chip, unsigned char reg) static inline int snd_es18xx_mixer_read(struct snd_es18xx *chip, unsigned char reg)
{ {
unsigned long flags; unsigned long flags;
int data; int data;
...@@ -298,7 +296,7 @@ static inline int snd_es18xx_mixer_read(es18xx_t *chip, unsigned char reg) ...@@ -298,7 +296,7 @@ static inline int snd_es18xx_mixer_read(es18xx_t *chip, unsigned char reg)
} }
/* Return old value */ /* Return old value */
static inline int snd_es18xx_mixer_bits(es18xx_t *chip, unsigned char reg, static inline int snd_es18xx_mixer_bits(struct snd_es18xx *chip, unsigned char reg,
unsigned char mask, unsigned char val) unsigned char mask, unsigned char val)
{ {
unsigned char old, new, oval; unsigned char old, new, oval;
...@@ -319,7 +317,7 @@ static inline int snd_es18xx_mixer_bits(es18xx_t *chip, unsigned char reg, ...@@ -319,7 +317,7 @@ static inline int snd_es18xx_mixer_bits(es18xx_t *chip, unsigned char reg,
return oval; return oval;
} }
static inline int snd_es18xx_mixer_writable(es18xx_t *chip, unsigned char reg, static inline int snd_es18xx_mixer_writable(struct snd_es18xx *chip, unsigned char reg,
unsigned char mask) unsigned char mask)
{ {
int old, expected, new; int old, expected, new;
...@@ -339,7 +337,7 @@ static inline int snd_es18xx_mixer_writable(es18xx_t *chip, unsigned char reg, ...@@ -339,7 +337,7 @@ static inline int snd_es18xx_mixer_writable(es18xx_t *chip, unsigned char reg,
} }
static int snd_es18xx_reset(es18xx_t *chip) static int snd_es18xx_reset(struct snd_es18xx *chip)
{ {
int i; int i;
outb(0x03, chip->port + 0x06); outb(0x03, chip->port + 0x06);
...@@ -351,7 +349,7 @@ static int snd_es18xx_reset(es18xx_t *chip) ...@@ -351,7 +349,7 @@ static int snd_es18xx_reset(es18xx_t *chip)
return 0; return 0;
} }
static int snd_es18xx_reset_fifo(es18xx_t *chip) static int snd_es18xx_reset_fifo(struct snd_es18xx *chip)
{ {
outb(0x02, chip->port + 0x06); outb(0x02, chip->port + 0x06);
inb(chip->port + 0x06); inb(chip->port + 0x06);
...@@ -359,7 +357,7 @@ static int snd_es18xx_reset_fifo(es18xx_t *chip) ...@@ -359,7 +357,7 @@ static int snd_es18xx_reset_fifo(es18xx_t *chip)
return 0; return 0;
} }
static ratnum_t new_clocks[2] = { static struct snd_ratnum new_clocks[2] = {
{ {
.num = 793800, .num = 793800,
.den_min = 1, .den_min = 1,
...@@ -374,12 +372,12 @@ static ratnum_t new_clocks[2] = { ...@@ -374,12 +372,12 @@ static ratnum_t new_clocks[2] = {
} }
}; };
static snd_pcm_hw_constraint_ratnums_t new_hw_constraints_clocks = { static struct snd_pcm_hw_constraint_ratnums new_hw_constraints_clocks = {
.nrats = 2, .nrats = 2,
.rats = new_clocks, .rats = new_clocks,
}; };
static ratnum_t old_clocks[2] = { static struct snd_ratnum old_clocks[2] = {
{ {
.num = 795444, .num = 795444,
.den_min = 1, .den_min = 1,
...@@ -394,18 +392,18 @@ static ratnum_t old_clocks[2] = { ...@@ -394,18 +392,18 @@ static ratnum_t old_clocks[2] = {
} }
}; };
static snd_pcm_hw_constraint_ratnums_t old_hw_constraints_clocks = { static struct snd_pcm_hw_constraint_ratnums old_hw_constraints_clocks = {
.nrats = 2, .nrats = 2,
.rats = old_clocks, .rats = old_clocks,
}; };
static void snd_es18xx_rate_set(es18xx_t *chip, static void snd_es18xx_rate_set(struct snd_es18xx *chip,
snd_pcm_substream_t *substream, struct snd_pcm_substream *substream,
int mode) int mode)
{ {
unsigned int bits, div0; unsigned int bits, div0;
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
if (chip->caps & ES18XX_NEW_RATE) { if (chip->caps & ES18XX_NEW_RATE) {
if (runtime->rate_num == new_clocks[0].num) if (runtime->rate_num == new_clocks[0].num)
bits = 128 - runtime->rate_den; bits = 128 - runtime->rate_den;
...@@ -435,10 +433,10 @@ static void snd_es18xx_rate_set(es18xx_t *chip, ...@@ -435,10 +433,10 @@ static void snd_es18xx_rate_set(es18xx_t *chip,
} }
} }
static int snd_es18xx_playback_hw_params(snd_pcm_substream_t * substream, static int snd_es18xx_playback_hw_params(struct snd_pcm_substream *substream,
snd_pcm_hw_params_t * hw_params) struct snd_pcm_hw_params *hw_params)
{ {
es18xx_t *chip = snd_pcm_substream_chip(substream); struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
int shift, err; int shift, err;
shift = 0; shift = 0;
...@@ -463,15 +461,15 @@ static int snd_es18xx_playback_hw_params(snd_pcm_substream_t * substream, ...@@ -463,15 +461,15 @@ static int snd_es18xx_playback_hw_params(snd_pcm_substream_t * substream,
return 0; return 0;
} }
static int snd_es18xx_pcm_hw_free(snd_pcm_substream_t * substream) static int snd_es18xx_pcm_hw_free(struct snd_pcm_substream *substream)
{ {
return snd_pcm_lib_free_pages(substream); return snd_pcm_lib_free_pages(substream);
} }
static int snd_es18xx_playback1_prepare(es18xx_t *chip, static int snd_es18xx_playback1_prepare(struct snd_es18xx *chip,
snd_pcm_substream_t *substream) struct snd_pcm_substream *substream)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
unsigned int size = snd_pcm_lib_buffer_bytes(substream); unsigned int size = snd_pcm_lib_buffer_bytes(substream);
unsigned int count = snd_pcm_lib_period_bytes(substream); unsigned int count = snd_pcm_lib_period_bytes(substream);
...@@ -496,8 +494,8 @@ static int snd_es18xx_playback1_prepare(es18xx_t *chip, ...@@ -496,8 +494,8 @@ static int snd_es18xx_playback1_prepare(es18xx_t *chip,
return 0; return 0;
} }
static int snd_es18xx_playback1_trigger(es18xx_t *chip, static int snd_es18xx_playback1_trigger(struct snd_es18xx *chip,
snd_pcm_substream_t * substream, struct snd_pcm_substream *substream,
int cmd) int cmd)
{ {
switch (cmd) { switch (cmd) {
...@@ -546,10 +544,10 @@ static int snd_es18xx_playback1_trigger(es18xx_t *chip, ...@@ -546,10 +544,10 @@ static int snd_es18xx_playback1_trigger(es18xx_t *chip,
return 0; return 0;
} }
static int snd_es18xx_capture_hw_params(snd_pcm_substream_t * substream, static int snd_es18xx_capture_hw_params(struct snd_pcm_substream *substream,
snd_pcm_hw_params_t * hw_params) struct snd_pcm_hw_params *hw_params)
{ {
es18xx_t *chip = snd_pcm_substream_chip(substream); struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
int shift, err; int shift, err;
shift = 0; shift = 0;
...@@ -569,10 +567,10 @@ static int snd_es18xx_capture_hw_params(snd_pcm_substream_t * substream, ...@@ -569,10 +567,10 @@ static int snd_es18xx_capture_hw_params(snd_pcm_substream_t * substream,
return 0; return 0;
} }
static int snd_es18xx_capture_prepare(snd_pcm_substream_t *substream) static int snd_es18xx_capture_prepare(struct snd_pcm_substream *substream)
{ {
es18xx_t *chip = snd_pcm_substream_chip(substream); struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
unsigned int size = snd_pcm_lib_buffer_bytes(substream); unsigned int size = snd_pcm_lib_buffer_bytes(substream);
unsigned int count = snd_pcm_lib_period_bytes(substream); unsigned int count = snd_pcm_lib_period_bytes(substream);
...@@ -608,10 +606,10 @@ static int snd_es18xx_capture_prepare(snd_pcm_substream_t *substream) ...@@ -608,10 +606,10 @@ static int snd_es18xx_capture_prepare(snd_pcm_substream_t *substream)
return 0; return 0;
} }
static int snd_es18xx_capture_trigger(snd_pcm_substream_t *substream, static int snd_es18xx_capture_trigger(struct snd_pcm_substream *substream,
int cmd) int cmd)
{ {
es18xx_t *chip = snd_pcm_substream_chip(substream); struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
...@@ -637,10 +635,10 @@ static int snd_es18xx_capture_trigger(snd_pcm_substream_t *substream, ...@@ -637,10 +635,10 @@ static int snd_es18xx_capture_trigger(snd_pcm_substream_t *substream,
return 0; return 0;
} }
static int snd_es18xx_playback2_prepare(es18xx_t *chip, static int snd_es18xx_playback2_prepare(struct snd_es18xx *chip,
snd_pcm_substream_t *substream) struct snd_pcm_substream *substream)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
unsigned int size = snd_pcm_lib_buffer_bytes(substream); unsigned int size = snd_pcm_lib_buffer_bytes(substream);
unsigned int count = snd_pcm_lib_period_bytes(substream); unsigned int count = snd_pcm_lib_period_bytes(substream);
...@@ -674,8 +672,8 @@ static int snd_es18xx_playback2_prepare(es18xx_t *chip, ...@@ -674,8 +672,8 @@ static int snd_es18xx_playback2_prepare(es18xx_t *chip,
return 0; return 0;
} }
static int snd_es18xx_playback2_trigger(es18xx_t *chip, static int snd_es18xx_playback2_trigger(struct snd_es18xx *chip,
snd_pcm_substream_t *substream, struct snd_pcm_substream *substream,
int cmd) int cmd)
{ {
switch (cmd) { switch (cmd) {
...@@ -714,19 +712,19 @@ static int snd_es18xx_playback2_trigger(es18xx_t *chip, ...@@ -714,19 +712,19 @@ static int snd_es18xx_playback2_trigger(es18xx_t *chip,
return 0; return 0;
} }
static int snd_es18xx_playback_prepare(snd_pcm_substream_t *substream) static int snd_es18xx_playback_prepare(struct snd_pcm_substream *substream)
{ {
es18xx_t *chip = snd_pcm_substream_chip(substream); struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
if (substream->number == 0 && (chip->caps & ES18XX_PCM2)) if (substream->number == 0 && (chip->caps & ES18XX_PCM2))
return snd_es18xx_playback1_prepare(chip, substream); return snd_es18xx_playback1_prepare(chip, substream);
else else
return snd_es18xx_playback2_prepare(chip, substream); return snd_es18xx_playback2_prepare(chip, substream);
} }
static int snd_es18xx_playback_trigger(snd_pcm_substream_t *substream, static int snd_es18xx_playback_trigger(struct snd_pcm_substream *substream,
int cmd) int cmd)
{ {
es18xx_t *chip = snd_pcm_substream_chip(substream); struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
if (substream->number == 0 && (chip->caps & ES18XX_PCM2)) if (substream->number == 0 && (chip->caps & ES18XX_PCM2))
return snd_es18xx_playback1_trigger(chip, substream, cmd); return snd_es18xx_playback1_trigger(chip, substream, cmd);
else else
...@@ -735,7 +733,7 @@ static int snd_es18xx_playback_trigger(snd_pcm_substream_t *substream, ...@@ -735,7 +733,7 @@ static int snd_es18xx_playback_trigger(snd_pcm_substream_t *substream,
static irqreturn_t snd_es18xx_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t snd_es18xx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
es18xx_t *chip = dev_id; struct snd_es18xx *chip = dev_id;
unsigned char status; unsigned char status;
if (chip->caps & ES18XX_CONTROL) { if (chip->caps & ES18XX_CONTROL) {
...@@ -795,9 +793,9 @@ static irqreturn_t snd_es18xx_interrupt(int irq, void *dev_id, struct pt_regs *r ...@@ -795,9 +793,9 @@ static irqreturn_t snd_es18xx_interrupt(int irq, void *dev_id, struct pt_regs *r
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static snd_pcm_uframes_t snd_es18xx_playback_pointer(snd_pcm_substream_t * substream) static snd_pcm_uframes_t snd_es18xx_playback_pointer(struct snd_pcm_substream *substream)
{ {
es18xx_t *chip = snd_pcm_substream_chip(substream); struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
int pos; int pos;
if (substream->number == 0 && (chip->caps & ES18XX_PCM2)) { if (substream->number == 0 && (chip->caps & ES18XX_PCM2)) {
...@@ -813,9 +811,9 @@ static snd_pcm_uframes_t snd_es18xx_playback_pointer(snd_pcm_substream_t * subst ...@@ -813,9 +811,9 @@ static snd_pcm_uframes_t snd_es18xx_playback_pointer(snd_pcm_substream_t * subst
} }
} }
static snd_pcm_uframes_t snd_es18xx_capture_pointer(snd_pcm_substream_t * substream) static snd_pcm_uframes_t snd_es18xx_capture_pointer(struct snd_pcm_substream *substream)
{ {
es18xx_t *chip = snd_pcm_substream_chip(substream); struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
int pos; int pos;
if (!(chip->active & ADC1)) if (!(chip->active & ADC1))
...@@ -824,7 +822,7 @@ static snd_pcm_uframes_t snd_es18xx_capture_pointer(snd_pcm_substream_t * substr ...@@ -824,7 +822,7 @@ static snd_pcm_uframes_t snd_es18xx_capture_pointer(snd_pcm_substream_t * substr
return pos >> chip->dma1_shift; return pos >> chip->dma1_shift;
} }
static snd_pcm_hardware_t snd_es18xx_playback = static struct snd_pcm_hardware snd_es18xx_playback =
{ {
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_RESUME | SNDRV_PCM_INFO_RESUME |
...@@ -844,7 +842,7 @@ static snd_pcm_hardware_t snd_es18xx_playback = ...@@ -844,7 +842,7 @@ static snd_pcm_hardware_t snd_es18xx_playback =
.fifo_size = 0, .fifo_size = 0,
}; };
static snd_pcm_hardware_t snd_es18xx_capture = static struct snd_pcm_hardware snd_es18xx_capture =
{ {
.info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_RESUME | SNDRV_PCM_INFO_RESUME |
...@@ -864,10 +862,10 @@ static snd_pcm_hardware_t snd_es18xx_capture = ...@@ -864,10 +862,10 @@ static snd_pcm_hardware_t snd_es18xx_capture =
.fifo_size = 0, .fifo_size = 0,
}; };
static int snd_es18xx_playback_open(snd_pcm_substream_t * substream) static int snd_es18xx_playback_open(struct snd_pcm_substream *substream)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
es18xx_t *chip = snd_pcm_substream_chip(substream); struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
if (substream->number == 0 && (chip->caps & ES18XX_PCM2)) { if (substream->number == 0 && (chip->caps & ES18XX_PCM2)) {
if ((chip->caps & ES18XX_DUPLEX_MONO) && if ((chip->caps & ES18XX_DUPLEX_MONO) &&
...@@ -889,10 +887,10 @@ static int snd_es18xx_playback_open(snd_pcm_substream_t * substream) ...@@ -889,10 +887,10 @@ static int snd_es18xx_playback_open(snd_pcm_substream_t * substream)
return 0; return 0;
} }
static int snd_es18xx_capture_open(snd_pcm_substream_t * substream) static int snd_es18xx_capture_open(struct snd_pcm_substream *substream)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
es18xx_t *chip = snd_pcm_substream_chip(substream); struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
if (chip->playback_b_substream) if (chip->playback_b_substream)
return -EAGAIN; return -EAGAIN;
...@@ -907,9 +905,9 @@ static int snd_es18xx_capture_open(snd_pcm_substream_t * substream) ...@@ -907,9 +905,9 @@ static int snd_es18xx_capture_open(snd_pcm_substream_t * substream)
return 0; return 0;
} }
static int snd_es18xx_playback_close(snd_pcm_substream_t * substream) static int snd_es18xx_playback_close(struct snd_pcm_substream *substream)
{ {
es18xx_t *chip = snd_pcm_substream_chip(substream); struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
if (substream->number == 0 && (chip->caps & ES18XX_PCM2)) if (substream->number == 0 && (chip->caps & ES18XX_PCM2))
chip->playback_a_substream = NULL; chip->playback_a_substream = NULL;
...@@ -920,9 +918,9 @@ static int snd_es18xx_playback_close(snd_pcm_substream_t * substream) ...@@ -920,9 +918,9 @@ static int snd_es18xx_playback_close(snd_pcm_substream_t * substream)
return 0; return 0;
} }
static int snd_es18xx_capture_close(snd_pcm_substream_t * substream) static int snd_es18xx_capture_close(struct snd_pcm_substream *substream)
{ {
es18xx_t *chip = snd_pcm_substream_chip(substream); struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
chip->capture_a_substream = NULL; chip->capture_a_substream = NULL;
snd_pcm_lib_free_pages(substream); snd_pcm_lib_free_pages(substream);
...@@ -933,7 +931,7 @@ static int snd_es18xx_capture_close(snd_pcm_substream_t * substream) ...@@ -933,7 +931,7 @@ static int snd_es18xx_capture_close(snd_pcm_substream_t * substream)
* MIXER part * MIXER part
*/ */
static int snd_es18xx_info_mux(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_es18xx_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[8] = { static char *texts[8] = {
"Mic", "Mic Master", "CD", "AOUT", "Mic", "Mic Master", "CD", "AOUT",
...@@ -949,16 +947,16 @@ static int snd_es18xx_info_mux(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * u ...@@ -949,16 +947,16 @@ static int snd_es18xx_info_mux(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * u
return 0; return 0;
} }
static int snd_es18xx_get_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_es18xx_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
es18xx_t *chip = snd_kcontrol_chip(kcontrol); struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
ucontrol->value.enumerated.item[0] = snd_es18xx_mixer_read(chip, 0x1c) & 0x07; ucontrol->value.enumerated.item[0] = snd_es18xx_mixer_read(chip, 0x1c) & 0x07;
return 0; return 0;
} }
static int snd_es18xx_put_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_es18xx_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
es18xx_t *chip = snd_kcontrol_chip(kcontrol); struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
unsigned char val = ucontrol->value.enumerated.item[0]; unsigned char val = ucontrol->value.enumerated.item[0];
if (val > 7) if (val > 7)
...@@ -966,7 +964,7 @@ static int snd_es18xx_put_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ...@@ -966,7 +964,7 @@ static int snd_es18xx_put_mux(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
return snd_es18xx_mixer_bits(chip, 0x1c, 0x07, val) != val; return snd_es18xx_mixer_bits(chip, 0x1c, 0x07, val) != val;
} }
static int snd_es18xx_info_spatializer_enable(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_es18xx_info_spatializer_enable(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;
...@@ -975,17 +973,17 @@ static int snd_es18xx_info_spatializer_enable(snd_kcontrol_t *kcontrol, snd_ctl_ ...@@ -975,17 +973,17 @@ static int snd_es18xx_info_spatializer_enable(snd_kcontrol_t *kcontrol, snd_ctl_
return 0; return 0;
} }
static int snd_es18xx_get_spatializer_enable(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_es18xx_get_spatializer_enable(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
es18xx_t *chip = snd_kcontrol_chip(kcontrol); struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
unsigned char val = snd_es18xx_mixer_read(chip, 0x50); unsigned char val = snd_es18xx_mixer_read(chip, 0x50);
ucontrol->value.integer.value[0] = !!(val & 8); ucontrol->value.integer.value[0] = !!(val & 8);
return 0; return 0;
} }
static int snd_es18xx_put_spatializer_enable(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_es18xx_put_spatializer_enable(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
es18xx_t *chip = snd_kcontrol_chip(kcontrol); struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
unsigned char oval, nval; unsigned char oval, nval;
int change; int change;
nval = ucontrol->value.integer.value[0] ? 0x0c : 0x04; nval = ucontrol->value.integer.value[0] ? 0x0c : 0x04;
...@@ -998,7 +996,7 @@ static int snd_es18xx_put_spatializer_enable(snd_kcontrol_t * kcontrol, snd_ctl_ ...@@ -998,7 +996,7 @@ static int snd_es18xx_put_spatializer_enable(snd_kcontrol_t * kcontrol, snd_ctl_
return change; return change;
} }
static int snd_es18xx_info_hw_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_es18xx_info_hw_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;
...@@ -1007,15 +1005,15 @@ static int snd_es18xx_info_hw_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_info ...@@ -1007,15 +1005,15 @@ static int snd_es18xx_info_hw_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_info
return 0; return 0;
} }
static int snd_es18xx_get_hw_volume(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_es18xx_get_hw_volume(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
es18xx_t *chip = snd_kcontrol_chip(kcontrol); struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
ucontrol->value.integer.value[0] = snd_es18xx_mixer_read(chip, 0x61) & 0x3f; ucontrol->value.integer.value[0] = snd_es18xx_mixer_read(chip, 0x61) & 0x3f;
ucontrol->value.integer.value[1] = snd_es18xx_mixer_read(chip, 0x63) & 0x3f; ucontrol->value.integer.value[1] = snd_es18xx_mixer_read(chip, 0x63) & 0x3f;
return 0; return 0;
} }
static int snd_es18xx_info_hw_switch(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_es18xx_info_hw_switch(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 = 2; uinfo->count = 2;
...@@ -1024,24 +1022,24 @@ static int snd_es18xx_info_hw_switch(snd_kcontrol_t *kcontrol, snd_ctl_elem_info ...@@ -1024,24 +1022,24 @@ static int snd_es18xx_info_hw_switch(snd_kcontrol_t *kcontrol, snd_ctl_elem_info
return 0; return 0;
} }
static int snd_es18xx_get_hw_switch(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_es18xx_get_hw_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
es18xx_t *chip = snd_kcontrol_chip(kcontrol); struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
ucontrol->value.integer.value[0] = !(snd_es18xx_mixer_read(chip, 0x61) & 0x40); ucontrol->value.integer.value[0] = !(snd_es18xx_mixer_read(chip, 0x61) & 0x40);
ucontrol->value.integer.value[1] = !(snd_es18xx_mixer_read(chip, 0x63) & 0x40); ucontrol->value.integer.value[1] = !(snd_es18xx_mixer_read(chip, 0x63) & 0x40);
return 0; return 0;
} }
static void snd_es18xx_hwv_free(snd_kcontrol_t *kcontrol) static void snd_es18xx_hwv_free(struct snd_kcontrol *kcontrol)
{ {
es18xx_t *chip = snd_kcontrol_chip(kcontrol); struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
chip->master_volume = NULL; chip->master_volume = NULL;
chip->master_switch = NULL; chip->master_switch = NULL;
chip->hw_volume = NULL; chip->hw_volume = NULL;
chip->hw_switch = NULL; chip->hw_switch = NULL;
} }
static int snd_es18xx_reg_bits(es18xx_t *chip, unsigned char reg, static int snd_es18xx_reg_bits(struct snd_es18xx *chip, unsigned char reg,
unsigned char mask, unsigned char val) unsigned char mask, unsigned char val)
{ {
if (reg < 0xa0) if (reg < 0xa0)
...@@ -1050,7 +1048,7 @@ static int snd_es18xx_reg_bits(es18xx_t *chip, unsigned char reg, ...@@ -1050,7 +1048,7 @@ static int snd_es18xx_reg_bits(es18xx_t *chip, unsigned char reg,
return snd_es18xx_bits(chip, reg, mask, val); return snd_es18xx_bits(chip, reg, mask, val);
} }
static int snd_es18xx_reg_read(es18xx_t *chip, unsigned char reg) static int snd_es18xx_reg_read(struct snd_es18xx *chip, unsigned char reg)
{ {
if (reg < 0xa0) if (reg < 0xa0)
return snd_es18xx_mixer_read(chip, reg); return snd_es18xx_mixer_read(chip, reg);
...@@ -1064,7 +1062,7 @@ static int snd_es18xx_reg_read(es18xx_t *chip, unsigned char reg) ...@@ -1064,7 +1062,7 @@ static int snd_es18xx_reg_read(es18xx_t *chip, unsigned char reg)
.get = snd_es18xx_get_single, .put = snd_es18xx_put_single, \ .get = snd_es18xx_get_single, .put = snd_es18xx_put_single, \
.private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) } .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
static int snd_es18xx_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_es18xx_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
int mask = (kcontrol->private_value >> 16) & 0xff; int mask = (kcontrol->private_value >> 16) & 0xff;
...@@ -1075,9 +1073,9 @@ static int snd_es18xx_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t ...@@ -1075,9 +1073,9 @@ static int snd_es18xx_info_single(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t
return 0; return 0;
} }
static int snd_es18xx_get_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_es18xx_get_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
es18xx_t *chip = snd_kcontrol_chip(kcontrol); struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
int reg = kcontrol->private_value & 0xff; int reg = kcontrol->private_value & 0xff;
int shift = (kcontrol->private_value >> 8) & 0xff; int shift = (kcontrol->private_value >> 8) & 0xff;
int mask = (kcontrol->private_value >> 16) & 0xff; int mask = (kcontrol->private_value >> 16) & 0xff;
...@@ -1091,9 +1089,9 @@ static int snd_es18xx_get_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t ...@@ -1091,9 +1089,9 @@ static int snd_es18xx_get_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
return 0; return 0;
} }
static int snd_es18xx_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_es18xx_put_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
es18xx_t *chip = snd_kcontrol_chip(kcontrol); struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
int reg = kcontrol->private_value & 0xff; int reg = kcontrol->private_value & 0xff;
int shift = (kcontrol->private_value >> 8) & 0xff; int shift = (kcontrol->private_value >> 8) & 0xff;
int mask = (kcontrol->private_value >> 16) & 0xff; int mask = (kcontrol->private_value >> 16) & 0xff;
...@@ -1114,7 +1112,7 @@ static int snd_es18xx_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t ...@@ -1114,7 +1112,7 @@ static int snd_es18xx_put_single(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
.get = snd_es18xx_get_double, .put = snd_es18xx_put_double, \ .get = snd_es18xx_get_double, .put = snd_es18xx_put_double, \
.private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) } .private_value = left_reg | (right_reg << 8) | (shift_left << 16) | (shift_right << 19) | (mask << 24) | (invert << 22) }
static int snd_es18xx_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_es18xx_info_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
int mask = (kcontrol->private_value >> 24) & 0xff; int mask = (kcontrol->private_value >> 24) & 0xff;
...@@ -1125,9 +1123,9 @@ static int snd_es18xx_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t ...@@ -1125,9 +1123,9 @@ static int snd_es18xx_info_double(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t
return 0; return 0;
} }
static int snd_es18xx_get_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_es18xx_get_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
es18xx_t *chip = snd_kcontrol_chip(kcontrol); struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
int left_reg = kcontrol->private_value & 0xff; int left_reg = kcontrol->private_value & 0xff;
int right_reg = (kcontrol->private_value >> 8) & 0xff; int right_reg = (kcontrol->private_value >> 8) & 0xff;
int shift_left = (kcontrol->private_value >> 16) & 0x07; int shift_left = (kcontrol->private_value >> 16) & 0x07;
...@@ -1150,9 +1148,9 @@ static int snd_es18xx_get_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t ...@@ -1150,9 +1148,9 @@ static int snd_es18xx_get_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
return 0; return 0;
} }
static int snd_es18xx_put_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_es18xx_put_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
es18xx_t *chip = snd_kcontrol_chip(kcontrol); struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
int left_reg = kcontrol->private_value & 0xff; int left_reg = kcontrol->private_value & 0xff;
int right_reg = (kcontrol->private_value >> 8) & 0xff; int right_reg = (kcontrol->private_value >> 8) & 0xff;
int shift_left = (kcontrol->private_value >> 16) & 0x07; int shift_left = (kcontrol->private_value >> 16) & 0x07;
...@@ -1185,7 +1183,7 @@ static int snd_es18xx_put_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t ...@@ -1185,7 +1183,7 @@ static int snd_es18xx_put_double(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
return change; return change;
} }
static snd_kcontrol_new_t snd_es18xx_base_controls[] = { static struct snd_kcontrol_new snd_es18xx_base_controls[] = {
ES18XX_DOUBLE("Master Playback Volume", 0, 0x60, 0x62, 0, 0, 63, 0), ES18XX_DOUBLE("Master Playback Volume", 0, 0x60, 0x62, 0, 0, 63, 0),
ES18XX_DOUBLE("Master Playback Switch", 0, 0x60, 0x62, 6, 6, 1, 1), ES18XX_DOUBLE("Master Playback Switch", 0, 0x60, 0x62, 6, 6, 1, 1),
ES18XX_DOUBLE("Line Playback Volume", 0, 0x3e, 0x3e, 4, 0, 15, 0), ES18XX_DOUBLE("Line Playback Volume", 0, 0x3e, 0x3e, 4, 0, 15, 0),
...@@ -1207,10 +1205,10 @@ ES18XX_SINGLE("Capture Switch", 0, 0x1c, 4, 1, 1), ...@@ -1207,10 +1205,10 @@ ES18XX_SINGLE("Capture Switch", 0, 0x1c, 4, 1, 1),
} }
}; };
static snd_kcontrol_new_t snd_es18xx_mono_in_control = static struct snd_kcontrol_new snd_es18xx_mono_in_control =
ES18XX_DOUBLE("Mono Input Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0); ES18XX_DOUBLE("Mono Input Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0);
static snd_kcontrol_new_t snd_es18xx_recmix_controls[] = { static struct snd_kcontrol_new snd_es18xx_recmix_controls[] = {
ES18XX_DOUBLE("PCM Capture Volume", 0, 0x69, 0x69, 4, 0, 15, 0), ES18XX_DOUBLE("PCM Capture Volume", 0, 0x69, 0x69, 4, 0, 15, 0),
ES18XX_DOUBLE("Mic Capture Volume", 0, 0x68, 0x68, 4, 0, 15, 0), ES18XX_DOUBLE("Mic Capture Volume", 0, 0x68, 0x68, 4, 0, 15, 0),
ES18XX_DOUBLE("Line Capture Volume", 0, 0x6e, 0x6e, 4, 0, 15, 0), ES18XX_DOUBLE("Line Capture Volume", 0, 0x6e, 0x6e, 4, 0, 15, 0),
...@@ -1220,16 +1218,16 @@ ES18XX_DOUBLE("CD Capture Volume", 0, 0x6a, 0x6a, 4, 0, 15, 0), ...@@ -1220,16 +1218,16 @@ ES18XX_DOUBLE("CD Capture Volume", 0, 0x6a, 0x6a, 4, 0, 15, 0),
ES18XX_DOUBLE("Aux Capture Volume", 0, 0x6c, 0x6c, 4, 0, 15, 0) ES18XX_DOUBLE("Aux Capture Volume", 0, 0x6c, 0x6c, 4, 0, 15, 0)
}; };
static snd_kcontrol_new_t snd_es18xx_pcm1_controls[] = { static struct snd_kcontrol_new snd_es18xx_pcm1_controls[] = {
ES18XX_DOUBLE("PCM Playback Volume", 0, 0x14, 0x14, 4, 0, 15, 0), ES18XX_DOUBLE("PCM Playback Volume", 0, 0x14, 0x14, 4, 0, 15, 0),
}; };
static snd_kcontrol_new_t snd_es18xx_pcm2_controls[] = { static struct snd_kcontrol_new snd_es18xx_pcm2_controls[] = {
ES18XX_DOUBLE("PCM Playback Volume", 0, 0x7c, 0x7c, 4, 0, 15, 0), ES18XX_DOUBLE("PCM Playback Volume", 0, 0x7c, 0x7c, 4, 0, 15, 0),
ES18XX_DOUBLE("PCM Playback Volume", 1, 0x14, 0x14, 4, 0, 15, 0) ES18XX_DOUBLE("PCM Playback Volume", 1, 0x14, 0x14, 4, 0, 15, 0)
}; };
static snd_kcontrol_new_t snd_es18xx_spatializer_controls[] = { static struct snd_kcontrol_new snd_es18xx_spatializer_controls[] = {
ES18XX_SINGLE("3D Control - Level", 0, 0x52, 0, 63, 0), ES18XX_SINGLE("3D Control - Level", 0, 0x52, 0, 63, 0),
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
...@@ -1240,13 +1238,13 @@ ES18XX_SINGLE("3D Control - Level", 0, 0x52, 0, 63, 0), ...@@ -1240,13 +1238,13 @@ ES18XX_SINGLE("3D Control - Level", 0, 0x52, 0, 63, 0),
} }
}; };
static snd_kcontrol_new_t snd_es18xx_micpre1_control = static struct snd_kcontrol_new snd_es18xx_micpre1_control =
ES18XX_SINGLE("Mic Boost (+26dB)", 0, 0xa9, 2, 1, 0); ES18XX_SINGLE("Mic Boost (+26dB)", 0, 0xa9, 2, 1, 0);
static snd_kcontrol_new_t snd_es18xx_micpre2_control = static struct snd_kcontrol_new snd_es18xx_micpre2_control =
ES18XX_SINGLE("Mic Boost (+26dB)", 0, 0x7d, 3, 1, 0); ES18XX_SINGLE("Mic Boost (+26dB)", 0, 0x7d, 3, 1, 0);
static snd_kcontrol_new_t snd_es18xx_hw_volume_controls[] = { static struct snd_kcontrol_new snd_es18xx_hw_volume_controls[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Hardware Master Playback Volume", .name = "Hardware Master Playback Volume",
...@@ -1265,7 +1263,7 @@ ES18XX_SINGLE("Hardware Master Volume Split", 0, 0x64, 7, 1, 0), ...@@ -1265,7 +1263,7 @@ ES18XX_SINGLE("Hardware Master Volume Split", 0, 0x64, 7, 1, 0),
}; };
#if 0 #if 0
static int __devinit snd_es18xx_config_read(es18xx_t *chip, unsigned char reg) static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned char reg)
{ {
int data; int data;
unsigned long flags; unsigned long flags;
...@@ -1277,7 +1275,7 @@ static int __devinit snd_es18xx_config_read(es18xx_t *chip, unsigned char reg) ...@@ -1277,7 +1275,7 @@ static int __devinit snd_es18xx_config_read(es18xx_t *chip, unsigned char reg)
} }
#endif #endif
static void __devinit snd_es18xx_config_write(es18xx_t *chip, static void __devinit snd_es18xx_config_write(struct snd_es18xx *chip,
unsigned char reg, unsigned char data) unsigned char reg, unsigned char data)
{ {
/* No need for spinlocks, this function is used only in /* No need for spinlocks, this function is used only in
...@@ -1289,7 +1287,7 @@ static void __devinit snd_es18xx_config_write(es18xx_t *chip, ...@@ -1289,7 +1287,7 @@ static void __devinit snd_es18xx_config_write(es18xx_t *chip,
#endif #endif
} }
static int __devinit snd_es18xx_initialize(es18xx_t *chip) static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip)
{ {
int mask = 0; int mask = 0;
...@@ -1438,7 +1436,7 @@ static int __devinit snd_es18xx_initialize(es18xx_t *chip) ...@@ -1438,7 +1436,7 @@ static int __devinit snd_es18xx_initialize(es18xx_t *chip)
return 0; return 0;
} }
static int __devinit snd_es18xx_identify(es18xx_t *chip) static int __devinit snd_es18xx_identify(struct snd_es18xx *chip)
{ {
int hi,lo; int hi,lo;
...@@ -1504,7 +1502,7 @@ static int __devinit snd_es18xx_identify(es18xx_t *chip) ...@@ -1504,7 +1502,7 @@ static int __devinit snd_es18xx_identify(es18xx_t *chip)
return 0; return 0;
} }
static int __devinit snd_es18xx_probe(es18xx_t *chip) static int __devinit snd_es18xx_probe(struct snd_es18xx *chip)
{ {
if (snd_es18xx_identify(chip) < 0) { if (snd_es18xx_identify(chip) < 0) {
snd_printk(KERN_ERR PFX "[0x%lx] ESS chip not found\n", chip->port); snd_printk(KERN_ERR PFX "[0x%lx] ESS chip not found\n", chip->port);
...@@ -1544,7 +1542,7 @@ static int __devinit snd_es18xx_probe(es18xx_t *chip) ...@@ -1544,7 +1542,7 @@ static int __devinit snd_es18xx_probe(es18xx_t *chip)
return snd_es18xx_initialize(chip); return snd_es18xx_initialize(chip);
} }
static snd_pcm_ops_t snd_es18xx_playback_ops = { static struct snd_pcm_ops snd_es18xx_playback_ops = {
.open = snd_es18xx_playback_open, .open = snd_es18xx_playback_open,
.close = snd_es18xx_playback_close, .close = snd_es18xx_playback_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
...@@ -1555,7 +1553,7 @@ static snd_pcm_ops_t snd_es18xx_playback_ops = { ...@@ -1555,7 +1553,7 @@ static snd_pcm_ops_t snd_es18xx_playback_ops = {
.pointer = snd_es18xx_playback_pointer, .pointer = snd_es18xx_playback_pointer,
}; };
static snd_pcm_ops_t snd_es18xx_capture_ops = { static struct snd_pcm_ops snd_es18xx_capture_ops = {
.open = snd_es18xx_capture_open, .open = snd_es18xx_capture_open,
.close = snd_es18xx_capture_close, .close = snd_es18xx_capture_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
...@@ -1566,9 +1564,9 @@ static snd_pcm_ops_t snd_es18xx_capture_ops = { ...@@ -1566,9 +1564,9 @@ static snd_pcm_ops_t snd_es18xx_capture_ops = {
.pointer = snd_es18xx_capture_pointer, .pointer = snd_es18xx_capture_pointer,
}; };
static int __devinit snd_es18xx_pcm(es18xx_t *chip, int device, snd_pcm_t ** rpcm) static int __devinit snd_es18xx_pcm(struct snd_es18xx *chip, int device, struct snd_pcm ** rpcm)
{ {
snd_pcm_t *pcm; struct snd_pcm *pcm;
char str[16]; char str[16];
int err; int err;
...@@ -1608,9 +1606,9 @@ static int __devinit snd_es18xx_pcm(es18xx_t *chip, int device, snd_pcm_t ** rpc ...@@ -1608,9 +1606,9 @@ static int __devinit snd_es18xx_pcm(es18xx_t *chip, int device, snd_pcm_t ** rpc
/* Power Management support functions */ /* Power Management support functions */
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int snd_es18xx_suspend(snd_card_t *card, pm_message_t state) static int snd_es18xx_suspend(struct snd_card *card, pm_message_t state)
{ {
es18xx_t *chip = card->pm_private_data; struct snd_es18xx *chip = card->pm_private_data;
snd_pcm_suspend_all(chip->pcm); snd_pcm_suspend_all(chip->pcm);
...@@ -1623,9 +1621,9 @@ static int snd_es18xx_suspend(snd_card_t *card, pm_message_t state) ...@@ -1623,9 +1621,9 @@ static int snd_es18xx_suspend(snd_card_t *card, pm_message_t state)
return 0; return 0;
} }
static int snd_es18xx_resume(snd_card_t *card) static int snd_es18xx_resume(struct snd_card *card)
{ {
es18xx_t *chip = card->pm_private_data; struct snd_es18xx *chip = card->pm_private_data;
/* restore PM register, we won't wake till (not 0x07) i/o activity though */ /* restore PM register, we won't wake till (not 0x07) i/o activity though */
snd_es18xx_write(chip, ES18XX_PM, chip->pm_reg ^= ES18XX_PM_FM); snd_es18xx_write(chip, ES18XX_PM, chip->pm_reg ^= ES18XX_PM_FM);
...@@ -1634,7 +1632,7 @@ static int snd_es18xx_resume(snd_card_t *card) ...@@ -1634,7 +1632,7 @@ static int snd_es18xx_resume(snd_card_t *card)
} }
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
static int snd_es18xx_free(es18xx_t *chip) static int snd_es18xx_free(struct snd_es18xx *chip)
{ {
release_and_free_resource(chip->res_port); release_and_free_resource(chip->res_port);
release_and_free_resource(chip->res_ctrl_port); release_and_free_resource(chip->res_ctrl_port);
...@@ -1653,21 +1651,21 @@ static int snd_es18xx_free(es18xx_t *chip) ...@@ -1653,21 +1651,21 @@ static int snd_es18xx_free(es18xx_t *chip)
return 0; return 0;
} }
static int snd_es18xx_dev_free(snd_device_t *device) static int snd_es18xx_dev_free(struct snd_device *device)
{ {
es18xx_t *chip = device->device_data; struct snd_es18xx *chip = device->device_data;
return snd_es18xx_free(chip); return snd_es18xx_free(chip);
} }
static int __devinit snd_es18xx_new_device(snd_card_t * card, static int __devinit snd_es18xx_new_device(struct snd_card *card,
unsigned long port, unsigned long port,
unsigned long mpu_port, unsigned long mpu_port,
unsigned long fm_port, unsigned long fm_port,
int irq, int dma1, int dma2, int irq, int dma1, int dma2,
es18xx_t ** rchip) struct snd_es18xx ** rchip)
{ {
es18xx_t *chip; struct snd_es18xx *chip;
static snd_device_ops_t ops = { static struct snd_device_ops ops = {
.dev_free = snd_es18xx_dev_free, .dev_free = snd_es18xx_dev_free,
}; };
int err; int err;
...@@ -1728,9 +1726,9 @@ static int __devinit snd_es18xx_new_device(snd_card_t * card, ...@@ -1728,9 +1726,9 @@ static int __devinit snd_es18xx_new_device(snd_card_t * card,
return 0; return 0;
} }
static int __devinit snd_es18xx_mixer(es18xx_t *chip) static int __devinit snd_es18xx_mixer(struct snd_es18xx *chip)
{ {
snd_card_t *card; struct snd_card *card;
int err; int err;
unsigned int idx; unsigned int idx;
...@@ -1739,7 +1737,7 @@ static int __devinit snd_es18xx_mixer(es18xx_t *chip) ...@@ -1739,7 +1737,7 @@ static int __devinit snd_es18xx_mixer(es18xx_t *chip)
strcpy(card->mixername, chip->pcm->name); strcpy(card->mixername, chip->pcm->name);
for (idx = 0; idx < ARRAY_SIZE(snd_es18xx_base_controls); idx++) { for (idx = 0; idx < ARRAY_SIZE(snd_es18xx_base_controls); idx++) {
snd_kcontrol_t *kctl; struct snd_kcontrol *kctl;
kctl = snd_ctl_new1(&snd_es18xx_base_controls[idx], chip); kctl = snd_ctl_new1(&snd_es18xx_base_controls[idx], chip);
if (chip->caps & ES18XX_HWV) { if (chip->caps & ES18XX_HWV) {
switch (idx) { switch (idx) {
...@@ -1797,7 +1795,7 @@ static int __devinit snd_es18xx_mixer(es18xx_t *chip) ...@@ -1797,7 +1795,7 @@ static int __devinit snd_es18xx_mixer(es18xx_t *chip)
} }
if (chip->caps & ES18XX_HWV) { if (chip->caps & ES18XX_HWV) {
for (idx = 0; idx < ARRAY_SIZE(snd_es18xx_hw_volume_controls); idx++) { for (idx = 0; idx < ARRAY_SIZE(snd_es18xx_hw_volume_controls); idx++) {
snd_kcontrol_t *kctl; struct snd_kcontrol *kctl;
kctl = snd_ctl_new1(&snd_es18xx_hw_volume_controls[idx], chip); kctl = snd_ctl_new1(&snd_es18xx_hw_volume_controls[idx], chip);
if (idx == 0) if (idx == 0)
chip->hw_volume = kctl; chip->hw_volume = kctl;
...@@ -1874,7 +1872,7 @@ struct snd_audiodrive { ...@@ -1874,7 +1872,7 @@ struct snd_audiodrive {
#endif #endif
}; };
static snd_card_t *snd_audiodrive_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; static struct snd_card *snd_audiodrive_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
...@@ -1987,10 +1985,10 @@ static int __devinit snd_audiodrive_probe(int dev, struct pnp_card_link *pcard, ...@@ -1987,10 +1985,10 @@ static int __devinit snd_audiodrive_probe(int dev, struct pnp_card_link *pcard,
static int possible_irqs[] = {5, 9, 10, 7, 11, 12, -1}; static int possible_irqs[] = {5, 9, 10, 7, 11, 12, -1};
static int possible_dmas[] = {1, 0, 3, 5, -1}; static int possible_dmas[] = {1, 0, 3, 5, -1};
int xirq, xdma1, xdma2; int xirq, xdma1, xdma2;
snd_card_t *card; struct snd_card *card;
struct snd_audiodrive *acard; struct snd_audiodrive *acard;
es18xx_t *chip; struct snd_es18xx *chip;
opl3_t *opl3; struct snd_opl3 *opl3;
int err; int err;
card = snd_card_new(index[dev], id[dev], THIS_MODULE, card = snd_card_new(index[dev], id[dev], THIS_MODULE,
...@@ -2139,7 +2137,7 @@ static int __devinit snd_audiodrive_pnp_detect(struct pnp_card_link *card, ...@@ -2139,7 +2137,7 @@ static int __devinit snd_audiodrive_pnp_detect(struct pnp_card_link *card,
static void __devexit snd_audiodrive_pnp_remove(struct pnp_card_link * pcard) static void __devexit snd_audiodrive_pnp_remove(struct pnp_card_link * pcard)
{ {
snd_card_t *card = (snd_card_t *) pnp_get_card_drvdata(pcard); struct snd_card *card = (struct snd_card *) pnp_get_card_drvdata(pcard);
snd_card_disconnect(card); snd_card_disconnect(card);
snd_card_free_in_thread(card); snd_card_free_in_thread(card);
......
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