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

Timestamp:

Apr 19, 2025, 8:08:37 PM (6 months ago)

Author:

David Azarewicz

Message:

Merge in changes from 6.6-LTS branch.
Fixed additional 25+ problems.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/emu10k1/emu10k1.c (modified) (8 diffs)
• alsa-kernel/pci/emu10k1/emu10k1_callback.c (modified) (13 diffs)
• alsa-kernel/pci/emu10k1/emu10k1_main.c (modified) (45 diffs)
• alsa-kernel/pci/emu10k1/emu10k1_synth.c (modified) (5 diffs)
• alsa-kernel/pci/emu10k1/emufx.c (modified) (48 diffs)
• alsa-kernel/pci/emu10k1/emumixer.c (modified) (73 diffs)
• alsa-kernel/pci/emu10k1/emumpu401.c (modified) (14 diffs)
• alsa-kernel/pci/emu10k1/emupcm.c (modified) (49 diffs)
• alsa-kernel/pci/emu10k1/emuproc.c (modified) (18 diffs)
• alsa-kernel/pci/emu10k1/io.c (modified) (22 diffs)
• alsa-kernel/pci/emu10k1/irq.c (modified) (7 diffs)
• alsa-kernel/pci/emu10k1/memory.c (modified) (2 diffs)
• alsa-kernel/pci/emu10k1/p16v.c (modified) (18 diffs)
• alsa-kernel/pci/emu10k1/p16v.h (modified) (2 diffs)
• alsa-kernel/pci/emu10k1/p17v.h (modified) (1 diff)
• alsa-kernel/pci/emu10k1/timer.c (modified) (6 diffs)
• alsa-kernel/pci/emu10k1/tina2.h (modified) (1 diff)
• alsa-kernel/pci/emu10k1/voice.c (modified) (4 diffs)

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

@@ -3 +3 @@
  *  The driver for the EMU10K1 (SB Live!) based soundcards
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
- *
- *  Copyright (c) by James Courtier-Dutton <James@superbug.demon.co.uk>
- *      Added support for Audigy 2 Value.
+ *                   James Courtier-Dutton <James@superbug.co.uk>
  */
 
@@ -45 +43 @@
 static bool enable_ir[SNDRV_CARDS];
 static uint subsystem[SNDRV_CARDS]; /* Force card subsystem model */
-#ifndef TARGET_OS2
-static uint delay_pcm_irq[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 2};
-#else
-static uint delay_pcm_irq[SNDRV_CARDS] = {2,2,2,2,2,2,2,2};
-#endif
 
 module_param_array(index, int, NULL, 0444);
@@ -71 +64 @@
 module_param_array(subsystem, uint, NULL, 0444);
 MODULE_PARM_DESC(subsystem, "Force card subsystem model.");
-module_param_array(delay_pcm_irq, uint, NULL, 0444);
-MODULE_PARM_DESC(delay_pcm_irq, "Delay PCM interrupt by specified number of samples (default 0).");
 /*
  * Class 0401: 1102:0008 (rev 00) Subsystem: 1102:1001 -> Audigy2 Value  Model:SB0400
@@ -83 +74 @@
 };
 
-/*
- * Audigy 2 Value notes:
- * A_IOCFG Input (GPIO)
- * 0x400  = Front analog jack plugged in. (Green socket)
- * 0x1000 = Read analog jack plugged in. (Black socket)
- * 0x2000 = Center/LFE analog jack plugged in. (Orange socket)
- * A_IOCFG Output (GPIO)
- * 0x60 = Sound out of front Left.
- * Win sets it to 0xXX61
- */
-
 MODULE_DEVICE_TABLE(pci, snd_emu10k1_ids);
 
@@ -129 +109 @@
         if (err < 0)
                 return err;
-        emu->delay_pcm_irq = delay_pcm_irq[dev] & 0x1f;
         err = snd_emu10k1_pcm(emu, 0);
         if (err < 0)
                 return err;
-        err = snd_emu10k1_pcm_mic(emu, 1);
-        if (err < 0)
-                return err;
+        if (emu->card_capabilities->ac97_chip) {
+                err = snd_emu10k1_pcm_mic(emu, 1);
+                if (err < 0)
+                        return err;
+        }
         err = snd_emu10k1_pcm_efx(emu, 2);
         if (err < 0)
@@ -203 +184 @@
                 return err;
 
-        if (emu->card_capabilities->emu_model)
-                schedule_delayed_work(&emu->emu1010.firmware_work, 0);
-
         pci_set_drvdata(pci, card);
         dev++;
@@ -221 +199 @@
         emu->suspend = 1;
 
-        cancel_delayed_work_sync(&emu->emu1010.firmware_work);
+        cancel_work_sync(&emu->emu1010.work);
 
         snd_ac97_suspend(emu->ac97);
@@ -250 +228 @@
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D0);
-
-        if (emu->card_capabilities->emu_model)
-                schedule_delayed_work(&emu->emu1010.firmware_work, 0);
 
         return 0;

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

@@ -34 +34 @@
 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);
+static u32 make_fmmod(struct snd_emux_voice *vp);
+static u32 make_fm2frq2(struct snd_emux_voice *vp);
+static int get_pitch_shift(struct snd_emux *emu);
 
 /*
@@ -60 +60 @@
         .sample_new =   snd_emu10k1_sample_new,
         .sample_free =  snd_emu10k1_sample_free,
+        .get_pitch_shift = get_pitch_shift,
 };
 
@@ -117 +118 @@
 release_voice(struct snd_emux_voice *vp)
 {
-        int dcysusv;
         struct snd_emu10k1 *hw;
         
         hw = vp->hw;
-        dcysusv = 0x8000 | (unsigned char)vp->reg.parm.modrelease;
-        snd_emu10k1_ptr_write(hw, DCYSUSM, vp->ch, dcysusv);
-        dcysusv = 0x8000 | (unsigned char)vp->reg.parm.volrelease | DCYSUSV_CHANNELENABLE_MASK;
-        snd_emu10k1_ptr_write(hw, DCYSUSV, vp->ch, dcysusv);
+        snd_emu10k1_ptr_write_multiple(hw, vp->ch,
+                DCYSUSM, (unsigned char)vp->reg.parm.modrelease | DCYSUSM_PHASE1_MASK,
+                DCYSUSV, (unsigned char)vp->reg.parm.volrelease | DCYSUSV_PHASE1_MASK | DCYSUSV_CHANNELENABLE_MASK,
+                REGLIST_END);
 }
 
@@ -139 +139 @@
                 return;
         hw = vp->hw;
-        snd_emu10k1_ptr_write(hw, DCYSUSV, vp->ch, 0x807f | DCYSUSV_CHANNELENABLE_MASK);
+        snd_emu10k1_ptr_write_multiple(hw, vp->ch,
+                DCYSUSV, 0,
+                VTFT, VTFT_FILTERTARGET_MASK,
+                CVCF, CVCF_CURRENTFILTER_MASK,
+                PTRX, 0,
+                CPF, 0,
+                REGLIST_END);
         if (vp->block) {
                 struct snd_emu10k1_memblk *emem;
@@ -162 +168 @@
         /* on the Audigy 2 ZS Notebook. */
         if (hw && (vp->ch >= 0)) {
-                snd_emu10k1_ptr_write(hw, IFATN, vp->ch, 0xff00);
-                snd_emu10k1_ptr_write(hw, DCYSUSV, vp->ch, 0x807f | DCYSUSV_CHANNELENABLE_MASK);
-                // snd_emu10k1_ptr_write(hw, DCYSUSV, vp->ch, 0);
-                snd_emu10k1_ptr_write(hw, VTFT, vp->ch, 0xffff);
-                snd_emu10k1_ptr_write(hw, CVCF, vp->ch, 0xffff);
                 snd_emu10k1_voice_free(hw, &hw->voices[vp->ch]);
                 vp->emu->num_voices--;
@@ -192 +193 @@
         }
         if (update & SNDRV_EMUX_UPDATE_FMMOD)
-                set_fmmod(hw, vp);
+                snd_emu10k1_ptr_write(hw, FMMOD, vp->ch, make_fmmod(vp));
         if (update & SNDRV_EMUX_UPDATE_TREMFREQ)
                 snd_emu10k1_ptr_write(hw, TREMFRQ, vp->ch, vp->reg.parm.tremfrq);
         if (update & SNDRV_EMUX_UPDATE_FM2FRQ2)
-                set_fm2frq2(hw, vp);
+                snd_emu10k1_ptr_write(hw, FM2FRQ2, vp->ch, make_fm2frq2(vp));
         if (update & SNDRV_EMUX_UPDATE_Q)
-                set_filterQ(hw, vp);
+                snd_emu10k1_ptr_write(hw, CCCA_RESONANCE, vp->ch, vp->reg.parm.filterQ);
 }
 
@@ -289 +290 @@
                                 /* allocate a voice */
                                 struct snd_emu10k1_voice *hwvoice;
-                                if (snd_emu10k1_voice_alloc(hw, EMU10K1_SYNTH, 1, &hwvoice) < 0 || hwvoice == NULL)
+                                if (snd_emu10k1_voice_alloc(hw, EMU10K1_SYNTH, 1, 1, NULL, &hwvoice) < 0)
                                         continue;
                                 vp->ch = hwvoice->number;
@@ -310 +311 @@
         unsigned int temp;
         int ch;
+        u32 psst, dsl, map, ccca, vtarget;
         unsigned int addr, mapped_offset;
         struct snd_midi_channel *chan;
@@ -347 +349 @@
         }
 
-        /* channel to be silent and idle */
-        snd_emu10k1_ptr_write(hw, DCYSUSV, ch, 0x0000);
-        snd_emu10k1_ptr_write(hw, VTFT, ch, 0x0000FFFF);
-        snd_emu10k1_ptr_write(hw, CVCF, ch, 0x0000FFFF);
-        snd_emu10k1_ptr_write(hw, PTRX, ch, 0);
-        snd_emu10k1_ptr_write(hw, CPF, ch, 0);
-
-        /* set pitch offset */
-        snd_emu10k1_ptr_write(hw, IP, vp->ch, vp->apitch);
-
-        /* set envelope parameters */
-        snd_emu10k1_ptr_write(hw, ENVVAL, ch, vp->reg.parm.moddelay);
-        snd_emu10k1_ptr_write(hw, ATKHLDM, ch, vp->reg.parm.modatkhld);
-        snd_emu10k1_ptr_write(hw, DCYSUSM, ch, vp->reg.parm.moddcysus);
-        snd_emu10k1_ptr_write(hw, ENVVOL, ch, vp->reg.parm.voldelay);
-        snd_emu10k1_ptr_write(hw, ATKHLDV, ch, vp->reg.parm.volatkhld);
-        /* decay/sustain parameter for volume envelope is used
-           for triggerg the voice */
-
-        /* cutoff and volume */
-        temp = (unsigned int)vp->acutoff << 8 | (unsigned char)vp->avol;
-        snd_emu10k1_ptr_write(hw, IFATN, vp->ch, temp);
-
-        /* modulation envelope heights */
-        snd_emu10k1_ptr_write(hw, PEFE, ch, vp->reg.parm.pefe);
-
-        /* lfo1/2 delay */
-        snd_emu10k1_ptr_write(hw, LFOVAL1, ch, vp->reg.parm.lfo1delay);
-        snd_emu10k1_ptr_write(hw, LFOVAL2, ch, vp->reg.parm.lfo2delay);
-
-        /* lfo1 pitch & cutoff shift */
-        set_fmmod(hw, vp);
-        /* lfo1 volume & freq */
-        snd_emu10k1_ptr_write(hw, TREMFRQ, vp->ch, vp->reg.parm.tremfrq);
-        /* lfo2 pitch & freq */
-        set_fm2frq2(hw, vp);
-
-        /* reverb and loop start (reverb 8bit, MSB) */
         temp = vp->reg.parm.reverb;
         temp += (int)vp->chan->control[MIDI_CTL_E1_REVERB_DEPTH] * 9 / 10;
         LIMITMAX(temp, 255);
         addr = vp->reg.loopstart;
-        snd_emu10k1_ptr_write(hw, PSST, vp->ch, (temp << 24) | addr);
-
-        /* chorus & loop end (chorus 8bit, MSB) */
+        psst = (temp << 24) | addr;
+
         addr = vp->reg.loopend;
         temp = vp->reg.parm.chorus;
         temp += (int)chan->control[MIDI_CTL_E3_CHORUS_DEPTH] * 9 / 10;
         LIMITMAX(temp, 255);
-        temp = (temp <<24) | addr;
-        snd_emu10k1_ptr_write(hw, DSL, ch, temp);
-
-        /* clear filter delay memory */
-        snd_emu10k1_ptr_write(hw, Z1, ch, 0);
-        snd_emu10k1_ptr_write(hw, Z2, ch, 0);
-
-        /* invalidate maps */
-        temp = (hw->silent_page.addr << hw->address_mode) | (hw->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);
-        snd_emu10k1_ptr_write(hw, MAPA, ch, temp);
-        snd_emu10k1_ptr_write(hw, MAPB, ch, temp);
-#if 0
-        /* cache */
-        {
-                unsigned int val, sample;
-                val = 32;
-                if (vp->reg.sample_mode & SNDRV_SFNT_SAMPLE_8BITS)
-                        sample = 0x80808080;
-                else {
-                        sample = 0;
-                        val *= 2;
-                }
-
-                /* cache */
-                snd_emu10k1_ptr_write(hw, CCR, ch, 0x1c << 16);
-                snd_emu10k1_ptr_write(hw, CDE, ch, sample);
-                snd_emu10k1_ptr_write(hw, CDF, ch, sample);
-
-                /* invalidate maps */
-                temp = ((unsigned int)hw->silent_page.addr << hw_address_mode) | (hw->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);
-                snd_emu10k1_ptr_write(hw, MAPA, ch, temp);
-                snd_emu10k1_ptr_write(hw, MAPB, ch, temp);
-                
-                /* fill cache */
-                val -= 4;
-                val <<= 25;
-                val |= 0x1c << 16;
-                snd_emu10k1_ptr_write(hw, CCR, ch, val);
-        }
-#endif
-
-        /* Q & current address (Q 4bit value, MSB) */
+        dsl = (temp << 24) | addr;
+
+        map = (hw->silent_page.addr << hw->address_mode) | (hw->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);
+
         addr = vp->reg.start;
         temp = vp->reg.parm.filterQ;
-        temp = (temp<<28) | addr;
+        ccca = (temp << 28) | addr;
         if (vp->apitch < 0xe400)
-                temp |= CCCA_INTERPROM_0;
+                ccca |= CCCA_INTERPROM_0;
         else {
                 unsigned int shift = (vp->apitch - 0xe000) >> 10;
-                temp |= shift << 25;
+                ccca |= shift << 25;
         }
         if (vp->reg.sample_mode & SNDRV_SFNT_SAMPLE_8BITS)
-                temp |= CCCA_8BITSELECT;
-        snd_emu10k1_ptr_write(hw, CCCA, ch, temp);
-
-        /* reset volume */
-        temp = (unsigned int)vp->vtarget << 16;
-        snd_emu10k1_ptr_write(hw, VTFT, ch, temp | vp->ftarget);
-        snd_emu10k1_ptr_write(hw, CVCF, ch, temp | 0xff00);
+                ccca |= CCCA_8BITSELECT;
+
+        vtarget = (unsigned int)vp->vtarget << 16;
+
+        snd_emu10k1_ptr_write_multiple(hw, ch,
+                /* channel to be silent and idle */
+                DCYSUSV, 0,
+                VTFT, VTFT_FILTERTARGET_MASK,
+                CVCF, CVCF_CURRENTFILTER_MASK,
+                PTRX, 0,
+                CPF, 0,
+
+                /* set pitch offset */
+                IP, vp->apitch,
+
+                /* set envelope parameters */
+                ENVVAL, vp->reg.parm.moddelay,
+                ATKHLDM, vp->reg.parm.modatkhld,
+                DCYSUSM, vp->reg.parm.moddcysus,
+                ENVVOL, vp->reg.parm.voldelay,
+                ATKHLDV, vp->reg.parm.volatkhld,
+                /* decay/sustain parameter for volume envelope is used
+                   for triggerg the voice */
+
+                /* cutoff and volume */
+                IFATN, (unsigned int)vp->acutoff << 8 | (unsigned char)vp->avol,
+
+                /* modulation envelope heights */
+                PEFE, vp->reg.parm.pefe,
+
+                /* lfo1/2 delay */
+                LFOVAL1, vp->reg.parm.lfo1delay,
+                LFOVAL2, vp->reg.parm.lfo2delay,
+
+                /* lfo1 pitch & cutoff shift */
+                FMMOD, make_fmmod(vp),
+                /* lfo1 volume & freq */
+                TREMFRQ, vp->reg.parm.tremfrq,
+                /* lfo2 pitch & freq */
+                FM2FRQ2, make_fm2frq2(vp),
+
+                /* reverb and loop start (reverb 8bit, MSB) */
+                PSST, psst,
+
+                /* chorus & loop end (chorus 8bit, MSB) */
+                DSL, dsl,
+
+                /* clear filter delay memory */
+                Z1, 0,
+                Z2, 0,
+
+                /* invalidate maps */
+                MAPA, map,
+                MAPB, map,
+
+                /* Q & current address (Q 4bit value, MSB) */
+                CCCA, ccca,
+
+                /* reset volume */
+                VTFT, vtarget | vp->ftarget,
+                CVCF, vtarget | CVCF_CURRENTFILTER_MASK,
+
+                REGLIST_END);
+
+        hw->voices[ch].dirty = 1;
         return 0;
 }
@@ -464 +447 @@
 trigger_voice(struct snd_emux_voice *vp)
 {
-        unsigned int temp, ptarget;
+        unsigned int ptarget;
         struct snd_emu10k1 *hw;
         struct snd_emu10k1_memblk *emem;
@@ -479 +462 @@
         ptarget = IP_TO_CP(vp->apitch);
 #endif
-        /* set pitch target and pan (volume) */
-        temp = ptarget | (vp->apan << 8) | vp->aaux;
-        snd_emu10k1_ptr_write(hw, PTRX, vp->ch, temp);
-
-        /* pitch target */
-        snd_emu10k1_ptr_write(hw, CPF, vp->ch, ptarget);
-
-        /* trigger voice */
-        snd_emu10k1_ptr_write(hw, DCYSUSV, vp->ch, vp->reg.parm.voldcysus|DCYSUSV_CHANNELENABLE_MASK);
+        snd_emu10k1_ptr_write_multiple(hw, vp->ch,
+                /* set pitch target and pan (volume) */
+                PTRX, ptarget | (vp->apan << 8) | vp->aaux,
+
+                /* current pitch and fractional address */
+                CPF, ptarget,
+
+                /* enable envelope engine */
+                DCYSUSV, vp->reg.parm.voldcysus | DCYSUSV_CHANNELENABLE_MASK,
+
+                REGLIST_END);
 }
 
 #define MOD_SENSE 18
 
-/* set lfo1 modulation height and cutoff */
-static void
-set_fmmod(struct snd_emu10k1 *hw, struct snd_emux_voice *vp)
-{
-        unsigned short fmmod;
+/* calculate lfo1 modulation height and cutoff register */
+static u32
+make_fmmod(struct snd_emux_voice *vp)
+{
         short pitch;
         unsigned char cutoff;
@@ -506 +490 @@
         pitch += (MOD_SENSE * modulation) / 1200;
         LIMITVALUE(pitch, -128, 127);
-        fmmod = ((unsigned char)pitch<<8) | cutoff;
-        snd_emu10k1_ptr_write(hw, FMMOD, vp->ch, fmmod);
-}
-
-/* set lfo2 pitch & frequency */
-static void
-set_fm2frq2(struct snd_emu10k1 *hw, struct snd_emux_voice *vp)
-{
-        unsigned short fm2frq2;
+        return ((unsigned char)pitch << 8) | cutoff;
+}
+
+/* calculate set lfo2 pitch & frequency register */
+static u32
+make_fm2frq2(struct snd_emux_voice *vp)
+{
         short pitch;
         unsigned char freq;
@@ -524 +506 @@
         pitch += (MOD_SENSE * modulation) / 1200;
         LIMITVALUE(pitch, -128, 127);
-        fm2frq2 = ((unsigned char)pitch<<8) | freq;
-        snd_emu10k1_ptr_write(hw, FM2FRQ2, vp->ch, fm2frq2);
-}
-
-/* set filterQ */
-static void
-set_filterQ(struct snd_emu10k1 *hw, struct snd_emux_voice *vp)
-{
-        unsigned int val;
-        val = snd_emu10k1_ptr_read(hw, CCCA, vp->ch) & ~CCCA_RESONANCE;
-        val |= (vp->reg.parm.filterQ << 28);
-        snd_emu10k1_ptr_write(hw, CCCA, vp->ch, val);
-}
+        return ((unsigned char)pitch << 8) | freq;
+}
+
+static int get_pitch_shift(struct snd_emux *emu)
+{
+        struct snd_emu10k1 *hw = emu->hw;
+
+        return (hw->card_capabilities->emu_model &&
+                        hw->emu1010.word_clock == 44100) ? 0 : -501;
+}

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

@@ -2 +2 @@
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
+ *                   James Courtier-Dutton <James@superbug.co.uk>
+ *                   Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
  *                   Creative Labs, Inc.
+ *
  *  Routines for control of EMU10K1 chips
- *
- *  Copyright (c) by James Courtier-Dutton <James@superbug.co.uk>
- *      Added support for Audigy 2 Value.
- *      Added EMU 1010 support.
- *      General bug fixes and enhancements.
- *
- *  BUGS:
- *    --
- *
- *  TODO:
- *    --
  */
 
@@ -66 +58 @@
 void snd_emu10k1_voice_init(struct snd_emu10k1 *emu, int ch)
 {
-        snd_emu10k1_ptr_write(emu, DCYSUSV, ch, 0);
-        snd_emu10k1_ptr_write(emu, IP, ch, 0);
-        snd_emu10k1_ptr_write(emu, VTFT, ch, 0xffff);
-        snd_emu10k1_ptr_write(emu, CVCF, ch, 0xffff);
-        snd_emu10k1_ptr_write(emu, PTRX, ch, 0);
-        snd_emu10k1_ptr_write(emu, CPF, ch, 0);
-        snd_emu10k1_ptr_write(emu, CCR, ch, 0);
-
-        snd_emu10k1_ptr_write(emu, PSST, ch, 0);
-        snd_emu10k1_ptr_write(emu, DSL, ch, 0x10);
-        snd_emu10k1_ptr_write(emu, CCCA, ch, 0);
-        snd_emu10k1_ptr_write(emu, Z1, ch, 0);
-        snd_emu10k1_ptr_write(emu, Z2, ch, 0);
-        snd_emu10k1_ptr_write(emu, FXRT, ch, 0x32100000);
-
-        snd_emu10k1_ptr_write(emu, ATKHLDM, ch, 0);
-        snd_emu10k1_ptr_write(emu, DCYSUSM, ch, 0);
-        snd_emu10k1_ptr_write(emu, IFATN, ch, 0xffff);
-        snd_emu10k1_ptr_write(emu, PEFE, ch, 0);
-        snd_emu10k1_ptr_write(emu, FMMOD, ch, 0);
-        snd_emu10k1_ptr_write(emu, TREMFRQ, ch, 24);    /* 1 Hz */
-        snd_emu10k1_ptr_write(emu, FM2FRQ2, ch, 24);    /* 1 Hz */
-        snd_emu10k1_ptr_write(emu, TEMPENV, ch, 0);
-
-        /*** these are last so OFF prevents writing ***/
-        snd_emu10k1_ptr_write(emu, LFOVAL2, ch, 0);
-        snd_emu10k1_ptr_write(emu, LFOVAL1, ch, 0);
-        snd_emu10k1_ptr_write(emu, ATKHLDV, ch, 0);
-        snd_emu10k1_ptr_write(emu, ENVVOL, ch, 0);
-        snd_emu10k1_ptr_write(emu, ENVVAL, ch, 0);
+        snd_emu10k1_ptr_write_multiple(emu, ch,
+                DCYSUSV, 0,
+                VTFT, VTFT_FILTERTARGET_MASK,
+                CVCF, CVCF_CURRENTFILTER_MASK,
+                PTRX, 0,
+                CPF, 0,
+                CCR, 0,
+
+                PSST, 0,
+                DSL, 0x10,
+                CCCA, 0,
+                Z1, 0,
+                Z2, 0,
+                FXRT, 0x32100000,
+
+                // The rest is meaningless as long as DCYSUSV_CHANNELENABLE_MASK is zero
+                DCYSUSM, 0,
+                ATKHLDV, 0,
+                ATKHLDM, 0,
+                IP, 0,
+                IFATN, IFATN_FILTERCUTOFF_MASK | IFATN_ATTENUATION_MASK,
+                PEFE, 0,
+                FMMOD, 0,
+                TREMFRQ, 24,    /* 1 Hz */
+                FM2FRQ2, 24,    /* 1 Hz */
+                LFOVAL2, 0,
+                LFOVAL1, 0,
+                ENVVOL, 0,
+                ENVVAL, 0,
+
+                REGLIST_END);
 
         /* Audigy extra stuffs */
         if (emu->audigy) {
-                snd_emu10k1_ptr_write(emu, 0x4c, ch, 0); /* ?? */
-                snd_emu10k1_ptr_write(emu, 0x4d, ch, 0); /* ?? */
-                snd_emu10k1_ptr_write(emu, 0x4e, ch, 0); /* ?? */
-                snd_emu10k1_ptr_write(emu, 0x4f, ch, 0); /* ?? */
-                snd_emu10k1_ptr_write(emu, A_FXRT1, ch, 0x03020100);
-                snd_emu10k1_ptr_write(emu, A_FXRT2, ch, 0x3f3f3f3f);
-                snd_emu10k1_ptr_write(emu, A_SENDAMOUNTS, ch, 0);
+                snd_emu10k1_ptr_write_multiple(emu, ch,
+                        A_CSBA, 0,
+                        A_CSDC, 0,
+                        A_CSFE, 0,
+                        A_CSHG, 0,
+                        A_FXRT1, 0x03020100,
+                        A_FXRT2, 0x07060504,
+                        A_SENDAMOUNTS, 0,
+                        REGLIST_END);
         }
 }
@@ -149 +144 @@
 };
 
-static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
+static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir)
 {
         unsigned int silent_page;
@@ -159 +154 @@
                 HCFG_MUTEBUTTONENABLE, emu->port + HCFG);
 
-        /* reset recording buffers */
-        snd_emu10k1_ptr_write(emu, MICBS, 0, ADCBS_BUFSIZE_NONE);
-        snd_emu10k1_ptr_write(emu, MICBA, 0, 0);
-        snd_emu10k1_ptr_write(emu, FXBS, 0, ADCBS_BUFSIZE_NONE);
-        snd_emu10k1_ptr_write(emu, FXBA, 0, 0);
-        snd_emu10k1_ptr_write(emu, ADCBS, 0, ADCBS_BUFSIZE_NONE);
-        snd_emu10k1_ptr_write(emu, ADCBA, 0, 0);
-
-        /* disable channel interrupt */
         outl(0, emu->port + INTE);
-        snd_emu10k1_ptr_write(emu, CLIEL, 0, 0);
-        snd_emu10k1_ptr_write(emu, CLIEH, 0, 0);
-        snd_emu10k1_ptr_write(emu, SOLEL, 0, 0);
-        snd_emu10k1_ptr_write(emu, SOLEH, 0, 0);
+
+        snd_emu10k1_ptr_write_multiple(emu, 0,
+                /* reset recording buffers */
+                MICBS, ADCBS_BUFSIZE_NONE,
+                MICBA, 0,
+                FXBS, ADCBS_BUFSIZE_NONE,
+                FXBA, 0,
+                ADCBS, ADCBS_BUFSIZE_NONE,
+                ADCBA, 0,
+
+                /* disable channel interrupt */
+                CLIEL, 0,
+                CLIEH, 0,
+
+                /* disable stop on loop end */
+                SOLEL, 0,
+                SOLEH, 0,
+
+                REGLIST_END);
 
         if (emu->audigy) {
@@ -186 +187 @@
                 snd_emu10k1_voice_init(emu, ch);
 
-        snd_emu10k1_ptr_write(emu, SPCS0, 0, emu->spdif_bits[0]);
-        snd_emu10k1_ptr_write(emu, SPCS1, 0, emu->spdif_bits[1]);
-        snd_emu10k1_ptr_write(emu, SPCS2, 0, emu->spdif_bits[2]);
-
-        if (emu->card_capabilities->ca0151_chip) { /* audigy2 */
+        snd_emu10k1_ptr_write_multiple(emu, 0,
+                SPCS0, emu->spdif_bits[0],
+                SPCS1, emu->spdif_bits[1],
+                SPCS2, emu->spdif_bits[2],
+                REGLIST_END);
+
+        if (emu->card_capabilities->emu_model) {
+        } else if (emu->card_capabilities->ca0151_chip) { /* audigy2 */
                 /* Hacks for Alice3 to work independent of haP16V driver */
                 /* Setup SRCMulti_I2S SamplingRate */
+#ifndef TARGET_OS2
+                snd_emu10k1_ptr_write(emu, A_I2S_CAPTURE_RATE, 0, A_I2S_CAPTURE_96000);
+#else
                 tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);
                 tmp &= 0xfffff1ff;
                 tmp |= (0x2<<9);
                 snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, 0, tmp);
-
+#endif
                 /* Setup SRCSel (Enable Spdif,I2S SRCMulti) */
                 snd_emu10k1_ptr20_write(emu, SRCSel, 0, 0x14);
@@ -208 +215 @@
                 /* Set playback routing. */
                 snd_emu10k1_ptr20_write(emu, CAPTURE_P16V_SOURCE, 0, 0x78e4);
-        }
-        if (emu->card_capabilities->ca0108_chip) { /* audigy2 Value */
+        } else if (emu->card_capabilities->ca0108_chip) { /* audigy2 Value */
                 /* Hacks for Alice3 to work independent of haP16V driver */
                 dev_info(emu->card->dev, "Audigy2 value: Special config.\n");
                 /* Setup SRCMulti_I2S SamplingRate */
+#ifndef TARGET_OS2
+                snd_emu10k1_ptr_write(emu, A_I2S_CAPTURE_RATE, 0, A_I2S_CAPTURE_96000);
+#else
                 tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);
                 tmp &= 0xfffff1ff;
                 tmp |= (0x2<<9);
                 snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, 0, tmp);
-
+#endif
                 /* Setup SRCSel (Enable Spdif,I2S SRCMulti) */
-                outl(0x600000, emu->port + 0x20);
-                outl(0x14, emu->port + 0x24);
+                snd_emu10k1_ptr20_write(emu, P17V_SRCSel, 0, 0x14);
 
                 /* Setup SRCMulti Input Audio Enable */
-                outl(0x7b0000, emu->port + 0x20);
-                outl(0xFF000000, emu->port + 0x24);
+                snd_emu10k1_ptr20_write(emu, P17V_MIXER_I2S_ENABLE, 0, 0xFF000000);
 
                 /* Setup SPDIF Out Audio Enable */
@@ -230 +237 @@
                  * so no need for a mixer switch
                  */
-                outl(0x7a0000, emu->port + 0x20);
-                outl(0xFF000000, emu->port + 0x24);
-                tmp = inl(emu->port + A_IOCFG) & ~0x8; /* Clear bit 3 */
-                outl(tmp, emu->port + A_IOCFG);
+                snd_emu10k1_ptr20_write(emu, P17V_MIXER_SPDIF_ENABLE, 0, 0xFF000000);
+
+                tmp = inw(emu->port + A_IOCFG) & ~0x8; /* Clear bit 3 */
+                outw(tmp, emu->port + A_IOCFG);
         }
         if (emu->card_capabilities->spi_dac) { /* Audigy 2 ZS Notebook with DAC Wolfson WM8768/WM8568 */
@@ -253 +260 @@
                  * GPIO7: Unknown
                  */
-                outl(0x76, emu->port + A_IOCFG); /* Windows uses 0x3f76 */
+                outw(0x76, emu->port + A_IOCFG); /* Windows uses 0x3f76 */
         }
         if (emu->card_capabilities->i2c_adc) { /* Audigy 2 ZS Notebook with ADC Wolfson WM8775 */
@@ -259 +266 @@
 
                 snd_emu10k1_ptr20_write(emu, P17V_I2S_SRC_SEL, 0, 0x2020205f);
-                tmp = inl(emu->port + A_IOCFG);
-                outl(tmp | 0x4, emu->port + A_IOCFG);  /* Set bit 2 for mic input */
-                tmp = inl(emu->port + A_IOCFG);
+                tmp = inw(emu->port + A_IOCFG);
+                outw(tmp | 0x4, emu->port + A_IOCFG);  /* Set bit 2 for mic input */
+                tmp = inw(emu->port + A_IOCFG);
                 size = ARRAY_SIZE(i2c_adc_init);
                 for (n = 0; n < size; n++)
@@ -274 +281 @@
         snd_emu10k1_ptr_write(emu, PTB, 0, emu->ptb_pages.addr);
         snd_emu10k1_ptr_write(emu, TCB, 0, 0);  /* taken from original driver */
-        snd_emu10k1_ptr_write(emu, TCBS, 0, 4); /* taken from original driver */
+        snd_emu10k1_ptr_write(emu, TCBS, 0, TCBS_BUFFSIZE_256K);        /* taken from original driver */
 
         silent_page = (emu->silent_page.addr << emu->address_mode) | (emu->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);
@@ -317 +324 @@
                         ;  /* Disable A_IOCFG for Audigy 2 ZS Notebook */
                 } else if (emu->audigy) {
-                        unsigned int reg = inl(emu->port + A_IOCFG);
-                        outl(reg | A_IOCFG_GPOUT2, emu->port + A_IOCFG);
+                        u16 reg = inw(emu->port + A_IOCFG);
+                        outw(reg | A_IOCFG_GPOUT2, emu->port + A_IOCFG);
                         udelay(500);
-                        outl(reg | A_IOCFG_GPOUT1 | A_IOCFG_GPOUT2, emu->port + A_IOCFG);
+                        outw(reg | A_IOCFG_GPOUT1 | A_IOCFG_GPOUT2, emu->port + A_IOCFG);
                         udelay(100);
-                        outl(reg, emu->port + A_IOCFG);
+                        outw(reg, emu->port + A_IOCFG);
                 } else {
                         unsigned int reg = inl(emu->port + HCFG);
@@ -338 +345 @@
                 ;  /* Disable A_IOCFG for Audigy 2 ZS Notebook */
         } else if (emu->audigy) {       /* enable analog output */
-                unsigned int reg = inl(emu->port + A_IOCFG);
-                outl(reg | A_IOCFG_GPOUT0, emu->port + A_IOCFG);
+                u16 reg = inw(emu->port + A_IOCFG);
+                outw(reg | A_IOCFG_GPOUT0, emu->port + A_IOCFG);
         }
 
@@ -363 +370 @@
                 ;  /* Disable A_IOCFG for Audigy 2 ZS Notebook */
         } else if (emu->audigy) {
-                outl(inl(emu->port + A_IOCFG) & ~0x44, emu->port + A_IOCFG);
+                outw(inw(emu->port + A_IOCFG) & ~0x44, emu->port + A_IOCFG);
 
                 if (emu->card_capabilities->ca0151_chip) { /* audigy2 */
@@ -369 +376 @@
                          * This has to be done after init ALice3 I2SOut beyond 48KHz.
                          * So, sequence is important. */
-                        outl(inl(emu->port + A_IOCFG) | 0x0040, emu->port + A_IOCFG);
+                        outw(inw(emu->port + A_IOCFG) | 0x0040, emu->port + A_IOCFG);
                 } else if (emu->card_capabilities->ca0108_chip) { /* audigy2 value */
                         /* Unmute Analog now. */
-                        outl(inl(emu->port + A_IOCFG) | 0x0060, emu->port + A_IOCFG);
+                        outw(inw(emu->port + A_IOCFG) | 0x0060, emu->port + A_IOCFG);
                 } else {
                         /* Disable routing from AC97 line out to Front speakers */
-                        outl(inl(emu->port + A_IOCFG) | 0x0080, emu->port + A_IOCFG);
+                        outw(inw(emu->port + A_IOCFG) | 0x0080, emu->port + A_IOCFG);
                 }
         }
@@ -397 +404 @@
 #endif
 
-        snd_emu10k1_intr_enable(emu, INTE_PCIERRORENABLE);
+        if (emu->card_capabilities->emu_model)
+                snd_emu10k1_intr_enable(emu, INTE_PCIERRORENABLE | INTE_A_GPIOENABLE);
+        else
+                snd_emu10k1_intr_enable(emu, INTE_PCIERRORENABLE);
 }
 
@@ -407 +417 @@
 
         /*
-         *  Shutdown the chip
+         *  Shutdown the voices
          */
-        for (ch = 0; ch < NUM_G; ch++)
-                snd_emu10k1_ptr_write(emu, DCYSUSV, ch, 0);
         for (ch = 0; ch < NUM_G; ch++) {
-                snd_emu10k1_ptr_write(emu, VTFT, ch, 0);
-                snd_emu10k1_ptr_write(emu, CVCF, ch, 0);
-                snd_emu10k1_ptr_write(emu, PTRX, ch, 0);
-                snd_emu10k1_ptr_write(emu, CPF, ch, 0);
-        }
-
-        /* reset recording buffers */
-        snd_emu10k1_ptr_write(emu, MICBS, 0, 0);
-        snd_emu10k1_ptr_write(emu, MICBA, 0, 0);
-        snd_emu10k1_ptr_write(emu, FXBS, 0, 0);
-        snd_emu10k1_ptr_write(emu, FXBA, 0, 0);
-        snd_emu10k1_ptr_write(emu, FXWC, 0, 0);
-        snd_emu10k1_ptr_write(emu, ADCBS, 0, ADCBS_BUFSIZE_NONE);
-        snd_emu10k1_ptr_write(emu, ADCBA, 0, 0);
-        snd_emu10k1_ptr_write(emu, TCBS, 0, TCBS_BUFFSIZE_16K);
-        snd_emu10k1_ptr_write(emu, TCB, 0, 0);
+                snd_emu10k1_ptr_write_multiple(emu, ch,
+                        DCYSUSV, 0,
+                        VTFT, 0,
+                        CVCF, 0,
+                        PTRX, 0,
+                        CPF, 0,
+                        REGLIST_END);
+        }
+
+        // stop the DSP
         if (emu->audigy)
                 snd_emu10k1_ptr_write(emu, A_DBG, 0, A_DBG_SINGLE_STEP);
@@ -433 +435 @@
                 snd_emu10k1_ptr_write(emu, DBG, 0, EMU10K1_DBG_SINGLE_STEP);
 
-        /* disable channel interrupt */
-        snd_emu10k1_ptr_write(emu, CLIEL, 0, 0);
-        snd_emu10k1_ptr_write(emu, CLIEH, 0, 0);
-        snd_emu10k1_ptr_write(emu, SOLEL, 0, 0);
-        snd_emu10k1_ptr_write(emu, SOLEH, 0, 0);
+        snd_emu10k1_ptr_write_multiple(emu, 0,
+                /* reset recording buffers */
+                MICBS, 0,
+                MICBA, 0,
+                FXBS, 0,
+                FXBA, 0,
+                FXWC, 0,
+                ADCBS, ADCBS_BUFSIZE_NONE,
+                ADCBA, 0,
+                TCBS, TCBS_BUFFSIZE_16K,
+                TCB, 0,
+
+                /* disable channel interrupt */
+                CLIEL, 0,
+                CLIEH, 0,
+                SOLEL, 0,
+                SOLEH, 0,
+
+                PTB, 0,
+
+                REGLIST_END);
 
         /* disable audio and lock cache */
         outl(HCFG_LOCKSOUNDCACHE | HCFG_LOCKTANKCACHE_MASK | HCFG_MUTEBUTTONENABLE, emu->port + HCFG);
-        snd_emu10k1_ptr_write(emu, PTB, 0, 0);
 
         return 0;
@@ -660 +677 @@
 {
         int n, i;
-        int reg;
-        int value;
-        __always_unused unsigned int write_post;
-        unsigned long flags;
+        u16 reg;
+        u8 value;
+        __always_unused u16 write_post;
 
         if (!fw_entry)
@@ -669 +685 @@
 
         /* The FPGA is a Xilinx Spartan IIE XC2S50E */
+        /* On E-MU 0404b it is a Xilinx Spartan III XC3S50 */
         /* GPIO7 -> FPGA PGMN
          * GPIO6 -> FPGA CCLK
@@ -674 +691 @@
          * FPGA CONFIG OFF -> FPGA PGMN
          */
-        spin_lock_irqsave(&emu->emu_lock, flags);
-        outl(0x00, emu->port + A_IOCFG); /* Set PGMN low for 1uS. */
-        write_post = inl(emu->port + A_IOCFG);
+        spin_lock_irq(&emu->emu_lock);
+        outw(0x00, emu->port + A_GPIO); /* Set PGMN low for 100uS. */
+        write_post = inw(emu->port + A_GPIO);
         udelay(100);
-        outl(0x80, emu->port + A_IOCFG); /* Leave bit 7 set during netlist setup. */
-        write_post = inl(emu->port + A_IOCFG);
+        outw(0x80, emu->port + A_GPIO); /* Leave bit 7 set during netlist setup. */
+        write_post = inw(emu->port + A_GPIO);
         udelay(100); /* Allow FPGA memory to clean */
         for (n = 0; n < fw_entry->size; n++) {
@@ -688 +705 @@
                                 reg = reg | 0x20;
                         value = value >> 1;
-                        outl(reg, emu->port + A_IOCFG);
-                        write_post = inl(emu->port + A_IOCFG);
-                        outl(reg | 0x40, emu->port + A_IOCFG);
-                        write_post = inl(emu->port + A_IOCFG);
+                        outw(reg, emu->port + A_GPIO);
+                        write_post = inw(emu->port + A_GPIO);
+                        outw(reg | 0x40, emu->port + A_GPIO);
+                        write_post = inw(emu->port + A_GPIO);
                 }
         }
         /* After programming, set GPIO bit 4 high again. */
-        outl(0x10, emu->port + A_IOCFG);
-        write_post = inl(emu->port + A_IOCFG);
-        spin_unlock_irqrestore(&emu->emu_lock, flags);
+        outw(0x10, emu->port + A_GPIO);
+        write_post = inw(emu->port + A_GPIO);
+        spin_unlock_irq(&emu->emu_lock);
 
         return 0;
@@ -736 +753 @@
 }
 
-static void emu1010_firmware_work(struct work_struct *work)
+static void snd_emu1010_load_dock_firmware(struct snd_emu10k1 *emu)
+{
+        u32 tmp, tmp2;
+        int err;
+
+        // The docking events clearly arrive prematurely - while the
+        // Dock's FPGA seems to be successfully programmed, the Dock
+        // fails to initialize subsequently if we don't give it some
+        // time to "warm up" here.
+        msleep(200);
+
+        dev_info(emu->card->dev, "emu1010: Loading Audio Dock Firmware\n");
+        /* Return to Audio Dock programming mode */
+        snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG,
+                               EMU_HANA_FPGA_CONFIG_AUDIODOCK);
+        err = snd_emu1010_load_firmware(emu, 1, &emu->dock_fw);
+        if (err < 0)
+                return;
+        snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0);
+
+        snd_emu1010_fpga_read(emu, EMU_HANA_ID, &tmp);
+        dev_dbg(emu->card->dev, "emu1010: EMU_HANA+DOCK_ID = 0x%x\n", tmp);
+        if ((tmp & 0x1f) != 0x15) {
+                /* FPGA failed to be programmed */
+                dev_err(emu->card->dev,
+                        "emu1010: Loading Audio Dock Firmware failed, reg = 0x%x\n",
+                        tmp);
+                return;
+        }
+        dev_info(emu->card->dev, "emu1010: Audio Dock Firmware loaded\n");
+
+        snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp);
+        snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2);
+        dev_info(emu->card->dev, "Audio Dock ver: %u.%u\n", tmp, tmp2);
+
+        /* Allow DLL to settle, to sync clocking between 1010 and Dock */
+        msleep(10);
+}
+
+static void emu1010_dock_event(struct snd_emu10k1 *emu)
+{
+        u32 reg;
+
+        snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg); /* OPTIONS: Which cards are attached to the EMU */
+        if (reg & EMU_HANA_OPTION_DOCK_OFFLINE) {
+                /* Audio Dock attached */
+                snd_emu1010_load_dock_firmware(emu);
+                /* Unmute all. Default is muted after a firmware load */
+                snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);
+        } else if (!(reg & EMU_HANA_OPTION_DOCK_ONLINE)) {
+                /* Audio Dock removed */
+                dev_info(emu->card->dev, "emu1010: Audio Dock detached\n");
+                /* The hardware auto-mutes all, so we unmute again */
+                snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);
+        }
+}
+
+static void emu1010_clock_event(struct snd_emu10k1 *emu)
+{
+        struct snd_ctl_elem_id id;
+
+        spin_lock_irq(&emu->reg_lock);
+        // This is the only thing that can actually happen.
+        emu->emu1010.clock_source = emu->emu1010.clock_fallback;
+        emu->emu1010.wclock = 1 - emu->emu1010.clock_source;
+        snd_emu1010_update_clock(emu);
+        spin_unlock_irq(&emu->reg_lock);
+        snd_ctl_build_ioff(&id, emu->ctl_clock_source, 0);
+        snd_ctl_notify(emu->card, SNDRV_CTL_EVENT_MASK_VALUE, &id);
+}
+
+static void emu1010_work(struct work_struct *work)
 {
         struct snd_emu10k1 *emu;
-        u32 tmp, tmp2, reg;
-        int err;
-
-        emu = container_of(work, struct snd_emu10k1,
-                           emu1010.firmware_work.work);
+        u32 sts;
+
+        emu = container_of(work, struct snd_emu10k1, emu1010.work);
         if (emu->card->shutdown)
                 return;
@@ -750 +836 @@
                 return;
 #endif
-        snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &tmp); /* IRQ Status */
-        snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg); /* OPTIONS: Which cards are attached to the EMU */
-        if (reg & EMU_HANA_OPTION_DOCK_OFFLINE) {
-                /* Audio Dock attached */
-                /* Return to Audio Dock programming mode */
-                dev_info(emu->card->dev,
-                         "emu1010: Loading Audio Dock Firmware\n");
-                snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG,
-                                       EMU_HANA_FPGA_CONFIG_AUDIODOCK);
-                err = snd_emu1010_load_firmware(emu, 1, &emu->dock_fw);
-                if (err < 0)
-                        goto next;
-
-                snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0);
-                snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &tmp);
-                dev_info(emu->card->dev,
-                         "emu1010: EMU_HANA+DOCK_IRQ_STATUS = 0x%x\n", tmp);
-                /* ID, should read & 0x7f = 0x55 when FPGA programmed. */
-                snd_emu1010_fpga_read(emu, EMU_HANA_ID, &tmp);
-                dev_info(emu->card->dev,
-                         "emu1010: EMU_HANA+DOCK_ID = 0x%x\n", tmp);
-                if ((tmp & 0x1f) != 0x15) {
-                        /* FPGA failed to be programmed */
-                        dev_info(emu->card->dev,
-                                 "emu1010: Loading Audio Dock Firmware file failed, reg = 0x%x\n",
-                                 tmp);
-                        goto next;
-                }
-                dev_info(emu->card->dev,
-                         "emu1010: Audio Dock Firmware loaded\n");
-                snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp);
-                snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2);
-                dev_info(emu->card->dev, "Audio Dock ver: %u.%u\n", tmp, tmp2);
-                /* Sync clocking between 1010 and Dock */
-                /* Allow DLL to settle */
-                msleep(10);
-                /* Unmute all. Default is muted after a firmware load */
-                snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);
-        } else if (!reg && emu->emu1010.last_reg) {
-                /* Audio Dock removed */
-                dev_info(emu->card->dev, "emu1010: Audio Dock detached\n");
-                /* Unmute all */
-                snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);
-        }
-
- next:
-        emu->emu1010.last_reg = reg;
-        if (!emu->card->shutdown)
-                schedule_delayed_work(&emu->emu1010.firmware_work,
-                                      msecs_to_jiffies(1000));
+
+        snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &sts);
+
+        // The distinction of the IRQ status bits is unreliable,
+        // so we dispatch later based on option card status.
+        if (sts & (EMU_HANA_IRQ_DOCK | EMU_HANA_IRQ_DOCK_LOST))
+                emu1010_dock_event(emu);
+
+        if (sts & EMU_HANA_IRQ_WCLK_CHANGED)
+                emu1010_clock_event(emu);
+}
+
+static void emu1010_interrupt(struct snd_emu10k1 *emu)
+{
+        // We get an interrupt on each GPIO input pin change, but we
+        // care only about the ones triggered by the dedicated pin.
+        u16 sts = inw(emu->port + A_GPIO);
+        u16 bit = emu->card_capabilities->ca0108_chip ? 0x2000 : 0x8000;
+        if (!(sts & bit))
+                return;
+
+        schedule_work(&emu->emu1010.work);
 }
 //#endif
 
 /*
- * EMU-1010 - details found out from this driver, official MS Win drivers,
- * testing the card:
- *
- * Audigy2 (aka Alice2):
- * ---------------------
- *      * communication over PCI
- *      * conversion of 32-bit data coming over EMU32 links from HANA FPGA
- *        to 2 x 16-bit, using internal DSP instructions
- *      * slave mode, clock supplied by HANA
- *      * linked to HANA using:
- *              32 x 32-bit serial EMU32 output channels
- *              16 x EMU32 input channels
- *              (?) x I2S I/O channels (?)
- *
- * FPGA (aka HANA):
- * ---------------
- *      * provides all (?) physical inputs and outputs of the card
- *              (ADC, DAC, SPDIF I/O, ADAT I/O, etc.)
- *      * provides clock signal for the card and Alice2
- *      * two crystals - for 44.1kHz and 48kHz multiples
- *      * provides internal routing of signal sources to signal destinations
- *      * inputs/outputs to Alice2 - see above
- *
  * Current status of the driver:
  * ----------------------------
@@ -836 +871 @@
 static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
 {
-        unsigned int i;
         u32 tmp, tmp2, reg;
         int err;
 
         dev_info(emu->card->dev, "emu1010: Special config.\n");
-        /* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave,
-         * Lock Sound Memory Cache, Lock Tank Memory Cache,
-         * Mute all codecs.
-         */
-        outl(0x0005a00c, emu->port + HCFG);
-        /* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave,
-         * Lock Tank Memory Cache,
-         * Mute all codecs.
-         */
-        outl(0x0005a004, emu->port + HCFG);
-        /* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave,
-         * Mute all codecs.
-         */
-        outl(0x0005a000, emu->port + HCFG);
-        /* AC97 2.1, Any 16Meg of 4Gig address, Auto-Mute, EMU32 Slave,
-         * Mute all codecs.
-         */
-        outl(0x0005a000, emu->port + HCFG);
+
+        /* Mute, and disable audio and lock cache, just in case.
+         * Proper init follows in snd_emu10k1_init(). */
+        outl(HCFG_LOCKSOUNDCACHE | HCFG_LOCKTANKCACHE_MASK, emu->port + HCFG);
 
         /* Disable 48Volt power to Audio Dock */
@@ -870 +890 @@
                 /* Return to programming mode */
 
-                snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, 0x02);
+                snd_emu1010_fpga_write(emu, EMU_HANA_FPGA_CONFIG, EMU_HANA_FPGA_CONFIG_HANA);
         }
         snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);
@@ -907 +927 @@
         snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg);
         dev_info(emu->card->dev, "emu1010: Card options = 0x%x\n", reg);
-        snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg);
-        dev_info(emu->card->dev, "emu1010: Card options = 0x%x\n", reg);
-        snd_emu1010_fpga_read(emu, EMU_HANA_OPTICAL_TYPE, &tmp);
-        /* Optical -> ADAT I/O  */
-        /* 0 : SPDIF
-         * 1 : ADAT
-         */
-        emu->emu1010.optical_in = 1; /* IN_ADAT */
-        emu->emu1010.optical_out = 1; /* IN_ADAT */
-        tmp = 0;
-        tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0) |
-                (emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0);
+        if (reg & EMU_HANA_OPTION_DOCK_OFFLINE)
+                snd_emu1010_load_dock_firmware(emu);
+        if (emu->card_capabilities->no_adat) {
+                emu->emu1010.optical_in = 0; /* IN_SPDIF */
+                emu->emu1010.optical_out = 0; /* OUT_SPDIF */
+        } else {
+                /* Optical -> ADAT I/O  */
+                emu->emu1010.optical_in = 1; /* IN_ADAT */
+                emu->emu1010.optical_out = 1; /* OUT_ADAT */
+        }
+        tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : EMU_HANA_OPTICAL_IN_SPDIF) |
+                (emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : EMU_HANA_OPTICAL_OUT_SPDIF);
         snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp);
-        snd_emu1010_fpga_read(emu, EMU_HANA_ADC_PADS, &tmp);
         /* Set no attenuation on Audio Dock pads. */
-        snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, 0x00);
         emu->emu1010.adc_pads = 0x00;
-        snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_MISC, &tmp);
+        snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, emu->emu1010.adc_pads);
         /* Unmute Audio dock DACs, Headphone source DAC-4. */
-        snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, 0x30);
-        snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12);
-        snd_emu1010_fpga_read(emu, EMU_HANA_DAC_PADS, &tmp);
+        snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, EMU_HANA_DOCK_PHONES_192_DAC4);
         /* DAC PADs. */
-        snd_emu1010_fpga_write(emu, EMU_HANA_DAC_PADS, 0x0f);
-        emu->emu1010.dac_pads = 0x0f;
-        snd_emu1010_fpga_read(emu, EMU_HANA_DOCK_MISC, &tmp);
-        snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_MISC, 0x30);
-        snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &tmp);
+        emu->emu1010.dac_pads = EMU_HANA_DOCK_DAC_PAD1 | EMU_HANA_DOCK_DAC_PAD2 |
+                                EMU_HANA_DOCK_DAC_PAD3 | EMU_HANA_DOCK_DAC_PAD4;
+        snd_emu1010_fpga_write(emu, EMU_HANA_DAC_PADS, emu->emu1010.dac_pads);
         /* SPDIF Format. Set Consumer mode, 24bit, copy enable */
-        snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10);
+        snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, EMU_HANA_SPDIF_MODE_RX_INVALID);
         /* MIDI routing */
-        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19);
-        /* Unknown. */
-        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c);
-        /* IRQ Enable: All on */
-        /* snd_emu1010_fpga_write(emu, 0x09, 0x0f ); */
-        /* IRQ Enable: All off */
-        snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x00);
-
-        snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg);
-        dev_info(emu->card->dev, "emu1010: Card options3 = 0x%x\n", reg);
+        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, EMU_HANA_MIDI_INA_FROM_HAMOA | EMU_HANA_MIDI_INB_FROM_DOCK2);
+        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, EMU_HANA_MIDI_OUT_DOCK2 | EMU_HANA_MIDI_OUT_SYNC2);
+
+        emu->gpio_interrupt = emu1010_interrupt;
+        // Note: The Audigy INTE is set later
+        snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE,
+                               EMU_HANA_IRQ_DOCK | EMU_HANA_IRQ_DOCK_LOST | EMU_HANA_IRQ_WCLK_CHANGED);
+        snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &reg);  // Clear pending IRQs
+
+        emu->emu1010.clock_source = 1;  /* 48000 */
+        emu->emu1010.clock_fallback = 1;  /* 48000 */
         /* Default WCLK set to 48kHz. */
-        snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x00);
+        snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_48K);
         /* Word Clock source, Internal 48kHz x1 */
+        emu->emu1010.wclock = EMU_HANA_WCLOCK_INT_48K;
         snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K);
         /* snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_4X); */
-        /* Audio Dock LEDs. */
-        snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12);
-
-#if 0
-        /* For 96kHz */
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_0, EMU_SRC_HAMOA_ADC_LEFT1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_1, EMU_SRC_HAMOA_ADC_RIGHT1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_4, EMU_SRC_HAMOA_ADC_LEFT2);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_5, EMU_SRC_HAMOA_ADC_RIGHT2);
-#endif
-#if 0
-        /* For 192kHz */
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_0, EMU_SRC_HAMOA_ADC_LEFT1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_1, EMU_SRC_HAMOA_ADC_RIGHT1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_2, EMU_SRC_HAMOA_ADC_LEFT2);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_3, EMU_SRC_HAMOA_ADC_RIGHT2);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_4, EMU_SRC_HAMOA_ADC_LEFT3);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_5, EMU_SRC_HAMOA_ADC_RIGHT3);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_6, EMU_SRC_HAMOA_ADC_LEFT4);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_7, EMU_SRC_HAMOA_ADC_RIGHT4);
-#endif
-#if 1
-        /* For 48kHz */
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_0, EMU_SRC_DOCK_MIC_A1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_1, EMU_SRC_DOCK_MIC_B1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_2, EMU_SRC_HAMOA_ADC_LEFT2);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_3, EMU_SRC_HAMOA_ADC_LEFT2);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_4, EMU_SRC_DOCK_ADC1_LEFT1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_5, EMU_SRC_DOCK_ADC1_RIGHT1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_6, EMU_SRC_DOCK_ADC2_LEFT1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_7, EMU_SRC_DOCK_ADC2_RIGHT1);
-        /* Pavel Hofman - setting defaults for 8 more capture channels
-         * Defaults only, users will set their own values anyways, let's
-         * just copy/paste.
-         */
-
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_8, EMU_SRC_DOCK_MIC_A1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_9, EMU_SRC_DOCK_MIC_B1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_A, EMU_SRC_HAMOA_ADC_LEFT2);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_B, EMU_SRC_HAMOA_ADC_LEFT2);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_C, EMU_SRC_DOCK_ADC1_LEFT1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_D, EMU_SRC_DOCK_ADC1_RIGHT1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_E, EMU_SRC_DOCK_ADC2_LEFT1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_F, EMU_SRC_DOCK_ADC2_RIGHT1);
-#endif
-#if 0
-        /* Original */
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_4, EMU_SRC_HANA_ADAT);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_5, EMU_SRC_HANA_ADAT + 1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_6, EMU_SRC_HANA_ADAT + 2);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_7, EMU_SRC_HANA_ADAT + 3);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_8, EMU_SRC_HANA_ADAT + 4);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_9, EMU_SRC_HANA_ADAT + 5);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_A, EMU_SRC_HANA_ADAT + 6);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_B, EMU_SRC_HANA_ADAT + 7);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_C, EMU_SRC_DOCK_MIC_A1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_D, EMU_SRC_DOCK_MIC_B1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_E, EMU_SRC_HAMOA_ADC_LEFT2);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE2_EMU32_F, EMU_SRC_HAMOA_ADC_LEFT2);
-#endif
-        for (i = 0; i < 0x20; i++) {
-                /* AudioDock Elink <- Silence */
-                snd_emu1010_fpga_link_dst_src_write(emu, 0x0100 + i, EMU_SRC_SILENCE);
-        }
-        for (i = 0; i < 4; i++) {
-                /* Hana SPDIF Out <- Silence */
-                snd_emu1010_fpga_link_dst_src_write(emu, 0x0200 + i, EMU_SRC_SILENCE);
-        }
-        for (i = 0; i < 7; i++) {
-                /* Hamoa DAC <- Silence */
-                snd_emu1010_fpga_link_dst_src_write(emu, 0x0300 + i, EMU_SRC_SILENCE);
-        }
-        for (i = 0; i < 7; i++) {
-                /* Hana ADAT Out <- Silence */
-                snd_emu1010_fpga_link_dst_src_write(emu, EMU_DST_HANA_ADAT + i, EMU_SRC_SILENCE);
-        }
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE_I2S0_LEFT, EMU_SRC_DOCK_ADC1_LEFT1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE_I2S0_RIGHT, EMU_SRC_DOCK_ADC1_RIGHT1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE_I2S1_LEFT, EMU_SRC_DOCK_ADC2_LEFT1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE_I2S1_RIGHT, EMU_SRC_DOCK_ADC2_RIGHT1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE_I2S2_LEFT, EMU_SRC_DOCK_ADC3_LEFT1);
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_ALICE_I2S2_RIGHT, EMU_SRC_DOCK_ADC3_RIGHT1);
-        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x01); /* Unmute all */
-
-        snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &tmp);
-
-        /* AC97 1.03, Any 32Meg of 2Gig address, Auto-Mute, EMU32 Slave,
-         * Lock Sound Memory Cache, Lock Tank Memory Cache,
-         * Mute all codecs.
-         */
-        outl(0x0000a000, emu->port + HCFG);
-        /* AC97 1.03, Any 32Meg of 2Gig address, Auto-Mute, EMU32 Slave,
-         * Lock Sound Memory Cache, Lock Tank Memory Cache,
-         * Un-Mute all codecs.
-         */
-        outl(0x0000a001, emu->port + HCFG);
-
-        /* Initial boot complete. Now patches */
-
-        snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &tmp);
-        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19); /* MIDI Route */
-        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c); /* Unknown */
-        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19); /* MIDI Route */
-        snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c); /* Unknown */
-        snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &tmp);
-        snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10); /* SPDIF Format spdif  (or 0x11 for aes/ebu) */
-
-#if 0
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_HAMOA_DAC_LEFT1, EMU_SRC_ALICE_EMU32B + 2); /* ALICE2 bus 0xa2 */
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_HAMOA_DAC_RIGHT1, EMU_SRC_ALICE_EMU32B + 3); /* ALICE2 bus 0xa3 */
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_HANA_SPDIF_LEFT1, EMU_SRC_ALICE_EMU32A + 2); /* ALICE2 bus 0xb2 */
-        snd_emu1010_fpga_link_dst_src_write(emu,
-                EMU_DST_HANA_SPDIF_RIGHT1, EMU_SRC_ALICE_EMU32A + 3); /* ALICE2 bus 0xb3 */
-#endif
-        /* Default outputs */
-        if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616) {
-                /* 1616(M) cardbus default outputs */
-                /* ALICE2 bus 0xa0 */
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_DAC1_LEFT1, EMU_SRC_ALICE_EMU32A + 0);
-                emu->emu1010.output_source[0] = 17;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_DAC1_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);
-                emu->emu1010.output_source[1] = 18;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_DAC2_LEFT1, EMU_SRC_ALICE_EMU32A + 2);
-                emu->emu1010.output_source[2] = 19;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_DAC2_RIGHT1, EMU_SRC_ALICE_EMU32A + 3);
-                emu->emu1010.output_source[3] = 20;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_DAC3_LEFT1, EMU_SRC_ALICE_EMU32A + 4);
-                emu->emu1010.output_source[4] = 21;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_DAC3_RIGHT1, EMU_SRC_ALICE_EMU32A + 5);
-                emu->emu1010.output_source[5] = 22;
-                /* ALICE2 bus 0xa0 */
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_MANA_DAC_LEFT, EMU_SRC_ALICE_EMU32A + 0);
-                emu->emu1010.output_source[16] = 17;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_MANA_DAC_RIGHT, EMU_SRC_ALICE_EMU32A + 1);
-                emu->emu1010.output_source[17] = 18;
-        } else {
-                /* ALICE2 bus 0xa0 */
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_DAC1_LEFT1, EMU_SRC_ALICE_EMU32A + 0);
-                emu->emu1010.output_source[0] = 21;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_DAC1_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);
-                emu->emu1010.output_source[1] = 22;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_DAC2_LEFT1, EMU_SRC_ALICE_EMU32A + 2);
-                emu->emu1010.output_source[2] = 23;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_DAC2_RIGHT1, EMU_SRC_ALICE_EMU32A + 3);
-                emu->emu1010.output_source[3] = 24;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_DAC3_LEFT1, EMU_SRC_ALICE_EMU32A + 4);
-                emu->emu1010.output_source[4] = 25;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_DAC3_RIGHT1, EMU_SRC_ALICE_EMU32A + 5);
-                emu->emu1010.output_source[5] = 26;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_DAC4_LEFT1, EMU_SRC_ALICE_EMU32A + 6);
-                emu->emu1010.output_source[6] = 27;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_DAC4_RIGHT1, EMU_SRC_ALICE_EMU32A + 7);
-                emu->emu1010.output_source[7] = 28;
-                /* ALICE2 bus 0xa0 */
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_PHONES_LEFT1, EMU_SRC_ALICE_EMU32A + 0);
-                emu->emu1010.output_source[8] = 21;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_PHONES_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);
-                emu->emu1010.output_source[9] = 22;
-                /* ALICE2 bus 0xa0 */
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_SPDIF_LEFT1, EMU_SRC_ALICE_EMU32A + 0);
-                emu->emu1010.output_source[10] = 21;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_DOCK_SPDIF_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);
-                emu->emu1010.output_source[11] = 22;
-                /* ALICE2 bus 0xa0 */
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_HANA_SPDIF_LEFT1, EMU_SRC_ALICE_EMU32A + 0);
-                emu->emu1010.output_source[12] = 21;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_HANA_SPDIF_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);
-                emu->emu1010.output_source[13] = 22;
-                /* ALICE2 bus 0xa0 */
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_HAMOA_DAC_LEFT1, EMU_SRC_ALICE_EMU32A + 0);
-                emu->emu1010.output_source[14] = 21;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_HAMOA_DAC_RIGHT1, EMU_SRC_ALICE_EMU32A + 1);
-                emu->emu1010.output_source[15] = 22;
-                /* ALICE2 bus 0xa0 */
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_HANA_ADAT, EMU_SRC_ALICE_EMU32A + 0);
-                emu->emu1010.output_source[16] = 21;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_HANA_ADAT + 1, EMU_SRC_ALICE_EMU32A + 1);
-                emu->emu1010.output_source[17] = 22;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_HANA_ADAT + 2, EMU_SRC_ALICE_EMU32A + 2);
-                emu->emu1010.output_source[18] = 23;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_HANA_ADAT + 3, EMU_SRC_ALICE_EMU32A + 3);
-                emu->emu1010.output_source[19] = 24;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_HANA_ADAT + 4, EMU_SRC_ALICE_EMU32A + 4);
-                emu->emu1010.output_source[20] = 25;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_HANA_ADAT + 5, EMU_SRC_ALICE_EMU32A + 5);
-                emu->emu1010.output_source[21] = 26;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_HANA_ADAT + 6, EMU_SRC_ALICE_EMU32A + 6);
-                emu->emu1010.output_source[22] = 27;
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        EMU_DST_HANA_ADAT + 7, EMU_SRC_ALICE_EMU32A + 7);
-                emu->emu1010.output_source[23] = 28;
-        }
-        /* TEMP: Select SPDIF in/out */
-        /* snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x0); */ /* Output spdif */
-
-        /* TEMP: Select 48kHz SPDIF out */
-        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x0); /* Mute all */
-        snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x0); /* Default fallback clock 48kHz */
-        /* Word Clock source, Internal 48kHz x1 */
-        snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K);
-        /* snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_4X); */
-        emu->emu1010.internal_clock = 1; /* 48000 */
-        snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, 0x12); /* Set LEDs on Audio Dock */
-        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, 0x1); /* Unmute all */
-        /* snd_emu1010_fpga_write(emu, 0x7, 0x0); */ /* Mute all */
-        /* snd_emu1010_fpga_write(emu, 0x7, 0x1); */ /* Unmute all */
-        /* snd_emu1010_fpga_write(emu, 0xe, 0x12); */ /* Set LEDs on Audio Dock */
+        snd_emu1010_update_clock(emu);
+
+        // The routes are all set to EMU_SRC_SILENCE due to the reset,
+        // so it is safe to simply enable the outputs.
+        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);
 
         return 0;
@@ -1265 +999 @@
                 snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, 0);
         }
-        cancel_delayed_work_sync(&emu->emu1010.firmware_work);
+        cancel_work_sync(&emu->emu1010.work);
         release_firmware(emu->firmware);
         release_firmware(emu->dock_fw);
@@ -1353 +1087 @@
          * CA0151: None
          */
+        /*
+         * A_IOCFG Input (GPIO)
+         * 0x400  = Front analog jack plugged in. (Green socket)
+         * 0x1000 = Rear analog jack plugged in. (Black socket)
+         * 0x2000 = Center/LFE analog jack plugged in. (Orange socket)
+         * A_IOCFG Output (GPIO)
+         * 0x60 = Sound out of front Left.
+         * Win sets it to 0xXX61
+         */
         {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10011102,
          .driver = "Audigy2", .name = "SB Audigy 2 Value [SB0400]",
@@ -1401 +1144 @@
          .i2c_adc = 1,
          .spk71 = 1} ,
+        /* This is MAEM8950 "Mana" */
+        /* Attach MicroDock[M] to make it an E-MU 1616[m]. */
+        /* Does NOT support sync daughter card (obviously). */
         /* Tested by James@superbug.co.uk 4th Nov 2007. */
         {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x42011102,
-         .driver = "Audigy2", .name = "E-mu 1010 Notebook [MAEM8950]",
+         .driver = "Audigy2", .name = "E-MU 02 CardBus [MAEM8950]",
          .id = "EMU1010",
          .emu10k2_chip = 1,
@@ -1411 +1157 @@
          .emu_model = EMU_MODEL_EMU1616},
         /* Tested by James@superbug.co.uk 4th Nov 2007. */
-        /* This is MAEM8960, 0202 is MAEM 8980 */
+        /* This is MAEM8960 "Hana3", 0202 is MAEM8980 */
+        /* Attach 0202 daughter card to make it an E-MU 1212m, OR a
+         * MicroDock[M] to make it an E-MU 1616[m]. */
+        /* Does NOT support sync daughter card. */
         {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40041102,
-         .driver = "Audigy2", .name = "E-mu 1010b PCI [MAEM8960]",
+         .driver = "Audigy2", .name = "E-MU 1010b PCI [MAEM8960]",
          .id = "EMU1010",
          .emu10k2_chip = 1,
@@ -1421 +1170 @@
         /* Tested by Maxim Kachur <mcdebugger@duganet.ru> 17th Oct 2012. */
         /* This is MAEM8986, 0202 is MAEM8980 */
+        /* Attach 0202 daughter card to make it an E-MU 1212m, OR a
+         * MicroDockM to make it an E-MU 1616m. The non-m
+         * version was never sold with this card, but should
+         * still work. */
+        /* Does NOT support sync daughter card. */
         {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40071102,
-         .driver = "Audigy2", .name = "E-mu 1010 PCIe [MAEM8986]",
+         .driver = "Audigy2", .name = "E-MU 1010 PCIe [MAEM8986]",
          .id = "EMU1010",
          .emu10k2_chip = 1,
@@ -1429 +1183 @@
          .emu_model = EMU_MODEL_EMU1010B}, /* EMU 1010 PCIe */
         /* Tested by James@superbug.co.uk 8th July 2005. */
-        /* This is MAEM8810, 0202 is MAEM8820 */
+        /* This is MAEM8810 "Hana", 0202 is MAEM8820 "Hamoa" */
+        /* Attach 0202 daughter card to make it an E-MU 1212m, OR an
+         * AudioDock[M] to make it an E-MU 1820[m]. */
+        /* Supports sync daughter card. */
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102,
-         .driver = "Audigy2", .name = "E-mu 1010 [MAEM8810]",
+         .driver = "Audigy2", .name = "E-MU 1010 [MAEM8810]",
          .id = "EMU1010",
          .emu10k2_chip = 1,
@@ -1437 +1194 @@
          .spk71 = 1,
          .emu_model = EMU_MODEL_EMU1010}, /* EMU 1010 old revision */
-        /* EMU0404b */
+        /* This is MAEM8852 "HanaLiteLite" */
+        /* Supports sync daughter card. */
+        /* Tested by oswald.buddenhagen@gmx.de Mar 2023. */
         {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40021102,
-         .driver = "Audigy2", .name = "E-mu 0404b PCI [MAEM8852]",
+         .driver = "Audigy2", .name = "E-MU 0404b PCI [MAEM8852]",
          .id = "EMU0404",
          .emu10k2_chip = 1,
          .ca0108_chip = 1,
-         .spk71 = 1,
+         .spk20 = 1,
+         .no_adat = 1,
          .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 new revision */
+        /* This is MAEM8850 "HanaLite" */
+        /* Supports sync daughter card. */
         /* Tested by James@superbug.co.uk 20-3-2007. */
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40021102,
-         .driver = "Audigy2", .name = "E-mu 0404 [MAEM8850]",
+         .driver = "Audigy2", .name = "E-MU 0404 [MAEM8850]",
          .id = "EMU0404",
          .emu10k2_chip = 1,
          .ca0102_chip = 1,
-         .spk71 = 1,
+         .spk20 = 1,
+         .no_adat = 1,
          .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 */
         /* EMU0404 PCIe */
+        /* Does NOT support sync daughter card. */
         {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40051102,
-         .driver = "Audigy2", .name = "E-mu 0404 PCIe [MAEM8984]",
+         .driver = "Audigy2", .name = "E-MU 0404 PCIe [MAEM8984]",
          .id = "EMU0404",
          .emu10k2_chip = 1,
          .ca0108_chip = 1,
-         .spk71 = 1,
+         .spk20 = 1,
+         .no_adat = 1,
          .emu_model = EMU_MODEL_EMU0404}, /* EMU 0404 PCIe ver_03 */
-        /* Note that all E-mu cards require kernel 2.6 or newer. */
         {.vendor = 0x1102, .device = 0x0008,
          .driver = "Audigy2", .name = "SB Audigy 2 Value [Unknown]",
@@ -1542 +1306 @@
          .adc_1361t = 1,  /* 24 bit capture instead of 16bit */
          .ac97_chip = 1} ,
+        /* Audigy 2 Platinum EX */
+        /* Win driver sets A_IOCFG output to 0x1c00 */
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10051102,
          .driver = "Audigy2", .name = "Audigy 2 Platinum EX [SB0280]",
@@ -1562 +1328 @@
          .invert_shared_spdif = 1,      /* digital/analog switch swapped */
          .ac97_chip = 1} ,
+        /* Audigy 2 Platinum */
+        /* Win driver sets A_IOCFG output to 0xa00 */
         {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10021102,
          .driver = "Audigy2", .name = "SB Audigy 2 Platinum [SB0240P]",
@@ -1667 +1435 @@
          .ac97_chip = 1,
          .sblive51 = 1} ,
+        /* SB Live! Platinum */
+        /* Win driver sets A_IOCFG output to 0 */
+        /* Tested by Jonathan Dowland <jon@dow.land> Apr 2023. */
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80401102,
          .driver = "EMU10K1", .name = "SB Live! Platinum [CT4760P]",
@@ -1716 +1487 @@
          .sblive51 = 1} ,
         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102,
-         .driver = "EMU10K1", .name = "E-mu APS [PC545]",
+         .driver = "EMU10K1", .name = "E-MU APS [PC545]",
          .id = "APS",
          .emu10k1_chip = 1,
@@ -1761 +1532 @@
         emu->iommu_workaround = false;
 
-        if (!iommu_present(emu->card->dev->bus))
-                return;
-
         domain = iommu_get_domain_for_dev(emu->card->dev);
-        if (domain && domain->type == IOMMU_DOMAIN_IDENTITY)
+        if (!domain || domain->type == IOMMU_DOMAIN_IDENTITY)
                 return;
 
@@ -1810 +1578 @@
         emu->synth = NULL;
         emu->get_synth_voice = NULL;
-        INIT_DELAYED_WORK(&emu->emu1010.firmware_work, emu1010_firmware_work);
+        INIT_WORK(&emu->emu1010.work, emu1010_work);
         /* read revision & serial */
 #ifndef TARGET_OS2
@@ -1925 +1693 @@
         pci_set_master(pci);
 
-        emu->fx8010.fxbus_mask = 0x303f;
+        // The masks are not used for Audigy.
+        // FIXME: these should come from the card_capabilites table.
         if (extin_mask == 0)
-                extin_mask = 0x3fcf;
+                extin_mask = 0x3fcf;  // EXTIN_*
         if (extout_mask == 0)
-                extout_mask = 0x7fff;
+                extout_mask = 0x7fff;  // EXTOUT_*
         emu->fx8010.extin_mask = extin_mask;
         emu->fx8010.extout_mask = extout_mask;
@@ -1994 +1763 @@
 
         /* set up voice indices */
-        for (idx = 0; idx < NUM_G; idx++) {
-                emu->voices[idx].emu = emu;
+        for (idx = 0; idx < NUM_G; idx++)
                 emu->voices[idx].number = idx;
-        }
-
-        err = snd_emu10k1_init(emu, enable_ir, 0);
+
+        err = snd_emu10k1_init(emu, enable_ir);
         if (err < 0)
                 return err;
@@ -2031 +1798 @@
 };
 static const unsigned char saved_regs_audigy[] = {
-        A_ADCIDX, A_MICIDX, A_FXWC1, A_FXWC2, A_SAMPLE_RATE,
+        A_ADCIDX, A_MICIDX, A_FXWC1, A_FXWC2, A_EHC,
         A_FXRT2, A_SENDAMOUNTS, A_FXRT1,
         0xff /* end */
@@ -2082 +1849 @@
         }
         if (emu->audigy)
-                emu->saved_a_iocfg = inl(emu->port + A_IOCFG);
+                emu->saved_a_iocfg = inw(emu->port + A_IOCFG);
         emu->saved_hcfg = inl(emu->port + HCFG);
 }
@@ -2096 +1863 @@
         else
                 snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE);
-        snd_emu10k1_init(emu, emu->enable_ir, 1);
+        snd_emu10k1_init(emu, emu->enable_ir);
 }
 
@@ -2109 +1876 @@
         /* resore for spdif */
         if (emu->audigy)
-                outl(emu->saved_a_iocfg, emu->port + A_IOCFG);
+                outw(emu->saved_a_iocfg, emu->port + A_IOCFG);
         outl(emu->saved_hcfg, emu->port + HCFG);
 

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

@@ -27 +27 @@
         struct snd_emu10k1 *hw;
         struct snd_emu10k1_synth_arg *arg;
-        unsigned long flags;
 
         arg = SNDRV_SEQ_DEVICE_ARGPTR(dev);
@@ -48 +47 @@
         emux->max_voices = arg->max_voices;
         emux->num_ports = arg->seq_ports;
-        emux->pitch_shift = -501;
         emux->memhdr = hw->memhdr;
         /* maximum two ports */
@@ -62 +60 @@
         }
 
-        spin_lock_irqsave(&hw->voice_lock, flags);
+        spin_lock_irq(&hw->voice_lock);
         hw->synth = emux;
         hw->get_synth_voice = snd_emu10k1_synth_get_voice;
-        spin_unlock_irqrestore(&hw->voice_lock, flags);
+        spin_unlock_irq(&hw->voice_lock);
 
         dev->driver_data = emux;
@@ -77 +75 @@
         struct snd_emux *emux;
         struct snd_emu10k1 *hw;
-        unsigned long flags;
 
         if (dev->driver_data == NULL)
@@ -85 +82 @@
 
         hw = emux->hw;
-        spin_lock_irqsave(&hw->voice_lock, flags);
+        spin_lock_irq(&hw->voice_lock);
         hw->synth = NULL;
         hw->get_synth_voice = NULL;
-        spin_unlock_irqrestore(&hw->voice_lock, flags);
+        spin_unlock_irq(&hw->voice_lock);
 
         snd_emux_free(emux);

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

@@ -2 +2 @@
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
+ *                   James Courtier-Dutton <James@superbug.co.uk>
+ *                   Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
  *                   Creative Labs, Inc.
+ *
  *  Routines for effect processor FX8010
- *
- *  Copyright (c) by James Courtier-Dutton <James@superbug.co.uk>
- *      Added EMU 1010 support.
- *
- *  BUGS:
- *    --
- *
- *  TODO:
- *    --
  */
 
@@ -48 +42 @@
  */ 
 
-static const char * const fxbuses[16] = {
+// Playback channel labels; corresponds with the public FXBUS_* defines.
+// Unlike the tables below, this is not determined by the hardware.
+const char * const snd_emu10k1_fxbus[32] = {
         /* 0x00 */ "PCM Left",
         /* 0x01 */ "PCM Right",
-        /* 0x02 */ "PCM Surround Left",
-        /* 0x03 */ "PCM Surround Right",
+        /* 0x02 */ "PCM Rear Left",
+        /* 0x03 */ "PCM Rear Right",
         /* 0x04 */ "MIDI Left",
         /* 0x05 */ "MIDI Right",
-        /* 0x06 */ "Center",
-        /* 0x07 */ "LFE",
-        /* 0x08 */ NULL,
-        /* 0x09 */ NULL,
+        /* 0x06 */ "PCM Center",
+        /* 0x07 */ "PCM LFE",
+        /* 0x08 */ "PCM Front Left",
+        /* 0x09 */ "PCM Front Right",
         /* 0x0a */ NULL,
         /* 0x0b */ NULL,
         /* 0x0c */ "MIDI Reverb",
         /* 0x0d */ "MIDI Chorus",
-        /* 0x0e */ NULL,
-        /* 0x0f */ NULL
+        /* 0x0e */ "PCM Side Left",
+        /* 0x0f */ "PCM Side Right",
+        /* 0x10 */ NULL,
+        /* 0x11 */ NULL,
+        /* 0x12 */ NULL,
+        /* 0x13 */ NULL,
+        /* 0x14 */ "Passthrough Left",
+        /* 0x15 */ "Passthrough Right",
+        /* 0x16 */ NULL,
+        /* 0x17 */ NULL,
+        /* 0x18 */ NULL,
+        /* 0x19 */ NULL,
+        /* 0x1a */ NULL,
+        /* 0x1b */ NULL,
+        /* 0x1c */ NULL,
+        /* 0x1d */ NULL,
+        /* 0x1e */ NULL,
+        /* 0x1f */ NULL
 };
 
-static const char * const creative_ins[16] = {
+// Physical inputs; corresponds with the public EXTIN_* defines.
+const char * const snd_emu10k1_sblive_ins[16] = {
         /* 0x00 */ "AC97 Left",
         /* 0x01 */ "AC97 Right",
@@ -86 +99 @@
 };
 
-static const char * const audigy_ins[16] = {
+// Physical inputs; corresponds with the public A_EXTIN_* defines.
+const char * const snd_emu10k1_audigy_ins[16] = {
         /* 0x00 */ "AC97 Left",
         /* 0x01 */ "AC97 Right",
@@ -105 +119 @@
 };
 
-static const char * const creative_outs[32] = {
+// Physical outputs; corresponds with the public EXTOUT_* defines.
+const char * const snd_emu10k1_sblive_outs[32] = {
         /* 0x00 */ "AC97 Left",
         /* 0x01 */ "AC97 Right",
@@ -122 +137 @@
         /* 0x0e */ "AC97 Surround Right",
         /* 0x0f */ NULL,
+        // This is actually the FXBUS2 range; SB Live! 5.1 only.
         /* 0x10 */ NULL,
         /* 0x11 */ "Analog Center",
@@ -140 +156 @@
 };
 
-static const char * const audigy_outs[32] = {
+// Physical outputs; corresponds with the public A_EXTOUT_* defines.
+const char * const snd_emu10k1_audigy_outs[32] = {
         /* 0x00 */ "Digital Front Left",
         /* 0x01 */ "Digital Front Right",
@@ -173 +190 @@
         /* 0x1e */ NULL,
         /* 0x1f */ NULL,
+};
+
+// On the SB Live! 5.1, FXBUS2[1] and FXBUS2[2] are occupied by EXTOUT_ACENTER
+// and EXTOUT_ALFE, so we can't connect inputs to them for multitrack recording.
+//
+// Since only 14 of the 16 EXTINs are used, this is not a big problem.
+// We route AC97 to FX capture 14 and 15, SPDIF_CD to FX capture 0 and 3,
+// and the rest of the EXTINs to the corresponding FX capture channel.
+// Multitrack recorders will still see the center/LFE output signal
+// on the second and third "input" channel.
+const s8 snd_emu10k1_sblive51_fxbus2_map[16] = {
+        2, -1, -1, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 0, 1
 };
 
@@ -320 +349 @@
 static int snd_emu10k1_gpr_ctl_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
+        struct snd_emu10k1_fx8010_ctl *ctl =
+                (struct snd_emu10k1_fx8010_ctl *) kcontrol->private_value;
+        unsigned int i;
+        
+        for (i = 0; i < ctl->vcount; i++)
+                ucontrol->value.integer.value[i] = ctl->value[i];
+        return 0;
+}
+
+static int snd_emu10k1_gpr_ctl_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
         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;
-        
-        spin_lock_irqsave(&emu->reg_lock, flags);
-        for (i = 0; i < ctl->vcount; i++)
-                ucontrol->value.integer.value[i] = ctl->value[i];
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
-        return 0;
-}
-
-static int snd_emu10k1_gpr_ctl_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
-        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;
+        int nval, val;
         unsigned int i, j;
         int change = 0;
         
-        spin_lock_irqsave(&emu->reg_lock, flags);
         for (i = 0; i < ctl->vcount; i++) {
                 nval = ucontrol->value.integer.value[i];
@@ -357 +380 @@
                         snd_emu10k1_ptr_write(emu, emu->gpr_base + ctl->gpr[i], 0, val);
                         break;
+                case EMU10K1_GPR_TRANSLATION_NEGATE:
+                        snd_emu10k1_ptr_write(emu, emu->gpr_base + ctl->gpr[i], 0, ~val);
+                        break;
                 case EMU10K1_GPR_TRANSLATION_TABLE100:
                         snd_emu10k1_ptr_write(emu, emu->gpr_base + ctl->gpr[i], 0, db_table[val]);
+                        break;
+                case EMU10K1_GPR_TRANSLATION_NEG_TABLE100:
+                        snd_emu10k1_ptr_write(emu, emu->gpr_base + ctl->gpr[i], 0,
+                                              val == 100 ? 0x80000000 : -(int)db_table[val]);
                         break;
                 case EMU10K1_GPR_TRANSLATION_BASS:
@@ -382 +412 @@
         }
       __error:
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
         return change;
 }
@@ -643 +672 @@
                 kcontrol = ctl->kcontrol;
                 if (kcontrol->id.iface == id->iface &&
-                    !strcmp(kcontrol->id.name, id->name) &&
-                    kcontrol->id.index == id->index)
+                    kcontrol->id.index == id->index &&
+                    !strcmp(kcontrol->id.name, id->name))
                         return ctl;
         }
@@ -766 +795 @@
                         continue;
                 gctl_id = (struct snd_ctl_elem_id *)&gctl->id;
-                down_read(&emu->card->controls_rwsem);
                 if (snd_ctl_find_id(emu->card, gctl_id)) {
-                        up_read(&emu->card->controls_rwsem);
                         err = -EEXIST;
                         goto __error;
                 }
-                up_read(&emu->card->controls_rwsem);
                 if (gctl_id->iface != SNDRV_CTL_ELEM_IFACE_MIXER &&
                     gctl_id->iface != SNDRV_CTL_ELEM_IFACE_PCM) {
+                        err = -EINVAL;
+                        goto __error;
+                }
+                switch (gctl->translation) {
+                case EMU10K1_GPR_TRANSLATION_NONE:
+                case EMU10K1_GPR_TRANSLATION_NEGATE:
+                        break;
+                case EMU10K1_GPR_TRANSLATION_TABLE100:
+                case EMU10K1_GPR_TRANSLATION_NEG_TABLE100:
+                        if (gctl->min != 0 || gctl->max != 100) {
+                                err = -EINVAL;
+                                goto __error;
+                        }
+                        break;
+                case EMU10K1_GPR_TRANSLATION_BASS:
+                case EMU10K1_GPR_TRANSLATION_TREBLE:
+                        if (gctl->min != 0 || gctl->max != 40) {
+                                err = -EINVAL;
+                                goto __error;
+                        }
+                        break;
+                case EMU10K1_GPR_TRANSLATION_ONOFF:
+                        if (gctl->min != 0 || gctl->max != 1) {
+                                err = -EINVAL;
+                                goto __error;
+                        }
+                        break;
+                default:
                         err = -EINVAL;
                         goto __error;
@@ -916 +970 @@
                 if (err < 0)
                         return err;
-                down_write(&card->controls_rwsem);
                 ctl = snd_emu10k1_look_for_ctl(emu, &id);
                 if (ctl)
                         snd_ctl_remove(card, ctl->kcontrol);
-                up_write(&card->controls_rwsem);
         }
         return 0;
@@ -1118 +1170 @@
 #define SND_EMU10K1_CAPTURE_CHANNELS    4
 
+#define HR_VAL(v) ((v) * 0x80000000LL / 100 - 1)
+
 static void
-snd_emu10k1_init_mono_control(struct snd_emu10k1_fx8010_control_gpr *ctl,
-                              const char *name, int gpr, int defval)
+snd_emu10k1_init_mono_control2(struct snd_emu10k1_fx8010_control_gpr *ctl,
+                               const char *name, int gpr, int defval, int defval_hr)
 {
         ctl->id.iface = (__force int)SNDRV_CTL_ELEM_IFACE_MIXER;
         strcpy(ctl->id.name, name);
         ctl->vcount = ctl->count = 1;
-        ctl->gpr[0] = gpr + 0; ctl->value[0] = defval;
         if (high_res_gpr_volume) {
-                ctl->min = 0;
+                ctl->min = -1;
                 ctl->max = 0x7fffffff;
                 ctl->tlv = snd_emu10k1_db_linear;
-                ctl->translation = EMU10K1_GPR_TRANSLATION_NONE;
+                ctl->translation = EMU10K1_GPR_TRANSLATION_NEGATE;
+                defval = defval_hr;
         } else {
                 ctl->min = 0;
                 ctl->max = 100;
                 ctl->tlv = snd_emu10k1_db_scale1;
-                ctl->translation = EMU10K1_GPR_TRANSLATION_TABLE100;
-        }
-}
+                ctl->translation = EMU10K1_GPR_TRANSLATION_NEG_TABLE100;
+        }
+        ctl->gpr[0] = gpr + 0; ctl->value[0] = defval;
+}
+#define snd_emu10k1_init_mono_control(ctl, name, gpr, defval) \
+        snd_emu10k1_init_mono_control2(ctl, name, gpr, defval, HR_VAL(defval))
 
 static void
-snd_emu10k1_init_stereo_control(struct snd_emu10k1_fx8010_control_gpr *ctl,
-                                const char *name, int gpr, int defval)
+snd_emu10k1_init_stereo_control2(struct snd_emu10k1_fx8010_control_gpr *ctl,
+                                 const char *name, int gpr, int defval, int defval_hr)
 {
         ctl->id.iface = (__force int)SNDRV_CTL_ELEM_IFACE_MIXER;
         strcpy(ctl->id.name, name);
         ctl->vcount = ctl->count = 2;
-        ctl->gpr[0] = gpr + 0; ctl->value[0] = defval;
-        ctl->gpr[1] = gpr + 1; ctl->value[1] = defval;
         if (high_res_gpr_volume) {
-                ctl->min = 0;
+                ctl->min = -1;
                 ctl->max = 0x7fffffff;
                 ctl->tlv = snd_emu10k1_db_linear;
-                ctl->translation = EMU10K1_GPR_TRANSLATION_NONE;
+                ctl->translation = EMU10K1_GPR_TRANSLATION_NEGATE;
+                defval = defval_hr;
         } else {
                 ctl->min = 0;
                 ctl->max = 100;
                 ctl->tlv = snd_emu10k1_db_scale1;
-                ctl->translation = EMU10K1_GPR_TRANSLATION_TABLE100;
-        }
-}
+                ctl->translation = EMU10K1_GPR_TRANSLATION_NEG_TABLE100;
+        }
+        ctl->gpr[0] = gpr + 0; ctl->value[0] = defval;
+        ctl->gpr[1] = gpr + 1; ctl->value[1] = defval;
+}
+#define snd_emu10k1_init_stereo_control(ctl, name, gpr, defval) \
+        snd_emu10k1_init_stereo_control2(ctl, name, gpr, defval, HR_VAL(defval))
 
 static void
@@ -1189 +1249 @@
 
 /*
- * Used for emu1010 - conversion from 32-bit capture inputs from HANA
- * to 2 x 16-bit registers in audigy - their values are read via DMA.
+ * Used for emu1010 - conversion from 32-bit capture inputs from the FPGA
+ * to 2 x 16-bit registers in Audigy - their values are read via DMA.
  * Conversion is performed by Audigy DSP instructions of FX8010.
  */
-static int snd_emu10k1_audigy_dsp_convert_32_to_2x16(
+static void snd_emu10k1_audigy_dsp_convert_32_to_2x16(
                                 struct snd_emu10k1_fx8010_code *icode,
                                 u32 *ptr, int tmp, int bit_shifter16,
                                 int reg_in, int reg_out)
 {
-        A_OP(icode, ptr, iACC3, A_GPR(tmp + 1), reg_in, A_C_00000000, A_C_00000000);
-        A_OP(icode, ptr, iANDXOR, A_GPR(tmp), A_GPR(tmp + 1), A_GPR(bit_shifter16 - 1), A_C_00000000);
-        A_OP(icode, ptr, iTSTNEG, A_GPR(tmp + 2), A_GPR(tmp), A_C_80000000, A_GPR(bit_shifter16 - 2));
-        A_OP(icode, ptr, iANDXOR, A_GPR(tmp + 2), A_GPR(tmp + 2), A_C_80000000, A_C_00000000);
-        A_OP(icode, ptr, iANDXOR, A_GPR(tmp), A_GPR(tmp), A_GPR(bit_shifter16 - 3), A_C_00000000);
-        A_OP(icode, ptr, iMACINT0, A_GPR(tmp), A_C_00000000, A_GPR(tmp), A_C_00010000);
-        A_OP(icode, ptr, iANDXOR, reg_out, A_GPR(tmp), A_C_ffffffff, A_GPR(tmp + 2));
-        A_OP(icode, ptr, iACC3, reg_out + 1, A_GPR(tmp + 1), A_C_00000000, A_C_00000000);
-        return 1;
-}
+        // This leaves the low word in place, which is fine,
+        // as the low bits are completely ignored subsequently.
+        // reg_out[1] = reg_in
+        A_OP(icode, ptr, iACC3, reg_out + 1, reg_in, A_C_00000000, A_C_00000000);
+        // It is fine to read reg_in multiple times.
+        // tmp = reg_in << 15
+        A_OP(icode, ptr, iMACINT1, A_GPR(tmp), A_C_00000000, reg_in, A_GPR(bit_shifter16));
+        // Left-shift once more. This is a separate step, as the
+        // signed multiplication would clobber the MSB.
+        // reg_out[0] = tmp + ((tmp << 31) >> 31)
+        A_OP(icode, ptr, iMAC3, reg_out, A_GPR(tmp), A_GPR(tmp), A_C_80000000);
+}
+
+#define ENUM_GPR(name, size) name, name ## _dummy = name + (size) - 1
 
 /*
@@ -1215 +1279 @@
 static int _snd_emu10k1_audigy_init_efx(struct snd_emu10k1 *emu)
 {
-        int err, i, z, gpr, nctl;
-        int bit_shifter16;
-        const int playback = 10;
-        const int capture = playback + (SND_EMU10K1_PLAYBACK_CHANNELS * 2); /* we reserve 10 voices */
-        const int stereo_mix = capture + 2;
-        const int tmp = 0x88;
-        u32 ptr;
+        int err, z, nctl;
+        enum {
+                ENUM_GPR(playback, SND_EMU10K1_PLAYBACK_CHANNELS),
+                ENUM_GPR(stereo_mix, 2),
+                ENUM_GPR(capture, 2),
+                ENUM_GPR(bit_shifter16, 1),
+                // The fixed allocation of these breaks the pattern, but why not.
+                // Splitting these into left/right is questionable, as it will break
+                // down for center/lfe. But it works for stereo/quadro, so whatever.
+                ENUM_GPR(bass_gpr, 2 * 5),  // two sides, five coefficients
+                ENUM_GPR(treble_gpr, 2 * 5),
+                ENUM_GPR(bass_tmp, SND_EMU10K1_PLAYBACK_CHANNELS * 4),  // four delay stages
+                ENUM_GPR(treble_tmp, SND_EMU10K1_PLAYBACK_CHANNELS * 4),
+                ENUM_GPR(tmp, 3),
+                num_static_gprs
+        };
+        int gpr = num_static_gprs;
+        u32 ptr, ptr_skip;
         struct snd_emu10k1_fx8010_code *icode = NULL;
         struct snd_emu10k1_fx8010_control_gpr *controls = NULL, *ctl;
@@ -1247 +1322 @@
 
         /* clear free GPRs */
-        for (i = 0; i < 512; i++)
-                set_bit(i, icode->gpr_valid);
+        memset(icode->gpr_valid, 0xff, 512 / 8);
                 
         /* clear TRAM data & address lines */
-        for (i = 0; i < 256; i++)
-                set_bit(i, icode->tram_valid);
+        memset(icode->tram_valid, 0xff, 256 / 8);
 
         strcpy(icode->name, "Audigy DSP code for ALSA");
         ptr = 0;
         nctl = 0;
-        gpr = stereo_mix + 10;
-        gpr_map[gpr++] = 0x00007fff;
-        gpr_map[gpr++] = 0x00008000;
-        gpr_map[gpr++] = 0x0000ffff;
-        bit_shifter16 = gpr;
-
-        /* stop FX processor */
-        snd_emu10k1_ptr_write(emu, A_DBG, 0, (emu->fx8010.dbg = 0) | A_DBG_SINGLE_STEP);
+        gpr_map[bit_shifter16] = 0x00008000;
 
 #if 1
         /* PCM front Playback Volume (independent from stereo mix)
-         * playback = 0 + ( gpr * FXBUS_PCM_LEFT_FRONT >> 31)
-         * where gpr contains attenuation from corresponding mixer control
+         * playback = -gpr * FXBUS_PCM_LEFT_FRONT >> 31
+         * where gpr contains negated attenuation from corresponding mixer control
          * (snd_emu10k1_init_stereo_control)
          */
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_FRONT));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_FRONT));
+        A_OP(icode, &ptr, iMAC1, A_GPR(playback), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_FRONT));
+        A_OP(icode, &ptr, iMAC1, A_GPR(playback+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_FRONT));
         snd_emu10k1_init_stereo_control(&controls[nctl++], "PCM Front Playback Volume", gpr, 100);
         gpr += 2;
 
         /* PCM Surround Playback (independent from stereo mix) */
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+2), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_REAR));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+3), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_REAR));
+        A_OP(icode, &ptr, iMAC1, A_GPR(playback+2), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_REAR));
+        A_OP(icode, &ptr, iMAC1, A_GPR(playback+3), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_REAR));
         snd_emu10k1_init_stereo_control(&controls[nctl++], "PCM Surround Playback Volume", gpr, 100);
         gpr += 2;
@@ -1285 +1351 @@
         /* PCM Side Playback (independent from stereo mix) */
         if (emu->card_capabilities->spk71) {
-                A_OP(icode, &ptr, iMAC0, A_GPR(playback+6), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_SIDE));
-                A_OP(icode, &ptr, iMAC0, A_GPR(playback+7), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_SIDE));
+                A_OP(icode, &ptr, iMAC1, A_GPR(playback+6), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_SIDE));
+                A_OP(icode, &ptr, iMAC1, A_GPR(playback+7), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT_SIDE));
                 snd_emu10k1_init_stereo_control(&controls[nctl++], "PCM Side Playback Volume", gpr, 100);
                 gpr += 2;
@@ -1292 +1358 @@
 
         /* PCM Center Playback (independent from stereo mix) */
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+4), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_CENTER));
+        A_OP(icode, &ptr, iMAC1, A_GPR(playback+4), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_CENTER));
         snd_emu10k1_init_mono_control(&controls[nctl++], "PCM Center Playback Volume", gpr, 100);
         gpr++;
 
         /* PCM LFE Playback (independent from stereo mix) */
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+5), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LFE));
+        A_OP(icode, &ptr, iMAC1, A_GPR(playback+5), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LFE));
         snd_emu10k1_init_mono_control(&controls[nctl++], "PCM LFE Playback Volume", gpr, 100);
         gpr++;
@@ -1305 +1371 @@
          */
         /* Wave (PCM) Playback Volume (will be renamed later) */
-        A_OP(icode, &ptr, iMAC0, A_GPR(stereo_mix), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT));
-        A_OP(icode, &ptr, iMAC0, A_GPR(stereo_mix+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT));
+        A_OP(icode, &ptr, iMAC1, A_GPR(stereo_mix), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT));
+        A_OP(icode, &ptr, iMAC1, A_GPR(stereo_mix+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT));
         snd_emu10k1_init_stereo_control(&controls[nctl++], "Wave Playback Volume", gpr, 100);
         gpr += 2;
 
         /* Synth Playback */
-        A_OP(icode, &ptr, iMAC0, A_GPR(stereo_mix+0), A_GPR(stereo_mix+0), A_GPR(gpr), A_FXBUS(FXBUS_MIDI_LEFT));
-        A_OP(icode, &ptr, iMAC0, A_GPR(stereo_mix+1), A_GPR(stereo_mix+1), A_GPR(gpr+1), A_FXBUS(FXBUS_MIDI_RIGHT));
+        A_OP(icode, &ptr, iMAC1, A_GPR(stereo_mix+0), A_GPR(stereo_mix+0), A_GPR(gpr), A_FXBUS(FXBUS_MIDI_LEFT));
+        A_OP(icode, &ptr, iMAC1, A_GPR(stereo_mix+1), A_GPR(stereo_mix+1), A_GPR(gpr+1), A_FXBUS(FXBUS_MIDI_RIGHT));
         snd_emu10k1_init_stereo_control(&controls[nctl++], "Synth Playback Volume", gpr, 100);
         gpr += 2;
 
         /* Wave (PCM) Capture */
-        A_OP(icode, &ptr, iMAC0, A_GPR(capture+0), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT));
-        A_OP(icode, &ptr, iMAC0, A_GPR(capture+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT));
+        A_OP(icode, &ptr, iMAC1, A_GPR(capture+0), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT));
+        A_OP(icode, &ptr, iMAC1, A_GPR(capture+1), A_C_00000000, A_GPR(gpr+1), A_FXBUS(FXBUS_PCM_RIGHT));
         snd_emu10k1_init_stereo_control(&controls[nctl++], "PCM Capture Volume", gpr, 0);
         gpr += 2;
 
         /* Synth Capture */
-        A_OP(icode, &ptr, iMAC0, A_GPR(capture+0), A_GPR(capture+0), A_GPR(gpr), A_FXBUS(FXBUS_MIDI_LEFT));
-        A_OP(icode, &ptr, iMAC0, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+1), A_FXBUS(FXBUS_MIDI_RIGHT));
+        A_OP(icode, &ptr, iMAC1, A_GPR(capture+0), A_GPR(capture+0), A_GPR(gpr), A_FXBUS(FXBUS_MIDI_LEFT));
+        A_OP(icode, &ptr, iMAC1, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+1), A_FXBUS(FXBUS_MIDI_RIGHT));
         snd_emu10k1_init_stereo_control(&controls[nctl++], "Synth Capture Volume", gpr, 0);
         gpr += 2;
-      
+
+        // We need to double the volume, as we configure the voices for half volume,
+        // which is necessary for bit-identical reproduction.
+        //{ static_assert(stereo_mix == playback + SND_EMU10K1_PLAYBACK_CHANNELS); }
+        for (z = 0; z < SND_EMU10K1_PLAYBACK_CHANNELS + 2; z++)
+                A_OP(icode, &ptr, iACC3, A_GPR(playback + z), A_GPR(playback + z), A_GPR(playback + z), A_C_00000000);
+
         /*
          * inputs
          */
 #define A_ADD_VOLUME_IN(var,vol,input) \
-A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
-
-        /* emu1212 DSP 0 and DSP 1 Capture */
+        A_OP(icode, &ptr, iMAC1, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
+
         if (emu->card_capabilities->emu_model) {
+                /* EMU1010 DSP 0 and DSP 1 Capture */
+                // The 24 MSB hold the actual value. We implicitly discard the 16 LSB.
                 if (emu->card_capabilities->ca0108_chip) {
-                        /* Note:JCD:No longer bit shift lower 16bits to upper 16bits of 32bit value. */
-                        A_OP(icode, &ptr, iMACINT0, A_GPR(tmp), A_C_00000000, A3_EMU32IN(0x0), A_C_00000001);
-                        A_OP(icode, &ptr, iMAC0, A_GPR(capture+0), A_GPR(capture+0), A_GPR(gpr), A_GPR(tmp));
-                        A_OP(icode, &ptr, iMACINT0, A_GPR(tmp), A_C_00000000, A3_EMU32IN(0x1), A_C_00000001);
-                        A_OP(icode, &ptr, iMAC0, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr), A_GPR(tmp));
+                        // For unclear reasons, the EMU32IN cannot be the Y operand!
+                        A_OP(icode, &ptr, iMAC1, A_GPR(capture+0), A_GPR(capture+0), A3_EMU32IN(0x0), A_GPR(gpr));
+                        // A3_EMU32IN(0) is delayed by one sample, so all other A3_EMU32IN channels
+                        // need to be delayed as well; we use an auxiliary register for that.
+                        A_OP(icode, &ptr, iMAC1, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+2), A_GPR(gpr+1));
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr+2), A3_EMU32IN(0x1), A_C_00000000, A_C_00000000);
                 } else {
-                        A_OP(icode, &ptr, iMAC0, A_GPR(capture+0), A_GPR(capture+0), A_GPR(gpr), A_P16VIN(0x0));
-                        A_OP(icode, &ptr, iMAC0, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+1), A_P16VIN(0x1));
+                        A_OP(icode, &ptr, iMAC1, A_GPR(capture+0), A_GPR(capture+0), A_P16VIN(0x0), A_GPR(gpr));
+                        // A_P16VIN(0) is delayed by one sample, so all other A_P16VIN channels
+                        // need to be delayed as well; we use an auxiliary register for that.
+                        A_OP(icode, &ptr, iMAC1, A_GPR(capture+1), A_GPR(capture+1), A_GPR(gpr+2), A_GPR(gpr+1));
+                        A_OP(icode, &ptr, iACC3, A_GPR(gpr+2), A_P16VIN(0x1), A_C_00000000, A_C_00000000);
                 }
                 snd_emu10k1_init_stereo_control(&controls[nctl++], "EMU Capture Volume", gpr, 0);
+                gpr_map[gpr + 2] = 0x00000000;
+                gpr += 3;
+        } else {
+                if (emu->card_capabilities->ac97_chip) {
+                        /* AC'97 Playback Volume - used only for mic (renamed later) */
+                        A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_AC97_L);
+                        A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_AC97_R);
+                        snd_emu10k1_init_stereo_control(&controls[nctl++], "AMic Playback Volume", gpr, 0);
+                        gpr += 2;
+                        /* AC'97 Capture Volume - used only for mic */
+                        A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_AC97_L);
+                        A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_AC97_R);
+                        snd_emu10k1_init_stereo_control(&controls[nctl++], "Mic Capture Volume", gpr, 0);
+                        gpr += 2;
+
+                        /* mic capture buffer */
+                        A_OP(icode, &ptr, iINTERP, A_EXTOUT(A_EXTOUT_MIC_CAP), A_EXTIN(A_EXTIN_AC97_L), A_C_40000000, A_EXTIN(A_EXTIN_AC97_R));
+                }
+
+                /* Audigy CD Playback Volume */
+                A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_SPDIF_CD_L);
+                A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_SPDIF_CD_R);
+                snd_emu10k1_init_stereo_control(&controls[nctl++],
+                                                emu->card_capabilities->ac97_chip ? "Audigy CD Playback Volume" : "CD Playback Volume",
+                                                gpr, 0);
                 gpr += 2;
-        }
-        /* AC'97 Playback Volume - used only for mic (renamed later) */
-        A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_AC97_L);
-        A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_AC97_R);
-        snd_emu10k1_init_stereo_control(&controls[nctl++], "AMic Playback Volume", gpr, 0);
-        gpr += 2;
-        /* AC'97 Capture Volume - used only for mic */
-        A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_AC97_L);
-        A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_AC97_R);
-        snd_emu10k1_init_stereo_control(&controls[nctl++], "Mic Capture Volume", gpr, 0);
-        gpr += 2;
-
-        /* mic capture buffer */        
-        A_OP(icode, &ptr, iINTERP, A_EXTOUT(A_EXTOUT_MIC_CAP), A_EXTIN(A_EXTIN_AC97_L), 0xcd, A_EXTIN(A_EXTIN_AC97_R));
-
-        /* Audigy CD Playback Volume */
-        A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_SPDIF_CD_L);
-        A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_SPDIF_CD_R);
-        snd_emu10k1_init_stereo_control(&controls[nctl++],
-                                        emu->card_capabilities->ac97_chip ? "Audigy CD Playback Volume" : "CD Playback Volume",
-                                        gpr, 0);
-        gpr += 2;
-        /* Audigy CD Capture Volume */
-        A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_SPDIF_CD_L);
-        A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_SPDIF_CD_R);
-        snd_emu10k1_init_stereo_control(&controls[nctl++],
-                                        emu->card_capabilities->ac97_chip ? "Audigy CD Capture Volume" : "CD Capture Volume",
-                                        gpr, 0);
-        gpr += 2;
-
-        /* Optical SPDIF Playback Volume */
-        A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_OPT_SPDIF_L);
-        A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_OPT_SPDIF_R);
-        snd_emu10k1_init_stereo_control(&controls[nctl++], SNDRV_CTL_NAME_IEC958("Optical ",PLAYBACK,VOLUME), gpr, 0);
-        gpr += 2;
-        /* Optical SPDIF Capture Volume */
-        A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_OPT_SPDIF_L);
-        A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_OPT_SPDIF_R);
-        snd_emu10k1_init_stereo_control(&controls[nctl++], SNDRV_CTL_NAME_IEC958("Optical ",CAPTURE,VOLUME), gpr, 0);
-        gpr += 2;
-
-        /* Line2 Playback Volume */
-        A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_LINE2_L);
-        A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_LINE2_R);
-        snd_emu10k1_init_stereo_control(&controls[nctl++],
-                                        emu->card_capabilities->ac97_chip ? "Line2 Playback Volume" : "Line Playback Volume",
-                                        gpr, 0);
-        gpr += 2;
-        /* Line2 Capture Volume */
-        A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_LINE2_L);
-        A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_LINE2_R);
-        snd_emu10k1_init_stereo_control(&controls[nctl++],
-                                        emu->card_capabilities->ac97_chip ? "Line2 Capture Volume" : "Line Capture Volume",
-                                        gpr, 0);
-        gpr += 2;
-        
-        /* Philips ADC Playback Volume */
-        A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_ADC_L);
-        A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_ADC_R);
-        snd_emu10k1_init_stereo_control(&controls[nctl++], "Analog Mix Playback Volume", gpr, 0);
-        gpr += 2;
-        /* Philips ADC Capture Volume */
-        A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_ADC_L);
-        A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_ADC_R);
-        snd_emu10k1_init_stereo_control(&controls[nctl++], "Analog Mix Capture Volume", gpr, 0);
-        gpr += 2;
-
-        /* Aux2 Playback Volume */
-        A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_AUX2_L);
-        A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_AUX2_R);
-        snd_emu10k1_init_stereo_control(&controls[nctl++],
-                                        emu->card_capabilities->ac97_chip ? "Aux2 Playback Volume" : "Aux Playback Volume",
-                                        gpr, 0);
-        gpr += 2;
-        /* Aux2 Capture Volume */
-        A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_AUX2_L);
-        A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_AUX2_R);
-        snd_emu10k1_init_stereo_control(&controls[nctl++],
-                                        emu->card_capabilities->ac97_chip ? "Aux2 Capture Volume" : "Aux Capture Volume",
-                                        gpr, 0);
-        gpr += 2;
+                /* Audigy CD Capture Volume */
+                A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_SPDIF_CD_L);
+                A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_SPDIF_CD_R);
+                snd_emu10k1_init_stereo_control(&controls[nctl++],
+                                                emu->card_capabilities->ac97_chip ? "Audigy CD Capture Volume" : "CD Capture Volume",
+                                                gpr, 0);
+                gpr += 2;
+
+                /* Optical SPDIF Playback Volume */
+                A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_OPT_SPDIF_L);
+                A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_OPT_SPDIF_R);
+                snd_emu10k1_init_stereo_control(&controls[nctl++], SNDRV_CTL_NAME_IEC958("Optical ",PLAYBACK,VOLUME), gpr, 0);
+                gpr += 2;
+                /* Optical SPDIF Capture Volume */
+                A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_OPT_SPDIF_L);
+                A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_OPT_SPDIF_R);
+                snd_emu10k1_init_stereo_control(&controls[nctl++], SNDRV_CTL_NAME_IEC958("Optical ",CAPTURE,VOLUME), gpr, 0);
+                gpr += 2;
+
+                /* Line2 Playback Volume */
+                A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_LINE2_L);
+                A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_LINE2_R);
+                snd_emu10k1_init_stereo_control(&controls[nctl++],
+                                                emu->card_capabilities->ac97_chip ? "Line2 Playback Volume" : "Line Playback Volume",
+                                                gpr, 0);
+                gpr += 2;
+                /* Line2 Capture Volume */
+                A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_LINE2_L);
+                A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_LINE2_R);
+                snd_emu10k1_init_stereo_control(&controls[nctl++],
+                                                emu->card_capabilities->ac97_chip ? "Line2 Capture Volume" : "Line Capture Volume",
+                                                gpr, 0);
+                gpr += 2;
+
+                /* Philips ADC Playback Volume */
+                A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_ADC_L);
+                A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_ADC_R);
+                snd_emu10k1_init_stereo_control(&controls[nctl++], "Analog Mix Playback Volume", gpr, 0);
+                gpr += 2;
+                /* Philips ADC Capture Volume */
+                A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_ADC_L);
+                A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_ADC_R);
+                snd_emu10k1_init_stereo_control(&controls[nctl++], "Analog Mix Capture Volume", gpr, 0);
+                gpr += 2;
+
+                /* Aux2 Playback Volume */
+                A_ADD_VOLUME_IN(stereo_mix, gpr, A_EXTIN_AUX2_L);
+                A_ADD_VOLUME_IN(stereo_mix+1, gpr+1, A_EXTIN_AUX2_R);
+                snd_emu10k1_init_stereo_control(&controls[nctl++],
+                                                emu->card_capabilities->ac97_chip ? "Aux2 Playback Volume" : "Aux Playback Volume",
+                                                gpr, 0);
+                gpr += 2;
+                /* Aux2 Capture Volume */
+                A_ADD_VOLUME_IN(capture, gpr, A_EXTIN_AUX2_L);
+                A_ADD_VOLUME_IN(capture+1, gpr+1, A_EXTIN_AUX2_R);
+                snd_emu10k1_init_stereo_control(&controls[nctl++],
+                                                emu->card_capabilities->ac97_chip ? "Aux2 Capture Volume" : "Aux Capture Volume",
+                                                gpr, 0);
+                gpr += 2;
+        }
         
         /* Stereo Mix Front Playback Volume */
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback), A_GPR(playback), A_GPR(gpr), A_GPR(stereo_mix));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+1), A_GPR(playback+1), A_GPR(gpr+1), A_GPR(stereo_mix+1));
+        A_OP(icode, &ptr, iMAC1, A_GPR(playback), A_GPR(playback), A_GPR(gpr), A_GPR(stereo_mix));
+        A_OP(icode, &ptr, iMAC1, A_GPR(playback+1), A_GPR(playback+1), A_GPR(gpr+1), A_GPR(stereo_mix+1));
         snd_emu10k1_init_stereo_control(&controls[nctl++], "Front Playback Volume", gpr, 100);
         gpr += 2;
         
         /* Stereo Mix Surround Playback */
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+2), A_GPR(playback+2), A_GPR(gpr), A_GPR(stereo_mix));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+3), A_GPR(playback+3), A_GPR(gpr+1), A_GPR(stereo_mix+1));
+        A_OP(icode, &ptr, iMAC1, A_GPR(playback+2), A_GPR(playback+2), A_GPR(gpr), A_GPR(stereo_mix));
+        A_OP(icode, &ptr, iMAC1, A_GPR(playback+3), A_GPR(playback+3), A_GPR(gpr+1), A_GPR(stereo_mix+1));
         snd_emu10k1_init_stereo_control(&controls[nctl++], "Surround Playback Volume", gpr, 0);
         gpr += 2;
@@ -1444 +1525 @@
         /* Stereo Mix Center Playback */
         /* Center = sub = Left/2 + Right/2 */
-        A_OP(icode, &ptr, iINTERP, A_GPR(tmp), A_GPR(stereo_mix), 0xcd, A_GPR(stereo_mix+1));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+4), A_GPR(playback+4), A_GPR(gpr), A_GPR(tmp));
+        A_OP(icode, &ptr, iINTERP, A_GPR(tmp), A_GPR(stereo_mix), A_C_40000000, A_GPR(stereo_mix+1));
+        A_OP(icode, &ptr, iMAC1, A_GPR(playback+4), A_GPR(playback+4), A_GPR(gpr), A_GPR(tmp));
         snd_emu10k1_init_mono_control(&controls[nctl++], "Center Playback Volume", gpr, 0);
         gpr++;
 
         /* Stereo Mix LFE Playback */
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+5), A_GPR(playback+5), A_GPR(gpr), A_GPR(tmp));
+        A_OP(icode, &ptr, iMAC1, A_GPR(playback+5), A_GPR(playback+5), A_GPR(gpr), A_GPR(tmp));
         snd_emu10k1_init_mono_control(&controls[nctl++], "LFE Playback Volume", gpr, 0);
         gpr++;
@@ -1456 +1537 @@
         if (emu->card_capabilities->spk71) {
                 /* Stereo Mix Side Playback */
-                A_OP(icode, &ptr, iMAC0, A_GPR(playback+6), A_GPR(playback+6), A_GPR(gpr), A_GPR(stereo_mix));
-                A_OP(icode, &ptr, iMAC0, A_GPR(playback+7), A_GPR(playback+7), A_GPR(gpr+1), A_GPR(stereo_mix+1));
+                A_OP(icode, &ptr, iMAC1, A_GPR(playback+6), A_GPR(playback+6), A_GPR(gpr), A_GPR(stereo_mix));
+                A_OP(icode, &ptr, iMAC1, A_GPR(playback+7), A_GPR(playback+7), A_GPR(gpr+1), A_GPR(stereo_mix+1));
                 snd_emu10k1_init_stereo_control(&controls[nctl++], "Side Playback Volume", gpr, 0);
                 gpr += 2;
@@ -1482 +1563 @@
          *  Process tone control
          */
-        A_OP(icode, &ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 0), A_GPR(playback + 0), A_C_00000000, A_C_00000000); /* left */
-        A_OP(icode, &ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 1), A_GPR(playback + 1), A_C_00000000, A_C_00000000); /* right */
-        A_OP(icode, &ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 2), A_GPR(playback + 2), A_C_00000000, A_C_00000000); /* rear left */
-        A_OP(icode, &ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 3), A_GPR(playback + 3), A_C_00000000, A_C_00000000); /* rear right */
-        A_OP(icode, &ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 4), A_GPR(playback + 4), A_C_00000000, A_C_00000000); /* center */
-        A_OP(icode, &ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 5), A_GPR(playback + 5), A_C_00000000, A_C_00000000); /* LFE */
-        if (emu->card_capabilities->spk71) {
-                A_OP(icode, &ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 6), A_GPR(playback + 6), A_C_00000000, A_C_00000000); /* side left */
-                A_OP(icode, &ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 7), A_GPR(playback + 7), A_C_00000000, A_C_00000000); /* side right */
-        }
-        
-
         ctl = &controls[nctl + 0];
         ctl->id.iface = (__force int)SNDRV_CTL_ELEM_IFACE_MIXER;
@@ -1512 +1581 @@
         ctl->value[0] = ctl->value[1] = 20;
         ctl->translation = EMU10K1_GPR_TRANSLATION_TREBLE;
-
-#define BASS_GPR        0x8c
-#define TREBLE_GPR      0x96
-
         for (z = 0; z < 5; z++) {
                 int j;
                 for (j = 0; j < 2; j++) {
-                        controls[nctl + 0].gpr[z * 2 + j] = BASS_GPR + z * 2 + j;
-                        controls[nctl + 1].gpr[z * 2 + j] = TREBLE_GPR + z * 2 + j;
-                }
-        }
+                        controls[nctl + 0].gpr[z * 2 + j] = bass_gpr + z * 2 + j;
+                        controls[nctl + 1].gpr[z * 2 + j] = treble_gpr + z * 2 + j;
+                }
+        }
+        nctl += 2;
+
+        A_OP(icode, &ptr, iACC3, A_C_00000000, A_GPR(gpr), A_C_00000000, A_C_00000000);
+        snd_emu10k1_init_mono_onoff_control(controls + nctl++, "Tone Control - Switch", gpr, 0);
+        gpr++;
+        A_OP(icode, &ptr, iSKIP, A_GPR_COND, A_GPR_COND, A_CC_REG_ZERO, A_GPR(gpr));
+        ptr_skip = ptr;
         for (z = 0; z < 4; z++) {               /* front/rear/center-lfe/side */
                 int j, k, l, d;
                 for (j = 0; j < 2; j++) {       /* left/right */
-                        k = 0xb0 + (z * 8) + (j * 4);
-                        l = 0xe0 + (z * 8) + (j * 4);
-                        d = playback + SND_EMU10K1_PLAYBACK_CHANNELS + z * 2 + j;
-
-                        A_OP(icode, &ptr, iMAC0, A_C_00000000, A_C_00000000, A_GPR(d), A_GPR(BASS_GPR + 0 + j));
-                        A_OP(icode, &ptr, iMACMV, A_GPR(k+1), A_GPR(k), A_GPR(k+1), A_GPR(BASS_GPR + 4 + j));
-                        A_OP(icode, &ptr, iMACMV, A_GPR(k), A_GPR(d), A_GPR(k), A_GPR(BASS_GPR + 2 + j));
-                        A_OP(icode, &ptr, iMACMV, A_GPR(k+3), A_GPR(k+2), A_GPR(k+3), A_GPR(BASS_GPR + 8 + j));
-                        A_OP(icode, &ptr, iMAC0, A_GPR(k+2), A_GPR_ACCU, A_GPR(k+2), A_GPR(BASS_GPR + 6 + j));
+                        k = bass_tmp + (z * 8) + (j * 4);
+                        l = treble_tmp + (z * 8) + (j * 4);
+                        d = playback + z * 2 + j;
+
+                        A_OP(icode, &ptr, iMAC0, A_C_00000000, A_C_00000000, A_GPR(d), A_GPR(bass_gpr + 0 + j));
+                        A_OP(icode, &ptr, iMACMV, A_GPR(k+1), A_GPR(k), A_GPR(k+1), A_GPR(bass_gpr + 4 + j));
+                        A_OP(icode, &ptr, iMACMV, A_GPR(k), A_GPR(d), A_GPR(k), A_GPR(bass_gpr + 2 + j));
+                        A_OP(icode, &ptr, iMACMV, A_GPR(k+3), A_GPR(k+2), A_GPR(k+3), A_GPR(bass_gpr + 8 + j));
+                        A_OP(icode, &ptr, iMAC0, A_GPR(k+2), A_GPR_ACCU, A_GPR(k+2), A_GPR(bass_gpr + 6 + j));
                         A_OP(icode, &ptr, iACC3, A_GPR(k+2), A_GPR(k+2), A_GPR(k+2), A_C_00000000);
 
-                        A_OP(icode, &ptr, iMAC0, A_C_00000000, A_C_00000000, A_GPR(k+2), A_GPR(TREBLE_GPR + 0 + j));
-                        A_OP(icode, &ptr, iMACMV, A_GPR(l+1), A_GPR(l), A_GPR(l+1), A_GPR(TREBLE_GPR + 4 + j));
-                        A_OP(icode, &ptr, iMACMV, A_GPR(l), A_GPR(k+2), A_GPR(l), A_GPR(TREBLE_GPR + 2 + j));
-                        A_OP(icode, &ptr, iMACMV, A_GPR(l+3), A_GPR(l+2), A_GPR(l+3), A_GPR(TREBLE_GPR + 8 + j));
-                        A_OP(icode, &ptr, iMAC0, A_GPR(l+2), A_GPR_ACCU, A_GPR(l+2), A_GPR(TREBLE_GPR + 6 + j));
+                        A_OP(icode, &ptr, iMAC0, A_C_00000000, A_C_00000000, A_GPR(k+2), A_GPR(treble_gpr + 0 + j));
+                        A_OP(icode, &ptr, iMACMV, A_GPR(l+1), A_GPR(l), A_GPR(l+1), A_GPR(treble_gpr + 4 + j));
+                        A_OP(icode, &ptr, iMACMV, A_GPR(l), A_GPR(k+2), A_GPR(l), A_GPR(treble_gpr + 2 + j));
+                        A_OP(icode, &ptr, iMACMV, A_GPR(l+3), A_GPR(l+2), A_GPR(l+3), A_GPR(treble_gpr + 8 + j));
+                        A_OP(icode, &ptr, iMAC0, A_GPR(l+2), A_GPR_ACCU, A_GPR(l+2), A_GPR(treble_gpr + 6 + j));
                         A_OP(icode, &ptr, iMACINT0, A_GPR(l+2), A_C_00000000, A_GPR(l+2), A_C_00000010);
 
@@ -1550 +1622 @@
                 }
         }
-        nctl += 2;
-
-#undef BASS_GPR
-#undef TREBLE_GPR
-
-        for (z = 0; z < 8; z++) {
-                A_SWITCH(icode, &ptr, tmp + 0, playback + SND_EMU10K1_PLAYBACK_CHANNELS + z, gpr + 0);
-                A_SWITCH_NEG(icode, &ptr, tmp + 1, gpr + 0);
-                A_SWITCH(icode, &ptr, tmp + 1, playback + z, tmp + 1);
-                A_OP(icode, &ptr, iACC3, A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), A_GPR(tmp + 0), A_GPR(tmp + 1), A_C_00000000);
-        }
-        snd_emu10k1_init_stereo_onoff_control(controls + nctl++, "Tone Control - Switch", gpr, 0);
-        gpr += 2;
+        gpr_map[gpr++] = ptr - ptr_skip;
 
         /* Master volume (will be renamed later) */
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+0+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+0+SND_EMU10K1_PLAYBACK_CHANNELS));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+1+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+1+SND_EMU10K1_PLAYBACK_CHANNELS));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+2+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+2+SND_EMU10K1_PLAYBACK_CHANNELS));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+3+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+3+SND_EMU10K1_PLAYBACK_CHANNELS));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+4+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+4+SND_EMU10K1_PLAYBACK_CHANNELS));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+5+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+5+SND_EMU10K1_PLAYBACK_CHANNELS));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+6+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+6+SND_EMU10K1_PLAYBACK_CHANNELS));
-        A_OP(icode, &ptr, iMAC0, A_GPR(playback+7+SND_EMU10K1_PLAYBACK_CHANNELS), A_C_00000000, A_GPR(gpr), A_GPR(playback+7+SND_EMU10K1_PLAYBACK_CHANNELS));
+        for (z = 0; z < 8; z++)
+                A_OP(icode, &ptr, iMAC1, A_GPR(playback+z), A_C_00000000, A_GPR(gpr), A_GPR(playback+z));
         snd_emu10k1_init_mono_control(&controls[nctl++], "Wave Master Playback Volume", gpr, 0);
-        gpr += 2;
-
-        /* analog speakers */
-        A_PUT_STEREO_OUTPUT(A_EXTOUT_AFRONT_L, A_EXTOUT_AFRONT_R, playback + SND_EMU10K1_PLAYBACK_CHANNELS);
-        A_PUT_STEREO_OUTPUT(A_EXTOUT_AREAR_L, A_EXTOUT_AREAR_R, playback+2 + SND_EMU10K1_PLAYBACK_CHANNELS);
-        A_PUT_OUTPUT(A_EXTOUT_ACENTER, playback+4 + SND_EMU10K1_PLAYBACK_CHANNELS);
-        A_PUT_OUTPUT(A_EXTOUT_ALFE, playback+5 + SND_EMU10K1_PLAYBACK_CHANNELS);
-        if (emu->card_capabilities->spk71)
-                A_PUT_STEREO_OUTPUT(A_EXTOUT_ASIDE_L, A_EXTOUT_ASIDE_R, playback+6 + SND_EMU10K1_PLAYBACK_CHANNELS);
-
-        /* headphone */
-        A_PUT_STEREO_OUTPUT(A_EXTOUT_HEADPHONE_L, A_EXTOUT_HEADPHONE_R, playback + SND_EMU10K1_PLAYBACK_CHANNELS);
-
-        /* digital outputs */
-        /* A_PUT_STEREO_OUTPUT(A_EXTOUT_FRONT_L, A_EXTOUT_FRONT_R, playback + SND_EMU10K1_PLAYBACK_CHANNELS); */
+        gpr++;
+
         if (emu->card_capabilities->emu_model) {
                 /* EMU1010 Outputs from PCM Front, Rear, Center, LFE, Side */
@@ -1594 +1635 @@
                 for (z = 0; z < 8; z++) {
                         if (emu->card_capabilities->ca0108_chip) {
-                                A_OP(icode, &ptr, iACC3, A3_EMU32OUT(z), A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), A_C_00000000, A_C_00000000);
+                                A_OP(icode, &ptr, iACC3, A3_EMU32OUT(z), A_GPR(playback + z), A_C_00000000, A_C_00000000);
                         } else {
-                                A_OP(icode, &ptr, iACC3, A_EMU32OUTL(z), A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), A_C_00000000, A_C_00000000);
+                                A_OP(icode, &ptr, iACC3, A_EMU32OUTL(z), A_GPR(playback + z), A_C_00000000, A_C_00000000);
                         }
                 }
-        }
-
-        /* IEC958 Optical Raw Playback Switch */ 
-        gpr_map[gpr++] = 0;
-        gpr_map[gpr++] = 0x1008;
-        gpr_map[gpr++] = 0xffff0000;
-        for (z = 0; z < 2; z++) {
-                A_OP(icode, &ptr, iMAC0, A_GPR(tmp + 2), A_FXBUS(FXBUS_PT_LEFT + z), A_C_00000000, A_C_00000000);
-                A_OP(icode, &ptr, iSKIP, A_GPR_COND, A_GPR_COND, A_GPR(gpr - 2), A_C_00000001);
-                A_OP(icode, &ptr, iACC3, A_GPR(tmp + 2), A_C_00000000, A_C_00010000, A_GPR(tmp + 2));
-                A_OP(icode, &ptr, iANDXOR, A_GPR(tmp + 2), A_GPR(tmp + 2), A_GPR(gpr - 1), A_C_00000000);
-                A_SWITCH(icode, &ptr, tmp + 0, tmp + 2, gpr + z);
-                A_SWITCH_NEG(icode, &ptr, tmp + 1, gpr + z);
-                A_SWITCH(icode, &ptr, tmp + 1, playback + SND_EMU10K1_PLAYBACK_CHANNELS + z, tmp + 1);
-                if ((z==1) && (emu->card_capabilities->spdif_bug)) {
-                        /* Due to a SPDIF output bug on some Audigy cards, this code delays the Right channel by 1 sample */
-                        dev_info(emu->card->dev,
-                                 "Installing spdif_bug patch: %s\n",
-                                 emu->card_capabilities->name);
-                        A_OP(icode, &ptr, iACC3, A_EXTOUT(A_EXTOUT_FRONT_L + z), A_GPR(gpr - 3), A_C_00000000, A_C_00000000);
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 3), A_GPR(tmp + 0), A_GPR(tmp + 1), A_C_00000000);
-                } else {
-                        A_OP(icode, &ptr, iACC3, A_EXTOUT(A_EXTOUT_FRONT_L + z), A_GPR(tmp + 0), A_GPR(tmp + 1), A_C_00000000);
-                }
-        }
-        snd_emu10k1_init_stereo_onoff_control(controls + nctl++, SNDRV_CTL_NAME_IEC958("Optical Raw ",PLAYBACK,SWITCH), gpr, 0);
-        gpr += 2;
-        
-        A_PUT_STEREO_OUTPUT(A_EXTOUT_REAR_L, A_EXTOUT_REAR_R, playback+2 + SND_EMU10K1_PLAYBACK_CHANNELS);
-        A_PUT_OUTPUT(A_EXTOUT_CENTER, playback+4 + SND_EMU10K1_PLAYBACK_CHANNELS);
-        A_PUT_OUTPUT(A_EXTOUT_LFE, playback+5 + SND_EMU10K1_PLAYBACK_CHANNELS);
+        } else {
+                /* analog speakers */
+                A_PUT_STEREO_OUTPUT(A_EXTOUT_AFRONT_L, A_EXTOUT_AFRONT_R, playback);
+                A_PUT_STEREO_OUTPUT(A_EXTOUT_AREAR_L, A_EXTOUT_AREAR_R, playback+2);
+                A_PUT_OUTPUT(A_EXTOUT_ACENTER, playback+4);
+                A_PUT_OUTPUT(A_EXTOUT_ALFE, playback+5);
+                if (emu->card_capabilities->spk71)
+                        A_PUT_STEREO_OUTPUT(A_EXTOUT_ASIDE_L, A_EXTOUT_ASIDE_R, playback+6);
+
+                /* headphone */
+                A_PUT_STEREO_OUTPUT(A_EXTOUT_HEADPHONE_L, A_EXTOUT_HEADPHONE_R, playback);
+
+                /* IEC958 Optical Raw Playback Switch */
+                gpr_map[gpr++] = 0;
+                gpr_map[gpr++] = 0x1008;
+                gpr_map[gpr++] = 0xffff0000;
+                for (z = 0; z < 2; z++) {
+                        A_OP(icode, &ptr, iMAC0, A_GPR(tmp + 2), A_FXBUS(FXBUS_PT_LEFT + z), A_C_00000000, A_C_00000000);
+                        A_OP(icode, &ptr, iSKIP, A_GPR_COND, A_GPR_COND, A_GPR(gpr - 2), A_C_00000001);
+                        A_OP(icode, &ptr, iACC3, A_GPR(tmp + 2), A_C_00000000, A_C_00010000, A_GPR(tmp + 2));
+                        A_OP(icode, &ptr, iANDXOR, A_GPR(tmp + 2), A_GPR(tmp + 2), A_GPR(gpr - 1), A_C_00000000);
+                        A_SWITCH(icode, &ptr, tmp + 0, tmp + 2, gpr + z);
+                        A_SWITCH_NEG(icode, &ptr, tmp + 1, gpr + z);
+                        A_SWITCH(icode, &ptr, tmp + 1, playback + z, tmp + 1);
+                        if ((z==1) && (emu->card_capabilities->spdif_bug)) {
+                                /* Due to a SPDIF output bug on some Audigy cards, this code delays the Right channel by 1 sample */
+                                dev_info(emu->card->dev,
+                                         "Installing spdif_bug patch: %s\n",
+                                         emu->card_capabilities->name);
+                                A_OP(icode, &ptr, iACC3, A_EXTOUT(A_EXTOUT_FRONT_L + z), A_GPR(gpr - 3), A_C_00000000, A_C_00000000);
+                                A_OP(icode, &ptr, iACC3, A_GPR(gpr - 3), A_GPR(tmp + 0), A_GPR(tmp + 1), A_C_00000000);
+                        } else {
+                                A_OP(icode, &ptr, iACC3, A_EXTOUT(A_EXTOUT_FRONT_L + z), A_GPR(tmp + 0), A_GPR(tmp + 1), A_C_00000000);
+                        }
+                }
+                snd_emu10k1_init_stereo_onoff_control(controls + nctl++, SNDRV_CTL_NAME_IEC958("Optical Raw ",PLAYBACK,SWITCH), gpr, 0);
+                gpr += 2;
+
+                A_PUT_STEREO_OUTPUT(A_EXTOUT_REAR_L, A_EXTOUT_REAR_R, playback+2);
+                A_PUT_OUTPUT(A_EXTOUT_CENTER, playback+4);
+                A_PUT_OUTPUT(A_EXTOUT_LFE, playback+5);
+        }
 
         /* ADC buffer */
 #ifdef EMU10K1_CAPTURE_DIGITAL_OUT
-        A_PUT_STEREO_OUTPUT(A_EXTOUT_ADC_CAP_L, A_EXTOUT_ADC_CAP_R, playback + SND_EMU10K1_PLAYBACK_CHANNELS);
+        A_PUT_STEREO_OUTPUT(A_EXTOUT_ADC_CAP_L, A_EXTOUT_ADC_CAP_R, playback);
 #else
         A_PUT_OUTPUT(A_EXTOUT_ADC_CAP_L, capture);
@@ -1640 +1692 @@
 
         if (emu->card_capabilities->emu_model) {
+                /* Capture 16 channels of S32_LE sound. */
                 if (emu->card_capabilities->ca0108_chip) {
                         dev_info(emu->card->dev, "EMU2 inputs on\n");
-                        for (z = 0; z < 0x10; z++) {
+                        /* Note that the Tina[2] DSPs have 16 more EMU32 inputs which we don't use. */
+
+                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(
+                                icode, &ptr, tmp, bit_shifter16, A3_EMU32IN(0), A_FXBUS2(0));
+                        // A3_EMU32IN(0) is delayed by one sample, so all other A3_EMU32IN channels
+                        // need to be delayed as well; we use an auxiliary register for that.
+                        for (z = 1; z < 0x10; z++) {
                                 snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, 
                                                                         bit_shifter16,
-                                                                        A3_EMU32IN(z),
+                                                                        A_GPR(gpr),
                                                                         A_FXBUS2(z*2) );
+                                A_OP(icode, &ptr, iACC3, A_GPR(gpr), A3_EMU32IN(z), A_C_00000000, A_C_00000000);
+                                gpr_map[gpr++] = 0x00000000;
                         }
                 } else {
                         dev_info(emu->card->dev, "EMU inputs on\n");
-                        /* Capture 16 (originally 8) channels of S32_LE sound */
+                        /* Note that the Alice2 DSPs have 6 I2S inputs which we don't use. */
 
                         /*
@@ -1656 +1717 @@
                                gpr, tmp);
                         */
-                        /* For the EMU1010: How to get 32bit values from the DSP. High 16bits into L, low 16bits into R. */
-                        /* A_P16VIN(0) is delayed by one sample,
-                         * so all other A_P16VIN channels will need to also be delayed
-                         */
-                        /* Left ADC in. 1 of 2 */
                         snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_P16VIN(0x0), A_FXBUS2(0) );
-                        /* Right ADC in 1 of 2 */
-                        gpr_map[gpr++] = 0x00000000;
-                        /* Delaying by one sample: instead of copying the input
-                         * value A_P16VIN to output A_FXBUS2 as in the first channel,
-                         * we use an auxiliary register, delaying the value by one
-                         * sample
-                         */
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(2) );
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x1), A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(4) );
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x2), A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(6) );
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x3), A_C_00000000, A_C_00000000);
-                        /* For 96kHz mode */
-                        /* Left ADC in. 2 of 2 */
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0x8) );
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x4), A_C_00000000, A_C_00000000);
-                        /* Right ADC in 2 of 2 */
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0xa) );
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x5), A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0xc) );
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x6), A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr - 1), A_FXBUS2(0xe) );
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x7), A_C_00000000, A_C_00000000);
-                        /* Pavel Hofman - we still have voices, A_FXBUS2s, and
-                         * A_P16VINs available -
-                         * let's add 8 more capture channels - total of 16
-                         */
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x10));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x8),
-                             A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x12));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0x9),
-                             A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x14));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xa),
-                             A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x16));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xb),
-                             A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x18));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xc),
-                             A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x1a));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xd),
-                             A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x1c));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xe),
-                             A_C_00000000, A_C_00000000);
-                        gpr_map[gpr++] = 0x00000000;
-                        snd_emu10k1_audigy_dsp_convert_32_to_2x16(icode, &ptr, tmp,
-                                                                  bit_shifter16,
-                                                                  A_GPR(gpr - 1),
-                                                                  A_FXBUS2(0x1e));
-                        A_OP(icode, &ptr, iACC3, A_GPR(gpr - 1), A_P16VIN(0xf),
-                             A_C_00000000, A_C_00000000);
+                        /* A_P16VIN(0) is delayed by one sample, so all other A_P16VIN channels
+                         * will need to also be delayed; we use an auxiliary register for that. */
+                        for (z = 1; z < 0x10; z++) {
+                                snd_emu10k1_audigy_dsp_convert_32_to_2x16( icode, &ptr, tmp, bit_shifter16, A_GPR(gpr), A_FXBUS2(z * 2) );
+                                A_OP(icode, &ptr, iACC3, A_GPR(gpr), A_P16VIN(z), A_C_00000000, A_C_00000000);
+                                gpr_map[gpr++] = 0x00000000;
+                        }
                 }
 
@@ -1775 +1748 @@
          */
 
-        if (gpr > tmp) {
+        if (gpr > 512) {
                 snd_BUG();
                 err = -EIO;
                 goto __err;
         }
+
         /* clear remaining instruction memory */
         while (ptr < 0x400)
@@ -1804 +1778 @@
  */
 
-/* when volume = max, then copy only to avoid volume modification */
-/* with iMAC0 (negative values) */
+/* Volumes are in the [-2^31, 0] range, zero being mute. */
 static void _volume(struct snd_emu10k1_fx8010_code *icode, u32 *ptr, u32 dst, u32 src, u32 vol)
 {
-        OP(icode, ptr, iMAC0, dst, C_00000000, src, vol);
-        OP(icode, ptr, iANDXOR, C_00000000, vol, C_ffffffff, C_7fffffff);
-        OP(icode, ptr, iSKIP, GPR_COND, GPR_COND, CC_REG_NONZERO, C_00000001);
-        OP(icode, ptr, iACC3, dst, src, C_00000000, C_00000000);
+        OP(icode, ptr, iMAC1, dst, C_00000000, src, vol);
 }
 static void _volume_add(struct snd_emu10k1_fx8010_code *icode, u32 *ptr, u32 dst, u32 src, u32 vol)
 {
-        OP(icode, ptr, iANDXOR, C_00000000, vol, C_ffffffff, C_7fffffff);
-        OP(icode, ptr, iSKIP, GPR_COND, GPR_COND, CC_REG_NONZERO, C_00000002);
-        OP(icode, ptr, iMACINT0, dst, dst, src, C_00000001);
-        OP(icode, ptr, iSKIP, C_00000000, C_7fffffff, C_7fffffff, C_00000001);
-        OP(icode, ptr, iMAC0, dst, dst, src, vol);
-}
-static void _volume_out(struct snd_emu10k1_fx8010_code *icode, u32 *ptr, u32 dst, u32 src, u32 vol)
-{
-        OP(icode, ptr, iANDXOR, C_00000000, vol, C_ffffffff, C_7fffffff);
-        OP(icode, ptr, iSKIP, GPR_COND, GPR_COND, CC_REG_NONZERO, C_00000002);
-        OP(icode, ptr, iACC3, dst, src, C_00000000, C_00000000);
-        OP(icode, ptr, iSKIP, C_00000000, C_7fffffff, C_7fffffff, C_00000001);
-        OP(icode, ptr, iMAC0, dst, C_00000000, src, vol);
+        OP(icode, ptr, iMAC1, dst, dst, src, vol);
 }
 
@@ -1839 +1797 @@
                 _volume_add(icode, ptr, GPR(dst), EXTIN(src), GPR(vol))
 #define VOLUME_OUT(icode, ptr, dst, src, vol) \
-                _volume_out(icode, ptr, EXTOUT(dst), GPR(src), GPR(vol))
+                _volume(icode, ptr, EXTOUT(dst), GPR(src), GPR(vol))
 #define _SWITCH(icode, ptr, dst, src, sw) \
         OP((icode), ptr, iMACINT0, dst, C_00000000, src, sw);
@@ -1855 +1813 @@
 {
         int err, i, z, gpr, tmp, playback, capture;
-        u32 ptr;
+        u32 ptr, ptr_skip;
         struct snd_emu10k1_fx8010_code *icode;
         struct snd_emu10k1_fx8010_pcm_rec *ipcm = NULL;
@@ -1888 +1846 @@
         
         /* clear free GPRs */
-        for (i = 0; i < 256; i++)
-                set_bit(i, icode->gpr_valid);
+        memset(icode->gpr_valid, 0xff, 256 / 8);
 
         /* clear TRAM data & address lines */
-        for (i = 0; i < 160; i++)
-                set_bit(i, icode->tram_valid);
+        memset(icode->tram_valid, 0xff, 160 / 8);
 
         strcpy(icode->name, "SB Live! FX8010 code for ALSA v1.2 by Jaroslav Kysela");
@@ -1900 +1856 @@
         playback = SND_EMU10K1_INPUTS;
         /* we have 6 playback channels and tone control doubles */
-        capture = playback + (SND_EMU10K1_PLAYBACK_CHANNELS * 2);
+        capture = playback + SND_EMU10K1_PLAYBACK_CHANNELS;
         gpr = capture + SND_EMU10K1_CAPTURE_CHANNELS;
         tmp = 0x88;     /* we need 4 temporary GPR */
         /* from 0x8c to 0xff is the area for tone control */
 
-        /* stop FX processor */
-        snd_emu10k1_ptr_write(emu, DBG, 0, (emu->fx8010.dbg = 0) | EMU10K1_DBG_SINGLE_STEP);
-
         /*
          *  Process FX Buses
          */
-        OP(icode, &ptr, iMACINT0, GPR(0), C_00000000, FXBUS(FXBUS_PCM_LEFT), C_00000004);
-        OP(icode, &ptr, iMACINT0, GPR(1), C_00000000, FXBUS(FXBUS_PCM_RIGHT), C_00000004);
-        OP(icode, &ptr, iMACINT0, GPR(2), C_00000000, FXBUS(FXBUS_MIDI_LEFT), C_00000004);
-        OP(icode, &ptr, iMACINT0, GPR(3), C_00000000, FXBUS(FXBUS_MIDI_RIGHT), C_00000004);
-        OP(icode, &ptr, iMACINT0, GPR(4), C_00000000, FXBUS(FXBUS_PCM_LEFT_REAR), C_00000004);
-        OP(icode, &ptr, iMACINT0, GPR(5), C_00000000, FXBUS(FXBUS_PCM_RIGHT_REAR), C_00000004);
-        OP(icode, &ptr, iMACINT0, GPR(6), C_00000000, FXBUS(FXBUS_PCM_CENTER), C_00000004);
-        OP(icode, &ptr, iMACINT0, GPR(7), C_00000000, FXBUS(FXBUS_PCM_LFE), C_00000004);
+        OP(icode, &ptr, iMACINT0, GPR(0), C_00000000, FXBUS(FXBUS_PCM_LEFT), C_00000008);
+        OP(icode, &ptr, iMACINT0, GPR(1), C_00000000, FXBUS(FXBUS_PCM_RIGHT), C_00000008);
+        OP(icode, &ptr, iMACINT0, GPR(2), C_00000000, FXBUS(FXBUS_MIDI_LEFT), C_00000008);
+        OP(icode, &ptr, iMACINT0, GPR(3), C_00000000, FXBUS(FXBUS_MIDI_RIGHT), C_00000008);
+        OP(icode, &ptr, iMACINT0, GPR(4), C_00000000, FXBUS(FXBUS_PCM_LEFT_REAR), C_00000008);
+        OP(icode, &ptr, iMACINT0, GPR(5), C_00000000, FXBUS(FXBUS_PCM_RIGHT_REAR), C_00000008);
+        OP(icode, &ptr, iMACINT0, GPR(6), C_00000000, FXBUS(FXBUS_PCM_CENTER), C_00000008);
+        OP(icode, &ptr, iMACINT0, GPR(7), C_00000000, FXBUS(FXBUS_PCM_LFE), C_00000008);
         OP(icode, &ptr, iMACINT0, GPR(8), C_00000000, C_00000000, C_00000000);  /* S/PDIF left */
         OP(icode, &ptr, iMACINT0, GPR(9), C_00000000, C_00000000, C_00000000);  /* S/PDIF right */
-        OP(icode, &ptr, iMACINT0, GPR(10), C_00000000, FXBUS(FXBUS_PCM_LEFT_FRONT), C_00000004);
-        OP(icode, &ptr, iMACINT0, GPR(11), C_00000000, FXBUS(FXBUS_PCM_RIGHT_FRONT), C_00000004);
+        OP(icode, &ptr, iMACINT0, GPR(10), C_00000000, FXBUS(FXBUS_PCM_LEFT_FRONT), C_00000008);
+        OP(icode, &ptr, iMACINT0, GPR(11), C_00000000, FXBUS(FXBUS_PCM_RIGHT_FRONT), C_00000008);
 
         /* Raw S/PDIF PCM */
@@ -2016 +1969 @@
         /* Wave Center/LFE Playback Volume */
         OP(icode, &ptr, iACC3, GPR(tmp + 0), FXBUS(FXBUS_PCM_LEFT), FXBUS(FXBUS_PCM_RIGHT), C_00000000);
-        OP(icode, &ptr, iMACINT0, GPR(tmp + 0), C_00000000, GPR(tmp + 0), C_00000002);
+        OP(icode, &ptr, iMACINT0, GPR(tmp + 0), C_00000000, GPR(tmp + 0), C_00000004);
         VOLUME(icode, &ptr, playback + 4, tmp + 0, gpr);
         snd_emu10k1_init_mono_control(controls + i++, "Wave Center Playback Volume", gpr++, 0);
@@ -2207 +2160 @@
          *  Process tone control
          */
-        OP(icode, &ptr, iACC3, GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 0), GPR(playback + 0), C_00000000, C_00000000); /* left */
-        OP(icode, &ptr, iACC3, GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 1), GPR(playback + 1), C_00000000, C_00000000); /* right */
-        OP(icode, &ptr, iACC3, GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 2), GPR(playback + 2), C_00000000, C_00000000); /* rear left */
-        OP(icode, &ptr, iACC3, GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 3), GPR(playback + 3), C_00000000, C_00000000); /* rear right */
-        OP(icode, &ptr, iACC3, GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 4), GPR(playback + 4), C_00000000, C_00000000); /* center */
-        OP(icode, &ptr, iACC3, GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 5), GPR(playback + 5), C_00000000, C_00000000); /* LFE */
-
         ctl = &controls[i + 0];
         ctl->id.iface = (__force int)SNDRV_CTL_ELEM_IFACE_MIXER;
@@ -2245 +2191 @@
                 }
         }
+        i += 2;
+
+        OP(icode, &ptr, iACC3, C_00000000, GPR(gpr), C_00000000, C_00000000);
+        snd_emu10k1_init_mono_onoff_control(controls + i++, "Tone Control - Switch", gpr, 0);
+        gpr++;
+        OP(icode, &ptr, iSKIP, GPR_COND, GPR_COND, CC_REG_ZERO, GPR(gpr));
+        ptr_skip = ptr;
         for (z = 0; z < 3; z++) {               /* front/rear/center-lfe */
                 int j, k, l, d;
@@ -2250 +2203 @@
                         k = 0xa0 + (z * 8) + (j * 4);
                         l = 0xd0 + (z * 8) + (j * 4);
-                        d = playback + SND_EMU10K1_PLAYBACK_CHANNELS + z * 2 + j;
+                        d = playback + z * 2 + j;
 
                         OP(icode, &ptr, iMAC0, C_00000000, C_00000000, GPR(d), GPR(BASS_GPR + 0 + j));
@@ -2272 +2225 @@
                 }
         }
-        i += 2;
+        gpr_map[gpr++] = ptr - ptr_skip;
 
 #undef BASS_GPR
 #undef TREBLE_GPR
-
-        for (z = 0; z < 6; z++) {
-                SWITCH(icode, &ptr, tmp + 0, playback + SND_EMU10K1_PLAYBACK_CHANNELS + z, gpr + 0);
-                SWITCH_NEG(icode, &ptr, tmp + 1, gpr + 0);
-                SWITCH(icode, &ptr, tmp + 1, playback + z, tmp + 1);
-                OP(icode, &ptr, iACC3, GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), GPR(tmp + 0), GPR(tmp + 1), C_00000000);
-        }
-        snd_emu10k1_init_stereo_onoff_control(controls + i++, "Tone Control - Switch", gpr, 0);
-        gpr += 2;
 
         /*
@@ -2293 +2237 @@
 
                 for (z = 0; z < 2; z++)
-                        OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_AC97_L + z), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), C_00000000, C_00000000);
+                        OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_AC97_L + z), GPR(playback + z), C_00000000, C_00000000);
         }
 
@@ -2302 +2246 @@
                         SWITCH(icode, &ptr, tmp + 0, 8 + z, gpr + z);
                         SWITCH_NEG(icode, &ptr, tmp + 1, gpr + z);
-                        SWITCH(icode, &ptr, tmp + 1, playback + SND_EMU10K1_PLAYBACK_CHANNELS + z, tmp + 1);
+                        SWITCH(icode, &ptr, tmp + 1, playback + z, tmp + 1);
                         OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_TOSLINK_L + z), GPR(tmp + 0), GPR(tmp + 1), C_00000000);
 #ifdef EMU10K1_CAPTURE_DIGITAL_OUT
@@ -2317 +2261 @@
 
                 for (z = 0; z < 2; z++) {
-                        SWITCH(icode, &ptr, tmp + 0, playback + SND_EMU10K1_PLAYBACK_CHANNELS + 4 + z, gpr + 2 + z);
+                        SWITCH(icode, &ptr, tmp + 0, playback + 4 + z, gpr + 2 + z);
                         SWITCH_NEG(icode, &ptr, tmp + 1, gpr + 2 + z);
-                        SWITCH(icode, &ptr, tmp + 1, playback + SND_EMU10K1_PLAYBACK_CHANNELS + z, tmp + 1);
+                        SWITCH(icode, &ptr, tmp + 1, playback + z, tmp + 1);
                         OP(icode, &ptr, iACC3, GPR(tmp + 0), GPR(tmp + 0), GPR(tmp + 1), C_00000000);
                         VOLUME_OUT(icode, &ptr, EXTOUT_HEADPHONE_L + z, tmp + 0, gpr + z);
@@ -2336 +2280 @@
         if (emu->fx8010.extout_mask & ((1<<EXTOUT_REAR_L)|(1<<EXTOUT_REAR_R)))
                 for (z = 0; z < 2; z++)
-                        OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_REAR_L + z), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 2 + z), C_00000000, C_00000000);
+                        OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_REAR_L + z), GPR(playback + 2 + z), C_00000000, C_00000000);
 
         if (emu->fx8010.extout_mask & ((1<<EXTOUT_AC97_REAR_L)|(1<<EXTOUT_AC97_REAR_R)))
                 for (z = 0; z < 2; z++)
-                        OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_AC97_REAR_L + z), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 2 + z), C_00000000, C_00000000);
+                        OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_AC97_REAR_L + z), GPR(playback + 2 + z), C_00000000, C_00000000);
 
         if (emu->fx8010.extout_mask & (1<<EXTOUT_AC97_CENTER)) {
 #ifndef EMU10K1_CENTER_LFE_FROM_FRONT
-                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_AC97_CENTER), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 4), C_00000000, C_00000000);
-                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_ACENTER), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 4), C_00000000, C_00000000);
+                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_AC97_CENTER), GPR(playback + 4), C_00000000, C_00000000);
+                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_ACENTER), GPR(playback + 4), C_00000000, C_00000000);
 #else
-                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_AC97_CENTER), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 0), C_00000000, C_00000000);
-                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_ACENTER), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 0), C_00000000, C_00000000);
+                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_AC97_CENTER), GPR(playback + 0), C_00000000, C_00000000);
+                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_ACENTER), GPR(playback + 0), C_00000000, C_00000000);
 #endif
         }
@@ -2354 +2298 @@
         if (emu->fx8010.extout_mask & (1<<EXTOUT_AC97_LFE)) {
 #ifndef EMU10K1_CENTER_LFE_FROM_FRONT
-                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_AC97_LFE), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 5), C_00000000, C_00000000);
-                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_ALFE), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 5), C_00000000, C_00000000);
+                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_AC97_LFE), GPR(playback + 5), C_00000000, C_00000000);
+                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_ALFE), GPR(playback + 5), C_00000000, C_00000000);
 #else
-                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_AC97_LFE), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 1), C_00000000, C_00000000);
-                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_ALFE), GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + 1), C_00000000, C_00000000);
+                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_AC97_LFE), GPR(playback + 1), C_00000000, C_00000000);
+                OP(icode, &ptr, iACC3, EXTOUT(EXTOUT_ALFE), GPR(playback + 1), C_00000000, C_00000000);
 #endif
         }
@@ -2372 +2316 @@
         /* EFX capture - capture the 16 EXTINS */
         if (emu->card_capabilities->sblive51) {
-                /* On the Live! 5.1, FXBUS2(1) and FXBUS(2) are shared with EXTOUT_ACENTER
-                 * and EXTOUT_ALFE, so we can't connect inputs to them for multitrack recording.
-                 *
-                 * Since only 14 of the 16 EXTINs are used, this is not a big problem.  
-                 * We route AC97L and R to FX capture 14 and 15, SPDIF CD in to FX capture 
-                 * 0 and 3, then the rest of the EXTINs to the corresponding FX capture 
-                 * channel.  Multitrack recorders will still see the center/lfe output signal 
-                 * on the second and third channels.
-                 */
-                OP(icode, &ptr, iACC3, FXBUS2(14), C_00000000, C_00000000, EXTIN(0));
-                OP(icode, &ptr, iACC3, FXBUS2(15), C_00000000, C_00000000, EXTIN(1));
-                OP(icode, &ptr, iACC3, FXBUS2(0), C_00000000, C_00000000, EXTIN(2));
-                OP(icode, &ptr, iACC3, FXBUS2(3), C_00000000, C_00000000, EXTIN(3));
-                for (z = 4; z < 14; z++)
-                        OP(icode, &ptr, iACC3, FXBUS2(z), C_00000000, C_00000000, EXTIN(z));
+                for (z = 0; z < 16; z++) {
+                        s8 c = snd_emu10k1_sblive51_fxbus2_map[z];
+                        if (c != -1)
+                                OP(icode, &ptr, iACC3, FXBUS2(z), C_00000000, C_00000000, EXTIN(c));
+                }
         } else {
                 for (z = 0; z < 16; z++)
@@ -2486 +2420 @@
         spin_unlock_irq(&emu->emu_lock);
         snd_emu10k1_ptr_write(emu, TCB, 0, 0);
-        snd_emu10k1_ptr_write(emu, TCBS, 0, 0);
+        snd_emu10k1_ptr_write(emu, TCBS, 0, TCBS_BUFFSIZE_16K);
         if (emu->fx8010.etram_pages.area != NULL) {
                 snd_dma_free_pages(&emu->fx8010.etram_pages);
@@ -2525 +2459 @@
 {
         const char * const *fxbus, * const *extin, * const *extout;
-        unsigned short fxbus_mask, extin_mask, extout_mask;
+        unsigned short extin_mask, extout_mask;
         int res;
 
         info->internal_tram_size = emu->fx8010.itram_size;
         info->external_tram_size = emu->fx8010.etram_pages.bytes / 2;
-        fxbus = fxbuses;
-        extin = emu->audigy ? audigy_ins : creative_ins;
-        extout = emu->audigy ? audigy_outs : creative_outs;
-        fxbus_mask = emu->fx8010.fxbus_mask;
-        extin_mask = emu->fx8010.extin_mask;
-        extout_mask = emu->fx8010.extout_mask;
+        fxbus = snd_emu10k1_fxbus;
+        extin = emu->audigy ? snd_emu10k1_audigy_ins : snd_emu10k1_sblive_ins;
+        extout = emu->audigy ? snd_emu10k1_audigy_outs : snd_emu10k1_sblive_outs;
+        extin_mask = emu->audigy ? ~0 : emu->fx8010.extin_mask;
+        extout_mask = emu->audigy ? ~0 : emu->fx8010.extout_mask;
         for (res = 0; res < 16; res++, fxbus++, extin++, extout++) {
-                copy_string(info->fxbus_names[res], fxbus_mask & (1 << res) ? *fxbus : NULL, "FXBUS", res);
+                copy_string(info->fxbus_names[res], *fxbus, "FXBUS", res);
                 copy_string(info->extin_names[res], extin_mask & (1 << res) ? *extin : NULL, "Unused", res);
                 copy_string(info->extout_names[res], extout_mask & (1 << res) ? *extout : NULL, "Unused", res);
@@ -2653 +2586 @@
                 if (get_user(addr, (unsigned int __user *)argp))
                         return -EFAULT;
-                if (addr > 0x1ff)
-                        return -EINVAL;
-                if (emu->audigy)
-                        snd_emu10k1_ptr_write(emu, A_DBG, 0, emu->fx8010.dbg |= A_DBG_SINGLE_STEP | addr);
-                else
-                        snd_emu10k1_ptr_write(emu, DBG, 0, emu->fx8010.dbg |= EMU10K1_DBG_SINGLE_STEP | addr);
-                udelay(10);
-                if (emu->audigy)
-                        snd_emu10k1_ptr_write(emu, A_DBG, 0, emu->fx8010.dbg |= A_DBG_SINGLE_STEP | A_DBG_STEP_ADDR | addr);
-                else
-                        snd_emu10k1_ptr_write(emu, DBG, 0, emu->fx8010.dbg |= EMU10K1_DBG_SINGLE_STEP | EMU10K1_DBG_STEP | addr);
+                if (emu->audigy) {
+                        if (addr > A_DBG_STEP_ADDR)
+                                return -EINVAL;
+                        snd_emu10k1_ptr_write(emu, A_DBG, 0, emu->fx8010.dbg |= A_DBG_SINGLE_STEP);
+                        udelay(10);
+                        snd_emu10k1_ptr_write(emu, A_DBG, 0, emu->fx8010.dbg | A_DBG_STEP | addr);
+                } else {
+                        if (addr > EMU10K1_DBG_SINGLE_STEP_ADDR)
+                                return -EINVAL;
+                        snd_emu10k1_ptr_write(emu, DBG, 0, emu->fx8010.dbg |= EMU10K1_DBG_SINGLE_STEP);
+                        udelay(10);
+                        snd_emu10k1_ptr_write(emu, DBG, 0, emu->fx8010.dbg | EMU10K1_DBG_STEP | addr);
+                }
                 return 0;
         case SNDRV_EMU10K1_IOCTL_DBG_READ:

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

@@ -3 +3 @@
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *                   Takashi Iwai <tiwai@suse.de>
+ *                   Lee Revell <rlrevell@joe-job.com>
+ *                   James Courtier-Dutton <James@superbug.co.uk>
+ *                   Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
  *                   Creative Labs, Inc.
+ *
  *  Routines for control of EMU10K1 chips / mixer routines
- *  Multichannel PCM support Copyright (c) Lee Revell <rlrevell@joe-job.com>
- *
- *  Copyright (c) by James Courtier-Dutton <James@superbug.co.uk>
- *      Added EMU 1010 support.
- *
- *  BUGS:
- *    --
- *
- *  TODO:
- *    --
  */
 
@@ -30 +24 @@
 static const DECLARE_TLV_DB_SCALE(snd_audigy_db_scale2, -10350, 50, 1); /* WM8775 gain scale */
 
+
+static int add_ctls(struct snd_emu10k1 *emu, const struct snd_kcontrol_new *tpl,
+                    const char * const *ctls, unsigned nctls)
+{
+        struct snd_kcontrol_new kctl = *tpl;
+        int err;
+
+        for (unsigned i = 0; i < nctls; i++) {
+                kctl.name = ctls[i];
+                kctl.private_value = i;
+                err = snd_ctl_add(emu->card, snd_ctl_new1(&kctl, emu));
+                if (err < 0)
+                        return err;
+        }
+        return 0;
+}
+
+
 static int snd_emu10k1_spdif_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
@@ -42 +54 @@
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
         unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-        unsigned long flags;
 
         /* Limit: emu->spdif_bits */
         if (idx >= 3)
                 return -EINVAL;
-        spin_lock_irqsave(&emu->reg_lock, flags);
         ucontrol->value.iec958.status[0] = (emu->spdif_bits[idx] >> 0) & 0xff;
         ucontrol->value.iec958.status[1] = (emu->spdif_bits[idx] >> 8) & 0xff;
         ucontrol->value.iec958.status[2] = (emu->spdif_bits[idx] >> 16) & 0xff;
         ucontrol->value.iec958.status[3] = (emu->spdif_bits[idx] >> 24) & 0xff;
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
         return 0;
 }
@@ -66 +75 @@
 }
 
-/*
- * Items labels in enum mixer controls assigning source data to
- * each destination
- */
-static const char * const emu1010_src_texts[] = {
-        "Silence",
-        "Dock Mic A",
-        "Dock Mic B",
-        "Dock ADC1 Left",
-        "Dock ADC1 Right",
-        "Dock ADC2 Left",
-        "Dock ADC2 Right",
-        "Dock ADC3 Left",
-        "Dock ADC3 Right",
-        "0202 ADC Left",
-        "0202 ADC Right",
-        "0202 SPDIF Left",
-        "0202 SPDIF Right",
-        "ADAT 0",
-        "ADAT 1",
-        "ADAT 2",
-        "ADAT 3",
-        "ADAT 4",
-        "ADAT 5",
-        "ADAT 6",
-        "ADAT 7",
-        "DSP 0",
-        "DSP 1",
-        "DSP 2",
-        "DSP 3",
-        "DSP 4",
-        "DSP 5",
-        "DSP 6",
-        "DSP 7",
-        "DSP 8",
-        "DSP 9",
-        "DSP 10",
-        "DSP 11",
-        "DSP 12",
-        "DSP 13",
-        "DSP 14",
-        "DSP 15",
-        "DSP 16",
-        "DSP 17",
-        "DSP 18",
-        "DSP 19",
-        "DSP 20",
-        "DSP 21",
-        "DSP 22",
-        "DSP 23",
-        "DSP 24",
-        "DSP 25",
-        "DSP 26",
-        "DSP 27",
-        "DSP 28",
-        "DSP 29",
-        "DSP 30",
-        "DSP 31",
-};
-
-/* 1616(m) cardbus */
-
-static const char * const emu1616_src_texts[] = {
-        "Silence",
-        "Dock Mic A",
-        "Dock Mic B",
-        "Dock ADC1 Left",
-        "Dock ADC1 Right",
-        "Dock ADC2 Left",
-        "Dock ADC2 Right",
-        "Dock SPDIF Left",
-        "Dock SPDIF Right",
-        "ADAT 0",
-        "ADAT 1",
-        "ADAT 2",
-        "ADAT 3",
-        "ADAT 4",
-        "ADAT 5",
-        "ADAT 6",
-        "ADAT 7",
-        "DSP 0",
-        "DSP 1",
-        "DSP 2",
-        "DSP 3",
-        "DSP 4",
-        "DSP 5",
-        "DSP 6",
-        "DSP 7",
-        "DSP 8",
-        "DSP 9",
-        "DSP 10",
-        "DSP 11",
-        "DSP 12",
-        "DSP 13",
-        "DSP 14",
-        "DSP 15",
-        "DSP 16",
-        "DSP 17",
-        "DSP 18",
-        "DSP 19",
-        "DSP 20",
-        "DSP 21",
-        "DSP 22",
-        "DSP 23",
-        "DSP 24",
-        "DSP 25",
-        "DSP 26",
-        "DSP 27",
-        "DSP 28",
-        "DSP 29",
-        "DSP 30",
-        "DSP 31",
-};
-
+#define PAIR_PS(base, one, two, sfx) base " " one sfx, base " " two sfx
+#define LR_PS(base, sfx) PAIR_PS(base, "Left", "Right", sfx)
+
+#define ADAT_PS(pfx, sfx) \
+        pfx "ADAT 0" sfx, pfx "ADAT 1" sfx, pfx "ADAT 2" sfx, pfx "ADAT 3" sfx, \
+        pfx "ADAT 4" sfx, pfx "ADAT 5" sfx, pfx "ADAT 6" sfx, pfx "ADAT 7" sfx
+
+#define PAIR_REGS(base, one, two) \
+        base ## one ## 1, \
+        base ## two ## 1
+
+#define LR_REGS(base) PAIR_REGS(base, _LEFT, _RIGHT)
+
+#define ADAT_REGS(base) \
+        base+0, base+1, base+2, base+3, base+4, base+5, base+6, base+7
 
 /*
  * List of data sources available for each destination
  */
-static const unsigned int emu1010_src_regs[] = {
-        EMU_SRC_SILENCE,/* 0 */
-        EMU_SRC_DOCK_MIC_A1, /* 1 */
-        EMU_SRC_DOCK_MIC_B1, /* 2 */
-        EMU_SRC_DOCK_ADC1_LEFT1, /* 3 */
-        EMU_SRC_DOCK_ADC1_RIGHT1, /* 4 */
-        EMU_SRC_DOCK_ADC2_LEFT1, /* 5 */
-        EMU_SRC_DOCK_ADC2_RIGHT1, /* 6 */
-        EMU_SRC_DOCK_ADC3_LEFT1, /* 7 */
-        EMU_SRC_DOCK_ADC3_RIGHT1, /* 8 */
-        EMU_SRC_HAMOA_ADC_LEFT1, /* 9 */
-        EMU_SRC_HAMOA_ADC_RIGHT1, /* 10 */
-        EMU_SRC_HANA_SPDIF_LEFT1, /* 11 */
-        EMU_SRC_HANA_SPDIF_RIGHT1, /* 12 */
-        EMU_SRC_HANA_ADAT, /* 13 */
-        EMU_SRC_HANA_ADAT+1, /* 14 */
-        EMU_SRC_HANA_ADAT+2, /* 15 */
-        EMU_SRC_HANA_ADAT+3, /* 16 */
-        EMU_SRC_HANA_ADAT+4, /* 17 */
-        EMU_SRC_HANA_ADAT+5, /* 18 */
-        EMU_SRC_HANA_ADAT+6, /* 19 */
-        EMU_SRC_HANA_ADAT+7, /* 20 */
-        EMU_SRC_ALICE_EMU32A, /* 21 */
-        EMU_SRC_ALICE_EMU32A+1, /* 22 */
-        EMU_SRC_ALICE_EMU32A+2, /* 23 */
-        EMU_SRC_ALICE_EMU32A+3, /* 24 */
-        EMU_SRC_ALICE_EMU32A+4, /* 25 */
-        EMU_SRC_ALICE_EMU32A+5, /* 26 */
-        EMU_SRC_ALICE_EMU32A+6, /* 27 */
-        EMU_SRC_ALICE_EMU32A+7, /* 28 */
-        EMU_SRC_ALICE_EMU32A+8, /* 29 */
-        EMU_SRC_ALICE_EMU32A+9, /* 30 */
-        EMU_SRC_ALICE_EMU32A+0xa, /* 31 */
-        EMU_SRC_ALICE_EMU32A+0xb, /* 32 */
-        EMU_SRC_ALICE_EMU32A+0xc, /* 33 */
-        EMU_SRC_ALICE_EMU32A+0xd, /* 34 */
-        EMU_SRC_ALICE_EMU32A+0xe, /* 35 */
-        EMU_SRC_ALICE_EMU32A+0xf, /* 36 */
-        EMU_SRC_ALICE_EMU32B, /* 37 */
-        EMU_SRC_ALICE_EMU32B+1, /* 38 */
-        EMU_SRC_ALICE_EMU32B+2, /* 39 */
-        EMU_SRC_ALICE_EMU32B+3, /* 40 */
-        EMU_SRC_ALICE_EMU32B+4, /* 41 */
-        EMU_SRC_ALICE_EMU32B+5, /* 42 */
-        EMU_SRC_ALICE_EMU32B+6, /* 43 */
-        EMU_SRC_ALICE_EMU32B+7, /* 44 */
-        EMU_SRC_ALICE_EMU32B+8, /* 45 */
-        EMU_SRC_ALICE_EMU32B+9, /* 46 */
-        EMU_SRC_ALICE_EMU32B+0xa, /* 47 */
-        EMU_SRC_ALICE_EMU32B+0xb, /* 48 */
-        EMU_SRC_ALICE_EMU32B+0xc, /* 49 */
-        EMU_SRC_ALICE_EMU32B+0xd, /* 50 */
-        EMU_SRC_ALICE_EMU32B+0xe, /* 51 */
-        EMU_SRC_ALICE_EMU32B+0xf, /* 52 */
-};
+
+#define DSP_TEXTS \
+        "DSP 0", "DSP 1", "DSP 2", "DSP 3", "DSP 4", "DSP 5", "DSP 6", "DSP 7", \
+        "DSP 8", "DSP 9", "DSP 10", "DSP 11", "DSP 12", "DSP 13", "DSP 14", "DSP 15", \
+        "DSP 16", "DSP 17", "DSP 18", "DSP 19", "DSP 20", "DSP 21", "DSP 22", "DSP 23", \
+        "DSP 24", "DSP 25", "DSP 26", "DSP 27", "DSP 28", "DSP 29", "DSP 30", "DSP 31"
+
+#define PAIR_TEXTS(base, one, two) PAIR_PS(base, one, two, "")
+#define LR_TEXTS(base) LR_PS(base, "")
+#define ADAT_TEXTS(pfx) ADAT_PS(pfx, "")
+
+#define EMU32_SRC_REGS \
+        EMU_SRC_ALICE_EMU32A, \
+        EMU_SRC_ALICE_EMU32A+1, \
+        EMU_SRC_ALICE_EMU32A+2, \
+        EMU_SRC_ALICE_EMU32A+3, \
+        EMU_SRC_ALICE_EMU32A+4, \
+        EMU_SRC_ALICE_EMU32A+5, \
+        EMU_SRC_ALICE_EMU32A+6, \
+        EMU_SRC_ALICE_EMU32A+7, \
+        EMU_SRC_ALICE_EMU32A+8, \
+        EMU_SRC_ALICE_EMU32A+9, \
+        EMU_SRC_ALICE_EMU32A+0xa, \
+        EMU_SRC_ALICE_EMU32A+0xb, \
+        EMU_SRC_ALICE_EMU32A+0xc, \
+        EMU_SRC_ALICE_EMU32A+0xd, \
+        EMU_SRC_ALICE_EMU32A+0xe, \
+        EMU_SRC_ALICE_EMU32A+0xf, \
+        EMU_SRC_ALICE_EMU32B, \
+        EMU_SRC_ALICE_EMU32B+1, \
+        EMU_SRC_ALICE_EMU32B+2, \
+        EMU_SRC_ALICE_EMU32B+3, \
+        EMU_SRC_ALICE_EMU32B+4, \
+        EMU_SRC_ALICE_EMU32B+5, \
+        EMU_SRC_ALICE_EMU32B+6, \
+        EMU_SRC_ALICE_EMU32B+7, \
+        EMU_SRC_ALICE_EMU32B+8, \
+        EMU_SRC_ALICE_EMU32B+9, \
+        EMU_SRC_ALICE_EMU32B+0xa, \
+        EMU_SRC_ALICE_EMU32B+0xb, \
+        EMU_SRC_ALICE_EMU32B+0xc, \
+        EMU_SRC_ALICE_EMU32B+0xd, \
+        EMU_SRC_ALICE_EMU32B+0xe, \
+        EMU_SRC_ALICE_EMU32B+0xf
+
+/* 1010 rev1 */
+
+#define EMU1010_COMMON_TEXTS \
+        "Silence", \
+        PAIR_TEXTS("Dock Mic", "A", "B"), \
+        LR_TEXTS("Dock ADC1"), \
+        LR_TEXTS("Dock ADC2"), \
+        LR_TEXTS("Dock ADC3"), \
+        LR_TEXTS("0202 ADC"), \
+        LR_TEXTS("1010 SPDIF"), \
+        ADAT_TEXTS("1010 ")
+
+static const char * const emu1010_src_texts[] = {
+        EMU1010_COMMON_TEXTS,
+        DSP_TEXTS,
+};
+
+static const unsigned short emu1010_src_regs[] = {
+        EMU_SRC_SILENCE,
+        PAIR_REGS(EMU_SRC_DOCK_MIC, _A, _B),
+        LR_REGS(EMU_SRC_DOCK_ADC1),
+        LR_REGS(EMU_SRC_DOCK_ADC2),
+        LR_REGS(EMU_SRC_DOCK_ADC3),
+        LR_REGS(EMU_SRC_HAMOA_ADC),
+        LR_REGS(EMU_SRC_HANA_SPDIF),
+        ADAT_REGS(EMU_SRC_HANA_ADAT),
+        EMU32_SRC_REGS,
+};
+//static_assert(ARRAY_SIZE(emu1010_src_regs) == ARRAY_SIZE(emu1010_src_texts));
+
+/* 1010 rev2 */
+
+#define EMU1010b_COMMON_TEXTS \
+        "Silence", \
+        PAIR_TEXTS("Dock Mic", "A", "B"), \
+        LR_TEXTS("Dock ADC1"), \
+        LR_TEXTS("Dock ADC2"), \
+        LR_TEXTS("0202 ADC"), \
+        LR_TEXTS("Dock SPDIF"), \
+        LR_TEXTS("1010 SPDIF"), \
+        ADAT_TEXTS("Dock "), \
+        ADAT_TEXTS("1010 ")
+
+static const char * const emu1010b_src_texts[] = {
+        EMU1010b_COMMON_TEXTS,
+        DSP_TEXTS,
+};
+
+static const unsigned short emu1010b_src_regs[] = {
+        EMU_SRC_SILENCE,
+        PAIR_REGS(EMU_SRC_DOCK_MIC, _A, _B),
+        LR_REGS(EMU_SRC_DOCK_ADC1),
+        LR_REGS(EMU_SRC_DOCK_ADC2),
+        LR_REGS(EMU_SRC_HAMOA_ADC),
+        LR_REGS(EMU_SRC_MDOCK_SPDIF),
+        LR_REGS(EMU_SRC_HANA_SPDIF),
+        ADAT_REGS(EMU_SRC_MDOCK_ADAT),
+        ADAT_REGS(EMU_SRC_HANA_ADAT),
+        EMU32_SRC_REGS,
+};
+//static_assert(ARRAY_SIZE(emu1010b_src_regs) == ARRAY_SIZE(emu1010b_src_texts));
 
 /* 1616(m) cardbus */
-static const unsigned int emu1616_src_regs[] = {
+
+#define EMU1616_COMMON_TEXTS \
+        "Silence", \
+        PAIR_TEXTS("Mic", "A", "B"), \
+        LR_TEXTS("ADC1"), \
+        LR_TEXTS("ADC2"), \
+        LR_TEXTS("SPDIF"), \
+        ADAT_TEXTS("")
+
+static const char * const emu1616_src_texts[] = {
+        EMU1616_COMMON_TEXTS,
+        DSP_TEXTS,
+};
+
+static const unsigned short emu1616_src_regs[] = {
         EMU_SRC_SILENCE,
-        EMU_SRC_DOCK_MIC_A1,
-        EMU_SRC_DOCK_MIC_B1,
-        EMU_SRC_DOCK_ADC1_LEFT1,
-        EMU_SRC_DOCK_ADC1_RIGHT1,
-        EMU_SRC_DOCK_ADC2_LEFT1,
-        EMU_SRC_DOCK_ADC2_RIGHT1,
-        EMU_SRC_MDOCK_SPDIF_LEFT1,
-        EMU_SRC_MDOCK_SPDIF_RIGHT1,
-        EMU_SRC_MDOCK_ADAT,
-        EMU_SRC_MDOCK_ADAT+1,
-        EMU_SRC_MDOCK_ADAT+2,
-        EMU_SRC_MDOCK_ADAT+3,
-        EMU_SRC_MDOCK_ADAT+4,
-        EMU_SRC_MDOCK_ADAT+5,
-        EMU_SRC_MDOCK_ADAT+6,
-        EMU_SRC_MDOCK_ADAT+7,
-        EMU_SRC_ALICE_EMU32A,
-        EMU_SRC_ALICE_EMU32A+1,
-        EMU_SRC_ALICE_EMU32A+2,
-        EMU_SRC_ALICE_EMU32A+3,
-        EMU_SRC_ALICE_EMU32A+4,
-        EMU_SRC_ALICE_EMU32A+5,
-        EMU_SRC_ALICE_EMU32A+6,
-        EMU_SRC_ALICE_EMU32A+7,
-        EMU_SRC_ALICE_EMU32A+8,
-        EMU_SRC_ALICE_EMU32A+9,
-        EMU_SRC_ALICE_EMU32A+0xa,
-        EMU_SRC_ALICE_EMU32A+0xb,
-        EMU_SRC_ALICE_EMU32A+0xc,
-        EMU_SRC_ALICE_EMU32A+0xd,
-        EMU_SRC_ALICE_EMU32A+0xe,
-        EMU_SRC_ALICE_EMU32A+0xf,
-        EMU_SRC_ALICE_EMU32B,
-        EMU_SRC_ALICE_EMU32B+1,
-        EMU_SRC_ALICE_EMU32B+2,
-        EMU_SRC_ALICE_EMU32B+3,
-        EMU_SRC_ALICE_EMU32B+4,
-        EMU_SRC_ALICE_EMU32B+5,
-        EMU_SRC_ALICE_EMU32B+6,
-        EMU_SRC_ALICE_EMU32B+7,
-        EMU_SRC_ALICE_EMU32B+8,
-        EMU_SRC_ALICE_EMU32B+9,
-        EMU_SRC_ALICE_EMU32B+0xa,
-        EMU_SRC_ALICE_EMU32B+0xb,
-        EMU_SRC_ALICE_EMU32B+0xc,
-        EMU_SRC_ALICE_EMU32B+0xd,
-        EMU_SRC_ALICE_EMU32B+0xe,
-        EMU_SRC_ALICE_EMU32B+0xf,
-};
+        PAIR_REGS(EMU_SRC_DOCK_MIC, _A, _B),
+        LR_REGS(EMU_SRC_DOCK_ADC1),
+        LR_REGS(EMU_SRC_DOCK_ADC2),
+        LR_REGS(EMU_SRC_MDOCK_SPDIF),
+        ADAT_REGS(EMU_SRC_MDOCK_ADAT),
+        EMU32_SRC_REGS,
+};
+//static_assert(ARRAY_SIZE(emu1616_src_regs) == ARRAY_SIZE(emu1616_src_texts));
+
+/* 0404 rev1 & rev2 */
+
+#define EMU0404_COMMON_TEXTS \
+        "Silence", \
+        LR_TEXTS("ADC"), \
+        LR_TEXTS("SPDIF")
+
+static const char * const emu0404_src_texts[] = {
+        EMU0404_COMMON_TEXTS,
+        DSP_TEXTS,
+};
+
+static const unsigned short emu0404_src_regs[] = {
+        EMU_SRC_SILENCE,
+        LR_REGS(EMU_SRC_HAMOA_ADC),
+        LR_REGS(EMU_SRC_HANA_SPDIF),
+        EMU32_SRC_REGS,
+};
+//static_assert(ARRAY_SIZE(emu0404_src_regs) == ARRAY_SIZE(emu0404_src_texts));
 
 /*
@@ -297 +251 @@
  * Each destination has an enum mixer control to choose a data source
  */
-static const unsigned int emu1010_output_dst[] = {
-        EMU_DST_DOCK_DAC1_LEFT1, /* 0 */
-        EMU_DST_DOCK_DAC1_RIGHT1, /* 1 */
-        EMU_DST_DOCK_DAC2_LEFT1, /* 2 */
-        EMU_DST_DOCK_DAC2_RIGHT1, /* 3 */
-        EMU_DST_DOCK_DAC3_LEFT1, /* 4 */
-        EMU_DST_DOCK_DAC3_RIGHT1, /* 5 */
-        EMU_DST_DOCK_DAC4_LEFT1, /* 6 */
-        EMU_DST_DOCK_DAC4_RIGHT1, /* 7 */
-        EMU_DST_DOCK_PHONES_LEFT1, /* 8 */
-        EMU_DST_DOCK_PHONES_RIGHT1, /* 9 */
-        EMU_DST_DOCK_SPDIF_LEFT1, /* 10 */
-        EMU_DST_DOCK_SPDIF_RIGHT1, /* 11 */
-        EMU_DST_HANA_SPDIF_LEFT1, /* 12 */
-        EMU_DST_HANA_SPDIF_RIGHT1, /* 13 */
-        EMU_DST_HAMOA_DAC_LEFT1, /* 14 */
-        EMU_DST_HAMOA_DAC_RIGHT1, /* 15 */
-        EMU_DST_HANA_ADAT, /* 16 */
-        EMU_DST_HANA_ADAT+1, /* 17 */
-        EMU_DST_HANA_ADAT+2, /* 18 */
-        EMU_DST_HANA_ADAT+3, /* 19 */
-        EMU_DST_HANA_ADAT+4, /* 20 */
-        EMU_DST_HANA_ADAT+5, /* 21 */
-        EMU_DST_HANA_ADAT+6, /* 22 */
-        EMU_DST_HANA_ADAT+7, /* 23 */
+
+#define LR_CTLS(base) LR_PS(base, " Playback Enum")
+#define ADAT_CTLS(pfx) ADAT_PS(pfx, " Playback Enum")
+
+/* 1010 rev1 */
+
+static const char * const emu1010_output_texts[] = {
+        LR_CTLS("Dock DAC1"),
+        LR_CTLS("Dock DAC2"),
+        LR_CTLS("Dock DAC3"),
+        LR_CTLS("Dock DAC4"),
+        LR_CTLS("Dock Phones"),
+        LR_CTLS("Dock SPDIF"),
+        LR_CTLS("0202 DAC"),
+        LR_CTLS("1010 SPDIF"),
+        ADAT_CTLS("1010 "),
+};
+//static_assert(ARRAY_SIZE(emu1010_output_texts) <= NUM_OUTPUT_DESTS);
+
+static const unsigned short emu1010_output_dst[] = {
+        LR_REGS(EMU_DST_DOCK_DAC1),
+        LR_REGS(EMU_DST_DOCK_DAC2),
+        LR_REGS(EMU_DST_DOCK_DAC3),
+        LR_REGS(EMU_DST_DOCK_DAC4),
+        LR_REGS(EMU_DST_DOCK_PHONES),
+        LR_REGS(EMU_DST_DOCK_SPDIF),
+        LR_REGS(EMU_DST_HAMOA_DAC),
+        LR_REGS(EMU_DST_HANA_SPDIF),
+        ADAT_REGS(EMU_DST_HANA_ADAT),
+};
+//static_assert(ARRAY_SIZE(emu1010_output_dst) == ARRAY_SIZE(emu1010_output_texts));
+
+static const unsigned short emu1010_output_dflt[] = {
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,
+        EMU_SRC_ALICE_EMU32A+2, EMU_SRC_ALICE_EMU32A+3,
+        EMU_SRC_ALICE_EMU32A+4, EMU_SRC_ALICE_EMU32A+5,
+        EMU_SRC_ALICE_EMU32A+6, EMU_SRC_ALICE_EMU32A+7,
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1, EMU_SRC_ALICE_EMU32A+2, EMU_SRC_ALICE_EMU32A+3,
+        EMU_SRC_ALICE_EMU32A+4, EMU_SRC_ALICE_EMU32A+5, EMU_SRC_ALICE_EMU32A+6, EMU_SRC_ALICE_EMU32A+7,
+};
+//static_assert(ARRAY_SIZE(emu1010_output_dflt) == ARRAY_SIZE(emu1010_output_dst));
+
+/* 1010 rev2 */
+
+static const char * const snd_emu1010b_output_texts[] = {
+        LR_CTLS("Dock DAC1"),
+        LR_CTLS("Dock DAC2"),
+        LR_CTLS("Dock DAC3"),
+        LR_CTLS("Dock SPDIF"),
+        ADAT_CTLS("Dock "),
+        LR_CTLS("0202 DAC"),
+        LR_CTLS("1010 SPDIF"),
+        ADAT_CTLS("1010 "),
+};
+//static_assert(ARRAY_SIZE(snd_emu1010b_output_texts) <= NUM_OUTPUT_DESTS);
+
+static const unsigned short emu1010b_output_dst[] = {
+        LR_REGS(EMU_DST_DOCK_DAC1),
+        LR_REGS(EMU_DST_DOCK_DAC2),
+        LR_REGS(EMU_DST_DOCK_DAC3),
+        LR_REGS(EMU_DST_MDOCK_SPDIF),
+        ADAT_REGS(EMU_DST_MDOCK_ADAT),
+        LR_REGS(EMU_DST_HAMOA_DAC),
+        LR_REGS(EMU_DST_HANA_SPDIF),
+        ADAT_REGS(EMU_DST_HANA_ADAT),
+};
+//static_assert(ARRAY_SIZE(emu1010b_output_dst) == ARRAY_SIZE(snd_emu1010b_output_texts));
+
+static const unsigned short emu1010b_output_dflt[] = {
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,
+        EMU_SRC_ALICE_EMU32A+2, EMU_SRC_ALICE_EMU32A+3,
+        EMU_SRC_ALICE_EMU32A+4, EMU_SRC_ALICE_EMU32A+5,
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1, EMU_SRC_ALICE_EMU32A+2, EMU_SRC_ALICE_EMU32A+3,
+        EMU_SRC_ALICE_EMU32A+4, EMU_SRC_ALICE_EMU32A+5, EMU_SRC_ALICE_EMU32A+6, EMU_SRC_ALICE_EMU32A+7,
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1, EMU_SRC_ALICE_EMU32A+2, EMU_SRC_ALICE_EMU32A+3,
+        EMU_SRC_ALICE_EMU32A+4, EMU_SRC_ALICE_EMU32A+5, EMU_SRC_ALICE_EMU32A+6, EMU_SRC_ALICE_EMU32A+7,
 };
 
 /* 1616(m) cardbus */
-static const unsigned int emu1616_output_dst[] = {
-        EMU_DST_DOCK_DAC1_LEFT1,
-        EMU_DST_DOCK_DAC1_RIGHT1,
-        EMU_DST_DOCK_DAC2_LEFT1,
-        EMU_DST_DOCK_DAC2_RIGHT1,
-        EMU_DST_DOCK_DAC3_LEFT1,
-        EMU_DST_DOCK_DAC3_RIGHT1,
-        EMU_DST_MDOCK_SPDIF_LEFT1,
-        EMU_DST_MDOCK_SPDIF_RIGHT1,
-        EMU_DST_MDOCK_ADAT,
-        EMU_DST_MDOCK_ADAT+1,
-        EMU_DST_MDOCK_ADAT+2,
-        EMU_DST_MDOCK_ADAT+3,
-        EMU_DST_MDOCK_ADAT+4,
-        EMU_DST_MDOCK_ADAT+5,
-        EMU_DST_MDOCK_ADAT+6,
-        EMU_DST_MDOCK_ADAT+7,
-        EMU_DST_MANA_DAC_LEFT,
-        EMU_DST_MANA_DAC_RIGHT,
-};
+
+static const char * const snd_emu1616_output_texts[] = {
+        LR_CTLS("Dock DAC1"),
+        LR_CTLS("Dock DAC2"),
+        LR_CTLS("Dock DAC3"),
+        LR_CTLS("Dock SPDIF"),
+        ADAT_CTLS("Dock "),
+        LR_CTLS("Mana DAC"),
+};
+//static_assert(ARRAY_SIZE(snd_emu1616_output_texts) <= NUM_OUTPUT_DESTS);
+
+static const unsigned short emu1616_output_dst[] = {
+        LR_REGS(EMU_DST_DOCK_DAC1),
+        LR_REGS(EMU_DST_DOCK_DAC2),
+        LR_REGS(EMU_DST_DOCK_DAC3),
+        LR_REGS(EMU_DST_MDOCK_SPDIF),
+        ADAT_REGS(EMU_DST_MDOCK_ADAT),
+        EMU_DST_MANA_DAC_LEFT, EMU_DST_MANA_DAC_RIGHT,
+};
+//static_assert(ARRAY_SIZE(emu1616_output_dst) == ARRAY_SIZE(snd_emu1616_output_texts));
+
+static const unsigned short emu1616_output_dflt[] = {
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,
+        EMU_SRC_ALICE_EMU32A+2, EMU_SRC_ALICE_EMU32A+3,
+        EMU_SRC_ALICE_EMU32A+4, EMU_SRC_ALICE_EMU32A+5,
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1, EMU_SRC_ALICE_EMU32A+2, EMU_SRC_ALICE_EMU32A+3,
+        EMU_SRC_ALICE_EMU32A+4, EMU_SRC_ALICE_EMU32A+5, EMU_SRC_ALICE_EMU32A+6, EMU_SRC_ALICE_EMU32A+7,
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,
+};
+//static_assert(ARRAY_SIZE(emu1616_output_dflt) == ARRAY_SIZE(emu1616_output_dst));
+
+/* 0404 rev1 & rev2 */
+
+static const char * const snd_emu0404_output_texts[] = {
+        LR_CTLS("DAC"),
+        LR_CTLS("SPDIF"),
+};
+//static_assert(ARRAY_SIZE(snd_emu0404_output_texts) <= NUM_OUTPUT_DESTS);
+
+static const unsigned short emu0404_output_dst[] = {
+        LR_REGS(EMU_DST_HAMOA_DAC),
+        LR_REGS(EMU_DST_HANA_SPDIF),
+};
+//static_assert(ARRAY_SIZE(emu0404_output_dst) == ARRAY_SIZE(snd_emu0404_output_texts));
+
+static const unsigned short emu0404_output_dflt[] = {
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,
+        EMU_SRC_ALICE_EMU32A+0, EMU_SRC_ALICE_EMU32A+1,
+};
+//static_assert(ARRAY_SIZE(emu0404_output_dflt) == ARRAY_SIZE(emu0404_output_dst));
 
 /*
- * Data destinations - HANA outputs going to Alice2 (audigy) for
+ * Data destinations - FPGA outputs going to Alice2 (Audigy) for
  *   capture (EMU32 + I2S links)
  * Each destination has an enum mixer control to choose a data source
  */
-static const unsigned int emu1010_input_dst[] = {
+
+static const char * const emu1010_input_texts[] = {
+        "DSP 0 Capture Enum",
+        "DSP 1 Capture Enum",
+        "DSP 2 Capture Enum",
+        "DSP 3 Capture Enum",
+        "DSP 4 Capture Enum",
+        "DSP 5 Capture Enum",
+        "DSP 6 Capture Enum",
+        "DSP 7 Capture Enum",
+        "DSP 8 Capture Enum",
+        "DSP 9 Capture Enum",
+        "DSP A Capture Enum",
+        "DSP B Capture Enum",
+        "DSP C Capture Enum",
+        "DSP D Capture Enum",
+        "DSP E Capture Enum",
+        "DSP F Capture Enum",
+        /* These exist only on rev1 EMU1010 cards. */
+        "DSP 10 Capture Enum",
+        "DSP 11 Capture Enum",
+        "DSP 12 Capture Enum",
+        "DSP 13 Capture Enum",
+        "DSP 14 Capture Enum",
+        "DSP 15 Capture Enum",
+};
+//static_assert(ARRAY_SIZE(emu1010_input_texts) <= NUM_INPUT_DESTS);
+
+static const unsigned short emu1010_input_dst[] = {
         EMU_DST_ALICE2_EMU32_0,
         EMU_DST_ALICE2_EMU32_1,
@@ -368 +439 @@
         EMU_DST_ALICE2_EMU32_E,
         EMU_DST_ALICE2_EMU32_F,
+        /* These exist only on rev1 EMU1010 cards. */
         EMU_DST_ALICE_I2S0_LEFT,
         EMU_DST_ALICE_I2S0_RIGHT,
@@ -375 +447 @@
         EMU_DST_ALICE_I2S2_RIGHT,
 };
+//static_assert(ARRAY_SIZE(emu1010_input_dst) == ARRAY_SIZE(emu1010_input_texts));
+
+static const unsigned short emu1010_input_dflt[] = {
+        EMU_SRC_DOCK_MIC_A1,
+        EMU_SRC_DOCK_MIC_B1,
+        EMU_SRC_HAMOA_ADC_LEFT1,
+        EMU_SRC_HAMOA_ADC_RIGHT1,
+        EMU_SRC_DOCK_ADC1_LEFT1,
+        EMU_SRC_DOCK_ADC1_RIGHT1,
+        EMU_SRC_DOCK_ADC2_LEFT1,
+        EMU_SRC_DOCK_ADC2_RIGHT1,
+        /* Pavel Hofman - setting defaults for all capture channels.
+         * Defaults only, users will set their own values anyways, let's
+         * just copy/paste. */
+        EMU_SRC_DOCK_MIC_A1,
+        EMU_SRC_DOCK_MIC_B1,
+        EMU_SRC_HAMOA_ADC_LEFT1,
+        EMU_SRC_HAMOA_ADC_RIGHT1,
+        EMU_SRC_DOCK_ADC1_LEFT1,
+        EMU_SRC_DOCK_ADC1_RIGHT1,
+        EMU_SRC_DOCK_ADC2_LEFT1,
+        EMU_SRC_DOCK_ADC2_RIGHT1,
+
+        EMU_SRC_DOCK_ADC1_LEFT1,
+        EMU_SRC_DOCK_ADC1_RIGHT1,
+        EMU_SRC_DOCK_ADC2_LEFT1,
+        EMU_SRC_DOCK_ADC2_RIGHT1,
+        EMU_SRC_DOCK_ADC3_LEFT1,
+        EMU_SRC_DOCK_ADC3_RIGHT1,
+};
+//static_assert(ARRAY_SIZE(emu1010_input_dflt) == ARRAY_SIZE(emu1010_input_dst));
+
+static const unsigned short emu0404_input_dflt[] = {
+        EMU_SRC_HAMOA_ADC_LEFT1,
+        EMU_SRC_HAMOA_ADC_RIGHT1,
+        EMU_SRC_SILENCE,
+        EMU_SRC_SILENCE,
+        EMU_SRC_SILENCE,
+        EMU_SRC_SILENCE,
+        EMU_SRC_SILENCE,
+        EMU_SRC_SILENCE,
+        EMU_SRC_HANA_SPDIF_LEFT1,
+        EMU_SRC_HANA_SPDIF_RIGHT1,
+        EMU_SRC_SILENCE,
+        EMU_SRC_SILENCE,
+        EMU_SRC_SILENCE,
+        EMU_SRC_SILENCE,
+        EMU_SRC_SILENCE,
+        EMU_SRC_SILENCE,
+};
+
+struct snd_emu1010_routing_info {
+        const char * const *src_texts;
+        const char * const *out_texts;
+        const unsigned short *src_regs;
+        const unsigned short *out_regs;
+        const unsigned short *in_regs;
+        const unsigned short *out_dflts;
+        const unsigned short *in_dflts;
+        unsigned n_srcs;
+        unsigned n_outs;
+        unsigned n_ins;
+};
+
+static const struct snd_emu1010_routing_info emu1010_routing_info[] = {
+        {
+                /* rev1 1010 */
+                .src_regs = emu1010_src_regs,
+                .src_texts = emu1010_src_texts,
+                .n_srcs = ARRAY_SIZE(emu1010_src_texts),
+
+                .out_dflts = emu1010_output_dflt,
+                .out_regs = emu1010_output_dst,
+                .out_texts = emu1010_output_texts,
+                .n_outs = ARRAY_SIZE(emu1010_output_dst),
+
+                .in_dflts = emu1010_input_dflt,
+                .in_regs = emu1010_input_dst,
+                .n_ins = ARRAY_SIZE(emu1010_input_dst),
+        },
+        {
+                /* rev2 1010 */
+                .src_regs = emu1010b_src_regs,
+                .src_texts = emu1010b_src_texts,
+                .n_srcs = ARRAY_SIZE(emu1010b_src_texts),
+
+                .out_dflts = emu1010b_output_dflt,
+                .out_regs = emu1010b_output_dst,
+                .out_texts = snd_emu1010b_output_texts,
+                .n_outs = ARRAY_SIZE(emu1010b_output_dst),
+
+                .in_dflts = emu1010_input_dflt,
+                .in_regs = emu1010_input_dst,
+                .n_ins = ARRAY_SIZE(emu1010_input_dst) - 6,
+        },
+        {
+                /* 1616(m) cardbus */
+                .src_regs = emu1616_src_regs,
+                .src_texts = emu1616_src_texts,
+                .n_srcs = ARRAY_SIZE(emu1616_src_texts),
+
+                .out_dflts = emu1616_output_dflt,
+                .out_regs = emu1616_output_dst,
+                .out_texts = snd_emu1616_output_texts,
+                .n_outs = ARRAY_SIZE(emu1616_output_dst),
+
+                .in_dflts = emu1010_input_dflt,
+                .in_regs = emu1010_input_dst,
+                .n_ins = ARRAY_SIZE(emu1010_input_dst) - 6,
+        },
+        {
+                /* 0404 */
+                .src_regs = emu0404_src_regs,
+                .src_texts = emu0404_src_texts,
+                .n_srcs = ARRAY_SIZE(emu0404_src_texts),
+
+                .out_dflts = emu0404_output_dflt,
+                .out_regs = emu0404_output_dst,
+                .out_texts = snd_emu0404_output_texts,
+                .n_outs = ARRAY_SIZE(emu0404_output_dflt),
+
+                .in_dflts = emu0404_input_dflt,
+                .in_regs = emu1010_input_dst,
+                .n_ins = ARRAY_SIZE(emu1010_input_dst) - 6,
+        },
+};
+
+static unsigned emu1010_idx(struct snd_emu10k1 *emu)
+{
+        return emu->card_capabilities->emu_model - 1;
+}
+
+static void snd_emu1010_output_source_apply(struct snd_emu10k1 *emu,
+                                            int channel, int src)
+{
+        const struct snd_emu1010_routing_info *emu_ri =
+                &emu1010_routing_info[emu1010_idx(emu)];
+
+        snd_emu1010_fpga_link_dst_src_write(emu,
+                emu_ri->out_regs[channel], emu_ri->src_regs[src]);
+}
+
+static void snd_emu1010_input_source_apply(struct snd_emu10k1 *emu,
+                                           int channel, int src)
+{
+        const struct snd_emu1010_routing_info *emu_ri =
+                &emu1010_routing_info[emu1010_idx(emu)];
+
+        snd_emu1010_fpga_link_dst_src_write(emu,
+                emu_ri->in_regs[channel], emu_ri->src_regs[src]);
+}
+
+static void snd_emu1010_apply_sources(struct snd_emu10k1 *emu)
+{
+        const struct snd_emu1010_routing_info *emu_ri =
+                &emu1010_routing_info[emu1010_idx(emu)];
+
+        for (unsigned i = 0; i < emu_ri->n_outs; i++)
+                snd_emu1010_output_source_apply(
+                        emu, i, emu->emu1010.output_source[i]);
+        for (unsigned i = 0; i < emu_ri->n_ins; i++)
+                snd_emu1010_input_source_apply(
+                        emu, i, emu->emu1010.input_source[i]);
+}
+
+static u8 emu1010_map_source(const struct snd_emu1010_routing_info *emu_ri,
+                             unsigned val)
+{
+        for (unsigned i = 0; i < emu_ri->n_srcs; i++)
+                if (val == emu_ri->src_regs[i])
+                        return i;
+        return 0;
+}
 
 static int snd_emu1010_input_output_source_info(struct snd_kcontrol *kcontrol,
@@ -380 +625 @@
 {
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-
-        if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616)
-                return snd_ctl_enum_info(uinfo, 1, 49, emu1616_src_texts);
-        else
-                return snd_ctl_enum_info(uinfo, 1, 53, emu1010_src_texts);
+        const struct snd_emu1010_routing_info *emu_ri =
+                &emu1010_routing_info[emu1010_idx(emu)];
+
+        return snd_ctl_enum_info(uinfo, 1, emu_ri->n_srcs, emu_ri->src_texts);
 }
 
@@ -391 +635 @@
 {
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-        unsigned int channel;
-
-        channel = (kcontrol->private_value) & 0xff;
-        /* Limit: emu1010_output_dst, emu->emu1010.output_source */
-        if (channel >= 24 ||
-            (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
-             channel >= 18))
+        const struct snd_emu1010_routing_info *emu_ri =
+                &emu1010_routing_info[emu1010_idx(emu)];
+        unsigned channel = kcontrol->private_value;
+
+        if (channel >= emu_ri->n_outs)
                 return -EINVAL;
         ucontrol->value.enumerated.item[0] = emu->emu1010.output_source[channel];
@@ -407 +649 @@
 {
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-        unsigned int val;
-        unsigned int channel;
-
-        val = ucontrol->value.enumerated.item[0];
-        if (val >= 53 ||
-            (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
-             val >= 49))
+        const struct snd_emu1010_routing_info *emu_ri =
+                &emu1010_routing_info[emu1010_idx(emu)];
+        unsigned val = ucontrol->value.enumerated.item[0];
+        unsigned channel = kcontrol->private_value;
+        int change;
+
+        if (val >= emu_ri->n_srcs)
                 return -EINVAL;
-        channel = (kcontrol->private_value) & 0xff;
-        /* Limit: emu1010_output_dst, emu->emu1010.output_source */
-        if (channel >= 24 ||
-            (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
-             channel >= 18))
+        if (channel >= emu_ri->n_outs)
                 return -EINVAL;
-        if (emu->emu1010.output_source[channel] == val)
-                return 0;
-        emu->emu1010.output_source[channel] = val;
-        if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616)
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        emu1616_output_dst[channel], emu1616_src_regs[val]);
-        else
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        emu1010_output_dst[channel], emu1010_src_regs[val]);
-        return 1;
-}
+        change = (emu->emu1010.output_source[channel] != val);
+        if (change) {
+                emu->emu1010.output_source[channel] = val;
+                snd_emu1010_output_source_apply(emu, channel, val);
+        }
+        return change;
+}
+
+static const struct snd_kcontrol_new emu1010_output_source_ctl = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+        .info = snd_emu1010_input_output_source_info,
+        .get = snd_emu1010_output_source_get,
+        .put = snd_emu1010_output_source_put
+};
 
 static int snd_emu1010_input_source_get(struct snd_kcontrol *kcontrol,
@@ -437 +679 @@
 {
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-        unsigned int channel;
-
-        channel = (kcontrol->private_value) & 0xff;
-        /* Limit: emu1010_input_dst, emu->emu1010.input_source */
-        if (channel >= 22)
+        const struct snd_emu1010_routing_info *emu_ri =
+                &emu1010_routing_info[emu1010_idx(emu)];
+        unsigned channel = kcontrol->private_value;
+
+        if (channel >= emu_ri->n_ins)
                 return -EINVAL;
         ucontrol->value.enumerated.item[0] = emu->emu1010.input_source[channel];
@@ -451 +693 @@
 {
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-        unsigned int val;
-        unsigned int channel;
-
-        val = ucontrol->value.enumerated.item[0];
-        if (val >= 53 ||
-            (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616 &&
-             val >= 49))
+        const struct snd_emu1010_routing_info *emu_ri =
+                &emu1010_routing_info[emu1010_idx(emu)];
+        unsigned val = ucontrol->value.enumerated.item[0];
+        unsigned channel = kcontrol->private_value;
+        int change;
+
+        if (val >= emu_ri->n_srcs)
                 return -EINVAL;
-        channel = (kcontrol->private_value) & 0xff;
-        /* Limit: emu1010_input_dst, emu->emu1010.input_source */
-        if (channel >= 22)
+        if (channel >= emu_ri->n_ins)
                 return -EINVAL;
-        if (emu->emu1010.input_source[channel] == val)
-                return 0;
-        emu->emu1010.input_source[channel] = val;
-        if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616)
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        emu1010_input_dst[channel], emu1616_src_regs[val]);
-        else
-                snd_emu1010_fpga_link_dst_src_write(emu,
-                        emu1010_input_dst[channel], emu1010_src_regs[val]);
-        return 1;
-}
-
-#define EMU1010_SOURCE_OUTPUT(xname,chid) \
-{                                                               \
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
-        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,              \
-        .info =  snd_emu1010_input_output_source_info,          \
-        .get =   snd_emu1010_output_source_get,                 \
-        .put =   snd_emu1010_output_source_put,                 \
-        .private_value = chid                                   \
-}
-
-static const struct snd_kcontrol_new snd_emu1010_output_enum_ctls[] = {
-        EMU1010_SOURCE_OUTPUT("Dock DAC1 Left Playback Enum", 0),
-        EMU1010_SOURCE_OUTPUT("Dock DAC1 Right Playback Enum", 1),
-        EMU1010_SOURCE_OUTPUT("Dock DAC2 Left Playback Enum", 2),
-        EMU1010_SOURCE_OUTPUT("Dock DAC2 Right Playback Enum", 3),
-        EMU1010_SOURCE_OUTPUT("Dock DAC3 Left Playback Enum", 4),
-        EMU1010_SOURCE_OUTPUT("Dock DAC3 Right Playback Enum", 5),
-        EMU1010_SOURCE_OUTPUT("Dock DAC4 Left Playback Enum", 6),
-        EMU1010_SOURCE_OUTPUT("Dock DAC4 Right Playback Enum", 7),
-        EMU1010_SOURCE_OUTPUT("Dock Phones Left Playback Enum", 8),
-        EMU1010_SOURCE_OUTPUT("Dock Phones Right Playback Enum", 9),
-        EMU1010_SOURCE_OUTPUT("Dock SPDIF Left Playback Enum", 0xa),
-        EMU1010_SOURCE_OUTPUT("Dock SPDIF Right Playback Enum", 0xb),
-        EMU1010_SOURCE_OUTPUT("1010 SPDIF Left Playback Enum", 0xc),
-        EMU1010_SOURCE_OUTPUT("1010 SPDIF Right Playback Enum", 0xd),
-        EMU1010_SOURCE_OUTPUT("0202 DAC Left Playback Enum", 0xe),
-        EMU1010_SOURCE_OUTPUT("0202 DAC Right Playback Enum", 0xf),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 0 Playback Enum", 0x10),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 1 Playback Enum", 0x11),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 2 Playback Enum", 0x12),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 3 Playback Enum", 0x13),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 4 Playback Enum", 0x14),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 5 Playback Enum", 0x15),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 6 Playback Enum", 0x16),
-        EMU1010_SOURCE_OUTPUT("1010 ADAT 7 Playback Enum", 0x17),
-};
-
-
-/* 1616(m) cardbus */
-static const struct snd_kcontrol_new snd_emu1616_output_enum_ctls[] = {
-        EMU1010_SOURCE_OUTPUT("Dock DAC1 Left Playback Enum", 0),
-        EMU1010_SOURCE_OUTPUT("Dock DAC1 Right Playback Enum", 1),
-        EMU1010_SOURCE_OUTPUT("Dock DAC2 Left Playback Enum", 2),
-        EMU1010_SOURCE_OUTPUT("Dock DAC2 Right Playback Enum", 3),
-        EMU1010_SOURCE_OUTPUT("Dock DAC3 Left Playback Enum", 4),
-        EMU1010_SOURCE_OUTPUT("Dock DAC3 Right Playback Enum", 5),
-        EMU1010_SOURCE_OUTPUT("Dock SPDIF Left Playback Enum", 6),
-        EMU1010_SOURCE_OUTPUT("Dock SPDIF Right Playback Enum", 7),
-        EMU1010_SOURCE_OUTPUT("Dock ADAT 0 Playback Enum", 8),
-        EMU1010_SOURCE_OUTPUT("Dock ADAT 1 Playback Enum", 9),
-        EMU1010_SOURCE_OUTPUT("Dock ADAT 2 Playback Enum", 0xa),
-        EMU1010_SOURCE_OUTPUT("Dock ADAT 3 Playback Enum", 0xb),
-        EMU1010_SOURCE_OUTPUT("Dock ADAT 4 Playback Enum", 0xc),
-        EMU1010_SOURCE_OUTPUT("Dock ADAT 5 Playback Enum", 0xd),
-        EMU1010_SOURCE_OUTPUT("Dock ADAT 6 Playback Enum", 0xe),
-        EMU1010_SOURCE_OUTPUT("Dock ADAT 7 Playback Enum", 0xf),
-        EMU1010_SOURCE_OUTPUT("Mana DAC Left Playback Enum", 0x10),
-        EMU1010_SOURCE_OUTPUT("Mana DAC Right Playback Enum", 0x11),
-};
-
-
-#define EMU1010_SOURCE_INPUT(xname,chid) \
-{                                                               \
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
-        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,              \
-        .info =  snd_emu1010_input_output_source_info,          \
-        .get =   snd_emu1010_input_source_get,                  \
-        .put =   snd_emu1010_input_source_put,                  \
-        .private_value = chid                                   \
-}
-
-static const struct snd_kcontrol_new snd_emu1010_input_enum_ctls[] = {
-        EMU1010_SOURCE_INPUT("DSP 0 Capture Enum", 0),
-        EMU1010_SOURCE_INPUT("DSP 1 Capture Enum", 1),
-        EMU1010_SOURCE_INPUT("DSP 2 Capture Enum", 2),
-        EMU1010_SOURCE_INPUT("DSP 3 Capture Enum", 3),
-        EMU1010_SOURCE_INPUT("DSP 4 Capture Enum", 4),
-        EMU1010_SOURCE_INPUT("DSP 5 Capture Enum", 5),
-        EMU1010_SOURCE_INPUT("DSP 6 Capture Enum", 6),
-        EMU1010_SOURCE_INPUT("DSP 7 Capture Enum", 7),
-        EMU1010_SOURCE_INPUT("DSP 8 Capture Enum", 8),
-        EMU1010_SOURCE_INPUT("DSP 9 Capture Enum", 9),
-        EMU1010_SOURCE_INPUT("DSP A Capture Enum", 0xa),
-        EMU1010_SOURCE_INPUT("DSP B Capture Enum", 0xb),
-        EMU1010_SOURCE_INPUT("DSP C Capture Enum", 0xc),
-        EMU1010_SOURCE_INPUT("DSP D Capture Enum", 0xd),
-        EMU1010_SOURCE_INPUT("DSP E Capture Enum", 0xe),
-        EMU1010_SOURCE_INPUT("DSP F Capture Enum", 0xf),
-        EMU1010_SOURCE_INPUT("DSP 10 Capture Enum", 0x10),
-        EMU1010_SOURCE_INPUT("DSP 11 Capture Enum", 0x11),
-        EMU1010_SOURCE_INPUT("DSP 12 Capture Enum", 0x12),
-        EMU1010_SOURCE_INPUT("DSP 13 Capture Enum", 0x13),
-        EMU1010_SOURCE_INPUT("DSP 14 Capture Enum", 0x14),
-        EMU1010_SOURCE_INPUT("DSP 15 Capture Enum", 0x15),
-};
-
-
+        change = (emu->emu1010.input_source[channel] != val);
+        if (change) {
+                emu->emu1010.input_source[channel] = val;
+                snd_emu1010_input_source_apply(emu, channel, val);
+        }
+        return change;
+}
+
+static const struct snd_kcontrol_new emu1010_input_source_ctl = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+        .info = snd_emu1010_input_output_source_info,
+        .get = snd_emu1010_input_source_get,
+        .put = snd_emu1010_input_source_put
+};
+
+static int add_emu1010_source_mixers(struct snd_emu10k1 *emu)
+{
+        const struct snd_emu1010_routing_info *emu_ri =
+                &emu1010_routing_info[emu1010_idx(emu)];
+        int err;
+
+        err = add_ctls(emu, &emu1010_output_source_ctl,
+                       emu_ri->out_texts, emu_ri->n_outs);
+        if (err < 0)
+                return err;
+        err = add_ctls(emu, &emu1010_input_source_ctl,
+                       emu1010_input_texts, emu_ri->n_ins);
+        return err;
+}
+
+
+static const char * const snd_emu1010_adc_pads[] = {
+        "ADC1 14dB PAD 0202 Capture Switch",
+        "ADC1 14dB PAD Audio Dock Capture Switch",
+        "ADC2 14dB PAD Audio Dock Capture Switch",
+        "ADC3 14dB PAD Audio Dock Capture Switch",
+};
+
+static const unsigned short snd_emu1010_adc_pad_regs[] = {
+        EMU_HANA_0202_ADC_PAD1,
+        EMU_HANA_DOCK_ADC_PAD1,
+        EMU_HANA_DOCK_ADC_PAD2,
+        EMU_HANA_DOCK_ADC_PAD3,
+};
 
 #define snd_emu1010_adc_pads_info       snd_ctl_boolean_mono_info
@@ -578 +754 @@
 {
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-        unsigned int mask = kcontrol->private_value & 0xff;
+        unsigned int mask = snd_emu1010_adc_pad_regs[kcontrol->private_value];
+
         ucontrol->value.integer.value[0] = (emu->emu1010.adc_pads & mask) ? 1 : 0;
         return 0;
@@ -586 +763 @@
 {
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-        unsigned int mask = kcontrol->private_value & 0xff;
+        unsigned int mask = snd_emu1010_adc_pad_regs[kcontrol->private_value];
         unsigned int val, cache;
+        int change;
+
         val = ucontrol->value.integer.value[0];
         cache = emu->emu1010.adc_pads;
@@ -594 +773 @@
         else
                 cache = cache & ~mask;
-        if (cache != emu->emu1010.adc_pads) {
+        change = (cache != emu->emu1010.adc_pads);
+        if (change) {
                 snd_emu1010_fpga_write(emu, EMU_HANA_ADC_PADS, cache );
                 emu->emu1010.adc_pads = cache;
         }
 
-        return 0;
-}
-
-
-
-#define EMU1010_ADC_PADS(xname,chid) \
-{                                                               \
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
-        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,              \
-        .info =  snd_emu1010_adc_pads_info,                     \
-        .get =   snd_emu1010_adc_pads_get,                      \
-        .put =   snd_emu1010_adc_pads_put,                      \
-        .private_value = chid                                   \
-}
-
-static const struct snd_kcontrol_new snd_emu1010_adc_pads[] = {
-        EMU1010_ADC_PADS("ADC1 14dB PAD Audio Dock Capture Switch", EMU_HANA_DOCK_ADC_PAD1),
-        EMU1010_ADC_PADS("ADC2 14dB PAD Audio Dock Capture Switch", EMU_HANA_DOCK_ADC_PAD2),
-        EMU1010_ADC_PADS("ADC3 14dB PAD Audio Dock Capture Switch", EMU_HANA_DOCK_ADC_PAD3),
-        EMU1010_ADC_PADS("ADC1 14dB PAD 0202 Capture Switch", EMU_HANA_0202_ADC_PAD1),
+        return change;
+}
+
+static const struct snd_kcontrol_new emu1010_adc_pads_ctl = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+        .info = snd_emu1010_adc_pads_info,
+        .get = snd_emu1010_adc_pads_get,
+        .put = snd_emu1010_adc_pads_put
+};
+
+
+static const char * const snd_emu1010_dac_pads[] = {
+        "DAC1 0202 14dB PAD Playback Switch",
+        "DAC1 Audio Dock 14dB PAD Playback Switch",
+        "DAC2 Audio Dock 14dB PAD Playback Switch",
+        "DAC3 Audio Dock 14dB PAD Playback Switch",
+        "DAC4 Audio Dock 14dB PAD Playback Switch",
+};
+
+static const unsigned short snd_emu1010_dac_regs[] = {
+        EMU_HANA_0202_DAC_PAD1,
+        EMU_HANA_DOCK_DAC_PAD1,
+        EMU_HANA_DOCK_DAC_PAD2,
+        EMU_HANA_DOCK_DAC_PAD3,
+        EMU_HANA_DOCK_DAC_PAD4,
 };
 
@@ -626 +812 @@
 {
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-        unsigned int mask = kcontrol->private_value & 0xff;
+        unsigned int mask = snd_emu1010_dac_regs[kcontrol->private_value];
+
         ucontrol->value.integer.value[0] = (emu->emu1010.dac_pads & mask) ? 1 : 0;
         return 0;
@@ -634 +821 @@
 {
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-        unsigned int mask = kcontrol->private_value & 0xff;
+        unsigned int mask = snd_emu1010_dac_regs[kcontrol->private_value];
         unsigned int val, cache;
+        int change;
+
         val = ucontrol->value.integer.value[0];
         cache = emu->emu1010.dac_pads;
@@ -642 +831 @@
         else
                 cache = cache & ~mask;
-        if (cache != emu->emu1010.dac_pads) {
+        change = (cache != emu->emu1010.dac_pads);
+        if (change) {
                 snd_emu1010_fpga_write(emu, EMU_HANA_DAC_PADS, cache );
                 emu->emu1010.dac_pads = cache;
         }
 
-        return 0;
-}
-
-
-
-#define EMU1010_DAC_PADS(xname,chid) \
-{                                                               \
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
-        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,              \
-        .info =  snd_emu1010_dac_pads_info,                     \
-        .get =   snd_emu1010_dac_pads_get,                      \
-        .put =   snd_emu1010_dac_pads_put,                      \
-        .private_value = chid                                   \
-}
-
-static const struct snd_kcontrol_new snd_emu1010_dac_pads[] = {
-        EMU1010_DAC_PADS("DAC1 Audio Dock 14dB PAD Playback Switch", EMU_HANA_DOCK_DAC_PAD1),
-        EMU1010_DAC_PADS("DAC2 Audio Dock 14dB PAD Playback Switch", EMU_HANA_DOCK_DAC_PAD2),
-        EMU1010_DAC_PADS("DAC3 Audio Dock 14dB PAD Playback Switch", EMU_HANA_DOCK_DAC_PAD3),
-        EMU1010_DAC_PADS("DAC4 Audio Dock 14dB PAD Playback Switch", EMU_HANA_DOCK_DAC_PAD4),
-        EMU1010_DAC_PADS("DAC1 0202 14dB PAD Playback Switch", EMU_HANA_0202_DAC_PAD1),
-};
-
-
-static int snd_emu1010_internal_clock_info(struct snd_kcontrol *kcontrol,
+        return change;
+}
+
+static const struct snd_kcontrol_new emu1010_dac_pads_ctl = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+        .info = snd_emu1010_dac_pads_info,
+        .get = snd_emu1010_dac_pads_get,
+        .put = snd_emu1010_dac_pads_put
+};
+
+
+struct snd_emu1010_pads_info {
+        const char * const *adc_ctls, * const *dac_ctls;
+        unsigned n_adc_ctls, n_dac_ctls;
+};
+
+static const struct snd_emu1010_pads_info emu1010_pads_info[] = {
+        {
+                /* rev1 1010 */
+                .adc_ctls = snd_emu1010_adc_pads,
+                .n_adc_ctls = ARRAY_SIZE(snd_emu1010_adc_pads),
+                .dac_ctls = snd_emu1010_dac_pads,
+                .n_dac_ctls = ARRAY_SIZE(snd_emu1010_dac_pads),
+        },
+        {
+                /* rev2 1010 */
+                .adc_ctls = snd_emu1010_adc_pads,
+                .n_adc_ctls = ARRAY_SIZE(snd_emu1010_adc_pads) - 1,
+                .dac_ctls = snd_emu1010_dac_pads,
+                .n_dac_ctls = ARRAY_SIZE(snd_emu1010_dac_pads) - 1,
+        },
+        {
+                /* 1616(m) cardbus */
+                .adc_ctls = snd_emu1010_adc_pads + 1,
+                .n_adc_ctls = ARRAY_SIZE(snd_emu1010_adc_pads) - 2,
+                .dac_ctls = snd_emu1010_dac_pads + 1,
+                .n_dac_ctls = ARRAY_SIZE(snd_emu1010_dac_pads) - 2,
+        },
+        {
+                /* 0404 */
+                .adc_ctls = NULL,
+                .n_adc_ctls = 0,
+                .dac_ctls = NULL,
+                .n_dac_ctls = 0,
+        },
+};
+
+static const char * const emu1010_clock_texts[] = {
+        "44100", "48000", "SPDIF", "ADAT", "Dock", "BNC"
+};
+
+static const u8 emu1010_clock_vals[] = {
+        EMU_HANA_WCLOCK_INT_44_1K,
+        EMU_HANA_WCLOCK_INT_48K,
+        EMU_HANA_WCLOCK_HANA_SPDIF_IN,
+        EMU_HANA_WCLOCK_HANA_ADAT_IN,
+        EMU_HANA_WCLOCK_2ND_HANA,
+        EMU_HANA_WCLOCK_SYNC_BNC,
+};
+
+static const char * const emu0404_clock_texts[] = {
+        "44100", "48000", "SPDIF", "BNC"
+};
+
+static const u8 emu0404_clock_vals[] = {
+        EMU_HANA_WCLOCK_INT_44_1K,
+        EMU_HANA_WCLOCK_INT_48K,
+        EMU_HANA_WCLOCK_HANA_SPDIF_IN,
+        EMU_HANA_WCLOCK_SYNC_BNC,
+};
+
+struct snd_emu1010_clock_info {
+        const char * const *texts;
+        const u8 *vals;
+        unsigned num;
+};
+
+static const struct snd_emu1010_clock_info emu1010_clock_info[] = {
+        {
+                // rev1 1010
+                .texts = emu1010_clock_texts,
+                .vals = emu1010_clock_vals,
+                .num = ARRAY_SIZE(emu1010_clock_vals),
+        },
+        {
+                // rev2 1010
+                .texts = emu1010_clock_texts,
+                .vals = emu1010_clock_vals,
+                .num = ARRAY_SIZE(emu1010_clock_vals) - 1,
+        },
+        {
+                // 1616(m) CardBus
+                .texts = emu1010_clock_texts,
+                // TODO: determine what is actually available.
+                // Pedantically, *every* source comes from the 2nd FPGA, as the
+                // card itself has no own (digital) audio ports. The user manual
+                // claims that ADAT and S/PDIF clock sources are separate, which
+                // can mean two things: either E-MU mapped the dock's sources to
+                // the primary ones, or they determine the meaning of the "Dock"
+                // source depending on how the ports are actually configured
+                // (which the 2nd FPGA must be doing anyway).
+                .vals = emu1010_clock_vals,
+                .num = ARRAY_SIZE(emu1010_clock_vals),
+        },
+        {
+                // 0404
+                .texts = emu0404_clock_texts,
+                .vals = emu0404_clock_vals,
+                .num = ARRAY_SIZE(emu0404_clock_vals),
+        },
+};
+
+static int snd_emu1010_clock_source_info(struct snd_kcontrol *kcontrol,
                                           struct snd_ctl_elem_info *uinfo)
 {
-        static const char * const texts[4] = {
-                "44100", "48000", "SPDIF", "ADAT"
-        };
+        struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+        const struct snd_emu1010_clock_info *emu_ci =
+                &emu1010_clock_info[emu1010_idx(emu)];
                 
-        return snd_ctl_enum_info(uinfo, 1, 4, texts);
-}
-
-static int snd_emu1010_internal_clock_get(struct snd_kcontrol *kcontrol,
+        return snd_ctl_enum_info(uinfo, 1, emu_ci->num, emu_ci->texts);
+}
+
+static int snd_emu1010_clock_source_get(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
 
-        ucontrol->value.enumerated.item[0] = emu->emu1010.internal_clock;
-        return 0;
-}
-
-static int snd_emu1010_internal_clock_put(struct snd_kcontrol *kcontrol,
+        ucontrol->value.enumerated.item[0] = emu->emu1010.clock_source;
+        return 0;
+}
+
+static int snd_emu1010_clock_source_put(struct snd_kcontrol *kcontrol,
                                         struct snd_ctl_elem_value *ucontrol)
 {
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+        const struct snd_emu1010_clock_info *emu_ci =
+                &emu1010_clock_info[emu1010_idx(emu)];
         unsigned int val;
         int change = 0;
 
         val = ucontrol->value.enumerated.item[0] ;
-        /* Limit: uinfo->value.enumerated.items = 4; */
-        if (val >= 4)
+        if (val >= emu_ci->num)
                 return -EINVAL;
-        change = (emu->emu1010.internal_clock != val);
+        spin_lock_irq(&emu->reg_lock);
+        change = (emu->emu1010.clock_source != val);
         if (change) {
-                emu->emu1010.internal_clock = val;
-                switch (val) {
-                case 0:
-                        /* 44100 */
-                        /* Mute all */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE );
-                        /* Default fallback clock 48kHz */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_44_1K );
-                        /* Word Clock source, Internal 44.1kHz x1 */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK,
-                        EMU_HANA_WCLOCK_INT_44_1K | EMU_HANA_WCLOCK_1X );
-                        /* Set LEDs on Audio Dock */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2,
-                                EMU_HANA_DOCK_LEDS_2_44K | EMU_HANA_DOCK_LEDS_2_LOCK );
-                        /* Allow DLL to settle */
-                        msleep(10);
-                        /* Unmute all */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );
-                        break;
-                case 1:
-                        /* 48000 */
-                        /* Mute all */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE );
-                        /* Default fallback clock 48kHz */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_48K );
-                        /* Word Clock source, Internal 48kHz x1 */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK,
-                                EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_1X );
-                        /* Set LEDs on Audio Dock */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2,
-                                EMU_HANA_DOCK_LEDS_2_48K | EMU_HANA_DOCK_LEDS_2_LOCK );
-                        /* Allow DLL to settle */
-                        msleep(10);
-                        /* Unmute all */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );
-                        break;
-                        
-                case 2: /* Take clock from S/PDIF IN */
-                        /* Mute all */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE );
-                        /* Default fallback clock 48kHz */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_48K );
-                        /* Word Clock source, sync to S/PDIF input */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK,
-                                EMU_HANA_WCLOCK_HANA_SPDIF_IN | EMU_HANA_WCLOCK_1X );
-                        /* Set LEDs on Audio Dock */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2,
-                                EMU_HANA_DOCK_LEDS_2_EXT | EMU_HANA_DOCK_LEDS_2_LOCK );
-                        /* FIXME: We should set EMU_HANA_DOCK_LEDS_2_LOCK only when clock signal is present and valid */        
-                        /* Allow DLL to settle */
-                        msleep(10);
-                        /* Unmute all */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );
-                        break;
-                
-                case 3:                         
-                        /* Take clock from ADAT IN */
-                        /* Mute all */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE );
-                        /* Default fallback clock 48kHz */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, EMU_HANA_DEFCLOCK_48K );
-                        /* Word Clock source, sync to ADAT input */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK,
-                                EMU_HANA_WCLOCK_HANA_ADAT_IN | EMU_HANA_WCLOCK_1X );
-                        /* Set LEDs on Audio Dock */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, EMU_HANA_DOCK_LEDS_2_EXT | EMU_HANA_DOCK_LEDS_2_LOCK );
-                        /* FIXME: We should set EMU_HANA_DOCK_LEDS_2_LOCK only when clock signal is present and valid */        
-                        /* Allow DLL to settle */
-                        msleep(10);
-                        /*   Unmute all */
-                        snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );
-                         
-                        
-                        break;          
-                }
-        }
-        return change;
-}
-
-static const struct snd_kcontrol_new snd_emu1010_internal_clock =
-{
-        .access =       SNDRV_CTL_ELEM_ACCESS_READWRITE,
-        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name =         "Clock Internal Rate",
-        .count =        1,
-        .info =         snd_emu1010_internal_clock_info,
-        .get =          snd_emu1010_internal_clock_get,
-        .put =          snd_emu1010_internal_clock_put
+                emu->emu1010.clock_source = val;
+                emu->emu1010.wclock = emu_ci->vals[val];
+                snd_emu1010_update_clock(emu);
+
+                snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_MUTE);
+                snd_emu1010_fpga_write(emu, EMU_HANA_WCLOCK, emu->emu1010.wclock);
+                spin_unlock_irq(&emu->reg_lock);
+
+                msleep(10);  // Allow DLL to settle
+                snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);
+        } else {
+                spin_unlock_irq(&emu->reg_lock);
+        }
+        return change;
+}
+
+static const struct snd_kcontrol_new snd_emu1010_clock_source =
+{
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Clock Source",
+        .count = 1,
+        .info = snd_emu1010_clock_source_info,
+        .get = snd_emu1010_clock_source_get,
+        .put = snd_emu1010_clock_source_put
+};
+
+static int snd_emu1010_clock_fallback_info(struct snd_kcontrol *kcontrol,
+                                          struct snd_ctl_elem_info *uinfo)
+{
+        static const char * const texts[2] = {
+                "44100", "48000"
+        };
+
+        return snd_ctl_enum_info(uinfo, 1, 2, texts);
+}
+
+static int snd_emu1010_clock_fallback_get(struct snd_kcontrol *kcontrol,
+                                          struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = emu->emu1010.clock_fallback;
+        return 0;
+}
+
+static int snd_emu1010_clock_fallback_put(struct snd_kcontrol *kcontrol,
+                                          struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+        unsigned int val = ucontrol->value.enumerated.item[0];
+        int change;
+
+        if (val >= 2)
+                return -EINVAL;
+        change = (emu->emu1010.clock_fallback != val);
+        if (change) {
+                emu->emu1010.clock_fallback = val;
+                snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 1 - val);
+        }
+        return change;
+}
+
+static const struct snd_kcontrol_new snd_emu1010_clock_fallback =
+{
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE,
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Clock Fallback",
+        .count = 1,
+        .info = snd_emu1010_clock_fallback_info,
+        .get = snd_emu1010_clock_fallback_get,
+        .put = snd_emu1010_clock_fallback_put
 };
 
@@ -827 +1092 @@
         if (change) {
                 emu->emu1010.optical_out = val;
-                tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0) |
-                        (emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0);
+                tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : EMU_HANA_OPTICAL_IN_SPDIF) |
+                        (emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : EMU_HANA_OPTICAL_OUT_SPDIF);
                 snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp);
         }
@@ -878 +1143 @@
         if (change) {
                 emu->emu1010.optical_in = val;
-                tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : 0) |
-                        (emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : 0);
+                tmp = (emu->emu1010.optical_in ? EMU_HANA_OPTICAL_IN_ADAT : EMU_HANA_OPTICAL_IN_SPDIF) |
+                        (emu->emu1010.optical_out ? EMU_HANA_OPTICAL_OUT_ADAT : EMU_HANA_OPTICAL_OUT_SPDIF);
                 snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, tmp);
         }
@@ -925 +1190 @@
         unsigned int source_id;
         unsigned int ngain, ogain;
-        u32 gpio;
+        u16 gpio;
         int change = 0;
-        unsigned long flags;
         u32 source;
         /* If the capture source has changed,
@@ -941 +1205 @@
         if (change) {
                 snd_emu10k1_i2c_write(emu, ADC_MUX, 0); /* Mute input */
-                spin_lock_irqsave(&emu->emu_lock, flags);
-                gpio = inl(emu->port + A_IOCFG);
+                spin_lock_irq(&emu->emu_lock);
+                gpio = inw(emu->port + A_IOCFG);
                 if (source_id==0)
-                        outl(gpio | 0x4, emu->port + A_IOCFG);
+                        outw(gpio | 0x4, emu->port + A_IOCFG);
                 else
-                        outl(gpio & ~0x4, emu->port + A_IOCFG);
-                spin_unlock_irqrestore(&emu->emu_lock, flags);
+                        outw(gpio & ~0x4, emu->port + A_IOCFG);
+                spin_unlock_irq(&emu->emu_lock);
 
                 ngain = emu->i2c_capture_volume[source_id][0]; /* Left */
@@ -1006 +1270 @@
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
         unsigned int ogain;
-        unsigned int ngain;
+        unsigned int ngain0, ngain1;
         unsigned int source_id;
         int change = 0;
@@ -1015 +1279 @@
         if (source_id >= 2)
                 return -EINVAL;
+        ngain0 = ucontrol->value.integer.value[0];
+        ngain1 = ucontrol->value.integer.value[1];
+        if (ngain0 > 0xff)
+                return -EINVAL;
+        if (ngain1 > 0xff)
+                return -EINVAL;
         ogain = emu->i2c_capture_volume[source_id][0]; /* Left */
-        ngain = ucontrol->value.integer.value[0];
-        if (ngain > 0xff)
-                return 0;
-        if (ogain != ngain) {
+        if (ogain != ngain0) {
                 if (emu->i2c_capture_source == source_id)
-                        snd_emu10k1_i2c_write(emu, ADC_ATTEN_ADCL, ((ngain) & 0xff) );
-                emu->i2c_capture_volume[source_id][0] = ngain;
+                        snd_emu10k1_i2c_write(emu, ADC_ATTEN_ADCL, ngain0);
+                emu->i2c_capture_volume[source_id][0] = ngain0;
                 change = 1;
         }
         ogain = emu->i2c_capture_volume[source_id][1]; /* Right */
-        ngain = ucontrol->value.integer.value[1];
-        if (ngain > 0xff)
-                return 0;
-        if (ogain != ngain) {
+        if (ogain != ngain1) {
                 if (emu->i2c_capture_source == source_id)
-                        snd_emu10k1_i2c_write(emu, ADC_ATTEN_ADCR, ((ngain) & 0xff));
-                emu->i2c_capture_volume[source_id][1] = ngain;
+                        snd_emu10k1_i2c_write(emu, ADC_ATTEN_ADCR, ngain1);
+                emu->i2c_capture_volume[source_id][1] = ngain1;
                 change = 1;
         }
@@ -1039 +1303 @@
 }
 
-#define I2C_VOLUME(xname,chid) \
-{                                                               \
-        .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
-        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |             \
-                  SNDRV_CTL_ELEM_ACCESS_TLV_READ,               \
-        .info =  snd_audigy_i2c_volume_info,                    \
-        .get =   snd_audigy_i2c_volume_get,                     \
-        .put =   snd_audigy_i2c_volume_put,                     \
-        .tlv = { .p = snd_audigy_db_scale2 },                   \
-        .private_value = chid                                   \
-}
-
-
-static const struct snd_kcontrol_new snd_audigy_i2c_volume_ctls[] = {
-        I2C_VOLUME("Mic Capture Volume", 0),
-        I2C_VOLUME("Line Capture Volume", 0)
+static const struct snd_kcontrol_new i2c_volume_ctl = {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
+                  SNDRV_CTL_ELEM_ACCESS_TLV_READ,
+        .info = snd_audigy_i2c_volume_info,
+        .get = snd_audigy_i2c_volume_get,
+        .put = snd_audigy_i2c_volume_put,
+        .tlv = { .p = snd_audigy_db_scale2 }
+};
+
+static const char * const snd_audigy_i2c_volume_ctls[] = {
+        "Mic Capture Volume",
+        "Line Capture Volume",
 };
 
@@ -1070 +1331 @@
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
         unsigned int tmp;
-        unsigned long flags;
-        
-
-        spin_lock_irqsave(&emu->reg_lock, flags);
+
         tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);
         switch (tmp & A_SPDIF_RATE_MASK) {
@@ -1088 +1346 @@
                 ucontrol->value.enumerated.item[0] = 1;
         }
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
         return 0;
 }
@@ -1098 +1355 @@
         int change;
         unsigned int reg, val, tmp;
-        unsigned long flags;
 
         switch(ucontrol->value.enumerated.item[0]) {
@@ -1116 +1372 @@
 
         
-        spin_lock_irqsave(&emu->reg_lock, flags);
+        spin_lock_irq(&emu->reg_lock);
         reg = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);
         tmp = reg & ~A_SPDIF_RATE_MASK;
@@ -1123 +1379 @@
         if (change)
                 snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, 0, tmp);
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
+        spin_unlock_irq(&emu->reg_lock);
         return change;
 }
@@ -1146 +1402 @@
         int change;
         unsigned int val;
-        unsigned long flags;
 
         /* Limit: emu->spdif_bits */
@@ -1155 +1410 @@
               (ucontrol->value.iec958.status[2] << 16) |
               (ucontrol->value.iec958.status[3] << 24);
-        spin_lock_irqsave(&emu->reg_lock, flags);
         change = val != emu->spdif_bits[idx];
         if (change) {
@@ -1161 +1415 @@
                 emu->spdif_bits[idx] = val;
         }
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
         return change;
 }
@@ -1189 +1442 @@
 {
         if (emu->audigy) {
-                snd_emu10k1_ptr_write(emu, A_FXRT1, voice,
-                                      snd_emu10k1_compose_audigy_fxrt1(route));
-                snd_emu10k1_ptr_write(emu, A_FXRT2, voice,
-                                      snd_emu10k1_compose_audigy_fxrt2(route));
+                snd_emu10k1_ptr_write_multiple(emu, voice,
+                        A_FXRT1, snd_emu10k1_compose_audigy_fxrt1(route),
+                        A_FXRT2, snd_emu10k1_compose_audigy_fxrt2(route),
+                        REGLIST_END);
         } else {
                 snd_emu10k1_ptr_write(emu, FXRT, voice,
@@ -1206 +1459 @@
         snd_emu10k1_ptr_write(emu, DSL_FXSENDAMOUNT_D, voice, volume[3]);
         if (emu->audigy) {
-                unsigned int val = ((unsigned int)volume[4] << 24) |
-                        ((unsigned int)volume[5] << 16) |
-                        ((unsigned int)volume[6] << 8) |
-                        (unsigned int)volume[7];
-                snd_emu10k1_ptr_write(emu, A_SENDAMOUNTS, voice, val);
+                snd_emu10k1_ptr_write(emu, A_SENDAMOUNTS, voice,
+                                      snd_emu10k1_compose_audigy_sendamounts(volume));
         }
 }
@@ -1229 +1479 @@
                                         struct snd_ctl_elem_value *ucontrol)
 {
-        unsigned long flags;
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
         struct snd_emu10k1_pcm_mixer *mix =
@@ -1237 +1486 @@
         int mask = emu->audigy ? 0x3f : 0x0f;
 
-        spin_lock_irqsave(&emu->reg_lock, flags);
         for (voice = 0; voice < 3; voice++)
                 for (idx = 0; idx < num_efx; idx++)
                         ucontrol->value.integer.value[(voice * num_efx) + idx] = 
                                 mix->send_routing[voice][idx] & mask;
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
         return 0;
 }
@@ -1249 +1496 @@
                                         struct snd_ctl_elem_value *ucontrol)
 {
-        unsigned long flags;
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
         struct snd_emu10k1_pcm_mixer *mix =
@@ -1257 +1503 @@
         int mask = emu->audigy ? 0x3f : 0x0f;
 
-        spin_lock_irqsave(&emu->reg_lock, flags);
+        spin_lock_irq(&emu->reg_lock);
         for (voice = 0; voice < 3; voice++)
                 for (idx = 0; idx < num_efx; idx++) {
@@ -1266 +1512 @@
                         }
                 }       
-        if (change && mix->epcm) {
-                if (mix->epcm->voices[0] && mix->epcm->voices[1]) {
+        if (change && mix->epcm && mix->epcm->voices[0]) {
+                if (!mix->epcm->voices[0]->last) {
                         update_emu10k1_fxrt(emu, mix->epcm->voices[0]->number,
                                             &mix->send_routing[1][0]);
-                        update_emu10k1_fxrt(emu, mix->epcm->voices[1]->number,
+                        update_emu10k1_fxrt(emu, mix->epcm->voices[0]->number + 1,
                                             &mix->send_routing[2][0]);
-                } else if (mix->epcm->voices[0]) {
+                } else {
                         update_emu10k1_fxrt(emu, mix->epcm->voices[0]->number,
                                             &mix->send_routing[0][0]);
                 }
         }
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
+        spin_unlock_irq(&emu->reg_lock);
         return change;
 }
@@ -1305 +1551 @@
                                        struct snd_ctl_elem_value *ucontrol)
 {
-        unsigned long flags;
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
         struct snd_emu10k1_pcm_mixer *mix =
@@ -1312 +1557 @@
         int num_efx = emu->audigy ? 8 : 4;
 
-        spin_lock_irqsave(&emu->reg_lock, flags);
         for (idx = 0; idx < 3*num_efx; idx++)
                 ucontrol->value.integer.value[idx] = mix->send_volume[idx/num_efx][idx%num_efx];
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
         return 0;
 }
@@ -1322 +1565 @@
                                        struct snd_ctl_elem_value *ucontrol)
 {
-        unsigned long flags;
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
         struct snd_emu10k1_pcm_mixer *mix =
@@ -1329 +1571 @@
         int num_efx = emu->audigy ? 8 : 4;
 
-        spin_lock_irqsave(&emu->reg_lock, flags);
+        spin_lock_irq(&emu->reg_lock);
         for (idx = 0; idx < 3*num_efx; idx++) {
                 val = ucontrol->value.integer.value[idx] & 255;
@@ -1337 +1579 @@
                 }
         }
-        if (change && mix->epcm) {
-                if (mix->epcm->voices[0] && mix->epcm->voices[1]) {
+        if (change && mix->epcm && mix->epcm->voices[0]) {
+                if (!mix->epcm->voices[0]->last) {
                         update_emu10k1_send_volume(emu, mix->epcm->voices[0]->number,
                                                    &mix->send_volume[1][0]);
-                        update_emu10k1_send_volume(emu, mix->epcm->voices[1]->number,
+                        update_emu10k1_send_volume(emu, mix->epcm->voices[0]->number + 1,
                                                    &mix->send_volume[2][0]);
-                } else if (mix->epcm->voices[0]) {
+                } else {
                         update_emu10k1_send_volume(emu, mix->epcm->voices[0]->number,
                                                    &mix->send_volume[0][0]);
                 }
         }
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
+        spin_unlock_irq(&emu->reg_lock);
         return change;
 }
@@ -1368 +1610 @@
         uinfo->count = 3;
         uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 0xffff;
+        uinfo->value.integer.max = 0x1fffd;
         return 0;
 }
@@ -1378 +1620 @@
         struct snd_emu10k1_pcm_mixer *mix =
                 &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
-        unsigned long flags;
         int idx;
 
-        spin_lock_irqsave(&emu->reg_lock, flags);
         for (idx = 0; idx < 3; idx++)
-                ucontrol->value.integer.value[idx] = mix->attn[idx];
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
+                ucontrol->value.integer.value[idx] = mix->attn[idx] * 0xffffU / 0x8000U;
         return 0;
 }
@@ -1391 +1630 @@
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        unsigned long flags;
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
         struct snd_emu10k1_pcm_mixer *mix =
@@ -1397 +1635 @@
         int change = 0, idx, val;
 
-        spin_lock_irqsave(&emu->reg_lock, flags);
+        spin_lock_irq(&emu->reg_lock);
         for (idx = 0; idx < 3; idx++) {
-                val = ucontrol->value.integer.value[idx] & 0xffff;
+                unsigned uval = ucontrol->value.integer.value[idx] & 0x1ffff;
+                val = uval * 0x8000U / 0xffffU;
                 if (mix->attn[idx] != val) {
                         mix->attn[idx] = val;
@@ -1405 +1644 @@
                 }
         }
-        if (change && mix->epcm) {
-                if (mix->epcm->voices[0] && mix->epcm->voices[1]) {
+        if (change && mix->epcm && mix->epcm->voices[0]) {
+                if (!mix->epcm->voices[0]->last) {
                         snd_emu10k1_ptr_write(emu, VTFT_VOLUMETARGET, mix->epcm->voices[0]->number, mix->attn[1]);
-                        snd_emu10k1_ptr_write(emu, VTFT_VOLUMETARGET, mix->epcm->voices[1]->number, mix->attn[2]);
-                } else if (mix->epcm->voices[0]) {
+                        snd_emu10k1_ptr_write(emu, VTFT_VOLUMETARGET, mix->epcm->voices[0]->number + 1, mix->attn[2]);
+                } else {
                         snd_emu10k1_ptr_write(emu, VTFT_VOLUMETARGET, mix->epcm->voices[0]->number, mix->attn[0]);
                 }
         }
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
+        spin_unlock_irq(&emu->reg_lock);
         return change;
 }
@@ -1443 +1682 @@
                                         struct snd_ctl_elem_value *ucontrol)
 {
-        unsigned long flags;
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
         struct snd_emu10k1_pcm_mixer *mix =
@@ -1451 +1689 @@
         int mask = emu->audigy ? 0x3f : 0x0f;
 
-        spin_lock_irqsave(&emu->reg_lock, flags);
         for (idx = 0; idx < num_efx; idx++)
                 ucontrol->value.integer.value[idx] = 
                         mix->send_routing[0][idx] & mask;
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
         return 0;
 }
@@ -1462 +1698 @@
                                         struct snd_ctl_elem_value *ucontrol)
 {
-        unsigned long flags;
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
         int ch = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
@@ -1470 +1705 @@
         int mask = emu->audigy ? 0x3f : 0x0f;
 
-        spin_lock_irqsave(&emu->reg_lock, flags);
+        spin_lock_irq(&emu->reg_lock);
         for (idx = 0; idx < num_efx; idx++) {
                 val = ucontrol->value.integer.value[idx] & mask;
@@ -1485 +1720 @@
                 }
         }
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
+        spin_unlock_irq(&emu->reg_lock);
         return change;
 }
@@ -1513 +1748 @@
                                        struct snd_ctl_elem_value *ucontrol)
 {
-        unsigned long flags;
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
         struct snd_emu10k1_pcm_mixer *mix =
@@ -1520 +1754 @@
         int num_efx = emu->audigy ? 8 : 4;
 
-        spin_lock_irqsave(&emu->reg_lock, flags);
         for (idx = 0; idx < num_efx; idx++)
                 ucontrol->value.integer.value[idx] = mix->send_volume[0][idx];
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
         return 0;
 }
@@ -1530 +1762 @@
                                        struct snd_ctl_elem_value *ucontrol)
 {
-        unsigned long flags;
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
         int ch = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
@@ -1537 +1768 @@
         int num_efx = emu->audigy ? 8 : 4;
 
-        spin_lock_irqsave(&emu->reg_lock, flags);
+        spin_lock_irq(&emu->reg_lock);
         for (idx = 0; idx < num_efx; idx++) {
                 val = ucontrol->value.integer.value[idx] & 255;
@@ -1551 +1782 @@
                 }
         }
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
+        spin_unlock_irq(&emu->reg_lock);
         return change;
 }
@@ -1572 +1803 @@
         uinfo->count = 1;
         uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 0xffff;
+        uinfo->value.integer.max = 0x1fffd;
         return 0;
 }
@@ -1582 +1813 @@
         struct snd_emu10k1_pcm_mixer *mix =
                 &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
-        unsigned long flags;
-
-        spin_lock_irqsave(&emu->reg_lock, flags);
-        ucontrol->value.integer.value[0] = mix->attn[0];
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
+
+        ucontrol->value.integer.value[0] = mix->attn[0] * 0xffffU / 0x8000U;
         return 0;
 }
@@ -1593 +1821 @@
                                 struct snd_ctl_elem_value *ucontrol)
 {
-        unsigned long flags;
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
         int ch = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
         struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[ch];
         int change = 0, val;
-
-        spin_lock_irqsave(&emu->reg_lock, flags);
-        val = ucontrol->value.integer.value[0] & 0xffff;
+        unsigned uval;
+
+        spin_lock_irq(&emu->reg_lock);
+        uval = ucontrol->value.integer.value[0] & 0x1ffff;
+        val = uval * 0x8000U / 0xffffU;
         if (mix->attn[0] != val) {
                 mix->attn[0] = val;
@@ -1610 +1839 @@
                 }
         }
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
+        spin_unlock_irq(&emu->reg_lock);
         return change;
 }
@@ -1633 +1862 @@
 
         if (emu->audigy)
-                ucontrol->value.integer.value[0] = inl(emu->port + A_IOCFG) & A_IOCFG_GPOUT0 ? 1 : 0;
+                ucontrol->value.integer.value[0] = inw(emu->port + A_IOCFG) & A_IOCFG_GPOUT0 ? 1 : 0;
         else
                 ucontrol->value.integer.value[0] = inl(emu->port + HCFG) & HCFG_GPOUT0 ? 1 : 0;
@@ -1646 +1875 @@
                                         struct snd_ctl_elem_value *ucontrol)
 {
-        unsigned long flags;
         struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
         unsigned int reg, val, sw;
@@ -1654 +1882 @@
         if (emu->card_capabilities->invert_shared_spdif)
                 sw = !sw;
-        spin_lock_irqsave(&emu->reg_lock, flags);
+        spin_lock_irq(&emu->emu_lock);
         if ( emu->card_capabilities->i2c_adc) {
                 /* Do nothing for Audigy 2 ZS Notebook */
         } else if (emu->audigy) {
-                reg = inl(emu->port + A_IOCFG);
+                reg = inw(emu->port + A_IOCFG);
                 val = sw ? A_IOCFG_GPOUT0 : 0;
                 change = (reg & A_IOCFG_GPOUT0) != val;
@@ -1664 +1892 @@
                         reg &= ~A_IOCFG_GPOUT0;
                         reg |= val;
-                        outl(reg | val, emu->port + A_IOCFG);
+                        outw(reg | val, emu->port + A_IOCFG);
                 }
         }
@@ -1675 +1903 @@
                 outl(reg | val, emu->port + HCFG);
         }
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
+        spin_unlock_irq(&emu->emu_lock);
         return change;
 }
@@ -1755 +1983 @@
 }
 
-static struct snd_kcontrol *ctl_find(struct snd_card *card, const char *name)
-{
-        struct snd_ctl_elem_id sid;
-        memset(&sid, 0, sizeof(sid));
-        strcpy(sid.name, name);
-        sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-        return snd_ctl_find_id(card, &sid);
-}
-
 static int rename_ctl(struct snd_card *card, const char *src, const char *dst)
 {
-        struct snd_kcontrol *kctl = ctl_find(card, src);
+        struct snd_kcontrol *kctl = snd_ctl_find_id_mixer(card, src);
         if (kctl) {
-                strcpy(kctl->id.name, dst);
+                snd_ctl_rename(card, kctl, dst);
                 return 0;
         }
@@ -1777 +1996 @@
                       int pcm_device, int multi_device)
 {
-        int err, pcm;
+        int err;
         struct snd_kcontrol *kctl;
         struct snd_card *card = emu->card;
@@ -2041 +2260 @@
                 return err;
 
-        /* initialize the routing and volume table for each pcm playback stream */
-        for (pcm = 0; pcm < 32; pcm++) {
-                struct snd_emu10k1_pcm_mixer *mix;
-                int v;
-                
-                mix = &emu->pcm_mixer[pcm];
-                mix->epcm = NULL;
-
-                for (v = 0; v < 4; v++)
-                        mix->send_routing[0][v] = 
-                                mix->send_routing[1][v] = 
-                                mix->send_routing[2][v] = v;
-                
-                memset(&mix->send_volume, 0, sizeof(mix->send_volume));
-                mix->send_volume[0][0] = mix->send_volume[0][1] =
-                mix->send_volume[1][0] = mix->send_volume[2][1] = 255;
-                
-                mix->attn[0] = mix->attn[1] = mix->attn[2] = 0xffff;
-        }
-        
-        /* initialize the routing and volume table for the multichannel playback stream */
-        for (pcm = 0; pcm < NUM_EFX_PLAYBACK; pcm++) {
-                struct snd_emu10k1_pcm_mixer *mix;
-                int v;
-                
-                mix = &emu->efx_pcm_mixer[pcm];
-                mix->epcm = NULL;
-
-                mix->send_routing[0][0] = pcm;
-                mix->send_routing[0][1] = (pcm == 0) ? 1 : 0;
-                for (v = 0; v < 2; v++)
-                        mix->send_routing[0][2+v] = 13+v;
-                if (emu->audigy)
-                        for (v = 0; v < 4; v++)
-                                mix->send_routing[0][4+v] = 60+v;
-                
-                memset(&mix->send_volume, 0, sizeof(mix->send_volume));
-                mix->send_volume[0][0]  = 255;
-                
-                mix->attn[0] = 0xffff;
-        }
-        
-        if (! emu->card_capabilities->ecard) { /* FIXME: APS has these controls? */
+        if (!emu->card_capabilities->ecard && !emu->card_capabilities->emu_model) {
                 /* sb live! and audigy */
                 kctl = snd_ctl_new1(&snd_emu10k1_spdif_mask_control, emu);
@@ -2135 +2312 @@
         }
 
-        if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616) {
-                /* 1616(m) cardbus */
-                int i;
-
-                for (i = 0; i < ARRAY_SIZE(snd_emu1616_output_enum_ctls); i++) {
+        if (emu->card_capabilities->emu_model) {
+                unsigned i, emu_idx = emu1010_idx(emu);
+                const struct snd_emu1010_routing_info *emu_ri =
+                        &emu1010_routing_info[emu_idx];
+                const struct snd_emu1010_pads_info *emu_pi = &emu1010_pads_info[emu_idx];
+
+                for (i = 0; i < emu_ri->n_ins; i++)
+                        emu->emu1010.input_source[i] =
+                                emu1010_map_source(emu_ri, emu_ri->in_dflts[i]);
+                for (i = 0; i < emu_ri->n_outs; i++)
+                        emu->emu1010.output_source[i] =
+                                emu1010_map_source(emu_ri, emu_ri->out_dflts[i]);
+                snd_emu1010_apply_sources(emu);
+
+                kctl = emu->ctl_clock_source = snd_ctl_new1(&snd_emu1010_clock_source, emu);
+                err = snd_ctl_add(card, kctl);
+                if (err < 0)
+                        return err;
+                err = snd_ctl_add(card,
+                        snd_ctl_new1(&snd_emu1010_clock_fallback, emu));
+                if (err < 0)
+                        return err;
+
+                err = add_ctls(emu, &emu1010_adc_pads_ctl,
+                               emu_pi->adc_ctls, emu_pi->n_adc_ctls);
+                if (err < 0)
+                        return err;
+                err = add_ctls(emu, &emu1010_dac_pads_ctl,
+                               emu_pi->dac_ctls, emu_pi->n_dac_ctls);
+                if (err < 0)
+                        return err;
+
+                if (!emu->card_capabilities->no_adat) {
                         err = snd_ctl_add(card,
-                                snd_ctl_new1(&snd_emu1616_output_enum_ctls[i],
-                                             emu));
+                                snd_ctl_new1(&snd_emu1010_optical_out, emu));
+                        if (err < 0)
+                                return err;
+                        err = snd_ctl_add(card,
+                                snd_ctl_new1(&snd_emu1010_optical_in, emu));
                         if (err < 0)
                                 return err;
                 }
-                for (i = 0; i < ARRAY_SIZE(snd_emu1010_input_enum_ctls); i++) {
-                        err = snd_ctl_add(card,
-                                snd_ctl_new1(&snd_emu1010_input_enum_ctls[i],
-                                             emu));
-                        if (err < 0)
-                                return err;
-                }
-                for (i = 0; i < ARRAY_SIZE(snd_emu1010_adc_pads) - 2; i++) {
-                        err = snd_ctl_add(card,
-                                snd_ctl_new1(&snd_emu1010_adc_pads[i], emu));
-                        if (err < 0)
-                                return err;
-                }
-                for (i = 0; i < ARRAY_SIZE(snd_emu1010_dac_pads) - 2; i++) {
-                        err = snd_ctl_add(card,
-                                snd_ctl_new1(&snd_emu1010_dac_pads[i], emu));
-                        if (err < 0)
-                                return err;
-                }
-                err = snd_ctl_add(card,
-                        snd_ctl_new1(&snd_emu1010_internal_clock, emu));
+
+                err = add_emu1010_source_mixers(emu);
                 if (err < 0)
                         return err;
-                err = snd_ctl_add(card,
-                        snd_ctl_new1(&snd_emu1010_optical_out, emu));
-                if (err < 0)
-                        return err;
-                err = snd_ctl_add(card,
-                        snd_ctl_new1(&snd_emu1010_optical_in, emu));
-                if (err < 0)
-                        return err;
-
-        } else if (emu->card_capabilities->emu_model) {
-                /* all other e-mu cards for now */
-                int i;
-
-                for (i = 0; i < ARRAY_SIZE(snd_emu1010_output_enum_ctls); i++) {
-                        err = snd_ctl_add(card,
-                                snd_ctl_new1(&snd_emu1010_output_enum_ctls[i],
-                                             emu));
-                        if (err < 0)
-                                return err;
-                }
-                for (i = 0; i < ARRAY_SIZE(snd_emu1010_input_enum_ctls); i++) {
-                        err = snd_ctl_add(card,
-                                snd_ctl_new1(&snd_emu1010_input_enum_ctls[i],
-                                             emu));
-                        if (err < 0)
-                                return err;
-                }
-                for (i = 0; i < ARRAY_SIZE(snd_emu1010_adc_pads); i++) {
-                        err = snd_ctl_add(card,
-                                snd_ctl_new1(&snd_emu1010_adc_pads[i], emu));
-                        if (err < 0)
-                                return err;
-                }
-                for (i = 0; i < ARRAY_SIZE(snd_emu1010_dac_pads); i++) {
-                        err = snd_ctl_add(card,
-                                snd_ctl_new1(&snd_emu1010_dac_pads[i], emu));
-                        if (err < 0)
-                                return err;
-                }
-                err = snd_ctl_add(card,
-                        snd_ctl_new1(&snd_emu1010_internal_clock, emu));
-                if (err < 0)
-                        return err;
-                err = snd_ctl_add(card,
-                        snd_ctl_new1(&snd_emu1010_optical_out, emu));
-                if (err < 0)
-                        return err;
-                err = snd_ctl_add(card,
-                        snd_ctl_new1(&snd_emu1010_optical_in, emu));
-                if (err < 0)
-                        return err;
         }
 
         if ( emu->card_capabilities->i2c_adc) {
-                int i;
-
                 err = snd_ctl_add(card, snd_ctl_new1(&snd_audigy_i2c_capture_source, emu));
                 if (err < 0)
                         return err;
 
-                for (i = 0; i < ARRAY_SIZE(snd_audigy_i2c_volume_ctls); i++) {
-                        err = snd_ctl_add(card, snd_ctl_new1(&snd_audigy_i2c_volume_ctls[i], emu));
-                        if (err < 0)
-                                return err;
-                }
+                err = add_ctls(emu, &i2c_volume_ctl,
+                               snd_audigy_i2c_volume_ctls,
+                               ARRAY_SIZE(snd_audigy_i2c_volume_ctls));
+                if (err < 0)
+                        return err;
         }
                 

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

@@ -105 +105 @@
 static int snd_emu10k1_midi_cmd(struct snd_emu10k1 * emu, struct snd_emu10k1_midi *midi, unsigned char cmd, int ack)
 {
-        unsigned long flags;
         int timeout, ok;
 
-        spin_lock_irqsave(&midi->input_lock, flags);
+        spin_lock_irq(&midi->input_lock);
         mpu401_write_data(emu, midi, 0x00);
         /* mpu401_clear_rx(emu, midi); */
@@ -127 +126 @@
                 ok = 1;
         }
-        spin_unlock_irqrestore(&midi->input_lock, flags);
+        spin_unlock_irq(&midi->input_lock);
         if (!ok) {
                 dev_err(emu->card->dev,
@@ -143 +142 @@
         struct snd_emu10k1 *emu;
         struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
-        unsigned long flags;
 
         emu = midi->emu;
         if (snd_BUG_ON(!emu))
                 return -ENXIO;
-        spin_lock_irqsave(&midi->open_lock, flags);
+        spin_lock_irq(&midi->open_lock);
         midi->midi_mode |= EMU10K1_MIDI_MODE_INPUT;
         midi->substream_input = substream;
         if (!(midi->midi_mode & EMU10K1_MIDI_MODE_OUTPUT)) {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
                 if (snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1))
                         goto error_out;
@@ -158 +156 @@
                         goto error_out;
         } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
         }
         return 0;
@@ -170 +168 @@
         struct snd_emu10k1 *emu;
         struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
-        unsigned long flags;
 
         emu = midi->emu;
         if (snd_BUG_ON(!emu))
                 return -ENXIO;
-        spin_lock_irqsave(&midi->open_lock, flags);
+        spin_lock_irq(&midi->open_lock);
         midi->midi_mode |= EMU10K1_MIDI_MODE_OUTPUT;
         midi->substream_output = substream;
         if (!(midi->midi_mode & EMU10K1_MIDI_MODE_INPUT)) {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
                 if (snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1))
                         goto error_out;
@@ -185 +182 @@
                         goto error_out;
         } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
         }
         return 0;
@@ -197 +194 @@
         struct snd_emu10k1 *emu;
         struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
-        unsigned long flags;
         int err = 0;
 
@@ -203 +199 @@
         if (snd_BUG_ON(!emu))
                 return -ENXIO;
-        spin_lock_irqsave(&midi->open_lock, flags);
+        spin_lock_irq(&midi->open_lock);
         snd_emu10k1_intr_disable(emu, midi->rx_enable);
         midi->midi_mode &= ~EMU10K1_MIDI_MODE_INPUT;
         midi->substream_input = NULL;
         if (!(midi->midi_mode & EMU10K1_MIDI_MODE_OUTPUT)) {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
                 err = snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
         } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
         }
         return err;
@@ -220 +216 @@
         struct snd_emu10k1 *emu;
         struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
-        unsigned long flags;
         int err = 0;
 
@@ -226 +221 @@
         if (snd_BUG_ON(!emu))
                 return -ENXIO;
-        spin_lock_irqsave(&midi->open_lock, flags);
+        spin_lock_irq(&midi->open_lock);
         snd_emu10k1_intr_disable(emu, midi->tx_enable);
         midi->midi_mode &= ~EMU10K1_MIDI_MODE_OUTPUT;
         midi->substream_output = NULL;
         if (!(midi->midi_mode & EMU10K1_MIDI_MODE_INPUT)) {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
                 err = snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
         } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
+                spin_unlock_irq(&midi->open_lock);
         }
         return err;
@@ -257 +252 @@
         struct snd_emu10k1 *emu;
         struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
-        unsigned long flags;
 
         emu = midi->emu;
@@ -268 +262 @@
         
                 /* try to send some amount of bytes here before interrupts */
-                spin_lock_irqsave(&midi->output_lock, flags);
+                spin_lock_irq(&midi->output_lock);
                 while (max > 0) {
                         if (mpu401_output_ready(emu, midi)) {
@@ -274 +268 @@
                                     snd_rawmidi_transmit(substream, &byte, 1) != 1) {
                                         /* no more data */
-                                        spin_unlock_irqrestore(&midi->output_lock, flags);
+                                        spin_unlock_irq(&midi->output_lock);
                                         return;
                                 }
@@ -283 +277 @@
                         }
                 }
-                spin_unlock_irqrestore(&midi->output_lock, flags);
+                spin_unlock_irq(&midi->output_lock);
                 snd_emu10k1_intr_enable(emu, midi->tx_enable);
         } else {

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

@@ -2 +2 @@
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
+ *                   Lee Revell <rlrevell@joe-job.com>
+ *                   James Courtier-Dutton <James@superbug.co.uk>
+ *                   Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
  *                   Creative Labs, Inc.
+ *
  *  Routines for control of EMU10K1 chips / PCM routines
- *  Multichannel PCM support Copyright (c) Lee Revell <rlrevell@joe-job.com>
- *
- *  BUGS:
- *    --
- *
- *  TODO:
- *    --
  */
 
@@ -77 +74 @@
 }        
 
-static snd_pcm_uframes_t snd_emu10k1_efx_playback_pointer(struct snd_pcm_substream *substream)
-{
-        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct snd_emu10k1_pcm *epcm = runtime->private_data;
-        unsigned int ptr;
-
-        if (!epcm->running)
-                return 0;
-        ptr = snd_emu10k1_ptr_read(emu, CCCA, epcm->voices[0]->number) & 0x00ffffff;
-        ptr += runtime->buffer_size;
-        ptr -= epcm->ccca_start_addr;
-        ptr %= runtime->buffer_size;
-
-        return ptr;
-}
-
-static int snd_emu10k1_pcm_channel_alloc(struct snd_emu10k1_pcm * epcm, int voices)
-{
-        int err, i;
-
-        if (epcm->voices[1] != NULL && voices < 2) {
-                snd_emu10k1_voice_free(epcm->emu, epcm->voices[1]);
-                epcm->voices[1] = NULL;
-        }
-        for (i = 0; i < voices; i++) {
-                if (epcm->voices[i] == NULL)
-                        break;
-        }
-        if (i == voices)
-                return 0; /* already allocated */
-
-        for (i = 0; i < ARRAY_SIZE(epcm->voices); i++) {
+static void snd_emu10k1_pcm_free_voices(struct snd_emu10k1_pcm *epcm)
+{
+        for (unsigned i = 0; i < ARRAY_SIZE(epcm->voices); i++) {
                 if (epcm->voices[i]) {
                         snd_emu10k1_voice_free(epcm->emu, epcm->voices[i]);
@@ -115 +82 @@
                 }
         }
+}
+
+static int snd_emu10k1_pcm_channel_alloc(struct snd_emu10k1_pcm *epcm,
+                                         int type, int count, int channels)
+{
+        int err;
+
+        snd_emu10k1_pcm_free_voices(epcm);
+
         err = snd_emu10k1_voice_alloc(epcm->emu,
-                                      epcm->type == PLAYBACK_EMUVOICE ? EMU10K1_PCM : EMU10K1_EFX,
-                                      voices,
-                                      &epcm->voices[0]);
-        
+                                      type, count, channels,
+                                      epcm, &epcm->voices[0]);
         if (err < 0)
                 return err;
-        epcm->voices[0]->epcm = epcm;
-        if (voices > 1) {
-                for (i = 1; i < voices; i++) {
-                        epcm->voices[i] = &epcm->emu->voices[epcm->voices[0]->number + i];
-                        epcm->voices[i]->epcm = epcm;
-                }
-        }
+
         if (epcm->extra == NULL) {
+                // The hardware supports only (half-)loop interrupts, so to support an
+                // arbitrary number of periods per buffer, we use an extra voice with a
+                // period-sized loop as the interrupt source. Additionally, the interrupt
+                // timing of the hardware is "suboptimal" and needs some compensation.
                 err = snd_emu10k1_voice_alloc(epcm->emu,
-                                              epcm->type == PLAYBACK_EMUVOICE ? EMU10K1_PCM : EMU10K1_EFX,
-                                              1,
-                                              &epcm->extra);
+                                              type + 1, 1, 1,
+                                              epcm, &epcm->extra);
                 if (err < 0) {
                         /*
@@ -140 +111 @@
                                voices, frame);
                         */
-                        for (i = 0; i < voices; i++) {
-                                snd_emu10k1_voice_free(epcm->emu, epcm->voices[i]);
-                                epcm->voices[i] = NULL;
-                        }
+                        snd_emu10k1_pcm_free_voices(epcm);
                         return err;
                 }
-                epcm->extra->epcm = epcm;
                 epcm->extra->interrupt = snd_emu10k1_pcm_interrupt;
         }
-        return 0;
-}
-
-static const unsigned int capture_period_sizes[31] = {
+
+        return 0;
+}
+
+// Primes 2-7 and 2^n multiples thereof, up to 16.
+static const unsigned int efx_capture_channels[] = {
+        1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16
+};
+
+static const struct snd_pcm_hw_constraint_list hw_constraints_efx_capture_channels = {
+        .count = ARRAY_SIZE(efx_capture_channels),
+        .list = efx_capture_channels,
+        .mask = 0
+};
+
+static const unsigned int capture_buffer_sizes[31] = {
         384,    448,    512,    640,
         384*2,  448*2,  512*2,  640*2,
@@ -163 +142 @@
 };
 
-static const struct snd_pcm_hw_constraint_list hw_constraints_capture_period_sizes = {
+static const struct snd_pcm_hw_constraint_list hw_constraints_capture_buffer_sizes = {
         .count = 31,
-        .list = capture_period_sizes,
+        .list = capture_buffer_sizes,
         .mask = 0
 };
@@ -196 +175 @@
 }
 
+static const unsigned int audigy_capture_rates[9] = {
+        8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000
+};
+
+static const struct snd_pcm_hw_constraint_list hw_constraints_audigy_capture_rates = {
+        .count = 9,
+        .list = audigy_capture_rates,
+        .mask = 0
+};
+
 static unsigned int snd_emu10k1_audigy_capture_rate_reg(unsigned int rate)
 {
@@ -201 +190 @@
         case 8000:      return A_ADCCR_SAMPLERATE_8;
         case 11025:     return A_ADCCR_SAMPLERATE_11;
-        case 12000:     return A_ADCCR_SAMPLERATE_12; /* really supported? */
+        case 12000:     return A_ADCCR_SAMPLERATE_12;
         case 16000:     return ADCCR_SAMPLERATE_16;
         case 22050:     return ADCCR_SAMPLERATE_22;
@@ -212 +201 @@
                         return A_ADCCR_SAMPLERATE_8;
         }
+}
+
+static void snd_emu10k1_constrain_capture_rates(struct snd_emu10k1 *emu,
+                                                struct snd_pcm_runtime *runtime)
+{
+        if (emu->card_capabilities->emu_model &&
+            emu->emu1010.word_clock == 44100) {
+                // This also sets the rate constraint by deleting SNDRV_PCM_RATE_KNOT
+                runtime->hw.rates = SNDRV_PCM_RATE_11025 | \
+                                    SNDRV_PCM_RATE_22050 | \
+                                    SNDRV_PCM_RATE_44100;
+                runtime->hw.rate_min = 11025;
+                runtime->hw.rate_max = 44100;
+                return;
+        }
+        snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
+                                   emu->audigy ? &hw_constraints_audigy_capture_rates :
+                                                 &hw_constraints_capture_rates);
+}
+
+static void snd_emu1010_constrain_efx_rate(struct snd_emu10k1 *emu,
+                                           struct snd_pcm_runtime *runtime)
+{
+        int rate;
+
+        rate = emu->emu1010.word_clock;
+        runtime->hw.rate_min = runtime->hw.rate_max = rate;
+        runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);
 }
 
@@ -250 +267 @@
 }
 
-/*
- * calculate cache invalidate size 
- *
- * stereo: channel is stereo
- * w_16: using 16bit samples
- *
- * returns: cache invalidate size in samples
- */
-static inline int emu10k1_ccis(int stereo, int w_16)
-{
-        if (w_16) {
-                return stereo ? 24 : 26;
-        } else {
-                return stereo ? 24*2 : 26*2;
-        }
+static u16 emu10k1_send_target_from_amount(u8 amount)
+{
+        static const u8 shifts[8] = { 4, 4, 5, 6, 7, 8, 9, 10 };
+        static const u16 offsets[8] = { 0, 0x200, 0x400, 0x800, 0x1000, 0x2000, 0x4000, 0x8000 };
+        u8 exp;
+
+        if (amount == 0xff)
+                return 0xffff;
+        exp = amount >> 5;
+        return ((amount & 0x1f) << shifts[exp]) + offsets[exp];
 }
 
 static void snd_emu10k1_pcm_init_voice(struct snd_emu10k1 *emu,
-                                       int master, int extra,
                                        struct snd_emu10k1_voice *evoice,
+                                       bool w_16, bool stereo,
                                        unsigned int start_addr,
                                        unsigned int end_addr,
-                                       struct snd_emu10k1_pcm_mixer *mix)
-{
-        struct snd_pcm_substream *substream = evoice->epcm->substream;
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        unsigned int silent_page, tmp;
-        int voice, stereo, w_16;
-        unsigned char send_amount[8];
-        unsigned char send_routing[8];
-        unsigned long flags;
-        unsigned int pitch_target;
-        unsigned int ccis;
+                                       const unsigned char *send_routing,
+                                       const unsigned char *send_amount)
+{
+        unsigned int silent_page;
+        int voice;
 
         voice = evoice->number;
-        stereo = runtime->channels == 2;
-        w_16 = snd_pcm_format_width(runtime->format) == 16;
-
-        if (!extra && stereo) {
-                start_addr >>= 1;
-                end_addr >>= 1;
-        }
-        if (w_16) {
-                start_addr >>= 1;
-                end_addr >>= 1;
-        }
-
-        spin_lock_irqsave(&emu->reg_lock, flags);
-
-        /* volume parameters */
-        if (extra) {
-                memset(send_routing, 0, sizeof(send_routing));
-                send_routing[0] = 0;
-                send_routing[1] = 1;
-                send_routing[2] = 2;
-                send_routing[3] = 3;
-                memset(send_amount, 0, sizeof(send_amount));
+
+        silent_page = ((unsigned int)emu->silent_page.addr << emu->address_mode) |
+                      (emu->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);
+        snd_emu10k1_ptr_write_multiple(emu, voice,
+                // Not really necessary for the slave, but it doesn't hurt
+                CPF, stereo ? CPF_STEREO_MASK : 0,
+                // Assumption that PT is already 0 so no harm overwriting
+                PTRX, (send_amount[0] << 8) | send_amount[1],
+                // Stereo slaves don't need to have the addresses set, but it doesn't hurt
+                DSL, end_addr | (send_amount[3] << 24),
+                PSST, start_addr | (send_amount[2] << 24),
+                CCCA, emu10k1_select_interprom(evoice->epcm->pitch_target) |
+                      (w_16 ? 0 : CCCA_8BITSELECT),
+                // Clear filter delay memory
+                Z1, 0,
+                Z2, 0,
+                // Invalidate maps
+                MAPA, silent_page,
+                MAPB, silent_page,
+                // Disable filter (in conjunction with CCCA_RESONANCE == 0)
+                VTFT, VTFT_FILTERTARGET_MASK,
+                CVCF, CVCF_CURRENTFILTER_MASK,
+                REGLIST_END);
+        // Setup routing
+        if (emu->audigy) {
+                snd_emu10k1_ptr_write_multiple(emu, voice,
+                        A_FXRT1, snd_emu10k1_compose_audigy_fxrt1(send_routing),
+                        A_FXRT2, snd_emu10k1_compose_audigy_fxrt2(send_routing),
+                        A_SENDAMOUNTS, snd_emu10k1_compose_audigy_sendamounts(send_amount),
+                        REGLIST_END);
+                for (int i = 0; i < 4; i++) {
+                        u32 aml = emu10k1_send_target_from_amount(send_amount[2 * i]);
+                        u32 amh = emu10k1_send_target_from_amount(send_amount[2 * i + 1]);
+                        snd_emu10k1_ptr_write(emu, A_CSBA + i, voice, (amh << 16) | aml);
+                }
         } else {
-                /* mono, left, right (master voice = left) */
-                tmp = stereo ? (master ? 1 : 2) : 0;
-                memcpy(send_routing, &mix->send_routing[tmp][0], 8);
-                memcpy(send_amount, &mix->send_volume[tmp][0], 8);
-        }
-
-        ccis = emu10k1_ccis(stereo, w_16);
-        
-        if (master) {
-                evoice->epcm->ccca_start_addr = start_addr + ccis;
-                if (extra) {
-                        start_addr += ccis;
-                        end_addr += ccis + emu->delay_pcm_irq;
-                }
-                if (stereo && !extra) {
-                        snd_emu10k1_ptr_write(emu, CPF, voice, CPF_STEREO_MASK);
-                        snd_emu10k1_ptr_write(emu, CPF, (voice + 1), CPF_STEREO_MASK);
-                } else {
-                        snd_emu10k1_ptr_write(emu, CPF, voice, 0);
-                }
-        }
-
-        /* setup routing */
-        if (emu->audigy) {
-                snd_emu10k1_ptr_write(emu, A_FXRT1, voice,
-                                      snd_emu10k1_compose_audigy_fxrt1(send_routing));
-                snd_emu10k1_ptr_write(emu, A_FXRT2, voice,
-                                      snd_emu10k1_compose_audigy_fxrt2(send_routing));
-                snd_emu10k1_ptr_write(emu, A_SENDAMOUNTS, voice,
-                                      ((unsigned int)send_amount[4] << 24) |
-                                      ((unsigned int)send_amount[5] << 16) |
-                                      ((unsigned int)send_amount[6] << 8) |
-                                      (unsigned int)send_amount[7]);
-        } else
                 snd_emu10k1_ptr_write(emu, FXRT, voice,
                                       snd_emu10k1_compose_send_routing(send_routing));
-        /* Stop CA */
-        /* Assumption that PT is already 0 so no harm overwriting */
-        snd_emu10k1_ptr_write(emu, PTRX, voice, (send_amount[0] << 8) | send_amount[1]);
-        snd_emu10k1_ptr_write(emu, DSL, voice, end_addr | (send_amount[3] << 24));
-        snd_emu10k1_ptr_write(emu, PSST, voice,
-                        (start_addr + (extra ? emu->delay_pcm_irq : 0)) |
-                        (send_amount[2] << 24));
-        if (emu->card_capabilities->emu_model)
-                pitch_target = PITCH_48000; /* Disable interpolators on emu1010 card */
-        else 
-                pitch_target = emu10k1_calc_pitch_target(runtime->rate);
-        if (extra)
-                snd_emu10k1_ptr_write(emu, CCCA, voice, start_addr |
-                              emu10k1_select_interprom(pitch_target) |
-                              (w_16 ? 0 : CCCA_8BITSELECT));
-        else
-                snd_emu10k1_ptr_write(emu, CCCA, voice, (start_addr + ccis) |
-                              emu10k1_select_interprom(pitch_target) |
-                              (w_16 ? 0 : CCCA_8BITSELECT));
-        /* Clear filter delay memory */
-        snd_emu10k1_ptr_write(emu, Z1, voice, 0);
-        snd_emu10k1_ptr_write(emu, Z2, voice, 0);
-        /* invalidate maps */
-        silent_page = ((unsigned int)emu->silent_page.addr << emu->address_mode) | (emu->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);
-        snd_emu10k1_ptr_write(emu, MAPA, voice, silent_page);
-        snd_emu10k1_ptr_write(emu, MAPB, voice, silent_page);
-        /* modulation envelope */
-        snd_emu10k1_ptr_write(emu, CVCF, voice, 0xffff);
-        snd_emu10k1_ptr_write(emu, VTFT, voice, 0xffff);
-        snd_emu10k1_ptr_write(emu, ATKHLDM, voice, 0);
-        snd_emu10k1_ptr_write(emu, DCYSUSM, voice, 0x007f);
-        snd_emu10k1_ptr_write(emu, LFOVAL1, voice, 0x8000);
-        snd_emu10k1_ptr_write(emu, LFOVAL2, voice, 0x8000);
-        snd_emu10k1_ptr_write(emu, FMMOD, voice, 0);
-        snd_emu10k1_ptr_write(emu, TREMFRQ, voice, 0);
-        snd_emu10k1_ptr_write(emu, FM2FRQ2, voice, 0);
-        snd_emu10k1_ptr_write(emu, ENVVAL, voice, 0x8000);
-        /* volume envelope */
-        snd_emu10k1_ptr_write(emu, ATKHLDV, voice, 0x7f7f);
-        snd_emu10k1_ptr_write(emu, ENVVOL, voice, 0x0000);
-        /* filter envelope */
-        snd_emu10k1_ptr_write(emu, PEFE_FILTERAMOUNT, voice, 0x7f);
-        /* pitch envelope */
-        snd_emu10k1_ptr_write(emu, PEFE_PITCHAMOUNT, voice, 0);
-
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
+        }
+
+        emu->voices[voice].dirty = 1;
+}
+
+static void snd_emu10k1_pcm_init_voices(struct snd_emu10k1 *emu,
+                                        struct snd_emu10k1_voice *evoice,
+                                        bool w_16, bool stereo,
+                                        unsigned int start_addr,
+                                        unsigned int end_addr,
+                                        struct snd_emu10k1_pcm_mixer *mix)
+{
+        spin_lock_irq(&emu->reg_lock);
+        snd_emu10k1_pcm_init_voice(emu, evoice, w_16, stereo,
+                                   start_addr, end_addr,
+                                   &mix->send_routing[stereo][0],
+                                   &mix->send_volume[stereo][0]);
+        if (stereo)
+                snd_emu10k1_pcm_init_voice(emu, evoice + 1, w_16, true,
+                                           start_addr, end_addr,
+                                           &mix->send_routing[2][0],
+                                           &mix->send_volume[2][0]);
+        spin_unlock_irq(&emu->reg_lock);
+}
+
+static void snd_emu10k1_pcm_init_extra_voice(struct snd_emu10k1 *emu,
+                                             struct snd_emu10k1_voice *evoice,
+                                             bool w_16,
+                                             unsigned int start_addr,
+                                             unsigned int end_addr)
+{
+        static const unsigned char send_routing[8] = { 0, 1, 2, 3, 4, 5, 6, 7 };
+        static const unsigned char send_amount[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+
+        snd_emu10k1_pcm_init_voice(emu, evoice, w_16, false,
+                                   start_addr, end_addr,
+                                   send_routing, send_amount);
 }
 
@@ -399 +375 @@
         struct snd_emu10k1_pcm *epcm = runtime->private_data;
         size_t alloc_size;
+        int type, channels, count;
         int err;
 
-        err = snd_emu10k1_pcm_channel_alloc(epcm, params_channels(hw_params));
+        if (epcm->type == PLAYBACK_EMUVOICE) {
+                type = EMU10K1_PCM;
+                channels = 1;
+                count = params_channels(hw_params);
+        } else {
+                type = EMU10K1_EFX;
+                channels = params_channels(hw_params);
+                count = 1;
+        }
+        err = snd_emu10k1_pcm_channel_alloc(epcm, type, count, channels);
         if (err < 0)
                 return err;
@@ -442 +428 @@
                 epcm->extra = NULL;
         }
-        if (epcm->voices[1]) {
-                snd_emu10k1_voice_free(epcm->emu, epcm->voices[1]);
-                epcm->voices[1] = NULL;
-        }
-        if (epcm->voices[0]) {
-                snd_emu10k1_voice_free(epcm->emu, epcm->voices[0]);
-                epcm->voices[0] = NULL;
-        }
+        snd_emu10k1_pcm_free_voices(epcm);
         if (epcm->memblk) {
                 snd_emu10k1_free_pages(emu, epcm->memblk);
@@ -459 +438 @@
 }
 
-static int snd_emu10k1_efx_playback_hw_free(struct snd_pcm_substream *substream)
-{
-        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct snd_emu10k1_pcm *epcm;
-        int i;
-
-        if (runtime->private_data == NULL)
-                return 0;
-        epcm = runtime->private_data;
-        if (epcm->extra) {
-                snd_emu10k1_voice_free(epcm->emu, epcm->extra);
-                epcm->extra = NULL;
-        }
-        for (i = 0; i < NUM_EFX_PLAYBACK; i++) {
-                if (epcm->voices[i]) {
-                        snd_emu10k1_voice_free(epcm->emu, epcm->voices[i]);
-                        epcm->voices[i] = NULL;
-                }
-        }
-        if (epcm->memblk) {
-                snd_emu10k1_free_pages(emu, epcm->memblk);
-                epcm->memblk = NULL;
-                epcm->start_addr = 0;
-        }
-        snd_pcm_lib_free_pages(substream);
-        return 0;
-}
-
 static int snd_emu10k1_playback_prepare(struct snd_pcm_substream *substream)
 {
@@ -493 +443 @@
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_emu10k1_pcm *epcm = runtime->private_data;
+        bool w_16 = snd_pcm_format_width(runtime->format) == 16;
+        bool stereo = runtime->channels == 2;
         unsigned int start_addr, end_addr;
-
-        start_addr = epcm->start_addr;
-        end_addr = snd_pcm_lib_period_bytes(substream);
-        if (runtime->channels == 2) {
-                start_addr >>= 1;
-                end_addr >>= 1;
-        }
-        end_addr += start_addr;
-        snd_emu10k1_pcm_init_voice(emu, 1, 1, epcm->extra,
-                                   start_addr, end_addr, NULL);
-        start_addr = epcm->start_addr;
-        end_addr = epcm->start_addr + snd_pcm_lib_buffer_bytes(substream);
-        snd_emu10k1_pcm_init_voice(emu, 1, 0, epcm->voices[0],
-                                   start_addr, end_addr,
-                                   &emu->pcm_mixer[substream->number]);
-        if (epcm->voices[1])
-                snd_emu10k1_pcm_init_voice(emu, 0, 0, epcm->voices[1],
-                                           start_addr, end_addr,
-                                           &emu->pcm_mixer[substream->number]);
+        unsigned int rate;
+
+        rate = runtime->rate;
+        if (emu->card_capabilities->emu_model &&
+            emu->emu1010.word_clock == 44100)
+                rate = rate * 480 / 441;
+        epcm->pitch_target = emu10k1_calc_pitch_target(rate);
+
+        start_addr = epcm->start_addr >> w_16;
+        end_addr = start_addr + runtime->period_size;
+        snd_emu10k1_pcm_init_extra_voice(emu, epcm->extra, w_16,
+                                         start_addr, end_addr);
+        start_addr >>= stereo;
+        epcm->ccca_start_addr = start_addr;
+        end_addr = start_addr + runtime->buffer_size;
+        snd_emu10k1_pcm_init_voices(emu, epcm->voices[0], w_16, stereo,
+                                    start_addr, end_addr,
+                                    &emu->pcm_mixer[substream->number]);
+
         return 0;
 }
@@ -521 +473 @@
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_emu10k1_pcm *epcm = runtime->private_data;
-        unsigned int start_addr, end_addr;
-        unsigned int channel_size;
-        int i;
-
-        start_addr = epcm->start_addr;
-        end_addr = epcm->start_addr + snd_pcm_lib_buffer_bytes(substream);
-
-        /*
-         * the kX driver leaves some space between voices
-         */
-        channel_size = ( end_addr - start_addr ) / NUM_EFX_PLAYBACK;
-
-        snd_emu10k1_pcm_init_voice(emu, 1, 1, epcm->extra,
-                                   start_addr, start_addr + (channel_size / 2), NULL);
-
-        /* only difference with the master voice is we use it for the pointer */
-        snd_emu10k1_pcm_init_voice(emu, 1, 0, epcm->voices[0],
-                                   start_addr, start_addr + channel_size,
-                                   &emu->efx_pcm_mixer[0]);
-
-        start_addr += channel_size;
-        for (i = 1; i < NUM_EFX_PLAYBACK; i++) {
-                snd_emu10k1_pcm_init_voice(emu, 0, 0, epcm->voices[i],
-                                           start_addr, start_addr + channel_size,
-                                           &emu->efx_pcm_mixer[i]);
+        unsigned int start_addr;
+        unsigned int extra_size, channel_size;
+        unsigned int i;
+
+        epcm->pitch_target = PITCH_48000;
+
+        start_addr = epcm->start_addr >> 1;  // 16-bit voices
+
+        extra_size = runtime->period_size;
+        channel_size = runtime->buffer_size;
+
+        snd_emu10k1_pcm_init_extra_voice(emu, epcm->extra, true,
+                                         start_addr, start_addr + extra_size);
+
+        epcm->ccca_start_addr = start_addr;
+        for (i = 0; i < runtime->channels; i++) {
+                snd_emu10k1_pcm_init_voices(emu, epcm->voices[i], true, false,
+                                            start_addr, start_addr + channel_size,
+                                            &emu->efx_pcm_mixer[i]);
                 start_addr += channel_size;
         }
@@ -562 +508 @@
         .rate_min =             48000,
         .rate_max =             48000,
-        .channels_min =         NUM_EFX_PLAYBACK,
+        .channels_min =         1,
         .channels_max =         NUM_EFX_PLAYBACK,
-        .buffer_bytes_max =     (64*1024),
-        .period_bytes_min =     64,
-        .period_bytes_max =     (64*1024),
+        .buffer_bytes_max =     (128*1024),
+        .period_bytes_max =     (128*1024),
         .periods_min =          2,
-        .periods_max =          2,
+        .periods_max =          1024,
         .fifo_size =            0,
 };
@@ -586 +531 @@
                 break;
         case CAPTURE_EFX:
+                if (emu->card_capabilities->emu_model) {
+                        // The upper 32 16-bit capture voices, two for each of the 16 32-bit channels.
+                        // The lower voices are occupied by A_EXTOUT_*_CAP*.
+                        epcm->capture_cr_val = 0;
+                        epcm->capture_cr_val2 = 0xffffffff >> (32 - runtime->channels * 2);
+                }
                 if (emu->audigy) {
-                        snd_emu10k1_ptr_write(emu, A_FXWC1, 0, 0);
-                        snd_emu10k1_ptr_write(emu, A_FXWC2, 0, 0);
+                        snd_emu10k1_ptr_write_multiple(emu, 0,
+                                A_FXWC1, 0,
+                                A_FXWC2, 0,
+                                REGLIST_END);
                 } else
                         snd_emu10k1_ptr_write(emu, FXWC, 0, 0);
@@ -599 +552 @@
         epcm->capture_bs_val = 0;
         for (idx = 0; idx < 31; idx++) {
-                if (capture_period_sizes[idx] == epcm->capture_bufsize) {
+                if (capture_buffer_sizes[idx] == epcm->capture_bufsize) {
                         epcm->capture_bs_val = idx + 1;
                         break;
@@ -609 +562 @@
         }
         if (epcm->type == CAPTURE_AC97ADC) {
+                unsigned rate = runtime->rate;
+                if (!(runtime->hw.rates & SNDRV_PCM_RATE_48000))
+                        rate = rate * 480 / 441;
+
                 epcm->capture_cr_val = emu->audigy ? A_ADCCR_LCHANENABLE : ADCCR_LCHANENABLE;
                 if (runtime->channels > 1)
                         epcm->capture_cr_val |= emu->audigy ? A_ADCCR_RCHANENABLE : ADCCR_RCHANENABLE;
                 epcm->capture_cr_val |= emu->audigy ?
-                        snd_emu10k1_audigy_capture_rate_reg(runtime->rate) :
-                        snd_emu10k1_capture_rate_reg(runtime->rate);
-        }
-        return 0;
-}
-
-static void snd_emu10k1_playback_invalidate_cache(struct snd_emu10k1 *emu, int extra, struct snd_emu10k1_voice *evoice)
-{
-        struct snd_pcm_runtime *runtime;
-        unsigned int voice, stereo, i, ccis, cra = 64, cs, sample;
-
-        if (evoice == NULL)
-                return;
-        runtime = evoice->epcm->substream->runtime;
+                        snd_emu10k1_audigy_capture_rate_reg(rate) :
+                        snd_emu10k1_capture_rate_reg(rate);
+        }
+        return 0;
+}
+
+static void snd_emu10k1_playback_fill_cache(struct snd_emu10k1 *emu,
+                                            unsigned voice,
+                                            u32 sample, bool stereo)
+{
+        u32 ccr;
+
+        // We assume that the cache is resting at this point (i.e.,
+        // CCR_CACHEINVALIDSIZE is very small).
+
+        // Clear leading frames. For simplicitly, this does too much,
+        // except for 16-bit stereo. And the interpolator will actually
+        // access them at all only when we're pitch-shifting.
+        for (int i = 0; i < 3; i++)
+                snd_emu10k1_ptr_write(emu, CD0 + i, voice, sample);
+
+        // Fill cache
+        ccr = (64 - 3) << REG_SHIFT(CCR_CACHEINVALIDSIZE);
+        if (stereo) {
+                // The engine goes haywire if CCR_READADDRESS is out of sync
+                snd_emu10k1_ptr_write(emu, CCR, voice + 1, ccr);
+        }
+        snd_emu10k1_ptr_write(emu, CCR, voice, ccr);
+}
+
+static void snd_emu10k1_playback_prepare_voices(struct snd_emu10k1 *emu,
+                                                struct snd_emu10k1_pcm *epcm,
+                                                bool w_16, bool stereo,
+                                                int channels)
+{
+        struct snd_pcm_substream *substream = epcm->substream;
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        unsigned eloop_start = epcm->start_addr >> w_16;
+        unsigned loop_start = eloop_start >> stereo;
+        unsigned eloop_size = runtime->period_size;
+        unsigned loop_size = runtime->buffer_size;
+        u32 sample = w_16 ? 0 : 0x80808080;
+
+        // To make the playback actually start at the 1st frame,
+        // we need to compensate for two circumstances:
+        // - The actual position is delayed by the cache size (64 frames)
+        // - The interpolator is centered around the 4th frame
+        loop_start += (epcm->resume_pos + 64 - 3) % loop_size;
+        for (int i = 0; i < channels; i++) {
+                unsigned voice = epcm->voices[i]->number;
+                snd_emu10k1_ptr_write(emu, CCCA_CURRADDR, voice, loop_start);
+                loop_start += loop_size;
+                snd_emu10k1_playback_fill_cache(emu, voice, sample, stereo);
+        }
+
+        // The interrupt is triggered when CCCA_CURRADDR (CA) wraps around,
+        // which is ahead of the actual playback position, so the interrupt
+        // source needs to be delayed.
+        //
+        // In principle, this wouldn't need to be the cache's entire size - in
+        // practice, CCR_CACHEINVALIDSIZE (CIS) > `fetch threshold` has never
+        // been observed, and assuming 40 _bytes_ should be safe.
+        //
+        // The cache fills are somewhat random, which makes it impossible to
+        // align them with the interrupts. This makes a non-delayed interrupt
+        // source not practical, as the interrupt handler would have to wait
+        // for (CA - CIS) >= period_boundary for every channel in the stream.
+        //
+        // This is why all other (open) drivers for these chips use timer-based
+        // interrupts.
+        //
+        eloop_start += (epcm->resume_pos + eloop_size - 3) % eloop_size;
+        snd_emu10k1_ptr_write(emu, CCCA_CURRADDR, epcm->extra->number, eloop_start);
+
+        // It takes a moment until the cache fills complete,
+        // but the unmuting takes long enough for that.
+}
+
+static void snd_emu10k1_playback_commit_volume(struct snd_emu10k1 *emu,
+                                               struct snd_emu10k1_voice *evoice,
+                                               unsigned int vattn)
+{
+        snd_emu10k1_ptr_write_multiple(emu, evoice->number,
+                VTFT, vattn | VTFT_FILTERTARGET_MASK,
+                CVCF, vattn | CVCF_CURRENTFILTER_MASK,
+                REGLIST_END);
+}
+
+static void snd_emu10k1_playback_unmute_voice(struct snd_emu10k1 *emu,
+                                              struct snd_emu10k1_voice *evoice,
+                                              bool stereo, bool master,
+                                              struct snd_emu10k1_pcm_mixer *mix)
+{
+        unsigned int vattn;
+        unsigned int tmp;
+
+        tmp = stereo ? (master ? 1 : 2) : 0;
+        vattn = mix->attn[tmp] << 16;
+        snd_emu10k1_playback_commit_volume(emu, evoice, vattn);
+}       
+
+static void snd_emu10k1_playback_unmute_voices(struct snd_emu10k1 *emu,
+                                               struct snd_emu10k1_voice *evoice,
+                                               bool stereo,
+                                               struct snd_emu10k1_pcm_mixer *mix)
+{
+        snd_emu10k1_playback_unmute_voice(emu, evoice, stereo, true, mix);
+        if (stereo)
+                snd_emu10k1_playback_unmute_voice(emu, evoice + 1, true, false, mix);
+}
+
+static void snd_emu10k1_playback_mute_voice(struct snd_emu10k1 *emu,
+                                            struct snd_emu10k1_voice *evoice)
+{
+        snd_emu10k1_playback_commit_volume(emu, evoice, 0);
+}
+
+static void snd_emu10k1_playback_mute_voices(struct snd_emu10k1 *emu,
+                                             struct snd_emu10k1_voice *evoice,
+                                             bool stereo)
+{
+        snd_emu10k1_playback_mute_voice(emu, evoice);
+        if (stereo)
+                snd_emu10k1_playback_mute_voice(emu, evoice + 1);
+}
+
+static void snd_emu10k1_playback_commit_pitch(struct snd_emu10k1 *emu,
+                                              u32 voice, u32 pitch_target)
+{
+        u32 ptrx = snd_emu10k1_ptr_read(emu, PTRX, voice);
+        u32 cpf = snd_emu10k1_ptr_read(emu, CPF, voice);
+        snd_emu10k1_ptr_write_multiple(emu, voice,
+                PTRX, (ptrx & ~PTRX_PITCHTARGET_MASK) | pitch_target,
+                CPF, (cpf & ~(CPF_CURRENTPITCH_MASK | CPF_FRACADDRESS_MASK)) | pitch_target,
+                REGLIST_END);
+}
+
+static void snd_emu10k1_playback_trigger_voice(struct snd_emu10k1 *emu,
+                                               struct snd_emu10k1_voice *evoice)
+{
+        unsigned int voice;
+
         voice = evoice->number;
-        stereo = (!extra && runtime->channels == 2);
-        sample = snd_pcm_format_width(runtime->format) == 16 ? 0 : 0x80808080;
-        ccis = emu10k1_ccis(stereo, sample == 0);
-        /* set cs to 2 * number of cache registers beside the invalidated */
-        cs = (sample == 0) ? (32-ccis) : (64-ccis+1) >> 1;
-        if (cs > 16) cs = 16;
-        for (i = 0; i < cs; i++) {
-                snd_emu10k1_ptr_write(emu, CD0 + i, voice, sample);
-                if (stereo) {
-                        snd_emu10k1_ptr_write(emu, CD0 + i, voice + 1, sample);
-                }
-        }
-        /* reset cache */
-        snd_emu10k1_ptr_write(emu, CCR_CACHEINVALIDSIZE, voice, 0);
-        snd_emu10k1_ptr_write(emu, CCR_READADDRESS, voice, cra);
-        if (stereo) {
-                snd_emu10k1_ptr_write(emu, CCR_CACHEINVALIDSIZE, voice + 1, 0);
-                snd_emu10k1_ptr_write(emu, CCR_READADDRESS, voice + 1, cra);
-        }
-        /* fill cache */
-        snd_emu10k1_ptr_write(emu, CCR_CACHEINVALIDSIZE, voice, ccis);
-        if (stereo) {
-                snd_emu10k1_ptr_write(emu, CCR_CACHEINVALIDSIZE, voice+1, ccis);
-        }
-}
-
-static void snd_emu10k1_playback_prepare_voice(struct snd_emu10k1 *emu, struct snd_emu10k1_voice *evoice,
-                                               int master, int extra,
-                                               struct snd_emu10k1_pcm_mixer *mix)
-{
-        struct snd_pcm_substream *substream;
-        struct snd_pcm_runtime *runtime;
-        unsigned int attn, vattn;
-        unsigned int voice, tmp;
-
-        if (evoice == NULL)     /* skip second voice for mono */
-                return;
-        substream = evoice->epcm->substream;
-        runtime = substream->runtime;
+        snd_emu10k1_playback_commit_pitch(emu, voice, evoice->epcm->pitch_target << 16);
+}
+
+static void snd_emu10k1_playback_stop_voice(struct snd_emu10k1 *emu,
+                                            struct snd_emu10k1_voice *evoice)
+{
+        unsigned int voice;
+
         voice = evoice->number;
-
-        attn = extra ? 0 : 0x00ff;
-        tmp = runtime->channels == 2 ? (master ? 1 : 2) : 0;
-        vattn = mix != NULL ? (mix->attn[tmp] << 16) : 0;
-        snd_emu10k1_ptr_write(emu, IFATN, voice, attn);
-        snd_emu10k1_ptr_write(emu, VTFT, voice, vattn | 0xffff);
-        snd_emu10k1_ptr_write(emu, CVCF, voice, vattn | 0xffff);
-        snd_emu10k1_ptr_write(emu, DCYSUSV, voice, 0x7f7f);
-        snd_emu10k1_voice_clear_loop_stop(emu, voice);
-}       
-
-static void snd_emu10k1_playback_trigger_voice(struct snd_emu10k1 *emu, struct snd_emu10k1_voice *evoice, int master, int extra)
-{
-        struct snd_pcm_substream *substream;
-        struct snd_pcm_runtime *runtime;
-        unsigned int voice, pitch, pitch_target;
-
-        if (evoice == NULL)     /* skip second voice for mono */
-                return;
-        substream = evoice->epcm->substream;
-        runtime = substream->runtime;
-        voice = evoice->number;
-
-        pitch = snd_emu10k1_rate_to_pitch(runtime->rate) >> 8;
-        if (emu->card_capabilities->emu_model)
-                pitch_target = PITCH_48000; /* Disable interpolators on emu1010 card */
-        else 
-                pitch_target = emu10k1_calc_pitch_target(runtime->rate);
-        snd_emu10k1_ptr_write(emu, PTRX_PITCHTARGET, voice, pitch_target);
-        if (master || evoice->epcm->type == PLAYBACK_EFX)
-                snd_emu10k1_ptr_write(emu, CPF_CURRENTPITCH, voice, pitch_target);
-        snd_emu10k1_ptr_write(emu, IP, voice, pitch);
-        if (extra)
-                snd_emu10k1_voice_intr_enable(emu, voice);
-}
-
-static void snd_emu10k1_playback_stop_voice(struct snd_emu10k1 *emu, struct snd_emu10k1_voice *evoice)
-{
-        unsigned int voice;
-
-        if (evoice == NULL)
-                return;
-        voice = evoice->number;
-        snd_emu10k1_voice_intr_disable(emu, voice);
-        snd_emu10k1_ptr_write(emu, PTRX_PITCHTARGET, voice, 0);
-        snd_emu10k1_ptr_write(emu, CPF_CURRENTPITCH, voice, 0);
-        snd_emu10k1_ptr_write(emu, IFATN, voice, 0xffff);
-        snd_emu10k1_ptr_write(emu, VTFT, voice, 0xffff);
-        snd_emu10k1_ptr_write(emu, CVCF, voice, 0xffff);
-        snd_emu10k1_ptr_write(emu, IP, voice, 0);
-}
-
-static inline void snd_emu10k1_playback_mangle_extra(struct snd_emu10k1 *emu,
-                struct snd_emu10k1_pcm *epcm,
-                struct snd_pcm_substream *substream,
-                struct snd_pcm_runtime *runtime)
-{
-        unsigned int ptr, period_pos;
-
-        /* try to sychronize the current position for the interrupt
-           source voice */
-        period_pos = runtime->status->hw_ptr - runtime->hw_ptr_interrupt;
-        period_pos %= runtime->period_size;
-        ptr = snd_emu10k1_ptr_read(emu, CCCA, epcm->extra->number);
-        ptr &= ~0x00ffffff;
-        ptr |= epcm->ccca_start_addr + period_pos;
-        snd_emu10k1_ptr_write(emu, CCCA, epcm->extra->number, ptr);
+        snd_emu10k1_playback_commit_pitch(emu, voice, 0);
+}
+
+static void snd_emu10k1_playback_set_running(struct snd_emu10k1 *emu,
+                                             struct snd_emu10k1_pcm *epcm)
+{
+        epcm->running = 1;
+        snd_emu10k1_voice_intr_enable(emu, epcm->extra->number);
+}
+
+static void snd_emu10k1_playback_set_stopped(struct snd_emu10k1 *emu,
+                                              struct snd_emu10k1_pcm *epcm)
+{
+        snd_emu10k1_voice_intr_disable(emu, epcm->extra->number);
+        epcm->running = 0;
 }
 
@@ -744 +746 @@
         struct snd_emu10k1_pcm *epcm = runtime->private_data;
         struct snd_emu10k1_pcm_mixer *mix;
+        bool w_16 = snd_pcm_format_width(runtime->format) == 16;
+        bool stereo = runtime->channels == 2;
         int result = 0;
 
@@ -754 +758 @@
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
-                snd_emu10k1_playback_invalidate_cache(emu, 1, epcm->extra);     /* do we need this? */
-                snd_emu10k1_playback_invalidate_cache(emu, 0, epcm->voices[0]);
+                snd_emu10k1_playback_prepare_voices(emu, epcm, w_16, stereo, 1);
                 fallthrough;
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
         case SNDRV_PCM_TRIGGER_RESUME:
-                if (cmd == SNDRV_PCM_TRIGGER_PAUSE_RELEASE)
-                        snd_emu10k1_playback_mangle_extra(emu, epcm, substream, runtime);
                 mix = &emu->pcm_mixer[substream->number];
-                snd_emu10k1_playback_prepare_voice(emu, epcm->voices[0], 1, 0, mix);
-                snd_emu10k1_playback_prepare_voice(emu, epcm->voices[1], 0, 0, mix);
-                snd_emu10k1_playback_prepare_voice(emu, epcm->extra, 1, 1, NULL);
-                snd_emu10k1_playback_trigger_voice(emu, epcm->voices[0], 1, 0);
-                snd_emu10k1_playback_trigger_voice(emu, epcm->voices[1], 0, 0);
-                snd_emu10k1_playback_trigger_voice(emu, epcm->extra, 1, 1);
-                epcm->running = 1;
+                snd_emu10k1_playback_unmute_voices(emu, epcm->voices[0], stereo, mix);
+                snd_emu10k1_playback_set_running(emu, epcm);
+                snd_emu10k1_playback_trigger_voice(emu, epcm->voices[0]);
+                snd_emu10k1_playback_trigger_voice(emu, epcm->extra);
                 break;
         case SNDRV_PCM_TRIGGER_STOP:
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
         case SNDRV_PCM_TRIGGER_SUSPEND:
-                epcm->running = 0;
                 snd_emu10k1_playback_stop_voice(emu, epcm->voices[0]);
-                snd_emu10k1_playback_stop_voice(emu, epcm->voices[1]);
                 snd_emu10k1_playback_stop_voice(emu, epcm->extra);
+                snd_emu10k1_playback_set_stopped(emu, epcm);
+                snd_emu10k1_playback_mute_voices(emu, epcm->voices[0], stereo);
                 break;
         default:
@@ -811 +809 @@
                 case CAPTURE_EFX:
                         if (emu->audigy) {
-                                snd_emu10k1_ptr_write(emu, A_FXWC1, 0, epcm->capture_cr_val);
-                                snd_emu10k1_ptr_write(emu, A_FXWC2, 0, epcm->capture_cr_val2);
+                                snd_emu10k1_ptr_write_multiple(emu, 0,
+                                        A_FXWC1, epcm->capture_cr_val,
+                                        A_FXWC2, epcm->capture_cr_val2,
+                                        REGLIST_END);
                                 dev_dbg(emu->card->dev,
                                         "cr_val=0x%x, cr_val2=0x%x\n",
@@ -839 +839 @@
                 case CAPTURE_EFX:
                         if (emu->audigy) {
-                                snd_emu10k1_ptr_write(emu, A_FXWC1, 0, 0);
-                                snd_emu10k1_ptr_write(emu, A_FXWC2, 0, 0);
+                                snd_emu10k1_ptr_write_multiple(emu, 0,
+                                        A_FXWC1, 0,
+                                        A_FXWC2, 0,
+                                        REGLIST_END);
                         } else
                                 snd_emu10k1_ptr_write(emu, FXWC, 0, 0);
@@ -860 +862 @@
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_emu10k1_pcm *epcm = runtime->private_data;
-        unsigned int ptr;
+        int ptr;
 
         if (!epcm->running)
                 return 0;
+
         ptr = snd_emu10k1_ptr_read(emu, CCCA, epcm->voices[0]->number) & 0x00ffffff;
-#if 0   /* Perex's code */
-        ptr += runtime->buffer_size;
         ptr -= epcm->ccca_start_addr;
-        ptr %= runtime->buffer_size;
-#else   /* EMU10K1 Open Source code from Creative */
-        if (ptr < epcm->ccca_start_addr)
-                ptr += runtime->buffer_size - epcm->ccca_start_addr;
-        else {
-                ptr -= epcm->ccca_start_addr;
-                if (ptr >= runtime->buffer_size)
-                        ptr -= runtime->buffer_size;
-        }
-#endif
+
+        // This is the size of the whole cache minus the interpolator read-ahead,
+        // which leads us to the actual playback position.
+        //
+        // The cache is constantly kept mostly filled, so in principle we could
+        // return a more advanced position representing how far the hardware has
+        // already read the buffer, and set runtime->delay accordingly. However,
+        // this would be slightly different for every channel (and remarkably slow
+        // to obtain), so only a fixed worst-case value would be practical.
+        //
+        ptr -= 64 - 3;
+        if (ptr < 0)
+                ptr += runtime->buffer_size;
+
         /*
         dev_dbg(emu->card->dev,
@@ -887 +892 @@
 }
 
+static u64 snd_emu10k1_efx_playback_voice_mask(struct snd_emu10k1_pcm *epcm,
+                                               int channels)
+{
+        u64 mask = 0;
+
+        for (int i = 0; i < channels; i++) {
+                int voice = epcm->voices[i]->number;
+                mask |= 1ULL << voice;
+        }
+        return mask;
+}
+
+static void snd_emu10k1_efx_playback_freeze_voices(struct snd_emu10k1 *emu,
+                                                   struct snd_emu10k1_pcm *epcm,
+                                                   int channels)
+{
+        for (int i = 0; i < channels; i++) {
+                int voice = epcm->voices[i]->number;
+                snd_emu10k1_ptr_write(emu, CPF_STOP, voice, 1);
+                snd_emu10k1_playback_commit_pitch(emu, voice, PITCH_48000 << 16);
+        }
+}
+
+static void snd_emu10k1_efx_playback_unmute_voices(struct snd_emu10k1 *emu,
+                                                   struct snd_emu10k1_pcm *epcm,
+                                                   int channels)
+{
+        for (int i = 0; i < channels; i++)
+                snd_emu10k1_playback_unmute_voice(emu, epcm->voices[i], false, true,
+                                                  &emu->efx_pcm_mixer[i]);
+}
+
+static void snd_emu10k1_efx_playback_stop_voices(struct snd_emu10k1 *emu,
+                                                 struct snd_emu10k1_pcm *epcm,
+                                                 int channels)
+{
+        for (int i = 0; i < channels; i++)
+                snd_emu10k1_playback_stop_voice(emu, epcm->voices[i]);
+        snd_emu10k1_playback_set_stopped(emu, epcm);
+
+        for (int i = 0; i < channels; i++)
+                snd_emu10k1_playback_mute_voice(emu, epcm->voices[i]);
+}
 
 static int snd_emu10k1_efx_playback_trigger(struct snd_pcm_substream *substream,
@@ -894 +942 @@
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_emu10k1_pcm *epcm = runtime->private_data;
-        int i;
+        u64 mask;
         int result = 0;
 
@@ -900 +948 @@
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
-                /* prepare voices */
-                for (i = 0; i < NUM_EFX_PLAYBACK; i++) {        
-                        snd_emu10k1_playback_invalidate_cache(emu, 0, epcm->voices[i]);
-                }
-                snd_emu10k1_playback_invalidate_cache(emu, 1, epcm->extra);
-                fallthrough;
         case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
         case SNDRV_PCM_TRIGGER_RESUME:
-                snd_emu10k1_playback_prepare_voice(emu, epcm->extra, 1, 1, NULL);
-                snd_emu10k1_playback_prepare_voice(emu, epcm->voices[0], 0, 0,
-                                                   &emu->efx_pcm_mixer[0]);
-                for (i = 1; i < NUM_EFX_PLAYBACK; i++)
-                        snd_emu10k1_playback_prepare_voice(emu, epcm->voices[i], 0, 0,
-                                                           &emu->efx_pcm_mixer[i]);
-                snd_emu10k1_playback_trigger_voice(emu, epcm->voices[0], 0, 0);
-                snd_emu10k1_playback_trigger_voice(emu, epcm->extra, 1, 1);
-                for (i = 1; i < NUM_EFX_PLAYBACK; i++)
-                        snd_emu10k1_playback_trigger_voice(emu, epcm->voices[i], 0, 0);
-                epcm->running = 1;
+                mask = snd_emu10k1_efx_playback_voice_mask(
+                                epcm, runtime->channels);
+                for (int i = 0; i < 10; i++) {
+                        // Note that the freeze is not interruptible, so we make no
+                        // effort to reset the bits outside the error handling here.
+                        snd_emu10k1_voice_set_loop_stop_multiple(emu, mask);
+                        snd_emu10k1_efx_playback_freeze_voices(
+                                        emu, epcm, runtime->channels);
+                        snd_emu10k1_playback_prepare_voices(
+                                        emu, epcm, true, false, runtime->channels);
+
+                        // It might seem to make more sense to unmute the voices only after
+                        // they have been started, to potentially avoid torturing the speakers
+                        // if something goes wrong. However, we cannot unmute atomically,
+                        // which means that we'd get some mild artifacts in the regular case.
+                        snd_emu10k1_efx_playback_unmute_voices(emu, epcm, runtime->channels);
+
+                        snd_emu10k1_playback_set_running(emu, epcm);
+                        result = snd_emu10k1_voice_clear_loop_stop_multiple_atomic(emu, mask);
+                        if (result == 0) {
+                                // The extra voice is allowed to lag a bit
+                                snd_emu10k1_playback_trigger_voice(emu, epcm->extra);
+                                goto leave;
+                        }
+
+                        snd_emu10k1_efx_playback_stop_voices(
+                                        emu, epcm, runtime->channels);
+
+                        if (result != -EAGAIN)
+                                break;
+                        // The sync start can legitimately fail due to NMIs, etc.
+                }
+                snd_emu10k1_voice_clear_loop_stop_multiple(emu, mask);
                 break;
         case SNDRV_PCM_TRIGGER_SUSPEND:
         case SNDRV_PCM_TRIGGER_STOP:
         case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-                epcm->running = 0;
-                for (i = 0; i < NUM_EFX_PLAYBACK; i++) {        
-                        snd_emu10k1_playback_stop_voice(emu, epcm->voices[i]);
-                }
                 snd_emu10k1_playback_stop_voice(emu, epcm->extra);
+                snd_emu10k1_efx_playback_stop_voices(
+                                emu, epcm, runtime->channels);
+
+                epcm->resume_pos = snd_emu10k1_playback_pointer(substream);
                 break;
         default:
@@ -933 +997 @@
                 break;
         }
+leave:
         spin_unlock(&emu->reg_lock);
         return result;
@@ -972 +1037 @@
         .channels_max =         2,
         .buffer_bytes_max =     (128*1024),
-        .period_bytes_min =     64,
         .period_bytes_max =     (128*1024),
-        .periods_min =          1,
+        .periods_min =          2,
         .periods_max =          1024,
         .fifo_size =            0,
@@ -990 +1054 @@
                                  SNDRV_PCM_INFO_MMAP_VALID),
         .formats =              SNDRV_PCM_FMTBIT_S16_LE,
-        .rates =                SNDRV_PCM_RATE_8000_48000,
+        .rates =                SNDRV_PCM_RATE_8000_48000 | SNDRV_PCM_RATE_KNOT,
         .rate_min =             8000,
         .rate_max =             48000,
@@ -1010 +1074 @@
                                  SNDRV_PCM_INFO_MMAP_VALID),
         .formats =              SNDRV_PCM_FMTBIT_S16_LE,
-        .rates =                SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | 
-                                 SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | 
-                                 SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000,
-        .rate_min =             44100,
-        .rate_max =             192000,
-        .channels_min =         8,
-        .channels_max =         8,
+        .rates =                SNDRV_PCM_RATE_48000,
+        .rate_min =             48000,
+        .rate_max =             48000,
+        .channels_min =         1,
+        .channels_max =         16,
         .buffer_bytes_max =     (64*1024),
         .period_bytes_min =     384,
@@ -1077 +1139 @@
 }
 
+static int snd_emu10k1_playback_set_constraints(struct snd_pcm_runtime *runtime)
+{
+        int err;
+
+        // The buffer size must be a multiple of the period size, to avoid a
+        // mismatch between the extra voice and the regular voices.
+        err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
+        if (err < 0)
+                return err;
+        // The hardware is typically the cache's size of 64 frames ahead.
+        // Leave enough time for actually filling up the buffer.
+        err = snd_pcm_hw_constraint_minmax(
+                        runtime, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 128, UINT_MAX);
+        return err;
+}
+
 static int snd_emu10k1_efx_playback_open(struct snd_pcm_substream *substream)
 {
@@ -1083 +1161 @@
         struct snd_emu10k1_pcm_mixer *mix;
         struct snd_pcm_runtime *runtime = substream->runtime;
-        int i;
+        int i, j, err;
 
         epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
@@ -1092 +1170 @@
         epcm->substream = substream;
         
-        emu->pcm_playback_efx_substream = substream;
-
         runtime->private_data = epcm;
         runtime->private_free = snd_emu10k1_pcm_free_substream;
         runtime->hw = snd_emu10k1_efx_playback;
-        
+        if (emu->card_capabilities->emu_model)
+                snd_emu1010_constrain_efx_rate(emu, runtime);
+        err = snd_emu10k1_playback_set_constraints(runtime);
+        if (err < 0) {
+                kfree(epcm);
+                return err;
+        }
+
         for (i = 0; i < NUM_EFX_PLAYBACK; i++) {
                 mix = &emu->efx_pcm_mixer[i];
-                mix->send_routing[0][0] = i;
+                for (j = 0; j < 8; j++)
+                        mix->send_routing[0][j] = i + j;
                 memset(&mix->send_volume, 0, sizeof(mix->send_volume));
                 mix->send_volume[0][0] = 255;
-                mix->attn[0] = 0xffff;
+                mix->attn[0] = 0x8000;
                 mix->epcm = epcm;
                 snd_emu10k1_pcm_efx_mixer_notify(emu, i, 1);
@@ -1127 +1211 @@
         runtime->private_free = snd_emu10k1_pcm_free_substream;
         runtime->hw = snd_emu10k1_playback;
-        err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
+        err = snd_emu10k1_playback_set_constraints(runtime);
         if (err < 0) {
                 kfree(epcm);
                 return err;
         }
-        err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 256, UINT_MAX);
-        if (err < 0) {
-                kfree(epcm);
-                return err;
-        }
-        if (emu->card_capabilities->emu_model && emu->emu1010.internal_clock == 0)
-                sample_rate = 44100;
+        if (emu->card_capabilities->emu_model)
+                sample_rate = emu->emu1010.word_clock;
         else
                 sample_rate = 48000;
@@ -1147 +1226 @@
         }
         mix = &emu->pcm_mixer[substream->number];
-        for (i = 0; i < 4; i++)
+        for (i = 0; i < 8; i++)
                 mix->send_routing[0][i] = mix->send_routing[1][i] = mix->send_routing[2][i] = i;
         memset(&mix->send_volume, 0, sizeof(mix->send_volume));
         mix->send_volume[0][0] = mix->send_volume[0][1] =
         mix->send_volume[1][0] = mix->send_volume[2][1] = 255;
-        mix->attn[0] = mix->attn[1] = mix->attn[2] = 0xffff;
+        mix->attn[0] = mix->attn[1] = mix->attn[2] = 0x8000;
         mix->epcm = epcm;
         snd_emu10k1_pcm_mixer_notify(emu, substream->number, 1);
@@ -1188 +1267 @@
         runtime->private_free = snd_emu10k1_pcm_free_substream;
         runtime->hw = snd_emu10k1_capture;
+        snd_emu10k1_constrain_capture_rates(emu, runtime);
+        snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
+                                   &hw_constraints_capture_buffer_sizes);
         emu->capture_interrupt = snd_emu10k1_pcm_ac97adc_interrupt;
         emu->pcm_capture_substream = substream;
-        snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, &hw_constraints_capture_period_sizes);
-        snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE, &hw_constraints_capture_rates);
         return 0;
 }
@@ -1226 +1306 @@
         runtime->hw.rates = SNDRV_PCM_RATE_8000;
         runtime->hw.rate_min = runtime->hw.rate_max = 8000;
-        runtime->hw.channels_min = 1;
+        snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
+                                   &hw_constraints_capture_buffer_sizes);
         emu->capture_mic_interrupt = snd_emu10k1_pcm_ac97mic_interrupt;
         emu->pcm_capture_mic_substream = substream;
-        snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, &hw_constraints_capture_period_sizes);
         return 0;
 }
@@ -1237 +1317 @@
         struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
 
-        emu->capture_interrupt = NULL;
+        emu->capture_mic_interrupt = NULL;
         emu->pcm_capture_mic_substream = NULL;
         return 0;
@@ -1248 +1328 @@
         struct snd_pcm_runtime *runtime = substream->runtime;
         int nefx = emu->audigy ? 64 : 32;
-        int idx;
+        int idx, err;
 
         epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
@@ -1264 +1344 @@
         substream->runtime->private_free = snd_emu10k1_pcm_free_substream;
         runtime->hw = snd_emu10k1_capture_efx;
-        runtime->hw.rates = SNDRV_PCM_RATE_48000;
-        runtime->hw.rate_min = runtime->hw.rate_max = 48000;
-        spin_lock_irq(&emu->reg_lock);
         if (emu->card_capabilities->emu_model) {
-                /*  Nb. of channels has been increased to 16 */
-                /* TODO
-                 * SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE
-                 * SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |
-                 * SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 |
-                 * SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000
-                 * rate_min = 44100,
-                 * rate_max = 192000,
-                 * channels_min = 16,
-                 * channels_max = 16,
-                 * Need to add mixer control to fix sample rate
-                 *                 
+                snd_emu1010_constrain_efx_rate(emu, runtime);
+                /*
                  * There are 32 mono channels of 16bits each.
-                 * 24bit Audio uses 2x channels over 16bit
-                 * 96kHz uses 2x channels over 48kHz
-                 * 192kHz uses 4x channels over 48kHz
-                 * So, for 48kHz 24bit, one has 16 channels
-                 * for 96kHz 24bit, one has 8 channels
-                 * for 192kHz 24bit, one has 4 channels
-                 *
+                 * 24bit Audio uses 2x channels over 16bit,
+                 * 96kHz uses 2x channels over 48kHz,
+                 * 192kHz uses 4x channels over 48kHz.
+                 * So, for 48kHz 24bit, one has 16 channels,
+                 * for 96kHz 24bit, one has 8 channels,
+                 * for 192kHz 24bit, one has 4 channels.
+                 * 1010rev2 and 1616(m) cards have double that,
+                 * but we don't exceed 16 channels anyway.
                  */
-#if 1
-                switch (emu->emu1010.internal_clock) {
-                case 0:
-                        /* For 44.1kHz */
-                        runtime->hw.rates = SNDRV_PCM_RATE_44100;
-                        runtime->hw.rate_min = runtime->hw.rate_max = 44100;
-                        runtime->hw.channels_min =
-                                runtime->hw.channels_max = 16;
-                        break;
-                case 1:
-                        /* For 48kHz */
-                        runtime->hw.rates = SNDRV_PCM_RATE_48000;
-                        runtime->hw.rate_min = runtime->hw.rate_max = 48000;
-                        runtime->hw.channels_min =
-                                runtime->hw.channels_max = 16;
-                        break;
-                }
-#endif
 #if 0
                 /* For 96kHz */
-                runtime->hw.rates = SNDRV_PCM_RATE_96000;
-                runtime->hw.rate_min = runtime->hw.rate_max = 96000;
                 runtime->hw.channels_min = runtime->hw.channels_max = 4;
 #endif
 #if 0
                 /* For 192kHz */
-                runtime->hw.rates = SNDRV_PCM_RATE_192000;
-                runtime->hw.rate_min = runtime->hw.rate_max = 192000;
                 runtime->hw.channels_min = runtime->hw.channels_max = 2;
 #endif
                 runtime->hw.formats = SNDRV_PCM_FMTBIT_S32_LE;
-                /* efx_voices_mask[0] is expected to be zero
-                 * efx_voices_mask[1] is expected to have 32bits set
-                 */
         } else {
+                spin_lock_irq(&emu->reg_lock);
                 runtime->hw.channels_min = runtime->hw.channels_max = 0;
                 for (idx = 0; idx < nefx; idx++) {
@@ -1331 +1375 @@
                         }
                 }
-        }
-        epcm->capture_cr_val = emu->efx_voices_mask[0];
-        epcm->capture_cr_val2 = emu->efx_voices_mask[1];
-        spin_unlock_irq(&emu->reg_lock);
+                epcm->capture_cr_val = emu->efx_voices_mask[0];
+                epcm->capture_cr_val2 = emu->efx_voices_mask[1];
+                spin_unlock_irq(&emu->reg_lock);
+        }
+        err = snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
+                                         &hw_constraints_efx_capture_channels);
+        if (err < 0) {
+                kfree(epcm);
+                return err;
+        }
+        snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
+                                   &hw_constraints_capture_buffer_sizes);
         emu->capture_efx_interrupt = snd_emu10k1_pcm_efx_interrupt;
         emu->pcm_capture_efx_substream = substream;
-        snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, &hw_constraints_capture_period_sizes);
         return 0;
 }
@@ -1345 +1396 @@
         struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
 
-        emu->capture_interrupt = NULL;
+        emu->capture_efx_interrupt = NULL;
         emu->pcm_capture_efx_substream = NULL;
         return 0;
@@ -1373 +1424 @@
         .close =                snd_emu10k1_efx_playback_close,
         .hw_params =            snd_emu10k1_playback_hw_params,
-        .hw_free =              snd_emu10k1_efx_playback_hw_free,
+        .hw_free =              snd_emu10k1_playback_hw_free,
         .prepare =              snd_emu10k1_efx_playback_prepare,
         .trigger =              snd_emu10k1_efx_playback_trigger,
-        .pointer =              snd_emu10k1_efx_playback_pointer,
+        .pointer =              snd_emu10k1_playback_pointer,
 };
 
@@ -1488 +1539 @@
         int idx;
         
-        spin_lock_irq(&emu->reg_lock);
         for (idx = 0; idx < nefx; idx++)
                 ucontrol->value.integer.value[idx] = (emu->efx_voices_mask[idx / 32] & (1 << (idx % 32))) ? 1 : 0;
-        spin_unlock_irq(&emu->reg_lock);
         return 0;
 }
@@ -1500 +1549 @@
         unsigned int nval[2], bits;
         int nefx = emu->audigy ? 64 : 32;
-        int nefxb = emu->audigy ? 7 : 6;
         int change, idx;
         
@@ -1509 +1557 @@
                         bits++;
                 }
-                
-        for (idx = 0; idx < nefxb; idx++)
-                if (1 << idx == bits)
-                        break;
-        
-        if (idx >= nefxb)
+
+        if (bits == 9 || bits == 11 || bits == 13 || bits == 15 || bits > 16)
                 return -EINVAL;
 
@@ -1646 +1690 @@
         pcm->tram_pos = INITIAL_TRAM_POS(pcm->buffer_size);
         pcm->tram_shift = 0;
-        snd_emu10k1_ptr_write(emu, emu->gpr_base + pcm->gpr_running, 0, 0);     /* reset */
-        snd_emu10k1_ptr_write(emu, emu->gpr_base + pcm->gpr_trigger, 0, 0);     /* reset */
-        snd_emu10k1_ptr_write(emu, emu->gpr_base + pcm->gpr_size, 0, runtime->buffer_size);
-        snd_emu10k1_ptr_write(emu, emu->gpr_base + pcm->gpr_ptr, 0, 0);         /* reset ptr number */
-        snd_emu10k1_ptr_write(emu, emu->gpr_base + pcm->gpr_count, 0, runtime->period_size);
-        snd_emu10k1_ptr_write(emu, emu->gpr_base + pcm->gpr_tmpcount, 0, runtime->period_size);
+        snd_emu10k1_ptr_write_multiple(emu, 0,
+                emu->gpr_base + pcm->gpr_running, 0,    /* reset */
+                emu->gpr_base + pcm->gpr_trigger, 0,    /* reset */
+                emu->gpr_base + pcm->gpr_size, runtime->buffer_size,
+                emu->gpr_base + pcm->gpr_ptr, 0,        /* reset ptr number */
+                emu->gpr_base + pcm->gpr_count, runtime->period_size,
+                emu->gpr_base + pcm->gpr_tmpcount, runtime->period_size,
+                REGLIST_END);
         for (i = 0; i < pcm->channels; i++)
                 snd_emu10k1_ptr_write(emu, TANKMEMADDRREGBASE + 0x80 + pcm->etram[i], 0, (TANKMEMADDRREG_READ|TANKMEMADDRREG_ALIGN) + i * (runtime->buffer_size / pcm->channels));
@@ -1782 +1828 @@
         int err;
 
-        err = snd_pcm_new(emu->card, "emu10k1 efx", device, 8, 1, &pcm);
+        err = snd_pcm_new(emu->card, "emu10k1 efx", device, emu->audigy ? 0 : 8, 1, &pcm);
         if (err < 0)
                 return err;
@@ -1788 +1834 @@
         pcm->private_data = emu;
 
-        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_fx8010_playback_ops);
+        if (!emu->audigy)
+                snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_fx8010_playback_ops);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_efx_ops);
 
         pcm->info_flags = 0;
-        strcpy(pcm->name, "Multichannel Capture/PT Playback");
+        if (emu->audigy)
+                strcpy(pcm->name, "Multichannel Capture");
+        else
+                strcpy(pcm->name, "Multichannel Capture/PT Playback");
         emu->pcm_efx = pcm;
 
-        /* EFX capture - record the "FXBUS2" channels, by default we connect the EXTINs 
-         * to these
-         */     
-        
-        /* emu->efx_voices_mask[0] = FXWC_DEFAULTROUTE_C | FXWC_DEFAULTROUTE_A; */
-        if (emu->audigy) {
-                emu->efx_voices_mask[0] = 0;
-                if (emu->card_capabilities->emu_model)
-                        /* Pavel Hofman - 32 voices will be used for
-                         * capture (write mode) -
-                         * each bit = corresponding voice
-                         */
-                        emu->efx_voices_mask[1] = 0xffffffff;
-                else
+        if (!emu->card_capabilities->emu_model) {
+                // On Sound Blasters, the DSP code copies the EXTINs to FXBUS2.
+                // The mask determines which of these and the EXTOUTs the multi-
+                // channel capture actually records (the channel order is fixed).
+                if (emu->audigy) {
+                        emu->efx_voices_mask[0] = 0;
                         emu->efx_voices_mask[1] = 0xffff;
+                } else {
+                        emu->efx_voices_mask[0] = 0xffff0000;
+                        emu->efx_voices_mask[1] = 0;
+                }
+                kctl = snd_ctl_new1(&snd_emu10k1_pcm_efx_voices_mask, emu);
+                if (!kctl)
+                        return -ENOMEM;
+                kctl->id.device = device;
+                err = snd_ctl_add(emu->card, kctl);
+                if (err < 0)
+                        return err;
         } else {
-                emu->efx_voices_mask[0] = 0xffff0000;
-                emu->efx_voices_mask[1] = 0;
-        }
-        /* For emu1010, the control has to set 32 upper bits (voices)
-         * out of the 64 bits (voices) to true for the 16-channels capture
-         * to work correctly. Correct A_FXWC2 initial value (0xffffffff)
-         * is already defined but the snd_emu10k1_pcm_efx_voices_mask
-         * control can override this register's value.
-         */
-        kctl = snd_ctl_new1(&snd_emu10k1_pcm_efx_voices_mask, emu);
-        if (!kctl)
-                return -ENOMEM;
-        kctl->id.device = device;
-        err = snd_ctl_add(emu->card, kctl);
-        if (err < 0)
-                return err;
+                // On E-MU cards, the DSP code copies the P16VINs/EMU32INs to
+                // FXBUS2. These are already selected & routed by the FPGA,
+                // so there is no need to apply additional masking.
+        }
 
         snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, &emu->pci->dev,

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

@@ -2 +2 @@
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
+ *                   Lee Revell <rlrevell@joe-job.com>
+ *                   James Courtier-Dutton <James@superbug.co.uk>
+ *                   Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
  *                   Creative Labs, Inc.
+ *
  *  Routines for control of EMU10K1 chips / proc interface routines
- *
- *  Copyright (c) by James Courtier-Dutton <James@superbug.co.uk>
- *      Added EMU 1010 support.
- *
- *  BUGS:
- *    --
- *
- *  TODO:
- *    --
  */
 
@@ -67 +62 @@
                                   struct snd_info_buffer *buffer)
 {
-        /* FIXME - output names are in emufx.c too */
-        static const char * const creative_outs[32] = {
-                /* 00 */ "AC97 Left",
-                /* 01 */ "AC97 Right",
-                /* 02 */ "Optical IEC958 Left",
-                /* 03 */ "Optical IEC958 Right",
-                /* 04 */ "Center",
-                /* 05 */ "LFE",
-                /* 06 */ "Headphone Left",
-                /* 07 */ "Headphone Right",
-                /* 08 */ "Surround Left",
-                /* 09 */ "Surround Right",
-                /* 10 */ "PCM Capture Left",
-                /* 11 */ "PCM Capture Right",
-                /* 12 */ "MIC Capture",
-                /* 13 */ "AC97 Surround Left",
-                /* 14 */ "AC97 Surround Right",
-                /* 15 */ "???",
-                /* 16 */ "???",
-                /* 17 */ "Analog Center",
-                /* 18 */ "Analog LFE",
-                /* 19 */ "???",
-                /* 20 */ "???",
-                /* 21 */ "???",
-                /* 22 */ "???",
-                /* 23 */ "???",
-                /* 24 */ "???",
-                /* 25 */ "???",
-                /* 26 */ "???",
-                /* 27 */ "???",
-                /* 28 */ "???",
-                /* 29 */ "???",
-                /* 30 */ "???",
-                /* 31 */ "???"
-        };
-
-        static const char * const audigy_outs[64] = {
-                /* 00 */ "Digital Front Left",
-                /* 01 */ "Digital Front Right",
-                /* 02 */ "Digital Center",
-                /* 03 */ "Digital LEF",
-                /* 04 */ "Headphone Left",
-                /* 05 */ "Headphone Right",
-                /* 06 */ "Digital Rear Left",
-                /* 07 */ "Digital Rear Right",
-                /* 08 */ "Front Left",
-                /* 09 */ "Front Right",
-                /* 10 */ "Center",
-                /* 11 */ "LFE",
-                /* 12 */ "???",
-                /* 13 */ "???",
-                /* 14 */ "Rear Left",
-                /* 15 */ "Rear Right",
-                /* 16 */ "AC97 Front Left",
-                /* 17 */ "AC97 Front Right",
-                /* 18 */ "ADC Capture Left",
-                /* 19 */ "ADC Capture Right",
-                /* 20 */ "???",
-                /* 21 */ "???",
-                /* 22 */ "???",
-                /* 23 */ "???",
-                /* 24 */ "???",
-                /* 25 */ "???",
-                /* 26 */ "???",
-                /* 27 */ "???",
-                /* 28 */ "???",
-                /* 29 */ "???",
-                /* 30 */ "???",
-                /* 31 */ "???",
-                /* 32 */ "FXBUS2_0",
-                /* 33 */ "FXBUS2_1",
-                /* 34 */ "FXBUS2_2",
-                /* 35 */ "FXBUS2_3",
-                /* 36 */ "FXBUS2_4",
-                /* 37 */ "FXBUS2_5",
-                /* 38 */ "FXBUS2_6",
-                /* 39 */ "FXBUS2_7",
-                /* 40 */ "FXBUS2_8",
-                /* 41 */ "FXBUS2_9",
-                /* 42 */ "FXBUS2_10",
-                /* 43 */ "FXBUS2_11",
-                /* 44 */ "FXBUS2_12",
-                /* 45 */ "FXBUS2_13",
-                /* 46 */ "FXBUS2_14",
-                /* 47 */ "FXBUS2_15",
-                /* 48 */ "FXBUS2_16",
-                /* 49 */ "FXBUS2_17",
-                /* 50 */ "FXBUS2_18",
-                /* 51 */ "FXBUS2_19",
-                /* 52 */ "FXBUS2_20",
-                /* 53 */ "FXBUS2_21",
-                /* 54 */ "FXBUS2_22",
-                /* 55 */ "FXBUS2_23",
-                /* 56 */ "FXBUS2_24",
-                /* 57 */ "FXBUS2_25",
-                /* 58 */ "FXBUS2_26",
-                /* 59 */ "FXBUS2_27",
-                /* 60 */ "FXBUS2_28",
-                /* 61 */ "FXBUS2_29",
-                /* 62 */ "FXBUS2_30",
-                /* 63 */ "FXBUS2_31"
-        };
-
-        struct snd_emu10k1 *emu = entry->private_data;
-        unsigned int val, val1;
-        int nefx = emu->audigy ? 64 : 32;
-        const char * const *outputs = emu->audigy ? audigy_outs : creative_outs;
+        struct snd_emu10k1 *emu = entry->private_data;
+        const char * const *inputs = emu->audigy ?
+                snd_emu10k1_audigy_ins : snd_emu10k1_sblive_ins;
+        const char * const *outputs = emu->audigy ?
+                snd_emu10k1_audigy_outs : snd_emu10k1_sblive_outs;
+        unsigned short extin_mask = emu->audigy ? ~0 : emu->fx8010.extin_mask;
+        unsigned short extout_mask = emu->audigy ? ~0 : emu->fx8010.extout_mask;
+        unsigned int val, val1, ptrx, psst, dsl, snda;
+        int nefx = emu->audigy ? 32 : 16;
         int idx;
         
         snd_iprintf(buffer, "EMU10K1\n\n");
         snd_iprintf(buffer, "Card                  : %s\n",
-                    emu->audigy ? "Audigy" : (emu->card_capabilities->ecard ? "EMU APS" : "Creative"));
+                    emu->card_capabilities->emu_model ? "E-MU D.A.S." :
+                    emu->card_capabilities->ecard ? "E-MU A.P.S." :
+                    emu->audigy ? "SB Audigy" : "SB Live!");
         snd_iprintf(buffer, "Internal TRAM (words) : 0x%x\n", emu->fx8010.itram_size);
         snd_iprintf(buffer, "External TRAM (words) : 0x%x\n", (int)emu->fx8010.etram_pages.bytes / 2);
-        snd_iprintf(buffer, "\n");
-        snd_iprintf(buffer, "Effect Send Routing   :\n");
+
+        snd_iprintf(buffer, "\nEffect Send Routing & Amounts:\n");
         for (idx = 0; idx < NUM_G; idx++) {
-                val = emu->audigy ?
-                        snd_emu10k1_ptr_read(emu, A_FXRT1, idx) :
-                        snd_emu10k1_ptr_read(emu, FXRT, idx);
-                val1 = emu->audigy ?
-                        snd_emu10k1_ptr_read(emu, A_FXRT2, idx) :
-                        0;
+                ptrx = snd_emu10k1_ptr_read(emu, PTRX, idx);
+                psst = snd_emu10k1_ptr_read(emu, PSST, idx);
+                dsl = snd_emu10k1_ptr_read(emu, DSL, idx);
                 if (emu->audigy) {
-                        snd_iprintf(buffer, "Ch%i: A=%i, B=%i, C=%i, D=%i, ",
+                        val = snd_emu10k1_ptr_read(emu, A_FXRT1, idx);
+                        val1 = snd_emu10k1_ptr_read(emu, A_FXRT2, idx);
+                        snda = snd_emu10k1_ptr_read(emu, A_SENDAMOUNTS, idx);
+                        snd_iprintf(buffer, "Ch%-2i: A=%2i:%02x, B=%2i:%02x, C=%2i:%02x, D=%2i:%02x, ",
                                 idx,
-                                val & 0x3f,
-                                (val >> 8) & 0x3f,
-                                (val >> 16) & 0x3f,
-                                (val >> 24) & 0x3f);
-                        snd_iprintf(buffer, "E=%i, F=%i, G=%i, H=%i\n",
-                                val1 & 0x3f,
-                                (val1 >> 8) & 0x3f,
-                                (val1 >> 16) & 0x3f,
-                                (val1 >> 24) & 0x3f);
+                                val & 0x3f, REG_VAL_GET(PTRX_FXSENDAMOUNT_A, ptrx),
+                                (val >> 8) & 0x3f, REG_VAL_GET(PTRX_FXSENDAMOUNT_B, ptrx),
+                                (val >> 16) & 0x3f, REG_VAL_GET(PSST_FXSENDAMOUNT_C, psst),
+                                (val >> 24) & 0x3f, REG_VAL_GET(DSL_FXSENDAMOUNT_D, dsl));
+                        snd_iprintf(buffer, "E=%2i:%02x, F=%2i:%02x, G=%2i:%02x, H=%2i:%02x\n",
+                                val1 & 0x3f, (snda >> 24) & 0xff,
+                                (val1 >> 8) & 0x3f, (snda >> 16) & 0xff,
+                                (val1 >> 16) & 0x3f, (snda >> 8) & 0xff,
+                                (val1 >> 24) & 0x3f, snda & 0xff);
                 } else {
-                        snd_iprintf(buffer, "Ch%i: A=%i, B=%i, C=%i, D=%i\n",
+                        val = snd_emu10k1_ptr_read(emu, FXRT, idx);
+                        snd_iprintf(buffer, "Ch%-2i: A=%2i:%02x, B=%2i:%02x, C=%2i:%02x, D=%2i:%02x\n",
                                 idx,
-                                (val >> 16) & 0x0f,
-                                (val >> 20) & 0x0f,
-                                (val >> 24) & 0x0f,
-                                (val >> 28) & 0x0f);
-                }
-        }
-        snd_iprintf(buffer, "\nCaptured FX Outputs   :\n");
-        for (idx = 0; idx < nefx; idx++) {
-                if (emu->efx_voices_mask[idx/32] & (1 << (idx%32)))
-                        snd_iprintf(buffer, "  Output %02i [%s]\n", idx, outputs[idx]);
-        }
-        snd_iprintf(buffer, "\nAll FX Outputs        :\n");
-        for (idx = 0; idx < (emu->audigy ? 64 : 32); idx++)
-                snd_iprintf(buffer, "  Output %02i [%s]\n", idx, outputs[idx]);
+                                (val >> 16) & 0x0f, REG_VAL_GET(PTRX_FXSENDAMOUNT_A, ptrx),
+                                (val >> 20) & 0x0f, REG_VAL_GET(PTRX_FXSENDAMOUNT_B, ptrx),
+                                (val >> 24) & 0x0f, REG_VAL_GET(PSST_FXSENDAMOUNT_C, psst),
+                                (val >> 28) & 0x0f, REG_VAL_GET(DSL_FXSENDAMOUNT_D, dsl));
+                }
+        }
+        snd_iprintf(buffer, "\nEffect Send Targets:\n");
+        // Audigy actually has 64, but we don't use them all.
+        for (idx = 0; idx < 32; idx++) {
+                const char *c = snd_emu10k1_fxbus[idx];
+                if (c)
+                        snd_iprintf(buffer, "  Channel %02i [%s]\n", idx, c);
+        }
+        if (!emu->card_capabilities->emu_model) {
+                snd_iprintf(buffer, "\nOutput Channels:\n");
+                for (idx = 0; idx < 32; idx++)
+                        if (outputs[idx] && (extout_mask & (1 << idx)))
+                                snd_iprintf(buffer, "  Channel %02i [%s]\n", idx, outputs[idx]);
+                snd_iprintf(buffer, "\nInput Channels:\n");
+                for (idx = 0; idx < 16; idx++)
+                        if (inputs[idx] && (extin_mask & (1 << idx)))
+                                snd_iprintf(buffer, "  Channel %02i [%s]\n", idx, inputs[idx]);
+                snd_iprintf(buffer, "\nMultichannel Capture Sources:\n");
+                for (idx = 0; idx < nefx; idx++)
+                        if (emu->efx_voices_mask[0] & (1 << idx))
+                                snd_iprintf(buffer, "  Channel %02i [Output: %s]\n",
+                                            idx, outputs[idx] ? outputs[idx] : "???");
+                if (emu->audigy) {
+                        for (idx = 0; idx < 32; idx++)
+                                if (emu->efx_voices_mask[1] & (1 << idx))
+                                        snd_iprintf(buffer, "  Channel %02i [Input: %s]\n",
+                                                    idx + 32, inputs[idx] ? inputs[idx] : "???");
+                } else {
+                        for (idx = 0; idx < 16; idx++) {
+                                if (emu->efx_voices_mask[0] & ((1 << 16) << idx)) {
+                                        if (emu->card_capabilities->sblive51) {
+                                                s8 c = snd_emu10k1_sblive51_fxbus2_map[idx];
+                                                if (c == -1)
+                                                        snd_iprintf(buffer, "  Channel %02i [Output: %s]\n",
+                                                                    idx + 16, outputs[idx + 16]);
+                                                else
+                                                        snd_iprintf(buffer, "  Channel %02i [Input: %s]\n",
+                                                                    idx + 16, inputs[c]);
+                                        } else {
+                                                snd_iprintf(buffer, "  Channel %02i [Input: %s]\n",
+                                                            idx + 16, inputs[idx] ? inputs[idx] : "???");
+                                        }
+                                }
+                        }
+                }
+        }
 }
 
@@ -227 +164 @@
         u32 value;
         u32 value2;
-        u32 rate;
 
         if (emu->card_capabilities->emu_model) {
-                snd_emu1010_fpga_read(emu, 0x38, &value);
-                if ((value & 0x1) == 0) {
-                        snd_emu1010_fpga_read(emu, 0x2a, &value);
-                        snd_emu1010_fpga_read(emu, 0x2b, &value2);
-                        rate = 0x1770000 / (((value << 5) | value2)+1); 
-                        snd_iprintf(buffer, "ADAT Locked : %u\n", rate);
-                } else {
-                        snd_iprintf(buffer, "ADAT Unlocked\n");
-                }
-                snd_emu1010_fpga_read(emu, 0x20, &value);
-                if ((value & 0x4) == 0) {
-                        snd_emu1010_fpga_read(emu, 0x28, &value);
-                        snd_emu1010_fpga_read(emu, 0x29, &value2);
-                        rate = 0x1770000 / (((value << 5) | value2)+1); 
-                        snd_iprintf(buffer, "SPDIF Locked : %d\n", rate);
-                } else {
-                        snd_iprintf(buffer, "SPDIF Unlocked\n");
-                }
+                // This represents the S/PDIF lock status on 0404b, which is
+                // kinda weird and unhelpful, because monitoring it via IRQ is
+                // impractical (one gets an IRQ flood as long as it is desynced).
+                snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &value);
+                snd_iprintf(buffer, "Lock status 1: %#x\n", value & 0x10);
+
+                // Bit 0x1 in LO being 0 is supposedly for ADAT lock.
+                // The registers are always all zero on 0404b.
+                snd_emu1010_fpga_read(emu, EMU_HANA_LOCK_STS_LO, &value);
+                snd_emu1010_fpga_read(emu, EMU_HANA_LOCK_STS_HI, &value2);
+                snd_iprintf(buffer, "Lock status 2: %#x %#x\n", value, value2);
+
+                snd_iprintf(buffer, "S/PDIF rate: %dHz\n",
+                            snd_emu1010_get_raw_rate(emu, EMU_HANA_WCLOCK_HANA_SPDIF_IN));
+                if (emu->card_capabilities->emu_model != EMU_MODEL_EMU0404) {
+                        snd_iprintf(buffer, "ADAT rate: %dHz\n",
+                                    snd_emu1010_get_raw_rate(emu, EMU_HANA_WCLOCK_HANA_ADAT_IN));
+                        snd_iprintf(buffer, "Dock rate: %dHz\n",
+                                    snd_emu1010_get_raw_rate(emu, EMU_HANA_WCLOCK_2ND_HANA));
+                }
+                if (emu->card_capabilities->emu_model == EMU_MODEL_EMU0404 ||
+                    emu->card_capabilities->emu_model == EMU_MODEL_EMU1010)
+                        snd_iprintf(buffer, "BNC rate: %dHz\n",
+                                    snd_emu1010_get_raw_rate(emu, EMU_HANA_WCLOCK_SYNC_BNC));
+
+                snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &value);
+                if (value & EMU_HANA_SPDIF_MODE_RX_INVALID)
+                        snd_iprintf(buffer, "\nS/PDIF input invalid\n");
+                else
+                        snd_iprintf(buffer, "\nS/PDIF mode: %s%s\n",
+                                    value & EMU_HANA_SPDIF_MODE_RX_PRO ? "professional" : "consumer",
+                                    value & EMU_HANA_SPDIF_MODE_RX_NOCOPY ? ", no copy" : "");
         } else {
                 snd_emu10k1_proc_spdif_status(emu, buffer, "CD-ROM S/PDIF In", CDCS, CDSRCS);
@@ -274 +224 @@
 }
 
-static void snd_emu10k1_proc_acode_read(struct snd_info_entry *entry, 
+struct emu10k1_reg_entry {
+        unsigned short base, size;
+        const char *name;
+};
+
+static const struct emu10k1_reg_entry sblive_reg_entries[] = {
+        {    0, 0x10, "FXBUS" },
+        { 0x10, 0x10, "EXTIN" },
+        { 0x20, 0x10, "EXTOUT" },
+        { 0x30, 0x10, "FXBUS2" },
+        { 0x40, 0x20, NULL },  // Constants
+        { 0x100, 0x100, "GPR" },
+        { 0x200, 0x80, "ITRAM_DATA" },
+        { 0x280, 0x20, "ETRAM_DATA" },
+        { 0x300, 0x80, "ITRAM_ADDR" },
+        { 0x380, 0x20, "ETRAM_ADDR" },
+        { 0x400, 0, NULL }
+};
+
+static const struct emu10k1_reg_entry audigy_reg_entries[] = {
+        {    0, 0x40, "FXBUS" },
+        { 0x40, 0x10, "EXTIN" },
+        { 0x50, 0x10, "P16VIN" },
+        { 0x60, 0x20, "EXTOUT" },
+        { 0x80, 0x20, "FXBUS2" },
+        { 0xa0, 0x10, "EMU32OUTH" },
+        { 0xb0, 0x10, "EMU32OUTL" },
+        { 0xc0, 0x20, NULL },  // Constants
+        // This can't be quite right - overlap.
+        //{ 0x100, 0xc0, "ITRAM_CTL" },
+        //{ 0x1c0, 0x40, "ETRAM_CTL" },
+        { 0x160, 0x20, "A3_EMU32IN" },
+        { 0x1e0, 0x20, "A3_EMU32OUT" },
+        { 0x200, 0xc0, "ITRAM_DATA" },
+        { 0x2c0, 0x40, "ETRAM_DATA" },
+        { 0x300, 0xc0, "ITRAM_ADDR" },
+        { 0x3c0, 0x40, "ETRAM_ADDR" },
+        { 0x400, 0x200, "GPR" },
+        { 0x600, 0, NULL }
+};
+
+static const char * const emu10k1_const_entries[] = {
+        "C_00000000",
+        "C_00000001",
+        "C_00000002",
+        "C_00000003",
+        "C_00000004",
+        "C_00000008",
+        "C_00000010",
+        "C_00000020",
+        "C_00000100",
+        "C_00010000",
+        "C_00000800",
+        "C_10000000",
+        "C_20000000",
+        "C_40000000",
+        "C_80000000",
+        "C_7fffffff",
+        "C_ffffffff",
+        "C_fffffffe",
+        "C_c0000000",
+        "C_4f1bbcdc",
+        "C_5a7ef9db",
+        "C_00100000",
+        "GPR_ACCU",
+        "GPR_COND",
+        "GPR_NOISE0",
+        "GPR_NOISE1",
+        "GPR_IRQ",
+        "GPR_DBAC",
+        "GPR_DBACE",
+        "???",
+};
+
+static int disasm_emu10k1_reg(char *buffer,
+                              const struct emu10k1_reg_entry *entries,
+                              unsigned reg, const char *pfx)
+{
+        for (int i = 0; ; i++) {
+                unsigned base = entries[i].base;
+                unsigned size = entries[i].size;
+                if (!size)
+                        return sprintf(buffer, "%s0x%03x", pfx, reg);
+                if (reg >= base && reg < base + size) {
+                        const char *name = entries[i].name;
+                        reg -= base;
+                        if (name)
+                                return sprintf(buffer, "%s%s(%u)", pfx, name, reg);
+                        return sprintf(buffer, "%s%s", pfx, emu10k1_const_entries[reg]);
+                }
+        }
+}
+
+static int disasm_sblive_reg(char *buffer, unsigned reg, const char *pfx)
+{
+        return disasm_emu10k1_reg(buffer, sblive_reg_entries, reg, pfx);
+}
+
+static int disasm_audigy_reg(char *buffer, unsigned reg, const char *pfx)
+{
+        return disasm_emu10k1_reg(buffer, audigy_reg_entries, reg, pfx);
+}
+
+static void snd_emu10k1_proc_acode_read(struct snd_info_entry *entry,
                                         struct snd_info_buffer *buffer)
 {
         u32 pc;
         struct snd_emu10k1 *emu = entry->private_data;
+        static const char * const insns[16] = {
+                "MAC0", "MAC1", "MAC2", "MAC3", "MACINT0", "MACINT1", "ACC3", "MACMV",
+                "ANDXOR", "TSTNEG", "LIMITGE", "LIMITLT", "LOG", "EXP", "INTERP", "SKIP",
+        };
+        static const char spaces[] = "                              ";
+        const int nspaces = sizeof(spaces) - 1;
 
         snd_iprintf(buffer, "FX8010 Instruction List '%s'\n", emu->fx8010.name);
@@ -284 +343 @@
         for (pc = 0; pc < (emu->audigy ? 1024 : 512); pc++) {
                 u32 low, high;
+                int len;
+                char buf[100];
+                char *bufp = buf;
                         
                 low = snd_emu10k1_efx_read(emu, pc * 2);
                 high = snd_emu10k1_efx_read(emu, pc * 2 + 1);
-                if (emu->audigy)
-                        snd_iprintf(buffer, "    OP(0x%02x, 0x%03x, 0x%03x, 0x%03x, 0x%03x) /* 0x%04x: 0x%08x%08x */\n",
-                                    (high >> 24) & 0x0f,
-                                    (high >> 12) & 0x7ff,
-                                    (high >> 0) & 0x7ff,
-                                    (low >> 12) & 0x7ff,
-                                    (low >> 0) & 0x7ff,
-                                    pc,
-                                    high, low);
-                else
-                        snd_iprintf(buffer, "    OP(0x%02x, 0x%03x, 0x%03x, 0x%03x, 0x%03x) /* 0x%04x: 0x%08x%08x */\n",
-                                    (high >> 20) & 0x0f,
-                                    (high >> 10) & 0x3ff,
-                                    (high >> 0) & 0x3ff,
-                                    (low >> 10) & 0x3ff,
-                                    (low >> 0) & 0x3ff,
-                                    pc,
-                                    high, low);
+                if (emu->audigy) {
+                        bufp += sprintf(bufp, "    %-7s  ", insns[(high >> 24) & 0x0f]);
+                        bufp += disasm_audigy_reg(bufp, (high >> 12) & 0x7ff, "");
+                        bufp += disasm_audigy_reg(bufp, (high >> 0) & 0x7ff, ", ");
+                        bufp += disasm_audigy_reg(bufp, (low >> 12) & 0x7ff, ", ");
+                        bufp += disasm_audigy_reg(bufp, (low >> 0) & 0x7ff, ", ");
+                } else {
+                        bufp += sprintf(bufp, "    %-7s  ", insns[(high >> 20) & 0x0f]);
+                        bufp += disasm_sblive_reg(bufp, (high >> 10) & 0x3ff, "");
+                        bufp += disasm_sblive_reg(bufp, (high >> 0) & 0x3ff, ", ");
+                        bufp += disasm_sblive_reg(bufp, (low >> 10) & 0x3ff, ", ");
+                        bufp += disasm_sblive_reg(bufp, (low >> 0) & 0x3ff, ", ");
+                }
+                len = (int)(ptrdiff_t)(bufp - buf);
+                snd_iprintf(buffer, "%s %s /* 0x%04x: 0x%08x%08x */\n",
+                            buf, &spaces[nspaces - clamp(65 - len, 0, nspaces)],
+                            pc, high, low);
         }
 }
@@ -366 +427 @@
         struct snd_emu10k1_voice *voice;
         int idx;
-        
-        snd_iprintf(buffer, "ch\tuse\tpcm\tefx\tsynth\tmidi\n");
+        static const char * const types[] = {
+                "Unused", "EFX", "EFX IRQ", "PCM", "PCM IRQ", "Synth"
+        };
+        //static_assert(ARRAY_SIZE(types) == EMU10K1_NUM_TYPES);
+
+        snd_iprintf(buffer, "ch\tdirty\tlast\tuse\n");
         for (idx = 0; idx < NUM_G; idx++) {
                 voice = &emu->voices[idx];
-                snd_iprintf(buffer, "%i\t%i\t%i\t%i\t%i\t%i\n",
+                snd_iprintf(buffer, "%i\t%u\t%u\t%s\n",
                         idx,
-                        voice->use,
-                        voice->pcm,
-                        voice->efx,
-                        voice->synth,
-                        voice->midi);
+                        voice->dirty,
+                        voice->last,
+                        types[voice->use]);
         }
 }
 
 #ifdef CONFIG_SND_DEBUG
+
+static void snd_emu_proc_emu1010_link_read(struct snd_emu10k1 *emu,
+                                           struct snd_info_buffer *buffer,
+                                           u32 dst)
+{
+        u32 src = snd_emu1010_fpga_link_dst_src_read(emu, dst);
+        snd_iprintf(buffer, "%04x: %04x\n", dst, src);
+}
+
 static void snd_emu_proc_emu1010_reg_read(struct snd_info_entry *entry,
                                      struct snd_info_buffer *buffer)
@@ -391 +463 @@
         for(i = 0; i < 0x40; i+=1) {
                 snd_emu1010_fpga_read(emu, i, &value);
-                snd_iprintf(buffer, "%02X: %08X, %02X\n", i, value, (value >> 8) & 0x7f);
+                snd_iprintf(buffer, "%02x: %02x\n", i, value);
+        }
+
+        snd_iprintf(buffer, "\nEMU1010 Routes:\n\n");
+
+        for (i = 0; i < 16; i++)  // To Alice2/Tina[2] via EMU32
+                snd_emu_proc_emu1010_link_read(emu, buffer, i);
+        if (emu->card_capabilities->emu_model != EMU_MODEL_EMU0404)
+                for (i = 0; i < 32; i++)  // To Dock via EDI
+                        snd_emu_proc_emu1010_link_read(emu, buffer, 0x100 + i);
+        if (emu->card_capabilities->emu_model != EMU_MODEL_EMU1616)
+                for (i = 0; i < 8; i++)  // To Hamoa/local
+                        snd_emu_proc_emu1010_link_read(emu, buffer, 0x200 + i);
+        for (i = 0; i < 8; i++)  // To Hamoa/Mana/local
+                snd_emu_proc_emu1010_link_read(emu, buffer, 0x300 + i);
+        if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1616) {
+                for (i = 0; i < 16; i++)  // To Tina2 via EMU32
+                        snd_emu_proc_emu1010_link_read(emu, buffer, 0x400 + i);
+        } else if (emu->card_capabilities->emu_model != EMU_MODEL_EMU0404) {
+                for (i = 0; i < 8; i++)  // To Hana ADAT
+                        snd_emu_proc_emu1010_link_read(emu, buffer, 0x400 + i);
+                if (emu->card_capabilities->emu_model == EMU_MODEL_EMU1010B) {
+                        for (i = 0; i < 16; i++)  // To Tina via EMU32
+                                snd_emu_proc_emu1010_link_read(emu, buffer, 0x500 + i);
+                } else {
+                        // To Alice2 via I2S
+                        snd_emu_proc_emu1010_link_read(emu, buffer, 0x500);
+                        snd_emu_proc_emu1010_link_read(emu, buffer, 0x501);
+                        snd_emu_proc_emu1010_link_read(emu, buffer, 0x600);
+                        snd_emu_proc_emu1010_link_read(emu, buffer, 0x601);
+                        snd_emu_proc_emu1010_link_read(emu, buffer, 0x700);
+                        snd_emu_proc_emu1010_link_read(emu, buffer, 0x701);
+                }
         }
 }
@@ -400 +504 @@
         struct snd_emu10k1 *emu = entry->private_data;
         unsigned long value;
-        unsigned long flags;
         int i;
         snd_iprintf(buffer, "IO Registers:\n\n");
         for(i = 0; i < 0x40; i+=4) {
-                spin_lock_irqsave(&emu->emu_lock, flags);
                 value = inl(emu->port + i);
-                spin_unlock_irqrestore(&emu->emu_lock, flags);
                 snd_iprintf(buffer, "%02X: %08lX\n", i, value);
         }
@@ -415 +516 @@
 {
         struct snd_emu10k1 *emu = entry->private_data;
-        unsigned long flags;
         char line[64];
         u32 reg, val;
@@ -422 +522 @@
                         continue;
                 if (reg < 0x40 && val <= 0xffffffff) {
-                        spin_lock_irqsave(&emu->emu_lock, flags);
                         outl(val, emu->port + (reg & 0xfffffffc));
-                        spin_unlock_irqrestore(&emu->emu_lock, flags);
                 }
         }
@@ -434 +532 @@
                                  unsigned int chn)
 {
-        unsigned long flags;
         unsigned int regptr, val;
 
         regptr = (reg << 16) | chn;
 
-        spin_lock_irqsave(&emu->emu_lock, flags);
+        spin_lock_irq(&emu->emu_lock);
         outl(regptr, emu->port + iobase + PTR);
         val = inl(emu->port + iobase + DATA);
-        spin_unlock_irqrestore(&emu->emu_lock, flags);
+        spin_unlock_irq(&emu->emu_lock);
         return val;
 }
@@ -453 +550 @@
 {
         unsigned int regptr;
-        unsigned long flags;
 
         regptr = (reg << 16) | chn;
 
-        spin_lock_irqsave(&emu->emu_lock, flags);
+        spin_lock_irq(&emu->emu_lock);
         outl(regptr, emu->port + iobase + PTR);
         outl(data, emu->port + iobase + DATA);
-        spin_unlock_irqrestore(&emu->emu_lock, flags);
+        spin_unlock_irq(&emu->emu_lock);
 }
 
@@ -478 +574 @@
                 snd_iprintf(buffer, "%02X: ",i);
                 for (j = 0; j < voices; j++) {
-                        if(iobase == 0)
-                                value = snd_ptr_read(emu, 0, i, j);
-                        else
-                                value = snd_ptr_read(emu, 0x20, i, j);
+                        value = snd_ptr_read(emu, iobase, i, j);
                         snd_iprintf(buffer, "%08lX ", value);
                 }
@@ -489 +582 @@
 
 static void snd_emu_proc_ptr_reg_write(struct snd_info_entry *entry,
-                                       struct snd_info_buffer *buffer, int iobase)
+                                       struct snd_info_buffer *buffer,
+                                       int iobase, int length, int voices)
 {
         struct snd_emu10k1 *emu = entry->private_data;
@@ -497 +591 @@
                 if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3)
                         continue;
-                if (reg < 0xa0 && val <= 0xffffffff && channel_id <= 3)
+                if (reg < length && channel_id < voices)
                         snd_ptr_write(emu, iobase, reg, channel_id, val);
         }
@@ -505 +599 @@
                                          struct snd_info_buffer *buffer)
 {
-        snd_emu_proc_ptr_reg_write(entry, buffer, 0);
+        snd_emu_proc_ptr_reg_write(entry, buffer, 0, 0x80, 64);
 }
 
@@ -511 +605 @@
                                          struct snd_info_buffer *buffer)
 {
-        snd_emu_proc_ptr_reg_write(entry, buffer, 0x20);
+        struct snd_emu10k1 *emu = entry->private_data;
+        snd_emu_proc_ptr_reg_write(entry, buffer, 0x20,
+                                   emu->card_capabilities->ca0108_chip ? 0xa0 : 0x80, 4);
 }
         
@@ -567 +663 @@
                              snd_emu_proc_ptr_reg_read00b,
                              snd_emu_proc_ptr_reg_write00);
-        snd_card_rw_proc_new(emu->card, "ptr_regs20a", emu,
-                             snd_emu_proc_ptr_reg_read20a,
-                             snd_emu_proc_ptr_reg_write20);
-        snd_card_rw_proc_new(emu->card, "ptr_regs20b", emu,
-                             snd_emu_proc_ptr_reg_read20b,
-                             snd_emu_proc_ptr_reg_write20);
-        snd_card_rw_proc_new(emu->card, "ptr_regs20c", emu,
-                             snd_emu_proc_ptr_reg_read20c,
-                             snd_emu_proc_ptr_reg_write20);
+        if (!emu->card_capabilities->emu_model &&
+            (emu->card_capabilities->ca0151_chip || emu->card_capabilities->ca0108_chip)) {
+                snd_card_rw_proc_new(emu->card, "ptr_regs20a", emu,
+                                     snd_emu_proc_ptr_reg_read20a,
+                                     snd_emu_proc_ptr_reg_write20);
+                snd_card_rw_proc_new(emu->card, "ptr_regs20b", emu,
+                                     snd_emu_proc_ptr_reg_read20b,
+                                     snd_emu_proc_ptr_reg_write20);
+                if (emu->card_capabilities->ca0108_chip)
+                        snd_card_rw_proc_new(emu->card, "ptr_regs20c", emu,
+                                             snd_emu_proc_ptr_reg_read20c,
+                                             snd_emu_proc_ptr_reg_write20);
+        }
 #endif
         

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

@@ -2 +2 @@
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
+ *                   Lee Revell <rlrevell@joe-job.com>
+ *                   James Courtier-Dutton <James@superbug.co.uk>
+ *                   Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
  *                   Creative Labs, Inc.
+ *
  *  Routines for control of EMU10K1 chips
- *
- *  BUGS:
- *    --
- *
- *  TODO:
- *    --
  */
 
@@ -19 +17 @@
 #include "p17v.h"
 
+static inline bool check_ptr_reg(struct snd_emu10k1 *emu, unsigned int reg)
+{
+        if (snd_BUG_ON(!emu))
+                return false;
+        if (snd_BUG_ON(reg & (emu->audigy ? (0xffff0000 & ~A_PTR_ADDRESS_MASK)
+                                          : (0xffff0000 & ~PTR_ADDRESS_MASK))))
+                return false;
+        if (snd_BUG_ON(reg & 0x0000ffff & ~PTR_CHANNELNUM_MASK))
+                return false;
+        return true;
+}
+
 unsigned int snd_emu10k1_ptr_read(struct snd_emu10k1 * emu, unsigned int reg, unsigned int chn)
 {
@@ -25 +35 @@
         unsigned int mask;
 
-        mask = emu->audigy ? A_PTR_ADDRESS_MASK : PTR_ADDRESS_MASK;
-        regptr = ((reg << 16) & mask) | (chn & PTR_CHANNELNUM_MASK);
+        regptr = (reg << 16) | chn;
+        if (!check_ptr_reg(emu, regptr))
+                return 0;
+
+        spin_lock_irqsave(&emu->emu_lock, flags);
+        outl(regptr, emu->port + PTR);
+        val = inl(emu->port + DATA);
+        spin_unlock_irqrestore(&emu->emu_lock, flags);
 
         if (reg & 0xff000000) {
@@ -33 +49 @@
                 size = (reg >> 24) & 0x3f;
                 offset = (reg >> 16) & 0x1f;
-                mask = ((1 << size) - 1) << offset;
+                mask = (1 << size) - 1;
                 
-                spin_lock_irqsave(&emu->emu_lock, flags);
-                outl(regptr, emu->port + PTR);
-                val = inl(emu->port + DATA);
-                spin_unlock_irqrestore(&emu->emu_lock, flags);
-                
-                return (val & mask) >> offset;
-        } else {
-                spin_lock_irqsave(&emu->emu_lock, flags);
-                outl(regptr, emu->port + PTR);
-                val = inl(emu->port + DATA);
-                spin_unlock_irqrestore(&emu->emu_lock, flags);
+                return (val >> offset) & mask;
+        } else {
                 return val;
         }
@@ -58 +65 @@
         unsigned int mask;
 
-        if (snd_BUG_ON(!emu))
+        regptr = (reg << 16) | chn;
+        if (!check_ptr_reg(emu, regptr))
                 return;
-        mask = emu->audigy ? A_PTR_ADDRESS_MASK : PTR_ADDRESS_MASK;
-        regptr = ((reg << 16) & mask) | (chn & PTR_CHANNELNUM_MASK);
 
         if (reg & 0xff000000) {
@@ -68 +74 @@
                 size = (reg >> 24) & 0x3f;
                 offset = (reg >> 16) & 0x1f;
-                mask = ((1 << size) - 1) << offset;
-                data = (data << offset) & mask;
+                mask = (1 << size) - 1;
+                if (snd_BUG_ON(data & ~mask))
+                        return;
+                mask <<= offset;
+                data <<= offset;
 
                 spin_lock_irqsave(&emu->emu_lock, flags);
                 outl(regptr, emu->port + PTR);
                 data |= inl(emu->port + DATA) & ~mask;
-                outl(data, emu->port + DATA);
-                spin_unlock_irqrestore(&emu->emu_lock, flags);          
         } else {
                 spin_lock_irqsave(&emu->emu_lock, flags);
                 outl(regptr, emu->port + PTR);
+        }
+        outl(data, emu->port + DATA);
+        spin_unlock_irqrestore(&emu->emu_lock, flags);
+}
+
+EXPORT_SYMBOL(snd_emu10k1_ptr_write);
+
+void snd_emu10k1_ptr_write_multiple(struct snd_emu10k1 *emu, unsigned int chn, ...)
+{
+        va_list va;
+        u32 addr_mask;
+        unsigned long flags;
+
+        if (snd_BUG_ON(!emu))
+                return;
+        if (snd_BUG_ON(chn & ~PTR_CHANNELNUM_MASK))
+                return;
+        addr_mask = ~((emu->audigy ? A_PTR_ADDRESS_MASK : PTR_ADDRESS_MASK) >> 16);
+
+        va_start(va, chn);
+        spin_lock_irqsave(&emu->emu_lock, flags);
+        for (;;) {
+                u32 data;
+                u32 reg = va_arg(va, u32);
+                if (reg == REGLIST_END)
+                        break;
+                data = va_arg(va, u32);
+                if (snd_BUG_ON(reg & addr_mask))  // Only raw registers supported here
+                        continue;
+                outl((reg << 16) | chn, emu->port + PTR);
                 outl(data, emu->port + DATA);
-                spin_unlock_irqrestore(&emu->emu_lock, flags);
-        }
-}
-
-EXPORT_SYMBOL(snd_emu10k1_ptr_write);
+        }
+        spin_unlock_irqrestore(&emu->emu_lock, flags);
+        va_end(va);
+}
+
+EXPORT_SYMBOL(snd_emu10k1_ptr_write_multiple);
 
 unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu, 
@@ -96 +134 @@
 
         spin_lock_irqsave(&emu->emu_lock, flags);
-        outl(regptr, emu->port + 0x20 + PTR);
-        val = inl(emu->port + 0x20 + DATA);
+        outl(regptr, emu->port + PTR2);
+        val = inl(emu->port + DATA2);
         spin_unlock_irqrestore(&emu->emu_lock, flags);
         return val;
@@ -113 +151 @@
 
         spin_lock_irqsave(&emu->emu_lock, flags);
-        outl(regptr, emu->port + 0x20 + PTR);
-        outl(data, emu->port + 0x20 + DATA);
+        outl(regptr, emu->port + PTR2);
+        outl(data, emu->port + DATA2);
         spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
@@ -129 +167 @@
         spin_lock(&emu->spi_lock);
         if (emu->card_capabilities->ca0108_chip)
-                reg = 0x3c; /* PTR20, reg 0x3c */
+                reg = P17V_SPI;
         else {
                 /* For other chip types the SPI register
@@ -234 +272 @@
 }
 
-int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, u32 reg, u32 value)
-{
-        unsigned long flags;
-
-        if (reg > 0x3f)
-                return 1;
+static void snd_emu1010_fpga_write_locked(struct snd_emu10k1 *emu, u32 reg, u32 value)
+{
+        if (snd_BUG_ON(reg > 0x3f))
+                return;
         reg += 0x40; /* 0x40 upwards are registers. */
-        if (value > 0x3f) /* 0 to 0x3f are values */
-                return 1;
-        spin_lock_irqsave(&emu->emu_lock, flags);
-        outl(reg, emu->port + A_IOCFG);
+        if (snd_BUG_ON(value > 0x3f)) /* 0 to 0x3f are values */
+                return;
+        outw(reg, emu->port + A_GPIO);
         udelay(10);
-        outl(reg | 0x80, emu->port + A_IOCFG);  /* High bit clocks the value into the fpga. */
+        outw(reg | 0x80, emu->port + A_GPIO);  /* High bit clocks the value into the fpga. */
         udelay(10);
-        outl(value, emu->port + A_IOCFG);
+        outw(value, emu->port + A_GPIO);
         udelay(10);
-        outl(value | 0x80 , emu->port + A_IOCFG);  /* High bit clocks the value into the fpga. */
-        spin_unlock_irqrestore(&emu->emu_lock, flags);
-
-        return 0;
-}
-
-int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, u32 reg, u32 *value)
-{
-        unsigned long flags;
-        if (reg > 0x3f)
-                return 1;
+        outw(value | 0x80 , emu->port + A_GPIO);  /* High bit clocks the value into the fpga. */
+        udelay(10);
+}
+
+void snd_emu1010_fpga_write(struct snd_emu10k1 *emu, u32 reg, u32 value)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&emu->emu_lock, flags);
+        snd_emu1010_fpga_write_locked(emu, reg, value);
+        spin_unlock_irqrestore(&emu->emu_lock, flags);
+}
+
+static void snd_emu1010_fpga_read_locked(struct snd_emu10k1 *emu, u32 reg, u32 *value)
+{
+        // The higest input pin is used as the designated interrupt trigger,
+        // so it needs to be masked out.
+        // But note that any other input pin change will also cause an IRQ,
+        // so using this function often causes an IRQ as a side effect.
+        u32 mask = emu->card_capabilities->ca0108_chip ? 0x1f : 0x7f;
+        if (snd_BUG_ON(reg > 0x3f))
+                return;
         reg += 0x40; /* 0x40 upwards are registers. */
-        spin_lock_irqsave(&emu->emu_lock, flags);
-        outl(reg, emu->port + A_IOCFG);
+        outw(reg, emu->port + A_GPIO);
         udelay(10);
-        outl(reg | 0x80, emu->port + A_IOCFG);  /* High bit clocks the value into the fpga. */
+        outw(reg | 0x80, emu->port + A_GPIO);  /* High bit clocks the value into the fpga. */
         udelay(10);
-        *value = ((inl(emu->port + A_IOCFG) >> 8) & 0x7f);
-        spin_unlock_irqrestore(&emu->emu_lock, flags);
-
-        return 0;
+        *value = ((inw(emu->port + A_GPIO) >> 8) & mask);
+}
+
+void snd_emu1010_fpga_read(struct snd_emu10k1 *emu, u32 reg, u32 *value)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&emu->emu_lock, flags);
+        snd_emu1010_fpga_read_locked(emu, reg, value);
+        spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
 
@@ -276 +327 @@
  * but one Source can feed any number of Destinations simultaneously.
  */
-int snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 * emu, u32 dst, u32 src)
-{
-        snd_emu1010_fpga_write(emu, 0x00, ((dst >> 8) & 0x3f) );
-        snd_emu1010_fpga_write(emu, 0x01, (dst & 0x3f) );
-        snd_emu1010_fpga_write(emu, 0x02, ((src >> 8) & 0x3f) );
-        snd_emu1010_fpga_write(emu, 0x03, (src & 0x3f) );
-
-        return 0;
+void snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 *emu, u32 dst, u32 src)
+{
+        unsigned long flags;
+
+        if (snd_BUG_ON(dst & ~0x71f))
+                return;
+        if (snd_BUG_ON(src & ~0x71f))
+                return;
+        spin_lock_irqsave(&emu->emu_lock, flags);
+        snd_emu1010_fpga_write_locked(emu, EMU_HANA_DESTHI, dst >> 8);
+        snd_emu1010_fpga_write_locked(emu, EMU_HANA_DESTLO, dst & 0x1f);
+        snd_emu1010_fpga_write_locked(emu, EMU_HANA_SRCHI, src >> 8);
+        snd_emu1010_fpga_write_locked(emu, EMU_HANA_SRCLO, src & 0x1f);
+        spin_unlock_irqrestore(&emu->emu_lock, flags);
+}
+
+u32 snd_emu1010_fpga_link_dst_src_read(struct snd_emu10k1 *emu, u32 dst)
+{
+        unsigned long flags;
+        u32 hi, lo;
+
+        if (snd_BUG_ON(dst & ~0x71f))
+                return 0;
+        spin_lock_irqsave(&emu->emu_lock, flags);
+        snd_emu1010_fpga_write_locked(emu, EMU_HANA_DESTHI, dst >> 8);
+        snd_emu1010_fpga_write_locked(emu, EMU_HANA_DESTLO, dst & 0x1f);
+        snd_emu1010_fpga_read_locked(emu, EMU_HANA_SRCHI, &hi);
+        snd_emu1010_fpga_read_locked(emu, EMU_HANA_SRCLO, &lo);
+        spin_unlock_irqrestore(&emu->emu_lock, flags);
+        return (hi << 8) | lo;
+}
+
+int snd_emu1010_get_raw_rate(struct snd_emu10k1 *emu, u8 src)
+{
+        u32 reg_lo, reg_hi, value, value2;
+
+        switch (src) {
+        case EMU_HANA_WCLOCK_HANA_SPDIF_IN:
+                snd_emu1010_fpga_read(emu, EMU_HANA_SPDIF_MODE, &value);
+                if (value & EMU_HANA_SPDIF_MODE_RX_INVALID)
+                        return 0;
+                reg_lo = EMU_HANA_WC_SPDIF_LO;
+                reg_hi = EMU_HANA_WC_SPDIF_HI;
+                break;
+        case EMU_HANA_WCLOCK_HANA_ADAT_IN:
+                reg_lo = EMU_HANA_WC_ADAT_LO;
+                reg_hi = EMU_HANA_WC_ADAT_HI;
+                break;
+        case EMU_HANA_WCLOCK_SYNC_BNC:
+                reg_lo = EMU_HANA_WC_BNC_LO;
+                reg_hi = EMU_HANA_WC_BNC_HI;
+                break;
+        case EMU_HANA_WCLOCK_2ND_HANA:
+                reg_lo = EMU_HANA2_WC_SPDIF_LO;
+                reg_hi = EMU_HANA2_WC_SPDIF_HI;
+                break;
+        default:
+                return 0;
+        }
+        snd_emu1010_fpga_read(emu, reg_hi, &value);
+        snd_emu1010_fpga_read(emu, reg_lo, &value2);
+        // FIXME: The /4 is valid for 0404b, but contradicts all other info.
+        return 0x1770000 / 4 / (((value << 5) | value2) + 1);
+}
+
+void snd_emu1010_update_clock(struct snd_emu10k1 *emu)
+{
+        int clock;
+        u32 leds;
+
+        switch (emu->emu1010.wclock) {
+        case EMU_HANA_WCLOCK_INT_44_1K | EMU_HANA_WCLOCK_1X:
+                clock = 44100;
+                leds = EMU_HANA_DOCK_LEDS_2_44K;
+                break;
+        case EMU_HANA_WCLOCK_INT_48K | EMU_HANA_WCLOCK_1X:
+                clock = 48000;
+                leds = EMU_HANA_DOCK_LEDS_2_48K;
+                break;
+        default:
+                clock = snd_emu1010_get_raw_rate(
+                                emu, emu->emu1010.wclock & EMU_HANA_WCLOCK_SRC_MASK);
+                // The raw rate reading is rather coarse (it cannot accurately
+                // represent 44.1 kHz) and fluctuates slightly. Luckily, the
+                // clock comes from digital inputs, which use standardized rates.
+                // So we round to the closest standard rate and ignore discrepancies.
+                if (clock < 46000) {
+                        clock = 44100;
+                        leds = EMU_HANA_DOCK_LEDS_2_EXT | EMU_HANA_DOCK_LEDS_2_44K;
+                } else {
+                        clock = 48000;
+                        leds = EMU_HANA_DOCK_LEDS_2_EXT | EMU_HANA_DOCK_LEDS_2_48K;
+                }
+                break;
+        }
+        emu->emu1010.word_clock = clock;
+
+        // FIXME: this should probably represent the AND of all currently
+        // used sources' lock status. But we don't know how to get that ...
+        leds |= EMU_HANA_DOCK_LEDS_2_LOCK;
+
+        snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_LEDS_2, leds);
 }
 
@@ -314 +459 @@
 
         spin_lock_irqsave(&emu->emu_lock, flags);
-        /* voice interrupt */
         if (voicenum >= 32) {
                 outl(CLIEH << 16, emu->port + PTR);
@@ -334 +478 @@
 
         spin_lock_irqsave(&emu->emu_lock, flags);
-        /* voice interrupt */
         if (voicenum >= 32) {
                 outl(CLIEH << 16, emu->port + PTR);
@@ -353 +496 @@
 
         spin_lock_irqsave(&emu->emu_lock, flags);
-        /* voice interrupt */
         if (voicenum >= 32) {
                 outl(CLIPH << 16, emu->port + PTR);
@@ -371 +513 @@
 
         spin_lock_irqsave(&emu->emu_lock, flags);
-        /* voice interrupt */
         if (voicenum >= 32) {
                 outl(HLIEH << 16, emu->port + PTR);
@@ -391 +532 @@
 
         spin_lock_irqsave(&emu->emu_lock, flags);
-        /* voice interrupt */
         if (voicenum >= 32) {
                 outl(HLIEH << 16, emu->port + PTR);
@@ -410 +550 @@
 
         spin_lock_irqsave(&emu->emu_lock, flags);
-        /* voice interrupt */
         if (voicenum >= 32) {
                 outl(HLIPH << 16, emu->port + PTR);
@@ -422 +561 @@
 }
 
+#if 0
 void snd_emu10k1_voice_set_loop_stop(struct snd_emu10k1 *emu, unsigned int voicenum)
 {
@@ -428 +568 @@
 
         spin_lock_irqsave(&emu->emu_lock, flags);
-        /* voice interrupt */
         if (voicenum >= 32) {
                 outl(SOLEH << 16, emu->port + PTR);
@@ -448 +587 @@
 
         spin_lock_irqsave(&emu->emu_lock, flags);
-        /* voice interrupt */
         if (voicenum >= 32) {
                 outl(SOLEH << 16, emu->port + PTR);
@@ -460 +598 @@
         outl(sol, emu->port + DATA);
         spin_unlock_irqrestore(&emu->emu_lock, flags);
+}
+#endif
+
+void snd_emu10k1_voice_set_loop_stop_multiple(struct snd_emu10k1 *emu, u64 voices)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&emu->emu_lock, flags);
+        outl(SOLEL << 16, emu->port + PTR);
+        outl(inl(emu->port + DATA) | (u32)voices, emu->port + DATA);
+        outl(SOLEH << 16, emu->port + PTR);
+        outl(inl(emu->port + DATA) | (u32)(voices >> 32), emu->port + DATA);
+        spin_unlock_irqrestore(&emu->emu_lock, flags);
+}
+
+void snd_emu10k1_voice_clear_loop_stop_multiple(struct snd_emu10k1 *emu, u64 voices)
+{
+        unsigned long flags;
+
+        spin_lock_irqsave(&emu->emu_lock, flags);
+        outl(SOLEL << 16, emu->port + PTR);
+        outl(inl(emu->port + DATA) & (u32)~voices, emu->port + DATA);
+        outl(SOLEH << 16, emu->port + PTR);
+        outl(inl(emu->port + DATA) & (u32)(~voices >> 32), emu->port + DATA);
+        spin_unlock_irqrestore(&emu->emu_lock, flags);
+}
+
+int snd_emu10k1_voice_clear_loop_stop_multiple_atomic(struct snd_emu10k1 *emu, u64 voices)
+{
+        unsigned long flags;
+        u32 soll, solh;
+        int ret = -EIO;
+
+        spin_lock_irqsave(&emu->emu_lock, flags);
+
+        outl(SOLEL << 16, emu->port + PTR);
+        soll = inl(emu->port + DATA);
+        outl(SOLEH << 16, emu->port + PTR);
+        solh = inl(emu->port + DATA);
+
+        soll &= (u32)~voices;
+        solh &= (u32)(~voices >> 32);
+
+        for (int tries = 0; tries < 1000; tries++) {
+                const u32 quart = 1U << (REG_SIZE(WC_CURRENTCHANNEL) - 2);
+                // First we wait for the third quarter of the sample cycle ...
+                u32 wc = inl(emu->port + WC);
+                u32 cc = REG_VAL_GET(WC_CURRENTCHANNEL, wc);
+                if (cc >= quart * 2 && cc < quart * 3) {
+                        // ... and release the low voices, while the high ones are serviced.
+                        outl(SOLEL << 16, emu->port + PTR);
+                        outl(soll, emu->port + DATA);
+                        // Then we wait for the first quarter of the next sample cycle ...
+                        for (; tries < 1000; tries++) {
+                                cc = REG_VAL_GET(WC_CURRENTCHANNEL, inl(emu->port + WC));
+                                if (cc < quart)
+                                        goto good;
+                                // We will block for 10+ us with interrupts disabled. This is
+                                // not nice at all, but necessary for reasonable reliability.
+                                udelay(1);
+                        }
+                        break;
+                good:
+                        // ... and release the high voices, while the low ones are serviced.
+                        outl(SOLEH << 16, emu->port + PTR);
+                        outl(solh, emu->port + DATA);
+                        // Finally we verify that nothing interfered in fact.
+                        if (REG_VAL_GET(WC_SAMPLECOUNTER, inl(emu->port + WC)) ==
+                            ((REG_VAL_GET(WC_SAMPLECOUNTER, wc) + 1) & REG_MASK0(WC_SAMPLECOUNTER))) {
+                                ret = 0;
+                        } else {
+                                ret = -EAGAIN;
+                        }
+                        break;
+                }
+                // Don't block for too long
+                spin_unlock_irqrestore(&emu->emu_lock, flags);
+                udelay(1);
+                spin_lock_irqsave(&emu->emu_lock, flags);
+        }
+
+        spin_unlock_irqrestore(&emu->emu_lock, flags);
+        return ret;
 }
 
@@ -504 +725 @@
         spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
-
-/*
- *  convert rate to pitch
- */
-
-unsigned int snd_emu10k1_rate_to_pitch(unsigned int rate)
-{
-        static const u32 logMagTable[128] = {
-                0x00000, 0x02dfc, 0x05b9e, 0x088e6, 0x0b5d6, 0x0e26f, 0x10eb3, 0x13aa2,
-                0x1663f, 0x1918a, 0x1bc84, 0x1e72e, 0x2118b, 0x23b9a, 0x2655d, 0x28ed5,
-                0x2b803, 0x2e0e8, 0x30985, 0x331db, 0x359eb, 0x381b6, 0x3a93d, 0x3d081,
-                0x3f782, 0x41e42, 0x444c1, 0x46b01, 0x49101, 0x4b6c4, 0x4dc49, 0x50191,
-                0x5269e, 0x54b6f, 0x57006, 0x59463, 0x5b888, 0x5dc74, 0x60029, 0x623a7,
-                0x646ee, 0x66a00, 0x68cdd, 0x6af86, 0x6d1fa, 0x6f43c, 0x7164b, 0x73829,
-                0x759d4, 0x77b4f, 0x79c9a, 0x7bdb5, 0x7dea1, 0x7ff5e, 0x81fed, 0x8404e,
-                0x86082, 0x88089, 0x8a064, 0x8c014, 0x8df98, 0x8fef1, 0x91e20, 0x93d26,
-                0x95c01, 0x97ab4, 0x9993e, 0x9b79f, 0x9d5d9, 0x9f3ec, 0xa11d8, 0xa2f9d,
-                0xa4d3c, 0xa6ab5, 0xa8808, 0xaa537, 0xac241, 0xadf26, 0xafbe7, 0xb1885,
-                0xb3500, 0xb5157, 0xb6d8c, 0xb899f, 0xba58f, 0xbc15e, 0xbdd0c, 0xbf899,
-                0xc1404, 0xc2f50, 0xc4a7b, 0xc6587, 0xc8073, 0xc9b3f, 0xcb5ed, 0xcd07c,
-                0xceaec, 0xd053f, 0xd1f73, 0xd398a, 0xd5384, 0xd6d60, 0xd8720, 0xda0c3,
-                0xdba4a, 0xdd3b4, 0xded03, 0xe0636, 0xe1f4e, 0xe384a, 0xe512c, 0xe69f3,
-                0xe829f, 0xe9b31, 0xeb3a9, 0xecc08, 0xee44c, 0xefc78, 0xf148a, 0xf2c83,
-                0xf4463, 0xf5c2a, 0xf73da, 0xf8b71, 0xfa2f0, 0xfba57, 0xfd1a7, 0xfe8df
-        };
-        static const char logSlopeTable[128] = {
-                0x5c, 0x5c, 0x5b, 0x5a, 0x5a, 0x59, 0x58, 0x58,
-                0x57, 0x56, 0x56, 0x55, 0x55, 0x54, 0x53, 0x53,
-                0x52, 0x52, 0x51, 0x51, 0x50, 0x50, 0x4f, 0x4f,
-                0x4e, 0x4d, 0x4d, 0x4d, 0x4c, 0x4c, 0x4b, 0x4b,
-                0x4a, 0x4a, 0x49, 0x49, 0x48, 0x48, 0x47, 0x47,
-                0x47, 0x46, 0x46, 0x45, 0x45, 0x45, 0x44, 0x44,
-                0x43, 0x43, 0x43, 0x42, 0x42, 0x42, 0x41, 0x41,
-                0x41, 0x40, 0x40, 0x40, 0x3f, 0x3f, 0x3f, 0x3e,
-                0x3e, 0x3e, 0x3d, 0x3d, 0x3d, 0x3c, 0x3c, 0x3c,
-                0x3b, 0x3b, 0x3b, 0x3b, 0x3a, 0x3a, 0x3a, 0x39,
-                0x39, 0x39, 0x39, 0x38, 0x38, 0x38, 0x38, 0x37,
-                0x37, 0x37, 0x37, 0x36, 0x36, 0x36, 0x36, 0x35,
-                0x35, 0x35, 0x35, 0x34, 0x34, 0x34, 0x34, 0x34,
-                0x33, 0x33, 0x33, 0x33, 0x32, 0x32, 0x32, 0x32,
-                0x32, 0x31, 0x31, 0x31, 0x31, 0x31, 0x30, 0x30,
-                0x30, 0x30, 0x30, 0x2f, 0x2f, 0x2f, 0x2f, 0x2f
-        };
-        int i;
-
-        if (rate == 0)
-                return 0;       /* Bail out if no leading "1" */
-        rate *= 11185;          /* Scale 48000 to 0x20002380 */
-        for (i = 31; i > 0; i--) {
-                if (rate & 0x80000000) {        /* Detect leading "1" */
-                        return (((unsigned int) (i - 15) << 20) +
-                               logMagTable[0x7f & (rate >> 24)] +
-                                        (0x7f & (rate >> 17)) *
-                                        logSlopeTable[0x7f & (rate >> 24)]);
-                }
-                rate <<= 1;
-        }
-
-        return 0;               /* Should never reach this point */
-}
-

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

@@ -4 +4 @@
  *                   Creative Labs, Inc.
  *  Routines for IRQ control of EMU10K1 chips
- *
- *  BUGS:
- *    --
- *
- *  TODO:
- *    --
  */
 
@@ -19 +13 @@
 {
         struct snd_emu10k1 *emu = dev_id;
-        unsigned int status, status2, orig_status, orig_status2;
+        unsigned int status, orig_status;
         int handled = 0;
         int timeout = 0;
 
-        while (((status = inl(emu->port + IPR)) != 0) && (timeout < 1000)) {
-                timeout++;
-                orig_status = status;
+        while ((status = inl(emu->port + IPR)) != 0) {
                 handled = 1;
                 if ((status & 0xffffffff) == 0xffffffff) {
@@ -32 +24 @@
                         break;
                 }
+                if (++timeout == 1000) {
+                        dev_info(emu->card->dev, "emu10k1 irq routine failure\n");
+                        break;
+                }
+                orig_status = status;
                 if (status & IPR_PCIERROR) {
                         dev_err(emu->card->dev, "interrupt: PCI error\n");
@@ -45 +42 @@
                 }
                 if (status & IPR_CHANNELLOOP) {
+                        struct snd_emu10k1_voice *pvoice;
                         int voice;
                         int voice_max = status & IPR_CHANNELNUMBERMASK;
                         u32 val;
-                        struct snd_emu10k1_voice *pvoice = emu->voices;
 
                         val = snd_emu10k1_ptr_read(emu, CLIPL, 0);
+                        pvoice = emu->voices;
                         for (voice = 0; voice <= voice_max; voice++) {
                                 if (voice == 0x20)
@@ -66 +64 @@
                         }
                         val = snd_emu10k1_ptr_read(emu, HLIPL, 0);
+                        pvoice = emu->voices;
                         for (voice = 0; voice <= voice_max; voice++) {
                                 if (voice == 0x20)
@@ -80 +79 @@
                                 pvoice++;
                         }
-                        status &= ~IPR_CHANNELLOOP;
+                        status &= ~(IPR_CHANNELLOOP | IPR_CHANNELNUMBERMASK);
                 }
-                status &= ~IPR_CHANNELNUMBERMASK;
                 if (status & (IPR_ADCBUFFULL|IPR_ADCBUFHALFFULL)) {
                         if (emu->capture_interrupt)
@@ -140 +138 @@
                 }
                 if (status & IPR_P16V) {
-                        while ((status2 = inl(emu->port + IPR2)) != 0) {
-                                u32 mask = INTE2_PLAYBACK_CH_0_LOOP;  /* Full Loop */
-                                struct snd_emu10k1_voice *pvoice = &(emu->p16v_voices[0]);
-                                struct snd_emu10k1_voice *cvoice = &(emu->p16v_capture_voice);
-
-                                /* dev_dbg(emu->card->dev, "status2=0x%x\n", status2); */
-                                orig_status2 = status2;
-                                if(status2 & mask) {
-                                        if(pvoice->use) {
-                                                snd_pcm_period_elapsed(pvoice->epcm->substream);
-                                        } else { 
-                                                dev_err(emu->card->dev,
-                                                        "p16v: status: 0x%08x, mask=0x%08x, pvoice=%p, use=%d\n",
-                                                        status2, mask, pvoice,
-                                                        pvoice->use);
-                                        }
-                                }
-                                if(status2 & 0x110000) {
-                                        /* dev_info(emu->card->dev, "capture int found\n"); */
-                                        if(cvoice->use) {
-                                                /* dev_info(emu->card->dev, "capture period_elapsed\n"); */
-                                                snd_pcm_period_elapsed(cvoice->epcm->substream);
-                                        }
-                                }
-                                outl(orig_status2, emu->port + IPR2); /* ack all */
-                        }
+                        if (emu->p16v_interrupt)
+                                emu->p16v_interrupt(emu);
+                        else
+                                outl(0, emu->port + INTE2);
                         status &= ~IPR_P16V;
+                }
+                if (status & IPR_A_GPIO) {
+                        if (emu->gpio_interrupt)
+                                emu->gpio_interrupt(emu);
+                        else
+                                snd_emu10k1_intr_disable(emu, INTE_A_GPIOENABLE);
+                        status &= ~IPR_A_GPIO;
                 }
 
                 if (status) {
-                        unsigned int bits;
                         dev_err(emu->card->dev,
                                 "unhandled interrupt: 0x%08x\n", status);
-                        //make sure any interrupts we don't handle are disabled:
-                        bits = INTE_FXDSPENABLE |
-                                INTE_PCIERRORENABLE |
-                                INTE_VOLINCRENABLE |
-                                INTE_VOLDECRENABLE |
-                                INTE_MUTEENABLE |
-                                INTE_MICBUFENABLE |
-                                INTE_ADCBUFENABLE |
-                                INTE_EFXBUFENABLE |
-                                INTE_GPSPDIFENABLE |
-                                INTE_CDSPDIFENABLE |
-                                INTE_INTERVALTIMERENB |
-                                INTE_MIDITXENABLE |
-                                INTE_MIDIRXENABLE;
-                        if (emu->audigy)
-                                bits |= INTE_A_MIDITXENABLE2 | INTE_A_MIDIRXENABLE2;
-                        snd_emu10k1_intr_disable(emu, bits);
                 }
                 outl(orig_status, emu->port + IPR); /* ack all */
         }
-        if (timeout == 1000)
-                dev_info(emu->card->dev, "emu10k1 irq routine failure\n");
 
         return IRQ_RETVAL(handled);

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

@@ -316 +316 @@
                 return NULL;
 
-        idx = runtime->period_size >= runtime->buffer_size ?
-                                        (emu->delay_pcm_irq * 2) : 0;
         mutex_lock(&hdr->block_mutex);
-        blk = search_empty(emu, runtime->dma_bytes + idx);
+        blk = search_empty(emu, runtime->dma_bytes);
         if (blk == NULL) {
                 mutex_unlock(&hdr->block_mutex);
@@ -325 +323 @@
         }
         /* fill buffer addresses but pointers are not stored so that
-         * snd_free_pci_page() is not called in in synth_free()
+         * snd_free_pci_page() is not called in synth_free()
          */
         idx = 0;

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

@@ -150 +150 @@
 };
 
-static void snd_p16v_pcm_free_substream(struct snd_pcm_runtime *runtime)
-{
-        struct snd_emu10k1_pcm *epcm = runtime->private_data;
-
-        kfree(epcm);
-}
-
 /* open_playback callback */
 static int snd_p16v_pcm_open_playback_channel(struct snd_pcm_substream *substream, int channel_id)
 {
-        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-        struct snd_emu10k1_voice *channel = &(emu->p16v_voices[channel_id]);
-        struct snd_emu10k1_pcm *epcm;
         struct snd_pcm_runtime *runtime = substream->runtime;
         int err;
 
-        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
-        /* dev_dbg(emu->card->dev, "epcm kcalloc: %p\n", epcm); */
-
-        if (epcm == NULL)
-                return -ENOMEM;
-        epcm->emu = emu;
-        epcm->substream = substream;
         /*
         dev_dbg(emu->card->dev, "epcm device=%d, channel_id=%d\n",
                    substream->pcm->device, channel_id);
         */
-        runtime->private_data = epcm;
-        runtime->private_free = snd_p16v_pcm_free_substream;
   
         runtime->hw = snd_p16v_playback_hw;
 
-        channel->emu = emu;
-        channel->number = channel_id;
-
-        channel->use=1;
 #if 0 /* debug */
         dev_dbg(emu->card->dev,
@@ -194 +171 @@
 #endif /* debug */
         /* channel->interrupt = snd_p16v_pcm_channel_interrupt; */
-        channel->epcm = epcm;
         err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
         if (err < 0)
@@ -206 +182 @@
         return 0;
 }
+
 /* open_capture callback */
 static int snd_p16v_pcm_open_capture_channel(struct snd_pcm_substream *substream, int channel_id)
 {
-        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-        struct snd_emu10k1_voice *channel = &(emu->p16v_capture_voice);
-        struct snd_emu10k1_pcm *epcm;
         struct snd_pcm_runtime *runtime = substream->runtime;
         int err;
 
-        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
-        /* dev_dbg(emu->card->dev, "epcm kcalloc: %p\n", epcm); */
-
-        if (epcm == NULL)
-                return -ENOMEM;
-        epcm->emu = emu;
-        epcm->substream = substream;
         /*
         dev_dbg(emu->card->dev, "epcm device=%d, channel_id=%d\n",
                    substream->pcm->device, channel_id);
         */
-        runtime->private_data = epcm;
-        runtime->private_free = snd_p16v_pcm_free_substream;
   
         runtime->hw = snd_p16v_capture_hw;
 
-        channel->emu = emu;
-        channel->number = channel_id;
-
-        channel->use=1;
-#if 0 /* debug */
-        dev_dbg(emu->card->dev,
-                   "p16v: open channel_id=%d, channel=%p, use=0x%x\n",
-                   channel_id, channel, channel->use);
-        dev_dbg(emu->card->dev, "open:channel_id=%d, chip=%p, channel=%p\n",
-               channel_id, chip, channel);
-#endif /* debug */
-        /* channel->interrupt = snd_p16v_pcm_channel_interrupt; */
-        channel->epcm = epcm;
         err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
         if (err < 0)
@@ -255 +207 @@
 static int snd_p16v_pcm_close_playback(struct snd_pcm_substream *substream)
 {
-        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-        //struct snd_pcm_runtime *runtime = substream->runtime;
-        //struct snd_emu10k1_pcm *epcm = runtime->private_data;
-        emu->p16v_voices[substream->pcm->device - emu->p16v_device_offset].use = 0;
-        /* FIXME: maybe zero others */
         return 0;
 }
@@ -266 +213 @@
 static int snd_p16v_pcm_close_capture(struct snd_pcm_substream *substream)
 {
-        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-        //struct snd_pcm_runtime *runtime = substream->runtime;
-        //struct snd_emu10k1_pcm *epcm = runtime->private_data;
-        emu->p16v_capture_voice.use = 0;
-        /* FIXME: maybe zero others */
         return 0;
 }
@@ -313 +255 @@
 #endif /* debug */
         tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, channel);
+        tmp &= ~(A_SPDIF_RATE_MASK | A_EHC_SRC48_MASK);
         switch (runtime->rate) {
         case 44100:
-          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0xe0e0) | 0x8080);
+          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel,
+                                tmp | A_SPDIF_44100 | A_EHC_SRC48_44);
           break;
         case 96000:
-          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0xe0e0) | 0x4040);
+          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel,
+                                tmp | A_SPDIF_96000 | A_EHC_SRC48_96);
           break;
         case 192000:
-          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0xe0e0) | 0x2020);
+          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel,
+                                tmp | A_SPDIF_192000 | A_EHC_SRC48_192);
           break;
         case 48000:
         default:
-          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0xe0e0) | 0x0000);
+          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel,
+                                tmp | A_SPDIF_48000 | A_EHC_SRC48_BYPASS);
           break;
         }
@@ -341 +288 @@
         snd_emu10k1_ptr20_write(emu, PLAYBACK_PERIOD_SIZE, channel, 0); // buffer size in bytes
         snd_emu10k1_ptr20_write(emu, PLAYBACK_POINTER, channel, 0);
-        snd_emu10k1_ptr20_write(emu, 0x07, channel, 0x0);
-        snd_emu10k1_ptr20_write(emu, 0x08, channel, 0);
+        snd_emu10k1_ptr20_write(emu, PLAYBACK_FIFO_END_ADDRESS, channel, 0);
+        snd_emu10k1_ptr20_write(emu, PLAYBACK_FIFO_POINTER, channel, 0);
 
         return 0;
@@ -353 +300 @@
         struct snd_pcm_runtime *runtime = substream->runtime;
         int channel = substream->pcm->device - emu->p16v_device_offset;
-        u32 tmp;
 
         /*
@@ -363 +309 @@
                frames_to_bytes(runtime, 1));
         */
-        tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, channel);
         switch (runtime->rate) {
         case 44100:
-          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0x0e00) | 0x0800);
+          snd_emu10k1_ptr_write(emu, A_I2S_CAPTURE_RATE, channel, A_I2S_CAPTURE_44100);
           break;
         case 96000:
-          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0x0e00) | 0x0400);
+          snd_emu10k1_ptr_write(emu, A_I2S_CAPTURE_RATE, channel, A_I2S_CAPTURE_96000);
           break;
         case 192000:
-          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0x0e00) | 0x0200);
+          snd_emu10k1_ptr_write(emu, A_I2S_CAPTURE_RATE, channel, A_I2S_CAPTURE_192000);
           break;
         case 48000:
         default:
-          snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0x0e00) | 0x0000);
+          snd_emu10k1_ptr_write(emu, A_I2S_CAPTURE_RATE, channel, A_I2S_CAPTURE_48000);
           break;
         }
         /* FIXME: Check emu->buffer.size before actually writing to it. */
-        snd_emu10k1_ptr20_write(emu, 0x13, channel, 0);
+        snd_emu10k1_ptr20_write(emu, CAPTURE_FIFO_POINTER, channel, 0);
         snd_emu10k1_ptr20_write(emu, CAPTURE_DMA_ADDR, channel, runtime->dma_addr);
         snd_emu10k1_ptr20_write(emu, CAPTURE_BUFFER_SIZE, channel, frames_to_bytes(runtime, runtime->buffer_size) << 16); // buffer size in bytes
@@ -412 +357 @@
 }
 
+static void snd_p16v_interrupt(struct snd_emu10k1 *emu)
+{
+        unsigned int status;
+
+        while ((status = inl(emu->port + IPR2)) != 0) {
+                u32 mask = INTE2_PLAYBACK_CH_0_LOOP;  /* Full Loop */
+
+                /* dev_dbg(emu->card->dev, "p16v status=0x%x\n", status); */
+                if (status & mask) {
+                        struct snd_pcm_substream *substream =
+                                        emu->pcm_p16v->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
+                        struct snd_pcm_runtime *runtime = substream->runtime;
+
+                        if (runtime && runtime->private_data) {
+                                snd_pcm_period_elapsed(substream);
+                        } else {
+                                dev_err(emu->card->dev,
+                                        "p16v: status: 0x%08x, mask=0x%08x\n",
+                                        status, mask);
+                        }
+                }
+                if (status & 0x110000) {
+                        struct snd_pcm_substream *substream =
+                                        emu->pcm_p16v->streams[SNDRV_PCM_STREAM_CAPTURE].substream;
+                        struct snd_pcm_runtime *runtime = substream->runtime;
+
+                        /* dev_info(emu->card->dev, "capture int found\n"); */
+                        if (runtime && runtime->private_data) {
+                                /* dev_info(emu->card->dev, "capture period_elapsed\n"); */
+                                snd_pcm_period_elapsed(substream);
+                        }
+                }
+                outl(status, emu->port + IPR2); /* ack all */
+        }
+}
+
 /* trigger_playback callback */
 static int snd_p16v_pcm_trigger_playback(struct snd_pcm_substream *substream,
@@ -418 +399 @@
         struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime;
-        struct snd_emu10k1_pcm *epcm;
         int channel;
         int result = 0;
@@ -440 +420 @@
                         continue;
                 runtime = s->runtime;
-                epcm = runtime->private_data;
                 channel = substream->pcm->device-emu->p16v_device_offset;
                 /* dev_dbg(emu->card->dev, "p16v channel=%d\n", channel); */
-                epcm->running = running;
+                runtime->private_data = (void *)(ptrdiff_t)running;
                 basic |= (0x1<<channel);
                 inte |= (INTE2_PLAYBACK_CH_0_LOOP<<channel);
@@ -472 +451 @@
         struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
-        struct snd_emu10k1_pcm *epcm = runtime->private_data;
         int channel = 0;
         int result = 0;
@@ -481 +459 @@
                 snd_p16v_intr_enable(emu, inte);
                 snd_emu10k1_ptr20_write(emu, BASIC_INTERRUPT, 0, snd_emu10k1_ptr20_read(emu, BASIC_INTERRUPT, 0)|(0x100<<channel));
-                epcm->running = 1;
+                runtime->private_data = (void *)1;
                 break;
         case SNDRV_PCM_TRIGGER_STOP:
@@ -487 +465 @@
                 snd_p16v_intr_disable(emu, inte);
                 //snd_emu10k1_ptr20_write(emu, EXTENDED_INT_MASK, 0, snd_emu10k1_ptr20_read(emu, EXTENDED_INT_MASK, 0) & ~(0x110000<<channel));
-                epcm->running = 0;
+                runtime->private_data = NULL;
                 break;
         default:
@@ -502 +480 @@
         struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
-        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;
-        if (!epcm->running)
+
+        if (!runtime->private_data)
                 return 0;
 
@@ -527 +505 @@
         struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
         struct snd_pcm_runtime *runtime = substream->runtime;
-        struct snd_emu10k1_pcm *epcm = runtime->private_data;
         snd_pcm_uframes_t ptr, ptr1, ptr2 = 0;
         int channel = 0;
 
-        if (!epcm->running)
+        if (!runtime->private_data)
                 return 0;
 
@@ -592 +569 @@
         strcpy(pcm->name, "p16v");
         emu->pcm_p16v = pcm;
+        emu->p16v_interrupt = snd_p16v_interrupt;
 
         for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; 

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

@@ -3 +3 @@
  *  Copyright (c) by James Courtier-Dutton <James@superbug.demon.co.uk>
  *  Driver p16v chips
- *  Version: 0.21
- *
- *  FEATURES currently supported:
- *    Output fixed at S32_LE, 2 channel to hw:0,0
- *    Rates: 44.1, 48, 96, 192.
- *
- *  Changelog:
- *  0.8
- *    Use separate card based buffer for periods table.
- *  0.9
- *    Use 2 channel output streams instead of 8 channel.
- *       (8 channel output streams might be good for ASIO type output)
- *    Corrected speaker output, so Front -> Front etc.
- *  0.10
- *    Fixed missed interrupts.
- *  0.11
- *    Add Sound card model number and names.
- *    Add Analog volume controls.
- *  0.12
- *    Corrected playback interrupts. Now interrupt per period, instead of half period.
- *  0.13
- *    Use single trigger for multichannel.
- *  0.14
- *    Mic capture now works at fixed: S32_LE, 96000Hz, Stereo.
- *  0.15
- *    Force buffer_size / period_size == INTEGER.
- *  0.16
- *    Update p16v.c to work with changed alsa api.
- *  0.17
- *    Update p16v.c to work with changed alsa api. Removed boot_devs.
- *  0.18
- *    Merging with snd-emu10k1 driver.
- *  0.19
- *    One stereo channel at 24bit now works.
- *  0.20
- *    Added better register defines.
- *  0.21
- *    Split from p16v.c
- *
- *  BUGS:
- *    Some stability problems when unloading the snd-p16v kernel module.
- *    --
- *
- *  TODO:
- *    SPDIF out.
- *    Find out how to change capture sample rates. E.g. To record SPDIF at 48000Hz.
- *    Currently capture fixed at 48000Hz.
- *
- *    --
- *  GENERAL INFO:
- *    Model: SB0240
- *    P16V Chip: CA0151-DBS
- *    Audigy 2 Chip: CA0102-IAT
- *    AC97 Codec: STAC 9721
- *    ADC: Philips 1361T (Stereo 24bit)
- *    DAC: CS4382-K (8-channel, 24bit, 192Khz)
  *
  *  This code was initially based on code from ALSA's emu10k1x.c which is:
@@ -65 +9 @@
 
 /********************************************************************************************************/
-/* Audigy2 P16V pointer-offset register set, accessed through the PTR2 and DATA2 registers                     */
+/* Audigy2 P16V pointer-offset register set, accessed through the PTR2 and DATA2 registers              */
 /********************************************************************************************************/
                                                                                                                            

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

@@ -3 +3 @@
  *  Copyright (c) by James Courtier-Dutton <James@superbug.demon.co.uk>
  *  Driver p17v chips
- *  Version: 0.01
  */
 
 /******************************************************************************/
-/* Audigy2Value Tina (P17V) pointer-offset register set,
- * accessed through the PTR20 and DATA24 registers  */
+/* Audigy2Value Tina (P17V) pointer-offset register set,                      */
+/* accessed through the PTR2 and DATA2 registers                              */
 /******************************************************************************/
 

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

@@ -3 +3 @@
  *  Copyright (c) by Lee Revell <rlrevell@joe-job.com>
  *                   Clemens Ladisch <clemens@ladisch.de>
+ *                   Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
+ *
  *  Routines for control of EMU10K1 chips
- *
- *  BUGS:
- *    --
- *
- *  TODO:
- *    --
  */
 
@@ -19 +15 @@
 {
         struct snd_emu10k1 *emu;
-        unsigned long flags;
         unsigned int delay;
 
@@ -26 +21 @@
         if (delay < 5 ) /* minimum time is 5 ticks */
                 delay = 5;
-        spin_lock_irqsave(&emu->reg_lock, flags);
         snd_emu10k1_intr_enable(emu, INTE_INTERVALTIMERENB);
         outw(delay & TIMER_RATE_MASK, emu->port + TIMER);
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
         return 0;
 }
@@ -36 +29 @@
 {
         struct snd_emu10k1 *emu;
-        unsigned long flags;
 
         emu = snd_timer_chip(timer);
-        spin_lock_irqsave(&emu->reg_lock, flags);
         snd_emu10k1_intr_disable(emu, INTE_INTERVALTIMERENB);
-        spin_unlock_irqrestore(&emu->reg_lock, flags);
         return 0;
+}
+
+static unsigned long snd_emu10k1_timer_c_resolution(struct snd_timer *timer)
+{
+        struct snd_emu10k1 *emu = snd_timer_chip(timer);
+
+        if (emu->card_capabilities->emu_model &&
+            emu->emu1010.word_clock == 44100)
+                return 22676;  // 1 sample @ 44.1 kHz = 22.675736...us
+        else
+                return 20833;  // 1 sample @ 48 kHz = 20.833...us
 }
 
@@ -48 +49 @@
                                                unsigned long *num, unsigned long *den)
 {
+        struct snd_emu10k1 *emu = snd_timer_chip(timer);
+
         *num = 1;
-        *den = 48000;
+        if (emu->card_capabilities->emu_model)
+                *den = emu->emu1010.word_clock;
+        else
+                *den = 48000;
         return 0;
 }
@@ -55 +61 @@
 static const 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,
+        .c_resolution = snd_emu10k1_timer_c_resolution,
         .precise_resolution = snd_emu10k1_timer_precise_resolution,
 };

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

@@ -3 +3 @@
  *  Copyright (c) by James Courtier-Dutton <James@superbug.demon.co.uk>
  *  Driver tina2 chips
- *  Version: 0.1
  */
 

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

@@ -2 +2 @@
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
+ *                   Lee Revell <rlrevell@joe-job.com>
+ *                   Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
  *                   Creative Labs, Inc.
- *                   Lee Revell <rlrevell@joe-job.com>
+ *
  *  Routines for control of EMU10K1 chips - voice manager
- *
- *  Rewrote voice allocator for multichannel support - rlrevell 12/2004
- * 
- *  BUGS:
- *    --
- *
- *  TODO:
- *    --
  */
 
@@ -24 +18 @@
  * the card record and each allocation begins where the last left off.  The 
  * hardware requires stereo interleaved voices be aligned to an even/odd 
- * boundary.  For multichannel voice allocation we ensure than the block of 
- * voices does not cross the 32 voice boundary.  This simplifies the 
- * multichannel support and ensures we can use a single write to the 
- * (set|clear)_loop_stop registers.  Otherwise (for example) the voices would 
- * get out of sync when pausing/resuming a stream.
+ * boundary.
  *                                                      --rlrevell
  */
 
 static int voice_alloc(struct snd_emu10k1 *emu, int type, int number,
-                       struct snd_emu10k1_voice **rvoice)
+                       struct snd_emu10k1_pcm *epcm, struct snd_emu10k1_voice **rvoice)
 {
         struct snd_emu10k1_voice *voice;
-        int i, j, k, first_voice, last_voice, skip;
+        int i, j, k, skip;
 
-        *rvoice = NULL;
-        first_voice = last_voice = 0;
-        for (i = emu->next_free_voice, j = 0; j < NUM_G ; i += number, j += number) {
+        for (i = emu->next_free_voice, j = 0; j < NUM_G; i = (i + skip) % NUM_G, j += skip) {
                 /*
                 dev_dbg(emu->card->dev, "i %d j %d next free %d!\n",
                        i, j, emu->next_free_voice);
                 */
-                i %= NUM_G;
 
                 /* stereo voices must be even/odd */
-                if ((number == 2) && (i % 2)) {
-                        i++;
+                if ((number > 1) && (i % 2)) {
+                        skip = 1;
                         continue;
                 }
-                        
-                skip = 0;
+
                 for (k = 0; k < number; k++) {
-                        voice = &emu->voices[(i+k) % NUM_G];
+                        voice = &emu->voices[i + k];
                         if (voice->use) {
-                                skip = 1;
-                                break;
+                                skip = k + 1;
+                                goto next;
                         }
                 }
-                if (!skip) {
-                        /* dev_dbg(emu->card->dev, "allocated voice %d\n", i); */
-                        first_voice = i;
-                        last_voice = (i + number) % NUM_G;
-                        emu->next_free_voice = last_voice;
-                        break;
+
+                for (k = 0; k < number; k++) {
+                        voice = &emu->voices[i + k];
+                        voice->use = type;
+                        voice->epcm = epcm;
+                        /* dev_dbg(emu->card->dev, "allocated voice %d\n", i + k); */
                 }
+                voice->last = 1;
+
+                *rvoice = &emu->voices[i];
+                emu->next_free_voice = (i + number) % NUM_G;
+                return 0;
+
+        next: ;
         }
-        
-        if (first_voice == last_voice)
-                return -ENOMEM;
-        
-        for (i = 0; i < number; i++) {
-                voice = &emu->voices[(first_voice + i) % NUM_G];
-                /*
-                dev_dbg(emu->card->dev, "voice alloc - %i, %i of %i\n",
-                       voice->number, idx-first_voice+1, number);
-                */
-                voice->use = 1;
-                switch (type) {
-                case EMU10K1_PCM:
-                        voice->pcm = 1;
-                        break;
-                case EMU10K1_SYNTH:
-                        voice->synth = 1;
-                        break;
-                case EMU10K1_MIDI:
-                        voice->midi = 1;
-                        break;
-                case EMU10K1_EFX:
-                        voice->efx = 1;
-                        break;
-                }
-        }
-        *rvoice = &emu->voices[first_voice];
-        return 0;
+        return -ENOMEM;  // -EBUSY would have been better
 }
 
-int snd_emu10k1_voice_alloc(struct snd_emu10k1 *emu, int type, int number,
-                            struct snd_emu10k1_voice **rvoice)
+static void voice_free(struct snd_emu10k1 *emu,
+                       struct snd_emu10k1_voice *pvoice)
+{
+        if (pvoice->dirty)
+                snd_emu10k1_voice_init(emu, pvoice->number);
+        pvoice->interrupt = NULL;
+        pvoice->use = pvoice->dirty = pvoice->last = 0;
+        pvoice->epcm = NULL;
+}
+
+int snd_emu10k1_voice_alloc(struct snd_emu10k1 *emu, int type, int count, int channels,
+                            struct snd_emu10k1_pcm *epcm, struct snd_emu10k1_voice **rvoice)
 {
         unsigned long flags;
@@ -107 +83 @@
         if (snd_BUG_ON(!rvoice))
                 return -EINVAL;
-        if (snd_BUG_ON(!number))
+        if (snd_BUG_ON(!count))
+                return -EINVAL;
+        if (snd_BUG_ON(!channels))
                 return -EINVAL;
 
         spin_lock_irqsave(&emu->voice_lock, flags);
-        for (;;) {
-                result = voice_alloc(emu, type, number, rvoice);
-                if (result == 0 || type == EMU10K1_SYNTH || type == EMU10K1_MIDI)
-                        break;
-
-                /* free a voice from synth */
-                if (emu->get_synth_voice) {
+        for (int got = 0; got < channels; ) {
+                result = voice_alloc(emu, type, count, epcm, &rvoice[got]);
+                if (result == 0) {
+                        got++;
+                        /*
+                        dev_dbg(emu->card->dev, "voice alloc - %i, %i of %i\n",
+                                rvoice[got - 1]->number, got, want);
+                        */
+                        continue;
+                }
+                if (type != EMU10K1_SYNTH && emu->get_synth_voice) {
+                        /* free a voice from synth */
                         result = emu->get_synth_voice(emu);
                         if (result >= 0) {
-                                struct snd_emu10k1_voice *pvoice = &emu->voices[result];
-                                pvoice->interrupt = NULL;
-                                pvoice->use = pvoice->pcm = pvoice->synth = pvoice->midi = pvoice->efx = 0;
-                                pvoice->epcm = NULL;
+                                voice_free(emu, &emu->voices[result]);
+                                continue;
                         }
                 }
-                if (result < 0)
-                        break;
+                for (int i = 0; i < got; i++) {
+                        for (int j = 0; j < count; j++)
+                                voice_free(emu, rvoice[i] + j);
+                        rvoice[i] = NULL;
+                }
+                break;
         }
         spin_unlock_irqrestore(&emu->voice_lock, flags);
@@ -140 +125 @@
 {
         unsigned long flags;
+        int last;
 
         if (snd_BUG_ON(!pvoice))
                 return -EINVAL;
         spin_lock_irqsave(&emu->voice_lock, flags);
-        pvoice->interrupt = NULL;
-        pvoice->use = pvoice->pcm = pvoice->synth = pvoice->midi = pvoice->efx = 0;
-        pvoice->epcm = NULL;
-        snd_emu10k1_voice_init(emu, pvoice->number);
+        do {
+                last = pvoice->last;
+                voice_free(emu, pvoice++);
+        } while (!last);
         spin_unlock_irqrestore(&emu->voice_lock, flags);
         return 0;