hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ALSA] Remove xxx_t typedefs: PCI emu10k1x 

Modules: EMU10K1/EMU10K2 driver

Remove xxx_t typedefs from the PCI emu10k1x driver.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2005-11-17 14:50:31 +01:00 committed by Jaroslav Kysela
parent eb4698f347
commit 4b32f1aae2
1 changed files with 168 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

337
sound/pci/emu10k1/emu10k1x.c
View File

@ -195,30 +195,26 @@ MODULE_PARM_DESC(enable, "Enable the EMU10K1X soundcard.");
* playback. * playback.
*/ */
typedef struct snd_emu10k1x_voice emu10k1x_voice_t; struct emu10k1x_voice {
typedef struct snd_emu10k1x emu10k1x_t; struct emu10k1x *emu;
typedef struct snd_emu10k1x_pcm emu10k1x_pcm_t;
struct snd_emu10k1x_voice {
emu10k1x_t *emu;
int number; int number;
int use; int use;
emu10k1x_pcm_t *epcm; struct emu10k1x_pcm *epcm;
}; };
struct snd_emu10k1x_pcm { struct emu10k1x_pcm {
emu10k1x_t *emu; struct emu10k1x *emu;
snd_pcm_substream_t *substream; struct snd_pcm_substream *substream;
emu10k1x_voice_t *voice; struct emu10k1x_voice *voice;
unsigned short running; unsigned short running;
}; };
typedef struct { struct emu10k1x_midi {
struct snd_emu10k1x *emu; struct emu10k1x *emu;
snd_rawmidi_t *rmidi; struct snd_rawmidi *rmidi;
snd_rawmidi_substream_t *substream_input; struct snd_rawmidi_substream *substream_input;
snd_rawmidi_substream_t *substream_output; struct snd_rawmidi_substream *substream_output;
unsigned int midi_mode; unsigned int midi_mode;
spinlock_t input_lock; spinlock_t input_lock;
spinlock_t output_lock; spinlock_t output_lock;
@ -226,12 +222,12 @@ typedef struct {
int tx_enable, rx_enable; int tx_enable, rx_enable;
int port; int port;
int ipr_tx, ipr_rx; int ipr_tx, ipr_rx;
void (*interrupt)(emu10k1x_t *emu, unsigned int status); void (*interrupt)(struct emu10k1x *emu, unsigned int status);
} emu10k1x_midi_t; };
// definition of the chip-specific record // definition of the chip-specific record
struct snd_emu10k1x { struct emu10k1x {
snd_card_t *card; struct snd_card *card;
struct pci_dev *pci; struct pci_dev *pci;
unsigned long port; unsigned long port;
@ -245,20 +241,20 @@ struct snd_emu10k1x {
spinlock_t emu_lock; spinlock_t emu_lock;
spinlock_t voice_lock; spinlock_t voice_lock;
ac97_t *ac97; struct snd_ac97 *ac97;
snd_pcm_t *pcm; struct snd_pcm *pcm;
emu10k1x_voice_t voices[3]; struct emu10k1x_voice voices[3];
emu10k1x_voice_t capture_voice; struct emu10k1x_voice capture_voice;
u32 spdif_bits[3]; // SPDIF out setup u32 spdif_bits[3]; // SPDIF out setup
struct snd_dma_buffer dma_buffer; struct snd_dma_buffer dma_buffer;
emu10k1x_midi_t midi; struct emu10k1x_midi midi;
}; };
/* hardware definition */ /* hardware definition */
static snd_pcm_hardware_t snd_emu10k1x_playback_hw = { static struct snd_pcm_hardware snd_emu10k1x_playback_hw = {
.info = (SNDRV_PCM_INFO_MMAP | .info = (SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_BLOCK_TRANSFER |
@ -277,7 +273,7 @@ static snd_pcm_hardware_t snd_emu10k1x_playback_hw = {
.fifo_size = 0, .fifo_size = 0,
}; };
static snd_pcm_hardware_t snd_emu10k1x_capture_hw = { static struct snd_pcm_hardware snd_emu10k1x_capture_hw = {
.info = (SNDRV_PCM_INFO_MMAP | .info = (SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_INTERLEAVED |
SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_BLOCK_TRANSFER |
@ -296,7 +292,7 @@ static snd_pcm_hardware_t snd_emu10k1x_capture_hw = {
.fifo_size = 0, .fifo_size = 0,
}; };
static unsigned int snd_emu10k1x_ptr_read(emu10k1x_t * emu, static unsigned int snd_emu10k1x_ptr_read(struct emu10k1x * emu,
unsigned int reg, unsigned int reg,
unsigned int chn) unsigned int chn)
{ {
@ -312,7 +308,7 @@ static unsigned int snd_emu10k1x_ptr_read(emu10k1x_t * emu,
return val; return val;
} }
static void snd_emu10k1x_ptr_write(emu10k1x_t *emu, static void snd_emu10k1x_ptr_write(struct emu10k1x *emu,
unsigned int reg, unsigned int reg,
unsigned int chn, unsigned int chn,
unsigned int data) unsigned int data)
@ -328,7 +324,7 @@ static void snd_emu10k1x_ptr_write(emu10k1x_t *emu,
spin_unlock_irqrestore(&emu->emu_lock, flags); spin_unlock_irqrestore(&emu->emu_lock, flags);
} }
static void snd_emu10k1x_intr_enable(emu10k1x_t *emu, unsigned int intrenb) static void snd_emu10k1x_intr_enable(struct emu10k1x *emu, unsigned int intrenb)
{ {
unsigned long flags; unsigned long flags;
unsigned int enable; unsigned int enable;
@ -339,7 +335,7 @@ static void snd_emu10k1x_intr_enable(emu10k1x_t *emu, unsigned int intrenb)
spin_unlock_irqrestore(&emu->emu_lock, flags); spin_unlock_irqrestore(&emu->emu_lock, flags);
} }
static void snd_emu10k1x_intr_disable(emu10k1x_t *emu, unsigned int intrenb) static void snd_emu10k1x_intr_disable(struct emu10k1x *emu, unsigned int intrenb)
{ {
unsigned long flags; unsigned long flags;
unsigned int enable; unsigned int enable;
@ -350,7 +346,7 @@ static void snd_emu10k1x_intr_disable(emu10k1x_t *emu, unsigned int intrenb)
spin_unlock_irqrestore(&emu->emu_lock, flags); spin_unlock_irqrestore(&emu->emu_lock, flags);
} }
static void snd_emu10k1x_gpio_write(emu10k1x_t *emu, unsigned int value) static void snd_emu10k1x_gpio_write(struct emu10k1x *emu, unsigned int value)
{ {
unsigned long flags; unsigned long flags;
@ -359,14 +355,14 @@ static void snd_emu10k1x_gpio_write(emu10k1x_t *emu, unsigned int value)
spin_unlock_irqrestore(&emu->emu_lock, flags); spin_unlock_irqrestore(&emu->emu_lock, flags);
} }
static void snd_emu10k1x_pcm_free_substream(snd_pcm_runtime_t *runtime) static void snd_emu10k1x_pcm_free_substream(struct snd_pcm_runtime *runtime)
{ {
kfree(runtime->private_data); kfree(runtime->private_data);
} }
static void snd_emu10k1x_pcm_interrupt(emu10k1x_t *emu, emu10k1x_voice_t *voice) static void snd_emu10k1x_pcm_interrupt(struct emu10k1x *emu, struct emu10k1x_voice *voice)
{ {
emu10k1x_pcm_t *epcm; struct emu10k1x_pcm *epcm;
if ((epcm = voice->epcm) == NULL) if ((epcm = voice->epcm) == NULL)
return; return;
@ -382,11 +378,11 @@ static void snd_emu10k1x_pcm_interrupt(emu10k1x_t *emu, emu10k1x_voice_t *voice)
} }
/* open callback */ /* open callback */
static int snd_emu10k1x_playback_open(snd_pcm_substream_t *substream) static int snd_emu10k1x_playback_open(struct snd_pcm_substream *substream)
{ {
emu10k1x_t *chip = snd_pcm_substream_chip(substream); struct emu10k1x *chip = snd_pcm_substream_chip(substream);
emu10k1x_pcm_t *epcm; struct emu10k1x_pcm *epcm;
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
int err; int err;
if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0) { if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0) {
@ -410,17 +406,17 @@ static int snd_emu10k1x_playback_open(snd_pcm_substream_t *substream)
} }
/* close callback */ /* close callback */
static int snd_emu10k1x_playback_close(snd_pcm_substream_t *substream) static int snd_emu10k1x_playback_close(struct snd_pcm_substream *substream)
{ {
return 0; return 0;
} }
/* hw_params callback */ /* hw_params callback */
static int snd_emu10k1x_pcm_hw_params(snd_pcm_substream_t *substream, static int snd_emu10k1x_pcm_hw_params(struct snd_pcm_substream *substream,
snd_pcm_hw_params_t * hw_params) struct snd_pcm_hw_params *hw_params)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
emu10k1x_pcm_t *epcm = runtime->private_data; struct emu10k1x_pcm *epcm = runtime->private_data;
if (! epcm->voice) { if (! epcm->voice) {
epcm->voice = &epcm->emu->voices[substream->pcm->device]; epcm->voice = &epcm->emu->voices[substream->pcm->device];
@ -433,10 +429,10 @@ static int snd_emu10k1x_pcm_hw_params(snd_pcm_substream_t *substream,
} }
/* hw_free callback */ /* hw_free callback */
static int snd_emu10k1x_pcm_hw_free(snd_pcm_substream_t *substream) static int snd_emu10k1x_pcm_hw_free(struct snd_pcm_substream *substream)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
emu10k1x_pcm_t *epcm; struct emu10k1x_pcm *epcm;
if (runtime->private_data == NULL) if (runtime->private_data == NULL)
return 0; return 0;
@ -453,11 +449,11 @@ static int snd_emu10k1x_pcm_hw_free(snd_pcm_substream_t *substream)
} }
/* prepare callback */ /* prepare callback */
static int snd_emu10k1x_pcm_prepare(snd_pcm_substream_t *substream) static int snd_emu10k1x_pcm_prepare(struct snd_pcm_substream *substream)
{ {
emu10k1x_t *emu = snd_pcm_substream_chip(substream); struct emu10k1x *emu = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
emu10k1x_pcm_t *epcm = runtime->private_data; struct emu10k1x_pcm *epcm = runtime->private_data;
int voice = epcm->voice->number; int voice = epcm->voice->number;
u32 *table_base = (u32 *)(emu->dma_buffer.area+1024*voice); u32 *table_base = (u32 *)(emu->dma_buffer.area+1024*voice);
u32 period_size_bytes = frames_to_bytes(runtime, runtime->period_size); u32 period_size_bytes = frames_to_bytes(runtime, runtime->period_size);
@ -482,12 +478,12 @@ static int snd_emu10k1x_pcm_prepare(snd_pcm_substream_t *substream)
} }
/* trigger callback */ /* trigger callback */
static int snd_emu10k1x_pcm_trigger(snd_pcm_substream_t *substream, static int snd_emu10k1x_pcm_trigger(struct snd_pcm_substream *substream,
int cmd) int cmd)
{ {
emu10k1x_t *emu = snd_pcm_substream_chip(substream); struct emu10k1x *emu = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
emu10k1x_pcm_t *epcm = runtime->private_data; struct emu10k1x_pcm *epcm = runtime->private_data;
int channel = epcm->voice->number; int channel = epcm->voice->number;
int result = 0; int result = 0;
@ -516,11 +512,11 @@ static int snd_emu10k1x_pcm_trigger(snd_pcm_substream_t *substream,
/* pointer callback */ /* pointer callback */
static snd_pcm_uframes_t static snd_pcm_uframes_t
snd_emu10k1x_pcm_pointer(snd_pcm_substream_t *substream) snd_emu10k1x_pcm_pointer(struct snd_pcm_substream *substream)
{ {
emu10k1x_t *emu = snd_pcm_substream_chip(substream); struct emu10k1x *emu = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
emu10k1x_pcm_t *epcm = runtime->private_data; struct emu10k1x_pcm *epcm = runtime->private_data;
int channel = epcm->voice->number; int channel = epcm->voice->number;
snd_pcm_uframes_t ptr = 0, ptr1 = 0, ptr2= 0,ptr3 = 0,ptr4 = 0; snd_pcm_uframes_t ptr = 0, ptr1 = 0, ptr2= 0,ptr3 = 0,ptr4 = 0;
@ -547,7 +543,7 @@ snd_emu10k1x_pcm_pointer(snd_pcm_substream_t *substream)
} }
/* operators */ /* operators */
static snd_pcm_ops_t snd_emu10k1x_playback_ops = { static struct snd_pcm_ops snd_emu10k1x_playback_ops = {
.open = snd_emu10k1x_playback_open, .open = snd_emu10k1x_playback_open,
.close = snd_emu10k1x_playback_close, .close = snd_emu10k1x_playback_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
@ -559,11 +555,11 @@ static snd_pcm_ops_t snd_emu10k1x_playback_ops = {
}; };
/* open_capture callback */ /* open_capture callback */
static int snd_emu10k1x_pcm_open_capture(snd_pcm_substream_t *substream) static int snd_emu10k1x_pcm_open_capture(struct snd_pcm_substream *substream)
{ {
emu10k1x_t *chip = snd_pcm_substream_chip(substream); struct emu10k1x *chip = snd_pcm_substream_chip(substream);
emu10k1x_pcm_t *epcm; struct emu10k1x_pcm *epcm;
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
int err; int err;
if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0) if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
@ -587,17 +583,17 @@ static int snd_emu10k1x_pcm_open_capture(snd_pcm_substream_t *substream)
} }
/* close callback */ /* close callback */
static int snd_emu10k1x_pcm_close_capture(snd_pcm_substream_t *substream) static int snd_emu10k1x_pcm_close_capture(struct snd_pcm_substream *substream)
{ {
return 0; return 0;
} }
/* hw_params callback */ /* hw_params callback */
static int snd_emu10k1x_pcm_hw_params_capture(snd_pcm_substream_t *substream, static int snd_emu10k1x_pcm_hw_params_capture(struct snd_pcm_substream *substream,
snd_pcm_hw_params_t * hw_params) struct snd_pcm_hw_params *hw_params)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
emu10k1x_pcm_t *epcm = runtime->private_data; struct emu10k1x_pcm *epcm = runtime->private_data;
if (! epcm->voice) { if (! epcm->voice) {
if (epcm->emu->capture_voice.use) if (epcm->emu->capture_voice.use)
@ -612,11 +608,11 @@ static int snd_emu10k1x_pcm_hw_params_capture(snd_pcm_substream_t *substream,
} }
/* hw_free callback */ /* hw_free callback */
static int snd_emu10k1x_pcm_hw_free_capture(snd_pcm_substream_t *substream) static int snd_emu10k1x_pcm_hw_free_capture(struct snd_pcm_substream *substream)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
emu10k1x_pcm_t *epcm; struct emu10k1x_pcm *epcm;
if (runtime->private_data == NULL) if (runtime->private_data == NULL)
return 0; return 0;
@ -632,10 +628,10 @@ static int snd_emu10k1x_pcm_hw_free_capture(snd_pcm_substream_t *substream)
} }
/* prepare capture callback */ /* prepare capture callback */
static int snd_emu10k1x_pcm_prepare_capture(snd_pcm_substream_t *substream) static int snd_emu10k1x_pcm_prepare_capture(struct snd_pcm_substream *substream)
{ {
emu10k1x_t *emu = snd_pcm_substream_chip(substream); struct emu10k1x *emu = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
snd_emu10k1x_ptr_write(emu, CAPTURE_DMA_ADDR, 0, runtime->dma_addr); snd_emu10k1x_ptr_write(emu, CAPTURE_DMA_ADDR, 0, runtime->dma_addr);
snd_emu10k1x_ptr_write(emu, CAPTURE_BUFFER_SIZE, 0, frames_to_bytes(runtime, runtime->buffer_size)<<16); // buffer size in bytes snd_emu10k1x_ptr_write(emu, CAPTURE_BUFFER_SIZE, 0, frames_to_bytes(runtime, runtime->buffer_size)<<16); // buffer size in bytes
@ -646,12 +642,12 @@ static int snd_emu10k1x_pcm_prepare_capture(snd_pcm_substream_t *substream)
} }
/* trigger_capture callback */ /* trigger_capture callback */
static int snd_emu10k1x_pcm_trigger_capture(snd_pcm_substream_t *substream, static int snd_emu10k1x_pcm_trigger_capture(struct snd_pcm_substream *substream,
int cmd) int cmd)
{ {
emu10k1x_t *emu = snd_pcm_substream_chip(substream); struct emu10k1x *emu = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
emu10k1x_pcm_t *epcm = runtime->private_data; struct emu10k1x_pcm *epcm = runtime->private_data;
int result = 0; int result = 0;
switch (cmd) { switch (cmd) {
@ -676,11 +672,11 @@ static int snd_emu10k1x_pcm_trigger_capture(snd_pcm_substream_t *substream,
/* pointer_capture callback */ /* pointer_capture callback */
static snd_pcm_uframes_t static snd_pcm_uframes_t
snd_emu10k1x_pcm_pointer_capture(snd_pcm_substream_t *substream) snd_emu10k1x_pcm_pointer_capture(struct snd_pcm_substream *substream)
{ {
emu10k1x_t *emu = snd_pcm_substream_chip(substream); struct emu10k1x *emu = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
emu10k1x_pcm_t *epcm = runtime->private_data; struct emu10k1x_pcm *epcm = runtime->private_data;
snd_pcm_uframes_t ptr; snd_pcm_uframes_t ptr;
if (!epcm->running) if (!epcm->running)
@ -693,7 +689,7 @@ snd_emu10k1x_pcm_pointer_capture(snd_pcm_substream_t *substream)
return ptr; return ptr;
} }
static snd_pcm_ops_t snd_emu10k1x_capture_ops = { static struct snd_pcm_ops snd_emu10k1x_capture_ops = {
.open = snd_emu10k1x_pcm_open_capture, .open = snd_emu10k1x_pcm_open_capture,
.close = snd_emu10k1x_pcm_close_capture, .close = snd_emu10k1x_pcm_close_capture,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
@ -704,10 +700,10 @@ static snd_pcm_ops_t snd_emu10k1x_capture_ops = {
.pointer = snd_emu10k1x_pcm_pointer_capture, .pointer = snd_emu10k1x_pcm_pointer_capture,
}; };
static unsigned short snd_emu10k1x_ac97_read(ac97_t *ac97, static unsigned short snd_emu10k1x_ac97_read(struct snd_ac97 *ac97,
unsigned short reg) unsigned short reg)
{ {
emu10k1x_t *emu = ac97->private_data; struct emu10k1x *emu = ac97->private_data;
unsigned long flags; unsigned long flags;
unsigned short val; unsigned short val;
@ -718,10 +714,10 @@ static unsigned short snd_emu10k1x_ac97_read(ac97_t *ac97,
return val; return val;
} }
static void snd_emu10k1x_ac97_write(ac97_t *ac97, static void snd_emu10k1x_ac97_write(struct snd_ac97 *ac97,
unsigned short reg, unsigned short val) unsigned short reg, unsigned short val)
{ {
emu10k1x_t *emu = ac97->private_data; struct emu10k1x *emu = ac97->private_data;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&emu->emu_lock, flags); spin_lock_irqsave(&emu->emu_lock, flags);
@ -730,12 +726,12 @@ static void snd_emu10k1x_ac97_write(ac97_t *ac97,
spin_unlock_irqrestore(&emu->emu_lock, flags); spin_unlock_irqrestore(&emu->emu_lock, flags);
} }
static int snd_emu10k1x_ac97(emu10k1x_t *chip) static int snd_emu10k1x_ac97(struct emu10k1x *chip)
{ {
ac97_bus_t *pbus; struct snd_ac97_bus *pbus;
ac97_template_t ac97; struct snd_ac97_template ac97;
int err; int err;
static ac97_bus_ops_t ops = { static struct snd_ac97_bus_ops ops = {
.write = snd_emu10k1x_ac97_write, .write = snd_emu10k1x_ac97_write,
.read = snd_emu10k1x_ac97_read, .read = snd_emu10k1x_ac97_read,
}; };
@ -750,7 +746,7 @@ static int snd_emu10k1x_ac97(emu10k1x_t *chip)
return snd_ac97_mixer(pbus, &ac97, &chip->ac97); return snd_ac97_mixer(pbus, &ac97, &chip->ac97);
} }
static int snd_emu10k1x_free(emu10k1x_t *chip) static int snd_emu10k1x_free(struct emu10k1x *chip)
{ {
snd_emu10k1x_ptr_write(chip, TRIGGER_CHANNEL, 0, 0); snd_emu10k1x_ptr_write(chip, TRIGGER_CHANNEL, 0, 0);
// disable interrupts // disable interrupts
@ -777,9 +773,9 @@ static int snd_emu10k1x_free(emu10k1x_t *chip)
return 0; return 0;
} }
static int snd_emu10k1x_dev_free(snd_device_t *device) static int snd_emu10k1x_dev_free(struct snd_device *device)
{ {
emu10k1x_t *chip = device->device_data; struct emu10k1x *chip = device->device_data;
return snd_emu10k1x_free(chip); return snd_emu10k1x_free(chip);
} }
@ -788,8 +784,8 @@ static irqreturn_t snd_emu10k1x_interrupt(int irq, void *dev_id,
{ {
unsigned int status; unsigned int status;
emu10k1x_t *chip = dev_id; struct emu10k1x *chip = dev_id;
emu10k1x_voice_t *pvoice = chip->voices; struct emu10k1x_voice *pvoice = chip->voices;
int i; int i;
int mask; int mask;
@ -800,8 +796,8 @@ static irqreturn_t snd_emu10k1x_interrupt(int irq, void *dev_id,
// capture interrupt // capture interrupt
if (status & (IPR_CAP_0_LOOP | IPR_CAP_0_HALF_LOOP)) { if (status & (IPR_CAP_0_LOOP | IPR_CAP_0_HALF_LOOP)) {
emu10k1x_voice_t *pvoice = &chip->capture_voice; struct emu10k1x_voice *pvoice = &chip->capture_voice;
if(pvoice->use) if (pvoice->use)
snd_emu10k1x_pcm_interrupt(chip, pvoice); snd_emu10k1x_pcm_interrupt(chip, pvoice);
else else
snd_emu10k1x_intr_disable(chip, snd_emu10k1x_intr_disable(chip,
@ -835,9 +831,9 @@ static irqreturn_t snd_emu10k1x_interrupt(int irq, void *dev_id,
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int __devinit snd_emu10k1x_pcm(emu10k1x_t *emu, int device, snd_pcm_t **rpcm) static int __devinit snd_emu10k1x_pcm(struct emu10k1x *emu, int device, struct snd_pcm **rpcm)
{ {
snd_pcm_t *pcm; struct snd_pcm *pcm;
int err; int err;
int capture = 0; int capture = 0;
@ -887,14 +883,14 @@ static int __devinit snd_emu10k1x_pcm(emu10k1x_t *emu, int device, snd_pcm_t **r
return 0; return 0;
} }
static int __devinit snd_emu10k1x_create(snd_card_t *card, static int __devinit snd_emu10k1x_create(struct snd_card *card,
struct pci_dev *pci, struct pci_dev *pci,
emu10k1x_t **rchip) struct emu10k1x **rchip)
{ {
emu10k1x_t *chip; struct emu10k1x *chip;
int err; int err;
int ch; int ch;
static snd_device_ops_t ops = { static struct snd_device_ops ops = {
.dev_free = snd_emu10k1x_dev_free, .dev_free = snd_emu10k1x_dev_free,
}; };
@ -1008,10 +1004,10 @@ static int __devinit snd_emu10k1x_create(snd_card_t *card,
return 0; return 0;
} }
static void snd_emu10k1x_proc_reg_read(snd_info_entry_t *entry, static void snd_emu10k1x_proc_reg_read(struct snd_info_entry *entry,
snd_info_buffer_t * buffer) struct snd_info_buffer *buffer)
{ {
emu10k1x_t *emu = entry->private_data; struct emu10k1x *emu = entry->private_data;
unsigned long value,value1,value2; unsigned long value,value1,value2;
unsigned long flags; unsigned long flags;
int i; int i;
@ -1036,10 +1032,10 @@ static void snd_emu10k1x_proc_reg_read(snd_info_entry_t *entry,
} }
} }
static void snd_emu10k1x_proc_reg_write(snd_info_entry_t *entry, static void snd_emu10k1x_proc_reg_write(struct snd_info_entry *entry,
snd_info_buffer_t *buffer) struct snd_info_buffer *buffer)
{ {
emu10k1x_t *emu = entry->private_data; struct emu10k1x *emu = entry->private_data;
char line[64]; char line[64];
unsigned int reg, channel_id , val; unsigned int reg, channel_id , val;
@ -1053,9 +1049,9 @@ static void snd_emu10k1x_proc_reg_write(snd_info_entry_t *entry,
} }
} }
static int __devinit snd_emu10k1x_proc_init(emu10k1x_t * emu) static int __devinit snd_emu10k1x_proc_init(struct emu10k1x * emu)
{ {
snd_info_entry_t *entry; struct snd_info_entry *entry;
if(! snd_card_proc_new(emu->card, "emu10k1x_regs", &entry)) { if(! snd_card_proc_new(emu->card, "emu10k1x_regs", &entry)) {
snd_info_set_text_ops(entry, emu, 1024, snd_emu10k1x_proc_reg_read); snd_info_set_text_ops(entry, emu, 1024, snd_emu10k1x_proc_reg_read);
@ -1068,7 +1064,7 @@ static int __devinit snd_emu10k1x_proc_init(emu10k1x_t * emu)
return 0; return 0;
} }
static int snd_emu10k1x_shared_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_emu10k1x_shared_spdif_info(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;
@ -1077,20 +1073,20 @@ static int snd_emu10k1x_shared_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem
return 0; return 0;
} }
static int snd_emu10k1x_shared_spdif_get(snd_kcontrol_t * kcontrol, static int snd_emu10k1x_shared_spdif_get(struct snd_kcontrol *kcontrol,
snd_ctl_elem_value_t * ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
emu10k1x_t *emu = snd_kcontrol_chip(kcontrol); struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
ucontrol->value.integer.value[0] = (snd_emu10k1x_ptr_read(emu, SPDIF_SELECT, 0) == 0x700) ? 0 : 1; ucontrol->value.integer.value[0] = (snd_emu10k1x_ptr_read(emu, SPDIF_SELECT, 0) == 0x700) ? 0 : 1;
return 0; return 0;
} }
static int snd_emu10k1x_shared_spdif_put(snd_kcontrol_t * kcontrol, static int snd_emu10k1x_shared_spdif_put(struct snd_kcontrol *kcontrol,
snd_ctl_elem_value_t * ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
emu10k1x_t *emu = snd_kcontrol_chip(kcontrol); struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
unsigned int val; unsigned int val;
int change = 0; int change = 0;
@ -1110,7 +1106,7 @@ static int snd_emu10k1x_shared_spdif_put(snd_kcontrol_t * kcontrol,
return change; return change;
} }
static snd_kcontrol_new_t snd_emu10k1x_shared_spdif __devinitdata = static struct snd_kcontrol_new snd_emu10k1x_shared_spdif __devinitdata =
{ {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
.name = "Analog/Digital Output Jack", .name = "Analog/Digital Output Jack",
@ -1119,17 +1115,17 @@ static snd_kcontrol_new_t snd_emu10k1x_shared_spdif __devinitdata =
.put = snd_emu10k1x_shared_spdif_put .put = snd_emu10k1x_shared_spdif_put
}; };
static int snd_emu10k1x_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_emu10k1x_spdif_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958; uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
uinfo->count = 1; uinfo->count = 1;
return 0; return 0;
} }
static int snd_emu10k1x_spdif_get(snd_kcontrol_t * kcontrol, static int snd_emu10k1x_spdif_get(struct snd_kcontrol *kcontrol,
snd_ctl_elem_value_t * ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
emu10k1x_t *emu = snd_kcontrol_chip(kcontrol); struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
ucontrol->value.iec958.status[0] = (emu->spdif_bits[idx] >> 0) & 0xff; ucontrol->value.iec958.status[0] = (emu->spdif_bits[idx] >> 0) & 0xff;
@ -1139,8 +1135,8 @@ static int snd_emu10k1x_spdif_get(snd_kcontrol_t * kcontrol,
return 0; return 0;
} }
static int snd_emu10k1x_spdif_get_mask(snd_kcontrol_t * kcontrol, static int snd_emu10k1x_spdif_get_mask(struct snd_kcontrol *kcontrol,
snd_ctl_elem_value_t * ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
ucontrol->value.iec958.status[0] = 0xff; ucontrol->value.iec958.status[0] = 0xff;
ucontrol->value.iec958.status[1] = 0xff; ucontrol->value.iec958.status[1] = 0xff;
@ -1149,10 +1145,10 @@ static int snd_emu10k1x_spdif_get_mask(snd_kcontrol_t * kcontrol,
return 0; return 0;
} }
static int snd_emu10k1x_spdif_put(snd_kcontrol_t * kcontrol, static int snd_emu10k1x_spdif_put(struct snd_kcontrol *kcontrol,
snd_ctl_elem_value_t * ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
emu10k1x_t *emu = snd_kcontrol_chip(kcontrol); struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
int change; int change;
unsigned int val; unsigned int val;
@ -1169,7 +1165,7 @@ static int snd_emu10k1x_spdif_put(snd_kcontrol_t * kcontrol,
return change; return change;
} }
static snd_kcontrol_new_t snd_emu10k1x_spdif_mask_control = static struct snd_kcontrol_new snd_emu10k1x_spdif_mask_control =
{ {
.access = SNDRV_CTL_ELEM_ACCESS_READ, .access = SNDRV_CTL_ELEM_ACCESS_READ,
.iface = SNDRV_CTL_ELEM_IFACE_PCM, .iface = SNDRV_CTL_ELEM_IFACE_PCM,
@ -1179,7 +1175,7 @@ static snd_kcontrol_new_t snd_emu10k1x_spdif_mask_control =
.get = snd_emu10k1x_spdif_get_mask .get = snd_emu10k1x_spdif_get_mask
}; };
static snd_kcontrol_new_t snd_emu10k1x_spdif_control = static struct snd_kcontrol_new snd_emu10k1x_spdif_control =
{ {
.iface = SNDRV_CTL_ELEM_IFACE_PCM, .iface = SNDRV_CTL_ELEM_IFACE_PCM,
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
@ -1189,11 +1185,11 @@ static snd_kcontrol_new_t snd_emu10k1x_spdif_control =
.put = snd_emu10k1x_spdif_put .put = snd_emu10k1x_spdif_put
}; };
static int __devinit snd_emu10k1x_mixer(emu10k1x_t *emu) static int __devinit snd_emu10k1x_mixer(struct emu10k1x *emu)
{ {
int err; int err;
snd_kcontrol_t *kctl; struct snd_kcontrol *kctl;
snd_card_t *card = emu->card; struct snd_card *card = emu->card;
if ((kctl = snd_ctl_new1(&snd_emu10k1x_spdif_mask_control, emu)) == NULL) if ((kctl = snd_ctl_new1(&snd_emu10k1x_spdif_mask_control, emu)) == NULL)
return -ENOMEM; return -ENOMEM;
@ -1214,12 +1210,12 @@ static int __devinit snd_emu10k1x_mixer(emu10k1x_t *emu)
#define EMU10K1X_MIDI_MODE_INPUT (1<<0) #define EMU10K1X_MIDI_MODE_INPUT (1<<0)
#define EMU10K1X_MIDI_MODE_OUTPUT (1<<1) #define EMU10K1X_MIDI_MODE_OUTPUT (1<<1)
static inline unsigned char mpu401_read(emu10k1x_t *emu, emu10k1x_midi_t *mpu, int idx) static inline unsigned char mpu401_read(struct emu10k1x *emu, struct emu10k1x_midi *mpu, int idx)
{ {
return (unsigned char)snd_emu10k1x_ptr_read(emu, mpu->port + idx, 0); return (unsigned char)snd_emu10k1x_ptr_read(emu, mpu->port + idx, 0);
} }
static inline void mpu401_write(emu10k1x_t *emu, emu10k1x_midi_t *mpu, int data, int idx) static inline void mpu401_write(struct emu10k1x *emu, struct emu10k1x_midi *mpu, int data, int idx)
{ {
snd_emu10k1x_ptr_write(emu, mpu->port + idx, 0, data); snd_emu10k1x_ptr_write(emu, mpu->port + idx, 0, data);
} }
@ -1236,7 +1232,7 @@ static inline void mpu401_write(emu10k1x_t *emu, emu10k1x_midi_t *mpu, int data,
#define MPU401_ENTER_UART 0x3f #define MPU401_ENTER_UART 0x3f
#define MPU401_ACK 0xfe #define MPU401_ACK 0xfe
static void mpu401_clear_rx(emu10k1x_t *emu, emu10k1x_midi_t *mpu) static void mpu401_clear_rx(struct emu10k1x *emu, struct emu10k1x_midi *mpu)
{ {
int timeout = 100000; int timeout = 100000;
for (; timeout > 0 && mpu401_input_avail(emu, mpu); timeout--) for (; timeout > 0 && mpu401_input_avail(emu, mpu); timeout--)
@ -1251,7 +1247,8 @@ static void mpu401_clear_rx(emu10k1x_t *emu, emu10k1x_midi_t *mpu)
*/ */
static void do_emu10k1x_midi_interrupt(emu10k1x_t *emu, emu10k1x_midi_t *midi, unsigned int status) static void do_emu10k1x_midi_interrupt(struct emu10k1x *emu,
struct emu10k1x_midi *midi, unsigned int status)
{ {
unsigned char byte; unsigned char byte;
@ -1284,12 +1281,13 @@ static void do_emu10k1x_midi_interrupt(emu10k1x_t *emu, emu10k1x_midi_t *midi, u
spin_unlock(&midi->output_lock); spin_unlock(&midi->output_lock);
} }
static void snd_emu10k1x_midi_interrupt(emu10k1x_t *emu, unsigned int status) static void snd_emu10k1x_midi_interrupt(struct emu10k1x *emu, unsigned int status)
{ {
do_emu10k1x_midi_interrupt(emu, &emu->midi, status); do_emu10k1x_midi_interrupt(emu, &emu->midi, status);
} }
static void snd_emu10k1x_midi_cmd(emu10k1x_t * emu, emu10k1x_midi_t *midi, unsigned char cmd, int ack) static void snd_emu10k1x_midi_cmd(struct emu10k1x * emu,
struct emu10k1x_midi *midi, unsigned char cmd, int ack)
{ {
unsigned long flags; unsigned long flags;
int timeout, ok; int timeout, ok;
@ -1321,10 +1319,10 @@ static void snd_emu10k1x_midi_cmd(emu10k1x_t * emu, emu10k1x_midi_t *midi, unsig
mpu401_read_data(emu, midi)); mpu401_read_data(emu, midi));
} }
static int snd_emu10k1x_midi_input_open(snd_rawmidi_substream_t * substream) static int snd_emu10k1x_midi_input_open(struct snd_rawmidi_substream *substream)
{ {
emu10k1x_t *emu; struct emu10k1x *emu;
emu10k1x_midi_t *midi = (emu10k1x_midi_t *)substream->rmidi->private_data; struct emu10k1x_midi *midi = substream->rmidi->private_data;
unsigned long flags; unsigned long flags;
emu = midi->emu; emu = midi->emu;
@ -1342,10 +1340,10 @@ static int snd_emu10k1x_midi_input_open(snd_rawmidi_substream_t * substream)
return 0; return 0;
} }
static int snd_emu10k1x_midi_output_open(snd_rawmidi_substream_t * substream) static int snd_emu10k1x_midi_output_open(struct snd_rawmidi_substream *substream)
{ {
emu10k1x_t *emu; struct emu10k1x *emu;
emu10k1x_midi_t *midi = (emu10k1x_midi_t *)substream->rmidi->private_data; struct emu10k1x_midi *midi = substream->rmidi->private_data;
unsigned long flags; unsigned long flags;
emu = midi->emu; emu = midi->emu;
@ -1363,10 +1361,10 @@ static int snd_emu10k1x_midi_output_open(snd_rawmidi_substream_t * substream)
return 0; return 0;
} }
static int snd_emu10k1x_midi_input_close(snd_rawmidi_substream_t * substream) static int snd_emu10k1x_midi_input_close(struct snd_rawmidi_substream *substream)
{ {
emu10k1x_t *emu; struct emu10k1x *emu;
emu10k1x_midi_t *midi = (emu10k1x_midi_t *)substream->rmidi->private_data; struct emu10k1x_midi *midi = substream->rmidi->private_data;
unsigned long flags; unsigned long flags;
emu = midi->emu; emu = midi->emu;
@ -1384,10 +1382,10 @@ static int snd_emu10k1x_midi_input_close(snd_rawmidi_substream_t * substream)
return 0; return 0;
} }
static int snd_emu10k1x_midi_output_close(snd_rawmidi_substream_t * substream) static int snd_emu10k1x_midi_output_close(struct snd_rawmidi_substream *substream)
{ {
emu10k1x_t *emu; struct emu10k1x *emu;
emu10k1x_midi_t *midi = (emu10k1x_midi_t *)substream->rmidi->private_data; struct emu10k1x_midi *midi = substream->rmidi->private_data;
unsigned long flags; unsigned long flags;
emu = midi->emu; emu = midi->emu;
@ -1405,10 +1403,10 @@ static int snd_emu10k1x_midi_output_close(snd_rawmidi_substream_t * substream)
return 0; return 0;
} }
static void snd_emu10k1x_midi_input_trigger(snd_rawmidi_substream_t * substream, int up) static void snd_emu10k1x_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)
{ {
emu10k1x_t *emu; struct emu10k1x *emu;
emu10k1x_midi_t *midi = (emu10k1x_midi_t *)substream->rmidi->private_data; struct emu10k1x_midi *midi = substream->rmidi->private_data;
emu = midi->emu; emu = midi->emu;
snd_assert(emu, return); snd_assert(emu, return);
@ -1418,10 +1416,10 @@ static void snd_emu10k1x_midi_input_trigger(snd_rawmidi_substream_t * substream,
snd_emu10k1x_intr_disable(emu, midi->rx_enable); snd_emu10k1x_intr_disable(emu, midi->rx_enable);
} }
static void snd_emu10k1x_midi_output_trigger(snd_rawmidi_substream_t * substream, int up) static void snd_emu10k1x_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)
{ {
emu10k1x_t *emu; struct emu10k1x *emu;
emu10k1x_midi_t *midi = (emu10k1x_midi_t *)substream->rmidi->private_data; struct emu10k1x_midi *midi = substream->rmidi->private_data;
unsigned long flags; unsigned long flags;
emu = midi->emu; emu = midi->emu;
@ -1458,30 +1456,31 @@ static void snd_emu10k1x_midi_output_trigger(snd_rawmidi_substream_t * substream
*/ */
static snd_rawmidi_ops_t snd_emu10k1x_midi_output = static struct snd_rawmidi_ops snd_emu10k1x_midi_output =
{ {
.open = snd_emu10k1x_midi_output_open, .open = snd_emu10k1x_midi_output_open,
.close = snd_emu10k1x_midi_output_close, .close = snd_emu10k1x_midi_output_close,
.trigger = snd_emu10k1x_midi_output_trigger, .trigger = snd_emu10k1x_midi_output_trigger,
}; };
static snd_rawmidi_ops_t snd_emu10k1x_midi_input = static struct snd_rawmidi_ops snd_emu10k1x_midi_input =
{ {
.open = snd_emu10k1x_midi_input_open, .open = snd_emu10k1x_midi_input_open,
.close = snd_emu10k1x_midi_input_close, .close = snd_emu10k1x_midi_input_close,
.trigger = snd_emu10k1x_midi_input_trigger, .trigger = snd_emu10k1x_midi_input_trigger,
}; };
static void snd_emu10k1x_midi_free(snd_rawmidi_t *rmidi) static void snd_emu10k1x_midi_free(struct snd_rawmidi *rmidi)
{ {
emu10k1x_midi_t *midi = (emu10k1x_midi_t *)rmidi->private_data; struct emu10k1x_midi *midi = rmidi->private_data;
midi->interrupt = NULL; midi->interrupt = NULL;
midi->rmidi = NULL; midi->rmidi = NULL;
} }
static int __devinit emu10k1x_midi_init(emu10k1x_t *emu, emu10k1x_midi_t *midi, int device, char *name) static int __devinit emu10k1x_midi_init(struct emu10k1x *emu,
struct emu10k1x_midi *midi, int device, char *name)
{ {
snd_rawmidi_t *rmidi; struct snd_rawmidi *rmidi;
int err; int err;
if ((err = snd_rawmidi_new(emu->card, name, device, 1, 1, &rmidi)) < 0) if ((err = snd_rawmidi_new(emu->card, name, device, 1, 1, &rmidi)) < 0)
@ -1502,9 +1501,9 @@ static int __devinit emu10k1x_midi_init(emu10k1x_t *emu, emu10k1x_midi_t *midi,
return 0; return 0;
} }
static int __devinit snd_emu10k1x_midi(emu10k1x_t *emu) static int __devinit snd_emu10k1x_midi(struct emu10k1x *emu)
{ {
emu10k1x_midi_t *midi = &emu->midi; struct emu10k1x_midi *midi = &emu->midi;
int err; int err;
if ((err = emu10k1x_midi_init(emu, midi, 0, "EMU10K1X MPU-401 (UART)")) < 0) if ((err = emu10k1x_midi_init(emu, midi, 0, "EMU10K1X MPU-401 (UART)")) < 0)
@ -1523,8 +1522,8 @@ static int __devinit snd_emu10k1x_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id) const struct pci_device_id *pci_id)
{ {
static int dev; static int dev;
snd_card_t *card; struct snd_card *card;
emu10k1x_t *chip; struct emu10k1x *chip;
int err; int err;
if (dev >= SNDRV_CARDS) if (dev >= SNDRV_CARDS)