Changeset 34 for GPL/trunk/alsa-kernel/pci/emu10k1

Timestamp:

Dec 11, 2005, 5:57:39 PM (20 years ago)

Author:

vladest

Message:

Latest update from ALSA. some intial > 15 interrupts support

Location:

GPL/trunk/alsa-kernel/pci/emu10k1

Files:

• emu10k1.c (modified) (2 diffs)
• emu10k1_callback.c (modified) (18 diffs)
• emu10k1_main.c (modified) (13 diffs)
• emu10k1_patch.c (modified) (3 diffs)
• emu10k1_synth.c (modified) (3 diffs)
• emu10k1_synth_local.h (modified) (1 diff)
• emu10k1x.c (modified) (62 diffs)
• emufx.c (modified) (39 diffs)
• emumixer.c (modified) (28 diffs)
• emumpu401.c (modified) (14 diffs)
• emupcm.c (modified) (55 diffs)
• emuproc.c (modified) (13 diffs)
• io.c (modified) (17 diffs)
• irq.c (modified) (4 diffs)
• memory.c (modified) (21 diffs)
• p16v.c (modified) (23 diffs)
• timer.c (modified) (4 diffs)
• voice.c (modified) (4 diffs)

GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1.c

@@ -122 +122 @@
 #endif
         snd_card_t *card;
-        emu10k1_t *emu;
+        struct snd_emu10k1 *emu;
 #ifdef ENABLE_SYNTH
         snd_seq_device_t *wave = NULL;
@@ -208 +208 @@
 #ifdef ENABLE_SYNTH
         if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH,
-                               sizeof(snd_emu10k1_synth_arg_t), &wave) < 0 ||
+                               sizeof(struct snd_emu10k1_synth_arg), &wave) < 0 ||
             wave == NULL) {
                 snd_printk("can't initialize Emu10k1 wavetable synth\n");
         } else {
-                snd_emu10k1_synth_arg_t *arg;
+                struct snd_emu10k1_synth_arg *arg;
                 arg = SNDRV_SEQ_DEVICE_ARGPTR(wave);
                 strcpy(wave->name, "Emu-10k1 Synth");

GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1_callback.c

@@ -37 +37 @@
  * prototypes
  */
-static void lookup_voices(snd_emux_t *emu, emu10k1_t *hw, best_voice_t *best, int active_only);
-static snd_emux_voice_t *get_voice(snd_emux_t *emu, snd_emux_port_t *port);
-static int start_voice(snd_emux_voice_t *vp);
-static void trigger_voice(snd_emux_voice_t *vp);
-static void release_voice(snd_emux_voice_t *vp);
-static void update_voice(snd_emux_voice_t *vp, int update);
-static void terminate_voice(snd_emux_voice_t *vp);
-static void free_voice(snd_emux_voice_t *vp);
-
-static void set_fmmod(emu10k1_t *hw, snd_emux_voice_t *vp);
-static void set_fm2frq2(emu10k1_t *hw, snd_emux_voice_t *vp);
-static void set_filterQ(emu10k1_t *hw, snd_emux_voice_t *vp);
+static void lookup_voices(struct snd_emux *emu, struct snd_emu10k1 *hw, best_voice_t *best, int active_only);
+static struct snd_emux_voice *get_voice(struct snd_emux *emu, struct snd_emux_port *port);
+static int start_voice(struct snd_emux_voice *vp);
+static void trigger_voice(struct snd_emux_voice *vp);
+static void release_voice(struct snd_emux_voice *vp);
+static void update_voice(struct snd_emux_voice *vp, int update);
+static void terminate_voice(struct snd_emux_voice *vp);
+static void free_voice(struct snd_emux_voice *vp);
+
+static void set_fmmod(struct snd_emu10k1 *hw, struct snd_emux_voice *vp);
+static void set_fm2frq2(struct snd_emu10k1 *hw, struct snd_emux_voice *vp);
+static void set_filterQ(struct snd_emu10k1 *hw, struct snd_emux_voice *vp);
 
 /*
@@ -61 +61 @@
  * set up operators
  */
-#ifdef TARGET_OS2
-static snd_emux_operators_t emu10k1_ops = {
-        THIS_MODULE,
-        get_voice,
-        start_voice,
-        trigger_voice,
-        release_voice,
-        update_voice,
-        terminate_voice,
-        free_voice, 0,
-        snd_emu10k1_sample_new,
-        snd_emu10k1_sample_free,0,0,0
+static struct snd_emux_operators emu10k1_ops = {
+        .owner =        THIS_MODULE,
+        .get_voice =    get_voice,
+        .prepare =      start_voice,
+        .trigger =      trigger_voice,
+        .release =      release_voice,
+        .update =       update_voice,
+        .terminate =    terminate_voice,
+        .free_voice =   free_voice,
+        .sample_new =   snd_emu10k1_sample_new,
+        .sample_free =  snd_emu10k1_sample_free,
 };
-#else
-static snd_emux_operators_t emu10k1_ops = {
-        owner:          THIS_MODULE,
-        get_voice:      get_voice,
-        prepare:        start_voice,
-        trigger:        trigger_voice,
-        release:        release_voice,
-        update:         update_voice,
-        terminate:      terminate_voice,
-        free_voice:     free_voice,
-        sample_new:     snd_emu10k1_sample_new,
-        sample_free:    snd_emu10k1_sample_free,
-};
-#endif
-void
-snd_emu10k1_ops_setup(snd_emux_t *emu)
+
+void snd_emu10k1_ops_setup(struct snd_emux *emu)
 {
         emu->ops = emu10k1_ops;
@@ -101 +86 @@
  */
 int
-snd_emu10k1_synth_get_voice(emu10k1_t *hw)
-{
-        snd_emux_t *emu;
-        snd_emux_voice_t *vp;
+snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw)
+{
+        struct snd_emux *emu;
+        struct snd_emux_voice *vp;
         best_voice_t best[V_END];
         unsigned long flags;
@@ -139 +124 @@
  */
 static void
-release_voice(snd_emux_voice_t *vp)
+release_voice(struct snd_emux_voice *vp)
 {
         int dcysusv;
-        emu10k1_t *hw;
+        struct snd_emu10k1 *hw;
 
         hw = vp->hw;
@@ -156 +141 @@
  */
 static void
-terminate_voice(snd_emux_voice_t *vp)
-{
-        emu10k1_t *hw;
+terminate_voice(struct snd_emux_voice *vp)
+{
+        struct snd_emu10k1 *hw;
         
         snd_assert(vp, return);
@@ -164 +149 @@
         snd_emu10k1_ptr_write(hw, DCYSUSV, vp->ch, 0x807f | DCYSUSV_CHANNELENABLE_MASK);
         if (vp->block) {
-                emu10k1_memblk_t *emem;
-                emem = (emu10k1_memblk_t *)vp->block;
+                struct snd_emu10k1_memblk *emem;
+                emem = (struct snd_emu10k1_memblk *)vp->block;
                 if (emem->map_locked > 0)
                         emem->map_locked--;
@@ -175 +160 @@
  */
 static void
-free_voice(snd_emux_voice_t *vp)
-{
-        emu10k1_t *hw;
+free_voice(struct snd_emux_voice *vp)
+{
+        struct snd_emu10k1 *hw;
 
         hw = vp->hw;
@@ -197 +182 @@
  */
 static void
-update_voice(snd_emux_voice_t *vp, int update)
-{
-        emu10k1_t *hw;
+update_voice(struct snd_emux_voice *vp, int update)
+{
+        struct snd_emu10k1 *hw;
 
         hw = vp->hw;
@@ -226 +211 @@
 /* spinlock held! */
 static void
-lookup_voices(snd_emux_t *emu, emu10k1_t *hw, best_voice_t *best, int active_only)
-{
-        snd_emux_voice_t *vp;
+lookup_voices(struct snd_emux *emu, struct snd_emu10k1 *hw, best_voice_t *best, int active_only)
+{
+        struct snd_emux_voice *vp;
         best_voice_t *bp;
         int  i;
@@ -290 +275 @@
  * emu->voice_lock is already held.
  */
-static snd_emux_voice_t *
-get_voice(snd_emux_t *emu, snd_emux_port_t *port)
-{
-        emu10k1_t *hw;
-        snd_emux_voice_t *vp;
+static struct snd_emux_voice *
+get_voice(struct snd_emux *emu, struct snd_emux_port *port)
+{
+        struct snd_emu10k1 *hw;
+        struct snd_emux_voice *vp;
         best_voice_t best[V_END];
         int i;
@@ -306 +291 @@
                         if (vp->ch < 0) {
                                 /* allocate a voice */
-                            emu10k1_voice_t *hwvoice;
+                            struct snd_emu10k1_voice *hwvoice;
                             if (snd_emu10k1_voice_alloc(hw, EMU10K1_SYNTH, 1, &hwvoice) < 0 || hwvoice == NULL)
                                         continue;
@@ -324 +309 @@
  */
 static int
-start_voice(snd_emux_voice_t *vp)
+start_voice(struct snd_emux_voice *vp)
 {
         unsigned int temp;
@@ -330 +315 @@
         unsigned int addr, mapped_offset;
         snd_midi_channel_t *chan;
-        emu10k1_t *hw;
-        emu10k1_memblk_t *emem;
+        struct snd_emu10k1 *hw;
+        struct snd_emu10k1_memblk *emem;
 
         hw = vp->hw;
@@ -338 +323 @@
         chan = vp->chan;
 
-        emem = (emu10k1_memblk_t *)vp->block;
+        emem = (struct snd_emu10k1_memblk *)vp->block;
         if (emem == NULL)
                 return -EINVAL;
@@ -480 +465 @@
  */
 static void
-trigger_voice(snd_emux_voice_t *vp)
+trigger_voice(struct snd_emux_voice *vp)
 {
         unsigned int temp, ptarget;
-        emu10k1_t *hw;
-        emu10k1_memblk_t *emem;
+        struct snd_emu10k1 *hw;
+        struct snd_emu10k1_memblk *emem;
 
         hw = vp->hw;
 
-        emem = (emu10k1_memblk_t *)vp->block;
+        emem = (struct snd_emu10k1_memblk *)vp->block;
         if (! emem || emem->mapped_page < 0)
                 return; /* not mapped */
@@ -512 +497 @@
 /* set lfo1 modulation height and cutoff */
 static void
-set_fmmod(emu10k1_t *hw, snd_emux_voice_t *vp)
+set_fmmod(struct snd_emu10k1 *hw, struct snd_emux_voice *vp)
 {
         unsigned short fmmod;
@@ -530 +515 @@
 /* set lfo2 pitch & frequency */
 static void
-set_fm2frq2(emu10k1_t *hw, snd_emux_voice_t *vp)
+set_fm2frq2(struct snd_emu10k1 *hw, struct snd_emux_voice *vp)
 {
         unsigned short fm2frq2;
@@ -548 +533 @@
 /* set filterQ */
 static void
-set_filterQ(emu10k1_t *hw, snd_emux_voice_t *vp)
+set_filterQ(struct snd_emu10k1 *hw, struct snd_emux_voice *vp)
 {
         unsigned int val;

GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1_main.c

@@ -46 +46 @@
  *************************************************************************/
 
-void snd_emu10k1_voice_init(emu10k1_t * emu, int ch)
+void snd_emu10k1_voice_init(struct snd_emu10k1 * emu, int ch)
 {
     snd_emu10k1_ptr_write(emu, DCYSUSV, ch, 0);
@@ -91 +91 @@
 }
 
-static int __devinit snd_emu10k1_init(emu10k1_t * emu, int enable_ir)
+static int __devinit snd_emu10k1_init(struct snd_emu10k1 * emu, int enable_ir)
 {
     int ch, idx, err;
@@ -329 +329 @@
     snd_emu10k1_intr_enable(emu, INTE_PCIERRORENABLE);
 
-    emu->reserved_page = (emu10k1_memblk_t *)snd_emu10k1_synth_alloc(emu, 4096);
+    emu->reserved_page = (struct snd_emu10k1_memblk *)snd_emu10k1_synth_alloc(emu, 4096);
     if (emu->reserved_page)
         emu->reserved_page->map_locked = 1;
@@ -336 +336 @@
 }
 
-static int snd_emu10k1_done(emu10k1_t * emu)
+static int snd_emu10k1_done(struct snd_emu10k1 * emu)
 {
     int ch;
@@ -467 +467 @@
  */
 
-static void snd_emu10k1_ecard_write(emu10k1_t * emu, unsigned int value)
+static void snd_emu10k1_ecard_write(struct snd_emu10k1 * emu, unsigned int value)
 {
     unsigned short count;
@@ -505 +505 @@
  */
 
-static void snd_emu10k1_ecard_setadcgain(emu10k1_t * emu,
+static void snd_emu10k1_ecard_setadcgain(struct snd_emu10k1 * emu,
                                          unsigned short gain)
 {
@@ -533 +533 @@
 }
 
-static int __devinit snd_emu10k1_ecard_init(emu10k1_t * emu)
+static int __devinit snd_emu10k1_ecard_init(struct snd_emu10k1 * emu)
 {
     unsigned int hc_value;
@@ -573 +573 @@
 }
 
-static int __devinit snd_emu10k1_cardbus_init(emu10k1_t * emu)
+static int __devinit snd_emu10k1_cardbus_init(struct snd_emu10k1 * emu)
 {
     unsigned long special_port;
@@ -601 +601 @@
  */
 
-static int snd_emu10k1_free(emu10k1_t *emu)
+static int snd_emu10k1_free(struct snd_emu10k1 *emu)
 {
     if (emu->port) {        /* avoid access to already used hardware */
@@ -629 +629 @@
 static int snd_emu10k1_dev_free(snd_device_t *device)
 {
-    emu10k1_t *emu = device->device_data;
+    struct snd_emu10k1 *emu = device->device_data;
     return snd_emu10k1_free(emu);
 }
 
 /* vendor, device, subsystem, emu10k1_chip, emu10k2_chip, ca0102_chip, ca0108_chip, ca0151_chip, spk71, spdif_bug, ac97_chip, ecard, driver, name */
-static emu_chip_details_t emu_chip_details[] = {
+static struct snd_emu_chip_details emu_chip_details[] = {
         /* Audigy 2 Value AC3 out does not work yet. Need to find out how to turn off interpolators.*/
         /* Tested by James@superbug.co.uk 3rd July 2005 */
@@ -880 +880 @@
                                  int enable_ir,
                                  uint subsystem,
-                                 emu10k1_t ** remu)
+                                 struct snd_emu10k1 ** remu)
 {
-    emu10k1_t *emu;
+    struct snd_emu10k1 *emu;
     int err;
     int is_audigy;
     unsigned char revision;
-    const emu_chip_details_t *c;
+    const struct snd_emu_chip_details *c;
 #ifdef TARGET_OS2
     static snd_device_ops_t ops = {
@@ -902 +902 @@
         return err;
 
-    emu = kzalloc(sizeof(*emu), GFP_KERNEL);
+    emu = (struct snd_emu10k1 *)kzalloc(sizeof(*emu), GFP_KERNEL);
     if (emu == NULL)
         return -ENOMEM;
@@ -1003 +1003 @@
         return -ENOMEM;
     }
-    emu->memhdr->block_extra_size = sizeof(emu10k1_memblk_t) - sizeof(snd_util_memblk_t);
+    emu->memhdr->block_extra_size = sizeof(struct snd_emu10k1_memblk) - sizeof(snd_util_memblk_t);
 
     pci_set_master(pci);

GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1_patch.c

@@ -37 +37 @@
  */
 int
-snd_emu10k1_sample_new(snd_emux_t *rec, snd_sf_sample_t *sp,
+snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,
                        snd_util_memhdr_t *hdr, const void *data, long count)
 {
@@ -44 +44 @@
         int loopend, sampleend;
         unsigned int start_addr;
-        emu10k1_t *emu;
+        struct snd_emu10k1 *emu;
 
         emu = rec->hw;
@@ -210 +210 @@
  */
 int
-snd_emu10k1_sample_free(snd_emux_t *rec, snd_sf_sample_t *sp,
+snd_emu10k1_sample_free(struct snd_emux *rec, struct snd_sf_sample *sp,
                         snd_util_memhdr_t *hdr)
 {
-        emu10k1_t *emu;
+        struct snd_emu10k1 *emu;
 
         emu = rec->hw;

GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1_synth.c

@@ -31 +31 @@
 int snd_emu10k1_synth_new_device(snd_seq_device_t *dev)
 {
-        snd_emux_t *emu;
-        emu10k1_t *hw;
-        snd_emu10k1_synth_arg_t *arg;
+        struct snd_emux *emu;
+        struct snd_emu10k1 *hw;
+        struct snd_emu10k1_synth_arg *arg;
         unsigned long flags;
 
@@ -79 +79 @@
 int snd_emu10k1_synth_delete_device(snd_seq_device_t *dev)
 {
-        snd_emux_t *emu;
-        emu10k1_t *hw;
+        struct snd_emux *emu;
+        struct snd_emu10k1 *hw;
         unsigned long flags;
 
@@ -110 +110 @@
                 snd_emu10k1_synth_delete_device,
         };
-        return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &ops, sizeof(snd_emu10k1_synth_arg_t));
+        return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &ops, sizeof(struct snd_emu10k1_synth_arg));
 }
 

GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1_synth_local.h

@@ -27 +27 @@
 
 /* emu10k1_patch.c */
-int snd_emu10k1_sample_new(snd_emux_t *private_data, snd_sf_sample_t *sp, snd_util_memhdr_t *hdr, const void *_data, long count);
-int snd_emu10k1_sample_free(snd_emux_t *private_data, snd_sf_sample_t *sp, snd_util_memhdr_t *hdr);
-int snd_emu10k1_memhdr_init(snd_emux_t *emu);
+int snd_emu10k1_sample_new(struct snd_emux *private_data,
+                           struct snd_sf_sample *sp,
+                           struct snd_util_memhdr *hdr,
+                           const void __user *_data, long count);
+int snd_emu10k1_sample_free(struct snd_emux *private_data,
+                            struct snd_sf_sample *sp,
+                            struct snd_util_memhdr *hdr);
+int snd_emu10k1_memhdr_init(struct snd_emux *emu);
 
 /* emu10k1_callback.c */
-void snd_emu10k1_ops_setup(snd_emux_t *emu);
-int snd_emu10k1_synth_get_voice(emu10k1_t *hw);
+void snd_emu10k1_ops_setup(struct snd_emux *emu);
+int snd_emu10k1_synth_get_voice(struct snd_emu10k1 *hw);
 
 

GPL/trunk/alsa-kernel/pci/emu10k1/emu10k1x.c

@@ -196 +196 @@
  */
 
-typedef struct snd_emu10k1x_voice emu10k1x_voice_t;
-typedef struct snd_emu10k1x emu10k1x_t;
-typedef struct snd_emu10k1x_pcm emu10k1x_pcm_t;
-
-struct snd_emu10k1x_voice {
-        emu10k1x_t *emu;
+struct emu10k1x_voice {
+        struct emu10k1x *emu;
         int number;
         int use;
   
-        emu10k1x_pcm_t *epcm;
+        struct emu10k1x_pcm *epcm;
 };
 
-struct snd_emu10k1x_pcm {
-        emu10k1x_t *emu;
-        snd_pcm_substream_t *substream;
-        emu10k1x_voice_t *voice;
+struct emu10k1x_pcm {
+        struct emu10k1x *emu;
+        struct snd_pcm_substream *substream;
+        struct emu10k1x_voice *voice;
         unsigned short running;
 };
 
-typedef struct {
-        struct snd_emu10k1x *emu;
-        snd_rawmidi_t *rmidi;
-        snd_rawmidi_substream_t *substream_input;
-        snd_rawmidi_substream_t *substream_output;
+struct emu10k1x_midi {
+        struct emu10k1x *emu;
+        struct snd_rawmidi *rmidi;
+        struct snd_rawmidi_substream *substream_input;
+        struct snd_rawmidi_substream *substream_output;
         unsigned int midi_mode;
         spinlock_t input_lock;
@@ -227 +223 @@
         int port;
         int ipr_tx, ipr_rx;
-        void (*interrupt)(emu10k1x_t *emu, unsigned int status);
-} emu10k1x_midi_t;
+        void (*interrupt)(struct emu10k1x *emu, unsigned int status);
+};
 
 // definition of the chip-specific record
-struct snd_emu10k1x {
-        snd_card_t *card;
+struct emu10k1x {
+        struct snd_card *card;
         struct pci_dev *pci;
 
@@ -246 +242 @@
         spinlock_t voice_lock;
 
-        ac97_t *ac97;
-        snd_pcm_t *pcm;
-
-        emu10k1x_voice_t voices[3];
-        emu10k1x_voice_t capture_voice;
+        struct snd_ac97 *ac97;
+        struct snd_pcm *pcm;
+
+        struct emu10k1x_voice voices[3];
+        struct emu10k1x_voice capture_voice;
         u32 spdif_bits[3]; // SPDIF out setup
 
         struct snd_dma_buffer dma_buffer;
 
-        emu10k1x_midi_t midi;
+        struct emu10k1x_midi midi;
 };
 
 /* hardware definition */
-static snd_pcm_hardware_t snd_emu10k1x_playback_hw = {
-        /*.info =              */  (SNDRV_PCM_INFO_MMAP |
+static struct snd_pcm_hardware snd_emu10k1x_playback_hw = {
+        .info =                 (SNDRV_PCM_INFO_MMAP | 
                                  SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
                                  SNDRV_PCM_INFO_MMAP_VALID),
-        /*.formats =           */ SNDRV_PCM_FMTBIT_S16_LE,
-        /*.rates =             */ SNDRV_PCM_RATE_48000,
-        /*.rate_min =          */ 48000,
-        /*.rate_max =          */ 48000,
-        /*.channels_min =      */       2,
-        /*.channels_max =      */       2,
-        /*.buffer_bytes_max =  */ (32*1024),
-        /*.period_bytes_min =  */ 64,
-        /*.period_bytes_max =  */ (16*1024),
-        /*.periods_min =       */       2,
-        /*.periods_max =       */       8,
-        /*.fifo_size =         */ 0
+        .formats =              SNDRV_PCM_FMTBIT_S16_LE,
+        .rates =                SNDRV_PCM_RATE_48000,
+        .rate_min =             48000,
+        .rate_max =             48000,
+        .channels_min =         2,
+        .channels_max =         2,
+        .buffer_bytes_max =     (32*1024),
+        .period_bytes_min =     64,
+        .period_bytes_max =     (16*1024),
+        .periods_min =          2,
+        .periods_max =          8,
+        .fifo_size =            0,
 };
 
-static snd_pcm_hardware_t snd_emu10k1x_capture_hw = {
-        /*.info =              */       (SNDRV_PCM_INFO_MMAP | 
+static struct snd_pcm_hardware snd_emu10k1x_capture_hw = {
+        .info =                 (SNDRV_PCM_INFO_MMAP | 
                                  SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
                                  SNDRV_PCM_INFO_MMAP_VALID),
-        /*.formats =           */ SNDRV_PCM_FMTBIT_S16_LE,
-        /*.rates =             */ SNDRV_PCM_RATE_48000,
-        /*.rate_min =          */ 48000,
-        /*.rate_max =          */ 48000,
-        /*.channels_min =      */       2,
-        /*.channels_max =      */       2,
-        /*.buffer_bytes_max =  */ (32*1024),
-        /*.period_bytes_min =  */ 64,
-        /*.period_bytes_max =  */ (16*1024),
-        /*.periods_min =       */       2,
-        /*.periods_max =       */       2,
-        /*.fifo_size =         */ 0
+        .formats =              SNDRV_PCM_FMTBIT_S16_LE,
+        .rates =                SNDRV_PCM_RATE_48000,
+        .rate_min =             48000,
+        .rate_max =             48000,
+        .channels_min =         2,
+        .channels_max =         2,
+        .buffer_bytes_max =     (32*1024),
+        .period_bytes_min =     64,
+        .period_bytes_max =     (16*1024),
+        .periods_min =          2,
+        .periods_max =          2,
+        .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 chn)
@@ -313 +309 @@
 }
 
-static void snd_emu10k1x_ptr_write(emu10k1x_t *emu, 
+static void snd_emu10k1x_ptr_write(struct emu10k1x *emu, 
                                    unsigned int reg, 
                                    unsigned int chn, 
@@ -329 +325 @@
 }
 
-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;
@@ -340 +336 @@
 }
 
-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;
@@ -351 +347 @@
 }
 
-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;
@@ -360 +356 @@
 }
 
-static void snd_emu10k1x_pcm_free_substream(snd_pcm_runtime_t *runtime)
-{
-        emu10k1x_pcm_t *epcm = runtime->private_data;
-  
-        if (epcm)
-                kfree(epcm);
-}
-
-static void snd_emu10k1x_pcm_interrupt(emu10k1x_t *emu, emu10k1x_voice_t *voice)
-{
-        emu10k1x_pcm_t *epcm;
+static void snd_emu10k1x_pcm_free_substream(struct snd_pcm_runtime *runtime)
+{
+        kfree(runtime->private_data);
+}
+
+static void snd_emu10k1x_pcm_interrupt(struct emu10k1x *emu, struct emu10k1x_voice *voice)
+{
+        struct emu10k1x_pcm *epcm;
 
         if ((epcm = voice->epcm) == NULL)
@@ -386 +379 @@
 
 /* open callback */
-static int snd_emu10k1x_playback_open(snd_pcm_substream_t *substream)
-{
-        emu10k1x_t *chip = snd_pcm_substream_chip(substream);
-        emu10k1x_pcm_t *epcm;
-        snd_pcm_runtime_t *runtime = substream->runtime;
+static int snd_emu10k1x_playback_open(struct snd_pcm_substream *substream)
+{
+        struct emu10k1x *chip = snd_pcm_substream_chip(substream);
+        struct emu10k1x_pcm *epcm;
+        struct snd_pcm_runtime *runtime = substream->runtime;
         int err;
 
@@ -399 +392 @@
                 return err;
 
-        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
+        epcm = (struct emu10k1x_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
         if (epcm == NULL)
                 return -ENOMEM;
@@ -414 +407 @@
 
 /* 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;
@@ -420 +413 @@
 
 /* hw_params callback */
-static int snd_emu10k1x_pcm_hw_params(snd_pcm_substream_t *substream,
-                                      snd_pcm_hw_params_t * hw_params)
-{
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        emu10k1x_pcm_t *epcm = runtime->private_data;
+static int snd_emu10k1x_pcm_hw_params(struct snd_pcm_substream *substream,
+                                      struct snd_pcm_hw_params *hw_params)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct emu10k1x_pcm *epcm = runtime->private_data;
 
         if (! epcm->voice) {
@@ -437 +430 @@
 
 /* hw_free callback */
-static int snd_emu10k1x_pcm_hw_free(snd_pcm_substream_t *substream)
-{
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        emu10k1x_pcm_t *epcm;
+static int snd_emu10k1x_pcm_hw_free(struct snd_pcm_substream *substream)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct emu10k1x_pcm *epcm;
 
         if (runtime->private_data == NULL)
@@ -457 +450 @@
 
 /* prepare callback */
-static int snd_emu10k1x_pcm_prepare(snd_pcm_substream_t *substream)
-{
-        emu10k1x_t *emu = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        emu10k1x_pcm_t *epcm = runtime->private_data;
+static int snd_emu10k1x_pcm_prepare(struct snd_pcm_substream *substream)
+{
+        struct emu10k1x *emu = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct emu10k1x_pcm *epcm = runtime->private_data;
         int voice = epcm->voice->number;
         u32 *table_base = (u32 *)(emu->dma_buffer.area+1024*voice);
@@ -486 +479 @@
 
 /* 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)
 {
-        emu10k1x_t *emu = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        emu10k1x_pcm_t *epcm = runtime->private_data;
+        struct emu10k1x *emu = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct emu10k1x_pcm *epcm = runtime->private_data;
         int channel = epcm->voice->number;
         int result = 0;
@@ -520 +513 @@
 /* pointer callback */
 static snd_pcm_uframes_t
-snd_emu10k1x_pcm_pointer(snd_pcm_substream_t *substream)
-{
-        emu10k1x_t *emu = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        emu10k1x_pcm_t *epcm = runtime->private_data;
+snd_emu10k1x_pcm_pointer(struct snd_pcm_substream *substream)
+{
+        struct emu10k1x *emu = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct emu10k1x_pcm *epcm = runtime->private_data;
         int channel = epcm->voice->number;
         snd_pcm_uframes_t ptr = 0, ptr1 = 0, ptr2= 0,ptr3 = 0,ptr4 = 0;
@@ -551 +544 @@
 
 /* operators */
-static snd_pcm_ops_t snd_emu10k1x_playback_ops = {
-        /*.open =       */ snd_emu10k1x_playback_open,
-        /*.close =      */ snd_emu10k1x_playback_close,
-        /*.ioctl =      */ snd_pcm_lib_ioctl,
-        /*.hw_params =  */ snd_emu10k1x_pcm_hw_params,
-        /*.hw_free =    */ snd_emu10k1x_pcm_hw_free,
-        /*.prepare =    */ snd_emu10k1x_pcm_prepare,
-        /*.trigger =    */ snd_emu10k1x_pcm_trigger,
-        /*.pointer =    */ snd_emu10k1x_pcm_pointer,
-        0,0,0,0
+static struct snd_pcm_ops snd_emu10k1x_playback_ops = {
+        .open =        snd_emu10k1x_playback_open,
+        .close =       snd_emu10k1x_playback_close,
+        .ioctl =       snd_pcm_lib_ioctl,
+        .hw_params =   snd_emu10k1x_pcm_hw_params,
+        .hw_free =     snd_emu10k1x_pcm_hw_free,
+        .prepare =     snd_emu10k1x_pcm_prepare,
+        .trigger =     snd_emu10k1x_pcm_trigger,
+        .pointer =     snd_emu10k1x_pcm_pointer,
 };
 
 /* open_capture callback */
-static int snd_emu10k1x_pcm_open_capture(snd_pcm_substream_t *substream)
-{
-        emu10k1x_t *chip = snd_pcm_substream_chip(substream);
-        emu10k1x_pcm_t *epcm;
-        snd_pcm_runtime_t *runtime = substream->runtime;
+static int snd_emu10k1x_pcm_open_capture(struct snd_pcm_substream *substream)
+{
+        struct emu10k1x *chip = snd_pcm_substream_chip(substream);
+        struct emu10k1x_pcm *epcm;
+        struct snd_pcm_runtime *runtime = substream->runtime;
         int err;
 
@@ -576 +568 @@
                 return err;
 
-        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
+        epcm = (struct emu10k1x_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
         if (epcm == NULL)
                 return -ENOMEM;
@@ -592 +584 @@
 
 /* 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;
@@ -598 +590 @@
 
 /* hw_params callback */
-static int snd_emu10k1x_pcm_hw_params_capture(snd_pcm_substream_t *substream,
-                                              snd_pcm_hw_params_t * hw_params)
-{
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        emu10k1x_pcm_t *epcm = runtime->private_data;
+static int snd_emu10k1x_pcm_hw_params_capture(struct snd_pcm_substream *substream,
+                                              struct snd_pcm_hw_params *hw_params)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct emu10k1x_pcm *epcm = runtime->private_data;
 
         if (! epcm->voice) {
@@ -617 +609 @@
 
 /* hw_free callback */
-static int snd_emu10k1x_pcm_hw_free_capture(snd_pcm_substream_t *substream)
-{
-        snd_pcm_runtime_t *runtime = substream->runtime;
-
-        emu10k1x_pcm_t *epcm;
+static int snd_emu10k1x_pcm_hw_free_capture(struct snd_pcm_substream *substream)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+
+        struct emu10k1x_pcm *epcm;
 
         if (runtime->private_data == NULL)
@@ -637 +629 @@
 
 /* prepare capture callback */
-static int snd_emu10k1x_pcm_prepare_capture(snd_pcm_substream_t *substream)
-{
-        emu10k1x_t *emu = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
+static int snd_emu10k1x_pcm_prepare_capture(struct snd_pcm_substream *substream)
+{
+        struct emu10k1x *emu = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
 
         snd_emu10k1x_ptr_write(emu, CAPTURE_DMA_ADDR, 0, runtime->dma_addr);
@@ -651 +643 @@
 
 /* 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)
 {
-        emu10k1x_t *emu = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        emu10k1x_pcm_t *epcm = runtime->private_data;
+        struct emu10k1x *emu = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct emu10k1x_pcm *epcm = runtime->private_data;
         int result = 0;
 
@@ -681 +673 @@
 /* pointer_capture callback */
 static snd_pcm_uframes_t
-snd_emu10k1x_pcm_pointer_capture(snd_pcm_substream_t *substream)
-{
-        emu10k1x_t *emu = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        emu10k1x_pcm_t *epcm = runtime->private_data;
+snd_emu10k1x_pcm_pointer_capture(struct snd_pcm_substream *substream)
+{
+        struct emu10k1x *emu = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct emu10k1x_pcm *epcm = runtime->private_data;
         snd_pcm_uframes_t ptr;
 
@@ -698 +690 @@
 }
 
-static snd_pcm_ops_t snd_emu10k1x_capture_ops = {
-        /*.open =       */ snd_emu10k1x_pcm_open_capture,
-        /*.close =      */ snd_emu10k1x_pcm_close_capture,
-        /*.ioctl =      */ snd_pcm_lib_ioctl,
-        /*.hw_params =  */ snd_emu10k1x_pcm_hw_params_capture,
-        /*.hw_free =    */ snd_emu10k1x_pcm_hw_free_capture,
-        /*.prepare =    */ snd_emu10k1x_pcm_prepare_capture,
-        /*.trigger =    */ snd_emu10k1x_pcm_trigger_capture,
-        /*.pointer =    */ snd_emu10k1x_pcm_pointer_capture,
-        0,0,0,0
+static struct snd_pcm_ops snd_emu10k1x_capture_ops = {
+        .open =        snd_emu10k1x_pcm_open_capture,
+        .close =       snd_emu10k1x_pcm_close_capture,
+        .ioctl =       snd_pcm_lib_ioctl,
+        .hw_params =   snd_emu10k1x_pcm_hw_params_capture,
+        .hw_free =     snd_emu10k1x_pcm_hw_free_capture,
+        .prepare =     snd_emu10k1x_pcm_prepare_capture,
+        .trigger =     snd_emu10k1x_pcm_trigger_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)
 {
-        emu10k1x_t *emu = ac97->private_data;
+        struct emu10k1x *emu = ac97->private_data;
         unsigned long flags;
         unsigned short val;
@@ -724 +715 @@
 }
 
-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)
 {
-        emu10k1x_t *emu = ac97->private_data;
+        struct emu10k1x *emu = ac97->private_data;
         unsigned long flags;
   
@@ -736 +727 @@
 }
 
-static int snd_emu10k1x_ac97(emu10k1x_t *chip)
-{
-        ac97_bus_t *pbus;
-        ac97_template_t ac97;
+static int snd_emu10k1x_ac97(struct emu10k1x *chip)
+{
+        struct snd_ac97_bus *pbus;
+        struct snd_ac97_template ac97;
         int err;
-        static ac97_bus_ops_t ops = {
-            0,
-            /*.write = */snd_emu10k1x_ac97_write,
-            /*.read = */snd_emu10k1x_ac97_read, 0,0
+        static struct snd_ac97_bus_ops ops = {
+                .write = snd_emu10k1x_ac97_write,
+                .read = snd_emu10k1x_ac97_read,
         };
   
@@ -757 +747 @@
 }
 
-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);
@@ -766 +756 @@
 
         // release the i/o port
-        if (chip->res_port) {
-                release_resource(chip->res_port);
-                kfree_nocheck(chip->res_port);
-        }
+        release_and_free_resource(chip->res_port);
+
         // release the irq
         if (chip->irq >= 0)
@@ -786 +774 @@
 }
 
-static int snd_emu10k1x_dev_free(snd_device_t *device)
-{
-        emu10k1x_t *chip = device->device_data;
+static int snd_emu10k1x_dev_free(struct snd_device *device)
+{
+        struct emu10k1x *chip = device->device_data;
         return snd_emu10k1x_free(chip);
 }
@@ -797 +785 @@
         unsigned int status;
 
-        emu10k1x_t *chip = dev_id;
-        emu10k1x_voice_t *pvoice = chip->voices;
+        struct emu10k1x *chip = dev_id;
+        struct emu10k1x_voice *pvoice = chip->voices;
         int i;
         int mask;
@@ -804 +792 @@
         status = inl(chip->port + IPR);
 
-        if(status) {
-                // capture interrupt
-                if(status & (IPR_CAP_0_LOOP | IPR_CAP_0_HALF_LOOP)) {
-                        emu10k1x_voice_t *pvoice = &chip->capture_voice;
-                        if(pvoice->use)
+        if (! status)
+                return IRQ_NONE;
+
+        // capture interrupt
+        if (status & (IPR_CAP_0_LOOP | IPR_CAP_0_HALF_LOOP)) {
+                struct emu10k1x_voice *pvoice = &chip->capture_voice;
+                if (pvoice->use)
+                        snd_emu10k1x_pcm_interrupt(chip, pvoice);
+                else
+                        snd_emu10k1x_intr_disable(chip, 
+                                                  INTE_CAP_0_LOOP |
+                                                  INTE_CAP_0_HALF_LOOP);
+        }
+                
+        mask = IPR_CH_0_LOOP|IPR_CH_0_HALF_LOOP;
+        for (i = 0; i < 3; i++) {
+                if (status & mask) {
+                        if (pvoice->use)
                                 snd_emu10k1x_pcm_interrupt(chip, pvoice);
-                        else
-                                snd_emu10k1x_intr_disable(chip, 
-                                                          INTE_CAP_0_LOOP |
-                                                          INTE_CAP_0_HALF_LOOP);
+                        else 
+                                snd_emu10k1x_intr_disable(chip, mask);
                 }
+                pvoice++;
+                mask <<= 1;
+        }
                 
-                mask = IPR_CH_0_LOOP|IPR_CH_0_HALF_LOOP;
-                for(i = 0; i < 3; i++) {
-                        if(status & mask) {
-                                if(pvoice->use)
-                                        snd_emu10k1x_pcm_interrupt(chip, pvoice);
-                                else 
-                                        snd_emu10k1x_intr_disable(chip, mask);
-                        }
-                        pvoice++;
-                        mask <<= 1;
-                }
+        if (status & (IPR_MIDITRANSBUFEMPTY|IPR_MIDIRECVBUFEMPTY)) {
+                if (chip->midi.interrupt)
+                        chip->midi.interrupt(chip, status);
+                else
+                        snd_emu10k1x_intr_disable(chip, INTE_MIDITXENABLE|INTE_MIDIRXENABLE);
+        }
                 
-                if (status & (IPR_MIDITRANSBUFEMPTY|IPR_MIDIRECVBUFEMPTY)) {
-                        if (chip->midi.interrupt)
-                                chip->midi.interrupt(chip, status);
-                        else
-                                snd_emu10k1x_intr_disable(chip, INTE_MIDITXENABLE|INTE_MIDIRXENABLE);
-                }
-                
-                // acknowledge the interrupt if necessary
-                if(status)
-                        outl(status, chip->port+IPR);
-
-//              snd_printk(KERN_INFO "interrupt %08x\n", status);
-        }
-
+        // acknowledge the interrupt if necessary
+        outl(status, chip->port + IPR);
+
+        // snd_printk(KERN_INFO "interrupt %08x\n", status);
         return IRQ_HANDLED;
 }
 
-static void snd_emu10k1x_pcm_free(snd_pcm_t *pcm)
-{
-        emu10k1x_t *emu = pcm->private_data;
-        emu->pcm = NULL;
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
-static int __devinit snd_emu10k1x_pcm(emu10k1x_t *emu, int device, snd_pcm_t **rpcm)
-{
-        snd_pcm_t *pcm;
+static int __devinit snd_emu10k1x_pcm(struct emu10k1x *emu, int device, struct snd_pcm **rpcm)
+{
+        struct snd_pcm *pcm;
         int err;
         int capture = 0;
@@ -867 +847 @@
   
         pcm->private_data = emu;
-        pcm->private_free = snd_emu10k1x_pcm_free;
         
         switch(device) {
@@ -905 +884 @@
 }
 
-static int __devinit snd_emu10k1x_create(snd_card_t *card,
+static int __devinit snd_emu10k1x_create(struct snd_card *card,
                                          struct pci_dev *pci,
-                                         emu10k1x_t **rchip)
-{
-        emu10k1x_t *chip;
+                                         struct emu10k1x **rchip)
+{
+        struct emu10k1x *chip;
         int err;
         int ch;
-        static snd_device_ops_t ops = {
-                /*.dev_free = */snd_emu10k1x_dev_free,0,0,0
+        static struct snd_device_ops ops = {
+                .dev_free = snd_emu10k1x_dev_free,
         };
   
@@ -920 +899 @@
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
-        pci_set_dma_mask(pci, 0x0fffffff);
-
-        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+        pci_set_dma_mask(pci, 0x0fffffff);
+  
+        chip = (struct emu10k1x *)kzalloc(sizeof(*chip), GFP_KERNEL);
         if (chip == NULL) {
                 pci_disable_device(pci);
@@ -1021 +1000 @@
 }
 
-static void snd_emu10k1x_proc_reg_read(snd_info_entry_t *entry, 
-                                       snd_info_buffer_t * buffer)
-{
-        emu10k1x_t *emu = entry->private_data;
+static void snd_emu10k1x_proc_reg_read(struct snd_info_entry *entry, 
+                                       struct snd_info_buffer *buffer)
+{
+        struct emu10k1x *emu = entry->private_data;
         unsigned long value,value1,value2;
         unsigned long flags;
@@ -1049 +1028 @@
 }
 
-static void snd_emu10k1x_proc_reg_write(snd_info_entry_t *entry, 
-                                        snd_info_buffer_t *buffer)
-{
-        emu10k1x_t *emu = entry->private_data;
+static void snd_emu10k1x_proc_reg_write(struct snd_info_entry *entry, 
+                                        struct snd_info_buffer *buffer)
+{
+        struct emu10k1x *emu = entry->private_data;
         char line[64];
         unsigned int reg, channel_id , val;
-
+#if 0
         while (!snd_info_get_line(buffer, line, sizeof(line))) {
                 if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3)
@@ -1063 +1042 @@
                     && (channel_id >=0) && (channel_id <= 2) )
                         snd_emu10k1x_ptr_write(emu, reg, channel_id, val);
-        }
-}
-
-static int __devinit snd_emu10k1x_proc_init(emu10k1x_t * emu)
-{
-        snd_info_entry_t *entry;
+        }
+#endif
+}
+
+static int __devinit snd_emu10k1x_proc_init(struct emu10k1x * emu)
+{
+        struct snd_info_entry *entry;
         
         if(! snd_card_proc_new(emu->card, "emu10k1x_regs", &entry)) {
@@ -1074 +1054 @@
                 entry->c.text.write_size = 64;
                 entry->c.text.write = snd_emu10k1x_proc_reg_write;
+                entry->mode |= S_IWUSR;
                 entry->private_data = emu;
         }
@@ -1080 +1061 @@
 }
 
-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;
@@ -1089 +1070 @@
 }
 
-static int snd_emu10k1x_shared_spdif_get(snd_kcontrol_t * kcontrol,
-                                         snd_ctl_elem_value_t * ucontrol)
-{
-        emu10k1x_t *emu = snd_kcontrol_chip(kcontrol);
+static int snd_emu10k1x_shared_spdif_get(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+        struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
 
         ucontrol->value.integer.value[0] = (snd_emu10k1x_ptr_read(emu, SPDIF_SELECT, 0) == 0x700) ? 0 : 1;
@@ -1099 +1080 @@
 }
 
-static int snd_emu10k1x_shared_spdif_put(snd_kcontrol_t * kcontrol,
-                                         snd_ctl_elem_value_t * ucontrol)
-{
-        emu10k1x_t *emu = snd_kcontrol_chip(kcontrol);
+static int snd_emu10k1x_shared_spdif_put(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+        struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
         unsigned int val;
         int change = 0;
@@ -1122 +1103 @@
 }
 
-static snd_kcontrol_new_t snd_emu10k1x_shared_spdif __devinitdata =
-{
-        /*.iface = */     SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        /*.name =  */           "Analog/Digital Output Jack",0,0,0,
-        /*.info =  */           snd_emu10k1x_shared_spdif_info,
-        /*.get =   */           snd_emu10k1x_shared_spdif_get,
-        /*.put =   */           snd_emu10k1x_shared_spdif_put,0
+static struct snd_kcontrol_new snd_emu10k1x_shared_spdif __devinitdata =
+{
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "Analog/Digital Output Jack",
+        .info =         snd_emu10k1x_shared_spdif_info,
+        .get =          snd_emu10k1x_shared_spdif_get,
+        .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;
@@ -1138 +1119 @@
 }
 
-static int snd_emu10k1x_spdif_get(snd_kcontrol_t * kcontrol,
-                                  snd_ctl_elem_value_t * ucontrol)
-{
-        emu10k1x_t *emu = snd_kcontrol_chip(kcontrol);
+static int snd_emu10k1x_spdif_get(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol)
+{
+        struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
         unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
 
@@ -1151 +1132 @@
 }
 
-static int snd_emu10k1x_spdif_get_mask(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
+static int snd_emu10k1x_spdif_get_mask(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
 {
         ucontrol->value.iec958.status[0] = 0xff;
@@ -1161 +1142 @@
 }
 
-static int snd_emu10k1x_spdif_put(snd_kcontrol_t * kcontrol,
-                                  snd_ctl_elem_value_t * ucontrol)
-{
-        emu10k1x_t *emu = snd_kcontrol_chip(kcontrol);
+static int snd_emu10k1x_spdif_put(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_value *ucontrol)
+{
+        struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
         unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
         int change;
@@ -1181 +1162 @@
 }
 
-static snd_kcontrol_new_t snd_emu10k1x_spdif_mask_control =
-{
-        /*.iface = */       SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        /*.name =  */       SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),0,
-        /*.access =*/   SNDRV_CTL_ELEM_ACCESS_READ,
-        /*.count = */     3,
-        /*.info =  */       snd_emu10k1x_spdif_info,
-        /*.get =   */       snd_emu10k1x_spdif_get_mask,0,0
+static struct snd_kcontrol_new snd_emu10k1x_spdif_mask_control =
+{
+        .access =       SNDRV_CTL_ELEM_ACCESS_READ,
+        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+        .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),
+        .count =        3,
+        .info =         snd_emu10k1x_spdif_info,
+        .get =          snd_emu10k1x_spdif_get_mask
 };
 
-static snd_kcontrol_new_t snd_emu10k1x_spdif_control =
-{
-        /*.iface = */     SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        /*.name =  */       SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),0,0,
-        /*.count = */     3,
-        /*.info =  */       snd_emu10k1x_spdif_info,
-        /*.get =   */       snd_emu10k1x_spdif_get,
-        /*.put =   */       snd_emu10k1x_spdif_put,0
+static struct snd_kcontrol_new snd_emu10k1x_spdif_control =
+{
+        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+        .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+        .count =        3,
+        .info =         snd_emu10k1x_spdif_info,
+        .get =          snd_emu10k1x_spdif_get,
+        .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;
-        snd_kcontrol_t *kctl;
-        snd_card_t *card = emu->card;
+        struct snd_kcontrol *kctl;
+        struct snd_card *card = emu->card;
 
         if ((kctl = snd_ctl_new1(&snd_emu10k1x_spdif_mask_control, emu)) == NULL)
@@ -1226 +1207 @@
 #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);
 }
 
-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);
@@ -1248 +1229 @@
 #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;
@@ -1263 +1244 @@
  */
 
-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;
@@ -1296 +1278 @@
 }
 
-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);
 }
 
-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;
@@ -1333 +1316 @@
 }
 
-static int snd_emu10k1x_midi_input_open(snd_rawmidi_substream_t * substream)
-{
-        emu10k1x_t *emu;
-        emu10k1x_midi_t *midi = (emu10k1x_midi_t *)substream->rmidi->private_data;
+static int snd_emu10k1x_midi_input_open(struct snd_rawmidi_substream *substream)
+{
+        struct emu10k1x *emu;
+        struct emu10k1x_midi *midi = substream->rmidi->private_data;
         unsigned long flags;
         
@@ -1354 +1337 @@
 }
 
-static int snd_emu10k1x_midi_output_open(snd_rawmidi_substream_t * substream)
-{
-        emu10k1x_t *emu;
-        emu10k1x_midi_t *midi = (emu10k1x_midi_t *)substream->rmidi->private_data;
+static int snd_emu10k1x_midi_output_open(struct snd_rawmidi_substream *substream)
+{
+        struct emu10k1x *emu;
+        struct emu10k1x_midi *midi = substream->rmidi->private_data;
         unsigned long flags;
 
@@ -1375 +1358 @@
 }
 
-static int snd_emu10k1x_midi_input_close(snd_rawmidi_substream_t * substream)
-{
-        emu10k1x_t *emu;
-        emu10k1x_midi_t *midi = (emu10k1x_midi_t *)substream->rmidi->private_data;
+static int snd_emu10k1x_midi_input_close(struct snd_rawmidi_substream *substream)
+{
+        struct emu10k1x *emu;
+        struct emu10k1x_midi *midi = substream->rmidi->private_data;
         unsigned long flags;
 
@@ -1396 +1379 @@
 }
 
-static int snd_emu10k1x_midi_output_close(snd_rawmidi_substream_t * substream)
-{
-        emu10k1x_t *emu;
-        emu10k1x_midi_t *midi = (emu10k1x_midi_t *)substream->rmidi->private_data;
+static int snd_emu10k1x_midi_output_close(struct snd_rawmidi_substream *substream)
+{
+        struct emu10k1x *emu;
+        struct emu10k1x_midi *midi = substream->rmidi->private_data;
         unsigned long flags;
 
@@ -1417 +1400 @@
 }
 
-static void snd_emu10k1x_midi_input_trigger(snd_rawmidi_substream_t * substream, int up)
-{
-        emu10k1x_t *emu;
-        emu10k1x_midi_t *midi = (emu10k1x_midi_t *)substream->rmidi->private_data;
+static void snd_emu10k1x_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)
+{
+        struct emu10k1x *emu;
+        struct emu10k1x_midi *midi = substream->rmidi->private_data;
         emu = midi->emu;
         snd_assert(emu, return);
@@ -1430 +1413 @@
 }
 
-static void snd_emu10k1x_midi_output_trigger(snd_rawmidi_substream_t * substream, int up)
-{
-        emu10k1x_t *emu;
-        emu10k1x_midi_t *midi = (emu10k1x_midi_t *)substream->rmidi->private_data;
+static void snd_emu10k1x_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)
+{
+        struct emu10k1x *emu;
+        struct emu10k1x_midi *midi = substream->rmidi->private_data;
         unsigned long flags;
 
@@ -1470 +1453 @@
  */
 
-static snd_rawmidi_ops_t snd_emu10k1x_midi_output =
-{
-        snd_emu10k1x_midi_output_open,
-        snd_emu10k1x_midi_output_close,
-        snd_emu10k1x_midi_output_trigger,0
+static struct snd_rawmidi_ops snd_emu10k1x_midi_output =
+{
+        .open =         snd_emu10k1x_midi_output_open,
+        .close =        snd_emu10k1x_midi_output_close,
+        .trigger =      snd_emu10k1x_midi_output_trigger,
 };
 
-static snd_rawmidi_ops_t snd_emu10k1x_midi_input =
-{
-        snd_emu10k1x_midi_input_open,
-        snd_emu10k1x_midi_input_close,
-        snd_emu10k1x_midi_input_trigger,0
+static struct snd_rawmidi_ops snd_emu10k1x_midi_input =
+{
+        .open =         snd_emu10k1x_midi_input_open,
+        .close =        snd_emu10k1x_midi_input_close,
+        .trigger =      snd_emu10k1x_midi_input_trigger,
 };
 
-static void snd_emu10k1x_midi_free(snd_rawmidi_t *rmidi)
-{
-        emu10k1x_midi_t *midi = (emu10k1x_midi_t *)rmidi->private_data;
+static void snd_emu10k1x_midi_free(struct snd_rawmidi *rmidi)
+{
+        struct emu10k1x_midi *midi = rmidi->private_data;
         midi->interrupt = NULL;
         midi->rmidi = NULL;
 }
 
-static int __devinit emu10k1x_midi_init(emu10k1x_t *emu, emu10k1x_midi_t *midi, int device, char *name)
-{
-        snd_rawmidi_t *rmidi;
+static int __devinit emu10k1x_midi_init(struct emu10k1x *emu,
+                                        struct emu10k1x_midi *midi, int device, char *name)
+{
+        struct snd_rawmidi *rmidi;
         int err;
 
@@ -1514 +1498 @@
 }
 
-static int __devinit snd_emu10k1x_midi(emu10k1x_t *emu)
-{
-        emu10k1x_midi_t *midi = &emu->midi;
+static int __devinit snd_emu10k1x_midi(struct emu10k1x *emu)
+{
+        struct emu10k1x_midi *midi = &emu->midi;
         int err;
 
@@ -1535 +1519 @@
 {
         static int dev;
-        snd_card_t *card;
-        emu10k1x_t *chip;
+        struct snd_card *card;
+        struct emu10k1x *chip;
         int err;
 
@@ -1615 +1599 @@
 // pci_driver definition
 static struct pci_driver driver = {
-    0,0,0,
-        /*.name = */"EMU10K1X",
-        /*.id_table = */snd_emu10k1x_ids,
-        /*.probe = */snd_emu10k1x_probe,
-        /*.remove = */snd_emu10k1x_remove,
-        0,0
+        .name = "EMU10K1X",
+        .id_table = snd_emu10k1x_ids,
+        .probe = snd_emu10k1x_probe,
+        .remove = snd_emu10k1x_remove,
 };
 
@@ -1628 +1610 @@
         int err;
 
-        if ((err = pci_module_init(&driver)) > 0)
+        if ((err = pci_register_driver(&driver)) > 0)
                 return err;
 

GPL/trunk/alsa-kernel/pci/emu10k1/emufx.c

@@ -312 +312 @@
 static int snd_emu10k1_gpr_ctl_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
-    snd_emu10k1_fx8010_ctl_t *ctl = (snd_emu10k1_fx8010_ctl_t *)kcontrol->private_value;
+    struct snd_emu10k1_fx8010_ctl *ctl = (struct snd_emu10k1_fx8010_ctl *)kcontrol->private_value;
 
     if (ctl->min == 0 && ctl->max == 1)
@@ -326 +326 @@
 static int snd_emu10k1_gpr_ctl_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
-    snd_emu10k1_fx8010_ctl_t *ctl = (snd_emu10k1_fx8010_ctl_t *)kcontrol->private_value;
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_fx8010_ctl *ctl = (struct snd_emu10k1_fx8010_ctl *)kcontrol->private_value;
     unsigned long flags;
     unsigned int i;
@@ -340 +340 @@
 static int snd_emu10k1_gpr_ctl_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
-    snd_emu10k1_fx8010_ctl_t *ctl = (snd_emu10k1_fx8010_ctl_t *)kcontrol->private_value;
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_fx8010_ctl *ctl = (struct snd_emu10k1_fx8010_ctl *)kcontrol->private_value;
     unsigned long flags;
     unsigned int nval, val;
@@ -388 +388 @@
  */
 
-static void snd_emu10k1_fx8010_interrupt(emu10k1_t *emu)
-{
-    snd_emu10k1_fx8010_irq_t *irq, *nirq;
+static void snd_emu10k1_fx8010_interrupt(struct snd_emu10k1 *emu)
+{
+    struct snd_emu10k1_fx8010_irq *irq, *nirq;
 
     irq = emu->fx8010.irq_handlers;
@@ -404 +404 @@
 }
 
-int snd_emu10k1_fx8010_register_irq_handler(emu10k1_t *emu,
+int snd_emu10k1_fx8010_register_irq_handler(struct snd_emu10k1 *emu,
                                             snd_fx8010_irq_handler_t *handler,
                                             unsigned char gpr_running,
                                             void *private_data,
-                                            snd_emu10k1_fx8010_irq_t **r_irq)
-{
-    snd_emu10k1_fx8010_irq_t *irq;
+                                            struct snd_emu10k1_fx8010_irq **r_irq)
+{
+    struct snd_emu10k1_fx8010_irq *irq;
     unsigned long flags;
 
@@ -437 +437 @@
 }
 
-int snd_emu10k1_fx8010_unregister_irq_handler(emu10k1_t *emu,
-                                              snd_emu10k1_fx8010_irq_t *irq)
-{
-    snd_emu10k1_fx8010_irq_t *tmp;
+int snd_emu10k1_fx8010_unregister_irq_handler(struct snd_emu10k1 *emu,
+                                              struct snd_emu10k1_fx8010_irq *irq)
+{
+    struct snd_emu10k1_fx8010_irq *tmp;
     unsigned long flags;
 
@@ -496 +496 @@
     snd_emu10k1_audigy_write_op(icode, ptr, op, r, a, x, y)
 
-void snd_emu10k1_efx_write(emu10k1_t *emu, unsigned int pc, unsigned int data)
+void snd_emu10k1_efx_write(struct snd_emu10k1 *emu, unsigned int pc, unsigned int data)
 {
     pc += emu->audigy ? A_MICROCODEBASE : MICROCODEBASE;
@@ -502 +502 @@
 }
 
-unsigned int snd_emu10k1_efx_read(emu10k1_t *emu, unsigned int pc)
+unsigned int snd_emu10k1_efx_read(struct snd_emu10k1 *emu, unsigned int pc)
 {
     pc += emu->audigy ? A_MICROCODEBASE : MICROCODEBASE;
@@ -508 +508 @@
 }
 
-static int snd_emu10k1_gpr_poke(emu10k1_t *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_gpr_poke(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
 {
     int gpr;
@@ -523 +523 @@
 }
 
-static int snd_emu10k1_gpr_peek(emu10k1_t *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_gpr_peek(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
 {
     int gpr;
@@ -537 +537 @@
 }
 
-static int snd_emu10k1_tram_poke(emu10k1_t *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_tram_poke(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
 {
     int tram;
@@ -559 +559 @@
 }
 
-static int snd_emu10k1_tram_peek(emu10k1_t *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_tram_peek(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
 {
     int tram;
@@ -581 +581 @@
 }
 
-static int snd_emu10k1_code_poke(emu10k1_t *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_code_poke(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
 {
     u32 pc, lo, hi;
@@ -597 +597 @@
 }
 
-static int snd_emu10k1_code_peek(emu10k1_t *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_code_peek(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
 {
     u32 pc;
@@ -612 +612 @@
 }
 
-static snd_emu10k1_fx8010_ctl_t *snd_emu10k1_look_for_ctl(emu10k1_t *emu, snd_ctl_elem_id_t *id)
-{
-    snd_emu10k1_fx8010_ctl_t *ctl;
+static struct snd_emu10k1_fx8010_ctl *snd_emu10k1_look_for_ctl(struct snd_emu10k1 *emu, snd_ctl_elem_id_t *id)
+{
+    struct snd_emu10k1_fx8010_ctl *ctl;
     snd_kcontrol_t *kcontrol;
     struct list_head *list;
@@ -629 +629 @@
 }
 
-static int snd_emu10k1_verify_controls(emu10k1_t *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_verify_controls(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
 {
     unsigned int i;
@@ -684 +684 @@
 static void snd_emu10k1_ctl_private_free(snd_kcontrol_t *kctl)
 {
-    snd_emu10k1_fx8010_ctl_t *ctl;
-
-    ctl = (snd_emu10k1_fx8010_ctl_t *)kctl->private_value;
+    struct snd_emu10k1_fx8010_ctl *ctl;
+
+    ctl = (struct snd_emu10k1_fx8010_ctl *)kctl->private_value;
     kctl->private_value = 0;
     list_del(&ctl->list);
@@ -692 +692 @@
 }
 
-static int snd_emu10k1_add_controls(emu10k1_t *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
 {
     unsigned int i, j;
     emu10k1_fx8010_control_gpr_t *_gctl;
     emu10k1_fx8010_control_gpr_t *gctl;
-    snd_emu10k1_fx8010_ctl_t *ctl, *nctl;
+    struct snd_emu10k1_fx8010_ctl *ctl, *nctl;
     snd_kcontrol_new_t knew;
     snd_kcontrol_t *kctl;
@@ -742 +742 @@
         nctl->translation = gctl->translation;
         if (ctl == NULL) {
-            ctl = (snd_emu10k1_fx8010_ctl_t *)kmalloc(sizeof(*ctl), GFP_KERNEL);
+            ctl = (struct snd_emu10k1_fx8010_ctl *)kmalloc(sizeof(*ctl), GFP_KERNEL);
             if (ctl == NULL) {
                 err = -ENOMEM;
@@ -773 +773 @@
 }
 
-static int snd_emu10k1_del_controls(emu10k1_t *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_del_controls(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
 {
     unsigned int i;
     snd_ctl_elem_id_t *_id, id;
-    snd_emu10k1_fx8010_ctl_t *ctl;
+    struct snd_emu10k1_fx8010_ctl *ctl;
     snd_card_t *card = emu->card;
 
@@ -792 +792 @@
 }
 
-static int snd_emu10k1_list_controls(emu10k1_t *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_list_controls(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
 {
     unsigned int i = 0, j;
@@ -798 +798 @@
     emu10k1_fx8010_control_gpr_t *gctl;
     emu10k1_fx8010_control_gpr_t *_gctl;
-    snd_emu10k1_fx8010_ctl_t *ctl;
+    struct snd_emu10k1_fx8010_ctl *ctl;
     snd_ctl_elem_id_t *id;
     struct list_head *list;
@@ -840 +840 @@
 }
 
-static int snd_emu10k1_icode_poke(emu10k1_t *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_icode_poke(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
 {
     int err = 0;
@@ -871 +871 @@
 }
 
-static int snd_emu10k1_icode_peek(emu10k1_t *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_icode_peek(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
 {
     int err;
@@ -889 +889 @@
 }
 
-static int snd_emu10k1_ipcm_poke(emu10k1_t *emu, emu10k1_fx8010_pcm_t *ipcm)
+static int snd_emu10k1_ipcm_poke(struct snd_emu10k1 *emu, emu10k1_fx8010_pcm_t *ipcm)
 {
     unsigned int i;
     int err = 0;
-    snd_emu10k1_fx8010_pcm_t *pcm;
+    struct snd_emu10k1_fx8010_pcm *pcm;
 
     if (ipcm->substream >= EMU10K1_FX8010_PCM_COUNT)
@@ -934 +934 @@
 }
 
-static int snd_emu10k1_ipcm_peek(emu10k1_t *emu, emu10k1_fx8010_pcm_t *ipcm)
+static int snd_emu10k1_ipcm_peek(struct snd_emu10k1 *emu, emu10k1_fx8010_pcm_t *ipcm)
 {
     unsigned int i;
     int err = 0;
-    snd_emu10k1_fx8010_pcm_t *pcm;
+    struct snd_emu10k1_fx8010_pcm *pcm;
 
     if (ipcm->substream >= EMU10K1_FX8010_PCM_COUNT)
@@ -1019 +1019 @@
  */
 
-static int __devinit _snd_emu10k1_audigy_init_efx(emu10k1_t *emu)
+static int __devinit _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu)
 {
     int err, i, z, gpr, nctl;
@@ -1035 +1035 @@
     INIT_LIST_HEAD(&emu->fx8010.gpr_ctl);
 
-    if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL ||
+    if ((icode = (emu10k1_fx8010_code_t *)kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL ||
         (icode->gpr_map = (u_int32_t __user *)kcalloc(512 + 256 + 256 + 2 * 1024, sizeof(u_int32_t), GFP_KERNEL)) == NULL ||
         (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS, sizeof(*controls), GFP_KERNEL)) == NULL) {
@@ -1487 +1487 @@
 
 
-static int __devinit _snd_emu10k1_init_efx(emu10k1_t *emu)
+static int __devinit _snd_emu10k1_init_efx(struct snd_emu10k1 *emu)
 {
     int err, i, z, gpr, tmp, playback, capture;
@@ -1500 +1500 @@
     INIT_LIST_HEAD(&emu->fx8010.gpr_ctl);
 
-    if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL)
+    if ((icode = (emu10k1_fx8010_code_t *)kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL)
         return -ENOMEM;
     if ((icode->gpr_map = (u_int32_t __user *)kcalloc(256 + 160 + 160 + 2 * 512, sizeof(u_int32_t), GFP_KERNEL)) == NULL ||
         (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS, sizeof(emu10k1_fx8010_control_gpr_t), GFP_KERNEL)) == NULL ||
-        (ipcm = kzalloc(sizeof(*ipcm), GFP_KERNEL)) == NULL) {
+        (ipcm = (emu10k1_fx8010_pcm_t *)kzalloc(sizeof(*ipcm), GFP_KERNEL)) == NULL) {
         err = -ENOMEM;
         goto __err;
@@ -2050 +2050 @@
 }
 
-int __devinit snd_emu10k1_init_efx(emu10k1_t *emu)
+int __devinit snd_emu10k1_init_efx(struct snd_emu10k1 *emu)
 {
     if (emu->audigy)
@@ -2058 +2058 @@
 }
 
-void snd_emu10k1_free_efx(emu10k1_t *emu)
+void snd_emu10k1_free_efx(struct snd_emu10k1 *emu)
 {
     /* stop processor */
@@ -2068 +2068 @@
 
 #if 0 // FIXME: who use them?
-int snd_emu10k1_fx8010_tone_control_activate(emu10k1_t *emu, int output)
+int snd_emu10k1_fx8010_tone_control_activate(struct snd_emu10k1 *emu, int output)
 {
     snd_runtime_check(output >= 0 && output < 6, return -EINVAL);
@@ -2075 +2075 @@
 }
 
-int snd_emu10k1_fx8010_tone_control_deactivate(emu10k1_t *emu, int output)
+int snd_emu10k1_fx8010_tone_control_deactivate(struct snd_emu10k1 *emu, int output)
 {
     snd_runtime_check(output >= 0 && output < 6, return -EINVAL);
@@ -2083 +2083 @@
 #endif
 
-int snd_emu10k1_fx8010_tram_setup(emu10k1_t *emu, u32 size)
+int snd_emu10k1_fx8010_tram_setup(struct snd_emu10k1 *emu, u32 size)
 {
     u8 size_reg = 0;
@@ -2138 +2138 @@
 }
 
-static int snd_emu10k1_fx8010_info(emu10k1_t *emu, emu10k1_fx8010_info_t *info)
+static int snd_emu10k1_fx8010_info(struct snd_emu10k1 *emu, emu10k1_fx8010_info_t *info)
 {
     char **fxbus, **extin, **extout;
@@ -2166 +2166 @@
 static int snd_emu10k1_fx8010_ioctl(snd_hwdep_t * hw, struct file *file, unsigned int cmd, unsigned long arg)
 {
-    emu10k1_t *emu = hw->private_data;
+    struct snd_emu10k1 *emu = hw->private_data;
     emu10k1_fx8010_info_t *info;
     emu10k1_fx8010_code_t *icode;
@@ -2228 +2228 @@
         return res;
     case SNDRV_EMU10K1_IOCTL_PCM_PEEK:
-        ipcm = kzalloc(sizeof(*ipcm), GFP_KERNEL);
+        ipcm = (emu10k1_fx8010_pcm_t *)kzalloc(sizeof(*ipcm), GFP_KERNEL);
         if (ipcm == NULL)
             return -ENOMEM;
@@ -2314 +2314 @@
 }
 
-int __devinit snd_emu10k1_fx8010_new(emu10k1_t *emu, int device, snd_hwdep_t ** rhwdep)
+int __devinit snd_emu10k1_fx8010_new(struct snd_emu10k1 *emu, int device, snd_hwdep_t ** rhwdep)
 {
     snd_hwdep_t *hw;

GPL/trunk/alsa-kernel/pci/emu10k1/emumixer.c

@@ -46 +46 @@
                                  snd_ctl_elem_value_t * ucontrol)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
     unsigned long flags;
@@ -85 +85 @@
                                             snd_ctl_elem_value_t * ucontrol)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     unsigned int tmp;
     unsigned long flags;
@@ -112 +112 @@
                                             snd_ctl_elem_value_t * ucontrol)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     int change;
     unsigned int reg, val, tmp;
@@ -157 +157 @@
                                  snd_ctl_elem_value_t * ucontrol)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
     int change;
@@ -195 +195 @@
 };
 
-static void update_emu10k1_fxrt(emu10k1_t *emu, int voice, unsigned char *route)
+static void update_emu10k1_fxrt(struct snd_emu10k1 *emu, int voice, unsigned char *route)
 {
     if (emu->audigy) {
@@ -208 +208 @@
 }
 
-static void update_emu10k1_send_volume(emu10k1_t *emu, int voice, unsigned char *volume)
+static void update_emu10k1_send_volume(struct snd_emu10k1 *emu, int voice, unsigned char *volume)
 {
     snd_emu10k1_ptr_write(emu, PTRX_FXSENDAMOUNT_A, voice, volume[0]);
@@ -227 +227 @@
 static int snd_emu10k1_send_routing_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
     uinfo->count = emu->audigy ? 3*8 : 3*4;
@@ -239 +239 @@
 {
     unsigned long flags;
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
-    emu10k1_pcm_mixer_t *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     int voice, idx;
     int num_efx = emu->audigy ? 8 : 4;
@@ -258 +258 @@
 {
     unsigned long flags;
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
-    emu10k1_pcm_mixer_t *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     int change = 0, voice, idx, val;
     int num_efx = emu->audigy ? 8 : 4;
@@ -300 +300 @@
 static int snd_emu10k1_send_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
     uinfo->count = emu->audigy ? 3*8 : 3*4;
@@ -312 +312 @@
 {
     unsigned long flags;
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
-    emu10k1_pcm_mixer_t *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     int idx;
     int num_efx = emu->audigy ? 8 : 4;
@@ -328 +328 @@
 {
     unsigned long flags;
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
-    emu10k1_pcm_mixer_t *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     int change = 0, idx, val;
     int num_efx = emu->audigy ? 8 : 4;
@@ -378 +378 @@
                                 snd_ctl_elem_value_t * ucontrol)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
-    emu10k1_pcm_mixer_t *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     unsigned long flags;
     int idx;
@@ -394 +394 @@
 {
     unsigned long flags;
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
-    emu10k1_pcm_mixer_t *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     int change = 0, idx, val;
 
@@ -432 +432 @@
 static int snd_emu10k1_efx_send_routing_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
     uinfo->count = emu->audigy ? 8 : 4;
@@ -444 +444 @@
 {
     unsigned long flags;
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
-    emu10k1_pcm_mixer_t *mix = &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     int idx;
     int num_efx = emu->audigy ? 8 : 4;
@@ -462 +462 @@
 {
     unsigned long flags;
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     int ch = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-    emu10k1_pcm_mixer_t *mix = &emu->efx_pcm_mixer[ch];
+    struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[ch];
     int change = 0, idx, val;
     int num_efx = emu->audigy ? 8 : 4;
@@ -500 +500 @@
 static int snd_emu10k1_efx_send_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
     uinfo->count = emu->audigy ? 8 : 4;
@@ -512 +512 @@
 {
     unsigned long flags;
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
-    emu10k1_pcm_mixer_t *mix = &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     int idx;
     int num_efx = emu->audigy ? 8 : 4;
@@ -528 +528 @@
 {
     unsigned long flags;
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     int ch = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-    emu10k1_pcm_mixer_t *mix = &emu->efx_pcm_mixer[ch];
+    struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[ch];
     int change = 0, idx, val;
     int num_efx = emu->audigy ? 8 : 4;
@@ -576 +576 @@
                                     snd_ctl_elem_value_t * ucontrol)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
-    emu10k1_pcm_mixer_t *mix = &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     unsigned long flags;
 
@@ -590 +590 @@
 {
     unsigned long flags;
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     int ch = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-    emu10k1_pcm_mixer_t *mix = &emu->efx_pcm_mixer[ch];
+    struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[ch];
     int change = 0, val;
 
@@ -633 +633 @@
                                         snd_ctl_elem_value_t * ucontrol)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
 
     if (emu->audigy)
@@ -646 +646 @@
 {
     unsigned long flags;
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     unsigned int reg, val;
     int change = 0;
@@ -695 +695 @@
 static void snd_emu10k1_mixer_free_ac97(ac97_t *ac97)
 {
-    emu10k1_t *emu = ac97->private_data;
+    struct snd_emu10k1 *emu = ac97->private_data;
     emu->ac97 = NULL;
 }
@@ -729 +729 @@
 }
 
-int __devinit snd_emu10k1_mixer(emu10k1_t *emu,
+int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
                                 int pcm_device, int multi_device)
 {
@@ -881 +881 @@
     /* initialize the routing and volume table for each pcm playback stream */
     for (pcm = 0; pcm < 32; pcm++) {
-        emu10k1_pcm_mixer_t *mix;
+        struct snd_emu10k1_pcm_mixer *mix;
         int v;
 
@@ -901 +901 @@
     /* initialize the routing and volume table for the multichannel playback stream */
     for (pcm = 0; pcm < NUM_EFX_PLAYBACK; pcm++) {
-        emu10k1_pcm_mixer_t *mix;
+        struct snd_emu10k1_pcm_mixer *mix;
         int v;
 

GPL/trunk/alsa-kernel/pci/emu10k1/emumpu401.c

@@ -29 +29 @@
 #define EMU10K1_MIDI_MODE_OUTPUT        (1<<1)
 
-static inline unsigned char mpu401_read(emu10k1_t *emu, emu10k1_midi_t *mpu, int idx)
+static inline unsigned char mpu401_read(struct snd_emu10k1 *emu, struct snd_emu10k1_midi *mpu, int idx)
 {
         if (emu->audigy)
@@ -37 +37 @@
 }
 
-static inline void mpu401_write(emu10k1_t *emu, emu10k1_midi_t *mpu, int data, int idx)
+static inline void mpu401_write(struct snd_emu10k1 *emu, struct snd_emu10k1_midi *mpu, int data, int idx)
 {
         if (emu->audigy)
@@ -57 +57 @@
 #define MPU401_ACK              0xfe
 
-static void mpu401_clear_rx(emu10k1_t *emu, emu10k1_midi_t *mpu)
+static void mpu401_clear_rx(struct snd_emu10k1 *emu, struct snd_emu10k1_midi *mpu)
 {
         int timeout = 100000;
@@ -72 +72 @@
  */
 
-static void do_emu10k1_midi_interrupt(emu10k1_t *emu, emu10k1_midi_t *midi, unsigned int status)
+static void do_emu10k1_midi_interrupt(struct snd_emu10k1 *emu, struct snd_emu10k1_midi *midi, unsigned int status)
 {
         unsigned char byte;
@@ -107 +107 @@
 }
 
-static void snd_emu10k1_midi_interrupt(emu10k1_t *emu, unsigned int status)
+static void snd_emu10k1_midi_interrupt(struct snd_emu10k1 *emu, unsigned int status)
 {
         do_emu10k1_midi_interrupt(emu, &emu->midi, status);
 }
 
-static void snd_emu10k1_midi_interrupt2(emu10k1_t *emu, unsigned int status)
+static void snd_emu10k1_midi_interrupt2(struct snd_emu10k1 *emu, unsigned int status)
 {
         do_emu10k1_midi_interrupt(emu, &emu->midi2, status);
 }
 
-static void snd_emu10k1_midi_cmd(emu10k1_t * emu, emu10k1_midi_t *midi, unsigned char cmd, int ack)
+static void snd_emu10k1_midi_cmd(struct snd_emu10k1 * emu, struct snd_emu10k1_midi *midi, unsigned char cmd, int ack)
 {
         unsigned long flags;
@@ -151 +151 @@
 static int snd_emu10k1_midi_input_open(snd_rawmidi_substream_t * substream)
 {
-        emu10k1_t *emu;
-        emu10k1_midi_t *midi = (emu10k1_midi_t *)substream->rmidi->private_data;
+        struct snd_emu10k1 *emu;
+        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
         unsigned long flags;
 
@@ -172 +172 @@
 static int snd_emu10k1_midi_output_open(snd_rawmidi_substream_t * substream)
 {
-        emu10k1_t *emu;
-        emu10k1_midi_t *midi = (emu10k1_midi_t *)substream->rmidi->private_data;
+        struct snd_emu10k1 *emu;
+        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
         unsigned long flags;
 
@@ -193 +193 @@
 static int snd_emu10k1_midi_input_close(snd_rawmidi_substream_t * substream)
 {
-        emu10k1_t *emu;
-        emu10k1_midi_t *midi = (emu10k1_midi_t *)substream->rmidi->private_data;
+        struct snd_emu10k1 *emu;
+        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
         unsigned long flags;
 
@@ -214 +214 @@
 static int snd_emu10k1_midi_output_close(snd_rawmidi_substream_t * substream)
 {
-        emu10k1_t *emu;
-        emu10k1_midi_t *midi = (emu10k1_midi_t *)substream->rmidi->private_data;
+        struct snd_emu10k1 *emu;
+        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
         unsigned long flags;
 
@@ -235 +235 @@
 static void snd_emu10k1_midi_input_trigger(snd_rawmidi_substream_t * substream, int up)
 {
-        emu10k1_t *emu;
-        emu10k1_midi_t *midi = (emu10k1_midi_t *)substream->rmidi->private_data;
+        struct snd_emu10k1 *emu;
+        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
         emu = midi->emu;
         snd_assert(emu, return);
@@ -248 +248 @@
 static void snd_emu10k1_midi_output_trigger(snd_rawmidi_substream_t * substream, int up)
 {
-        emu10k1_t *emu;
-        emu10k1_midi_t *midi = (emu10k1_midi_t *)substream->rmidi->private_data;
+        struct snd_emu10k1 *emu;
+        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
         unsigned long flags;
 
@@ -318 +318 @@
 static void snd_emu10k1_midi_free(snd_rawmidi_t *rmidi)
 {
-        emu10k1_midi_t *midi = (emu10k1_midi_t *)rmidi->private_data;
+        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)rmidi->private_data;
         midi->interrupt = NULL;
         midi->rmidi = NULL;
 }
 
-static int __devinit emu10k1_midi_init(emu10k1_t *emu, emu10k1_midi_t *midi, int device, char *name)
+static int __devinit emu10k1_midi_init(struct snd_emu10k1 *emu, struct snd_emu10k1_midi *midi, int device, char *name)
 {
         snd_rawmidi_t *rmidi;
@@ -346 +346 @@
 }
 
-int __devinit snd_emu10k1_midi(emu10k1_t *emu)
-{
-        emu10k1_midi_t *midi = &emu->midi;
+int __devinit snd_emu10k1_midi(struct snd_emu10k1 *emu)
+{
+        struct snd_emu10k1_midi *midi = &emu->midi;
         int err;
 
@@ -363 +363 @@
 }
 
-int __devinit snd_emu10k1_audigy_midi(emu10k1_t *emu)
-{
-        emu10k1_midi_t *midi;
+int __devinit snd_emu10k1_audigy_midi(struct snd_emu10k1 *emu)
+{
+        struct snd_emu10k1_midi *midi;
         int err;
 

GPL/trunk/alsa-kernel/pci/emu10k1/emupcm.c

@@ -43 +43 @@
 }
 
-static void snd_emu10k1_pcm_interrupt(emu10k1_t *emu, emu10k1_voice_t *voice)
-{
-    emu10k1_pcm_t *epcm;
+static void snd_emu10k1_pcm_interrupt(struct snd_emu10k1 *emu, struct snd_emu10k1_voice *voice)
+{
+    struct snd_emu10k1_pcm *epcm;
 
     if ((epcm = voice->epcm) == NULL)
@@ -60 +60 @@
 }
 
-static void snd_emu10k1_pcm_ac97adc_interrupt(emu10k1_t *emu, unsigned int status)
+static void snd_emu10k1_pcm_ac97adc_interrupt(struct snd_emu10k1 *emu, unsigned int status)
 {
 #if 0
@@ -71 +71 @@
 }
 
-static void snd_emu10k1_pcm_ac97mic_interrupt(emu10k1_t *emu, unsigned int status)
+static void snd_emu10k1_pcm_ac97mic_interrupt(struct snd_emu10k1 *emu, unsigned int status)
 {
 #if 0
@@ -82 +82 @@
 }
 
-static void snd_emu10k1_pcm_efx_interrupt(emu10k1_t *emu, unsigned int status)
+static void snd_emu10k1_pcm_efx_interrupt(struct snd_emu10k1 *emu, unsigned int status)
 {
 #if 0
@@ -95 +95 @@
 static snd_pcm_uframes_t snd_emu10k1_efx_playback_pointer(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm = runtime->private_data;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_emu10k1_pcm *epcm = runtime->private_data;
     unsigned int ptr;
 
@@ -110 +110 @@
 }
 
-static int snd_emu10k1_pcm_channel_alloc(emu10k1_pcm_t * epcm, int voices)
+static int snd_emu10k1_pcm_channel_alloc(struct snd_emu10k1_pcm * epcm, int voices)
 {
     int err, i;
@@ -277 +277 @@
 }
 
-static void snd_emu10k1_pcm_init_voice(emu10k1_t *emu,
+static void snd_emu10k1_pcm_init_voice(struct snd_emu10k1 *emu,
                                        int master, int extra,
-                                       emu10k1_voice_t *evoice,
+                                       struct snd_emu10k1_voice *evoice,
                                        unsigned int start_addr,
                                        unsigned int end_addr,
-                                       emu10k1_pcm_mixer_t *mix)
+                                       struct snd_emu10k1_pcm_mixer *mix)
 {
     snd_pcm_substream_t *substream = evoice->epcm->substream;
@@ -401 +401 @@
                                           snd_pcm_hw_params_t * hw_params)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm = runtime->private_data;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_emu10k1_pcm *epcm = runtime->private_data;
     int err;
 
@@ -415 +415 @@
             snd_emu10k1_free_pages(emu, epcm->memblk);
         memblk = snd_emu10k1_alloc_pages(emu, substream);
-        if ((epcm->memblk = memblk) == NULL || ((emu10k1_memblk_t *)memblk)->mapped_page < 0) {
+        if ((epcm->memblk = memblk) == NULL || ((struct snd_emu10k1_memblk *)memblk)->mapped_page < 0) {
             epcm->start_addr = 0;
             return -ENOMEM;
         }
-        epcm->start_addr = ((emu10k1_memblk_t *)memblk)->mapped_page << PAGE_SHIFT;
+        epcm->start_addr = ((struct snd_emu10k1_memblk *)memblk)->mapped_page << PAGE_SHIFT;
     }
     return 0;
@@ -426 +426 @@
 static int snd_emu10k1_playback_hw_free(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_emu10k1_pcm *epcm;
 
     if (runtime->private_data == NULL)
@@ -456 +456 @@
 static int snd_emu10k1_efx_playback_hw_free(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_emu10k1_pcm *epcm;
     int i;
 
@@ -485 +485 @@
 static int snd_emu10k1_playback_prepare(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm = runtime->private_data;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_emu10k1_pcm *epcm = runtime->private_data;
     unsigned int start_addr, end_addr;
 
@@ -513 +513 @@
 static int snd_emu10k1_efx_playback_prepare(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm = runtime->private_data;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_emu10k1_pcm *epcm = runtime->private_data;
     unsigned int start_addr, end_addr;
     unsigned int channel_size;
@@ -579 +579 @@
 static int snd_emu10k1_capture_prepare(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm = runtime->private_data;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_emu10k1_pcm *epcm = runtime->private_data;
     int idx;
 
@@ -624 +624 @@
 }
 
-static void snd_emu10k1_playback_invalidate_cache(emu10k1_t *emu, int extra, emu10k1_voice_t *evoice)
+static void snd_emu10k1_playback_invalidate_cache(struct snd_emu10k1 *emu, int extra, struct snd_emu10k1_voice *evoice)
 {
     snd_pcm_runtime_t *runtime;
@@ -659 +659 @@
 }
 
-static void snd_emu10k1_playback_prepare_voice(emu10k1_t *emu, emu10k1_voice_t *evoice,
+static void snd_emu10k1_playback_prepare_voice(struct snd_emu10k1 *emu, struct snd_emu10k1_voice *evoice,
                                                int master, int extra,
-                                               emu10k1_pcm_mixer_t *mix)
+                                               struct snd_emu10k1_pcm_mixer *mix)
 {
     snd_pcm_substream_t *substream;
@@ -683 +683 @@
 }
 
-static void snd_emu10k1_playback_trigger_voice(emu10k1_t *emu, emu10k1_voice_t *evoice, int master, int extra)
+static void snd_emu10k1_playback_trigger_voice(struct snd_emu10k1 *emu, struct snd_emu10k1_voice *evoice, int master, int extra)
 {
     snd_pcm_substream_t *substream;
@@ -705 +705 @@
 }
 
-static void snd_emu10k1_playback_stop_voice(emu10k1_t *emu, emu10k1_voice_t *evoice)
+static void snd_emu10k1_playback_stop_voice(struct snd_emu10k1 *emu, struct snd_emu10k1_voice *evoice)
 {
     unsigned int voice;
@@ -724 +724 @@
                                         int cmd)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm = runtime->private_data;
-    emu10k1_pcm_mixer_t *mix;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_emu10k1_pcm *epcm = runtime->private_data;
+    struct snd_emu10k1_pcm_mixer *mix;
     int result = 0;
 
@@ -765 +765 @@
                                        int cmd)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm = runtime->private_data;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_emu10k1_pcm *epcm = runtime->private_data;
     int result = 0;
 
@@ -824 +824 @@
 static snd_pcm_uframes_t snd_emu10k1_playback_pointer(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm = runtime->private_data;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_emu10k1_pcm *epcm = runtime->private_data;
     unsigned int ptr;
 
@@ -852 +852 @@
                                             int cmd)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm = runtime->private_data;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_emu10k1_pcm *epcm = runtime->private_data;
     int i;
     int result = 0;
@@ -899 +899 @@
 static snd_pcm_uframes_t snd_emu10k1_capture_pointer(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm = runtime->private_data;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_emu10k1_pcm *epcm = runtime->private_data;
     unsigned int ptr;
 
@@ -924 +924 @@
     case SNDRV_PCM_IOCTL1_SETVOLUME:
         {
-            emu10k1_pcm_mixer_t *mix;
+            struct snd_emu10k1_pcm_mixer *mix;
             snd_pcm_volume_t    *volume = (snd_pcm_volume_t *)arg;
-            emu10k1_t           *emu    = snd_pcm_substream_chip(substream);
+            struct snd_emu10k1           *emu    = snd_pcm_substream_chip(substream);
             snd_ctl_elem_value_t *ucontrol;
             snd_ctl_elem_info_t  *uinfo;
@@ -959 +959 @@
     case SNDRV_PCM_IOCTL1_GETVOLUME:
         {
-            emu10k1_pcm_mixer_t *mix;
+            struct snd_emu10k1_pcm_mixer *mix;
             snd_pcm_volume_t    *volume = (snd_pcm_volume_t *)arg;
-            emu10k1_t           *emu    = snd_pcm_substream_chip(substream);
+            struct snd_emu10k1           *emu    = snd_pcm_substream_chip(substream);
             int                  range;
             snd_ctl_elem_value_t *ucontrol;
@@ -1053 +1053 @@
  */
 
-static void snd_emu10k1_pcm_mixer_notify1(emu10k1_t *emu, snd_kcontrol_t *kctl, int idx, int activate)
+static void snd_emu10k1_pcm_mixer_notify1(struct snd_emu10k1 *emu, snd_kcontrol_t *kctl, int idx, int activate)
 {
     snd_ctl_elem_id_t id;
@@ -1068 +1068 @@
 }
 
-static void snd_emu10k1_pcm_mixer_notify(emu10k1_t *emu, int idx, int activate)
+static void snd_emu10k1_pcm_mixer_notify(struct snd_emu10k1 *emu, int idx, int activate)
 {
     snd_emu10k1_pcm_mixer_notify1(emu, emu->ctl_send_routing, idx, activate);
@@ -1075 +1075 @@
 }
 
-static void snd_emu10k1_pcm_efx_mixer_notify(emu10k1_t *emu, int idx, int activate)
+static void snd_emu10k1_pcm_efx_mixer_notify(struct snd_emu10k1 *emu, int idx, int activate)
 {
     snd_emu10k1_pcm_mixer_notify1(emu, emu->ctl_efx_send_routing, idx, activate);
@@ -1084 +1084 @@
 static void snd_emu10k1_pcm_free_substream(snd_pcm_runtime_t *runtime)
 {
-    emu10k1_pcm_t *epcm = runtime->private_data;
+    struct snd_emu10k1_pcm *epcm = runtime->private_data;
     if (epcm)
         kfree(epcm);
@@ -1091 +1091 @@
 static int snd_emu10k1_efx_playback_close(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    emu10k1_pcm_mixer_t *mix;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1_pcm_mixer *mix;
     int i;
 
@@ -1105 +1105 @@
 static int snd_emu10k1_efx_playback_open(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    emu10k1_pcm_t *epcm;
-    emu10k1_pcm_mixer_t *mix;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1_pcm *epcm;
+    struct snd_emu10k1_pcm_mixer *mix;
     snd_pcm_runtime_t *runtime = substream->runtime;
     int i;
 
-    epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
+    epcm = (struct snd_emu10k1_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
     if (epcm == NULL)
         return -ENOMEM;
@@ -1138 +1138 @@
 static int snd_emu10k1_playback_open(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    emu10k1_pcm_t *epcm;
-    emu10k1_pcm_mixer_t *mix;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1_pcm *epcm;
+    struct snd_emu10k1_pcm_mixer *mix;
     snd_pcm_runtime_t *runtime = substream->runtime;
     int i, err;
 
-    epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
+    epcm = (struct snd_emu10k1_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
     if (epcm == NULL)
         return -ENOMEM;
@@ -1175 +1175 @@
 static int snd_emu10k1_playback_close(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    emu10k1_pcm_mixer_t *mix = &emu->pcm_mixer[substream->number];
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[substream->number];
 
     mix->epcm = NULL;
@@ -1185 +1185 @@
 static int snd_emu10k1_capture_open(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm;
-
-    epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_emu10k1_pcm *epcm;
+
+    epcm = (struct snd_emu10k1_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
     if (epcm == NULL)
         return -ENOMEM;
@@ -1212 +1212 @@
 static int snd_emu10k1_capture_close(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
 
     emu->capture_interrupt = NULL;
@@ -1221 +1221 @@
 static int snd_emu10k1_capture_mic_open(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    emu10k1_pcm_t *epcm;
-    snd_pcm_runtime_t *runtime = substream->runtime;
-
-    epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1_pcm *epcm;
+    snd_pcm_runtime_t *runtime = substream->runtime;
+
+    epcm = (struct snd_emu10k1_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
     if (epcm == NULL)
         return -ENOMEM;
@@ -1250 +1250 @@
 static int snd_emu10k1_capture_mic_close(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
 
     emu->capture_interrupt = NULL;
@@ -1259 +1259 @@
 static int snd_emu10k1_capture_efx_open(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    emu10k1_pcm_t *epcm;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1_pcm *epcm;
     snd_pcm_runtime_t *runtime = substream->runtime;
     int nefx = emu->audigy ? 64 : 32;
     int idx;
 
-    epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
+    epcm = (struct snd_emu10k1_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
     if (epcm == NULL)
         return -ENOMEM;
@@ -1300 +1300 @@
 static int snd_emu10k1_capture_efx_close(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
 
     emu->capture_interrupt = NULL;
@@ -1347 +1347 @@
 static void snd_emu10k1_pcm_free(snd_pcm_t *pcm)
 {
-    emu10k1_t *emu = pcm->private_data;
+    struct snd_emu10k1 *emu = pcm->private_data;
     emu->pcm = NULL;
     snd_pcm_lib_preallocate_free_for_all(pcm);
 }
 
-int __devinit snd_emu10k1_pcm(emu10k1_t * emu, int device, snd_pcm_t ** rpcm)
+int __devinit snd_emu10k1_pcm(struct snd_emu10k1 * emu, int device, snd_pcm_t ** rpcm)
 {
     snd_pcm_t *pcm;
@@ -1388 +1388 @@
 }
 
-int __devinit snd_emu10k1_pcm_multi(emu10k1_t * emu, int device, snd_pcm_t ** rpcm)
+int __devinit snd_emu10k1_pcm_multi(struct snd_emu10k1 * emu, int device, snd_pcm_t ** rpcm)
 {
     snd_pcm_t *pcm;
@@ -1433 +1433 @@
 static void snd_emu10k1_pcm_mic_free(snd_pcm_t *pcm)
 {
-    emu10k1_t *emu = pcm->private_data;
+    struct snd_emu10k1 *emu = pcm->private_data;
     emu->pcm_mic = NULL;
     snd_pcm_lib_preallocate_free_for_all(pcm);
 }
 
-int __devinit snd_emu10k1_pcm_mic(emu10k1_t * emu, int device, snd_pcm_t ** rpcm)
+int __devinit snd_emu10k1_pcm_mic(struct snd_emu10k1 * emu, int device, snd_pcm_t ** rpcm)
 {
     snd_pcm_t *pcm;
@@ -1468 +1468 @@
 static int snd_emu10k1_pcm_efx_voices_mask_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     int nefx = emu->audigy ? 64 : 32;
     uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
@@ -1479 +1479 @@
 static int snd_emu10k1_pcm_efx_voices_mask_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     int nefx = emu->audigy ? 64 : 32;
     int idx;
@@ -1492 +1492 @@
 static int snd_emu10k1_pcm_efx_voices_mask_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     unsigned int nval[2], bits;
     int nefx = emu->audigy ? 64 : 32;
@@ -1543 +1543 @@
 #define INITIAL_TRAM_POS(size) ((((size) / 2) - INITIAL_TRAM_SHIFT) - 1)
 
-static void snd_emu10k1_fx8010_playback_irq(emu10k1_t *emu, void *private_data)
+static void snd_emu10k1_fx8010_playback_irq(struct snd_emu10k1 *emu, void *private_data)
 {
     snd_pcm_substream_t *substream = private_data;
@@ -1571 +1571 @@
 
 static void fx8010_pb_trans_copy(snd_pcm_substream_t *substream,
-                                 snd_pcm_indirect_t *rec, size_t bytes)
-{
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_emu10k1_fx8010_pcm_t *pcm = &emu->fx8010.pcm[substream->number];
+                                 struct snd_pcm_indirect *rec, size_t bytes)
+{
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
     unsigned int tram_size = pcm->buffer_size;
     unsigned short *src = (unsigned short *)(substream->runtime->dma_area + rec->sw_data);
@@ -1601 +1601 @@
 static int snd_emu10k1_fx8010_playback_transfer(snd_pcm_substream_t *substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_emu10k1_fx8010_pcm_t *pcm = &emu->fx8010.pcm[substream->number];
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
 
     snd_pcm_indirect_playback_transfer(substream, &pcm->pcm_rec, fx8010_pb_trans_copy);
@@ -1616 +1616 @@
 static int snd_emu10k1_fx8010_playback_hw_free(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_emu10k1_fx8010_pcm_t *pcm = &emu->fx8010.pcm[substream->number];
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
     unsigned int i;
 
@@ -1628 +1628 @@
 static int snd_emu10k1_fx8010_playback_prepare(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    snd_emu10k1_fx8010_pcm_t *pcm = &emu->fx8010.pcm[substream->number];
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
     unsigned int i;
 
@@ -1652 +1652 @@
 static int snd_emu10k1_fx8010_playback_trigger(snd_pcm_substream_t * substream, int cmd)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_emu10k1_fx8010_pcm_t *pcm = &emu->fx8010.pcm[substream->number];
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
     int result = 0;
 
@@ -1697 +1697 @@
 static snd_pcm_uframes_t snd_emu10k1_fx8010_playback_pointer(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_emu10k1_fx8010_pcm_t *pcm = &emu->fx8010.pcm[substream->number];
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
     size_t ptr; /* byte pointer */
 
@@ -1707 +1707 @@
 }
 
-static snd_pcm_hardware_t snd_emu10k1_fx8010_playback =
-{
-    /*  .info =     */            (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
-                                   /*                             /* SNDRV_PCM_INFO_MMAP_VALID | */ SNDRV_PCM_INFO_PAUSE),
-                                   /*                             .formats =  */            SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-                                   /*                           .rates =      */          SNDRV_PCM_RATE_48000,
-                                   /*                           .rate_min =   */          48000,
-                                   /*                           .rate_max =   */          48000,
-                                   /*                           .channels_min = */        1,
-                                   /*                           .channels_max = */        1,
-                                   /*                           .buffer_bytes_max = */    (128*1024),
-                                   /*                           .period_bytes_min = */    1024,
-                                   /*                           .period_bytes_max = */    (128*1024),
-                                   /*                           .periods_min =      */    1,
-                                   /*                           .periods_max =      */    1024,
-                                   /*                           .fifo_size =        */    0,
+static struct snd_pcm_hardware snd_emu10k1_fx8010_playback =
+{
+    .info =                     (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+                                 SNDRV_PCM_INFO_RESUME |
+                                 /* SNDRV_PCM_INFO_MMAP_VALID | */ SNDRV_PCM_INFO_PAUSE),
+                                 .formats =             SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+                                 .rates =               SNDRV_PCM_RATE_48000,
+                                 .rate_min =            48000,
+                                 .rate_max =            48000,
+                                 .channels_min =                1,
+                                 .channels_max =                1,
+                                 .buffer_bytes_max =    (128*1024),
+                                 .period_bytes_min =    1024,
+                                 .period_bytes_max =    (128*1024),
+                                 .periods_min =         1,
+                                 .periods_max =         1024,
+                                 .fifo_size =           0,
 };
 
 static int snd_emu10k1_fx8010_playback_open(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    snd_emu10k1_fx8010_pcm_t *pcm = &emu->fx8010.pcm[substream->number];
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
 
     runtime->hw = snd_emu10k1_fx8010_playback;
@@ -1746 +1747 @@
 static int snd_emu10k1_fx8010_playback_close(snd_pcm_substream_t * substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    snd_emu10k1_fx8010_pcm_t *pcm = &emu->fx8010.pcm[substream->number];
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
 
     spin_lock_irq(&emu->reg_lock);
@@ -1755 +1756 @@
 }
 
-static snd_pcm_ops_t snd_emu10k1_fx8010_playback_ops = {
-    /*.open =              */   snd_emu10k1_fx8010_playback_open,
-    /*.close =             */   snd_emu10k1_fx8010_playback_close,
-    /*.ioctl =             */   snd_pcm_lib_ioctl,
-    /*.hw_params =         */   snd_emu10k1_fx8010_playback_hw_params,
-    /*.hw_free =           */   snd_emu10k1_fx8010_playback_hw_free,
-    /*.prepare =           */   snd_emu10k1_fx8010_playback_prepare,
-    /*.trigger =           */   snd_emu10k1_fx8010_playback_trigger,
-    /*.pointer =           */   snd_emu10k1_fx8010_playback_pointer,
-    NULL, NULL, NULL,
-    /*.ack =               */   snd_emu10k1_fx8010_playback_transfer,
+static struct snd_pcm_ops snd_emu10k1_fx8010_playback_ops = {
+        .open =                 snd_emu10k1_fx8010_playback_open,
+        .close =                snd_emu10k1_fx8010_playback_close,
+        .ioctl =                snd_pcm_lib_ioctl,
+        .hw_params =            snd_emu10k1_fx8010_playback_hw_params,
+        .hw_free =              snd_emu10k1_fx8010_playback_hw_free,
+        .prepare =              snd_emu10k1_fx8010_playback_prepare,
+        .trigger =              snd_emu10k1_fx8010_playback_trigger,
+        .pointer =              snd_emu10k1_fx8010_playback_pointer,
+        .ack =                  snd_emu10k1_fx8010_playback_transfer,
 };
 
 static void snd_emu10k1_pcm_efx_free(snd_pcm_t *pcm)
 {
-    emu10k1_t *emu = pcm->private_data;
+    struct snd_emu10k1 *emu = pcm->private_data;
     emu->pcm_efx = NULL;
     snd_pcm_lib_preallocate_free_for_all(pcm);
 }
 
-int __devinit snd_emu10k1_pcm_efx(emu10k1_t * emu, int device, snd_pcm_t ** rpcm)
+int __devinit snd_emu10k1_pcm_efx(struct snd_emu10k1 * emu, int device, snd_pcm_t ** rpcm)
 {
     snd_pcm_t *pcm;

GPL/trunk/alsa-kernel/pci/emu10k1/emuproc.c

@@ -32 +32 @@
 #include <sound/emu10k1.h>
 
-static void snd_emu10k1_proc_spdif_status(emu10k1_t * emu,
+static void snd_emu10k1_proc_spdif_status(struct snd_emu10k1 * emu,
                                           snd_info_buffer_t * buffer,
                                           char *title,
@@ -175 +175 @@
     };
 
-    emu10k1_t *emu = entry->private_data;
+    struct snd_emu10k1 *emu = entry->private_data;
     unsigned int val;
     int nefx = emu->audigy ? 64 : 32;
@@ -223 +223 @@
 {
     u32 pc;
-    emu10k1_t *emu = entry->private_data;
+    struct snd_emu10k1 *emu = entry->private_data;
 
     snd_iprintf(buffer, "FX8010 Instruction List '%s'\n", emu->fx8010.name);
@@ -267 +267 @@
 {
     long size;
-    emu10k1_t *emu = entry->private_data;
+    struct snd_emu10k1 *emu = entry->private_data;
     unsigned int offset;
     int tram_addr = 0;
@@ -310 +310 @@
                                          snd_info_buffer_t * buffer)
 {
-    emu10k1_t *emu = entry->private_data;
-    emu10k1_voice_t *voice;
+    struct snd_emu10k1 *emu = entry->private_data;
+    struct snd_emu10k1_voice *voice;
     int idx;
 
@@ -331 +331 @@
                                      snd_info_buffer_t * buffer)
 {
-    emu10k1_t *emu = entry->private_data;
+    struct snd_emu10k1 *emu = entry->private_data;
     unsigned long value;
     unsigned long flags;
@@ -347 +347 @@
                                       snd_info_buffer_t * buffer)
 {
-    emu10k1_t *emu = entry->private_data;
+    struct snd_emu10k1 *emu = entry->private_data;
     unsigned long flags;
     char line[64];
     u32 reg, val;
+#if 0
     while (!snd_info_get_line(buffer, line, sizeof(line))) {
         if (sscanf(line, "%x %x", &reg, &val) != 2)
@@ -360 +361 @@
         }
     }
-}
-
-static unsigned int snd_ptr_read(emu10k1_t * emu,
+#endif
+}
+
+static unsigned int snd_ptr_read(struct snd_emu10k1 * emu,
                                  unsigned int iobase,
                                  unsigned int reg,
@@ -379 +381 @@
 }
 
-static void snd_ptr_write(emu10k1_t *emu,
+static void snd_ptr_write(struct snd_emu10k1 *emu,
                           unsigned int iobase,
                           unsigned int reg,
@@ -400 +402 @@
                                       snd_info_buffer_t * buffer, int iobase, int offset, int length)
 {
-    emu10k1_t *emu = entry->private_data;
+    struct snd_emu10k1 *emu = entry->private_data;
     unsigned long value;
     int i,j;
@@ -424 +426 @@
                                        snd_info_buffer_t * buffer, int iobase)
 {
-    emu10k1_t *emu = entry->private_data;
+    struct snd_emu10k1 *emu = entry->private_data;
     char line[64];
     unsigned int reg, channel_id , val;
+#if 0
     while (!snd_info_get_line(buffer, line, sizeof(line))) {
         if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3)
@@ -433 +436 @@
             snd_ptr_write(emu, iobase, reg, channel_id, val);
     }
+#endif
 }
 
@@ -483 +487 @@
 };
 #endif
-int __devinit snd_emu10k1_proc_init(emu10k1_t * emu)
+int __devinit snd_emu10k1_proc_init(struct snd_emu10k1 * emu)
 {
     snd_info_entry_t *entry;

GPL/trunk/alsa-kernel/pci/emu10k1/io.c

@@ -32 +32 @@
 #include <sound/emu10k1.h>
 
-unsigned int snd_emu10k1_ptr_read(emu10k1_t * emu, unsigned int reg, unsigned int chn)
+unsigned int snd_emu10k1_ptr_read(struct snd_emu10k1 * emu, unsigned int reg, unsigned int chn)
 {
         unsigned long flags;
@@ -63 +63 @@
 }
 
-void snd_emu10k1_ptr_write(emu10k1_t *emu, unsigned int reg, unsigned int chn, unsigned int data)
+void snd_emu10k1_ptr_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned int chn, unsigned int data)
 {
         unsigned int regptr;
@@ -93 +93 @@
 }
 
-unsigned int snd_emu10k1_ptr20_read(emu10k1_t * emu,
+unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu,
                                     unsigned int reg,
                                     unsigned int chn)
@@ -109 +109 @@
 }
 
-void snd_emu10k1_ptr20_write(emu10k1_t *emu,
+void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu,
                              unsigned int reg,
                              unsigned int chn,
@@ -125 +125 @@
 }
 
-void snd_emu10k1_intr_enable(emu10k1_t *emu, unsigned int intrenb)
+void snd_emu10k1_intr_enable(struct snd_emu10k1 *emu, unsigned int intrenb)
 {
         unsigned long flags;
@@ -136 +136 @@
 }
 
-void snd_emu10k1_intr_disable(emu10k1_t *emu, unsigned int intrenb)
+void snd_emu10k1_intr_disable(struct snd_emu10k1 *emu, unsigned int intrenb)
 {
         unsigned long flags;
@@ -147 +147 @@
 }
 
-void snd_emu10k1_voice_intr_enable(emu10k1_t *emu, unsigned int voicenum)
+void snd_emu10k1_voice_intr_enable(struct snd_emu10k1 *emu, unsigned int voicenum)
 {
         unsigned long flags;
@@ -167 +167 @@
 }
 
-void snd_emu10k1_voice_intr_disable(emu10k1_t *emu, unsigned int voicenum)
+void snd_emu10k1_voice_intr_disable(struct snd_emu10k1 *emu, unsigned int voicenum)
 {
         unsigned long flags;
@@ -187 +187 @@
 }
 
-void snd_emu10k1_voice_intr_ack(emu10k1_t *emu, unsigned int voicenum)
+void snd_emu10k1_voice_intr_ack(struct snd_emu10k1 *emu, unsigned int voicenum)
 {
         unsigned long flags;
@@ -204 +204 @@
 }
 
-void snd_emu10k1_voice_half_loop_intr_enable(emu10k1_t *emu, unsigned int voicenum)
+void snd_emu10k1_voice_half_loop_intr_enable(struct snd_emu10k1 *emu, unsigned int voicenum)
 {
     unsigned long flags;
@@ -224 +224 @@
 }
 
-void snd_emu10k1_voice_half_loop_intr_disable(emu10k1_t *emu, unsigned int voicenum)
+void snd_emu10k1_voice_half_loop_intr_disable(struct snd_emu10k1 *emu, unsigned int voicenum)
 {
     unsigned long flags;
@@ -244 +244 @@
 }
 
-void snd_emu10k1_voice_half_loop_intr_ack(emu10k1_t *emu, unsigned int voicenum)
+void snd_emu10k1_voice_half_loop_intr_ack(struct snd_emu10k1 *emu, unsigned int voicenum)
 {
     unsigned long flags;
@@ -261 +261 @@
 }
 
-void snd_emu10k1_voice_set_loop_stop(emu10k1_t *emu, unsigned int voicenum)
+void snd_emu10k1_voice_set_loop_stop(struct snd_emu10k1 *emu, unsigned int voicenum)
 {
         unsigned long flags;
@@ -281 +281 @@
 }
 
-void snd_emu10k1_voice_clear_loop_stop(emu10k1_t *emu, unsigned int voicenum)
+void snd_emu10k1_voice_clear_loop_stop(struct snd_emu10k1 *emu, unsigned int voicenum)
 {
         unsigned long flags;
@@ -301 +301 @@
 }
 
-void snd_emu10k1_wait(emu10k1_t *emu, unsigned int wait)
+void snd_emu10k1_wait(struct snd_emu10k1 *emu, unsigned int wait)
 {
         volatile unsigned count;
@@ -322 +322 @@
 unsigned short snd_emu10k1_ac97_read(ac97_t *ac97, unsigned short reg)
 {
-    emu10k1_t *emu = ac97->private_data;
+    struct snd_emu10k1 *emu = ac97->private_data;
         unsigned long flags;
         unsigned short val;
@@ -335 +335 @@
 void snd_emu10k1_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short data)
 {
-    emu10k1_t *emu = ac97->private_data;
+    struct snd_emu10k1 *emu = ac97->private_data;
         unsigned long flags;
 

GPL/trunk/alsa-kernel/pci/emu10k1/irq.c

@@ -34 +34 @@
 irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
-    emu10k1_t *emu = dev_id;
+    struct snd_emu10k1 *emu = dev_id;
     unsigned int status, status2, orig_status, orig_status2;
     int handled = 0;
@@ -76 +76 @@
             int voice_max = status & IPR_CHANNELNUMBERMASK;
             u32 val;
-            emu10k1_voice_t *pvoice = emu->voices;
+            struct snd_emu10k1_voice *pvoice = emu->voices;
 
             val = snd_emu10k1_ptr_read(emu, CLIPL, 0);
@@ -170 +170 @@
             while ((status2 = inl(emu->port + IPR2)) != 0) {
                 u32 mask = INTE2_PLAYBACK_CH_0_LOOP;  /* Full Loop */
-                emu10k1_voice_t *pvoice = &(emu->p16v_voices[0]);
-                emu10k1_voice_t *cvoice = &(emu->p16v_capture_voice);
+                struct snd_emu10k1_voice *pvoice = &(emu->p16v_voices[0]);
+                struct snd_emu10k1_voice *cvoice = &(emu->p16v_capture_voice);
 
                 //printk(KERN_INFO "status2=0x%x\n", status2);
@@ -219 +219 @@
 
     }
-
-#ifdef TARGET_OS2
-        if (fOurIrq) {
-            eoi_irq(irq);
-        }
-#endif //TARGET_OS2
-
     return IRQ_RETVAL(handled);
 }

GPL/trunk/alsa-kernel/pci/emu10k1/memory.c

@@ -49 +49 @@
 #else
 /* fill PTB entries -- we need to fill UNIT_PAGES entries */
-static inline void set_ptb_entry(emu10k1_t *emu, int page, dma_addr_t addr)
+static inline void set_ptb_entry(struct snd_emu10k1 *emu, int page, dma_addr_t addr)
 {
         int i;
@@ -58 +58 @@
         }
 }
-static inline void set_silent_ptb(emu10k1_t *emu, int page)
+static inline void set_silent_ptb(struct snd_emu10k1 *emu, int page)
 {
         int i;
@@ -72 +72 @@
 /*
  */
-static int synth_alloc_pages(emu10k1_t *hw, emu10k1_memblk_t *blk);
-static int synth_free_pages(emu10k1_t *hw, emu10k1_memblk_t *blk);
-
-#define get_emu10k1_memblk(l,member)    list_entry(l, emu10k1_memblk_t, member)
+static int synth_alloc_pages(struct snd_emu10k1 *hw, struct snd_emu10k1_memblk *blk);
+static int synth_free_pages(struct snd_emu10k1 *hw, struct snd_emu10k1_memblk *blk);
+
+#define get_emu10k1_memblk(l,member)    list_entry(l, struct snd_emu10k1_memblk, member)
 
 
 /* initialize emu10k1 part */
-static void emu10k1_memblk_init(emu10k1_memblk_t *blk)
+static void emu10k1_memblk_init(struct snd_emu10k1_memblk *blk)
 {
         blk->mapped_page = -1;
@@ -98 +98 @@
  * if not found, return a negative error code.
  */
-static int search_empty_map_area(emu10k1_t *emu, int npages, struct list_head **nextp)
+static int search_empty_map_area(struct snd_emu10k1 *emu, int npages, struct list_head **nextp)
 {
         int page = 0, found_page = -ENOMEM;
@@ -107 +107 @@
 
         list_for_each (pos, &emu->mapped_link_head) {
-                emu10k1_memblk_t *blk = get_emu10k1_memblk(pos, mapped_link);
+                struct snd_emu10k1_memblk *blk = get_emu10k1_memblk(pos, mapped_link);
                 snd_assert(blk->mapped_page >= 0, continue);
                 size = blk->mapped_page - page;
@@ -136 +136 @@
  * call with memblk_lock held
  */
-static int map_memblk(emu10k1_t *emu, emu10k1_memblk_t *blk)
+static int map_memblk(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk)
 {
         int page, pg;
@@ -163 +163 @@
  * call with memblk_lock held
  */
-static int unmap_memblk(emu10k1_t *emu, emu10k1_memblk_t *blk)
+static int unmap_memblk(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk)
 {
         int start_page, end_page, mpage, pg;
         struct list_head *p;
-        emu10k1_memblk_t *q;
+        struct snd_emu10k1_memblk *q;
 
         /* calculate the expected size of empty region */
@@ -199 +199 @@
  * unlike synth_alloc the memory block is aligned to the page start
  */
-static emu10k1_memblk_t *
-search_empty(emu10k1_t *emu, int size)
+static struct snd_emu10k1_memblk *
+search_empty(struct snd_emu10k1 *emu, int size)
 {
         struct list_head *p;
-        emu10k1_memblk_t *blk;
+        struct snd_emu10k1_memblk *blk;
         int page, psize;
 
@@ -219 +219 @@
 __found_pages:
         /* create a new memory block */
-        blk = (emu10k1_memblk_t *)__snd_util_memblk_new(emu->memhdr, psize << PAGE_SHIFT, p->prev);
+        blk = (struct snd_emu10k1_memblk *)__snd_util_memblk_new(emu->memhdr, psize << PAGE_SHIFT, p->prev);
         if (blk == NULL)
                 return NULL;
@@ -231 +231 @@
  * check if the given pointer is valid for pages
  */
-static int is_valid_page(emu10k1_t *emu, dma_addr_t addr)
+static int is_valid_page(struct snd_emu10k1 *emu, dma_addr_t addr)
 {
         if (addr & ~emu->dma_mask) {
@@ -250 +250 @@
  * and retry the mapping.
  */
-int snd_emu10k1_memblk_map(emu10k1_t *emu, emu10k1_memblk_t *blk)
+int snd_emu10k1_memblk_map(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk)
 {
         int err;
         int size;
         struct list_head *p, *nextp;
-        emu10k1_memblk_t *deleted;
+        struct snd_emu10k1_memblk *deleted;
         unsigned long flags;
 
@@ -291 +291 @@
  */
 snd_util_memblk_t *
-snd_emu10k1_alloc_pages(emu10k1_t *emu, snd_pcm_substream_t *substream)
+snd_emu10k1_alloc_pages(struct snd_emu10k1 *emu, snd_pcm_substream_t *substream)
 {
     snd_pcm_runtime_t *runtime = substream->runtime;
     struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream);
     snd_util_memhdr_t *hdr;
-    emu10k1_memblk_t *blk;
+    struct snd_emu10k1_memblk *blk;
     int page, err, idx;
 
@@ -350 +350 @@
  * release DMA buffer from page table
  */
-int snd_emu10k1_free_pages(emu10k1_t *emu, snd_util_memblk_t *blk)
+int snd_emu10k1_free_pages(struct snd_emu10k1 *emu, snd_util_memblk_t *blk)
 {
         snd_assert(emu && blk, return -EINVAL);
@@ -366 +366 @@
  */
 snd_util_memblk_t *
-snd_emu10k1_synth_alloc(emu10k1_t *hw, unsigned int size)
-{
-        emu10k1_memblk_t *blk;
+snd_emu10k1_synth_alloc(struct snd_emu10k1 *hw, unsigned int size)
+{
+        struct snd_emu10k1_memblk *blk;
         snd_util_memhdr_t *hdr = hw->memhdr;
 
         down(&hdr->block_mutex);
-        blk = (emu10k1_memblk_t *)__snd_util_mem_alloc(hdr, size);
+        blk = (struct snd_emu10k1_memblk *)__snd_util_mem_alloc(hdr, size);
         if (blk == NULL) {
                 up(&hdr->block_mutex);
@@ -392 +392 @@
  */
 int
-snd_emu10k1_synth_free(emu10k1_t *emu, snd_util_memblk_t *memblk)
+snd_emu10k1_synth_free(struct snd_emu10k1 *emu, snd_util_memblk_t *memblk)
 {
         snd_util_memhdr_t *hdr = emu->memhdr;
-        emu10k1_memblk_t *blk = (emu10k1_memblk_t *)memblk;
+        struct snd_emu10k1_memblk *blk = (struct snd_emu10k1_memblk *)memblk;
         unsigned long flags;
 
@@ -411 +411 @@
 
 /* check new allocation range */
-static void get_single_page_range(snd_util_memhdr_t *hdr, emu10k1_memblk_t *blk, int *first_page_ret, int *last_page_ret)
+static void get_single_page_range(snd_util_memhdr_t *hdr, struct snd_emu10k1_memblk *blk, int *first_page_ret, int *last_page_ret)
 {
         struct list_head *p;
-        emu10k1_memblk_t *q;
+        struct snd_emu10k1_memblk *q;
         int first_page, last_page;
         first_page = blk->first_page;
@@ -435 +435 @@
  * allocate kernel pages
  */
-static int synth_alloc_pages(emu10k1_t *emu, emu10k1_memblk_t *blk)
+static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk)
 {
     int page, first_page, last_page;
@@ -474 +474 @@
  * free pages
  */
-static int synth_free_pages(emu10k1_t *emu, emu10k1_memblk_t *blk)
+static int synth_free_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *blk)
 {
     int page, first_page, last_page;
@@ -497 +497 @@
 
 /* calculate buffer pointer from offset address */
-inline static void *offset_ptr(emu10k1_t *emu, int page, int offset)
+inline static void *offset_ptr(struct snd_emu10k1 *emu, int page, int offset)
 {
         char *ptr;
@@ -513 +513 @@
  * bzero(blk + offset, size)
  */
-int snd_emu10k1_synth_bzero(emu10k1_t *emu, snd_util_memblk_t *blk, int offset, int size)
+int snd_emu10k1_synth_bzero(struct snd_emu10k1 *emu, snd_util_memblk_t *blk, int offset, int size)
 {
         int page, nextofs, end_offset, temp, temp1;
         void *ptr;
-        emu10k1_memblk_t *p = (emu10k1_memblk_t *)blk;
+        struct snd_emu10k1_memblk *p = (struct snd_emu10k1_memblk *)blk;
 
         offset += blk->offset & (PAGE_SIZE - 1);
@@ -540 +540 @@
  * copy_from_user(blk + offset, data, size)
  */
-int snd_emu10k1_synth_copy_from_user(emu10k1_t *emu, snd_util_memblk_t *blk, int offset, const char *data, int size)
+int snd_emu10k1_synth_copy_from_user(struct snd_emu10k1 *emu, snd_util_memblk_t *blk, int offset, const char *data, int size)
 {
         int page, nextofs, end_offset, temp, temp1;
         void *ptr;
-        emu10k1_memblk_t *p = (emu10k1_memblk_t *)blk;
+        struct snd_emu10k1_memblk *p = (struct snd_emu10k1_memblk *)blk;
 
         offset += blk->offset & (PAGE_SIZE - 1);

GPL/trunk/alsa-kernel/pci/emu10k1/p16v.c

@@ -162 +162 @@
 static void snd_p16v_pcm_free_substream(snd_pcm_runtime_t *runtime)
 {
-    emu10k1_pcm_t *epcm = runtime->private_data;
+    struct snd_emu10k1_pcm *epcm = runtime->private_data;
 
     if (epcm) {
@@ -173 +173 @@
 static int snd_p16v_pcm_open_playback_channel(snd_pcm_substream_t *substream, int channel_id)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    emu10k1_voice_t *channel = &(emu->p16v_voices[channel_id]);
-    emu10k1_pcm_t *epcm;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1_voice *channel = &(emu->p16v_voices[channel_id]);
+    struct snd_emu10k1_pcm *epcm;
     snd_pcm_runtime_t *runtime = substream->runtime;
     int err;
 
-    epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
+    epcm = (struct snd_emu10k1_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
     //snd_printk("epcm kcalloc: %p\n", epcm);
 
@@ -210 +210 @@
 static int snd_p16v_pcm_open_capture_channel(snd_pcm_substream_t *substream, int channel_id)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
-    emu10k1_voice_t *channel = &(emu->p16v_capture_voice);
-    emu10k1_pcm_t *epcm;
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1_voice *channel = &(emu->p16v_capture_voice);
+    struct snd_emu10k1_pcm *epcm;
     snd_pcm_runtime_t *runtime = substream->runtime;
     int err;
 
-    epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
+    epcm = (struct snd_emu10k1_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
     //snd_printk("epcm kcalloc: %p\n", epcm);
 
@@ -248 +248 @@
 static int snd_p16v_pcm_close_playback(snd_pcm_substream_t *substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
     //snd_pcm_runtime_t *runtime = substream->runtime;
-    //emu10k1_pcm_t *epcm = runtime->private_data;
+    //struct snd_emu10k1_pcm *epcm = runtime->private_data;
     emu->p16v_voices[substream->pcm->device - emu->p16v_device_offset].use=0;
     /* FIXME: maybe zero others */
@@ -259 +259 @@
 static int snd_p16v_pcm_close_capture(snd_pcm_substream_t *substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
     //snd_pcm_runtime_t *runtime = substream->runtime;
-    //emu10k1_pcm_t *epcm = runtime->private_data;
+    //struct snd_emu10k1_pcm *epcm = runtime->private_data;
     emu->p16v_capture_voice.use=0;
     /* FIXME: maybe zero others */
@@ -319 +319 @@
 static int snd_p16v_pcm_prepare_playback(snd_pcm_substream_t *substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
     snd_pcm_runtime_t *runtime = substream->runtime;
     int channel = substream->pcm->device - emu->p16v_device_offset;
@@ -368 +368 @@
 static int snd_p16v_pcm_prepare_capture(snd_pcm_substream_t *substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
     snd_pcm_runtime_t *runtime = substream->runtime;
     int channel = substream->pcm->device - emu->p16v_device_offset;
@@ -400 +400 @@
 }
 
-static void snd_p16v_intr_enable(emu10k1_t *emu, unsigned int intrenb)
+static void snd_p16v_intr_enable(struct snd_emu10k1 *emu, unsigned int intrenb)
 {
     unsigned long flags;
@@ -411 +411 @@
 }
 
-static void snd_p16v_intr_disable(emu10k1_t *emu, unsigned int intrenb)
+static void snd_p16v_intr_disable(struct snd_emu10k1 *emu, unsigned int intrenb)
 {
     unsigned long flags;
@@ -426 +426 @@
                                          int cmd)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
     snd_pcm_runtime_t *runtime;
-    emu10k1_pcm_t *epcm;
+    struct snd_emu10k1_pcm *epcm;
     int channel;
     int result = 0;
@@ -479 +479 @@
                                         int cmd)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
     snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm = runtime->private_data;
+    struct snd_emu10k1_pcm *epcm = runtime->private_data;
     int channel = 0;
     int result = 0;
@@ -509 +509 @@
 snd_p16v_pcm_pointer_playback(snd_pcm_substream_t *substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
     snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm = runtime->private_data;
+    struct snd_emu10k1_pcm *epcm = runtime->private_data;
     snd_pcm_uframes_t ptr, ptr1, ptr2,ptr3,ptr4 = 0;
     int channel = substream->pcm->device - emu->p16v_device_offset;
@@ -534 +534 @@
 snd_p16v_pcm_pointer_capture(snd_pcm_substream_t *substream)
 {
-    emu10k1_t *emu = snd_pcm_substream_chip(substream);
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
     snd_pcm_runtime_t *runtime = substream->runtime;
-    emu10k1_pcm_t *epcm = runtime->private_data;
+    struct snd_emu10k1_pcm *epcm = runtime->private_data;
     snd_pcm_uframes_t ptr, ptr1, ptr2 = 0;
     int channel = 0;
@@ -580 +580 @@
 };
 
-int snd_p16v_free(emu10k1_t *chip)
+int snd_p16v_free(struct snd_emu10k1 *chip)
 {
     // release the data
@@ -592 +592 @@
 static void snd_p16v_pcm_free(snd_pcm_t *pcm)
 {
-    emu10k1_t *emu = pcm->private_data;
+    struct snd_emu10k1 *emu = pcm->private_data;
     //snd_printk("snd_p16v_pcm_free pcm: called\n");
     snd_pcm_lib_preallocate_free_for_all(pcm);
@@ -598 +598 @@
 }
 
-int snd_p16v_pcm(emu10k1_t *emu, int device, snd_pcm_t **rpcm)
+int snd_p16v_pcm(struct snd_emu10k1 *emu, int device, snd_pcm_t **rpcm)
 {
     snd_pcm_t *pcm;
@@ -664 +664 @@
                                snd_ctl_elem_value_t * ucontrol, int reg, int high_low)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     u32 value;
 
@@ -742 +742 @@
                                snd_ctl_elem_value_t * ucontrol, int reg, int high_low)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     u32 value;
     value = snd_emu10k1_ptr20_read(emu, reg, 0);
@@ -909 +909 @@
                                        snd_ctl_elem_value_t * ucontrol)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
 
     ucontrol->value.enumerated.item[0] = emu->p16v_capture_source;
@@ -918 +918 @@
                                        snd_ctl_elem_value_t * ucontrol)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     unsigned int val;
     int change = 0;
@@ -960 +960 @@
                                         snd_ctl_elem_value_t * ucontrol)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
 
     ucontrol->value.enumerated.item[0] = emu->p16v_capture_channel;
@@ -969 +969 @@
                                         snd_ctl_elem_value_t * ucontrol)
 {
-    emu10k1_t *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
     unsigned int val;
     int change = 0;
@@ -993 +993 @@
 };
 
-int snd_p16v_mixer(emu10k1_t *emu)
+int snd_p16v_mixer(struct snd_emu10k1 *emu)
 {
     int err;

GPL/trunk/alsa-kernel/pci/emu10k1/timer.c

@@ -1 +1 @@
 /*
  *  Copyright (c) by Lee Revell <rlrevell@joe-job.com>
- *  
+ *
  *  Routines for control of EMU10K1 chips
  *
  *  Copied from similar code by Clemens Ladisch in the ymfpci driver
- * 
+ *
  *  BUGS:
  *    --
@@ -35 +35 @@
 static int snd_emu10k1_timer_start(snd_timer_t *timer)
 {
-        emu10k1_t *emu;
+        struct snd_emu10k1 *emu;
         unsigned long flags;
         unsigned int delay;
@@ -52 +52 @@
 static int snd_emu10k1_timer_stop(snd_timer_t *timer)
 {
-        emu10k1_t *emu;
+        struct snd_emu10k1 *emu;
         unsigned long flags;
 
@@ -70 +70 @@
 }
 
-static struct _snd_timer_hardware snd_emu10k1_timer_hw = {
-        /*.flags = */SNDRV_TIMER_HW_AUTO,
-        /*.resolution = */20833, /* 1 sample @ 48KHZ = 20.833...us */
-        0, 0,
-        /*.ticks = */1024,
-        NULL, NULL, NULL,
-        /*.start = */snd_emu10k1_timer_start,
-        /*.stop = */snd_emu10k1_timer_stop,
-        NULL,
-        /*.precise_resolution = */snd_emu10k1_timer_precise_resolution
+static struct snd_timer_hardware snd_emu10k1_timer_hw = {
+    .flags = SNDRV_TIMER_HW_AUTO,
+    .resolution = 20833, /* 1 sample @ 48KHZ = 20.833...us */
+    .ticks = 1024,
+    .start = snd_emu10k1_timer_start,
+    .stop = snd_emu10k1_timer_stop,
+    .precise_resolution = snd_emu10k1_timer_precise_resolution,
 };
 
-int __devinit snd_emu10k1_timer(emu10k1_t *emu, int device)
+int __devinit snd_emu10k1_timer(struct snd_emu10k1 *emu, int device)
 {
         snd_timer_t *timer = NULL;

GPL/trunk/alsa-kernel/pci/emu10k1/voice.c

@@ -47 +47 @@
  */
 
-static int voice_alloc(emu10k1_t *emu, emu10k1_voice_type_t type, int number, emu10k1_voice_t **rvoice)
+static int voice_alloc(struct snd_emu10k1 *emu, int type, int number, struct snd_emu10k1_voice **rvoice)
 {
-    emu10k1_voice_t *voice;
+    struct snd_emu10k1_voice *voice;
     int i, j, k, first_voice, last_voice, skip;
 
@@ -109 +109 @@
 }
 
-int snd_emu10k1_voice_alloc(emu10k1_t *emu, emu10k1_voice_type_t type, int number, emu10k1_voice_t **rvoice)
+int snd_emu10k1_voice_alloc(struct snd_emu10k1 *emu, int type, int number, struct snd_emu10k1_voice **rvoice)
 {
     unsigned long flags;
@@ -127 +127 @@
             result = emu->get_synth_voice(emu);
             if (result >= 0) {
-                emu10k1_voice_t *pvoice = &emu->voices[result];
+                struct snd_emu10k1_voice *pvoice = &emu->voices[result];
                 pvoice->interrupt = NULL;
                 pvoice->use = pvoice->pcm = pvoice->synth = pvoice->midi = pvoice->efx = 0;
@@ -141 +141 @@
 }
 
-int snd_emu10k1_voice_free(emu10k1_t *emu, emu10k1_voice_t *pvoice)
+int snd_emu10k1_voice_free(struct snd_emu10k1 *emu, struct snd_emu10k1_voice *pvoice)
 {
     unsigned long flags;