Changeset 84

Timestamp:

Oct 23, 2006, 11:07:11 PM (19 years ago)

Author:

vladest

Message:

SB code update
HDA code update
Some other updates

Location:

GPL/trunk

Files:

• alsa-kernel/core/control.c (modified) (6 diffs)
• alsa-kernel/core/misc.c (modified) (2 diffs)
• alsa-kernel/include/sound/asound.h (modified) (3 diffs)
• alsa-kernel/include/sound/control.h (modified) (4 diffs)
• alsa-kernel/include/sound/emu10k1.h (modified) (9 diffs)
• alsa-kernel/pci/ca0106/ca0106_mixer.c (modified) (2 diffs)
• alsa-kernel/pci/emu10k1/emu10k1.c (modified) (6 diffs)
• alsa-kernel/pci/emu10k1/emu10k1_callback.c (modified) (6 diffs)
• alsa-kernel/pci/emu10k1/emu10k1_main.c (modified) (31 diffs)
• alsa-kernel/pci/emu10k1/emu10k1_patch.c (modified) (3 diffs)
• alsa-kernel/pci/emu10k1/emu10k1_synth.c (modified) (4 diffs)
• alsa-kernel/pci/emu10k1/emu10k1x.c (modified) (22 diffs)
• alsa-kernel/pci/emu10k1/emufx.c (modified) (84 diffs)
• alsa-kernel/pci/emu10k1/emumixer.c (modified) (45 diffs)
• alsa-kernel/pci/emu10k1/emumpu401.c (modified) (3 diffs)
• alsa-kernel/pci/emu10k1/emupcm.c (modified) (9 diffs)
• alsa-kernel/pci/emu10k1/io.c (modified) (7 diffs)
• alsa-kernel/pci/emu10k1/irq.c (modified) (1 diff)
• alsa-kernel/pci/emu10k1/memory.c (modified) (7 diffs)
• alsa-kernel/pci/emu10k1/p16v.c (modified) (29 diffs)
• alsa-kernel/pci/emu10k1/voice.c (modified) (3 diffs)
• alsa-kernel/pci/hda/hda_intel.c (modified) (1 diff)
• alsa-kernel/pci/trident/trident_main.c (modified) (1 diff)
• alsa-kernel/pci/ymfpci/ymfpci_main.c (modified) (1 diff)
• drv32/dispatch.c (modified) (1 diff)
• drv32/init.c (modified) (1 diff)
• drv32/strategy.c (modified) (3 diffs)
• include/ossdefos2.h (modified) (1 diff)
• include/version.mak (modified) (1 diff)
• lib32/irq.c (modified) (3 diffs)
• lib32/ossidc.cpp (modified) (1 diff)
• lib32/sound.c (modified) (6 diffs)
• lib32/soundmixer.c (modified) (4 diffs)
• lib32/stack.cpp (modified) (1 diff)

GPL/trunk/alsa-kernel/core/control.c

@@ -27 +27 @@
 /* max number of user-defined controls */
 #define MAX_USER_CONTROLS       32
-
-static inline struct snd_ctl_elem_id *snd_ctl_build_ioff(struct snd_ctl_elem_id *dst_id,
-                                                    struct snd_kcontrol *src_kctl,
-                                                    unsigned int offset)
-{
-        *dst_id = src_kctl->id;
-        dst_id->index += offset;
-        dst_id->numid += offset;
-        return dst_id;
-}
 
 extern int control_id_changed;
@@ -223 +213 @@
  * Returns the pointer of the newly generated instance, or NULL on failure.
  */
-struct snd_kcontrol *snd_ctl_new1(struct snd_kcontrol_new const * ncontrol, void *private_data)
+struct snd_kcontrol *snd_ctl_new1(struct snd_kcontrol_new const * ncontrol,
+                                  void *private_data)
 {
     struct snd_kcontrol kctl;
@@ -244 +235 @@
     kctl.get = ncontrol->get;
     kctl.put = ncontrol->put;
-    kctl.tlv = ncontrol->tlv;
+    kctl.tlv.p =
+        ncontrol->tlv.p;
     kctl.private_value = ncontrol->private_value;
     kctl.private_data = private_data;
@@ -1037 +1029 @@
 #endif
 
-static int snd_ctl_tlv_read(struct snd_card *card,
-                            struct snd_ctl_tlv __user *_tlv)
-{
-    struct snd_ctl_tlv tlv;
-    struct snd_kcontrol *kctl;
-    unsigned int len;
-    int err = 0;
-
-    if (copy_from_user(&tlv, _tlv, sizeof(tlv)))
-        return -EFAULT;
-    if (tlv.length < sizeof(unsigned int) * 3)
-        return -EINVAL;
-    down_read(&card->controls_rwsem);
-    kctl = snd_ctl_find_numid(card, tlv.numid);
-    if (kctl == NULL) {
-        err = -ENOENT;
-        goto __kctl_end;
-    }
-    if (kctl->tlv == NULL) {
-        err = -ENXIO;
-        goto __kctl_end;
-    }
-    len = kctl->tlv[1] + 2 * sizeof(unsigned int);
-    if (tlv.length < len) {
-        err = -ENOMEM;
-        goto __kctl_end;
-    }
-    if (copy_to_user(_tlv->tlv, kctl->tlv, len))
-        err = -EFAULT;
-__kctl_end:
-    up_read(&card->controls_rwsem);
-    return err;
-}
+static int snd_ctl_tlv_ioctl(struct snd_ctl_file *file,
+                             struct snd_ctl_tlv __user *_tlv,
+                             int op_flag)
+{
+        struct snd_card *card = file->card;
+        struct snd_ctl_tlv tlv;
+        struct snd_kcontrol *kctl;
+        struct snd_kcontrol_volatile *vd;
+        unsigned int len;
+        int err = 0;
+
+        if (copy_from_user(&tlv, _tlv, sizeof(tlv)))
+                return -EFAULT;
+        if (tlv.length < sizeof(unsigned int) * 3)
+                return -EINVAL;
+        down_read(&card->controls_rwsem);
+        kctl = snd_ctl_find_numid(card, tlv.numid);
+        if (kctl == NULL) {
+                err = -ENOENT;
+                goto __kctl_end;
+        }
+        if (kctl->tlv.p == NULL) {
+                err = -ENXIO;
+                goto __kctl_end;
+        }
+        vd = &kctl->vd[tlv.numid - kctl->id.numid];
+        if ((op_flag == 0 && (vd->access & SNDRV_CTL_ELEM_ACCESS_TLV_READ) == 0) ||
+            (op_flag > 0 && (vd->access & SNDRV_CTL_ELEM_ACCESS_TLV_WRITE) == 0) ||
+            (op_flag < 0 && (vd->access & SNDRV_CTL_ELEM_ACCESS_TLV_COMMAND) == 0)) {
+                err = -ENXIO;
+                goto __kctl_end;
+        }
+        if (vd->access & SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK) {
+                if (file && vd->owner != NULL && vd->owner != file) {
+                        err = -EPERM;
+                        goto __kctl_end;
+                }
+                err = kctl->tlv.c(kctl, op_flag, tlv.length, _tlv->tlv); 
+                if (err > 0) {
+                        up_read(&card->controls_rwsem);
+                        snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_TLV, &kctl->id);
+                        return 0;
+                }
+        } else {
+                if (op_flag) {
+                        err = -ENXIO;
+                        goto __kctl_end;
+                }
+                len = kctl->tlv.p[1] + 2 * sizeof(unsigned int);
+                if (tlv.length < len) {
+                        err = -ENOMEM;
+                        goto __kctl_end;
+                }
+                if (copy_to_user(_tlv->tlv, kctl->tlv.p, len))
+                        err = -EFAULT;
+        }
+      __kctl_end:
+        up_read(&card->controls_rwsem);
+        return err;
+}
+
 
 static int snd_ctl_ioctl(struct inode *inode, struct file *file,
@@ -1093 +1113 @@
     case SNDRV_CTL_IOCTL_ELEM_INFO:
         return snd_ctl_elem_info(ctl, (struct snd_ctl_elem_info *) arg);
-#if 1
     case SNDRV_CTL_IOCTL_ELEM_READ:
         return snd_ctl_elem_read_user(ctl->card, argp);
     case SNDRV_CTL_IOCTL_ELEM_WRITE:
         return snd_ctl_elem_write_user(ctl, argp);
-#else
-    case SNDRV_CTL_IOCTL_ELEM_READ:
-        return snd_ctl_elem_read(ctl->card, (struct snd_ctl_elem_value *) arg);
-    case SNDRV_CTL_IOCTL_ELEM_WRITE:
-        return snd_ctl_elem_write(ctl, (struct snd_ctl_elem_value *) arg);
-#endif
     case SNDRV_CTL_IOCTL_ELEM_LOCK:
         return snd_ctl_elem_lock(ctl, (struct snd_ctl_elem_id *) arg);
@@ -1117 +1130 @@
         return snd_ctl_subscribe_events(ctl, (int *) arg);
     case SNDRV_CTL_IOCTL_TLV_READ:
-        return snd_ctl_tlv_read(card, argp);
+        return snd_ctl_tlv_ioctl(ctl, argp, 0);
+    case SNDRV_CTL_IOCTL_TLV_WRITE:
+        return snd_ctl_tlv_ioctl(ctl, argp, 1);
+    case SNDRV_CTL_IOCTL_TLV_COMMAND:
+        return snd_ctl_tlv_ioctl(ctl, argp, -1);
     case SNDRV_CTL_IOCTL_POWER:
         if (get_user(err, (int *)arg))

GPL/trunk/alsa-kernel/core/misc.c

@@ -21 +21 @@
 
 #include <sound/driver.h>
-
+#include <sound/firmware.h>
 int snd_task_name(struct task_struct *task, char *name, size_t size)
 {
@@ -669 +669 @@
 }
 
+int mod_firmware_load(const char *fn, char **fp)
+{
+    return 0;
+}
+
+static int snd_try_load_firmware(const char *path, const char *name,
+                                 struct firmware *firmware)
+{
+        char filename[30 + FIRMWARE_NAME_MAX];
+
+        sprintf(filename, "%s/%s", path, name);
+        firmware->size = mod_firmware_load(filename, (char **)&firmware->data);
+        if (firmware->size)
+                printk(KERN_INFO "Loaded '%s'.", filename);
+        return firmware->size;
+}
+
+int request_firmware(const struct firmware **fw, const char *name)
+{
+        struct firmware *firmware;
+
+        *fw = NULL;
+        firmware = kmalloc(sizeof *firmware, GFP_KERNEL);
+        if (!firmware)
+                return -ENOMEM;
+        if (!snd_try_load_firmware("/lib/firmware", name, firmware) &&
+            !snd_try_load_firmware("/lib/hotplug/firmware", name, firmware) &&
+            !snd_try_load_firmware("/usr/lib/hotplug/firmware", name, firmware)) {
+                kfree(firmware);
+                return -EIO;
+        }
+        *fw = firmware;
+        return 0;
+}
+
+void release_firmware(const struct firmware *fw)
+{
+        if (fw) {
+                vfree(fw->data);
+                kfree(fw);
+        }
+}
+

GPL/trunk/alsa-kernel/include/sound/asound.h

@@ -754 +754 @@
 #define SNDRV_CTL_ELEM_ACCESS_VOLATILE          (1<<2)  /* control value may be changed without a notification */
 #define SNDRV_CTL_ELEM_ACCESS_TIMESTAMP         (1<<2)  /* when was control changed */
+#define SNDRV_CTL_ELEM_ACCESS_TLV_READ          (1<<4)  /* TLV read is possible */
+#define SNDRV_CTL_ELEM_ACCESS_TLV_WRITE         (1<<5)  /* TLV write is possible */
+#define SNDRV_CTL_ELEM_ACCESS_TLV_READWRITE     (SNDRV_CTL_ELEM_ACCESS_TLV_READ|SNDRV_CTL_ELEM_ACCESS_TLV_WRITE)
+#define SNDRV_CTL_ELEM_ACCESS_TLV_COMMAND       (1<<6)  /* TLV command is possible */
 #define SNDRV_CTL_ELEM_ACCESS_INACTIVE          (1<<8)  /* control does actually nothing, but may be updated */
 #define SNDRV_CTL_ELEM_ACCESS_LOCK              (1<<9)  /* write lock */
 #define SNDRV_CTL_ELEM_ACCESS_OWNER             (1<<10) /* write lock owner */
+#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK      (1<<28) /* kernel use a TLV callback */ 
 #define SNDRV_CTL_ELEM_ACCESS_USER              (1<<29) /* user space element */
 #define SNDRV_CTL_ELEM_ACCESS_DINDIRECT         (1<<30) /* indirect access for matrix dimensions in the info structure */
@@ -864 +869 @@
         SNDRV_CTL_IOCTL_ELEM_REMOVE = _IOWR('U', 0x19, struct snd_ctl_elem_id),
         SNDRV_CTL_IOCTL_TLV_READ = _IOWR('U', 0x1a, struct snd_ctl_tlv),
+        SNDRV_CTL_IOCTL_TLV_WRITE = _IOWR('U', 0x1b, struct snd_ctl_tlv),
+        SNDRV_CTL_IOCTL_TLV_COMMAND = _IOWR('U', 0x1c, struct snd_ctl_tlv),
         SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE = _IOWR('U', 0x20, int),
         SNDRV_CTL_IOCTL_HWDEP_INFO = _IOR('U', 0x21, struct snd_hwdep_info),
@@ -893 +900 @@
 #define SNDRV_CTL_EVENT_MASK_INFO       (1<<1)  /* element info was changed */
 #define SNDRV_CTL_EVENT_MASK_ADD        (1<<2)  /* element was added */
+#define SNDRV_CTL_EVENT_MASK_TLV        (1<<3)  /* element TLV tree was changed */
 #define SNDRV_CTL_EVENT_MASK_REMOVE     (~0U)   /* element was removed */
 

GPL/trunk/alsa-kernel/include/sound/control.h

@@ -28 +28 @@
 typedef int (snd_kcontrol_get_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol);
 typedef int (snd_kcontrol_put_t) (struct snd_kcontrol * kcontrol, struct snd_ctl_elem_value * ucontrol);
+typedef int (snd_kcontrol_tlv_rw_t)(struct snd_kcontrol *kcontrol,
+                                    int op_flag, /* 0=read,1=write,-1=command */
+                                    unsigned int size,
+                                    unsigned int __user *tlv);
 
 struct snd_kcontrol_new {
@@ -40 +44 @@
     snd_kcontrol_get_t *get;
     snd_kcontrol_put_t *put;
-    unsigned int *tlv;
+    union {
+        snd_kcontrol_tlv_rw_t *c;
+        unsigned int *p;
+    } tlv;
     unsigned long private_value;
 };
@@ -57 +64 @@
         snd_kcontrol_get_t *get;
         snd_kcontrol_put_t *put;
-        unsigned int *tlv;
+        union {
+                snd_kcontrol_tlv_rw_t *c;
+                unsigned int *p;
+        } tlv;
         unsigned long private_value;
 #ifdef TARGET_OS2
@@ -140 +150 @@
 }
 
+static inline struct snd_ctl_elem_id *snd_ctl_build_ioff(struct snd_ctl_elem_id *dst_id,
+                                                    struct snd_kcontrol *src_kctl,
+                                                    unsigned int offset)
+{
+        *dst_id = src_kctl->id;
+        dst_id->index += offset;
+        dst_id->numid += offset;
+        return dst_id;
+}
+
 #endif                          /* __CONTROL_H */

GPL/trunk/alsa-kernel/include/sound/emu10k1.h

@@ -188 +188 @@
                                                 /* NOTE: The rest of the bits in this register  */
                                                 /* _are_ relevant under Linux.                  */
-#define HCFG_CODECFORMAT_MASK   0x00070000      /* CODEC format                                 */
+#define HCFG_PUSH_BUTTON_ENABLE 0x00100000      /* Enables Volume Inc/Dec and Mute functions    */
+#define HCFG_BAUD_RATE          0x00080000      /* 0 = 48kHz, 1 = 44.1kHz                       */
+#define HCFG_EXPANDED_MEM       0x00040000      /* 1 = any 16M of 4G addr, 0 = 32M of 2G addr   */
+#define HCFG_CODECFORMAT_MASK   0x00030000      /* CODEC format                                 */
+
+/* Specific to Alice2, CA0102 */
+#define HCFG_CODECFORMAT_AC97_1 0x00000000      /* AC97 CODEC format -- Ver 1.03                */
+#define HCFG_CODECFORMAT_AC97_2 0x00010000      /* AC97 CODEC format -- Ver 2.1                 */
+#define HCFG_AUTOMUTE_ASYNC     0x00008000      /* When set, the async sample rate convertors   */
+                                                /* will automatically mute their output when    */
+                                                /* they are not rate-locked to the external     */
+                                                /* async audio source                           */
+#define HCFG_AUTOMUTE_SPDIF     0x00004000      /* When set, the async sample rate convertors   */
+                                                /* will automatically mute their output when    */
+                                                /* the SPDIF V-bit indicates invalid audio      */
+#define HCFG_EMU32_SLAVE        0x00002000      /* 0 = Master, 1 = Slave. Slave for EMU1010     */
+#define HCFG_SLOW_RAMP          0x00001000      /* Increases Send Smoothing time constant       */
+/* 0x00000800 not used on Alice2 */
+#define HCFG_PHASE_TRACK_MASK   0x00000700      /* When set, forces corresponding input to      */
+                                                /* phase track the previous input.              */
+                                                /* I2S0 can phase track the last S/PDIF input   */
+#define HCFG_I2S_ASRC_ENABLE    0x00000070      /* When set, enables asynchronous sample rate   */
+                                                /* conversion for the corresponding             */
+                                                /* I2S format input                             */
+/* Rest of HCFG 0x0000000f same as below. LOCKSOUNDCACHE etc.  */
+
+
+
+/* Older chips */
 #define HCFG_CODECFORMAT_AC97   0x00000000      /* AC97 CODEC format -- Primary Output          */
 #define HCFG_CODECFORMAT_I2S    0x00010000      /* I2S CODEC format -- Secondary (Rear) Output  */
@@ -245 +273 @@
 #define A_IOCFG_DISABLE_ANALOG  0x0040          /* = 'enable' for Audigy2 (chiprev=4)           */
 #define A_IOCFG_ENABLE_DIGITAL  0x0004
+#define A_IOCFG_ENABLE_DIGITAL_AUDIGY4  0x0080
 #define A_IOCFG_UNKNOWN_20      0x0020
 #define A_IOCFG_DISABLE_AC97_FRONT      0x0080  /* turn off ac97 front -> front (10k2.1)        */
@@ -885 +914 @@
 #define A_HIWORD_OPA_MASK       0x000007ff
 
+/************************************************************************************************/
+/* EMU1010m HANA FPGA registers                                                                 */
+/************************************************************************************************/
+#define EMU_HANA_DESTHI         0x00    /* 0000xxx  3 bits Link Destination */
+#define EMU_HANA_DESTLO         0x01    /* 00xxxxx  5 bits */
+#define EMU_HANA_SRCHI          0x02    /* 0000xxx  3 bits Link Source */
+#define EMU_HANA_SRCLO          0x03    /* 00xxxxx  5 bits */
+#define EMU_HANA_DOCK_PWR       0x04    /* 000000x  1 bits Audio Dock power */
+#define EMU_HANA_DOCK_PWR_ON            0x01 /* Audio Dock power on */
+#define EMU_HANA_WCLOCK         0x05    /* 0000xxx  3 bits Word Clock source select  */
+                                        /* Must be written after power on to reset DLL */
+                                        /* One is unable to detect the Audio dock without this */
+#define EMU_HANA_WCLOCK_SRC_MASK        0x07
+#define EMU_HANA_WCLOCK_INT_48K         0x00
+#define EMU_HANA_WCLOCK_INT_44_1K       0x01
+#define EMU_HANA_WCLOCK_HANA_SPDIF_IN   0x02
+#define EMU_HANA_WCLOCK_HANA_ADAT_IN    0x03
+#define EMU_HANA_WCLOCK_SYNC_BNCN       0x04
+#define EMU_HANA_WCLOCK_2ND_HANA        0x05
+#define EMU_HANA_WCLOCK_SRC_RESERVED    0x06
+#define EMU_HANA_WCLOCK_OFF             0x07 /* For testing, forces fallback to DEFCLOCK */
+#define EMU_HANA_WCLOCK_MULT_MASK       0x18
+#define EMU_HANA_WCLOCK_1X              0x00
+#define EMU_HANA_WCLOCK_2X              0x08
+#define EMU_HANA_WCLOCK_4X              0x10
+#define EMU_HANA_WCLOCK_MULT_RESERVED   0x18
+
+#define EMU_HANA_DEFCLOCK       0x06    /* 000000x  1 bits Default Word Clock  */
+#define EMU_HANA_DEFCLOCK_48K           0x00
+#define EMU_HANA_DEFCLOCK_44_1K         0x01
+
+#define EMU_HANA_UNMUTE         0x07    /* 000000x  1 bits Mute all audio outputs  */
+#define EMU_MUTE                        0x00
+#define EMU_UNMUTE                      0x01
+
+#define EMU_HANA_FPGA_CONFIG    0x08    /* 00000xx  2 bits Config control of FPGAs  */
+#define EMU_HANA_FPGA_CONFIG_AUDIODOCK  0x01 /* Set in order to program FPGA on Audio Dock */
+#define EMU_HANA_FPGA_CONFIG_HANA       0x02 /* Set in order to program FPGA on Hana */
+
+#define EMU_HANA_IRQ_ENABLE     0x09    /* 000xxxx  4 bits IRQ Enable  */
+#define EMU_HANA_IRQ_WCLK_CHANGED       0x01
+#define EMU_HANA_IRQ_ADAT               0x02
+#define EMU_HANA_IRQ_DOCK               0x04
+#define EMU_HANA_IRQ_DOCK_LOST          0x08
+
+#define EMU_HANA_SPDIF_MODE     0x0a    /* 00xxxxx  5 bits SPDIF MODE  */
+#define EMU_HANA_SPDIF_MODE_TX_COMSUMER 0x00
+#define EMU_HANA_SPDIF_MODE_TX_PRO      0x01
+#define EMU_HANA_SPDIF_MODE_TX_NOCOPY   0x02
+#define EMU_HANA_SPDIF_MODE_RX_COMSUMER 0x00
+#define EMU_HANA_SPDIF_MODE_RX_PRO      0x04
+#define EMU_HANA_SPDIF_MODE_RX_NOCOPY   0x08
+#define EMU_HANA_SPDIF_MODE_RX_INVALID  0x10
+
+#define EMU_HANA_OPTICAL_TYPE   0x0b    /* 00000xx  2 bits ADAT or SPDIF in/out  */
+#define EMU_HANA_OPTICAL_IN_SPDIF       0x00
+#define EMU_HANA_OPTICAL_IN_ADAT        0x01
+#define EMU_HANA_OPTICAL_OUT_SPDIF      0x00
+#define EMU_HANA_OPTICAL_OUT_ADAT       0x02
+
+#define EMU_HANA_MIDI_IN                0x0c    /* 000000x  1 bit  Control MIDI  */
+#define EMU_HANA_MIDI_IN_FROM_HAMOA     0x00 /* HAMOA MIDI in to Alice 2 MIDI B */
+#define EMU_HANA_MIDI_IN_FROM_DOCK      0x01 /* Audio Dock MIDI in to Alice 2 MIDI B */
+
+#define EMU_HANA_DOCK_LEDS_1    0x0d    /* 000xxxx  4 bit  Audio Dock LEDs  */
+#define EMU_HANA_DOCK_LEDS_1_MIDI1      0x01    /* MIDI 1 LED on */
+#define EMU_HANA_DOCK_LEDS_1_MIDI2      0x02    /* MIDI 2 LED on */
+#define EMU_HANA_DOCK_LEDS_1_SMPTE_IN   0x04    /* SMPTE IN LED on */
+#define EMU_HANA_DOCK_LEDS_1_SMPTE_OUT  0x08    /* SMPTE OUT LED on */
+
+#define EMU_HANA_DOCK_LEDS_2    0x0e    /* 0xxxxxx  6 bit  Audio Dock LEDs  */
+#define EMU_HANA_DOCK_LEDS_2_44K        0x01    /* 44.1 kHz LED on */
+#define EMU_HANA_DOCK_LEDS_2_48K        0x02    /* 48 kHz LED on */
+#define EMU_HANA_DOCK_LEDS_2_96K        0x04    /* 96 kHz LED on */
+#define EMU_HANA_DOCK_LEDS_2_192K       0x08    /* 192 kHz LED on */
+#define EMU_HANA_DOCK_LEDS_2_LOCK       0x10    /* LOCK LED on */
+#define EMU_HANA_DOCK_LEDS_2_EXT        0x20    /* EXT LED on */
+
+#define EMU_HANA_DOCK_LEDS_3    0x0f    /* 0xxxxxx  6 bit  Audio Dock LEDs  */
+#define EMU_HANA_DOCK_LEDS_3_CLIP_A     0x01    /* Mic A Clip LED on */
+#define EMU_HANA_DOCK_LEDS_3_CLIP_B     0x02    /* Mic B Clip LED on */
+#define EMU_HANA_DOCK_LEDS_3_SIGNAL_A   0x04    /* Signal A Clip LED on */
+#define EMU_HANA_DOCK_LEDS_3_SIGNAL_B   0x08    /* Signal B Clip LED on */
+#define EMU_HANA_DOCK_LEDS_3_MANUAL_CLIP        0x10    /* Manual Clip detection */
+#define EMU_HANA_DOCK_LEDS_3_MANUAL_SIGNAL      0x20    /* Manual Signal detection */
+
+#define EMU_HANA_ADC_PADS       0x10    /* 0000xxx  3 bit  Audio Dock ADC 14dB pads */
+#define EMU_HANA_DOCK_ADC_PAD1  0x01    /* 14dB Attenuation on Audio Dock ADC 1 */
+#define EMU_HANA_DOCK_ADC_PAD2  0x02    /* 14dB Attenuation on Audio Dock ADC 2 */
+#define EMU_HANA_DOCK_ADC_PAD3  0x04    /* 14dB Attenuation on Audio Dock ADC 3 */
+#define EMU_HANA_0202_ADC_PAD1  0x08    /* 14dB Attenuation on 0202 ADC 1 */
+
+#define EMU_HANA_DOCK_MISC      0x11    /* 0xxxxxx  6 bit  Audio Dock misc bits */
+#define EMU_HANA_DOCK_DAC1_MUTE 0x01    /* DAC 1 Mute */
+#define EMU_HANA_DOCK_DAC2_MUTE 0x02    /* DAC 2 Mute */
+#define EMU_HANA_DOCK_DAC3_MUTE 0x04    /* DAC 3 Mute */
+#define EMU_HANA_DOCK_DAC4_MUTE 0x08    /* DAC 4 Mute */
+#define EMU_HANA_DOCK_PHONES_192_DAC1   0x00    /* DAC 1 Headphones source at 192kHz */
+#define EMU_HANA_DOCK_PHONES_192_DAC2   0x10    /* DAC 2 Headphones source at 192kHz */
+#define EMU_HANA_DOCK_PHONES_192_DAC3   0x20    /* DAC 3 Headphones source at 192kHz */
+#define EMU_HANA_DOCK_PHONES_192_DAC4   0x30    /* DAC 4 Headphones source at 192kHz */
+
+#define EMU_HANA_MIDI_OUT       0x12    /* 00xxxxx  5 bit  Source for each MIDI out port */
+#define EMU_HANA_MIDI_OUT_0202  0x01 /* 0202 MIDI from Alice 2. 0 = A, 1 = B */
+#define EMU_HANA_MIDI_OUT_DOCK1 0x02 /* Audio Dock MIDI1 front, from Alice 2. 0 = A, 1 = B */
+#define EMU_HANA_MIDI_OUT_DOCK2 0x04 /* Audio Dock MIDI2 rear, from Alice 2. 0 = A, 1 = B */
+#define EMU_HANA_MIDI_OUT_SYNC2 0x08 /* Sync card. Not the actual MIDI out jack. 0 = A, 1 = B */
+#define EMU_HANA_MIDI_OUT_LOOP  0x10 /* 0 = bits (3:0) normal. 1 = MIDI loopback enabled. */
+
+#define EMU_HANA_DAC_PADS       0x13    /* 00xxxxx  5 bit  DAC 14dB attenuation pads */
+#define EMU_HANA_DOCK_DAC_PAD1  0x01    /* 14dB Attenuation on AudioDock DAC 1. Left and Right */
+#define EMU_HANA_DOCK_DAC_PAD2  0x02    /* 14dB Attenuation on AudioDock DAC 2. Left and Right */
+#define EMU_HANA_DOCK_DAC_PAD3  0x04    /* 14dB Attenuation on AudioDock DAC 3. Left and Right */
+#define EMU_HANA_DOCK_DAC_PAD4  0x08    /* 14dB Attenuation on AudioDock DAC 4. Left and Right */
+#define EMU_HANA_0202_DAC_PAD1  0x10    /* 14dB Attenuation on 0202 DAC 1. Left and Right */
+
+/* 0x14 - 0x1f Unused R/W registers */
+#define EMU_HANA_IRQ_STATUS     0x20    /* 000xxxx  4 bits IRQ Status  */
+#if 0  /* Already defined for reg 0x09 IRQ_ENABLE */
+#define EMU_HANA_IRQ_WCLK_CHANGED       0x01
+#define EMU_HANA_IRQ_ADAT               0x02
+#define EMU_HANA_IRQ_DOCK               0x04
+#define EMU_HANA_IRQ_DOCK_LOST          0x08
+#endif
+
+#define EMU_HANA_OPTION_CARDS   0x21    /* 000xxxx  4 bits Presence of option cards */
+#define EMU_HANA_OPTION_HAMOA   0x01    /* HAMOA card present */
+#define EMU_HANA_OPTION_SYNC    0x02    /* Sync card present */
+#define EMU_HANA_OPTION_DOCK_ONLINE     0x04    /* Audio Dock online and FPGA configured */
+#define EMU_HANA_OPTION_DOCK_OFFLINE    0x08    /* Audio Dock online and FPGA not configured */
+
+#define EMU_HANA_ID             0x22    /* 1010101  7 bits ID byte & 0x7f = 0x55 */
+
+#define EMU_HANA_MAJOR_REV      0x23    /* 0000xxx  3 bit  Hana FPGA Major rev */
+#define EMU_HANA_MINOR_REV      0x24    /* 0000xxx  3 bit  Hana FPGA Minor rev */
+
+#define EMU_DOCK_MAJOR_REV      0x25    /* 0000xxx  3 bit  Audio Dock FPGA Major rev */
+#define EMU_DOCK_MINOR_REV      0x26    /* 0000xxx  3 bit  Audio Dock FPGA Minor rev */
+
+#define EMU_DOCK_BOARD_ID       0x27    /* 00000xx  2 bits Audio Dock ID pins */
+#define EMU_DOCK_BOARD_ID0      0x00    /* ID bit 0 */
+#define EMU_DOCK_BOARD_ID1      0x03    /* ID bit 1 */
+
+#define EMU_HANA_WC_SPDIF_HI    0x28    /* 0xxxxxx  6 bit  SPDIF IN Word clock, upper 6 bits */
+#define EMU_HANA_WC_SPDIF_LO    0x29    /* 0xxxxxx  6 bit  SPDIF IN Word clock, lower 6 bits */
+
+#define EMU_HANA_WC_ADAT_HI     0x2a    /* 0xxxxxx  6 bit  ADAT IN Word clock, upper 6 bits */
+#define EMU_HANA_WC_ADAT_LO     0x2b    /* 0xxxxxx  6 bit  ADAT IN Word clock, lower 6 bits */
+
+#define EMU_HANA_WC_BNC_LO      0x2c    /* 0xxxxxx  6 bit  BNC IN Word clock, lower 6 bits */
+#define EMU_HANA_WC_BNC_HI      0x2d    /* 0xxxxxx  6 bit  BNC IN Word clock, upper 6 bits */
+
+#define EMU_HANA2_WC_SPDIF_HI   0x2e    /* 0xxxxxx  6 bit  HANA2 SPDIF IN Word clock, upper 6 bits */
+#define EMU_HANA2_WC_SPDIF_LO   0x2f    /* 0xxxxxx  6 bit  HANA2 SPDIF IN Word clock, lower 6 bits */
+/* 0x30 - 0x3f Unused Read only registers */
+
+/************************************************************************************************/
+/* EMU1010m HANA Destinations                                                                   */
+/************************************************************************************************/
+#define EMU_DST_ALICE2_EMU32_0  0x000f  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_ALICE2_EMU32_1  0x0000  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_ALICE2_EMU32_2  0x0001  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_ALICE2_EMU32_3  0x0002  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_ALICE2_EMU32_4  0x0003  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_ALICE2_EMU32_5  0x0004  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_ALICE2_EMU32_6  0x0005  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_ALICE2_EMU32_7  0x0006  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_ALICE2_EMU32_8  0x0007  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_ALICE2_EMU32_9  0x0008  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_ALICE2_EMU32_A  0x0009  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_ALICE2_EMU32_B  0x000a  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_ALICE2_EMU32_C  0x000b  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_ALICE2_EMU32_D  0x000c  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_ALICE2_EMU32_E  0x000d  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_ALICE2_EMU32_F  0x000e  /* 16 EMU32 channels to Alice2 +0 to +0xf */
+#define EMU_DST_DOCK_DAC1_LEFT1 0x0100  /* Audio Dock DAC1 Left, 1st or 48kHz only */
+#define EMU_DST_DOCK_DAC1_LEFT2 0x0101  /* Audio Dock DAC1 Left, 2nd or 96kHz */
+#define EMU_DST_DOCK_DAC1_LEFT3 0x0102  /* Audio Dock DAC1 Left, 3rd or 192kHz */
+#define EMU_DST_DOCK_DAC1_LEFT4 0x0103  /* Audio Dock DAC1 Left, 4th or 192kHz */
+#define EMU_DST_DOCK_DAC1_RIGHT1        0x0104  /* Audio Dock DAC1 Right, 1st or 48kHz only */
+#define EMU_DST_DOCK_DAC1_RIGHT2        0x0105  /* Audio Dock DAC1 Right, 2nd or 96kHz */
+#define EMU_DST_DOCK_DAC1_RIGHT3        0x0106  /* Audio Dock DAC1 Right, 3rd or 192kHz */
+#define EMU_DST_DOCK_DAC1_RIGHT4        0x0107  /* Audio Dock DAC1 Right, 4th or 192kHz */
+#define EMU_DST_DOCK_DAC2_LEFT1 0x0108  /* Audio Dock DAC2 Left, 1st or 48kHz only */
+#define EMU_DST_DOCK_DAC2_LEFT2 0x0109  /* Audio Dock DAC2 Left, 2nd or 96kHz */
+#define EMU_DST_DOCK_DAC2_LEFT3 0x010a  /* Audio Dock DAC2 Left, 3rd or 192kHz */
+#define EMU_DST_DOCK_DAC2_LEFT4 0x010b  /* Audio Dock DAC2 Left, 4th or 192kHz */
+#define EMU_DST_DOCK_DAC2_RIGHT1        0x010c  /* Audio Dock DAC2 Right, 1st or 48kHz only */
+#define EMU_DST_DOCK_DAC2_RIGHT2        0x010d  /* Audio Dock DAC2 Right, 2nd or 96kHz */
+#define EMU_DST_DOCK_DAC2_RIGHT3        0x010e  /* Audio Dock DAC2 Right, 3rd or 192kHz */
+#define EMU_DST_DOCK_DAC2_RIGHT4        0x010f  /* Audio Dock DAC2 Right, 4th or 192kHz */
+#define EMU_DST_DOCK_DAC3_LEFT1 0x0110  /* Audio Dock DAC1 Left, 1st or 48kHz only */
+#define EMU_DST_DOCK_DAC3_LEFT2 0x0111  /* Audio Dock DAC1 Left, 2nd or 96kHz */
+#define EMU_DST_DOCK_DAC3_LEFT3 0x0112  /* Audio Dock DAC1 Left, 3rd or 192kHz */
+#define EMU_DST_DOCK_DAC3_LEFT4 0x0113  /* Audio Dock DAC1 Left, 4th or 192kHz */
+#define EMU_DST_DOCK_PHONES_LEFT1       0x0112  /* Audio Dock PHONES Left, 1st or 48kHz only */
+#define EMU_DST_DOCK_PHONES_LEFT2       0x0113  /* Audio Dock PHONES Left, 2nd or 96kHz */
+#define EMU_DST_DOCK_DAC3_RIGHT1        0x0114  /* Audio Dock DAC1 Right, 1st or 48kHz only */
+#define EMU_DST_DOCK_DAC3_RIGHT2        0x0115  /* Audio Dock DAC1 Right, 2nd or 96kHz */
+#define EMU_DST_DOCK_DAC3_RIGHT3        0x0116  /* Audio Dock DAC1 Right, 3rd or 192kHz */
+#define EMU_DST_DOCK_DAC3_RIGHT4        0x0117  /* Audio Dock DAC1 Right, 4th or 192kHz */
+#define EMU_DST_DOCK_PHONES_RIGHT1      0x0116  /* Audio Dock PHONES Right, 1st or 48kHz only */
+#define EMU_DST_DOCK_PHONES_RIGHT2      0x0117  /* Audio Dock PHONES Right, 2nd or 96kHz */
+#define EMU_DST_DOCK_DAC4_LEFT1 0x0118  /* Audio Dock DAC2 Left, 1st or 48kHz only */
+#define EMU_DST_DOCK_DAC4_LEFT2 0x0119  /* Audio Dock DAC2 Left, 2nd or 96kHz */
+#define EMU_DST_DOCK_DAC4_LEFT3 0x011a  /* Audio Dock DAC2 Left, 3rd or 192kHz */
+#define EMU_DST_DOCK_DAC4_LEFT4 0x011b  /* Audio Dock DAC2 Left, 4th or 192kHz */
+#define EMU_DST_DOCK_SPDIF_LEFT1        0x011a  /* Audio Dock SPDIF Left, 1st or 48kHz only */
+#define EMU_DST_DOCK_SPDIF_LEFT2        0x011b  /* Audio Dock SPDIF Left, 2nd or 96kHz */
+#define EMU_DST_DOCK_DAC4_RIGHT1        0x011c  /* Audio Dock DAC2 Right, 1st or 48kHz only */
+#define EMU_DST_DOCK_DAC4_RIGHT2        0x011d  /* Audio Dock DAC2 Right, 2nd or 96kHz */
+#define EMU_DST_DOCK_DAC4_RIGHT3        0x011e  /* Audio Dock DAC2 Right, 3rd or 192kHz */
+#define EMU_DST_DOCK_DAC4_RIGHT4        0x011f  /* Audio Dock DAC2 Right, 4th or 192kHz */
+#define EMU_DST_DOCK_SPDIF_RIGHT1       0x011e  /* Audio Dock SPDIF Right, 1st or 48kHz only */
+#define EMU_DST_DOCK_SPDIF_RIGHT2       0x011f  /* Audio Dock SPDIF Right, 2nd or 96kHz */
+#define EMU_DST_HANA_SPDIF_LEFT1        0x0200  /* Hana SPDIF Left, 1st or 48kHz only */
+#define EMU_DST_HANA_SPDIF_LEFT2        0x0202  /* Hana SPDIF Left, 2nd or 96kHz */
+#define EMU_DST_HANA_SPDIF_RIGHT1       0x0201  /* Hana SPDIF Right, 1st or 48kHz only */
+#define EMU_DST_HANA_SPDIF_RIGHT2       0x0203  /* Hana SPDIF Right, 2nd or 96kHz */
+#define EMU_DST_HAMOA_DAC_LEFT1 0x0300  /* Hamoa DAC Left, 1st or 48kHz only */
+#define EMU_DST_HAMOA_DAC_LEFT2 0x0302  /* Hamoa DAC Left, 2nd or 96kHz */
+#define EMU_DST_HAMOA_DAC_LEFT3 0x0304  /* Hamoa DAC Left, 3rd or 192kHz */
+#define EMU_DST_HAMOA_DAC_LEFT4 0x0306  /* Hamoa DAC Left, 4th or 192kHz */
+#define EMU_DST_HAMOA_DAC_RIGHT1        0x0301  /* Hamoa DAC Right, 1st or 48kHz only */
+#define EMU_DST_HAMOA_DAC_RIGHT2        0x0303  /* Hamoa DAC Right, 2nd or 96kHz */
+#define EMU_DST_HAMOA_DAC_RIGHT3        0x0305  /* Hamoa DAC Right, 3rd or 192kHz */
+#define EMU_DST_HAMOA_DAC_RIGHT4        0x0307  /* Hamoa DAC Right, 4th or 192kHz */
+#define EMU_DST_HANA_ADAT       0x0400  /* Hana ADAT 8 channel out +0 to +7 */
+#define EMU_DST_ALICE_I2S0_LEFT         0x0500  /* Alice2 I2S0 Left */
+#define EMU_DST_ALICE_I2S0_RIGHT        0x0501  /* Alice2 I2S0 Right */
+#define EMU_DST_ALICE_I2S1_LEFT         0x0600  /* Alice2 I2S1 Left */
+#define EMU_DST_ALICE_I2S1_RIGHT        0x0601  /* Alice2 I2S1 Right */
+#define EMU_DST_ALICE_I2S2_LEFT         0x0700  /* Alice2 I2S2 Left */
+#define EMU_DST_ALICE_I2S2_RIGHT        0x0701  /* Alice2 I2S2 Right */
+
+/************************************************************************************************/
+/* EMU1010m HANA Sources                                                                        */
+/************************************************************************************************/
+#define EMU_SRC_SILENCE         0x0000  /* Silence */
+#define EMU_SRC_DOCK_MIC_A1     0x0100  /* Audio Dock Mic A, 1st or 48kHz only */
+#define EMU_SRC_DOCK_MIC_A2     0x0101  /* Audio Dock Mic A, 2nd or 96kHz */
+#define EMU_SRC_DOCK_MIC_A3     0x0102  /* Audio Dock Mic A, 3rd or 192kHz */
+#define EMU_SRC_DOCK_MIC_A4     0x0103  /* Audio Dock Mic A, 4th or 192kHz */
+#define EMU_SRC_DOCK_MIC_B1     0x0104  /* Audio Dock Mic B, 1st or 48kHz only */
+#define EMU_SRC_DOCK_MIC_B2     0x0105  /* Audio Dock Mic B, 2nd or 96kHz */
+#define EMU_SRC_DOCK_MIC_B3     0x0106  /* Audio Dock Mic B, 3rd or 192kHz */
+#define EMU_SRC_DOCK_MIC_B4     0x0107  /* Audio Dock Mic B, 4th or 192kHz */
+#define EMU_SRC_DOCK_ADC1_LEFT1 0x0108  /* Audio Dock ADC1 Left, 1st or 48kHz only */
+#define EMU_SRC_DOCK_ADC1_LEFT2 0x0109  /* Audio Dock ADC1 Left, 2nd or 96kHz */
+#define EMU_SRC_DOCK_ADC1_LEFT3 0x010a  /* Audio Dock ADC1 Left, 3rd or 192kHz */
+#define EMU_SRC_DOCK_ADC1_LEFT4 0x010b  /* Audio Dock ADC1 Left, 4th or 192kHz */
+#define EMU_SRC_DOCK_ADC1_RIGHT1        0x010c  /* Audio Dock ADC1 Right, 1st or 48kHz only */
+#define EMU_SRC_DOCK_ADC1_RIGHT2        0x010d  /* Audio Dock ADC1 Right, 2nd or 96kHz */
+#define EMU_SRC_DOCK_ADC1_RIGHT3        0x010e  /* Audio Dock ADC1 Right, 3rd or 192kHz */
+#define EMU_SRC_DOCK_ADC1_RIGHT4        0x010f  /* Audio Dock ADC1 Right, 4th or 192kHz */
+#define EMU_SRC_DOCK_ADC2_LEFT1 0x0110  /* Audio Dock ADC2 Left, 1st or 48kHz only */
+#define EMU_SRC_DOCK_ADC2_LEFT2 0x0111  /* Audio Dock ADC2 Left, 2nd or 96kHz */
+#define EMU_SRC_DOCK_ADC2_LEFT3 0x0112  /* Audio Dock ADC2 Left, 3rd or 192kHz */
+#define EMU_SRC_DOCK_ADC2_LEFT4 0x0113  /* Audio Dock ADC2 Left, 4th or 192kHz */
+#define EMU_SRC_DOCK_ADC2_RIGHT1        0x0114  /* Audio Dock ADC2 Right, 1st or 48kHz only */
+#define EMU_SRC_DOCK_ADC2_RIGHT2        0x0115  /* Audio Dock ADC2 Right, 2nd or 96kHz */
+#define EMU_SRC_DOCK_ADC2_RIGHT3        0x0116  /* Audio Dock ADC2 Right, 3rd or 192kHz */
+#define EMU_SRC_DOCK_ADC2_RIGHT4        0x0117  /* Audio Dock ADC2 Right, 4th or 192kHz */
+#define EMU_SRC_DOCK_ADC3_LEFT1 0x0118  /* Audio Dock ADC3 Left, 1st or 48kHz only */
+#define EMU_SRC_DOCK_ADC3_LEFT2 0x0119  /* Audio Dock ADC3 Left, 2nd or 96kHz */
+#define EMU_SRC_DOCK_ADC3_LEFT3 0x011a  /* Audio Dock ADC3 Left, 3rd or 192kHz */
+#define EMU_SRC_DOCK_ADC3_LEFT4 0x011b  /* Audio Dock ADC3 Left, 4th or 192kHz */
+#define EMU_SRC_DOCK_ADC3_RIGHT1        0x011c  /* Audio Dock ADC3 Right, 1st or 48kHz only */
+#define EMU_SRC_DOCK_ADC3_RIGHT2        0x011d  /* Audio Dock ADC3 Right, 2nd or 96kHz */
+#define EMU_SRC_DOCK_ADC3_RIGHT3        0x011e  /* Audio Dock ADC3 Right, 3rd or 192kHz */
+#define EMU_SRC_DOCK_ADC3_RIGHT4        0x011f  /* Audio Dock ADC3 Right, 4th or 192kHz */
+#define EMU_SRC_HAMOA_ADC_LEFT1 0x0200  /* Hamoa ADC Left, 1st or 48kHz only */
+#define EMU_SRC_HAMOA_ADC_LEFT2 0x0202  /* Hamoa ADC Left, 2nd or 96kHz */
+#define EMU_SRC_HAMOA_ADC_LEFT3 0x0204  /* Hamoa ADC Left, 3rd or 192kHz */
+#define EMU_SRC_HAMOA_ADC_LEFT4 0x0206  /* Hamoa ADC Left, 4th or 192kHz */
+#define EMU_SRC_HAMOA_ADC_RIGHT1        0x0201  /* Hamoa ADC Right, 1st or 48kHz only */
+#define EMU_SRC_HAMOA_ADC_RIGHT2        0x0203  /* Hamoa ADC Right, 2nd or 96kHz */
+#define EMU_SRC_HAMOA_ADC_RIGHT3        0x0205  /* Hamoa ADC Right, 3rd or 192kHz */
+#define EMU_SRC_HAMOA_ADC_RIGHT4        0x0207  /* Hamoa ADC Right, 4th or 192kHz */
+#define EMU_SRC_ALICE_EMU32A            0x0300  /* Alice2 EMU32a 16 outputs. +0 to +0xf */
+#define EMU_SRC_ALICE_EMU32B            0x0310  /* Alice2 EMU32b 16 outputs. +0 to +0xf */
+#define EMU_SRC_HANA_ADAT       0x0400  /* Hana ADAT 8 channel in +0 to +7 */
+#define EMU_SRC_HANA_SPDIF_LEFT1        0x0500  /* Hana SPDIF Left, 1st or 48kHz only */
+#define EMU_SRC_HANA_SPDIF_LEFT2        0x0502  /* Hana SPDIF Left, 2nd or 96kHz */
+#define EMU_SRC_HANA_SPDIF_RIGHT1       0x0501  /* Hana SPDIF Right, 1st or 48kHz only */
+#define EMU_SRC_HANA_SPDIF_RIGHT2       0x0503  /* Hana SPDIF Right, 2nd or 96kHz */
+/* 0x600 and 0x700 no used */
 
 /* ------------------- STRUCTURES -------------------- */
@@ -1061 +1377 @@
         unsigned char spdif_bug;    /* Has Spdif phasing bug */
         unsigned char ac97_chip;    /* Has an AC97 chip: 1 = mandatory, 2 = optional */
-        unsigned char ecard;        /* APS EEPROM */
+        unsigned char ecard;        /* APS EEPROM */
+        unsigned char emu1010;     /* EMU 1010m card */
+        unsigned char spi_dac;      /* SPI interface for DAC */
+        unsigned char i2c_adc;      /* I2C interface for ADC */
+        unsigned char adc_1361t;    /* Use Philips 1361T ADC */
         const char *driver;
         const char *name;
         const char *id;         /* for backward compatibility - can be NULL if not needed */
 };
+
+struct snd_emu1010 {
+        unsigned int output_source[64];
+        unsigned int input_source[64];
+        unsigned int adc_pads; /* bit mask */
+        unsigned int dac_pads; /* bit mask */
+        unsigned int internal_clock; /* 44100 or 48000 */
+};
+
 
 struct snd_emu10k1 {
@@ -1120 +1449 @@
         spinlock_t emu_lock;
         spinlock_t voice_lock;
-        struct semaphore ptb_lock;
+        //struct semaphore ptb_lock;
 
         struct snd_emu10k1_voice voices[NUM_G];
@@ -1126 +1455 @@
         struct snd_emu10k1_voice p16v_capture_voice;
         int p16v_device_offset;
-        u32 p16v_capture_source;
+        u32 p16v_capture_source;
+        struct snd_emu1010 emu1010;
         u32 p16v_capture_channel;
         struct snd_emu10k1_pcm_mixer pcm_mixer[32];
@@ -1190 +1520 @@
 int snd_emu10k1_fx8010_new(struct snd_emu10k1 *emu, int device, struct snd_hwdep ** rhwdep);
 
-irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id);
 
 void snd_emu10k1_voice_init(struct snd_emu10k1 * emu, int voice);
@@ -1203 +1533 @@
 unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu, unsigned int reg, unsigned int chn);
 void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned int chn, unsigned int data);
+int snd_emu10k1_spi_write(struct snd_emu10k1 * emu, unsigned int data);
+int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, int reg, int value);
+int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, int reg, int *value);
+int snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 * emu, int dst, int src);
 unsigned int snd_emu10k1_efx_read(struct snd_emu10k1 *emu, unsigned int pc);
 void snd_emu10k1_intr_enable(struct snd_emu10k1 *emu, unsigned int intrenb);
@@ -1519 +1853 @@
         unsigned int min;               /* minimum range */
         unsigned int max;               /* maximum range */
+        union {
+                snd_kcontrol_tlv_rw_t *c;
+                unsigned int *p;
+        } tlv;
         unsigned int translation;       /* translation type (EMU10K1_GPR_TRANSLATION*) */
 };

GPL/trunk/alsa-kernel/pci/ca0106/ca0106_mixer.c

@@ -75 +75 @@
 #include "ca0106.h"
 
-static DECLARE_TLV_DB_SCALE(snd_ca0106_db_scale, -5150, 75, 1);
+static DECLARE_TLV_DB_SCALE(snd_ca0106_db_scale1, -5175, 25, 1);
+static DECLARE_TLV_DB_SCALE(snd_ca0106_db_scale2, -10350, 50, 1);
 
 static int snd_ca0106_shared_spdif_info(struct snd_kcontrol *kcontrol,
@@ -336 +337 @@
 {                                                               \
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
-        .info = snd_ca0106_volume_info,                         \
-        .get =          snd_ca0106_volume_get,                  \
-    .put =          snd_ca0106_volume_put, \
-    .tlv =       snd_ca0106_db_scale,                           \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |             \
+                  SNDRV_CTL_ELEM_ACCESS_TLV_READ,               \
+        .info =  snd_ca0106_volume_info,                        \
+        .get =   snd_ca0106_volume_get,                         \
+        .put =   snd_ca0106_volume_put,                         \
+        .tlv = { .p = snd_ca0106_db_scale1 },                   \
         .private_value = ((chid) << 8) | (reg)                  \
 }
-
 
 static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = {

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

@@ -2 +2 @@
  *  The driver for the EMU10K1 (SB Live!) based soundcards
  *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *
+ *  Copyright (c) by James Courtier-Dutton <James@superbug.demon.co.uk>
+ *      Added support for Audigy 2 Value.
  *
  *
@@ -17 +20 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
  *
  */
@@ -121 +125 @@
         static int dev;
 #endif
-        snd_card_t *card;
+        struct snd_card *card;
         struct snd_emu10k1 *emu;
 #ifdef ENABLE_SYNTH
-        snd_seq_device_t *wave = NULL;
+        struct snd_seq_device *wave = NULL;
 #endif
         int err;
@@ -145 +149 @@
                                       (long)max_buffer_size[dev] * 1024 * 1024,
                                       enable_ir[dev], subsystem[dev],
-                                      &emu)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_emu10k1_pcm(emu, 0, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_emu10k1_pcm_mic(emu, 1, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_emu10k1_pcm_efx(emu, 2, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+                                      &emu)) < 0)
+            goto error;
+        card->private_data = emu;
+        if ((err = snd_emu10k1_pcm(emu, 0, NULL)) < 0)
+                goto error;
+        if ((err = snd_emu10k1_pcm_mic(emu, 1, NULL)) < 0)
+                goto error;
+        if ((err = snd_emu10k1_pcm_efx(emu, 2, NULL)) < 0)
+                goto error;
         /* This stores the periods table. */
         if (emu->card_capabilities->ca0151_chip) { /* P16V */
-            if(snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), 1024, &emu->p16v_buffer) < 0) {
-                snd_p16v_free(emu);
-                return -ENOMEM;
-            }
+            if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
+                                           1024, &emu->p16v_buffer)) < 0)
+                goto error;
         }
-        if ((err = snd_emu10k1_mixer(emu, 0, 3)) < 0) {
-            snd_card_free(card);
-            return err;
+
+        if ((err = snd_emu10k1_mixer(emu, 0, 3)) < 0)
+                goto error;
+
+        if ((err = snd_emu10k1_timer(emu, 0)) < 0)
+                goto error;
+
+        if ((err = snd_emu10k1_pcm_multi(emu, 3, NULL)) < 0)
+                goto error;
+        if (emu->card_capabilities->ca0151_chip) { /* P16V */
+            if ((err = snd_p16v_pcm(emu, 4, NULL)) < 0)
+                goto error;
         }
-
-        if ((err = snd_emu10k1_timer(emu, 0)) < 0) {
-            snd_card_free(card);
-            return err;
+        if (emu->audigy) {
+            if ((err = snd_emu10k1_audigy_midi(emu)) < 0)
+                goto error;
+        } else {
+            if ((err = snd_emu10k1_midi(emu)) < 0)
+                goto error;
         }
-
-        if ((err = snd_emu10k1_pcm_multi(emu, 3, NULL)) < 0) {
-            snd_card_free(card);
-            return err;
-        }
-
-        if (emu->card_capabilities->ca0151_chip) { /* P16V */
-            if ((err = snd_p16v_pcm(emu, 4, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-            }
-        }
-#ifdef TARGET_OS2
-        if (emu->audigy) {
-                if ((err = snd_emu10k1_audigy_midi(emu)) < 0) {
-                        snd_card_free(card);
-                        return err;
-                }
-        } else {
-                if ((err = snd_emu10k1_midi(emu)) < 0) {
-                        snd_card_free(card);
-                        return err;
-                }
-        }
-#endif
-        if ((err = snd_emu10k1_fx8010_new(emu, 0, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        if ((err = snd_emu10k1_fx8010_new(emu, 0, NULL)) < 0)
+                goto error;
 #ifdef ENABLE_SYNTH
         if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH,
@@ -224 +204 @@
         strcpy(card->driver, emu->card_capabilities->driver);
         strcpy(card->shortname, emu->card_capabilities->name);
-        sprintf(card->longname, "%s (rev.%d) at 0x%lx, irq %i", card->shortname, emu->revision, emu->port, emu->irq);
-
-//        DebugInt3();
-
-        if ((err = snd_card_register(card)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        sprintf(card->longname,
+                "%s (rev.%d, serial:0x%x) at 0x%lx, irq %i",
+                card->shortname, emu->revision, emu->serial, emu->port, emu->irq);
+
+        if ((err = snd_card_register(card)) < 0)
+                goto error;
+
         pci_set_drvdata(pci, card);
         dev++;
-        return 0;
+        return 0;
+
+ error:
+        snd_card_free(card);
+        return err;
 }
 
@@ -243 +226 @@
 }
 
-#ifdef TARGET_OS2
+#ifdef CONFIG_PM
+static int snd_emu10k1_suspend(struct pci_dev *pci, pm_message_t state)
+{
+    struct snd_card *card = pci_get_drvdata(pci);
+    struct snd_emu10k1 *emu = card->private_data;
+    snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+
+    snd_pcm_suspend_all(emu->pcm);
+    snd_pcm_suspend_all(emu->pcm_mic);
+    snd_pcm_suspend_all(emu->pcm_efx);
+    snd_pcm_suspend_all(emu->pcm_multi);
+    snd_pcm_suspend_all(emu->pcm_p16v);
+
+    snd_ac97_suspend(emu->ac97);
+
+    snd_emu10k1_efx_suspend(emu);
+    snd_emu10k1_suspend_regs(emu);
+    if (emu->card_capabilities->ca0151_chip)
+        snd_p16v_suspend(emu);
+
+    snd_emu10k1_done(emu);
+
+    pci_disable_device(pci);
+    pci_save_state(pci);
+    pci_set_power_state(pci, PCI_D3hot);
+    return 0;
+}
+
+static int snd_emu10k1_resume(struct pci_dev *pci)
+{
+    struct snd_card *card = pci_get_drvdata(pci);
+    struct snd_emu10k1 *emu = card->private_data;
+
+    pci_set_power_state(pci, PCI_D0);
+    pci_restore_state(pci);
+    if (pci_enable_device(pci) < 0) {
+        printk(KERN_ERR "emu10k1: pci_enable_device failed, "
+               "disabling device\n");
+        snd_card_disconnect(card);
+        return -EIO;
+    }
+
+    pci_set_master(pci);
+
+    snd_emu10k1_resume_init(emu);
+    snd_emu10k1_efx_resume(emu);
+    snd_ac97_resume(emu->ac97);
+    snd_emu10k1_resume_regs(emu);
+
+    if (emu->card_capabilities->ca0151_chip)
+        snd_p16v_resume(emu);
+    snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+    return 0;
+}
+#endif
+
 static struct pci_driver driver = {
-        0, 0, 0,
-/*      name:    */ "EMU10K1/Audigy",
-/*      id_table:*/ snd_emu10k1_ids,
-/*      probe:   */ snd_card_emu10k1_probe,
-/*      remove:  */ snd_card_emu10k1_remove,
-        0, 0
+        .name = "EMU10K1_Audigy",
+        .id_table = snd_emu10k1_ids,
+        .probe = snd_card_emu10k1_probe,
+        .remove = snd_card_emu10k1_remove,
+#ifdef CONFIG_PM
+        .suspend = snd_emu10k1_suspend,
+        .resume = snd_emu10k1_resume,
+#endif
 };
-#else
-static struct pci_driver driver = {
-        name: "EMU10K1/Audigy",
-        id_table: snd_emu10k1_ids,
-        probe: snd_card_emu10k1_probe,
-        remove: __devexit_p(snd_card_emu10k1_remove),
-};
-#endif
 
 static int __init alsa_card_emu10k1_init(void)
 {
-        int err;
-
-        if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-//              printk(KERN_ERR "EMU10K1/Audigy soundcard not found or device busy\n");
-#endif
-                return err;
-        }
-        return 0;
+    return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_emu10k1_exit(void)
 {
-        pci_unregister_driver(&driver);
+    pci_unregister_driver(&driver);
 }
 
 module_init(alsa_card_emu10k1_init)
 module_exit(alsa_card_emu10k1_exit)
-
-#ifndef MODULE
-
-/* format is: snd-emu10k1=enable,index,id,
-                          seq_ports,max_synth_voices */
-
-static int __init alsa_card_emu10k1_setup(char *str)
-{
-        static unsigned __initdata nr_dev = 0;
-
-        if (nr_dev >= SNDRV_CARDS)
-                return 0;
-        (void)(get_option(&str,&enable[nr_dev]) == 2 &&
-               get_option(&str,&index[nr_dev]) == 2 &&
-               get_id(&str,&id[nr_dev]) == 2 &&
-               get_option(&str,&seq_ports[nr_dev]) == 2 &&
-               get_option(&str,&max_synth_voices[nr_dev]) == 2);
-        nr_dev++;
-        return 1;
-}
-
-__setup("snd-emu10k1=", alsa_card_emu10k1_setup);
-
-#endif /* ifndef MODULE */

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

@@ -19 +19 @@
  */
 
-#define __NO_VERSION__
 #include "emu10k1_synth_local.h"
 #include <sound/asoundef.h>
@@ -29 +28 @@
 
 /* Keeps track of what we are finding */
-typedef struct best_voice {
+struct best_voice {
         unsigned int time;
         int voice;
-} best_voice_t;
+};
 
 /*
  * prototypes
  */
-static void lookup_voices(struct snd_emux *emu, struct snd_emu10k1 *hw, best_voice_t *best, int active_only);
+static void lookup_voices(struct snd_emux *emu, struct snd_emu10k1 *hw, struct best_voice *best, int active_only);
 static struct snd_emux_voice *get_voice(struct snd_emux *emu, struct snd_emux_port *port);
 static int start_voice(struct snd_emux_voice *vp);
@@ -89 +88 @@
 {
         struct snd_emux *emu;
-        struct snd_emux_voice *vp;
-        best_voice_t best[V_END];
+        struct snd_emux_voice *vp;
+        struct best_voice best[V_END];
         unsigned long flags;
         int i;
@@ -211 +210 @@
 /* spinlock held! */
 static void
-lookup_voices(struct snd_emux *emu, struct snd_emu10k1 *hw, best_voice_t *best, int active_only)
-{
-        struct snd_emux_voice *vp;
-        best_voice_t *bp;
+lookup_voices(struct snd_emux *emu, struct snd_emu10k1 *hw,
+              struct best_voice *best, int active_only)
+{
+    struct snd_emux_voice *vp;
+    struct best_voice *bp;
         int  i;
 
@@ -279 +279 @@
 {
         struct snd_emu10k1 *hw;
-        struct snd_emux_voice *vp;
-        best_voice_t best[V_END];
+        struct snd_emux_voice *vp;
+        struct best_voice best[V_END];
         int i;
 
@@ -313 +313 @@
         unsigned int temp;
         int ch;
-        unsigned int addr, mapped_offset;
-        snd_midi_channel_t *chan;
+        unsigned int addr, mapped_offset;
+        struct snd_midi_channel *chan;
         struct snd_emu10k1 *hw;
         struct snd_emu10k1_memblk *emem;

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

@@ -3 +3 @@
  *                   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:
@@ -26 +32 @@
  */
 
-#define __NO_VERSION__
 #include <sound/driver.h>
 #include <linux/delay.h>
@@ -34 +39 @@
 #include <sound/core.h>
 #include <sound/emu10k1.h>
+#include <sound/firmware.h>
 #include "p16v.h"
-
-#if 0
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, Creative Labs, Inc.");
-MODULE_DESCRIPTION("Routines for control of EMU10K1 chips");
-MODULE_LICENSE("GPL");
-#endif
+#include "tina2.h"
 
 /*************************************************************************
@@ -91 +92 @@
 }
 
-static int __devinit snd_emu10k1_init(struct snd_emu10k1 * emu, int enable_ir)
+static unsigned int spi_dac_init[] = {
+    0x00ff,
+    0x02ff,
+    0x0400,
+    0x0520,
+    0x0600,
+    0x08ff,
+    0x0aff,
+    0x0cff,
+    0x0eff,
+    0x10ff,
+    0x1200,
+    0x1400,
+    0x1480,
+    0x1800,
+    0x1aff,
+    0x1cff,
+    0x1e00,
+    0x0530,
+    0x0602,
+    0x0622,
+    0x1400,
+};
+
+static int snd_emu10k1_init(struct snd_emu10k1 *emu, int enable_ir, int resume)
 {
-    int ch, idx, err;
     unsigned int silent_page;
-
-    emu->fx8010.itram_size = (16 * 1024)/2;
-    emu->fx8010.etram_pages.area = NULL;
-    emu->fx8010.etram_pages.bytes = 0;
+    int ch;
+
     /* disable audio and lock cache */
-    outl(HCFG_LOCKSOUNDCACHE | HCFG_LOCKTANKCACHE_MASK | HCFG_MUTEBUTTONENABLE, emu->port + HCFG);
+    outl(HCFG_LOCKSOUNDCACHE | HCFG_LOCKTANKCACHE_MASK | HCFG_MUTEBUTTONENABLE,
+         emu->port + HCFG);
 
     /* reset recording buffers */
@@ -121 +144 @@
         snd_emu10k1_ptr_write(emu, SPBYPASS, 0, SPBYPASS_FORMAT);
         /* enable rear left + rear right AC97 slots */
-        snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_REAR_RIGHT | AC97SLOT_REAR_LEFT);
+        snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_REAR_RIGHT |
+                              AC97SLOT_REAR_LEFT);
     }
 
     /* init envelope engine */
-    for (ch = 0; ch < NUM_G; ch++) {
-        emu->voices[ch].emu = emu;
-        emu->voices[ch].number = ch;
+    for (ch = 0; ch < NUM_G; ch++)
         snd_emu10k1_voice_init(emu, ch);
-    }
-
-    /*
-     *  Init to 0x02109204 :
-     *  Clock accuracy    = 0     (1000ppm)
-     *  Sample Rate       = 2     (48kHz)
-     *  Audio Channel     = 1     (Left of 2)
-     *  Source Number     = 0     (Unspecified)
-     *  Generation Status = 1     (Original for Cat Code 12)
-     *  Cat Code          = 12    (Digital Signal Mixer)
-     *  Mode              = 0     (Mode 0)
-     *  Emphasis          = 0     (None)
-     *  CP                = 1     (Copyright unasserted)
-     *  AN                = 0     (Audio data)
-     *  P                 = 0     (Consumer)
-     */
-    snd_emu10k1_ptr_write(emu, SPCS0, 0,
-                          emu->spdif_bits[0] =
-                          SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
-                          SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
-                          SPCS_GENERATIONSTATUS | 0x00001200 |
-                          0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT);
-    snd_emu10k1_ptr_write(emu, SPCS1, 0,
-                          emu->spdif_bits[1] =
-                          SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
-                          SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
-                          SPCS_GENERATIONSTATUS | 0x00001200 |
-                          0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT);
-    snd_emu10k1_ptr_write(emu, SPCS2, 0,
-                          emu->spdif_bits[2] =
-                          SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
-                          SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
-                          SPCS_GENERATIONSTATUS | 0x00001200 |
-                          0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT);
-
-    if (emu->audigy && emu->revision == 4) { /* audigy2 */
+
+    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 */
         /* Hacks for Alice3 to work independent of haP16V driver */
         u32 tmp;
@@ -176 +168 @@
         /* Setup SRCSel (Enable Spdif,I2S SRCMulti) */
         snd_emu10k1_ptr20_write(emu, SRCSel, 0, 0x14);
-
         /* Setup SRCMulti Input Audio Enable */
         /* Use 0xFFFFFFFF to enable P16V sounds. */
@@ -186 +177 @@
         snd_emu10k1_ptr20_write(emu, CAPTURE_P16V_SOURCE, 0, 0x78e4);
     }
-
     if (emu->card_capabilities->ca0108_chip) { /* audigy2 Value */
         /* Hacks for Alice3 to work independent of haP16V driver */
         u32 tmp;
 
-        snd_printk(KERN_ERR "Audigy2 value:Special config.\n");
+        snd_printk(KERN_INFO "Audigy2 value: Special config.\n");
         //Setup SRCMulti_I2S SamplingRate
         tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);
@@ -215 +205 @@
         outl(tmp, emu->port + A_IOCFG);
     }
-
-    /*
-     *  Clear page with silence & setup all pointers to this page
-     */
-    memset(emu->silent_page.area, 0, PAGE_SIZE);
-    silent_page = emu->silent_page.addr << 1;
-    for (idx = 0; idx < MAXPAGES; idx++)
-        ((u32 *)emu->ptb_pages.area)[idx] = cpu_to_le32(silent_page | idx);
+    if (emu->card_capabilities->spi_dac) { /* Audigy 2 ZS Notebook with DAC Wolfson WM8768/WM8568 */
+        int size, n;
+        size = ARRAY_SIZE(spi_dac_init);
+        for (n=0; n < size; n++)
+            snd_emu10k1_spi_write(emu, spi_dac_init[n]);
+
+        snd_emu10k1_ptr20_write(emu, 0x60, 0, 0x10);
+        /* Enable GPIOs
+         * GPIO0: Unknown
+         * GPIO1: Speakers-enabled.
+         * GPIO2: Unknown
+         * GPIO3: Unknown
+         * GPIO4: IEC958 Output on.
+         * GPIO5: Unknown
+         * GPIO6: Unknown
+         * GPIO7: Unknown
+         */
+        outl(0x76, emu->port + A_IOCFG); /* Windows uses 0x3f76 */
+
+    }
+
     snd_emu10k1_ptr_write(emu, PTB, 0, emu->ptb_pages.addr);
     snd_emu10k1_ptr_write(emu, TCB, 0, 0);      /* taken from original driver */
@@ -233 +236 @@
     }
 
-    /*
-     *  Hokay, setup HCFG
-     *   Mute Disable Audio = 0
-     *   Lock Tank Memory = 1
-     *   Lock Sound Memory = 0
-     *   Auto Mute = 1
-     */
-    if (emu->audigy) {
+    if (emu->card_capabilities->emu1010) {
+        outl(HCFG_AUTOMUTE_ASYNC |
+             HCFG_EMU32_SLAVE |
+             HCFG_AUDIOENABLE, emu->port + HCFG);
+
+        /*
+         *  Hokay, setup HCFG
+         *   Mute Disable Audio = 0
+         *   Lock Tank Memory = 1
+         *   Lock Sound Memory = 0
+         *   Auto Mute = 1
+         */
+    } else if (emu->audigy) {
         if (emu->revision == 4) /* audigy2 */
             outl(HCFG_AUDIOENABLE |
@@ -259 +267 @@
 
     if (enable_ir) {    /* enable IR for SB Live */
-        if (emu->audigy) {
+        if (emu->card_capabilities->emu1010) {
+            ;  /* Disable all access to A_IOCFG for the emu1010 */
+        } else if (emu->audigy) {
             unsigned int reg = inl(emu->port + A_IOCFG);
             outl(reg | A_IOCFG_GPOUT2, emu->port + A_IOCFG);
@@ -276 +286 @@
     }
 
-    if (emu->audigy) {  /* enable analog output */
+    if (emu->card_capabilities->emu1010) {
+        ;  /* Disable all access to A_IOCFG for the emu1010 */
+    } else if (emu->audigy) {   /* enable analog output */
         unsigned int reg = inl(emu->port + A_IOCFG);
         outl(reg | A_IOCFG_GPOUT0, emu->port + A_IOCFG);
     }
 
-    /*
-     *  Initialize the effect engine
-     */
-    if ((err = snd_emu10k1_init_efx(emu)) < 0)
-        return err;
-
+    return 0;
+}
+
+static void snd_emu10k1_audio_enable(struct snd_emu10k1 *emu)
+{
     /*
      *  Enable the audio bit
@@ -293 +304 @@
 
     /* Enable analog/digital outs on audigy */
-    if (emu->audigy) {
+    if (emu->card_capabilities->emu1010) {
+        ;  /* Disable all access to A_IOCFG for the emu1010 */
+    } else if (emu->audigy) {
         outl(inl(emu->port + A_IOCFG) & ~0x44, emu->port + A_IOCFG);
+
         if (emu->card_capabilities->ca0151_chip) { /* audigy2 */
             /* Unmute Analog now.  Set GPO6 to 1 for Apollo.
@@ -328 +342 @@
 
     snd_emu10k1_intr_enable(emu, INTE_PCIERRORENABLE);
-
-    emu->reserved_page = (struct snd_emu10k1_memblk *)snd_emu10k1_synth_alloc(emu, 4096);
-    if (emu->reserved_page)
-        emu->reserved_page->map_locked = 1;
-
-    return 0;
 }
 
-static int snd_emu10k1_done(struct snd_emu10k1 * emu)
+int snd_emu10k1_done(struct snd_emu10k1 * emu)
 {
     int ch;
@@ -375 +383 @@
     snd_emu10k1_ptr_write(emu, SOLEH, 0, 0);
 
-    /* remove reserved page */
-    if (emu->reserved_page != NULL) {
-        snd_emu10k1_synth_free(emu, (snd_util_memblk_t *)emu->reserved_page);
-        emu->reserved_page = NULL;
-    }
-
     /* disable audio and lock cache */
     outl(HCFG_LOCKSOUNDCACHE | HCFG_LOCKTANKCACHE_MASK | HCFG_MUTEBUTTONENABLE, emu->port + HCFG);
     snd_emu10k1_ptr_write(emu, PTB, 0, 0);
-
-    snd_emu10k1_free_efx(emu);
 
     return 0;
@@ -533 +533 @@
 }
 
-static int __devinit snd_emu10k1_ecard_init(struct snd_emu10k1 * emu)
+static int snd_emu10k1_ecard_init(struct snd_emu10k1 * emu)
 {
     unsigned int hc_value;
@@ -573 +573 @@
 }
 
-static int __devinit snd_emu10k1_cardbus_init(struct snd_emu10k1 * emu)
+static int snd_emu10k1_cardbus_init(struct snd_emu10k1 * emu)
 {
     unsigned long special_port;
@@ -594 +594 @@
     value = inl(special_port);
 
+    snd_emu10k1_ptr20_write(emu, TINA2_VOLUME, 0, 0xfefefefe); /* Defaults to 0x30303030 */
     return 0;
 }
+
+static int snd_emu1010_load_firmware(struct snd_emu10k1 * emu, const char * filename)
+{
+    int err;
+    int n, i;
+    int reg;
+    int value;
+    const struct firmware *fw_entry;
+
+    if ((err = request_firmware(&fw_entry, filename, &emu->pci->dev)) != 0) {
+        snd_printk(KERN_ERR "firmware: %s not found. Err=%d\n",filename, err);
+        return err;
+    }
+
+    snd_printk(KERN_INFO "firmware size=0x%zx\n", fw_entry->size);
+    if (fw_entry->size != 0x133a4) {
+        snd_printk(KERN_ERR "firmware: %s wrong size.\n",filename);
+        return -EINVAL;
+    }
+
+    /* The FPGA is a Xilinx Spartan IIE XC2S50E */
+    /* GPIO7 -> FPGA PGMN
+     * GPIO6 -> FPGA CCLK
+     * GPIO5 -> FPGA DIN
+     * FPGA CONFIG OFF -> FPGA PGMN
+     */
+    outl(0x00, emu->port + A_IOCFG); /* Set PGMN low for 1uS. */
+    udelay(1);
+    outl(0x80, emu->port + A_IOCFG); /* Leave bit 7 set during netlist setup. */
+    udelay(100); /* Allow FPGA memory to clean */
+    for(n = 0; n < fw_entry->size; n++) {
+        value=fw_entry->data[n];
+        for(i = 0; i < 8; i++) {
+            reg = 0x80;
+            if (value & 0x1)
+                reg = reg | 0x20;
+            value = value >> 1;
+            outl(reg, emu->port + A_IOCFG);
+            outl(reg | 0x40, emu->port + A_IOCFG);
+        }
+    }
+    /* After programming, set GPIO bit 4 high again. */
+    outl(0x10, emu->port + A_IOCFG);
+
+
+    release_firmware(fw_entry);
+    return 0;
+}
+
+static int snd_emu10k1_emu1010_init(struct snd_emu10k1 * emu)
+{
+    unsigned int i;
+    int tmp,tmp2;
+    int reg;
+    int err;
+    const char *hana_filename = "emu/hana.fw";
+    const char *dock_filename = "emu/audio_dock.fw";
+
+    snd_printk(KERN_INFO "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);
+
+    /* Disable 48Volt power to Audio Dock */
+    snd_emu1010_fpga_write(emu,  EMU_HANA_DOCK_PWR,  0 );
+
+    /* ID, should read & 0x7f = 0x55. (Bit 7 is the IRQ bit) */
+    snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg );
+    snd_printdd("reg1=0x%x\n",reg);
+    if (reg == 0x55) {
+        /* FPGA netlist already present so clear it */
+        /* Return to programming mode */
+
+        snd_emu1010_fpga_write(emu,  EMU_HANA_FPGA_CONFIG, 0x02 );
+    }
+    snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg );
+    snd_printdd("reg2=0x%x\n",reg);
+    if (reg == 0x55) {
+        /* FPGA failed to return to programming mode */
+        return -ENODEV;
+    }
+    snd_printk(KERN_INFO "emu1010: EMU_HANA_ID=0x%x\n",reg);
+    if ((err = snd_emu1010_load_firmware(emu, hana_filename)) != 0) {
+        snd_printk(KERN_INFO "emu1010: Loading Hana Firmware file %s failed\n", hana_filename);
+        return err;
+    }
+
+    /* ID, should read & 0x7f = 0x55 when FPGA programmed. */
+    snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg );
+    if (reg != 0x55) {
+        /* FPGA failed to be programmed */
+        snd_printk(KERN_INFO "emu1010: Loading Hana Firmware file failed, reg=0x%x\n", reg);
+        return -ENODEV;
+    }
+
+    snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n");
+    snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp );
+    snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2 );
+    snd_printk("Hana ver:%d.%d\n",tmp ,tmp2);
+    /* Enable 48Volt power to Audio Dock */
+    snd_emu1010_fpga_write(emu,  EMU_HANA_DOCK_PWR,  EMU_HANA_DOCK_PWR_ON );
+
+    snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg );
+    snd_printk(KERN_INFO "emu1010: Card options=0x%x\n",reg);
+    snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg );
+    snd_printk(KERN_INFO "emu1010: Card options=0x%x\n",reg);
+    snd_emu1010_fpga_read(emu, EMU_HANA_OPTICAL_TYPE, &tmp );
+    /* ADAT input. */
+    snd_emu1010_fpga_write(emu, EMU_HANA_OPTICAL_TYPE, 0x01 );
+    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 );
+    /* 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 );
+    /* 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 );
+    /* SPDIF Format. Set Consumer mode, 24bit, copy enable */
+    snd_emu1010_fpga_write(emu, EMU_HANA_SPDIF_MODE, 0x10 );
+    /* MIDI routing */
+    snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_IN, 0x19 );
+    /* Unknown. */
+    snd_emu1010_fpga_write(emu, EMU_HANA_MIDI_OUT, 0x0c );
+    /* snd_emu1010_fpga_write(emu, 0x09, 0x0f ); // IRQ Enable: All on */
+    /* IRQ Enable: All off */
+    snd_emu1010_fpga_write(emu, EMU_HANA_IRQ_ENABLE, 0x00 );
+
+    snd_emu1010_fpga_read(emu, EMU_HANA_OPTION_CARDS, &reg );
+    snd_printk(KERN_INFO "emu1010: Card options3=0x%x\n",reg);
+    /* Default WCLK set to 48kHz. */
+    snd_emu1010_fpga_write(emu, EMU_HANA_DEFCLOCK, 0x00 );
+    /* 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 );
+    /* 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);
+#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) */
+
+    /* Delay to allow Audio Dock to settle */
+    msleep(100);
+    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 */
+    /* FIXME: The loading of this should be able to happen any time,
+     * as the user can plug/unplug it at any time
+     */
+    if (reg & (EMU_HANA_OPTION_DOCK_ONLINE | EMU_HANA_OPTION_DOCK_OFFLINE) ) {
+        /* Audio Dock attached */
+        /* Return to Audio Dock programming mode */
+        snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware\n");
+        snd_emu1010_fpga_write(emu,  EMU_HANA_FPGA_CONFIG, EMU_HANA_FPGA_CONFIG_AUDIODOCK );
+        if ((err = snd_emu1010_load_firmware(emu, dock_filename)) != 0) {
+            return err;
+        }
+        snd_emu1010_fpga_write(emu,  EMU_HANA_FPGA_CONFIG, 0 );
+        snd_emu1010_fpga_read(emu, EMU_HANA_IRQ_STATUS, &reg );
+        snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_IRQ_STATUS=0x%x\n",reg);
+        /* ID, should read & 0x7f = 0x55 when FPGA programmed. */
+        snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg );
+        snd_printk(KERN_INFO "emu1010: EMU_HANA+DOCK_ID=0x%x\n",reg);
+        if (reg != 0x55) {
+            /* FPGA failed to be programmed */
+            snd_printk(KERN_INFO "emu1010: Loading Audio Dock Firmware file failed, reg=0x%x\n", reg);
+            return 0;
+            return -ENODEV;
+        }
+        snd_printk(KERN_INFO "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 );
+        snd_printk("Audio Dock ver:%d.%d\n",tmp ,tmp2);
+    }
+#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 */
+    snd_emu1010_fpga_link_dst_src_write(emu,
+                                        EMU_DST_DOCK_DAC1_LEFT1, EMU_SRC_ALICE_EMU32A + 0); /* ALICE2 bus 0xa0 */
+    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;
+    snd_emu1010_fpga_link_dst_src_write(emu,
+                                        EMU_DST_DOCK_PHONES_LEFT1, EMU_SRC_ALICE_EMU32A + 0); /* ALICE2 bus 0xa0 */
+    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;
+    snd_emu1010_fpga_link_dst_src_write(emu,
+                                        EMU_DST_DOCK_SPDIF_LEFT1, EMU_SRC_ALICE_EMU32A + 0); /* ALICE2 bus 0xa0 */
+    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;
+    snd_emu1010_fpga_link_dst_src_write(emu,
+                                        EMU_DST_HANA_SPDIF_LEFT1, EMU_SRC_ALICE_EMU32A + 0); /* ALICE2 bus 0xa0 */
+    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;
+    snd_emu1010_fpga_link_dst_src_write(emu,
+                                        EMU_DST_HAMOA_DAC_LEFT1, EMU_SRC_ALICE_EMU32A + 0); /* ALICE2 bus 0xa0 */
+    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;
+    snd_emu1010_fpga_link_dst_src_write(emu,
+                                        EMU_DST_HANA_ADAT, EMU_SRC_ALICE_EMU32A + 0); /* ALICE2 bus 0xa0 */
+    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 */
+
+    return 0;
+}
+
 
 /*
  *  Create the EMU10K1 instance
  */
+
+#ifdef CONFIG_PM
+static int alloc_pm_buffer(struct snd_emu10k1 *emu);
+static void free_pm_buffer(struct snd_emu10k1 *emu);
+#endif
 
 static int snd_emu10k1_free(struct snd_emu10k1 *emu)
@@ -606 +1036 @@
         snd_emu10k1_fx8010_tram_setup(emu, 0);
         snd_emu10k1_done(emu);
-    }
+        /* remove reserved page */
+        if (emu->reserved_page) {
+            snd_emu10k1_synth_free(emu, (struct snd_util_memblk *)emu->reserved_page);
+            emu->reserved_page = NULL;
+        }
+        snd_emu10k1_free_efx(emu);
+    }
+    if (emu->card_capabilities->emu1010) {
+        /* Disable 48Volt power to Audio Dock */
+        snd_emu1010_fpga_write(emu,  EMU_HANA_DOCK_PWR,  0 );
+    }
+
     if (emu->memhdr)
         snd_util_memhdr_free(emu->memhdr);
@@ -613 +1054 @@
     if (emu->ptb_pages.area)
         snd_dma_free_pages(&emu->ptb_pages);
-    if (emu->page_ptr_table)
-        vfree(emu->page_ptr_table);
-    if (emu->page_addr_table)
-        vfree(emu->page_addr_table);
+    vfree(emu->page_ptr_table);
+    vfree(emu->page_addr_table);
+#ifdef CONFIG_PM
+    free_pm_buffer(emu);
+#endif
     if (emu->irq >= 0)
         free_irq(emu->irq, (void *)emu);
     if (emu->port)
         pci_release_regions(emu->pci);
-    if (emu->audigy && emu->revision == 4) /* P16V */
+    if (emu->card_capabilities->ca0151_chip) /* P16V */
         snd_p16v_free(emu);
+    pci_disable_device(emu->pci);
     kfree(emu);
     return 0;
 }
 
-static int snd_emu10k1_dev_free(snd_device_t *device)
+static int snd_emu10k1_dev_free(struct snd_device *device)
 {
     struct snd_emu10k1 *emu = device->device_data;
@@ -633 +1076 @@
 }
 
-/* vendor, device, subsystem, emu10k1_chip, emu10k2_chip, ca0102_chip, ca0108_chip, ca0151_chip, spk71, spdif_bug, ac97_chip, ecard, driver, name */
 static struct snd_emu_chip_details emu_chip_details[] = {
-        /* Audigy 2 Value AC3 out does not work yet. Need to find out how to turn off interpolators.*/
-        /* Tested by James@superbug.co.uk 3rd July 2005 */
-        {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10011102,
-         .driver = "Audigy2", .name = "Audigy 2 Value [SB0400]",
-         .id = "Audigy2",
-         .emu10k2_chip = 1,
-         .ca0108_chip = 1,
-         .spk71 = 1,
-         .ac97_chip = 1} ,
-         /* Audigy 2 ZS Notebook Cardbus card.*/
-         /* Tested by James@superbug.co.uk 30th October 2005 */
-         /* Not working yet, but progressing. */
-         {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x20011102,
-         .driver = "Audigy2", .name = "Audigy 2 ZS Notebook [SB0530]",
-         .id = "Audigy2",
-         .emu10k2_chip = 1,
-         .ca0108_chip = 1,
-         .ca_cardbus_chip = 1,
-         .spk71 = 1} ,
-        {.vendor = 0x1102, .device = 0x0008,
-         .driver = "Audigy2", .name = "Audigy 2 Value [Unknown]",
-         .id = "Audigy2",
-         .emu10k2_chip = 1,
-         .ca0108_chip = 1,
-         .ac97_chip = 1} ,
-        /* Tested by James@superbug.co.uk 8th July 2005. No sound available yet. */
-        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102,
-         .driver = "Audigy2", .name = "E-mu 1212m [4001]",
-         .id = "EMU1212m",
-         .emu10k2_chip = 1,
-         .ca0102_chip = 1,
-         .ecard = 1} ,
-        /* Tested by James@superbug.co.uk 3rd July 2005 */
-        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20071102,
-         .driver = "Audigy2", .name = "Audigy 4 PRO [SB0380]",
-         .id = "Audigy2",
-         .emu10k2_chip = 1,
-         .ca0102_chip = 1,
-         .ca0151_chip = 1,
-         .spk71 = 1,
-         .spdif_bug = 1,
-         .ac97_chip = 1} ,
-        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20021102,
-         .driver = "Audigy2", .name = "Audigy 2 ZS [SB0350]",
-         .id = "Audigy2",
-         .emu10k2_chip = 1,
-         .ca0102_chip = 1,
-         .ca0151_chip = 1,
-         .spk71 = 1,
-         .spdif_bug = 1,
-         .ac97_chip = 1} ,
-        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20011102,
-         .driver = "Audigy2", .name = "Audigy 2 ZS [2001]",
-         .id = "Audigy2",
-         .emu10k2_chip = 1,
-         .ca0102_chip = 1,
-         .ca0151_chip = 1,
-         .spk71 = 1,
-         .spdif_bug = 1,
-         .ac97_chip = 1} ,
-        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10071102,
-         .driver = "Audigy2", .name = "Audigy 2 [SB0240]",
-         .id = "Audigy2",
-         .emu10k2_chip = 1,
-         .ca0102_chip = 1,
-         .ca0151_chip = 1,
-         .spk71 = 1,
-         .spdif_bug = 1,
-         .ac97_chip = 1} ,
-        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10051102,
-         .driver = "Audigy2", .name = "Audigy 2 EX [1005]",
-         .id = "Audigy2",
-         .emu10k2_chip = 1,
-         .ca0102_chip = 1,
-         .ca0151_chip = 1,
-         .spdif_bug = 1} ,
-        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10021102,
-         .driver = "Audigy2", .name = "Audigy 2 Platinum [SB0240P]",
-         .id = "Audigy2",
-         .emu10k2_chip = 1,
-         .ca0102_chip = 1,
-         .ca0151_chip = 1,
-         .spk71 = 1,
-         .spdif_bug = 1,
-         .ac97_chip = 1} ,
-        {.vendor = 0x1102, .device = 0x0004, .revision = 0x04,
-         .driver = "Audigy2", .name = "Audigy 2 [Unknown]",
-         .id = "Audigy2",
-         .emu10k2_chip = 1,
-         .ca0102_chip = 1,
-         .ca0151_chip = 1,
-         .spdif_bug = 1,
-         .ac97_chip = 1} ,
-        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00531102,
-         .driver = "Audigy", .name = "Audigy 1 [SB0090]",
-         .id = "Audigy",
-         .emu10k2_chip = 1,
-         .ca0102_chip = 1,
-         .ac97_chip = 1} ,
-        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00521102,
-         .driver = "Audigy", .name = "Audigy 1 ES [SB0160]",
-         .id = "Audigy",
-         .emu10k2_chip = 1,
-         .ca0102_chip = 1,
-         .spdif_bug = 1,
-         .ac97_chip = 1} ,
-        {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00511102,
-         .driver = "Audigy", .name = "Audigy 1 [SB0090]",
-         .id = "Audigy",
-         .emu10k2_chip = 1,
-         .ca0102_chip = 1,
-         .ac97_chip = 1} ,
-        {.vendor = 0x1102, .device = 0x0004,
-         .driver = "Audigy", .name = "Audigy 1 [Unknown]",
-         .id = "Audigy",
-         .emu10k2_chip = 1,
-         .ca0102_chip = 1,
-         .ac97_chip = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806B1102,
-         .driver = "EMU10K1", .name = "SBLive! [SB0105]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806A1102,
-         .driver = "EMU10K1", .name = "SBLive! Value [SB0103]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80691102,
-         .driver = "EMU10K1", .name = "SBLive! Value [SB0101]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1},
-         /* Tested by Thomas Zehetbauer 27th Aug 2005 */
-         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80651102,
-         .driver = "EMU10K1", .name = "SB Live 5.1 [SB0220]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80641102,
-         .driver = "EMU10K1", .name = "SB Live 5.1",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-         /* Tested by alsa bugtrack user "hus" 12th Sept 2005 */
-         {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102,
-         .driver = "EMU10K1", .name = "SBLive 5.1 [SB0060]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 2, /* ac97 is optional; both SBLive 5.1 and platinum
-         * share the same IDs!
-         */
-         .sblive51 = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80511102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4850]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80401102,
-         .driver = "EMU10K1", .name = "SBLive! Platinum [CT4760P]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80321102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4871]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80311102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4831]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80281102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4870]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-        /* Tested by James@superbug.co.uk 3rd July 2005 */
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80271102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4832]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80261102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4830]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80231102,
-         .driver = "EMU10K1", .name = "SB PCI512 [CT4790]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80221102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4780]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102,
-         .driver = "EMU10K1", .name = "E-mu APS [4001]",
-         .id = "APS",
-         .emu10k1_chip = 1,
-         .ecard = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00211102,
-         .driver = "EMU10K1", .name = "SBLive! [CT4620]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-        {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00201102,
-         .driver = "EMU10K1", .name = "SBLive! Value [CT4670]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-        {.vendor = 0x1102, .device = 0x0002,
-         .driver = "EMU10K1", .name = "SB Live [Unknown]",
-         .id = "Live",
-         .emu10k1_chip = 1,
-         .ac97_chip = 1,
-         .sblive51 = 1} ,
-        {0 } /* terminator */
+    /* Audigy 2 Value AC3 out does not work yet. Need to find out how to turn off interpolators.*/
+    /* Tested by James@superbug.co.uk 3rd July 2005 */
+    /* DSP: CA0108-IAT
+     * DAC: CS4382-KQ
+     * ADC: Philips 1361T
+     * AC97: STAC9750
+     * CA0151: None
+     */
+    {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10011102,
+    .driver = "Audigy2", .name = "Audigy 2 Value [SB0400]",
+    .id = "Audigy2",
+    .emu10k2_chip = 1,
+    .ca0108_chip = 1,
+    .spk71 = 1,
+    .ac97_chip = 1} ,
+    /* Audigy4 (Not PRO) SB0610 */
+    /* Tested by James@superbug.co.uk 4th April 2006 */
+    /* A_IOCFG bits
+     * Output
+     * 0: ?
+     * 1: ?
+     * 2: ?
+     * 3: 0 - Digital Out, 1 - Line in
+     * 4: ?
+     * 5: ?
+     * 6: ?
+     * 7: ?
+     * Input
+     * 8: ?
+     * 9: ?
+     * A: Green jack sense (Front)
+     * B: ?
+     * C: Black jack sense (Rear/Side Right)
+     * D: Yellow jack sense (Center/LFE/Side Left)
+     * E: ?
+     * F: ?
+     *
+     * Digital Out/Line in switch using A_IOCFG bit 3 (0x08)
+     * 0 - Digital Out
+     * 1 - Line in
+     */
+    /* Mic input not tested.
+     * Analog CD input not tested
+     * Digital Out not tested.
+     * Line in working.
+     * Audio output 5.1 working. Side outputs not working.
+     */
+    /* DSP: CA10300-IAT LF
+     * DAC: Cirrus Logic CS4382-KQZ
+     * ADC: Philips 1361T
+     * AC97: Sigmatel STAC9750
+     * CA0151: None
+     */
+    {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10211102,
+    .driver = "Audigy2", .name = "Audigy 4 [SB0610]",
+    .id = "Audigy2",
+    .emu10k2_chip = 1,
+    .ca0108_chip = 1,
+    .spk71 = 1,
+    .adc_1361t = 1,  /* 24 bit capture instead of 16bit */
+    .ac97_chip = 1} ,
+    /* Audigy 2 ZS Notebook Cardbus card.*/
+    /* Tested by James@superbug.co.uk 22th December 2005 */
+    /* Audio output 7.1/Headphones working.
+     * Digital output working. (AC3 not checked, only PCM)
+     * Audio inputs not tested.
+     */
+    /* DSP: Tina2
+     * DAC: Wolfson WM8768/WM8568
+     * ADC: Wolfson WM8775
+     * AC97: None
+     * CA0151: None
+     */
+    {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x20011102,
+    .driver = "Audigy2", .name = "Audigy 2 ZS Notebook [SB0530]",
+    .id = "Audigy2",
+    .emu10k2_chip = 1,
+    .ca0108_chip = 1,
+    .ca_cardbus_chip = 1,
+    .spi_dac = 1,
+    .spk71 = 1} ,
+    {.vendor = 0x1102, .device = 0x0008,
+    .driver = "Audigy2", .name = "Audigy 2 Value [Unknown]",
+    .id = "Audigy2",
+    .emu10k2_chip = 1,
+    .ca0108_chip = 1,
+    .ac97_chip = 1} ,
+    /* Tested by James@superbug.co.uk 8th July 2005. No sound available yet. */
+    {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102,
+    .driver = "Audigy2", .name = "E-mu 1010 [4001]",
+    .id = "EMU1010",
+    .emu10k2_chip = 1,
+    .ca0102_chip = 1,
+    .spk71 = 1,
+    .emu1010 = 1} ,
+    /* Tested by James@superbug.co.uk 3rd July 2005 */
+    {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20071102,
+    .driver = "Audigy2", .name = "Audigy 4 PRO [SB0380]",
+    .id = "Audigy2",
+    .emu10k2_chip = 1,
+    .ca0102_chip = 1,
+    .ca0151_chip = 1,
+    .spk71 = 1,
+    .spdif_bug = 1,
+    .ac97_chip = 1} ,
+    /* Tested by shane-alsa@cm.nu 5th Nov 2005 */
+    /* The 0x20061102 does have SB0350 written on it
+     * Just like 0x20021102
+     */
+    {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20061102,
+    .driver = "Audigy2", .name = "Audigy 2 [SB0350b]",
+    .id = "Audigy2",
+    .emu10k2_chip = 1,
+    .ca0102_chip = 1,
+    .ca0151_chip = 1,
+    .spk71 = 1,
+    .spdif_bug = 1,
+    .ac97_chip = 1} ,
+    {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20021102,
+    .driver = "Audigy2", .name = "Audigy 2 ZS [SB0350]",
+    .id = "Audigy2",
+    .emu10k2_chip = 1,
+    .ca0102_chip = 1,
+    .ca0151_chip = 1,
+    .spk71 = 1,
+    .spdif_bug = 1,
+    .ac97_chip = 1} ,
+    {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x20011102,
+    .driver = "Audigy2", .name = "Audigy 2 ZS [2001]",
+    .id = "Audigy2",
+    .emu10k2_chip = 1,
+    .ca0102_chip = 1,
+    .ca0151_chip = 1,
+    .spk71 = 1,
+    .spdif_bug = 1,
+    .ac97_chip = 1} ,
+    /* Audigy 2 */
+    /* Tested by James@superbug.co.uk 3rd July 2005 */
+    /* DSP: CA0102-IAT
+     * DAC: CS4382-KQ
+     * ADC: Philips 1361T
+     * AC97: STAC9721
+     * CA0151: Yes
+     */
+    {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10071102,
+    .driver = "Audigy2", .name = "Audigy 2 [SB0240]",
+    .id = "Audigy2",
+    .emu10k2_chip = 1,
+    .ca0102_chip = 1,
+    .ca0151_chip = 1,
+    .spk71 = 1,
+    .spdif_bug = 1,
+    .adc_1361t = 1,  /* 24 bit capture instead of 16bit */
+    .ac97_chip = 1} ,
+    {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10051102,
+    .driver = "Audigy2", .name = "Audigy 2 EX [1005]",
+    .id = "Audigy2",
+    .emu10k2_chip = 1,
+    .ca0102_chip = 1,
+    .ca0151_chip = 1,
+    .spk71 = 1,
+    .spdif_bug = 1} ,
+    /* Dell OEM/Creative Labs Audigy 2 ZS */
+    /* See ALSA bug#1365 */
+    {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10031102,
+    .driver = "Audigy2", .name = "Audigy 2 ZS [SB0353]",
+    .id = "Audigy2",
+    .emu10k2_chip = 1,
+    .ca0102_chip = 1,
+    .ca0151_chip = 1,
+    .spk71 = 1,
+    .spdif_bug = 1,
+    .ac97_chip = 1} ,
+    {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10021102,
+    .driver = "Audigy2", .name = "Audigy 2 Platinum [SB0240P]",
+    .id = "Audigy2",
+    .emu10k2_chip = 1,
+    .ca0102_chip = 1,
+    .ca0151_chip = 1,
+    .spk71 = 1,
+    .spdif_bug = 1,
+    .ac97_chip = 1} ,
+    {.vendor = 0x1102, .device = 0x0004, .revision = 0x04,
+    .driver = "Audigy2", .name = "Audigy 2 [Unknown]",
+    .id = "Audigy2",
+    .emu10k2_chip = 1,
+    .ca0102_chip = 1,
+    .ca0151_chip = 1,
+    .spdif_bug = 1,
+    .ac97_chip = 1} ,
+    {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00531102,
+    .driver = "Audigy", .name = "Audigy 1 [SB0090]",
+    .id = "Audigy",
+    .emu10k2_chip = 1,
+    .ca0102_chip = 1,
+    .ac97_chip = 1} ,
+    {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00521102,
+    .driver = "Audigy", .name = "Audigy 1 ES [SB0160]",
+    .id = "Audigy",
+    .emu10k2_chip = 1,
+    .ca0102_chip = 1,
+    .spdif_bug = 1,
+    .ac97_chip = 1} ,
+    {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x00511102,
+    .driver = "Audigy", .name = "Audigy 1 [SB0090]",
+    .id = "Audigy",
+    .emu10k2_chip = 1,
+    .ca0102_chip = 1,
+    .ac97_chip = 1} ,
+    {.vendor = 0x1102, .device = 0x0004,
+    .driver = "Audigy", .name = "Audigy 1 [Unknown]",
+    .id = "Audigy",
+    .emu10k2_chip = 1,
+    .ca0102_chip = 1,
+    .ac97_chip = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806B1102,
+    .driver = "EMU10K1", .name = "SBLive! [SB0105]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x806A1102,
+    .driver = "EMU10K1", .name = "SBLive! Value [SB0103]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80691102,
+    .driver = "EMU10K1", .name = "SBLive! Value [SB0101]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1},
+    /* Tested by ALSA bug#1680 26th December 2005 */
+    /* note: It really has SB0220 written on the card. */
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80661102,
+    .driver = "EMU10K1", .name = "SB Live 5.1 Dell OEM [SB0220]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    /* Tested by Thomas Zehetbauer 27th Aug 2005 */
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80651102,
+    .driver = "EMU10K1", .name = "SB Live 5.1 [SB0220]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x100a1102,
+    .driver = "EMU10K1", .name = "SB Live 5.1 [SB0220]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80641102,
+    .driver = "EMU10K1", .name = "SB Live 5.1",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    /* Tested by alsa bugtrack user "hus" bug #1297 12th Aug 2005 */
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80611102,
+    .driver = "EMU10K1", .name = "SBLive 5.1 [SB0060]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 2, /* ac97 is optional; both SBLive 5.1 and platinum
+    * share the same IDs!
+    */
+    .sblive51 = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80511102,
+    .driver = "EMU10K1", .name = "SBLive! Value [CT4850]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80401102,
+    .driver = "EMU10K1", .name = "SBLive! Platinum [CT4760P]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80321102,
+    .driver = "EMU10K1", .name = "SBLive! Value [CT4871]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80311102,
+    .driver = "EMU10K1", .name = "SBLive! Value [CT4831]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80281102,
+    .driver = "EMU10K1", .name = "SBLive! Value [CT4870]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    /* Tested by James@superbug.co.uk 3rd July 2005 */
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80271102,
+    .driver = "EMU10K1", .name = "SBLive! Value [CT4832]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80261102,
+    .driver = "EMU10K1", .name = "SBLive! Value [CT4830]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80231102,
+    .driver = "EMU10K1", .name = "SB PCI512 [CT4790]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x80221102,
+    .driver = "EMU10K1", .name = "SBLive! Value [CT4780]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x40011102,
+    .driver = "EMU10K1", .name = "E-mu APS [4001]",
+    .id = "APS",
+    .emu10k1_chip = 1,
+    .ecard = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00211102,
+    .driver = "EMU10K1", .name = "SBLive! [CT4620]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    {.vendor = 0x1102, .device = 0x0002, .subsystem = 0x00201102,
+    .driver = "EMU10K1", .name = "SBLive! Value [CT4670]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    {.vendor = 0x1102, .device = 0x0002,
+    .driver = "EMU10K1", .name = "SB Live [Unknown]",
+    .id = "Live",
+    .emu10k1_chip = 1,
+    .ac97_chip = 1,
+    .sblive51 = 1} ,
+    {0 } /* terminator */
 };
 
-int __devinit snd_emu10k1_create(snd_card_t * card,
+int __devinit snd_emu10k1_create(struct snd_card *card,
                                  struct pci_dev * pci,
                                  unsigned short extin_mask,
@@ -883 +1436 @@
 {
     struct snd_emu10k1 *emu;
-    int err;
+    int idx, err;
     int is_audigy;
     unsigned char revision;
+    unsigned int silent_page;
     const struct snd_emu_chip_details *c;
-#ifdef TARGET_OS2
-    static snd_device_ops_t ops = {
-        snd_emu10k1_dev_free,0,0,0
+    static struct snd_device_ops ops = {
+        .dev_free =     snd_emu10k1_dev_free,
     };
-#else
-    static snd_device_ops_t ops = {
-    dev_free:   snd_emu10k1_dev_free,
-    };
-#endif
+
     *remu = NULL;
 
@@ -902 +1451 @@
         return err;
 
-    emu = (struct snd_emu10k1 *)kzalloc(sizeof(*emu), GFP_KERNEL);
-    if (emu == NULL)
+    emu = kzalloc(sizeof(*emu), GFP_KERNEL);
+    if (emu == NULL) {
+        pci_disable_device(pci);
         return -ENOMEM;
-
+    }
     emu->card = card;
     spin_lock_init(&emu->reg_lock);
@@ -912 +1462 @@
     spin_lock_init(&emu->synth_lock);
     spin_lock_init(&emu->memblk_lock);
-    init_MUTEX(&emu->ptb_lock);
     init_MUTEX(&emu->fx8010.lock);
     INIT_LIST_HEAD(&emu->mapped_link_head);
@@ -925 +1474 @@
     pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &emu->serial);
     pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &emu->model);
-    emu->card_type = EMU10K1_CARD_CREATIVE;
     snd_printk("vendor=0x%x, device=0x%x, subsystem_vendor_id=0x%x, subsystem_id=0x%x\n",pci->vendor, pci->device, emu->serial, emu->model);
 
@@ -937 +1485 @@
                 if (c->subsystem && (c->subsystem != emu->serial) )
                     continue;
-            if (c->revision && c->revision != emu->revision)
-                continue;
+                if (c->revision && c->revision != emu->revision)
+                    continue;
             }
             break;
@@ -958 +1506 @@
         snd_printdd("Sound card name=%s, vendor=0x%x, device=0x%x, subsystem=0x%x.\n",
                     c->name, pci->vendor, pci->device, emu->serial);
+
+    if (!*card->id && c->id) {
+        int i, n = 0;
+        strlcpy(card->id, c->id, sizeof(card->id));
+        for (;;) {
+            for (i = 0; i < snd_ecards_limit; i++) {
+                if (snd_cards[i] && !strcmp(snd_cards[i]->id, card->id))
+                    break;
+            }
+            if (i >= snd_ecards_limit)
+                break;
+            n++;
+            if (n >= SNDRV_CARDS)
+                break;
+            sprintf(card->id, "%s_%d", c->id, n);
+        }
+    }
+
     is_audigy = emu->audigy = c->emu10k2_chip;
+
     /* set the DMA transfer mask */
     emu->dma_mask = is_audigy ? AUDIGY_DMA_MASK : EMU10K1_DMA_MASK;
@@ -969 +1536 @@
     if ((err = pci_request_regions(pci, "EMU10K1")) < 0) {
         kfree(emu);
+        pci_disable_device(pci);
         return err;
     }
@@ -982 +1550 @@
     if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
                             32 * 1024, &emu->ptb_pages) < 0) {
-        snd_emu10k1_free(emu);
-        return -ENOMEM;
+        err = -ENOMEM;
+        goto error;
     }
 
@@ -989 +1557 @@
     emu->page_addr_table = (unsigned long*)vmalloc(emu->max_cache_pages * sizeof(unsigned long));
     if (emu->page_ptr_table == NULL || emu->page_addr_table == NULL) {
-        snd_emu10k1_free(emu);
-        return -ENOMEM;
+        err = -ENOMEM;
+        goto error;
     }
 
     if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
                             EMUPAGESIZE, &emu->silent_page) < 0) {
-        snd_emu10k1_free(emu);
-        return -ENOMEM;
+        err = -ENOMEM;
+        goto error;
     }
     emu->memhdr = snd_util_memhdr_new(emu->max_cache_pages * PAGE_SIZE);
     if (emu->memhdr == NULL) {
-        snd_emu10k1_free(emu);
-        return -ENOMEM;
-    }
-    emu->memhdr->block_extra_size = sizeof(struct snd_emu10k1_memblk) - sizeof(snd_util_memblk_t);
+        err = -ENOMEM;
+        goto error;
+    }
+    emu->memhdr->block_extra_size = sizeof(struct snd_emu10k1_memblk) -
+        sizeof(struct snd_util_memblk);
 
     pci_set_master(pci);
@@ -1014 +1583 @@
     emu->fx8010.extin_mask = extin_mask;
     emu->fx8010.extout_mask = extout_mask;
+    emu->enable_ir = enable_ir;
 
     if (emu->card_capabilities->ecard) {
-        if ((err = snd_emu10k1_ecard_init(emu)) < 0) {
-            snd_emu10k1_free(emu);
-            return err;
-        }
+        if ((err = snd_emu10k1_ecard_init(emu)) < 0)
+            goto error;
     } else if (emu->card_capabilities->ca_cardbus_chip) {
-        if ((err = snd_emu10k1_cardbus_init(emu)) < 0) {
+        if ((err = snd_emu10k1_cardbus_init(emu)) < 0)
+            goto error;
+    } else if (emu->card_capabilities->emu1010) {
+        if ((err = snd_emu10k1_emu1010_init(emu)) < 0) {
             snd_emu10k1_free(emu);
             return err;
@@ -1031 +1602 @@
     }
 
-    if ((err = snd_emu10k1_init(emu, enable_ir)) < 0) {
-        snd_emu10k1_free(emu);
-        return err;
-    }
-
-    if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, emu, &ops)) < 0) {
-        snd_emu10k1_free(emu);
-        return err;
-    }
-
+    /* initialize TRAM setup */
+    emu->fx8010.itram_size = (16 * 1024)/2;
+    emu->fx8010.etram_pages.area = NULL;
+    emu->fx8010.etram_pages.bytes = 0;
+
+    /*
+     *  Init to 0x02109204 :
+     *  Clock accuracy    = 0     (1000ppm)
+     *  Sample Rate       = 2     (48kHz)
+     *  Audio Channel     = 1     (Left of 2)
+     *  Source Number     = 0     (Unspecified)
+     *  Generation Status = 1     (Original for Cat Code 12)
+     *  Cat Code          = 12    (Digital Signal Mixer)
+     *  Mode              = 0     (Mode 0)
+     *  Emphasis          = 0     (None)
+     *  CP                = 1     (Copyright unasserted)
+     *  AN                = 0     (Audio data)
+     *  P                 = 0     (Consumer)
+     */
+    emu->spdif_bits[0] = emu->spdif_bits[1] =
+        emu->spdif_bits[2] = SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
+        SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
+        SPCS_GENERATIONSTATUS | 0x00001200 |
+        0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT;
+
+    emu->reserved_page = (struct snd_emu10k1_memblk *)
+        snd_emu10k1_synth_alloc(emu, 4096);
+    if (emu->reserved_page)
+        emu->reserved_page->map_locked = 1;
+
+    /* Clear silent pages and set up pointers */
+    memset(emu->silent_page.area, 0, PAGE_SIZE);
+    silent_page = emu->silent_page.addr << 1;
+    for (idx = 0; idx < MAXPAGES; idx++)
+        ((u32 *)emu->ptb_pages.area)[idx] = cpu_to_le32(silent_page | idx);
+
+    /* set up voice indices */
+    for (idx = 0; idx < NUM_G; idx++) {
+        emu->voices[idx].emu = emu;
+        emu->voices[idx].number = idx;
+    }
+
+    if ((err = snd_emu10k1_init(emu, enable_ir, 0)) < 0)
+        goto error;
+#ifdef CONFIG_PM
+    if ((err = alloc_pm_buffer(emu)) < 0)
+        goto error;
+#endif
+
+    /*  Initialize the effect engine */
+    if ((err = snd_emu10k1_init_efx(emu)) < 0)
+        goto error;
+    snd_emu10k1_audio_enable(emu);
+
+    if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, emu, &ops)) < 0)
+        goto error;
+
+#ifdef CONFIG_PROC_FS
     snd_emu10k1_proc_init(emu);
-
+#endif
+
+    snd_card_set_dev(card, &pci->dev);
     *remu = emu;
     return 0;
+
+error:
+    snd_emu10k1_free(emu);
+    return err;
 }
 
-/* memory.c */
-EXPORT_SYMBOL(snd_emu10k1_synth_alloc);
-EXPORT_SYMBOL(snd_emu10k1_synth_free);
-EXPORT_SYMBOL(snd_emu10k1_synth_bzero);
-EXPORT_SYMBOL(snd_emu10k1_synth_copy_from_user);
-EXPORT_SYMBOL(snd_emu10k1_memblk_map);
-/* voice.c */
-EXPORT_SYMBOL(snd_emu10k1_voice_alloc);
-EXPORT_SYMBOL(snd_emu10k1_voice_free);
-/* io.c */
-EXPORT_SYMBOL(snd_emu10k1_ptr_read);
-EXPORT_SYMBOL(snd_emu10k1_ptr_write);
+#ifdef CONFIG_PM
+static unsigned char saved_regs[] = {
+    CPF, PTRX, CVCF, VTFT, Z1, Z2, PSST, DSL, CCCA, CCR, CLP,
+    FXRT, MAPA, MAPB, ENVVOL, ATKHLDV, DCYSUSV, LFOVAL1, ENVVAL,
+    ATKHLDM, DCYSUSM, LFOVAL2, IP, IFATN, PEFE, FMMOD, TREMFRQ, FM2FRQ2,
+    TEMPENV, ADCCR, FXWC, MICBA, ADCBA, FXBA,
+    MICBS, ADCBS, FXBS, CDCS, GPSCS, SPCS0, SPCS1, SPCS2,
+    SPBYPASS, AC97SLOT, CDSRCS, GPSRCS, ZVSRCS, MICIDX, ADCIDX, FXIDX,
+    0xff /* end */
+};
+static unsigned char saved_regs_audigy[] = {
+    A_ADCIDX, A_MICIDX, A_FXWC1, A_FXWC2, A_SAMPLE_RATE,
+    A_FXRT2, A_SENDAMOUNTS, A_FXRT1,
+    0xff /* end */
+};
+
+static int __devinit alloc_pm_buffer(struct snd_emu10k1 *emu)
+{
+    int size;
+
+    size = ARRAY_SIZE(saved_regs);
+    if (emu->audigy)
+        size += ARRAY_SIZE(saved_regs_audigy);
+    emu->saved_ptr = vmalloc(4 * NUM_G * size);
+    if (! emu->saved_ptr)
+        return -ENOMEM;
+    if (snd_emu10k1_efx_alloc_pm_buffer(emu) < 0)
+        return -ENOMEM;
+    if (emu->card_capabilities->ca0151_chip &&
+        snd_p16v_alloc_pm_buffer(emu) < 0)
+        return -ENOMEM;
+
+    return 0;
+}
+
+static void free_pm_buffer(struct snd_emu10k1 *emu)
+{
+    vfree(emu->saved_ptr);
+    snd_emu10k1_efx_free_pm_buffer(emu);
+    if (emu->card_capabilities->ca0151_chip)
+        snd_p16v_free_pm_buffer(emu);
+}
+
+void snd_emu10k1_suspend_regs(struct snd_emu10k1 *emu)
+{
+    int i;
+    unsigned char *reg;
+    unsigned int *val;
+
+    val = emu->saved_ptr;
+    for (reg = saved_regs; *reg != 0xff; reg++)
+        for (i = 0; i < NUM_G; i++, val++)
+            *val = snd_emu10k1_ptr_read(emu, *reg, i);
+    if (emu->audigy) {
+        for (reg = saved_regs_audigy; *reg != 0xff; reg++)
+            for (i = 0; i < NUM_G; i++, val++)
+                *val = snd_emu10k1_ptr_read(emu, *reg, i);
+    }
+    if (emu->audigy)
+        emu->saved_a_iocfg = inl(emu->port + A_IOCFG);
+    emu->saved_hcfg = inl(emu->port + HCFG);
+}
+
+void snd_emu10k1_resume_init(struct snd_emu10k1 *emu)
+{
+    if (emu->card_capabilities->ecard)
+        snd_emu10k1_ecard_init(emu);
+    else if (emu->card_capabilities->ca_cardbus_chip)
+        snd_emu10k1_cardbus_init(emu);
+    else if (emu->card_capabilities->emu1010)
+        snd_emu10k1_emu1010_init(emu);
+    else
+        snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE);
+    snd_emu10k1_init(emu, emu->enable_ir, 1);
+}
+
+void snd_emu10k1_resume_regs(struct snd_emu10k1 *emu)
+{
+    int i;
+    unsigned char *reg;
+    unsigned int *val;
+
+    snd_emu10k1_audio_enable(emu);
+
+    /* resore for spdif */
+    if (emu->audigy)
+        outl(emu->saved_a_iocfg, emu->port + A_IOCFG);
+    outl(emu->saved_hcfg, emu->port + HCFG);
+
+    val = emu->saved_ptr;
+    for (reg = saved_regs; *reg != 0xff; reg++)
+        for (i = 0; i < NUM_G; i++, val++)
+            snd_emu10k1_ptr_write(emu, *reg, i, *val);
+    if (emu->audigy) {
+        for (reg = saved_regs_audigy; *reg != 0xff; reg++)
+            for (i = 0; i < NUM_G; i++, val++)
+                snd_emu10k1_ptr_write(emu, *reg, i, *val);
+    }
+}
+#endif

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

@@ -23 +23 @@
  */
 
-#define __NO_VERSION__
 #include "emu10k1_synth_local.h"
 
@@ -38 +37 @@
 int
 snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,
-                       snd_util_memhdr_t *hdr, const void *data, long count)
+                       struct snd_util_memhdr *hdr,
+                       const void __user *data, long count)
 {
         int offset;
@@ -211 +211 @@
 int
 snd_emu10k1_sample_free(struct snd_emux *rec, struct snd_sf_sample *sp,
-                        snd_util_memhdr_t *hdr)
+                        struct snd_util_memhdr *hdr)
 {
         struct snd_emu10k1 *emu;

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

@@ -29 +29 @@
  * create a new hardware dependent device for Emu10k1
  */
-int snd_emu10k1_synth_new_device(snd_seq_device_t *dev)
+static int snd_emu10k1_synth_new_device(struct snd_seq_device *dev)
 {
         struct snd_emux *emu;
@@ -63 +63 @@
         if (snd_emux_register(emu, dev->card, arg->index, "Emu10k1") < 0) {
                 snd_emux_free(emu);
-                emu->hw = NULL;
                 return -ENOMEM;
         }
@@ -77 +76 @@
 }
 
-int snd_emu10k1_synth_delete_device(snd_seq_device_t *dev)
+static int snd_emu10k1_synth_delete_device(struct snd_seq_device *dev)
 {
         struct snd_emux *emu;
@@ -105 +104 @@
 static int __init alsa_emu10k1_synth_init(void)
 {
-        
-        static snd_seq_dev_ops_t ops = {
+    static struct snd_seq_dev_ops ops = {
                 snd_emu10k1_synth_new_device,
                 snd_emu10k1_synth_delete_device,
         };
-        return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &ops, sizeof(struct snd_emu10k1_synth_arg));
+        return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, &ops,
+                                              sizeof(struct snd_emu10k1_synth_arg));
 }
 

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

@@ -67 +67 @@
 
 #define PTR                     0x00            /* Indexed register set pointer register        */
-                                                /* NOTE: The CHANNELNUM and ADDRESS words can   */
-                                                /* be modified independently of each other.     */
+/* NOTE: The CHANNELNUM and ADDRESS words can   */
+/* be modified independently of each other.     */
 
 #define DATA                    0x04            /* Indexed register set data register           */
 
 #define IPR                     0x08            /* Global interrupt pending register            */
-                                                /* Clear pending interrupts by writing a 1 to   */
-                                                /* the relevant bits and zero to the other bits */
+/* Clear pending interrupts by writing a 1 to   */
+/* the relevant bits and zero to the other bits */
 #define IPR_MIDITRANSBUFEMPTY   0x00000001      /* MIDI UART transmit buffer empty              */
 #define IPR_MIDIRECVBUFEMPTY    0x00000002      /* MIDI UART receive buffer empty               */
@@ -93 +93 @@
 
 #define HCFG_LOCKSOUNDCACHE     0x00000008      /* 1 = Cancel bustmaster accesses to soundcache */
-                                                /* NOTE: This should generally never be used.   */
+/* NOTE: This should generally never be used.   */
 #define HCFG_AUDIOENABLE        0x00000001      /* 0 = CODECs transmit zero-valued samples      */
-                                                /* Should be set to 1 when the EMU10K1 is       */
-                                                /* completely initialized.                      */
+/* Should be set to 1 when the EMU10K1 is       */
+/* completely initialized.                      */
 #define GPIO                    0x18            /* Defaults: 00001080-Analog, 00001000-SPDIF.   */
 
@@ -108 +108 @@
 /********************************************************************************************************/
 #define PLAYBACK_LIST_ADDR      0x00            /* Base DMA address of a list of pointers to each period/size */
-                                                /* One list entry: 4 bytes for DMA address, 
-                                                 * 4 bytes for period_size << 16.
-                                                 * One list entry is 8 bytes long.
-                                                 * One list entry for each period in the buffer.
-                                                 */
+/* One list entry: 4 bytes for DMA address,
+ * 4 bytes for period_size << 16.
+ * One list entry is 8 bytes long.
+ * One list entry for each period in the buffer.
+ */
 #define PLAYBACK_LIST_SIZE      0x01            /* Size of list in bytes << 16. E.g. 8 periods -> 0x00380000  */
 #define PLAYBACK_LIST_PTR       0x02            /* Pointer to the current period being played */
@@ -187 +187 @@
  *  - channel 2 is the center/lfe chanel
  * Volume is controlled by the AC97 for the front and rear channels by
- * the PCM Playback Volume, Sigmatel Surround Playback Volume and 
+ * the PCM Playback Volume, Sigmatel Surround Playback Volume and
  * Surround Playback Volume. The Sigmatel 4-Speaker Stereo switch affects
  * the front/rear channel mixing in the REAR OUT jack. When using the
@@ -197 +197 @@
 
 struct emu10k1x_voice {
-        struct emu10k1x *emu;
-        int number;
-        int use;
-  
-        struct emu10k1x_pcm *epcm;
+    struct emu10k1x *emu;
+    int number;
+    int use;
+
+    struct emu10k1x_pcm *epcm;
 };
 
 struct emu10k1x_pcm {
-        struct emu10k1x *emu;
-        struct snd_pcm_substream *substream;
-        struct emu10k1x_voice *voice;
-        unsigned short running;
+    struct emu10k1x *emu;
+    struct snd_pcm_substream *substream;
+    struct emu10k1x_voice *voice;
+    unsigned short running;
 };
 
 struct emu10k1x_midi {
-        struct emu10k1x *emu;
-        struct snd_rawmidi *rmidi;
-        struct snd_rawmidi_substream *substream_input;
-        struct snd_rawmidi_substream *substream_output;
-        unsigned int midi_mode;
-        spinlock_t input_lock;
-        spinlock_t output_lock;
-        spinlock_t open_lock;
-        int tx_enable, rx_enable;
-        int port;
-        int ipr_tx, ipr_rx;
-        void (*interrupt)(struct emu10k1x *emu, unsigned int status);
+    struct emu10k1x *emu;
+    struct snd_rawmidi *rmidi;
+    struct snd_rawmidi_substream *substream_input;
+    struct snd_rawmidi_substream *substream_output;
+    unsigned int midi_mode;
+    spinlock_t input_lock;
+    spinlock_t output_lock;
+    spinlock_t open_lock;
+    int tx_enable, rx_enable;
+    int port;
+    int ipr_tx, ipr_rx;
+    void (*interrupt)(struct emu10k1x *emu, unsigned int status);
 };
 
 // definition of the chip-specific record
 struct emu10k1x {
-        struct snd_card *card;
-        struct pci_dev *pci;
-
-        unsigned long port;
-        struct resource *res_port;
-        int irq;
-
-        unsigned int revision;          /* chip revision */
-        unsigned int serial;            /* serial number */
-        unsigned short model;           /* subsystem id */
-
-        spinlock_t emu_lock;
-        spinlock_t voice_lock;
-
-        struct snd_ac97 *ac97;
-        struct snd_pcm *pcm;
-
-        struct emu10k1x_voice voices[3];
-        struct emu10k1x_voice capture_voice;
-        u32 spdif_bits[3]; // SPDIF out setup
-
-        struct snd_dma_buffer dma_buffer;
-
-        struct emu10k1x_midi midi;
+    struct snd_card *card;
+    struct pci_dev *pci;
+
+    unsigned long port;
+    struct resource *res_port;
+    int irq;
+
+    unsigned int revision;              /* chip revision */
+    unsigned int serial;            /* serial number */
+    unsigned short model;               /* subsystem id */
+
+    spinlock_t emu_lock;
+    spinlock_t voice_lock;
+
+    struct snd_ac97 *ac97;
+    struct snd_pcm *pcm;
+
+    struct emu10k1x_voice voices[3];
+    struct emu10k1x_voice capture_voice;
+    u32 spdif_bits[3]; // SPDIF out setup
+
+    struct snd_dma_buffer dma_buffer;
+
+    struct emu10k1x_midi midi;
 };
 
 /* hardware definition */
 static struct snd_pcm_hardware snd_emu10k1x_playback_hw = {
-        .info =                 (SNDRV_PCM_INFO_MMAP | 
-                                 SNDRV_PCM_INFO_INTERLEAVED |
-                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                 SNDRV_PCM_INFO_MMAP_VALID),
-        .formats =              SNDRV_PCM_FMTBIT_S16_LE,
-        .rates =                SNDRV_PCM_RATE_48000,
-        .rate_min =             48000,
-        .rate_max =             48000,
-        .channels_min =         2,
-        .channels_max =         2,
-        .buffer_bytes_max =     (32*1024),
-        .period_bytes_min =     64,
-        .period_bytes_max =     (16*1024),
-        .periods_min =          2,
-        .periods_max =          8,
-        .fifo_size =            0,
+    .info =                     (SNDRV_PCM_INFO_MMAP |
+                                 SNDRV_PCM_INFO_INTERLEAVED |
+                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                 SNDRV_PCM_INFO_MMAP_VALID),
+                                 .formats =             SNDRV_PCM_FMTBIT_S16_LE,
+                                 .rates =               SNDRV_PCM_RATE_48000,
+                                 .rate_min =            48000,
+                                 .rate_max =            48000,
+                                 .channels_min =                2,
+                                 .channels_max =                2,
+                                 .buffer_bytes_max =    (32*1024),
+                                 .period_bytes_min =    64,
+                                 .period_bytes_max =    (16*1024),
+                                 .periods_min =         2,
+                                 .periods_max =         8,
+                                 .fifo_size =           0,
 };
 
 static struct snd_pcm_hardware snd_emu10k1x_capture_hw = {
-        .info =                 (SNDRV_PCM_INFO_MMAP | 
-                                 SNDRV_PCM_INFO_INTERLEAVED |
-                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                 SNDRV_PCM_INFO_MMAP_VALID),
-        .formats =              SNDRV_PCM_FMTBIT_S16_LE,
-        .rates =                SNDRV_PCM_RATE_48000,
-        .rate_min =             48000,
-        .rate_max =             48000,
-        .channels_min =         2,
-        .channels_max =         2,
-        .buffer_bytes_max =     (32*1024),
-        .period_bytes_min =     64,
-        .period_bytes_max =     (16*1024),
-        .periods_min =          2,
-        .periods_max =          2,
-        .fifo_size =            0,
+    .info =                     (SNDRV_PCM_INFO_MMAP |
+                                 SNDRV_PCM_INFO_INTERLEAVED |
+                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                 SNDRV_PCM_INFO_MMAP_VALID),
+                                 .formats =             SNDRV_PCM_FMTBIT_S16_LE,
+                                 .rates =               SNDRV_PCM_RATE_48000,
+                                 .rate_min =            48000,
+                                 .rate_max =            48000,
+                                 .channels_min =                2,
+                                 .channels_max =                2,
+                                 .buffer_bytes_max =    (32*1024),
+                                 .period_bytes_min =    64,
+                                 .period_bytes_max =    (16*1024),
+                                 .periods_min =         2,
+                                 .periods_max =         2,
+                                 .fifo_size =           0,
 };
 
-static unsigned int snd_emu10k1x_ptr_read(struct emu10k1x * emu, 
-                                          unsigned int reg, 
-                                          unsigned int chn)
-{
-        unsigned long flags;
-        unsigned int regptr, val;
-  
-        regptr = (reg << 16) | chn;
-
-        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;
-}
-
-static void snd_emu10k1x_ptr_write(struct emu10k1x *emu, 
-                                   unsigned int reg, 
-                                   unsigned int chn, 
-                                   unsigned int data)
-{
-        unsigned int regptr;
-        unsigned long flags;
-
-        regptr = (reg << 16) | chn;
-
-        spin_lock_irqsave(&emu->emu_lock, flags);
-        outl(regptr, emu->port + PTR);
-        outl(data, emu->port + DATA);
-        spin_unlock_irqrestore(&emu->emu_lock, flags);
+static unsigned int snd_emu10k1x_ptr_read(struct emu10k1x * emu,
+                                          unsigned int reg,
+                                          unsigned int chn)
+{
+    unsigned long flags;
+    unsigned int regptr, val;
+
+    regptr = (reg << 16) | chn;
+
+    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;
+}
+
+static void snd_emu10k1x_ptr_write(struct emu10k1x *emu,
+                                   unsigned int reg,
+                                   unsigned int chn,
+                                   unsigned int data)
+{
+    unsigned int regptr;
+    unsigned long flags;
+
+    regptr = (reg << 16) | chn;
+
+    spin_lock_irqsave(&emu->emu_lock, flags);
+    outl(regptr, emu->port + PTR);
+    outl(data, emu->port + DATA);
+    spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
 
 static void snd_emu10k1x_intr_enable(struct emu10k1x *emu, unsigned int intrenb)
 {
-        unsigned long flags;
-        unsigned int enable;
-  
-        spin_lock_irqsave(&emu->emu_lock, flags);
-        enable = inl(emu->port + INTE) | intrenb;
-        outl(enable, emu->port + INTE);
-        spin_unlock_irqrestore(&emu->emu_lock, flags);
+    unsigned long flags;
+    unsigned int enable;
+
+    spin_lock_irqsave(&emu->emu_lock, flags);
+    enable = inl(emu->port + INTE) | intrenb;
+    outl(enable, emu->port + INTE);
+    spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
 
 static void snd_emu10k1x_intr_disable(struct emu10k1x *emu, unsigned int intrenb)
 {
-        unsigned long flags;
-        unsigned int enable;
-  
-        spin_lock_irqsave(&emu->emu_lock, flags);
-        enable = inl(emu->port + INTE) & ~intrenb;
-        outl(enable, emu->port + INTE);
-        spin_unlock_irqrestore(&emu->emu_lock, flags);
+    unsigned long flags;
+    unsigned int enable;
+
+    spin_lock_irqsave(&emu->emu_lock, flags);
+    enable = inl(emu->port + INTE) & ~intrenb;
+    outl(enable, emu->port + INTE);
+    spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
 
 static void snd_emu10k1x_gpio_write(struct emu10k1x *emu, unsigned int value)
 {
-        unsigned long flags;
-
-        spin_lock_irqsave(&emu->emu_lock, flags);
-        outl(value, emu->port + GPIO);
-        spin_unlock_irqrestore(&emu->emu_lock, flags);
+    unsigned long flags;
+
+    spin_lock_irqsave(&emu->emu_lock, flags);
+    outl(value, emu->port + GPIO);
+    spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
 
 static void snd_emu10k1x_pcm_free_substream(struct snd_pcm_runtime *runtime)
 {
-        kfree(runtime->private_data);
+    kfree(runtime->private_data);
 }
 
 static void snd_emu10k1x_pcm_interrupt(struct emu10k1x *emu, struct emu10k1x_voice *voice)
 {
-        struct emu10k1x_pcm *epcm;
-
-        if ((epcm = voice->epcm) == NULL)
-                return;
-        if (epcm->substream == NULL)
-                return;
+    struct emu10k1x_pcm *epcm;
+
+    if ((epcm = voice->epcm) == NULL)
+        return;
+    if (epcm->substream == NULL)
+        return;
 #if 0
-        snd_printk(KERN_INFO "IRQ: position = 0x%x, period = 0x%x, size = 0x%x\n",
-                   epcm->substream->ops->pointer(epcm->substream),
-                   snd_pcm_lib_period_bytes(epcm->substream),
-                   snd_pcm_lib_buffer_bytes(epcm->substream));
+    snd_printk(KERN_INFO "IRQ: position = 0x%x, period = 0x%x, size = 0x%x\n",
+               epcm->substream->ops->pointer(epcm->substream),
+               snd_pcm_lib_period_bytes(epcm->substream),
+               snd_pcm_lib_buffer_bytes(epcm->substream));
 #endif
-        snd_pcm_period_elapsed(epcm->substream);
+    snd_pcm_period_elapsed(epcm->substream);
 }
 
@@ -381 +381 @@
 static int snd_emu10k1x_playback_open(struct snd_pcm_substream *substream)
 {
-        struct emu10k1x *chip = snd_pcm_substream_chip(substream);
-        struct emu10k1x_pcm *epcm;
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        int err;
-
-        if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0) {
-                return err;
-        }
-        if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0)
-                return err;
-
-        epcm = (struct emu10k1x_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
-        if (epcm == NULL)
-                return -ENOMEM;
-        epcm->emu = chip;
-        epcm->substream = substream;
-  
-        runtime->private_data = epcm;
-        runtime->private_free = snd_emu10k1x_pcm_free_substream;
-  
-        runtime->hw = snd_emu10k1x_playback_hw;
-
-        return 0;
+    struct emu10k1x *chip = snd_pcm_substream_chip(substream);
+    struct emu10k1x_pcm *epcm;
+    struct snd_pcm_runtime *runtime = substream->runtime;
+    int err;
+
+    if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0) {
+        return err;
+    }
+    if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0)
+        return err;
+
+    epcm = (struct emu10k1x_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
+    if (epcm == NULL)
+        return -ENOMEM;
+    epcm->emu = chip;
+    epcm->substream = substream;
+
+    runtime->private_data = epcm;
+    runtime->private_free = snd_emu10k1x_pcm_free_substream;
+
+    runtime->hw = snd_emu10k1x_playback_hw;
+
+    return 0;
 }
 
@@ -409 +409 @@
 static int snd_emu10k1x_playback_close(struct snd_pcm_substream *substream)
 {
-        return 0;
+    return 0;
 }
 
 /* hw_params callback */
 static int snd_emu10k1x_pcm_hw_params(struct snd_pcm_substream *substream,
-                                      struct snd_pcm_hw_params *hw_params)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct emu10k1x_pcm *epcm = runtime->private_data;
-
-        if (! epcm->voice) {
-                epcm->voice = &epcm->emu->voices[substream->pcm->device];
-                epcm->voice->use = 1;
-                epcm->voice->epcm = epcm;
-        }
-
-        return snd_pcm_lib_malloc_pages(substream,
-                                        params_buffer_bytes(hw_params));
+                                      struct snd_pcm_hw_params *hw_params)
+{
+    struct snd_pcm_runtime *runtime = substream->runtime;
+    struct emu10k1x_pcm *epcm = runtime->private_data;
+
+    if (! epcm->voice) {
+        epcm->voice = &epcm->emu->voices[substream->pcm->device];
+        epcm->voice->use = 1;
+        epcm->voice->epcm = epcm;
+    }
+
+    return snd_pcm_lib_malloc_pages(substream,
+                                    params_buffer_bytes(hw_params));
 }
 
@@ -432 +432 @@
 static int snd_emu10k1x_pcm_hw_free(struct snd_pcm_substream *substream)
 {
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct emu10k1x_pcm *epcm;
-
-        if (runtime->private_data == NULL)
-                return 0;
-        
-        epcm = runtime->private_data;
-
-        if (epcm->voice) {
-                epcm->voice->use = 0;
-                epcm->voice->epcm = NULL;
-                epcm->voice = NULL;
-        }
-
-        return snd_pcm_lib_free_pages(substream);
+    struct snd_pcm_runtime *runtime = substream->runtime;
+    struct emu10k1x_pcm *epcm;
+
+    if (runtime->private_data == NULL)
+        return 0;
+
+    epcm = runtime->private_data;
+
+    if (epcm->voice) {
+        epcm->voice->use = 0;
+        epcm->voice->epcm = NULL;
+        epcm->voice = NULL;
+    }
+
+    return snd_pcm_lib_free_pages(substream);
 }
 
@@ -452 +452 @@
 static int snd_emu10k1x_pcm_prepare(struct snd_pcm_substream *substream)
 {
-        struct emu10k1x *emu = snd_pcm_substream_chip(substream);
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct emu10k1x_pcm *epcm = runtime->private_data;
-        int voice = epcm->voice->number;
-        u32 *table_base = (u32 *)(emu->dma_buffer.area+1024*voice);
-        u32 period_size_bytes = frames_to_bytes(runtime, runtime->period_size);
-        int i;
-        
-        for(i=0; i < runtime->periods; i++) {
-                *table_base++=runtime->dma_addr+(i*period_size_bytes);
-                *table_base++=period_size_bytes<<16;
-        }
-
-        snd_emu10k1x_ptr_write(emu, PLAYBACK_LIST_ADDR, voice, emu->dma_buffer.addr+1024*voice);
-        snd_emu10k1x_ptr_write(emu, PLAYBACK_LIST_SIZE, voice, (runtime->periods - 1) << 19);
-        snd_emu10k1x_ptr_write(emu, PLAYBACK_LIST_PTR, voice, 0);
-        snd_emu10k1x_ptr_write(emu, PLAYBACK_POINTER, voice, 0);
-        snd_emu10k1x_ptr_write(emu, PLAYBACK_UNKNOWN1, voice, 0);
-        snd_emu10k1x_ptr_write(emu, PLAYBACK_UNKNOWN2, voice, 0);
-        snd_emu10k1x_ptr_write(emu, PLAYBACK_DMA_ADDR, voice, runtime->dma_addr);
-
-        snd_emu10k1x_ptr_write(emu, PLAYBACK_PERIOD_SIZE, voice, frames_to_bytes(runtime, runtime->period_size)<<16);
-
-        return 0;
+    struct emu10k1x *emu = snd_pcm_substream_chip(substream);
+    struct snd_pcm_runtime *runtime = substream->runtime;
+    struct emu10k1x_pcm *epcm = runtime->private_data;
+    int voice = epcm->voice->number;
+    u32 *table_base = (u32 *)(emu->dma_buffer.area+1024*voice);
+    u32 period_size_bytes = frames_to_bytes(runtime, runtime->period_size);
+    int i;
+
+    for(i=0; i < runtime->periods; i++) {
+        *table_base++=runtime->dma_addr+(i*period_size_bytes);
+        *table_base++=period_size_bytes<<16;
+    }
+
+    snd_emu10k1x_ptr_write(emu, PLAYBACK_LIST_ADDR, voice, emu->dma_buffer.addr+1024*voice);
+    snd_emu10k1x_ptr_write(emu, PLAYBACK_LIST_SIZE, voice, (runtime->periods - 1) << 19);
+    snd_emu10k1x_ptr_write(emu, PLAYBACK_LIST_PTR, voice, 0);
+    snd_emu10k1x_ptr_write(emu, PLAYBACK_POINTER, voice, 0);
+    snd_emu10k1x_ptr_write(emu, PLAYBACK_UNKNOWN1, voice, 0);
+    snd_emu10k1x_ptr_write(emu, PLAYBACK_UNKNOWN2, voice, 0);
+    snd_emu10k1x_ptr_write(emu, PLAYBACK_DMA_ADDR, voice, runtime->dma_addr);
+
+    snd_emu10k1x_ptr_write(emu, PLAYBACK_PERIOD_SIZE, voice, frames_to_bytes(runtime, runtime->period_size)<<16);
+
+    return 0;
 }
 
 /* trigger callback */
 static int snd_emu10k1x_pcm_trigger(struct snd_pcm_substream *substream,
-                                    int cmd)
-{
-        struct emu10k1x *emu = snd_pcm_substream_chip(substream);
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct emu10k1x_pcm *epcm = runtime->private_data;
-        int channel = epcm->voice->number;
-        int result = 0;
-
-//      snd_printk(KERN_INFO "trigger - emu10k1x = 0x%x, cmd = %i, pointer = %d\n", (int)emu, cmd, (int)substream->ops->pointer(substream));
-
-        switch (cmd) {
-        case SNDRV_PCM_TRIGGER_START:
-                if(runtime->periods == 2)
-                        snd_emu10k1x_intr_enable(emu, (INTE_CH_0_LOOP | INTE_CH_0_HALF_LOOP) << channel);
-                else
-                        snd_emu10k1x_intr_enable(emu, INTE_CH_0_LOOP << channel);
-                epcm->running = 1;
-                snd_emu10k1x_ptr_write(emu, TRIGGER_CHANNEL, 0, snd_emu10k1x_ptr_read(emu, TRIGGER_CHANNEL, 0)|(TRIGGER_CHANNEL_0<<channel));
-                break;
-        case SNDRV_PCM_TRIGGER_STOP:
-                epcm->running = 0;
-                snd_emu10k1x_intr_disable(emu, (INTE_CH_0_LOOP | INTE_CH_0_HALF_LOOP) << channel);
-                snd_emu10k1x_ptr_write(emu, TRIGGER_CHANNEL, 0, snd_emu10k1x_ptr_read(emu, TRIGGER_CHANNEL, 0) & ~(TRIGGER_CHANNEL_0<<channel));
-                break;
-        default:
-                result = -EINVAL;
-                break;
-        }
-        return result;
+                                    int cmd)
+{
+    struct emu10k1x *emu = snd_pcm_substream_chip(substream);
+    struct snd_pcm_runtime *runtime = substream->runtime;
+    struct emu10k1x_pcm *epcm = runtime->private_data;
+    int channel = epcm->voice->number;
+    int result = 0;
+
+    //  snd_printk(KERN_INFO "trigger - emu10k1x = 0x%x, cmd = %i, pointer = %d\n", (int)emu, cmd, (int)substream->ops->pointer(substream));
+
+    switch (cmd) {
+    case SNDRV_PCM_TRIGGER_START:
+        if(runtime->periods == 2)
+            snd_emu10k1x_intr_enable(emu, (INTE_CH_0_LOOP | INTE_CH_0_HALF_LOOP) << channel);
+        else
+            snd_emu10k1x_intr_enable(emu, INTE_CH_0_LOOP << channel);
+        epcm->running = 1;
+        snd_emu10k1x_ptr_write(emu, TRIGGER_CHANNEL, 0, snd_emu10k1x_ptr_read(emu, TRIGGER_CHANNEL, 0)|(TRIGGER_CHANNEL_0<<channel));
+        break;
+    case SNDRV_PCM_TRIGGER_STOP:
+        epcm->running = 0;
+        snd_emu10k1x_intr_disable(emu, (INTE_CH_0_LOOP | INTE_CH_0_HALF_LOOP) << channel);
+        snd_emu10k1x_ptr_write(emu, TRIGGER_CHANNEL, 0, snd_emu10k1x_ptr_read(emu, TRIGGER_CHANNEL, 0) & ~(TRIGGER_CHANNEL_0<<channel));
+        break;
+    default:
+        result = -EINVAL;
+        break;
+    }
+    return result;
 }
 
@@ -515 +515 @@
 snd_emu10k1x_pcm_pointer(struct snd_pcm_substream *substream)
 {
-        struct emu10k1x *emu = snd_pcm_substream_chip(substream);
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct emu10k1x_pcm *epcm = runtime->private_data;
-        int channel = epcm->voice->number;
-        snd_pcm_uframes_t ptr = 0, ptr1 = 0, ptr2= 0,ptr3 = 0,ptr4 = 0;
-
-        if (!epcm->running)
-                return 0;
-
-        ptr3 = snd_emu10k1x_ptr_read(emu, PLAYBACK_LIST_PTR, channel);
-        ptr1 = snd_emu10k1x_ptr_read(emu, PLAYBACK_POINTER, channel);
-        ptr4 = snd_emu10k1x_ptr_read(emu, PLAYBACK_LIST_PTR, channel);
-
-        if(ptr4 == 0 && ptr1 == frames_to_bytes(runtime, runtime->buffer_size))
-                return 0;
-        
-        if (ptr3 != ptr4) 
-                ptr1 = snd_emu10k1x_ptr_read(emu, PLAYBACK_POINTER, channel);
-        ptr2 = bytes_to_frames(runtime, ptr1);
-        ptr2 += (ptr4 >> 3) * runtime->period_size;
-        ptr = ptr2;
-
-        if (ptr >= runtime->buffer_size)
-                ptr -= runtime->buffer_size;
-
-        return ptr;
+    struct emu10k1x *emu = snd_pcm_substream_chip(substream);
+    struct snd_pcm_runtime *runtime = substream->runtime;
+    struct emu10k1x_pcm *epcm = runtime->private_data;
+    int channel = epcm->voice->number;
+    snd_pcm_uframes_t ptr = 0, ptr1 = 0, ptr2= 0,ptr3 = 0,ptr4 = 0;
+
+    if (!epcm->running)
+        return 0;
+
+    ptr3 = snd_emu10k1x_ptr_read(emu, PLAYBACK_LIST_PTR, channel);
+    ptr1 = snd_emu10k1x_ptr_read(emu, PLAYBACK_POINTER, channel);
+    ptr4 = snd_emu10k1x_ptr_read(emu, PLAYBACK_LIST_PTR, channel);
+
+    if(ptr4 == 0 && ptr1 == frames_to_bytes(runtime, runtime->buffer_size))
+        return 0;
+
+    if (ptr3 != ptr4)
+        ptr1 = snd_emu10k1x_ptr_read(emu, PLAYBACK_POINTER, channel);
+    ptr2 = bytes_to_frames(runtime, ptr1);
+    ptr2 += (ptr4 >> 3) * runtime->period_size;
+    ptr = ptr2;
+
+    if (ptr >= runtime->buffer_size)
+        ptr -= runtime->buffer_size;
+
+    return ptr;
 }
 
 /* operators */
 static struct snd_pcm_ops snd_emu10k1x_playback_ops = {
-        .open =        snd_emu10k1x_playback_open,
-        .close =       snd_emu10k1x_playback_close,
-        .ioctl =       snd_pcm_lib_ioctl,
-        .hw_params =   snd_emu10k1x_pcm_hw_params,
-        .hw_free =     snd_emu10k1x_pcm_hw_free,
-        .prepare =     snd_emu10k1x_pcm_prepare,
-        .trigger =     snd_emu10k1x_pcm_trigger,
-        .pointer =     snd_emu10k1x_pcm_pointer,
+    .open =        snd_emu10k1x_playback_open,
+    .close =       snd_emu10k1x_playback_close,
+    .ioctl =       snd_pcm_lib_ioctl,
+    .hw_params =   snd_emu10k1x_pcm_hw_params,
+    .hw_free =     snd_emu10k1x_pcm_hw_free,
+    .prepare =     snd_emu10k1x_pcm_prepare,
+    .trigger =     snd_emu10k1x_pcm_trigger,
+    .pointer =     snd_emu10k1x_pcm_pointer,
 };
 
@@ -558 +558 @@
 static int snd_emu10k1x_pcm_open_capture(struct snd_pcm_substream *substream)
 {
-        struct emu10k1x *chip = snd_pcm_substream_chip(substream);
-        struct emu10k1x_pcm *epcm;
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        int err;
-
-        if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
-                return err;
-        if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0)
-                return err;
-
-        epcm = (struct emu10k1x_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
-        if (epcm == NULL)
-                return -ENOMEM;
-
-        epcm->emu = chip;
-        epcm->substream = substream;
-
-        runtime->private_data = epcm;
-        runtime->private_free = snd_emu10k1x_pcm_free_substream;
-
-        runtime->hw = snd_emu10k1x_capture_hw;
-
-        return 0;
+    struct emu10k1x *chip = snd_pcm_substream_chip(substream);
+    struct emu10k1x_pcm *epcm;
+    struct snd_pcm_runtime *runtime = substream->runtime;
+    int err;
+
+    if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
+        return err;
+    if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0)
+        return err;
+
+    epcm = (struct emu10k1x_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
+    if (epcm == NULL)
+        return -ENOMEM;
+
+    epcm->emu = chip;
+    epcm->substream = substream;
+
+    runtime->private_data = epcm;
+    runtime->private_free = snd_emu10k1x_pcm_free_substream;
+
+    runtime->hw = snd_emu10k1x_capture_hw;
+
+    return 0;
 }
 
@@ -586 +586 @@
 static int snd_emu10k1x_pcm_close_capture(struct snd_pcm_substream *substream)
 {
-        return 0;
+    return 0;
 }
 
 /* hw_params callback */
 static int snd_emu10k1x_pcm_hw_params_capture(struct snd_pcm_substream *substream,
-                                              struct snd_pcm_hw_params *hw_params)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct emu10k1x_pcm *epcm = runtime->private_data;
-
-        if (! epcm->voice) {
-                if (epcm->emu->capture_voice.use)
-                        return -EBUSY;
-                epcm->voice = &epcm->emu->capture_voice;
-                epcm->voice->epcm = epcm;
-                epcm->voice->use = 1;
-        }
-
-        return snd_pcm_lib_malloc_pages(substream,
-                                        params_buffer_bytes(hw_params));
+                                              struct snd_pcm_hw_params *hw_params)
+{
+    struct snd_pcm_runtime *runtime = substream->runtime;
+    struct emu10k1x_pcm *epcm = runtime->private_data;
+
+    if (! epcm->voice) {
+        if (epcm->emu->capture_voice.use)
+            return -EBUSY;
+        epcm->voice = &epcm->emu->capture_voice;
+        epcm->voice->epcm = epcm;
+        epcm->voice->use = 1;
+    }
+
+    return snd_pcm_lib_malloc_pages(substream,
+                                    params_buffer_bytes(hw_params));
 }
 
@@ -611 +611 @@
 static int snd_emu10k1x_pcm_hw_free_capture(struct snd_pcm_substream *substream)
 {
-        struct snd_pcm_runtime *runtime = substream->runtime;
-
-        struct emu10k1x_pcm *epcm;
-
-        if (runtime->private_data == NULL)
-                return 0;
-        epcm = runtime->private_data;
-
-        if (epcm->voice) {
-                epcm->voice->use = 0;
-                epcm->voice->epcm = NULL;
-                epcm->voice = NULL;
-        }
-
-        return snd_pcm_lib_free_pages(substream);
+    struct snd_pcm_runtime *runtime = substream->runtime;
+
+    struct emu10k1x_pcm *epcm;
+
+    if (runtime->private_data == NULL)
+        return 0;
+    epcm = runtime->private_data;
+
+    if (epcm->voice) {
+        epcm->voice->use = 0;
+        epcm->voice->epcm = NULL;
+        epcm->voice = NULL;
+    }
+
+    return snd_pcm_lib_free_pages(substream);
 }
 
@@ -631 +631 @@
 static int snd_emu10k1x_pcm_prepare_capture(struct snd_pcm_substream *substream)
 {
-        struct emu10k1x *emu = snd_pcm_substream_chip(substream);
-        struct snd_pcm_runtime *runtime = substream->runtime;
-
-        snd_emu10k1x_ptr_write(emu, CAPTURE_DMA_ADDR, 0, runtime->dma_addr);
-        snd_emu10k1x_ptr_write(emu, CAPTURE_BUFFER_SIZE, 0, frames_to_bytes(runtime, runtime->buffer_size)<<16); // buffer size in bytes
-        snd_emu10k1x_ptr_write(emu, CAPTURE_POINTER, 0, 0);
-        snd_emu10k1x_ptr_write(emu, CAPTURE_UNKNOWN, 0, 0);
-
-        return 0;
+    struct emu10k1x *emu = snd_pcm_substream_chip(substream);
+    struct snd_pcm_runtime *runtime = substream->runtime;
+
+    snd_emu10k1x_ptr_write(emu, CAPTURE_DMA_ADDR, 0, runtime->dma_addr);
+    snd_emu10k1x_ptr_write(emu, CAPTURE_BUFFER_SIZE, 0, frames_to_bytes(runtime, runtime->buffer_size)<<16); // buffer size in bytes
+    snd_emu10k1x_ptr_write(emu, CAPTURE_POINTER, 0, 0);
+    snd_emu10k1x_ptr_write(emu, CAPTURE_UNKNOWN, 0, 0);
+
+    return 0;
 }
 
 /* trigger_capture callback */
 static int snd_emu10k1x_pcm_trigger_capture(struct snd_pcm_substream *substream,
-                                            int cmd)
-{
-        struct emu10k1x *emu = snd_pcm_substream_chip(substream);
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct emu10k1x_pcm *epcm = runtime->private_data;
-        int result = 0;
-
-        switch (cmd) {
-        case SNDRV_PCM_TRIGGER_START:
-                snd_emu10k1x_intr_enable(emu, INTE_CAP_0_LOOP | 
-                                         INTE_CAP_0_HALF_LOOP);
-                snd_emu10k1x_ptr_write(emu, TRIGGER_CHANNEL, 0, snd_emu10k1x_ptr_read(emu, TRIGGER_CHANNEL, 0)|TRIGGER_CAPTURE);
-                epcm->running = 1;
-                break;
-        case SNDRV_PCM_TRIGGER_STOP:
-                epcm->running = 0;
-                snd_emu10k1x_intr_disable(emu, INTE_CAP_0_LOOP | 
-                                          INTE_CAP_0_HALF_LOOP);
-                snd_emu10k1x_ptr_write(emu, TRIGGER_CHANNEL, 0, snd_emu10k1x_ptr_read(emu, TRIGGER_CHANNEL, 0) & ~(TRIGGER_CAPTURE));
-                break;
-        default:
-                result = -EINVAL;
-                break;
-        }
-        return result;
+                                            int cmd)
+{
+    struct emu10k1x *emu = snd_pcm_substream_chip(substream);
+    struct snd_pcm_runtime *runtime = substream->runtime;
+    struct emu10k1x_pcm *epcm = runtime->private_data;
+    int result = 0;
+
+    switch (cmd) {
+    case SNDRV_PCM_TRIGGER_START:
+        snd_emu10k1x_intr_enable(emu, INTE_CAP_0_LOOP |
+                                 INTE_CAP_0_HALF_LOOP);
+        snd_emu10k1x_ptr_write(emu, TRIGGER_CHANNEL, 0, snd_emu10k1x_ptr_read(emu, TRIGGER_CHANNEL, 0)|TRIGGER_CAPTURE);
+        epcm->running = 1;
+        break;
+    case SNDRV_PCM_TRIGGER_STOP:
+        epcm->running = 0;
+        snd_emu10k1x_intr_disable(emu, INTE_CAP_0_LOOP |
+                                  INTE_CAP_0_HALF_LOOP);
+        snd_emu10k1x_ptr_write(emu, TRIGGER_CHANNEL, 0, snd_emu10k1x_ptr_read(emu, TRIGGER_CHANNEL, 0) & ~(TRIGGER_CAPTURE));
+        break;
+    default:
+        result = -EINVAL;
+        break;
+    }
+    return result;
 }
 
@@ -675 +675 @@
 snd_emu10k1x_pcm_pointer_capture(struct snd_pcm_substream *substream)
 {
-        struct emu10k1x *emu = snd_pcm_substream_chip(substream);
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct emu10k1x_pcm *epcm = runtime->private_data;
-        snd_pcm_uframes_t ptr;
-
-        if (!epcm->running)
-                return 0;
-
-        ptr = bytes_to_frames(runtime, snd_emu10k1x_ptr_read(emu, CAPTURE_POINTER, 0));
-        if (ptr >= runtime->buffer_size)
-                ptr -= runtime->buffer_size;
-
-        return ptr;
+    struct emu10k1x *emu = snd_pcm_substream_chip(substream);
+    struct snd_pcm_runtime *runtime = substream->runtime;
+    struct emu10k1x_pcm *epcm = runtime->private_data;
+    snd_pcm_uframes_t ptr;
+
+    if (!epcm->running)
+        return 0;
+
+    ptr = bytes_to_frames(runtime, snd_emu10k1x_ptr_read(emu, CAPTURE_POINTER, 0));
+    if (ptr >= runtime->buffer_size)
+        ptr -= runtime->buffer_size;
+
+    return ptr;
 }
 
 static struct snd_pcm_ops snd_emu10k1x_capture_ops = {
-        .open =        snd_emu10k1x_pcm_open_capture,
-        .close =       snd_emu10k1x_pcm_close_capture,
-        .ioctl =       snd_pcm_lib_ioctl,
-        .hw_params =   snd_emu10k1x_pcm_hw_params_capture,
-        .hw_free =     snd_emu10k1x_pcm_hw_free_capture,
-        .prepare =     snd_emu10k1x_pcm_prepare_capture,
-        .trigger =     snd_emu10k1x_pcm_trigger_capture,
-        .pointer =     snd_emu10k1x_pcm_pointer_capture,
+    .open =        snd_emu10k1x_pcm_open_capture,
+    .close =       snd_emu10k1x_pcm_close_capture,
+    .ioctl =       snd_pcm_lib_ioctl,
+    .hw_params =   snd_emu10k1x_pcm_hw_params_capture,
+    .hw_free =     snd_emu10k1x_pcm_hw_free_capture,
+    .prepare =     snd_emu10k1x_pcm_prepare_capture,
+    .trigger =     snd_emu10k1x_pcm_trigger_capture,
+    .pointer =     snd_emu10k1x_pcm_pointer_capture,
 };
 
 static unsigned short snd_emu10k1x_ac97_read(struct snd_ac97 *ac97,
-                                             unsigned short reg)
-{
-        struct emu10k1x *emu = ac97->private_data;
-        unsigned long flags;
-        unsigned short val;
-  
-        spin_lock_irqsave(&emu->emu_lock, flags);
-        outb(reg, emu->port + AC97ADDRESS);
-        val = inw(emu->port + AC97DATA);
-        spin_unlock_irqrestore(&emu->emu_lock, flags);
-        return val;
+                                             unsigned short reg)
+{
+    struct emu10k1x *emu = ac97->private_data;
+    unsigned long flags;
+    unsigned short val;
+
+    spin_lock_irqsave(&emu->emu_lock, flags);
+    outb(reg, emu->port + AC97ADDRESS);
+    val = inw(emu->port + AC97DATA);
+    spin_unlock_irqrestore(&emu->emu_lock, flags);
+    return val;
 }
 
 static void snd_emu10k1x_ac97_write(struct snd_ac97 *ac97,
-                                    unsigned short reg, unsigned short val)
-{
-        struct emu10k1x *emu = ac97->private_data;
-        unsigned long flags;
-  
-        spin_lock_irqsave(&emu->emu_lock, flags);
-        outb(reg, emu->port + AC97ADDRESS);
-        outw(val, emu->port + AC97DATA);
-        spin_unlock_irqrestore(&emu->emu_lock, flags);
+                                    unsigned short reg, unsigned short val)
+{
+    struct emu10k1x *emu = ac97->private_data;
+    unsigned long flags;
+
+    spin_lock_irqsave(&emu->emu_lock, flags);
+    outb(reg, emu->port + AC97ADDRESS);
+    outw(val, emu->port + AC97DATA);
+    spin_unlock_irqrestore(&emu->emu_lock, flags);
 }
 
 static int snd_emu10k1x_ac97(struct emu10k1x *chip)
 {
-        struct snd_ac97_bus *pbus;
-        struct snd_ac97_template ac97;
-        int err;
-        static struct snd_ac97_bus_ops ops = {
-                .write = snd_emu10k1x_ac97_write,
-                .read = snd_emu10k1x_ac97_read,
-        };
-  
-        if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus)) < 0)
-                return err;
-        pbus->no_vra = 1; /* we don't need VRA */
-
-        memset(&ac97, 0, sizeof(ac97));
-        ac97.private_data = chip;
-        ac97.scaps = AC97_SCAP_NO_SPDIF;
-        return snd_ac97_mixer(pbus, &ac97, &chip->ac97);
+    struct snd_ac97_bus *pbus;
+    struct snd_ac97_template ac97;
+    int err;
+    static struct snd_ac97_bus_ops ops = {
+        .write = snd_emu10k1x_ac97_write,
+        .read = snd_emu10k1x_ac97_read,
+    };
+
+    if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus)) < 0)
+        return err;
+    pbus->no_vra = 1; /* we don't need VRA */
+
+    memset(&ac97, 0, sizeof(ac97));
+    ac97.private_data = chip;
+    ac97.scaps = AC97_SCAP_NO_SPDIF;
+    return snd_ac97_mixer(pbus, &ac97, &chip->ac97);
 }
 
 static int snd_emu10k1x_free(struct emu10k1x *chip)
 {
-        snd_emu10k1x_ptr_write(chip, TRIGGER_CHANNEL, 0, 0);
-        // disable interrupts
-        outl(0, chip->port + INTE);
-        // disable audio
-        outl(HCFG_LOCKSOUNDCACHE, chip->port + HCFG);
-
-        // release the i/o port
-        release_and_free_resource(chip->res_port);
-
-        // release the irq
-        if (chip->irq >= 0)
-                free_irq(chip->irq, (void *)chip);
-
-        // release the DMA
-        if (chip->dma_buffer.area) {
-                snd_dma_free_pages(&chip->dma_buffer);
-        }
-
-        pci_disable_device(chip->pci);
-
-        // release the data
-        kfree(chip);
-        return 0;
+    snd_emu10k1x_ptr_write(chip, TRIGGER_CHANNEL, 0, 0);
+    // disable interrupts
+    outl(0, chip->port + INTE);
+    // disable audio
+    outl(HCFG_LOCKSOUNDCACHE, chip->port + HCFG);
+
+    // release the i/o port
+    release_and_free_resource(chip->res_port);
+
+    // release the irq
+    if (chip->irq >= 0)
+        free_irq(chip->irq, (void *)chip);
+
+    // release the DMA
+    if (chip->dma_buffer.area) {
+        snd_dma_free_pages(&chip->dma_buffer);
+    }
+
+    pci_disable_device(chip->pci);
+
+    // release the data
+    kfree(chip);
+    return 0;
 }
 
 static int snd_emu10k1x_dev_free(struct snd_device *device)
 {
-        struct emu10k1x *chip = device->device_data;
-        return snd_emu10k1x_free(chip);
-}
-
-static irqreturn_t snd_emu10k1x_interrupt(int irq, void *dev_id,
-                                          struct pt_regs *regs)
-{
-        unsigned int status;
-
-        struct emu10k1x *chip = dev_id;
-        struct emu10k1x_voice *pvoice = chip->voices;
-        int i;
-        int mask;
-
-        status = inl(chip->port + IPR);
-
-        if (! status)
-                return IRQ_NONE;
-
-        // capture interrupt
-        if (status & (IPR_CAP_0_LOOP | IPR_CAP_0_HALF_LOOP)) {
-                struct emu10k1x_voice *pvoice = &chip->capture_voice;
-                if (pvoice->use)
-                        snd_emu10k1x_pcm_interrupt(chip, pvoice);
-                else
-                        snd_emu10k1x_intr_disable(chip, 
-                                                  INTE_CAP_0_LOOP |
-                                                  INTE_CAP_0_HALF_LOOP);
-        }
-                
-        mask = IPR_CH_0_LOOP|IPR_CH_0_HALF_LOOP;
-        for (i = 0; i < 3; i++) {
-                if (status & mask) {
-                        if (pvoice->use)
-                                snd_emu10k1x_pcm_interrupt(chip, pvoice);
-                        else 
-                                snd_emu10k1x_intr_disable(chip, mask);
-                }
-                pvoice++;
-                mask <<= 1;
-        }
-                
-        if (status & (IPR_MIDITRANSBUFEMPTY|IPR_MIDIRECVBUFEMPTY)) {
-                if (chip->midi.interrupt)
-                        chip->midi.interrupt(chip, status);
-                else
-                        snd_emu10k1x_intr_disable(chip, INTE_MIDITXENABLE|INTE_MIDIRXENABLE);
-        }
-                
-        // acknowledge the interrupt if necessary
-        outl(status, chip->port + IPR);
-
-        // snd_printk(KERN_INFO "interrupt %08x\n", status);
-        return IRQ_HANDLED;
+    struct emu10k1x *chip = device->device_data;
+    return snd_emu10k1x_free(chip);
+}
+
+static irqreturn_t snd_emu10k1x_interrupt(int irq, void *dev_id)
+{
+    unsigned int status;
+
+    struct emu10k1x *chip = dev_id;
+    struct emu10k1x_voice *pvoice = chip->voices;
+    int i;
+    int mask;
+
+    status = inl(chip->port + IPR);
+
+    if (! status)
+        return IRQ_NONE;
+
+    // capture interrupt
+    if (status & (IPR_CAP_0_LOOP | IPR_CAP_0_HALF_LOOP)) {
+        struct emu10k1x_voice *pvoice = &chip->capture_voice;
+        if (pvoice->use)
+            snd_emu10k1x_pcm_interrupt(chip, pvoice);
+        else
+            snd_emu10k1x_intr_disable(chip,
+                                      INTE_CAP_0_LOOP |
+                                      INTE_CAP_0_HALF_LOOP);
+    }
+
+    mask = IPR_CH_0_LOOP|IPR_CH_0_HALF_LOOP;
+    for (i = 0; i < 3; i++) {
+        if (status & mask) {
+            if (pvoice->use)
+                snd_emu10k1x_pcm_interrupt(chip, pvoice);
+            else
+                snd_emu10k1x_intr_disable(chip, mask);
+        }
+        pvoice++;
+        mask <<= 1;
+    }
+
+    if (status & (IPR_MIDITRANSBUFEMPTY|IPR_MIDIRECVBUFEMPTY)) {
+        if (chip->midi.interrupt)
+            chip->midi.interrupt(chip, status);
+        else
+            snd_emu10k1x_intr_disable(chip, INTE_MIDITXENABLE|INTE_MIDIRXENABLE);
+    }
+
+    // acknowledge the interrupt if necessary
+    outl(status, chip->port + IPR);
+
+    // snd_printk(KERN_INFO "interrupt %08x\n", status);
+    return IRQ_HANDLED;
 }
 
 static int __devinit snd_emu10k1x_pcm(struct emu10k1x *emu, int device, struct snd_pcm **rpcm)
 {
-        struct snd_pcm *pcm;
-        int err;
-        int capture = 0;
-  
-        if (rpcm)
-                *rpcm = NULL;
-        if (device == 0)
-                capture = 1;
-        
-        if ((err = snd_pcm_new(emu->card, "emu10k1x", device, 1, capture, &pcm)) < 0)
-                return err;
-  
-        pcm->private_data = emu;
-        
-        switch(device) {
-        case 0:
-                snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1x_playback_ops);
-                snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1x_capture_ops);
-                break;
-        case 1:
-        case 2:
-                snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1x_playback_ops);
-                break;
-        }
-
-        pcm->info_flags = 0;
-        pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
-        switch(device) {
-        case 0:
-                strcpy(pcm->name, "EMU10K1X Front");
-                break;
-        case 1:
-                strcpy(pcm->name, "EMU10K1X Rear");
-                break;
-        case 2:
-                strcpy(pcm->name, "EMU10K1X Center/LFE");
-                break;
-        }
-        emu->pcm = pcm;
-
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_pci_data(emu->pci), 
-                                              32*1024, 32*1024);
-  
-        if (rpcm)
-                *rpcm = pcm;
-  
-        return 0;
+    struct snd_pcm *pcm;
+    int err;
+    int capture = 0;
+
+    if (rpcm)
+        *rpcm = NULL;
+    if (device == 0)
+        capture = 1;
+
+    if ((err = snd_pcm_new(emu->card, "emu10k1x", device, 1, capture, &pcm)) < 0)
+        return err;
+
+    pcm->private_data = emu;
+
+    switch(device) {
+    case 0:
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1x_playback_ops);
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1x_capture_ops);
+        break;
+    case 1:
+    case 2:
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1x_playback_ops);
+        break;
+    }
+
+    pcm->info_flags = 0;
+    pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
+    switch(device) {
+    case 0:
+        strcpy(pcm->name, "EMU10K1X Front");
+        break;
+    case 1:
+        strcpy(pcm->name, "EMU10K1X Rear");
+        break;
+    case 2:
+        strcpy(pcm->name, "EMU10K1X Center/LFE");
+        break;
+    }
+    emu->pcm = pcm;
+
+    snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                          snd_dma_pci_data(emu->pci),
+                                          32*1024, 32*1024);
+
+    if (rpcm)
+        *rpcm = pcm;
+
+    return 0;
 }
 
 static int __devinit snd_emu10k1x_create(struct snd_card *card,
-                                         struct pci_dev *pci,
-                                         struct emu10k1x **rchip)
-{
-        struct emu10k1x *chip;
-        int err;
-        int ch;
-        static struct snd_device_ops ops = {
-                .dev_free = snd_emu10k1x_dev_free,
-        };
-  
-        *rchip = NULL;
-  
-        if ((err = pci_enable_device(pci)) < 0)
-                return err;
-        pci_set_dma_mask(pci, 0x0fffffff);
-  
-        chip = (struct emu10k1x *)kzalloc(sizeof(*chip), GFP_KERNEL);
-        if (chip == NULL) {
-                pci_disable_device(pci);
-                return -ENOMEM;
-        }
-  
-        chip->card = card;
-        chip->pci = pci;
-        chip->irq = -1;
-
-        spin_lock_init(&chip->emu_lock);
-        spin_lock_init(&chip->voice_lock);
-  
-        chip->port = pci_resource_start(pci, 0);
-        if ((chip->res_port = request_region(chip->port, 8,
-                                             "EMU10K1X")) == NULL) { 
-                snd_printk(KERN_ERR "emu10k1x: cannot allocate the port 0x%lx\n", chip->port);
-                snd_emu10k1x_free(chip);
-                return -EBUSY;
-        }
-
-        if (request_irq(pci->irq, snd_emu10k1x_interrupt,
-                        SA_INTERRUPT|SA_SHIRQ, "EMU10K1X",
-                        (void *)chip)) {
-                snd_printk(KERN_ERR "emu10k1x: cannot grab irq %d\n", pci->irq);
-                snd_emu10k1x_free(chip);
-                return -EBUSY;
-        }
-        chip->irq = pci->irq;
-  
-        if(snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
-                               4 * 1024, &chip->dma_buffer) < 0) {
-                snd_emu10k1x_free(chip);
-                return -ENOMEM;
-        }
-
-        pci_set_master(pci);
-        /* read revision & serial */
-        pci_read_config_byte(pci, PCI_REVISION_ID, (char *)&chip->revision);
-        pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial);
-        pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model);
-        snd_printk(KERN_INFO "Model %04x Rev %08x Serial %08x\n", chip->model,
-                   chip->revision, chip->serial);
-
-        outl(0, chip->port + INTE);     
-
-        for(ch = 0; ch < 3; ch++) {
-                chip->voices[ch].emu = chip;
-                chip->voices[ch].number = ch;
-        }
-
-        /*
-         *  Init to 0x02109204 :
-         *  Clock accuracy    = 0     (1000ppm)
-         *  Sample Rate       = 2     (48kHz)
-         *  Audio Channel     = 1     (Left of 2)
-         *  Source Number     = 0     (Unspecified)
-         *  Generation Status = 1     (Original for Cat Code 12)
-         *  Cat Code          = 12    (Digital Signal Mixer)
-         *  Mode              = 0     (Mode 0)
-         *  Emphasis          = 0     (None)
-         *  CP                = 1     (Copyright unasserted)
-         *  AN                = 0     (Audio data)
-         *  P                 = 0     (Consumer)
-         */
-        snd_emu10k1x_ptr_write(chip, SPCS0, 0,
-                               chip->spdif_bits[0] = 
-                               SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
-                               SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
-                               SPCS_GENERATIONSTATUS | 0x00001200 |
-                               0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT);
-        snd_emu10k1x_ptr_write(chip, SPCS1, 0,
-                               chip->spdif_bits[1] = 
-                               SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
-                               SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
-                               SPCS_GENERATIONSTATUS | 0x00001200 |
-                               0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT);
-        snd_emu10k1x_ptr_write(chip, SPCS2, 0,
-                               chip->spdif_bits[2] = 
-                               SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
-                               SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
-                               SPCS_GENERATIONSTATUS | 0x00001200 |
-                               0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT);
-
-        snd_emu10k1x_ptr_write(chip, SPDIF_SELECT, 0, 0x700); // disable SPDIF
-        snd_emu10k1x_ptr_write(chip, ROUTING, 0, 0x1003F); // routing
-        snd_emu10k1x_gpio_write(chip, 0x1080); // analog mode
-
-        outl(HCFG_LOCKSOUNDCACHE|HCFG_AUDIOENABLE, chip->port+HCFG);
-
-        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
-                                  chip, &ops)) < 0) {
-                snd_emu10k1x_free(chip);
-                return err;
-        }
-        *rchip = chip;
-        return 0;
-}
-
-static void snd_emu10k1x_proc_reg_read(struct snd_info_entry *entry, 
-                                       struct snd_info_buffer *buffer)
-{
-        struct emu10k1x *emu = entry->private_data;
-        unsigned long value,value1,value2;
-        unsigned long flags;
-        int i;
-
-        snd_iprintf(buffer, "Registers:\n\n");
-        for(i = 0; i < 0x20; i+=4) {
-                spin_lock_irqsave(&emu->emu_lock, flags);
-                value = inl(emu->port + i);
-                spin_unlock_irqrestore(&emu->emu_lock, flags);
-                snd_iprintf(buffer, "Register %02X: %08lX\n", i, value);
-        }
-        snd_iprintf(buffer, "\nRegisters\n\n");
-        for(i = 0; i <= 0x48; i++) {
-                value = snd_emu10k1x_ptr_read(emu, i, 0);
-                if(i < 0x10 || (i >= 0x20 && i < 0x40)) {
-                        value1 = snd_emu10k1x_ptr_read(emu, i, 1);
-                        value2 = snd_emu10k1x_ptr_read(emu, i, 2);
-                        snd_iprintf(buffer, "%02X: %08lX %08lX %08lX\n", i, value, value1, value2);
-                } else {
-                        snd_iprintf(buffer, "%02X: %08lX\n", i, value);
-                }
-        }
-}
-
-static void snd_emu10k1x_proc_reg_write(struct snd_info_entry *entry, 
-                                        struct snd_info_buffer *buffer)
-{
-        struct emu10k1x *emu = entry->private_data;
-        char line[64];
-        unsigned int reg, channel_id , val;
+                                         struct pci_dev *pci,
+                                         struct emu10k1x **rchip)
+{
+    struct emu10k1x *chip;
+    int err;
+    int ch;
+    static struct snd_device_ops ops = {
+        .dev_free = snd_emu10k1x_dev_free,
+    };
+
+    *rchip = NULL;
+
+    if ((err = pci_enable_device(pci)) < 0)
+        return err;
+    pci_set_dma_mask(pci, 0x0fffffff);
+
+    chip = (struct emu10k1x *)kzalloc(sizeof(*chip), GFP_KERNEL);
+    if (chip == NULL) {
+        pci_disable_device(pci);
+        return -ENOMEM;
+    }
+
+    chip->card = card;
+    chip->pci = pci;
+    chip->irq = -1;
+
+    spin_lock_init(&chip->emu_lock);
+    spin_lock_init(&chip->voice_lock);
+
+    chip->port = pci_resource_start(pci, 0);
+    if ((chip->res_port = request_region(chip->port, 8,
+                                         "EMU10K1X")) == NULL) {
+        snd_printk(KERN_ERR "emu10k1x: cannot allocate the port 0x%lx\n", chip->port);
+        snd_emu10k1x_free(chip);
+        return -EBUSY;
+    }
+
+    if (request_irq(pci->irq, snd_emu10k1x_interrupt,
+                    SA_INTERRUPT|SA_SHIRQ, "EMU10K1X",
+                    (void *)chip)) {
+        snd_printk(KERN_ERR "emu10k1x: cannot grab irq %d\n", pci->irq);
+        snd_emu10k1x_free(chip);
+        return -EBUSY;
+    }
+    chip->irq = pci->irq;
+
+    if(snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
+                           4 * 1024, &chip->dma_buffer) < 0) {
+        snd_emu10k1x_free(chip);
+        return -ENOMEM;
+    }
+
+    pci_set_master(pci);
+    /* read revision & serial */
+    pci_read_config_byte(pci, PCI_REVISION_ID, (char *)&chip->revision);
+    pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &chip->serial);
+    pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &chip->model);
+    snd_printk(KERN_INFO "Model %04x Rev %08x Serial %08x\n", chip->model,
+               chip->revision, chip->serial);
+
+    outl(0, chip->port + INTE);
+
+    for(ch = 0; ch < 3; ch++) {
+        chip->voices[ch].emu = chip;
+        chip->voices[ch].number = ch;
+    }
+
+    /*
+     *  Init to 0x02109204 :
+     *  Clock accuracy    = 0     (1000ppm)
+     *  Sample Rate       = 2     (48kHz)
+     *  Audio Channel     = 1     (Left of 2)
+     *  Source Number     = 0     (Unspecified)
+     *  Generation Status = 1     (Original for Cat Code 12)
+     *  Cat Code          = 12    (Digital Signal Mixer)
+     *  Mode              = 0     (Mode 0)
+     *  Emphasis          = 0     (None)
+     *  CP                = 1     (Copyright unasserted)
+     *  AN                = 0     (Audio data)
+     *  P                 = 0     (Consumer)
+     */
+    snd_emu10k1x_ptr_write(chip, SPCS0, 0,
+                           chip->spdif_bits[0] =
+                           SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
+                           SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
+                           SPCS_GENERATIONSTATUS | 0x00001200 |
+                           0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT);
+    snd_emu10k1x_ptr_write(chip, SPCS1, 0,
+                           chip->spdif_bits[1] =
+                           SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
+                           SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
+                           SPCS_GENERATIONSTATUS | 0x00001200 |
+                           0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT);
+    snd_emu10k1x_ptr_write(chip, SPCS2, 0,
+                           chip->spdif_bits[2] =
+                           SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
+                           SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC |
+                           SPCS_GENERATIONSTATUS | 0x00001200 |
+                           0x00000000 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT);
+
+    snd_emu10k1x_ptr_write(chip, SPDIF_SELECT, 0, 0x700); // disable SPDIF
+    snd_emu10k1x_ptr_write(chip, ROUTING, 0, 0x1003F); // routing
+    snd_emu10k1x_gpio_write(chip, 0x1080); // analog mode
+
+    outl(HCFG_LOCKSOUNDCACHE|HCFG_AUDIOENABLE, chip->port+HCFG);
+
+    if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
+                              chip, &ops)) < 0) {
+        snd_emu10k1x_free(chip);
+        return err;
+    }
+    *rchip = chip;
+    return 0;
+}
+
+static void snd_emu10k1x_proc_reg_read(struct snd_info_entry *entry,
+                                       struct snd_info_buffer *buffer)
+{
+    struct emu10k1x *emu = entry->private_data;
+    unsigned long value,value1,value2;
+    unsigned long flags;
+    int i;
+
+    snd_iprintf(buffer, "Registers:\n\n");
+    for(i = 0; i < 0x20; i+=4) {
+        spin_lock_irqsave(&emu->emu_lock, flags);
+        value = inl(emu->port + i);
+        spin_unlock_irqrestore(&emu->emu_lock, flags);
+        snd_iprintf(buffer, "Register %02X: %08lX\n", i, value);
+    }
+    snd_iprintf(buffer, "\nRegisters\n\n");
+    for(i = 0; i <= 0x48; i++) {
+        value = snd_emu10k1x_ptr_read(emu, i, 0);
+        if(i < 0x10 || (i >= 0x20 && i < 0x40)) {
+            value1 = snd_emu10k1x_ptr_read(emu, i, 1);
+            value2 = snd_emu10k1x_ptr_read(emu, i, 2);
+            snd_iprintf(buffer, "%02X: %08lX %08lX %08lX\n", i, value, value1, value2);
+        } else {
+            snd_iprintf(buffer, "%02X: %08lX\n", i, value);
+        }
+    }
+}
+
+static void snd_emu10k1x_proc_reg_write(struct snd_info_entry *entry,
+                                        struct snd_info_buffer *buffer)
+{
+    struct emu10k1x *emu = entry->private_data;
+    char line[64];
+    unsigned int reg, channel_id , val;
 #if 0
-        while (!snd_info_get_line(buffer, line, sizeof(line))) {
-                if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3)
-                        continue;
-
-                if ((reg < 0x49) && (reg >=0) && (val <= 0xffffffff) 
-                    && (channel_id >=0) && (channel_id <= 2) )
-                        snd_emu10k1x_ptr_write(emu, reg, channel_id, val);
-        }
+    while (!snd_info_get_line(buffer, line, sizeof(line))) {
+        if (sscanf(line, "%x %x %x", &reg, &channel_id, &val) != 3)
+            continue;
+
+        if ((reg < 0x49) && (reg >=0) && (val <= 0xffffffff)
+            && (channel_id >=0) && (channel_id <= 2) )
+            snd_emu10k1x_ptr_write(emu, reg, channel_id, val);
+    }
 #endif
 }
@@ -1048 +1047 @@
 static int __devinit snd_emu10k1x_proc_init(struct emu10k1x * emu)
 {
-        struct snd_info_entry *entry;
-        
-        if(! snd_card_proc_new(emu->card, "emu10k1x_regs", &entry)) {
-                snd_info_set_text_ops(entry, emu, 1024, snd_emu10k1x_proc_reg_read);
-                entry->c.text.write_size = 64;
-                entry->c.text.write = snd_emu10k1x_proc_reg_write;
-                entry->mode |= S_IWUSR;
-                entry->private_data = emu;
-        }
-        
-        return 0;
+    struct snd_info_entry *entry;
+
+    if(! snd_card_proc_new(emu->card, "emu10k1x_regs", &entry)) {
+        snd_info_set_text_ops(entry, emu, 1024, snd_emu10k1x_proc_reg_read);
+        entry->c.text.write_size = 64;
+        entry->c.text.write = snd_emu10k1x_proc_reg_write;
+        entry->mode |= S_IWUSR;
+        entry->private_data = emu;
+    }
+
+    return 0;
 }
 
 static int snd_emu10k1x_shared_spdif_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+    uinfo->count = 1;
+    uinfo->value.integer.min = 0;
+    uinfo->value.integer.max = 1;
+    return 0;
 }
 
 static int snd_emu10k1x_shared_spdif_get(struct snd_kcontrol *kcontrol,
-                                         struct snd_ctl_elem_value *ucontrol)
-{
-        struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
-
-        ucontrol->value.integer.value[0] = (snd_emu10k1x_ptr_read(emu, SPDIF_SELECT, 0) == 0x700) ? 0 : 1;
-
-        return 0;
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+    struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
+
+    ucontrol->value.integer.value[0] = (snd_emu10k1x_ptr_read(emu, SPDIF_SELECT, 0) == 0x700) ? 0 : 1;
+
+    return 0;
 }
 
 static int snd_emu10k1x_shared_spdif_put(struct snd_kcontrol *kcontrol,
-                                         struct snd_ctl_elem_value *ucontrol)
-{
-        struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
-        unsigned int val;
-        int change = 0;
-
-        val = ucontrol->value.integer.value[0] ;
-
-        if (val) {
-                // enable spdif output
-                snd_emu10k1x_ptr_write(emu, SPDIF_SELECT, 0, 0x000);
-                snd_emu10k1x_ptr_write(emu, ROUTING, 0, 0x700);
-                snd_emu10k1x_gpio_write(emu, 0x1000);
-        } else {
-                // disable spdif output
-                snd_emu10k1x_ptr_write(emu, SPDIF_SELECT, 0, 0x700);
-                snd_emu10k1x_ptr_write(emu, ROUTING, 0, 0x1003F);
-                snd_emu10k1x_gpio_write(emu, 0x1080);
-        }
-        return change;
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+    struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
+    unsigned int val;
+    int change = 0;
+
+    val = ucontrol->value.integer.value[0] ;
+
+    if (val) {
+        // enable spdif output
+        snd_emu10k1x_ptr_write(emu, SPDIF_SELECT, 0, 0x000);
+        snd_emu10k1x_ptr_write(emu, ROUTING, 0, 0x700);
+        snd_emu10k1x_gpio_write(emu, 0x1000);
+    } else {
+        // disable spdif output
+        snd_emu10k1x_ptr_write(emu, SPDIF_SELECT, 0, 0x700);
+        snd_emu10k1x_ptr_write(emu, ROUTING, 0, 0x1003F);
+        snd_emu10k1x_gpio_write(emu, 0x1080);
+    }
+    return change;
 }
 
 static struct snd_kcontrol_new snd_emu10k1x_shared_spdif __devinitdata =
 {
-        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
-        .name =         "Analog/Digital Output Jack",
-        .info =         snd_emu10k1x_shared_spdif_info,
-        .get =          snd_emu10k1x_shared_spdif_get,
-        .put =          snd_emu10k1x_shared_spdif_put
+    .iface =    SNDRV_CTL_ELEM_IFACE_MIXER,
+    .name =             "Analog/Digital Output Jack",
+    .info =             snd_emu10k1x_shared_spdif_info,
+    .get =              snd_emu10k1x_shared_spdif_get,
+    .put =              snd_emu10k1x_shared_spdif_put
 };
 
 static int snd_emu10k1x_spdif_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
-        uinfo->count = 1;
-        return 0;
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
+    uinfo->count = 1;
+    return 0;
 }
 
 static int snd_emu10k1x_spdif_get(struct snd_kcontrol *kcontrol,
-                                  struct snd_ctl_elem_value *ucontrol)
-{
-        struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
-        unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-
-        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;
-        return 0;
+                                  struct snd_ctl_elem_value *ucontrol)
+{
+    struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
+    unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+
+    ucontrol->value.iec958.status[0] = (emu->spdif_bits[idx] >> 0) & 0xff;
+    ucontrol->value.iec958.status[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;
+    return 0;
 }
 
 static int snd_emu10k1x_spdif_get_mask(struct snd_kcontrol *kcontrol,
-                                       struct snd_ctl_elem_value *ucontrol)
-{
-        ucontrol->value.iec958.status[0] = 0xff;
-        ucontrol->value.iec958.status[1] = 0xff;
-        ucontrol->value.iec958.status[2] = 0xff;
-        ucontrol->value.iec958.status[3] = 0xff;
-        return 0;
+                                       struct snd_ctl_elem_value *ucontrol)
+{
+    ucontrol->value.iec958.status[0] = 0xff;
+    ucontrol->value.iec958.status[1] = 0xff;
+    ucontrol->value.iec958.status[2] = 0xff;
+    ucontrol->value.iec958.status[3] = 0xff;
+    return 0;
 }
 
 static int snd_emu10k1x_spdif_put(struct snd_kcontrol *kcontrol,
-                                  struct snd_ctl_elem_value *ucontrol)
-{
-        struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
-        unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
-        int change;
-        unsigned int val;
-
-        val = (ucontrol->value.iec958.status[0] << 0) |
-                (ucontrol->value.iec958.status[1] << 8) |
-                (ucontrol->value.iec958.status[2] << 16) |
-                (ucontrol->value.iec958.status[3] << 24);
-        change = val != emu->spdif_bits[idx];
-        if (change) {
-                snd_emu10k1x_ptr_write(emu, SPCS0 + idx, 0, val);
-                emu->spdif_bits[idx] = val;
-        }
-        return change;
+                                  struct snd_ctl_elem_value *ucontrol)
+{
+    struct emu10k1x *emu = snd_kcontrol_chip(kcontrol);
+    unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
+    int change;
+    unsigned int val;
+
+    val = (ucontrol->value.iec958.status[0] << 0) |
+        (ucontrol->value.iec958.status[1] << 8) |
+        (ucontrol->value.iec958.status[2] << 16) |
+        (ucontrol->value.iec958.status[3] << 24);
+    change = val != emu->spdif_bits[idx];
+    if (change) {
+        snd_emu10k1x_ptr_write(emu, SPCS0 + idx, 0, val);
+        emu->spdif_bits[idx] = val;
+    }
+    return change;
 }
 
 static struct snd_kcontrol_new snd_emu10k1x_spdif_mask_control =
 {
-        .access =       SNDRV_CTL_ELEM_ACCESS_READ,
-        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
-        .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),
-        .count =        3,
-        .info =         snd_emu10k1x_spdif_info,
-        .get =          snd_emu10k1x_spdif_get_mask
+    .access =   SNDRV_CTL_ELEM_ACCESS_READ,
+    .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+    .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),
+    .count =    3,
+    .info =         snd_emu10k1x_spdif_info,
+    .get =          snd_emu10k1x_spdif_get_mask
 };
 
 static struct snd_kcontrol_new snd_emu10k1x_spdif_control =
 {
-        .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
-        .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
-        .count =        3,
-        .info =         snd_emu10k1x_spdif_info,
-        .get =          snd_emu10k1x_spdif_get,
-        .put =          snd_emu10k1x_spdif_put
+    .iface =    SNDRV_CTL_ELEM_IFACE_PCM,
+    .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+    .count =    3,
+    .info =         snd_emu10k1x_spdif_info,
+    .get =          snd_emu10k1x_spdif_get,
+    .put =          snd_emu10k1x_spdif_put
 };
 
 static int __devinit snd_emu10k1x_mixer(struct emu10k1x *emu)
 {
-        int err;
-        struct snd_kcontrol *kctl;
-        struct snd_card *card = emu->card;
-
-        if ((kctl = snd_ctl_new1(&snd_emu10k1x_spdif_mask_control, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-                return err;
-        if ((kctl = snd_ctl_new1(&snd_emu10k1x_shared_spdif, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-                return err;
-        if ((kctl = snd_ctl_new1(&snd_emu10k1x_spdif_control, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-                return err;
-
-        return 0;
+    int err;
+    struct snd_kcontrol *kctl;
+    struct snd_card *card = emu->card;
+
+    if ((kctl = snd_ctl_new1(&snd_emu10k1x_spdif_mask_control, emu)) == NULL)
+        return -ENOMEM;
+    if ((err = snd_ctl_add(card, kctl)))
+        return err;
+    if ((kctl = snd_ctl_new1(&snd_emu10k1x_shared_spdif, emu)) == NULL)
+        return -ENOMEM;
+    if ((err = snd_ctl_add(card, kctl)))
+        return err;
+    if ((kctl = snd_ctl_new1(&snd_emu10k1x_spdif_control, emu)) == NULL)
+        return -ENOMEM;
+    if ((err = snd_ctl_add(card, kctl)))
+        return err;
+
+    return 0;
 }
 
@@ -1209 +1208 @@
 static inline unsigned char mpu401_read(struct emu10k1x *emu, struct emu10k1x_midi *mpu, int idx)
 {
-        return (unsigned char)snd_emu10k1x_ptr_read(emu, mpu->port + idx, 0);
+    return (unsigned char)snd_emu10k1x_ptr_read(emu, mpu->port + idx, 0);
 }
 
 static inline void mpu401_write(struct emu10k1x *emu, struct emu10k1x_midi *mpu, int data, int idx)
 {
-        snd_emu10k1x_ptr_write(emu, mpu->port + idx, 0, data);
+    snd_emu10k1x_ptr_write(emu, mpu->port + idx, 0, data);
 }
 
@@ -1231 +1230 @@
 static void mpu401_clear_rx(struct emu10k1x *emu, struct emu10k1x_midi *mpu)
 {
-        int timeout = 100000;
-        for (; timeout > 0 && mpu401_input_avail(emu, mpu); timeout--)
-                mpu401_read_data(emu, mpu);
+    int timeout = 100000;
+    for (; timeout > 0 && mpu401_input_avail(emu, mpu); timeout--)
+        mpu401_read_data(emu, mpu);
 #ifdef CONFIG_SND_DEBUG
-        if (timeout <= 0)
-                snd_printk(KERN_ERR "cmd: clear rx timeout (status = 0x%x)\n", mpu401_read_stat(emu, mpu));
+    if (timeout <= 0)
+        snd_printk(KERN_ERR "cmd: clear rx timeout (status = 0x%x)\n", mpu401_read_stat(emu, mpu));
 #endif
 }
@@ -1242 +1241 @@
 /*
 
- */
+*/
 
 static void do_emu10k1x_midi_interrupt(struct emu10k1x *emu,
-                                       struct emu10k1x_midi *midi, unsigned int status)
-{
-        unsigned char byte;
-
-        if (midi->rmidi == NULL) {
-                snd_emu10k1x_intr_disable(emu, midi->tx_enable | midi->rx_enable);
-                return;
-        }
-
-        spin_lock(&midi->input_lock);
-        if ((status & midi->ipr_rx) && mpu401_input_avail(emu, midi)) {
-                if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT)) {
-                        mpu401_clear_rx(emu, midi);
-                } else {
-                        byte = mpu401_read_data(emu, midi);
-                        if (midi->substream_input)
-                                snd_rawmidi_receive(midi->substream_input, &byte, 1);
-                }
-        }
-        spin_unlock(&midi->input_lock);
-
-        spin_lock(&midi->output_lock);
-        if ((status & midi->ipr_tx) && mpu401_output_ready(emu, midi)) {
-                if (midi->substream_output &&
-                    snd_rawmidi_transmit(midi->substream_output, &byte, 1) == 1) {
-                        mpu401_write_data(emu, midi, byte);
-                } else {
-                        snd_emu10k1x_intr_disable(emu, midi->tx_enable);
-                }
-        }
-        spin_unlock(&midi->output_lock);
+                                       struct emu10k1x_midi *midi, unsigned int status)
+{
+    unsigned char byte;
+
+    if (midi->rmidi == NULL) {
+        snd_emu10k1x_intr_disable(emu, midi->tx_enable | midi->rx_enable);
+        return;
+    }
+
+    spin_lock(&midi->input_lock);
+    if ((status & midi->ipr_rx) && mpu401_input_avail(emu, midi)) {
+        if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT)) {
+            mpu401_clear_rx(emu, midi);
+        } else {
+            byte = mpu401_read_data(emu, midi);
+            if (midi->substream_input)
+                snd_rawmidi_receive(midi->substream_input, &byte, 1);
+        }
+    }
+    spin_unlock(&midi->input_lock);
+
+    spin_lock(&midi->output_lock);
+    if ((status & midi->ipr_tx) && mpu401_output_ready(emu, midi)) {
+        if (midi->substream_output &&
+            snd_rawmidi_transmit(midi->substream_output, &byte, 1) == 1) {
+            mpu401_write_data(emu, midi, byte);
+        } else {
+            snd_emu10k1x_intr_disable(emu, midi->tx_enable);
+        }
+    }
+    spin_unlock(&midi->output_lock);
 }
 
 static void snd_emu10k1x_midi_interrupt(struct emu10k1x *emu, unsigned int status)
 {
-        do_emu10k1x_midi_interrupt(emu, &emu->midi, status);
-}
-
-static void snd_emu10k1x_midi_cmd(struct emu10k1x * emu,
-                                  struct emu10k1x_midi *midi, unsigned char cmd, int ack)
-{
-        unsigned long flags;
-        int timeout, ok;
-
-        spin_lock_irqsave(&midi->input_lock, flags);
-        mpu401_write_data(emu, midi, 0x00);
-        /* mpu401_clear_rx(emu, midi); */
-
-        mpu401_write_cmd(emu, midi, cmd);
-        if (ack) {
-                ok = 0;
-                timeout = 10000;
-                while (!ok && timeout-- > 0) {
-                        if (mpu401_input_avail(emu, midi)) {
-                                if (mpu401_read_data(emu, midi) == MPU401_ACK)
-                                        ok = 1;
-                        }
-                }
-                if (!ok && mpu401_read_data(emu, midi) == MPU401_ACK)
-                        ok = 1;
-        } else {
-                ok = 1;
-        }
-        spin_unlock_irqrestore(&midi->input_lock, flags);
-        if (!ok)
-                snd_printk(KERN_ERR "midi_cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)!!!\n",
-                           cmd, emu->port,
-                           mpu401_read_stat(emu, midi),
-                           mpu401_read_data(emu, midi));
+    do_emu10k1x_midi_interrupt(emu, &emu->midi, status);
+}
+
+static int snd_emu10k1x_midi_cmd(struct emu10k1x * emu,
+                                 struct emu10k1x_midi *midi, unsigned char cmd, int ack)
+{
+    unsigned long flags;
+    int timeout, ok;
+
+    spin_lock_irqsave(&midi->input_lock, flags);
+    mpu401_write_data(emu, midi, 0x00);
+    /* mpu401_clear_rx(emu, midi); */
+
+    mpu401_write_cmd(emu, midi, cmd);
+    if (ack) {
+        ok = 0;
+        timeout = 10000;
+        while (!ok && timeout-- > 0) {
+            if (mpu401_input_avail(emu, midi)) {
+                if (mpu401_read_data(emu, midi) == MPU401_ACK)
+                    ok = 1;
+            }
+        }
+        if (!ok && mpu401_read_data(emu, midi) == MPU401_ACK)
+            ok = 1;
+    } else {
+        ok = 1;
+    }
+    spin_unlock_irqrestore(&midi->input_lock, flags);
+    if (!ok) {
+        snd_printk(KERN_ERR "midi_cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)!!!\n",
+                   cmd, emu->port,
+                   mpu401_read_stat(emu, midi),
+                   mpu401_read_data(emu, midi));
+        return 1;
+    }
+    return 0;
 }
 
 static int snd_emu10k1x_midi_input_open(struct snd_rawmidi_substream *substream)
 {
-        struct emu10k1x *emu;
-        struct emu10k1x_midi *midi = substream->rmidi->private_data;
-        unsigned long flags;
-        
-        emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
-        spin_lock_irqsave(&midi->open_lock, flags);
-        midi->midi_mode |= EMU10K1X_MIDI_MODE_INPUT;
-        midi->substream_input = substream;
-        if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT)) {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
-                snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1);
-                snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1);
-        } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
-        }
-        return 0;
+    struct emu10k1x *emu;
+    struct emu10k1x_midi *midi = substream->rmidi->private_data;
+    unsigned long flags;
+
+    emu = midi->emu;
+    snd_assert(emu, return -ENXIO);
+    spin_lock_irqsave(&midi->open_lock, flags);
+    midi->midi_mode |= EMU10K1X_MIDI_MODE_INPUT;
+    midi->substream_input = substream;
+    if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT)) {
+        spin_unlock_irqrestore(&midi->open_lock, flags);
+        if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1))
+            goto error_out;
+        if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))
+            goto error_out;
+    } else {
+        spin_unlock_irqrestore(&midi->open_lock, flags);
+    }
+    return 0;
+
+    error_out:
+        return -EIO;
 }
 
 static int snd_emu10k1x_midi_output_open(struct snd_rawmidi_substream *substream)
 {
-        struct emu10k1x *emu;
-        struct emu10k1x_midi *midi = substream->rmidi->private_data;
-        unsigned long flags;
-
-        emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
-        spin_lock_irqsave(&midi->open_lock, flags);
-        midi->midi_mode |= EMU10K1X_MIDI_MODE_OUTPUT;
-        midi->substream_output = substream;
-        if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT)) {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
-                snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1);
-                snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1);
-        } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
-        }
-        return 0;
+    struct emu10k1x *emu;
+    struct emu10k1x_midi *midi = substream->rmidi->private_data;
+    unsigned long flags;
+
+    emu = midi->emu;
+    snd_assert(emu, return -ENXIO);
+    spin_lock_irqsave(&midi->open_lock, flags);
+    midi->midi_mode |= EMU10K1X_MIDI_MODE_OUTPUT;
+    midi->substream_output = substream;
+    if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT)) {
+        spin_unlock_irqrestore(&midi->open_lock, flags);
+        if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1))
+            goto error_out;
+        if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))
+            goto error_out;
+    } else {
+        spin_unlock_irqrestore(&midi->open_lock, flags);
+    }
+    return 0;
+
+    error_out:
+        return -EIO;
 }
 
 static int snd_emu10k1x_midi_input_close(struct snd_rawmidi_substream *substream)
 {
-        struct emu10k1x *emu;
-        struct emu10k1x_midi *midi = substream->rmidi->private_data;
-        unsigned long flags;
-
-        emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
-        spin_lock_irqsave(&midi->open_lock, flags);
-        snd_emu10k1x_intr_disable(emu, midi->rx_enable);
-        midi->midi_mode &= ~EMU10K1X_MIDI_MODE_INPUT;
-        midi->substream_input = NULL;
-        if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT)) {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
-                snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
-        } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
-        }
-        return 0;
+    struct emu10k1x *emu;
+    struct emu10k1x_midi *midi = substream->rmidi->private_data;
+    unsigned long flags;
+    int err = 0;
+
+    emu = midi->emu;
+    snd_assert(emu, return -ENXIO);
+    spin_lock_irqsave(&midi->open_lock, flags);
+    snd_emu10k1x_intr_disable(emu, midi->rx_enable);
+    midi->midi_mode &= ~EMU10K1X_MIDI_MODE_INPUT;
+    midi->substream_input = NULL;
+    if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT)) {
+        spin_unlock_irqrestore(&midi->open_lock, flags);
+        err = snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
+    } else {
+        spin_unlock_irqrestore(&midi->open_lock, flags);
+    }
+    return err;
 }
 
 static int snd_emu10k1x_midi_output_close(struct snd_rawmidi_substream *substream)
 {
-        struct emu10k1x *emu;
-        struct emu10k1x_midi *midi = substream->rmidi->private_data;
-        unsigned long flags;
-
-        emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
-        spin_lock_irqsave(&midi->open_lock, flags);
-        snd_emu10k1x_intr_disable(emu, midi->tx_enable);
-        midi->midi_mode &= ~EMU10K1X_MIDI_MODE_OUTPUT;
-        midi->substream_output = NULL;
-        if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT)) {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
-                snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
-        } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
-        }
-        return 0;
+    struct emu10k1x *emu;
+    struct emu10k1x_midi *midi = substream->rmidi->private_data;
+    unsigned long flags;
+    int err = 0;
+
+    emu = midi->emu;
+    snd_assert(emu, return -ENXIO);
+    spin_lock_irqsave(&midi->open_lock, flags);
+    snd_emu10k1x_intr_disable(emu, midi->tx_enable);
+    midi->midi_mode &= ~EMU10K1X_MIDI_MODE_OUTPUT;
+    midi->substream_output = NULL;
+    if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT)) {
+        spin_unlock_irqrestore(&midi->open_lock, flags);
+        err = snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
+    } else {
+        spin_unlock_irqrestore(&midi->open_lock, flags);
+    }
+    return err;
 }
 
 static void snd_emu10k1x_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)
 {
-        struct emu10k1x *emu;
-        struct emu10k1x_midi *midi = substream->rmidi->private_data;
-        emu = midi->emu;
-        snd_assert(emu, return);
-
-        if (up)
-                snd_emu10k1x_intr_enable(emu, midi->rx_enable);
-        else
-                snd_emu10k1x_intr_disable(emu, midi->rx_enable);
+    struct emu10k1x *emu;
+    struct emu10k1x_midi *midi = substream->rmidi->private_data;
+    emu = midi->emu;
+    snd_assert(emu, return);
+
+    if (up)
+        snd_emu10k1x_intr_enable(emu, midi->rx_enable);
+    else
+        snd_emu10k1x_intr_disable(emu, midi->rx_enable);
 }
 
 static void snd_emu10k1x_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)
 {
-        struct emu10k1x *emu;
-        struct emu10k1x_midi *midi = substream->rmidi->private_data;
-        unsigned long flags;
-
-        emu = midi->emu;
-        snd_assert(emu, return);
-
-        if (up) {
-                int max = 4;
-                unsigned char byte;
-        
-                /* try to send some amount of bytes here before interrupts */
-                spin_lock_irqsave(&midi->output_lock, flags);
-                while (max > 0) {
-                        if (mpu401_output_ready(emu, midi)) {
-                                if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT) ||
-                                    snd_rawmidi_transmit(substream, &byte, 1) != 1) {
-                                        /* no more data */
-                                        spin_unlock_irqrestore(&midi->output_lock, flags);
-                                        return;
-                                }
-                                mpu401_write_data(emu, midi, byte);
-                                max--;
-                        } else {
-                                break;
-                        }
-                }
-                spin_unlock_irqrestore(&midi->output_lock, flags);
-                snd_emu10k1x_intr_enable(emu, midi->tx_enable);
-        } else {
-                snd_emu10k1x_intr_disable(emu, midi->tx_enable);
-        }
+    struct emu10k1x *emu;
+    struct emu10k1x_midi *midi = substream->rmidi->private_data;
+    unsigned long flags;
+
+    emu = midi->emu;
+    snd_assert(emu, return);
+
+    if (up) {
+        int max = 4;
+        unsigned char byte;
+
+        /* try to send some amount of bytes here before interrupts */
+        spin_lock_irqsave(&midi->output_lock, flags);
+        while (max > 0) {
+            if (mpu401_output_ready(emu, midi)) {
+                if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT) ||
+                    snd_rawmidi_transmit(substream, &byte, 1) != 1) {
+                    /* no more data */
+                    spin_unlock_irqrestore(&midi->output_lock, flags);
+                    return;
+                }
+                mpu401_write_data(emu, midi, byte);
+                max--;
+            } else {
+                break;
+            }
+        }
+        spin_unlock_irqrestore(&midi->output_lock, flags);
+        snd_emu10k1x_intr_enable(emu, midi->tx_enable);
+    } else {
+        snd_emu10k1x_intr_disable(emu, midi->tx_enable);
+    }
 }
 
 /*
 
- */
+*/
 
 static struct snd_rawmidi_ops snd_emu10k1x_midi_output =
 {
-        .open =         snd_emu10k1x_midi_output_open,
-        .close =        snd_emu10k1x_midi_output_close,
-        .trigger =      snd_emu10k1x_midi_output_trigger,
+    .open =             snd_emu10k1x_midi_output_open,
+    .close =    snd_emu10k1x_midi_output_close,
+    .trigger =  snd_emu10k1x_midi_output_trigger,
 };
 
 static struct snd_rawmidi_ops snd_emu10k1x_midi_input =
 {
-        .open =         snd_emu10k1x_midi_input_open,
-        .close =        snd_emu10k1x_midi_input_close,
-        .trigger =      snd_emu10k1x_midi_input_trigger,
+    .open =             snd_emu10k1x_midi_input_open,
+    .close =    snd_emu10k1x_midi_input_close,
+    .trigger =  snd_emu10k1x_midi_input_trigger,
 };
 
 static void snd_emu10k1x_midi_free(struct snd_rawmidi *rmidi)
 {
-        struct emu10k1x_midi *midi = rmidi->private_data;
-        midi->interrupt = NULL;
-        midi->rmidi = NULL;
+    struct emu10k1x_midi *midi = rmidi->private_data;
+    midi->interrupt = NULL;
+    midi->rmidi = NULL;
 }
 
 static int __devinit emu10k1x_midi_init(struct emu10k1x *emu,
-                                        struct emu10k1x_midi *midi, int device, char *name)
-{
-        struct snd_rawmidi *rmidi;
-        int err;
-
-        if ((err = snd_rawmidi_new(emu->card, name, device, 1, 1, &rmidi)) < 0)
-                return err;
-        midi->emu = emu;
-        spin_lock_init(&midi->open_lock);
-        spin_lock_init(&midi->input_lock);
-        spin_lock_init(&midi->output_lock);
-        strcpy(rmidi->name, name);
-        snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &snd_emu10k1x_midi_output);
-        snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &snd_emu10k1x_midi_input);
-        rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT |
-                             SNDRV_RAWMIDI_INFO_INPUT |
-                             SNDRV_RAWMIDI_INFO_DUPLEX;
-        rmidi->private_data = midi;
-        rmidi->private_free = snd_emu10k1x_midi_free;
-        midi->rmidi = rmidi;
-        return 0;
+                                        struct emu10k1x_midi *midi, int device, char *name)
+{
+    struct snd_rawmidi *rmidi;
+    int err;
+
+    if ((err = snd_rawmidi_new(emu->card, name, device, 1, 1, &rmidi)) < 0)
+        return err;
+    midi->emu = emu;
+    spin_lock_init(&midi->open_lock);
+    spin_lock_init(&midi->input_lock);
+    spin_lock_init(&midi->output_lock);
+    strcpy(rmidi->name, name);
+    snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &snd_emu10k1x_midi_output);
+    snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &snd_emu10k1x_midi_input);
+    rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT |
+        SNDRV_RAWMIDI_INFO_INPUT |
+        SNDRV_RAWMIDI_INFO_DUPLEX;
+    rmidi->private_data = midi;
+    rmidi->private_free = snd_emu10k1x_midi_free;
+    midi->rmidi = rmidi;
+    return 0;
 }
 
 static int __devinit snd_emu10k1x_midi(struct emu10k1x *emu)
 {
-        struct emu10k1x_midi *midi = &emu->midi;
-        int err;
-
-        if ((err = emu10k1x_midi_init(emu, midi, 0, "EMU10K1X MPU-401 (UART)")) < 0)
-                return err;
-
-        midi->tx_enable = INTE_MIDITXENABLE;
-        midi->rx_enable = INTE_MIDIRXENABLE;
-        midi->port = MUDATA;
-        midi->ipr_tx = IPR_MIDITRANSBUFEMPTY;
-        midi->ipr_rx = IPR_MIDIRECVBUFEMPTY;
-        midi->interrupt = snd_emu10k1x_midi_interrupt;
-        return 0;
+    struct emu10k1x_midi *midi = &emu->midi;
+    int err;
+
+    if ((err = emu10k1x_midi_init(emu, midi, 0, "EMU10K1X MPU-401 (UART)")) < 0)
+        return err;
+
+    midi->tx_enable = INTE_MIDITXENABLE;
+    midi->rx_enable = INTE_MIDIRXENABLE;
+    midi->port = MUDATA;
+    midi->ipr_tx = IPR_MIDITRANSBUFEMPTY;
+    midi->ipr_rx = IPR_MIDIRECVBUFEMPTY;
+    midi->interrupt = snd_emu10k1x_midi_interrupt;
+    return 0;
 }
 
 static int __devinit snd_emu10k1x_probe(struct pci_dev *pci,
-                                        const struct pci_device_id *pci_id)
-{
-        static int dev;
-        struct snd_card *card;
-        struct emu10k1x *chip;
-        int err;
-
-        if (dev >= SNDRV_CARDS)
-                return -ENODEV;
-        if (!enable[dev]) {
-                dev++;
-                return -ENOENT;
-        }
-
-        card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-        if (card == NULL)
-                return -ENOMEM;
-
-        if ((err = snd_emu10k1x_create(card, pci, &chip)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-
-        if ((err = snd_emu10k1x_pcm(chip, 0, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_emu10k1x_pcm(chip, 1, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_emu10k1x_pcm(chip, 2, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-
-        if ((err = snd_emu10k1x_ac97(chip)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-
-        if ((err = snd_emu10k1x_mixer(chip)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        
-        if ((err = snd_emu10k1x_midi(chip)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-
-        snd_emu10k1x_proc_init(chip);
-
-        strcpy(card->driver, "EMU10K1X");
-        strcpy(card->shortname, "Dell Sound Blaster Live!");
-        sprintf(card->longname, "%s at 0x%lx irq %i",
-                card->shortname, chip->port, chip->irq);
-
-        if ((err = snd_card_register(card)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-
-        pci_set_drvdata(pci, card);
-        dev++;
-        return 0;
+                                        const struct pci_device_id *pci_id)
+{
+    static int dev;
+    struct snd_card *card;
+    struct emu10k1x *chip;
+    int err;
+
+    if (dev >= SNDRV_CARDS)
+        return -ENODEV;
+    if (!enable[dev]) {
+        dev++;
+        return -ENOENT;
+    }
+
+    card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+    if (card == NULL)
+        return -ENOMEM;
+
+    if ((err = snd_emu10k1x_create(card, pci, &chip)) < 0) {
+        snd_card_free(card);
+        return err;
+    }
+
+    if ((err = snd_emu10k1x_pcm(chip, 0, NULL)) < 0) {
+        snd_card_free(card);
+        return err;
+    }
+    if ((err = snd_emu10k1x_pcm(chip, 1, NULL)) < 0) {
+        snd_card_free(card);
+        return err;
+    }
+    if ((err = snd_emu10k1x_pcm(chip, 2, NULL)) < 0) {
+        snd_card_free(card);
+        return err;
+    }
+
+    if ((err = snd_emu10k1x_ac97(chip)) < 0) {
+        snd_card_free(card);
+        return err;
+    }
+
+    if ((err = snd_emu10k1x_mixer(chip)) < 0) {
+        snd_card_free(card);
+        return err;
+    }
+
+    if ((err = snd_emu10k1x_midi(chip)) < 0) {
+        snd_card_free(card);
+        return err;
+    }
+
+    snd_emu10k1x_proc_init(chip);
+
+    strcpy(card->driver, "EMU10K1X");
+    strcpy(card->shortname, "Dell Sound Blaster Live!");
+    sprintf(card->longname, "%s at 0x%lx irq %i",
+            card->shortname, chip->port, chip->irq);
+
+    if ((err = snd_card_register(card)) < 0) {
+        snd_card_free(card);
+        return err;
+    }
+
+    pci_set_drvdata(pci, card);
+    dev++;
+    return 0;
 }
 
 static void __devexit snd_emu10k1x_remove(struct pci_dev *pci)
 {
-        snd_card_free(pci_get_drvdata(pci));
-        pci_set_drvdata(pci, NULL);
+    snd_card_free(pci_get_drvdata(pci));
+    pci_set_drvdata(pci, NULL);
 }
 
 // PCI IDs
 static struct pci_device_id snd_emu10k1x_ids[] = {
-        { 0x1102, 0x0006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },    /* Dell OEM version (EMU10K1) */
-        { 0, }
+    { 0x1102, 0x0006, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },        /* Dell OEM version (EMU10K1) */
+    { 0, }
 };
 MODULE_DEVICE_TABLE(pci, snd_emu10k1x_ids);
@@ -1599 +1613 @@
 // pci_driver definition
 static struct pci_driver driver = {
-        .name = "EMU10K1X",
-        .id_table = snd_emu10k1x_ids,
-        .probe = snd_emu10k1x_probe,
-        .remove = snd_emu10k1x_remove,
+    .name = "EMU10K1X",
+    .id_table = snd_emu10k1x_ids,
+    .probe = snd_emu10k1x_probe,
+    .remove = snd_emu10k1x_remove,
 };
 
@@ -1608 +1622 @@
 static int __init alsa_card_emu10k1x_init(void)
 {
-        int err;
-
-        if ((err = pci_register_driver(&driver)) > 0)
-                return err;
-
-        return 0;
+    int err;
+
+    if ((err = pci_register_driver(&driver)) > 0)
+        return err;
+
+    return 0;
 }
 
@@ -1619 +1633 @@
 static void __exit alsa_card_emu10k1x_exit(void)
 {
-        pci_unregister_driver(&driver);
+    pci_unregister_driver(&driver);
 }
 

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

@@ -3 +3 @@
  *                   Creative Labs, Inc.
  *  Routines for effect processor FX8010
+ *
+ *  Copyright (c) by James Courtier-Dutton <James@superbug.co.uk>
+ *      Added EMU 1010 support.
  *
  *  BUGS:
@@ -29 +32 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
+
 #include <sound/core.h>
+#include <sound/tlv.h>
 #include <sound/emu10k1.h>
-
 
 #if 0           /* for testing purposes - digital out -> capture */
@@ -262 +266 @@
 };
 
+/* dB gain = (float) 20 * log10( float(db_table_value) / 0x8000000 ) */
 static const u32 db_table[101] = {
     0x00000000, 0x01571f82, 0x01674b41, 0x01783a1b, 0x0189f540,
@@ -286 +291 @@
 };
 
+/* EMU10k1/EMU10k2 DSP control db gain */
+static DECLARE_TLV_DB_SCALE(snd_emu10k1_db_scale1, -4000, 40, 1);
+
 static const u32 onoff_table[2] = {
     0x00000000, 0x00000001
@@ -310 +318 @@
  */
 
-static int snd_emu10k1_gpr_ctl_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
-{
-    struct snd_emu10k1_fx8010_ctl *ctl = (struct snd_emu10k1_fx8010_ctl *)kcontrol->private_value;
+static int snd_emu10k1_gpr_ctl_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+    struct snd_emu10k1_fx8010_ctl *ctl =
+        (struct snd_emu10k1_fx8010_ctl *) kcontrol->private_value;
 
     if (ctl->min == 0 && ctl->max == 1)
@@ -324 +333 @@
 }
 
-static int snd_emu10k1_gpr_ctl_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+static int snd_emu10k1_gpr_ctl_get(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;
+    struct snd_emu10k1_fx8010_ctl *ctl =
+        (struct snd_emu10k1_fx8010_ctl *) kcontrol->private_value;
     unsigned long flags;
     unsigned int i;
@@ -338 +348 @@
 }
 
-static int snd_emu10k1_gpr_ctl_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+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;
+    struct snd_emu10k1_fx8010_ctl *ctl =
+        (struct snd_emu10k1_fx8010_ctl *) kcontrol->private_value;
     unsigned long flags;
     unsigned int nval, val;
@@ -365 +376 @@
             break;
         case EMU10K1_GPR_TRANSLATION_BASS:
-            snd_runtime_check((ctl->count % 5) == 0 && (ctl->count / 5) == ctl->vcount, change = -EIO; goto __error);
+            if ((ctl->count % 5) != 0 || (ctl->count / 5) != ctl->vcount) {
+                change = -EIO;
+                goto __error;
+            }
             for (j = 0; j < 5; j++)
                 snd_emu10k1_ptr_write(emu, emu->gpr_base + ctl->gpr[j * ctl->vcount + i], 0, bass_table[val][j]);
             break;
         case EMU10K1_GPR_TRANSLATION_TREBLE:
-            snd_runtime_check((ctl->count % 5) == 0 && (ctl->count / 5) == ctl->vcount, change = -EIO; goto __error);
+            if ((ctl->count % 5) != 0 || (ctl->count / 5) != ctl->vcount) {
+                change = -EIO;
+                goto __error;
+            }
             for (j = 0; j < 5; j++)
                 snd_emu10k1_ptr_write(emu, emu->gpr_base + ctl->gpr[j * ctl->vcount + i], 0, treble_table[val][j]);
@@ -413 +430 @@
     unsigned long flags;
 
-    snd_runtime_check(emu, return -EINVAL);
-    snd_runtime_check(handler, return -EINVAL);
     irq = kmalloc(sizeof(*irq), GFP_ATOMIC);
     if (irq == NULL)
@@ -443 +458 @@
     unsigned long flags;
 
-    snd_runtime_check(irq, return -EINVAL);
     spin_lock_irqsave(&emu->fx8010.irq_lock, flags);
     if ((tmp = emu->fx8010.irq_handlers) == irq) {
@@ -466 +480 @@
  *************************************************************************/
 
-static void snd_emu10k1_write_op(emu10k1_fx8010_code_t *icode, unsigned int *ptr,
-                                u32 op, u32 r, u32 a, u32 x, u32 y)
+static void snd_emu10k1_write_op(struct snd_emu10k1_fx8010_code *icode,
+                                 unsigned int *ptr,
+                                 u32 op, u32 r, u32 a, u32 x, u32 y)
 {
     u_int32_t *code;
     snd_assert(*ptr < 512, return);
-    code = (u_int32_t *)icode->code + (*ptr) * 2;
+    code = (u_int32_t __force *)icode->code + (*ptr) * 2;
     set_bit(*ptr, icode->code_valid);
     code[0] = ((x & 0x3ff) << 10) | (y & 0x3ff);
@@ -481 +496 @@
     snd_emu10k1_write_op(icode, ptr, op, r, a, x, y)
 
-static void snd_emu10k1_audigy_write_op(emu10k1_fx8010_code_t *icode, unsigned int *ptr,
-                                       u32 op, u32 r, u32 a, u32 x, u32 y)
+static void snd_emu10k1_audigy_write_op(struct snd_emu10k1_fx8010_code *icode,
+                                        unsigned int *ptr,
+                                        u32 op, u32 r, u32 a, u32 x, u32 y)
 {
     u_int32_t *code;
     snd_assert(*ptr < 1024, return);
-    code = (u_int32_t *)icode->code + (*ptr) * 2;
+    code = (u_int32_t __force *)icode->code + (*ptr) * 2;
     set_bit(*ptr, icode->code_valid);
     code[0] = ((x & 0x7ff) << 12) | (y & 0x7ff);
@@ -496 +512 @@
     snd_emu10k1_audigy_write_op(icode, ptr, op, r, a, x, y)
 
-void snd_emu10k1_efx_write(struct snd_emu10k1 *emu, unsigned int pc, unsigned int data)
+static void snd_emu10k1_efx_write(struct snd_emu10k1 *emu, unsigned int pc, unsigned int data)
 {
     pc += emu->audigy ? A_MICROCODEBASE : MICROCODEBASE;
@@ -508 +524 @@
 }
 
-static int snd_emu10k1_gpr_poke(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_gpr_poke(struct snd_emu10k1 *emu,
+                                struct snd_emu10k1_fx8010_code *icode)
 {
     int gpr;
@@ -523 +540 @@
 }
 
-static int snd_emu10k1_gpr_peek(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_gpr_peek(struct snd_emu10k1 *emu,
+                                struct snd_emu10k1_fx8010_code *icode)
 {
     int gpr;
@@ -537 +555 @@
 }
 
-static int snd_emu10k1_tram_poke(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_tram_poke(struct snd_emu10k1 *emu,
+                                 struct snd_emu10k1_fx8010_code *icode)
 {
     int tram;
@@ -559 +578 @@
 }
 
-static int snd_emu10k1_tram_peek(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_tram_peek(struct snd_emu10k1 *emu,
+                                 struct snd_emu10k1_fx8010_code *icode)
 {
     int tram;
@@ -581 +601 @@
 }
 
-static int snd_emu10k1_code_poke(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_code_poke(struct snd_emu10k1 *emu,
+                                 struct snd_emu10k1_fx8010_code *icode)
 {
     u32 pc, lo, hi;
@@ -597 +618 @@
 }
 
-static int snd_emu10k1_code_peek(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_code_peek(struct snd_emu10k1 *emu,
+                                 struct snd_emu10k1_fx8010_code *icode)
 {
     u32 pc;
@@ -612 +634 @@
 }
 
-static struct snd_emu10k1_fx8010_ctl *snd_emu10k1_look_for_ctl(struct snd_emu10k1 *emu, snd_ctl_elem_id_t *id)
+static struct snd_emu10k1_fx8010_ctl *
+snd_emu10k1_look_for_ctl(struct snd_emu10k1 *emu, struct snd_ctl_elem_id *id)
 {
     struct snd_emu10k1_fx8010_ctl *ctl;
-    snd_kcontrol_t *kcontrol;
+    struct snd_kcontrol *kcontrol;
     struct list_head *list;
 
@@ -629 +652 @@
 }
 
-static int snd_emu10k1_verify_controls(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_verify_controls(struct snd_emu10k1 *emu,
+                                       struct snd_emu10k1_fx8010_code *icode)
 {
     unsigned int i;
-    snd_ctl_elem_id_t *_id, id;
-    emu10k1_fx8010_control_gpr_t *_gctl;
-    emu10k1_fx8010_control_gpr_t *gctl;
+    struct snd_ctl_elem_id __user *_id;
+    struct snd_ctl_elem_id id;
+    struct snd_emu10k1_fx8010_control_gpr __user *_gctl;
+    struct snd_emu10k1_fx8010_control_gpr *gctl;
     int err;
 
@@ -682 +707 @@
 }
 
-static void snd_emu10k1_ctl_private_free(snd_kcontrol_t *kctl)
+static void snd_emu10k1_ctl_private_free(struct snd_kcontrol *kctl)
 {
     struct snd_emu10k1_fx8010_ctl *ctl;
@@ -692 +717 @@
 }
 
-static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_add_controls(struct snd_emu10k1 *emu,
+                                    struct snd_emu10k1_fx8010_code *icode)
 {
     unsigned int i, j;
-    emu10k1_fx8010_control_gpr_t *_gctl;
-    emu10k1_fx8010_control_gpr_t *gctl;
+    struct snd_emu10k1_fx8010_control_gpr __user *_gctl;
+    struct snd_emu10k1_fx8010_control_gpr *gctl;
     struct snd_emu10k1_fx8010_ctl *ctl, *nctl;
-    snd_kcontrol_new_t knew;
-    snd_kcontrol_t *kctl;
-    snd_ctl_elem_value_t *val;
+    struct snd_kcontrol_new knew;
+    struct snd_kcontrol *kctl;
+    struct snd_ctl_elem_value *val;
     int err = 0;
 
-    val = (snd_ctl_elem_value_t *)kmalloc(sizeof(*val), GFP_KERNEL);
+    val = kmalloc(sizeof(*val), GFP_KERNEL);
     gctl = kmalloc(sizeof(*gctl), GFP_KERNEL);
     nctl = kmalloc(sizeof(*nctl), GFP_KERNEL);
@@ -717 +743 @@
             goto __error;
         }
-        snd_runtime_check(gctl->id.iface == SNDRV_CTL_ELEM_IFACE_MIXER ||
-                          gctl->id.iface == SNDRV_CTL_ELEM_IFACE_PCM, err = -EINVAL; goto __error);
-        snd_runtime_check(gctl->id.name[0] != '\0', err = -EINVAL; goto __error);
+        if (gctl->id.iface != SNDRV_CTL_ELEM_IFACE_MIXER &&
+            gctl->id.iface != SNDRV_CTL_ELEM_IFACE_PCM) {
+            err = -EINVAL;
+            goto __error;
+        }
+        if (! gctl->id.name[0]) {
+            err = -EINVAL;
+            goto __error;
+        }
         ctl = snd_emu10k1_look_for_ctl(emu, &gctl->id);
         memset(&knew, 0, sizeof(knew));
@@ -728 +760 @@
         knew.subdevice = gctl->id.subdevice;
         knew.info = snd_emu10k1_gpr_ctl_info;
+        if (gctl->tlv.p) {
+            knew.tlv.p = gctl->tlv.p;
+            knew.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |
+                SNDRV_CTL_ELEM_ACCESS_TLV_READ;
+        }
         knew.get = snd_emu10k1_gpr_ctl_get;
         knew.put = snd_emu10k1_gpr_ctl_put;
@@ -742 +779 @@
         nctl->translation = gctl->translation;
         if (ctl == NULL) {
-            ctl = (struct snd_emu10k1_fx8010_ctl *)kmalloc(sizeof(*ctl), GFP_KERNEL);
+            ctl = kmalloc(sizeof(*ctl), GFP_KERNEL);
             if (ctl == NULL) {
                 err = -ENOMEM;
@@ -773 +810 @@
 }
 
-static int snd_emu10k1_del_controls(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_del_controls(struct snd_emu10k1 *emu,
+                                    struct snd_emu10k1_fx8010_code *icode)
 {
     unsigned int i;
-    snd_ctl_elem_id_t *_id, id;
+    struct snd_ctl_elem_id id;
+    struct snd_ctl_elem_id __user *_id;
     struct snd_emu10k1_fx8010_ctl *ctl;
-    snd_card_t *card = emu->card;
+    struct snd_card *card = emu->card;
 
     for (i = 0, _id = icode->gpr_del_controls;
          i < icode->gpr_del_control_count; i++, _id++) {
-        snd_runtime_check(copy_from_user(&id, _id, sizeof(id)) == 0, return -EFAULT);
+        if (copy_from_user(&id, _id, sizeof(id)))
+            return -EFAULT;
         down_write(&card->controls_rwsem);
         ctl = snd_emu10k1_look_for_ctl(emu, &id);
@@ -792 +832 @@
 }
 
-static int snd_emu10k1_list_controls(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_list_controls(struct snd_emu10k1 *emu,
+                                     struct snd_emu10k1_fx8010_code *icode)
 {
     unsigned int i = 0, j;
     unsigned int total = 0;
-    emu10k1_fx8010_control_gpr_t *gctl;
-    emu10k1_fx8010_control_gpr_t *_gctl;
+    struct snd_emu10k1_fx8010_control_gpr *gctl;
+    struct snd_emu10k1_fx8010_control_gpr __user *_gctl;
     struct snd_emu10k1_fx8010_ctl *ctl;
-    snd_ctl_elem_id_t *id;
+    struct snd_ctl_elem_id *id;
     struct list_head *list;
 
@@ -840 +881 @@
 }
 
-static int snd_emu10k1_icode_poke(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_icode_poke(struct snd_emu10k1 *emu,
+                                  struct snd_emu10k1_fx8010_code *icode)
 {
     int err = 0;
@@ -871 +913 @@
 }
 
-static int snd_emu10k1_icode_peek(struct snd_emu10k1 *emu, emu10k1_fx8010_code_t *icode)
+static int snd_emu10k1_icode_peek(struct snd_emu10k1 *emu,
+                                  struct snd_emu10k1_fx8010_code *icode)
 {
     int err;
@@ -889 +932 @@
 }
 
-static int snd_emu10k1_ipcm_poke(struct snd_emu10k1 *emu, emu10k1_fx8010_pcm_t *ipcm)
+static int snd_emu10k1_ipcm_poke(struct snd_emu10k1 *emu,
+                                 struct snd_emu10k1_fx8010_pcm_rec *ipcm)
 {
     unsigned int i;
@@ -934 +978 @@
 }
 
-static int snd_emu10k1_ipcm_peek(struct snd_emu10k1 *emu, emu10k1_fx8010_pcm_t *ipcm)
+static int snd_emu10k1_ipcm_peek(struct snd_emu10k1 *emu,
+                                 struct snd_emu10k1_fx8010_pcm_rec *ipcm)
 {
     unsigned int i;
@@ -968 +1013 @@
 #define SND_EMU10K1_CAPTURE_CHANNELS    4
 
-static void __devinit snd_emu10k1_init_mono_control(emu10k1_fx8010_control_gpr_t *ctl, const char *name, int gpr, int defval)
+static void __devinit
+snd_emu10k1_init_mono_control(struct snd_emu10k1_fx8010_control_gpr *ctl,
+                              const char *name, int gpr, int defval)
 {
     ctl->id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
@@ -976 +1023 @@
     ctl->min = 0;
     ctl->max = 100;
+    ctl->tlv.p = snd_emu10k1_db_scale1;
     ctl->translation = EMU10K1_GPR_TRANSLATION_TABLE100;
 }
 
-static void __devinit snd_emu10k1_init_stereo_control(emu10k1_fx8010_control_gpr_t *ctl, const char *name, int gpr, int defval)
+static void __devinit
+snd_emu10k1_init_stereo_control(struct snd_emu10k1_fx8010_control_gpr *ctl,
+                                const char *name, int gpr, int defval)
 {
     ctl->id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
@@ -988 +1038 @@
     ctl->min = 0;
     ctl->max = 100;
+    ctl->tlv.p = snd_emu10k1_db_scale1;
     ctl->translation = EMU10K1_GPR_TRANSLATION_TABLE100;
 }
 
-static void __devinit snd_emu10k1_init_mono_onoff_control(emu10k1_fx8010_control_gpr_t *ctl, const char *name, int gpr, int defval)
+static void __devinit
+snd_emu10k1_init_mono_onoff_control(struct snd_emu10k1_fx8010_control_gpr *ctl,
+                                    const char *name, int gpr, int defval)
 {
     ctl->id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
@@ -1002 +1055 @@
 }
 
-static void __devinit snd_emu10k1_init_stereo_onoff_control(emu10k1_fx8010_control_gpr_t *ctl, const char *name, int gpr, int defval)
+static void __devinit
+snd_emu10k1_init_stereo_onoff_control(struct snd_emu10k1_fx8010_control_gpr *ctl,
+                                      const char *name, int gpr, int defval)
 {
     ctl->id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
@@ -1014 +1069 @@
 }
 
+static int 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;
+}
 
 /*
@@ -1022 +1092 @@
 {
     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 */
@@ -1027 +1098 @@
     const int tmp = 0x88;
     u32 ptr;
-    emu10k1_fx8010_code_t *icode = NULL;
-    emu10k1_fx8010_control_gpr_t *controls = NULL, *ctl;
+    struct snd_emu10k1_fx8010_code *icode = NULL;
+    struct snd_emu10k1_fx8010_control_gpr *controls = NULL, *ctl;
     u32 *gpr_map;
     mm_segment_t seg;
 
-    spin_lock_init(&emu->fx8010.irq_lock);
-    INIT_LIST_HEAD(&emu->fx8010.gpr_ctl);
-
-    if ((icode = (emu10k1_fx8010_code_t *)kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL ||
-        (icode->gpr_map = (u_int32_t __user *)kcalloc(512 + 256 + 256 + 2 * 1024, sizeof(u_int32_t), GFP_KERNEL)) == NULL ||
-        (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS, sizeof(*controls), GFP_KERNEL)) == NULL) {
+    if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL ||
+        (icode->gpr_map = (u_int32_t __user *)
+         kcalloc(512 + 256 + 256 + 2 * 1024, sizeof(u_int32_t),
+                 GFP_KERNEL)) == NULL ||
+        (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS,
+                            sizeof(*controls), GFP_KERNEL)) == NULL) {
         err = -ENOMEM;
         goto __err;
     }
-    gpr_map = (u32 *)icode->gpr_map;
+    gpr_map = (u32 __force *)icode->gpr_map;
 
     icode->tram_data_map = icode->gpr_map + 512;
@@ -1059 +1130 @@
     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);
 
+#if 1
     /* PCM front Playback Volume (independent from stereo mix) */
     A_OP(icode, &ptr, iMAC0, A_GPR(playback), A_C_00000000, A_GPR(gpr), A_FXBUS(FXBUS_PCM_LEFT_FRONT));
@@ -1102 +1178 @@
     gpr += 2;
 
-    /* Music Playback */
+    /* 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));
-    snd_emu10k1_init_stereo_control(&controls[nctl++], "Music Playback Volume", gpr, 100);
+    snd_emu10k1_init_stereo_control(&controls[nctl++], "Synth Playback Volume", gpr, 100);
     gpr += 2;
 
@@ -1114 +1190 @@
     gpr += 2;
 
-    /* Music Capture */
+    /* 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));
-    snd_emu10k1_init_stereo_control(&controls[nctl++], "Music Capture Volume", gpr, 0);
+    snd_emu10k1_init_stereo_control(&controls[nctl++], "Synth Capture Volume", gpr, 0);
     gpr += 2;
 
@@ -1126 +1202 @@
     A_OP(icode, &ptr, iMAC0, A_GPR(var), A_GPR(var), A_GPR(vol), A_EXTIN(input))
 
-    /* AC'97 Playback Volume - used only for mic */
+    /* emu1212 DSP 0 and DSP 1 Capture */
+    if (emu->card_capabilities->emu1010) {
+        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));
+        snd_emu10k1_init_stereo_control(&controls[nctl++], "EMU Capture 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);
@@ -1158 +1241 @@
     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++], "IEC958 Optical Playback Volume", gpr, 0);
+    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++], "IEC958 Optical Capture Volume", gpr, 0);
+    snd_emu10k1_init_stereo_control(&controls[nctl++], SNDRV_CTL_NAME_IEC958("Optical ",CAPTURE,VOLUME), gpr, 0);
     gpr += 2;
 
@@ -1265 +1348 @@
     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];
@@ -1350 +1433 @@
     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));
-    snd_emu10k1_init_stereo_control(&controls[nctl++], "Wave Master Playback Volume", gpr, 0);
-    //snd_emu10k1_init_mono_control(&controls[nctl++], "Wave Master Playback Volume", gpr, 0);
+    snd_emu10k1_init_mono_control(&controls[nctl++], "Wave Master Playback Volume", gpr, 0);
     gpr += 2;
 
@@ -1359 +1441 @@
     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);
@@ -1368 +1449 @@
     /* digital outputs */
     /* A_PUT_STEREO_OUTPUT(A_EXTOUT_FRONT_L, A_EXTOUT_FRONT_R, playback + SND_EMU10K1_PLAYBACK_CHANNELS); */
+    if (emu->card_capabilities->emu1010) {
+        /* EMU1010 Outputs from PCM Front, Rear, Center, LFE, Side */
+        snd_printk("EMU outputs on\n");
+        for (z = 0; z < 8; z++) {
+            A_OP(icode, &ptr, iACC3, A_EMU32OUTL(z), A_GPR(playback + SND_EMU10K1_PLAYBACK_CHANNELS + z), A_C_00000000, A_C_00000000);
+        }
+    }
 
     /* IEC958 Optical Raw Playback Switch */
@@ -1390 +1478 @@
         }
     }
-    snd_emu10k1_init_stereo_onoff_control(controls + nctl++, "IEC958 Optical Raw Playback Switch", gpr, 0);
+    snd_emu10k1_init_stereo_onoff_control(controls + nctl++, SNDRV_CTL_NAME_IEC958("Optical Raw ",PLAYBACK,SWITCH), gpr, 0);
     gpr += 2;
 
@@ -1398 +1486 @@
 
     /* 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);
+#else
     A_PUT_OUTPUT(A_EXTOUT_ADC_CAP_L, capture);
     A_PUT_OUTPUT(A_EXTOUT_ADC_CAP_R, capture+1);
-
-    /* EFX capture - capture the 16 EXTINs */
-    for (z = 0; z < 16; z++) {
-        A_OP(icode, &ptr, iACC3, A_FXBUS2(z), A_C_00000000, A_C_00000000, A_EXTIN(z));
-    }
-
+#endif
+
+    if (emu->card_capabilities->emu1010) {
+        snd_printk("EMU inputs on\n");
+        /* Capture 8 channels of S32_LE sound */
+
+        /* printk("emufx.c: gpr=0x%x, tmp=0x%x\n",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;
+        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);
+
+#if 0
+        for (z = 4; z < 8; z++) {
+            A_OP(icode, &ptr, iACC3, A_FXBUS2(z), A_C_00000000, A_C_00000000, A_C_00000000);
+        }
+        for (z = 0xc; z < 0x10; z++) {
+            A_OP(icode, &ptr, iACC3, A_FXBUS2(z), A_C_00000000, A_C_00000000, A_C_00000000);
+        }
+#endif
+    } else {
+
+        /* EFX capture - capture the 16 EXTINs */
+        /* Capture 16 channels of S16_LE sound */
+        for (z = 0; z < 16; z++) {
+            A_OP(icode, &ptr, iACC3, A_FXBUS2(z), A_C_00000000, A_C_00000000, A_EXTIN(z));
+        }
+    }
+
+#endif /* JCD test */
     /*
      * ok, set up done..
@@ -1421 +1563 @@
     seg = snd_enter_user();
     icode->gpr_add_control_count = nctl;
-    icode->gpr_add_controls = (emu10k1_fx8010_control_gpr_t __user *)controls;
+    icode->gpr_add_controls = (struct snd_emu10k1_fx8010_control_gpr __user *)controls;
     err = snd_emu10k1_icode_poke(emu, icode);
     snd_leave_user(seg);
@@ -1428 +1570 @@
     kfree(controls);
     if (icode != NULL) {
-        kfree((void *)icode->gpr_map);
+        kfree((void __force *)icode->gpr_map);
         kfree(icode);
     }
@@ -1441 +1583 @@
 /* when volume = max, then copy only to avoid volume modification */
 /* with iMAC0 (negative values) */
-static void __devinit _volume(emu10k1_fx8010_code_t *icode, u32 *ptr, u32 dst, u32 src, u32 vol)
+static void __devinit _volume(struct snd_emu10k1_fx8010_code *icode, u32 *ptr, u32 dst, u32 src, u32 vol)
 {
     OP(icode, ptr, iMAC0, dst, C_00000000, src, vol);
@@ -1448 +1590 @@
     OP(icode, ptr, iACC3, dst, src, C_00000000, C_00000000);
 }
-static void __devinit _volume_add(emu10k1_fx8010_code_t *icode, u32 *ptr, u32 dst, u32 src, u32 vol)
+static void __devinit _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);
@@ -1456 +1598 @@
     OP(icode, ptr, iMAC0, dst, dst, src, vol);
 }
-static void __devinit _volume_out(emu10k1_fx8010_code_t *icode, u32 *ptr, u32 dst, u32 src, u32 vol)
+static void __devinit _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);
@@ -1491 +1633 @@
     int err, i, z, gpr, tmp, playback, capture;
     u32 ptr;
-    emu10k1_fx8010_code_t *icode;
-    emu10k1_fx8010_pcm_t *ipcm = NULL;
-    emu10k1_fx8010_control_gpr_t *controls = NULL, *ctl;
+    struct snd_emu10k1_fx8010_code *icode;
+    struct snd_emu10k1_fx8010_pcm_rec *ipcm = NULL;
+    struct snd_emu10k1_fx8010_control_gpr *controls = NULL, *ctl;
     u32 *gpr_map;
     mm_segment_t seg;
 
-    spin_lock_init(&emu->fx8010.irq_lock);
-    INIT_LIST_HEAD(&emu->fx8010.gpr_ctl);
-
-    if ((icode = (emu10k1_fx8010_code_t *)kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL)
+    if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL)
         return -ENOMEM;
-    if ((icode->gpr_map = (u_int32_t __user *)kcalloc(256 + 160 + 160 + 2 * 512, sizeof(u_int32_t), GFP_KERNEL)) == NULL ||
-        (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS, sizeof(emu10k1_fx8010_control_gpr_t), GFP_KERNEL)) == NULL ||
-        (ipcm = (emu10k1_fx8010_pcm_t *)kzalloc(sizeof(*ipcm), GFP_KERNEL)) == NULL) {
+    if ((icode->gpr_map = (u_int32_t __user *)
+         kcalloc(256 + 160 + 160 + 2 * 512, sizeof(u_int32_t),
+                 GFP_KERNEL)) == NULL ||
+        (controls = kcalloc(SND_EMU10K1_GPR_CONTROLS,
+                            sizeof(struct snd_emu10k1_fx8010_control_gpr),
+                            GFP_KERNEL)) == NULL ||
+        (ipcm = kzalloc(sizeof(*ipcm), GFP_KERNEL)) == NULL) {
         err = -ENOMEM;
         goto __err;
     }
-    gpr_map = (u32 *)icode->gpr_map;
+    gpr_map = (u32 __force *)icode->gpr_map;
 
     icode->tram_data_map = icode->gpr_map + 256;
@@ -1565 +1708 @@
     ipcm->etram[1] = 1;
 
-        gpr_map[gpr + 0] = 0xfffff000;
-        gpr_map[gpr + 1] = 0xffff0000;
-        gpr_map[gpr + 2] = 0x70000000;
-        gpr_map[gpr + 3] = 0x00000007;
-        gpr_map[gpr + 4] = 0x001f << 11;
-        gpr_map[gpr + 5] = 0x001c << 11;
-        gpr_map[gpr + 6] = (0x22  - 0x01) - 1;  /* skip at 01 to 22 */
-        gpr_map[gpr + 7] = (0x22  - 0x06) - 1;  /* skip at 06 to 22 */
-        gpr_map[gpr + 8] = 0x2000000 + (2<<11);
-        gpr_map[gpr + 9] = 0x4000000 + (2<<11);
-        gpr_map[gpr + 10] = 1<<11;
-        gpr_map[gpr + 11] = (0x24 - 0x0a) - 1;  /* skip at 0a to 24 */
-        gpr_map[gpr + 12] = 0;
+    gpr_map[gpr + 0] = 0xfffff000;
+    gpr_map[gpr + 1] = 0xffff0000;
+    gpr_map[gpr + 2] = 0x70000000;
+    gpr_map[gpr + 3] = 0x00000007;
+    gpr_map[gpr + 4] = 0x001f << 11;
+    gpr_map[gpr + 5] = 0x001c << 11;
+    gpr_map[gpr + 6] = (0x22  - 0x01) - 1;      /* skip at 01 to 22 */
+    gpr_map[gpr + 7] = (0x22  - 0x06) - 1;      /* skip at 06 to 22 */
+    gpr_map[gpr + 8] = 0x2000000 + (2<<11);
+    gpr_map[gpr + 9] = 0x4000000 + (2<<11);
+    gpr_map[gpr + 10] = 1<<11;
+    gpr_map[gpr + 11] = (0x24 - 0x0a) - 1;      /* skip at 0a to 24 */
+    gpr_map[gpr + 12] = 0;
 
     /* if the trigger flag is not set, skip */
@@ -1658 +1801 @@
     gpr += 4;
 
-    /* Music Playback Volume */
+    /* Synth Playback Volume */
     for (z = 0; z < 2; z++)
         VOLUME_ADD(icode, &ptr, playback + z, 2 + z, gpr + z);
-    snd_emu10k1_init_stereo_control(controls + i++, "Music Playback Volume", gpr, 100);
-    gpr += 2;
-
-    /* Music Capture Volume + Switch */
+    snd_emu10k1_init_stereo_control(controls + i++, "Synth Playback Volume", gpr, 100);
+    gpr += 2;
+
+    /* Synth Capture Volume + Switch */
     for (z = 0; z < 2; z++) {
         SWITCH(icode, &ptr, tmp + 0, 2 + z, gpr + 2 + z);
         VOLUME_ADD(icode, &ptr, capture + z, tmp + 0, gpr + z);
     }
-    snd_emu10k1_init_stereo_control(controls + i++, "Music Capture Volume", gpr, 0);
-    snd_emu10k1_init_stereo_onoff_control(controls + i++, "Music Capture Switch", gpr + 2, 0);
+    snd_emu10k1_init_stereo_control(controls + i++, "Synth Capture Volume", gpr, 0);
+    snd_emu10k1_init_stereo_onoff_control(controls + i++, "Synth Capture Switch", gpr + 2, 0);
     gpr += 4;
 
@@ -1730 +1873 @@
         for (z = 0; z < 2; z++)
             VOLUME_ADDIN(icode, &ptr, playback + z, EXTIN_SPDIF_CD_L + z, gpr + z);
-        snd_emu10k1_init_stereo_control(controls + i++, "IEC958 TTL Playback Volume", gpr, 0);
+        snd_emu10k1_init_stereo_control(controls + i++, SNDRV_CTL_NAME_IEC958("TTL ",PLAYBACK,VOLUME), gpr, 0);
         gpr += 2;
 
@@ -1738 +1881 @@
             VOLUME_ADD(icode, &ptr, capture + z, tmp + 0, gpr + z);
         }
-        snd_emu10k1_init_stereo_control(controls + i++, "IEC958 TTL Capture Volume", gpr, 0);
-        snd_emu10k1_init_stereo_onoff_control(controls + i++, "IEC958 TTL Capture Switch", gpr + 2, 0);
+        snd_emu10k1_init_stereo_control(controls + i++, SNDRV_CTL_NAME_IEC958("TTL ",CAPTURE,VOLUME), gpr, 0);
+        snd_emu10k1_init_stereo_onoff_control(controls + i++, SNDRV_CTL_NAME_IEC958("TTL ",CAPTURE,SWITCH), gpr + 2, 0);
         gpr += 4;
     }
@@ -1764 +1907 @@
         for (z = 0; z < 2; z++)
             VOLUME_ADDIN(icode, &ptr, playback + z, EXTIN_TOSLINK_L + z, gpr + z);
-        snd_emu10k1_init_stereo_control(controls + i++, "IEC958 LiveDrive Playback Volume", gpr, 0);
+        snd_emu10k1_init_stereo_control(controls + i++, SNDRV_CTL_NAME_IEC958("LiveDrive ",PLAYBACK,VOLUME), gpr, 0);
         gpr += 2;
 
@@ -1772 +1915 @@
             VOLUME_ADD(icode, &ptr, capture + z, tmp + 0, gpr + z);
         }
-        snd_emu10k1_init_stereo_control(controls + i++, "IEC958 LiveDrive Capture Volume", gpr, 0);
-        snd_emu10k1_init_stereo_onoff_control(controls + i++, "IEC958 LiveDrive Capture Switch", gpr + 2, 0);
+        snd_emu10k1_init_stereo_control(controls + i++, SNDRV_CTL_NAME_IEC958("LiveDrive ",CAPTURE,VOLUME), gpr, 0);
+        snd_emu10k1_init_stereo_onoff_control(controls + i++, SNDRV_CTL_NAME_IEC958("LiveDrive ",CAPTURE,SWITCH), gpr + 2, 0);
         gpr += 4;
     }
@@ -1798 +1941 @@
         for (z = 0; z < 2; z++)
             VOLUME_ADDIN(icode, &ptr, playback + z, EXTIN_COAX_SPDIF_L + z, gpr + z);
-        snd_emu10k1_init_stereo_control(controls + i++, "IEC958 Coaxial Playback Volume", gpr, 0);
+        snd_emu10k1_init_stereo_control(controls + i++, SNDRV_CTL_NAME_IEC958("Coaxial ",PLAYBACK,VOLUME), gpr, 0);
         gpr += 2;
 
@@ -1806 +1949 @@
             VOLUME_ADD(icode, &ptr, capture + z, tmp + 0, gpr + z);
         }
-        snd_emu10k1_init_stereo_control(controls + i++, "IEC958 Coaxial Capture Volume", gpr, 0);
-        snd_emu10k1_init_stereo_onoff_control(controls + i++, "IEC958 Coaxial Capture Switch", gpr + 2, 0);
+        snd_emu10k1_init_stereo_control(controls + i++, SNDRV_CTL_NAME_IEC958("Coaxial ",CAPTURE,VOLUME), gpr, 0);
+        snd_emu10k1_init_stereo_onoff_control(controls + i++, SNDRV_CTL_NAME_IEC958("Coaxial ",CAPTURE,SWITCH), gpr + 2, 0);
         gpr += 4;
     }
@@ -1934 +2077 @@
         }
 
-        snd_emu10k1_init_stereo_onoff_control(controls + i++, "IEC958 Optical Raw Playback Switch", gpr, 0);
+        snd_emu10k1_init_stereo_onoff_control(controls + i++, SNDRV_CTL_NAME_IEC958("Optical Raw ",PLAYBACK,SWITCH), gpr, 0);
         gpr += 2;
     }
@@ -2035 +2178 @@
     seg = snd_enter_user();
     icode->gpr_add_control_count = i;
-    icode->gpr_add_controls = (emu10k1_fx8010_control_gpr_t __user *)controls;
+    icode->gpr_add_controls = (struct snd_emu10k1_fx8010_control_gpr __user *)controls;
     err = snd_emu10k1_icode_poke(emu, icode);
     snd_leave_user(seg);
@@ -2044 +2187 @@
     kfree(controls);
     if (icode != NULL) {
-        kfree((void *)icode->gpr_map);
+        kfree((void __force *)icode->gpr_map);
         kfree(icode);
     }
@@ -2052 +2195 @@
 int __devinit snd_emu10k1_init_efx(struct snd_emu10k1 *emu)
 {
+    spin_lock_init(&emu->fx8010.irq_lock);
+    INIT_LIST_HEAD(&emu->fx8010.gpr_ctl);
     if (emu->audigy)
         return _snd_emu10k1_audigy_init_efx(emu);
@@ -2067 +2212 @@
 }
 
-#if 0 // FIXME: who use them?
+#if 0 /* FIXME: who use them? */
 int snd_emu10k1_fx8010_tone_control_activate(struct snd_emu10k1 *emu, int output)
 {
-    snd_runtime_check(output >= 0 && output < 6, return -EINVAL);
+    if (output < 0 || output >= 6)
+        return -EINVAL;
     snd_emu10k1_ptr_write(emu, emu->gpr_base + 0x94 + output, 0, 1);
     return 0;
@@ -2077 +2223 @@
 int snd_emu10k1_fx8010_tone_control_deactivate(struct snd_emu10k1 *emu, int output)
 {
-    snd_runtime_check(output >= 0 && output < 6, return -EINVAL);
+    if (output < 0 || output >= 6)
+        return -EINVAL;
     snd_emu10k1_ptr_write(emu, emu->gpr_base + 0x94 + output, 0, 0);
     return 0;
@@ -2097 +2244 @@
         size = 0x2000 << size_reg;
     }
-    if (emu->fx8010.etram_pages.bytes == size)
+    if ((emu->fx8010.etram_pages.bytes / 2) == size)
         return 0;
     spin_lock_irq(&emu->emu_lock);
@@ -2125 +2272 @@
 }
 
-static int snd_emu10k1_fx8010_open(snd_hwdep_t * hw, struct file *file)
+static int snd_emu10k1_fx8010_open(struct snd_hwdep * hw, struct file *file)
 {
     return 0;
@@ -2138 +2285 @@
 }
 
-static int snd_emu10k1_fx8010_info(struct snd_emu10k1 *emu, emu10k1_fx8010_info_t *info)
+static int snd_emu10k1_fx8010_info(struct snd_emu10k1 *emu,
+                                   struct snd_emu10k1_fx8010_info *info)
 {
     char **fxbus, **extin, **extout;
@@ -2164 +2312 @@
 }
 
-static int snd_emu10k1_fx8010_ioctl(snd_hwdep_t * hw, struct file *file, unsigned int cmd, unsigned long arg)
+static int snd_emu10k1_fx8010_ioctl(struct snd_hwdep * hw, struct file *file, unsigned int cmd, unsigned long arg)
 {
     struct snd_emu10k1 *emu = hw->private_data;
-    emu10k1_fx8010_info_t *info;
-    emu10k1_fx8010_code_t *icode;
-    emu10k1_fx8010_pcm_t *ipcm;
+    struct snd_emu10k1_fx8010_info *info;
+    struct snd_emu10k1_fx8010_code *icode;
+    struct snd_emu10k1_fx8010_pcm_rec *ipcm;
     unsigned int addr;
+    void __user *argp = (void __user *)arg;
     int res;
 
     switch (cmd) {
     case SNDRV_EMU10K1_IOCTL_INFO:
-        info = (emu10k1_fx8010_info_t *)kmalloc(sizeof(*info), GFP_KERNEL);
+        info = kmalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
             return -ENOMEM;
@@ -2182 +2331 @@
             return res;
         }
-        if (copy_to_user((void *)arg, info, sizeof(*info))) {
+        if (copy_to_user(argp, info, sizeof(*info))) {
             kfree(info);
             return -EFAULT;
@@ -2191 +2340 @@
         if (!capable(CAP_SYS_ADMIN))
             return -EPERM;
-        icode = (emu10k1_fx8010_code_t *)kmalloc(sizeof(*icode), GFP_KERNEL);
+        icode = kmalloc(sizeof(*icode), GFP_KERNEL);
         if (icode == NULL)
             return -ENOMEM;
-        if (copy_from_user(icode, (void *)arg, sizeof(*icode))) {
+        if (copy_from_user(icode, argp, sizeof(*icode))) {
             kfree(icode);
             return -EFAULT;
@@ -2202 +2351 @@
         return res;
     case SNDRV_EMU10K1_IOCTL_CODE_PEEK:
-        icode = (emu10k1_fx8010_code_t *)kmalloc(sizeof(*icode), GFP_KERNEL);
+        icode = kmalloc(sizeof(*icode), GFP_KERNEL);
         if (icode == NULL)
             return -ENOMEM;
-        if (copy_from_user(icode, (void *)arg, sizeof(*icode))) {
+        if (copy_from_user(icode, argp, sizeof(*icode))) {
             kfree(icode);
             return -EFAULT;
         }
         res = snd_emu10k1_icode_peek(emu, icode);
-        if (res == 0 && copy_to_user((void *)arg, icode, sizeof(*icode))) {
+        if (res == 0 && copy_to_user(argp, icode, sizeof(*icode))) {
             kfree(icode);
             return -EFAULT;
@@ -2217 +2366 @@
         return res;
     case SNDRV_EMU10K1_IOCTL_PCM_POKE:
-        ipcm = (emu10k1_fx8010_pcm_t *)kmalloc(sizeof(*ipcm), GFP_KERNEL);
+        ipcm = kmalloc(sizeof(*ipcm), GFP_KERNEL);
         if (ipcm == NULL)
             return -ENOMEM;
-        if (copy_from_user(ipcm, (void *)arg, sizeof(*ipcm))) {
+        if (copy_from_user(ipcm, argp, sizeof(*ipcm))) {
             kfree(ipcm);
             return -EFAULT;
@@ -2228 +2377 @@
         return res;
     case SNDRV_EMU10K1_IOCTL_PCM_PEEK:
-        ipcm = (emu10k1_fx8010_pcm_t *)kzalloc(sizeof(*ipcm), GFP_KERNEL);
+        ipcm = kzalloc(sizeof(*ipcm), GFP_KERNEL);
         if (ipcm == NULL)
             return -ENOMEM;
-        if (copy_from_user(ipcm, (void *)arg, sizeof(*ipcm))) {
+        if (copy_from_user(ipcm, argp, sizeof(*ipcm))) {
             kfree(ipcm);
             return -EFAULT;
         }
         res = snd_emu10k1_ipcm_peek(emu, ipcm);
-        if (res == 0 && copy_to_user((void *)arg, ipcm, sizeof(*ipcm))) {
+        if (res == 0 && copy_to_user(argp, ipcm, sizeof(*ipcm))) {
             kfree(ipcm);
             return -EFAULT;
@@ -2245 +2394 @@
         if (!capable(CAP_SYS_ADMIN))
             return -EPERM;
-        if (get_user(addr, (unsigned int *)arg))
+        if (get_user(addr, (unsigned int __user *)argp))
             return -EFAULT;
         down(&emu->fx8010.lock);
@@ -2283 +2432 @@
         if (!capable(CAP_SYS_ADMIN))
             return -EPERM;
-        if (get_user(addr, (unsigned int *)arg))
+        if (get_user(addr, (unsigned int __user *)argp))
             return -EFAULT;
         if (addr > 0x1ff)
@@ -2302 +2451 @@
         else
             addr = snd_emu10k1_ptr_read(emu, DBG, 0);
-        if (put_user(addr, (unsigned int *)arg))
+        if (put_user(addr, (unsigned int __user *)argp))
             return -EFAULT;
         return 0;
@@ -2309 +2458 @@
 }
 
-static int snd_emu10k1_fx8010_release(snd_hwdep_t * hw, struct file *file)
+static int snd_emu10k1_fx8010_release(struct snd_hwdep * hw, struct file *file)
 {
     return 0;
 }
 
-int __devinit snd_emu10k1_fx8010_new(struct snd_emu10k1 *emu, int device, snd_hwdep_t ** rhwdep)
-{
-    snd_hwdep_t *hw;
+int __devinit snd_emu10k1_fx8010_new(struct snd_emu10k1 *emu, int device, struct snd_hwdep ** rhwdep)
+{
+    struct snd_hwdep *hw;
     int err;
 
@@ -2333 +2482 @@
     return 0;
 }
+
+#ifdef CONFIG_PM
+int __devinit snd_emu10k1_efx_alloc_pm_buffer(struct snd_emu10k1 *emu)
+{
+    int len;
+
+    len = emu->audigy ? 0x200 : 0x100;
+    emu->saved_gpr = kmalloc(len * 4, GFP_KERNEL);
+    if (! emu->saved_gpr)
+        return -ENOMEM;
+    len = emu->audigy ? 0x100 : 0xa0;
+    emu->tram_val_saved = kmalloc(len * 4, GFP_KERNEL);
+    emu->tram_addr_saved = kmalloc(len * 4, GFP_KERNEL);
+    if (! emu->tram_val_saved || ! emu->tram_addr_saved)
+        return -ENOMEM;
+    len = emu->audigy ? 2 * 1024 : 2 * 512;
+    emu->saved_icode = vmalloc(len * 4);
+    if (! emu->saved_icode)
+        return -ENOMEM;
+    return 0;
+}
+
+void snd_emu10k1_efx_free_pm_buffer(struct snd_emu10k1 *emu)
+{
+    kfree(emu->saved_gpr);
+    kfree(emu->tram_val_saved);
+    kfree(emu->tram_addr_saved);
+    vfree(emu->saved_icode);
+}
+
+/*
+ * save/restore GPR, TRAM and codes
+ */
+void snd_emu10k1_efx_suspend(struct snd_emu10k1 *emu)
+{
+    int i, len;
+
+    len = emu->audigy ? 0x200 : 0x100;
+    for (i = 0; i < len; i++)
+        emu->saved_gpr[i] = snd_emu10k1_ptr_read(emu, emu->gpr_base + i, 0);
+
+    len = emu->audigy ? 0x100 : 0xa0;
+    for (i = 0; i < len; i++) {
+        emu->tram_val_saved[i] = snd_emu10k1_ptr_read(emu, TANKMEMDATAREGBASE + i, 0);
+        emu->tram_addr_saved[i] = snd_emu10k1_ptr_read(emu, TANKMEMADDRREGBASE + i, 0);
+        if (emu->audigy) {
+            emu->tram_addr_saved[i] >>= 12;
+            emu->tram_addr_saved[i] |=
+                snd_emu10k1_ptr_read(emu, A_TANKMEMCTLREGBASE + i, 0) << 20;
+        }
+    }
+
+    len = emu->audigy ? 2 * 1024 : 2 * 512;
+    for (i = 0; i < len; i++)
+        emu->saved_icode[i] = snd_emu10k1_efx_read(emu, i);
+}
+
+void snd_emu10k1_efx_resume(struct snd_emu10k1 *emu)
+{
+    int i, len;
+
+    /* set up TRAM */
+    if (emu->fx8010.etram_pages.bytes > 0) {
+        unsigned size, size_reg = 0;
+        size = emu->fx8010.etram_pages.bytes / 2;
+        size = (size - 1) >> 13;
+        while (size) {
+            size >>= 1;
+            size_reg++;
+        }
+        outl(HCFG_LOCKTANKCACHE_MASK | inl(emu->port + HCFG), emu->port + HCFG);
+        snd_emu10k1_ptr_write(emu, TCB, 0, emu->fx8010.etram_pages.addr);
+        snd_emu10k1_ptr_write(emu, TCBS, 0, size_reg);
+        outl(inl(emu->port + HCFG) & ~HCFG_LOCKTANKCACHE_MASK, emu->port + HCFG);
+    }
+
+    if (emu->audigy)
+        snd_emu10k1_ptr_write(emu, A_DBG, 0, emu->fx8010.dbg | A_DBG_SINGLE_STEP);
+    else
+        snd_emu10k1_ptr_write(emu, DBG, 0, emu->fx8010.dbg | EMU10K1_DBG_SINGLE_STEP);
+
+    len = emu->audigy ? 0x200 : 0x100;
+    for (i = 0; i < len; i++)
+        snd_emu10k1_ptr_write(emu, emu->gpr_base + i, 0, emu->saved_gpr[i]);
+
+    len = emu->audigy ? 0x100 : 0xa0;
+    for (i = 0; i < len; i++) {
+        snd_emu10k1_ptr_write(emu, TANKMEMDATAREGBASE + i, 0,
+                              emu->tram_val_saved[i]);
+        if (! emu->audigy)
+            snd_emu10k1_ptr_write(emu, TANKMEMADDRREGBASE + i, 0,
+                                  emu->tram_addr_saved[i]);
+        else {
+            snd_emu10k1_ptr_write(emu, TANKMEMADDRREGBASE + i, 0,
+                                  emu->tram_addr_saved[i] << 12);
+            snd_emu10k1_ptr_write(emu, TANKMEMADDRREGBASE + i, 0,
+                                  emu->tram_addr_saved[i] >> 20);
+        }
+    }
+
+    len = emu->audigy ? 2 * 1024 : 2 * 512;
+    for (i = 0; i < len; i++)
+        snd_emu10k1_efx_write(emu, i, emu->saved_icode[i]);
+
+    /* start FX processor when the DSP code is updated */
+    if (emu->audigy)
+        snd_emu10k1_ptr_write(emu, A_DBG, 0, emu->fx8010.dbg);
+    else
+        snd_emu10k1_ptr_write(emu, DBG, 0, emu->fx8010.dbg);
+}
+#endif

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

@@ -5 +5 @@
  *  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:
@@ -36 +39 @@
 #define AC97_ID_STAC9758        0x83847658
 
-static int snd_emu10k1_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_emu10k1_spdif_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
     uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
@@ -43 +46 @@
 }
 
-static int snd_emu10k1_spdif_get(snd_kcontrol_t * kcontrol,
-                                 snd_ctl_elem_value_t * ucontrol)
+static int snd_emu10k1_spdif_get(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
 {
     struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
@@ -59 +62 @@
 }
 
-static int snd_emu10k1_spdif_get_mask(snd_kcontrol_t * kcontrol,
-                                      snd_ctl_elem_value_t * ucontrol)
+static int snd_emu10k1_spdif_get_mask(struct snd_kcontrol *kcontrol,
+                                      struct snd_ctl_elem_value *ucontrol)
 {
     ucontrol->value.iec958.status[0] = 0xff;
@@ -69 +72 @@
 }
 
-static int snd_audigy_spdif_output_rate_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static char *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",
+};
+
+static 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 */
+};
+
+static 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 */
+};
+
+static unsigned int emu1010_input_dst[] = {
+    EMU_DST_ALICE2_EMU32_0,
+    EMU_DST_ALICE2_EMU32_1,
+    EMU_DST_ALICE2_EMU32_2,
+    EMU_DST_ALICE2_EMU32_3,
+    EMU_DST_ALICE2_EMU32_4,
+    EMU_DST_ALICE2_EMU32_5,
+    EMU_DST_ALICE2_EMU32_6,
+    EMU_DST_ALICE2_EMU32_7,
+    EMU_DST_ALICE2_EMU32_8,
+    EMU_DST_ALICE2_EMU32_9,
+    EMU_DST_ALICE2_EMU32_A,
+    EMU_DST_ALICE2_EMU32_B,
+    EMU_DST_ALICE2_EMU32_C,
+    EMU_DST_ALICE2_EMU32_D,
+    EMU_DST_ALICE2_EMU32_E,
+    EMU_DST_ALICE2_EMU32_F,
+    EMU_DST_ALICE_I2S0_LEFT,
+    EMU_DST_ALICE_I2S0_RIGHT,
+    EMU_DST_ALICE_I2S1_LEFT,
+    EMU_DST_ALICE_I2S1_RIGHT,
+    EMU_DST_ALICE_I2S2_LEFT,
+    EMU_DST_ALICE_I2S2_RIGHT,
+};
+
+static int snd_emu1010_input_output_source_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+    uinfo->count = 1;
+    uinfo->value.enumerated.items = 53;
+    if (uinfo->value.enumerated.item >= uinfo->value.enumerated.items)
+        uinfo->value.enumerated.item = uinfo->value.enumerated.items - 1;
+    strcpy(uinfo->value.enumerated.name, emu1010_src_texts[uinfo->value.enumerated.item]);
+    return 0;
+}
+
+static int snd_emu1010_output_source_get(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    int channel;
+
+    channel = (kcontrol->private_value) & 0xff;
+    ucontrol->value.enumerated.item[0] = emu->emu1010.output_source[channel];
+    return 0;
+}
+
+static int snd_emu1010_output_source_put(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    int change = 0;
+    unsigned int val;
+    int channel;
+
+    channel = (kcontrol->private_value) & 0xff;
+    if (emu->emu1010.output_source[channel] != ucontrol->value.enumerated.item[0]) {
+        val = emu->emu1010.output_source[channel] = ucontrol->value.enumerated.item[0];
+        change = 1;
+        snd_emu1010_fpga_link_dst_src_write(emu,
+                                            emu1010_output_dst[channel], emu1010_src_regs[val]);
+    }
+    return change;
+}
+
+static int snd_emu1010_input_source_get(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
+{
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    int channel;
+
+    channel = (kcontrol->private_value) & 0xff;
+    ucontrol->value.enumerated.item[0] = emu->emu1010.input_source[channel];
+    return 0;
+}
+
+static int snd_emu1010_input_source_put(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
+{
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    int change = 0;
+    unsigned int val;
+    int channel;
+
+    channel = (kcontrol->private_value) & 0xff;
+    if (emu->emu1010.input_source[channel] != ucontrol->value.enumerated.item[0]) {
+        val = emu->emu1010.input_source[channel] = ucontrol->value.enumerated.item[0];
+        change = 1;
+        snd_emu1010_fpga_link_dst_src_write(emu,
+                                            emu1010_input_dst[channel], emu1010_src_regs[val]);
+    }
+    return change;
+}
+
+#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 struct snd_kcontrol_new snd_emu1010_output_enum_ctls[] __devinitdata = {
+    EMU1010_SOURCE_OUTPUT("Dock DAC1 Left Playback Switch", 0),
+    EMU1010_SOURCE_OUTPUT("Dock DAC1 Right Playback Switch", 1),
+    EMU1010_SOURCE_OUTPUT("Dock DAC2 Left Playback Switch", 2),
+    EMU1010_SOURCE_OUTPUT("Dock DAC2 Right Playback Switch", 3),
+    EMU1010_SOURCE_OUTPUT("Dock DAC3 Left Playback Switch", 4),
+    EMU1010_SOURCE_OUTPUT("Dock DAC3 Right Playback Switch", 5),
+    EMU1010_SOURCE_OUTPUT("Dock DAC4 Left Playback Switch", 6),
+    EMU1010_SOURCE_OUTPUT("Dock DAC4 Right Playback Switch", 7),
+    EMU1010_SOURCE_OUTPUT("Dock Phones Left Playback Switch", 8),
+    EMU1010_SOURCE_OUTPUT("Dock Phones Right Playback Switch", 9),
+    EMU1010_SOURCE_OUTPUT("Dock SPDIF Left Playback Switch", 0xa),
+    EMU1010_SOURCE_OUTPUT("Dock SPDIF Right Playback Switch", 0xb),
+    EMU1010_SOURCE_OUTPUT("1010 SPDIF Left Playback Switch", 0xc),
+    EMU1010_SOURCE_OUTPUT("1010 SPDIF Right Playback Switch", 0xd),
+    EMU1010_SOURCE_OUTPUT("0202 DAC Left Playback Switch", 0xe),
+    EMU1010_SOURCE_OUTPUT("0202 DAC Right Playback Switch", 0xf),
+    EMU1010_SOURCE_OUTPUT("1010 ADAT 0 Playback Switch", 0x10),
+    EMU1010_SOURCE_OUTPUT("1010 ADAT 1 Playback Switch", 0x11),
+    EMU1010_SOURCE_OUTPUT("1010 ADAT 2 Playback Switch", 0x12),
+    EMU1010_SOURCE_OUTPUT("1010 ADAT 3 Playback Switch", 0x13),
+    EMU1010_SOURCE_OUTPUT("1010 ADAT 4 Playback Switch", 0x14),
+    EMU1010_SOURCE_OUTPUT("1010 ADAT 5 Playback Switch", 0x15),
+    EMU1010_SOURCE_OUTPUT("1010 ADAT 6 Playback Switch", 0x16),
+    EMU1010_SOURCE_OUTPUT("1010 ADAT 7 Playback Switch", 0x17),
+};
+
+#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 struct snd_kcontrol_new snd_emu1010_input_enum_ctls[] __devinitdata = {
+    EMU1010_SOURCE_INPUT("DSP 0 Capture Switch", 0),
+    EMU1010_SOURCE_INPUT("DSP 1 Capture Switch", 1),
+    EMU1010_SOURCE_INPUT("DSP 2 Capture Switch", 2),
+    EMU1010_SOURCE_INPUT("DSP 3 Capture Switch", 3),
+    EMU1010_SOURCE_INPUT("DSP 4 Capture Switch", 4),
+    EMU1010_SOURCE_INPUT("DSP 5 Capture Switch", 5),
+    EMU1010_SOURCE_INPUT("DSP 6 Capture Switch", 6),
+    EMU1010_SOURCE_INPUT("DSP 7 Capture Switch", 7),
+    EMU1010_SOURCE_INPUT("DSP 8 Capture Switch", 8),
+    EMU1010_SOURCE_INPUT("DSP 9 Capture Switch", 9),
+    EMU1010_SOURCE_INPUT("DSP A Capture Switch", 0xa),
+    EMU1010_SOURCE_INPUT("DSP B Capture Switch", 0xb),
+    EMU1010_SOURCE_INPUT("DSP C Capture Switch", 0xc),
+    EMU1010_SOURCE_INPUT("DSP D Capture Switch", 0xd),
+    EMU1010_SOURCE_INPUT("DSP E Capture Switch", 0xe),
+    EMU1010_SOURCE_INPUT("DSP F Capture Switch", 0xf),
+    EMU1010_SOURCE_INPUT("DSP 10 Capture Switch", 0x10),
+    EMU1010_SOURCE_INPUT("DSP 11 Capture Switch", 0x11),
+    EMU1010_SOURCE_INPUT("DSP 12 Capture Switch", 0x12),
+    EMU1010_SOURCE_INPUT("DSP 13 Capture Switch", 0x13),
+    EMU1010_SOURCE_INPUT("DSP 14 Capture Switch", 0x14),
+    EMU1010_SOURCE_INPUT("DSP 15 Capture Switch", 0x15),
+};
+
+
+
+
+static int snd_emu1010_adc_pads_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+    uinfo->count = 1;
+    uinfo->value.integer.min = 0;
+    uinfo->value.integer.max = 1;
+    return 0;
+}
+
+static int snd_emu1010_adc_pads_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    unsigned int mask = kcontrol->private_value & 0xff;
+    ucontrol->value.integer.value[0] = (emu->emu1010.adc_pads & mask) ? 1 : 0;
+    return 0;
+}
+
+static int snd_emu1010_adc_pads_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    unsigned int mask = kcontrol->private_value & 0xff;
+    unsigned int val, cache;
+    val = ucontrol->value.integer.value[0];
+    cache = emu->emu1010.adc_pads;
+    if (val == 1)
+        cache = cache | mask;
+    else
+        cache = cache & ~mask;
+    if (cache != emu->emu1010.adc_pads) {
+        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 struct snd_kcontrol_new snd_emu1010_adc_pads[] __devinitdata = {
+    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),
+};
+
+static int snd_emu1010_dac_pads_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+    uinfo->count = 1;
+    uinfo->value.integer.min = 0;
+    uinfo->value.integer.max = 1;
+    return 0;
+}
+
+static int snd_emu1010_dac_pads_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    unsigned int mask = kcontrol->private_value & 0xff;
+    ucontrol->value.integer.value[0] = (emu->emu1010.dac_pads & mask) ? 1 : 0;
+    return 0;
+}
+
+static int snd_emu1010_dac_pads_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    unsigned int mask = kcontrol->private_value & 0xff;
+    unsigned int val, cache;
+    val = ucontrol->value.integer.value[0];
+    cache = emu->emu1010.dac_pads;
+    if (val == 1)
+        cache = cache | mask;
+    else
+        cache = cache & ~mask;
+    if (cache != emu->emu1010.dac_pads) {
+        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 struct snd_kcontrol_new snd_emu1010_dac_pads[] __devinitdata = {
+    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,
+                                           struct snd_ctl_elem_info *uinfo)
+{
+    static char *texts[2] = {
+        "44100", "48000"
+    };
+
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+    uinfo->count = 1;
+    uinfo->value.enumerated.items = 2;
+    if (uinfo->value.enumerated.item > 1)
+        uinfo->value.enumerated.item = 1;
+    strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+    return 0;
+}
+
+static int snd_emu1010_internal_clock_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,
+                                          struct snd_ctl_elem_value *ucontrol)
+{
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    unsigned int val;
+    int change = 0;
+
+    val = ucontrol->value.enumerated.item[0] ;
+    change = (emu->emu1010.internal_clock != 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;
+        }
+    }
+    return change;
+}
+
+static 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
+};
+
+
+#if 0
+static int snd_audigy_spdif_output_rate_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
     static char *texts[] = {"44100", "48000", "96000"};
@@ -82 +594 @@
 }
 
-static int snd_audigy_spdif_output_rate_get(snd_kcontrol_t * kcontrol,
-                                            snd_ctl_elem_value_t * ucontrol)
+static int snd_audigy_spdif_output_rate_get(struct snd_kcontrol *kcontrol,
+                                            struct snd_ctl_elem_value *ucontrol)
 {
     struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
@@ -109 +621 @@
 }
 
-static int snd_audigy_spdif_output_rate_put(snd_kcontrol_t * kcontrol,
-                                            snd_ctl_elem_value_t * ucontrol)
+static int snd_audigy_spdif_output_rate_put(struct snd_kcontrol *kcontrol,
+                                            struct snd_ctl_elem_value *ucontrol)
 {
     struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
@@ -143 +655 @@
 }
 
-static snd_kcontrol_new_t snd_audigy_spdif_output_rate =
-{
-    SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    "Audigy SPDIF Output Sample Rate", 0,
-    SNDRV_CTL_ELEM_ACCESS_READWRITE,
-    1,
-    snd_audigy_spdif_output_rate_info,
-    snd_audigy_spdif_output_rate_get,
-    snd_audigy_spdif_output_rate_put, 0
-};
-
-static int snd_emu10k1_spdif_put(snd_kcontrol_t * kcontrol,
-                                 snd_ctl_elem_value_t * ucontrol)
+static struct snd_kcontrol_new snd_audigy_spdif_output_rate =
+{
+    .access =   SNDRV_CTL_ELEM_ACCESS_READWRITE,
+    .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+    .name =         "Audigy SPDIF Output Sample Rate",
+    .count =    1,
+    .info =         snd_audigy_spdif_output_rate_info,
+    .get =          snd_audigy_spdif_output_rate_get,
+    .put =          snd_audigy_spdif_output_rate_put
+};
+#endif
+
+static int snd_emu10k1_spdif_put(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
 {
     struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
@@ -177 +690 @@
 }
 
-static snd_kcontrol_new_t snd_emu10k1_spdif_mask_control =
-{
-    SNDRV_CTL_ELEM_IFACE_PCM,0,0,
-    SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),
-    0,SNDRV_CTL_ELEM_ACCESS_READ,4,
-    snd_emu10k1_spdif_info,
-    snd_emu10k1_spdif_get_mask,0,0
-};
-
-static snd_kcontrol_new_t snd_emu10k1_spdif_control =
-{
-    SNDRV_CTL_ELEM_IFACE_PCM,0,0,
-    SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),0,0,4,
-    snd_emu10k1_spdif_info,
-    snd_emu10k1_spdif_get,
-    snd_emu10k1_spdif_put,0
-};
+static struct snd_kcontrol_new snd_emu10k1_spdif_mask_control =
+{
+    .access =   SNDRV_CTL_ELEM_ACCESS_READ,
+    .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+    .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),
+    .count =    4,
+    .info =         snd_emu10k1_spdif_info,
+    .get =          snd_emu10k1_spdif_get_mask
+};
+
+static struct snd_kcontrol_new snd_emu10k1_spdif_control =
+{
+    .iface =    SNDRV_CTL_ELEM_IFACE_PCM,
+    .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+    .count =    4,
+    .info =         snd_emu10k1_spdif_info,
+    .get =          snd_emu10k1_spdif_get,
+    .put =          snd_emu10k1_spdif_put
+};
+
 
 static void update_emu10k1_fxrt(struct snd_emu10k1 *emu, int voice, unsigned char *route)
@@ -225 +741 @@
 /* PCM stream controls */
 
-static int snd_emu10k1_send_routing_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_emu10k1_send_routing_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
     struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
@@ -235 +751 @@
 }
 
-static int snd_emu10k1_send_routing_get(snd_kcontrol_t * kcontrol,
-                                        snd_ctl_elem_value_t * ucontrol)
-{
-    unsigned long flags;
-    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+static int snd_emu10k1_send_routing_get(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
+{
+    unsigned long flags;
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix =
+        &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     int voice, idx;
     int num_efx = emu->audigy ? 8 : 4;
@@ -254 +771 @@
 }
 
-static int snd_emu10k1_send_routing_put(snd_kcontrol_t * kcontrol,
-                                        snd_ctl_elem_value_t * ucontrol)
-{
-    unsigned long flags;
-    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+static int snd_emu10k1_send_routing_put(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
+{
+    unsigned long flags;
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix =
+        &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     int change = 0, voice, idx, val;
     int num_efx = emu->audigy ? 8 : 4;
@@ -288 +806 @@
 }
 
-static snd_kcontrol_new_t snd_emu10k1_send_routing_control =
-{
-    SNDRV_CTL_ELEM_IFACE_PCM,0,0,
-    "EMU10K1 PCM Send Routing",0,
-    SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,32,
-    snd_emu10k1_send_routing_info,
-    snd_emu10k1_send_routing_get,
-    snd_emu10k1_send_routing_put,0
-};
-
-static int snd_emu10k1_send_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static struct snd_kcontrol_new snd_emu10k1_send_routing_control =
+{
+    .access =   SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+    .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+    .name =         "EMU10K1 PCM Send Routing",
+    .count =    32,
+    .info =         snd_emu10k1_send_routing_info,
+    .get =          snd_emu10k1_send_routing_get,
+    .put =          snd_emu10k1_send_routing_put
+};
+
+static int snd_emu10k1_send_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
     struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
@@ -308 +827 @@
 }
 
-static int snd_emu10k1_send_volume_get(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-    unsigned long flags;
-    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+static int snd_emu10k1_send_volume_get(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
+{
+    unsigned long flags;
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix =
+        &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     int idx;
     int num_efx = emu->audigy ? 8 : 4;
@@ -324 +844 @@
 }
 
-static int snd_emu10k1_send_volume_put(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-    unsigned long flags;
-    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+static int snd_emu10k1_send_volume_put(struct snd_kcontrol *kcontrol,
+                                       struct snd_ctl_elem_value *ucontrol)
+{
+    unsigned long flags;
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix =
+        &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     int change = 0, idx, val;
     int num_efx = emu->audigy ? 8 : 4;
@@ -356 +877 @@
 }
 
-static snd_kcontrol_new_t snd_emu10k1_send_volume_control =
-{
-    SNDRV_CTL_ELEM_IFACE_PCM,0,0,
-    "EMU10K1 PCM Send Volume",0,
-    SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,32,
-    snd_emu10k1_send_volume_info,
-    snd_emu10k1_send_volume_get,
-    snd_emu10k1_send_volume_put,0
-};
-
-static int snd_emu10k1_attn_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static struct snd_kcontrol_new snd_emu10k1_send_volume_control =
+{
+    .access =   SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+    .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+    .name =         "EMU10K1 PCM Send Volume",
+    .count =    32,
+    .info =         snd_emu10k1_send_volume_info,
+    .get =          snd_emu10k1_send_volume_get,
+    .put =          snd_emu10k1_send_volume_put
+};
+
+static int snd_emu10k1_attn_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
     uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
@@ -375 +897 @@
 }
 
-static int snd_emu10k1_attn_get(snd_kcontrol_t * kcontrol,
-                                snd_ctl_elem_value_t * ucontrol)
-{
-    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+static int snd_emu10k1_attn_get(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix =
+        &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     unsigned long flags;
     int idx;
@@ -390 +913 @@
 }
 
-static int snd_emu10k1_attn_put(snd_kcontrol_t * kcontrol,
-                                snd_ctl_elem_value_t * ucontrol)
-{
-    unsigned long flags;
-    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+static int snd_emu10k1_attn_put(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_value *ucontrol)
+{
+    unsigned long flags;
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix =
+        &emu->pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     int change = 0, idx, val;
 
@@ -418 +942 @@
 }
 
-static snd_kcontrol_new_t snd_emu10k1_attn_control =
-{
-    SNDRV_CTL_ELEM_IFACE_PCM,0,0,
-    "EMU10K1 PCM Volume",0,
-    SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,32,
-    snd_emu10k1_attn_info,
-    snd_emu10k1_attn_get,
-    snd_emu10k1_attn_put,0
+static struct snd_kcontrol_new snd_emu10k1_attn_control =
+{
+    .access =   SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+    .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+    .name =         "EMU10K1 PCM Volume",
+    .count =    32,
+    .info =         snd_emu10k1_attn_info,
+    .get =          snd_emu10k1_attn_get,
+    .put =          snd_emu10k1_attn_put
 };
 
 /* Mutichannel PCM stream controls */
 
-static int snd_emu10k1_efx_send_routing_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_emu10k1_efx_send_routing_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
     struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
@@ -440 +965 @@
 }
 
-static int snd_emu10k1_efx_send_routing_get(snd_kcontrol_t * kcontrol,
-                                            snd_ctl_elem_value_t * ucontrol)
-{
-    unsigned long flags;
-    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-    struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+static int snd_emu10k1_efx_send_routing_get(struct snd_kcontrol *kcontrol,
+                                            struct snd_ctl_elem_value *ucontrol)
+{
+    unsigned long flags;
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix =
+        &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     int idx;
     int num_efx = emu->audigy ? 8 : 4;
@@ -458 +984 @@
 }
 
-static int snd_emu10k1_efx_send_routing_put(snd_kcontrol_t * kcontrol,
-                                            snd_ctl_elem_value_t * ucontrol)
+static int snd_emu10k1_efx_send_routing_put(struct snd_kcontrol *kcontrol,
+                                            struct snd_ctl_elem_value *ucontrol)
 {
     unsigned long flags;
@@ -477 +1003 @@
         }
     }
+
     if (change && mix->epcm) {
         if (mix->epcm->voices[ch]) {
@@ -487 +1014 @@
 }
 
-static snd_kcontrol_new_t snd_emu10k1_efx_send_routing_control =
-{
-    SNDRV_CTL_ELEM_IFACE_PCM,0,0,
-    "Multichannel PCM Send Routing",0,
-    SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-    16,
-    snd_emu10k1_efx_send_routing_info,
-    snd_emu10k1_efx_send_routing_get,
-    snd_emu10k1_efx_send_routing_put,0
-};
-
-static int snd_emu10k1_efx_send_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static struct snd_kcontrol_new snd_emu10k1_efx_send_routing_control =
+{
+    .access =   SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+    .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+    .name =         "Multichannel PCM Send Routing",
+    .count =    16,
+    .info =         snd_emu10k1_efx_send_routing_info,
+    .get =          snd_emu10k1_efx_send_routing_get,
+    .put =          snd_emu10k1_efx_send_routing_put
+};
+
+static int snd_emu10k1_efx_send_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
     struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
@@ -508 +1035 @@
 }
 
-static int snd_emu10k1_efx_send_volume_get(snd_kcontrol_t * kcontrol,
-                                           snd_ctl_elem_value_t * ucontrol)
-{
-    unsigned long flags;
-    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-    struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+static int snd_emu10k1_efx_send_volume_get(struct snd_kcontrol *kcontrol,
+                                           struct snd_ctl_elem_value *ucontrol)
+{
+    unsigned long flags;
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix =
+        &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     int idx;
     int num_efx = emu->audigy ? 8 : 4;
@@ -524 +1052 @@
 }
 
-static int snd_emu10k1_efx_send_volume_put(snd_kcontrol_t * kcontrol,
-                                           snd_ctl_elem_value_t * ucontrol)
+static int snd_emu10k1_efx_send_volume_put(struct snd_kcontrol *kcontrol,
+                                           struct snd_ctl_elem_value *ucontrol)
 {
     unsigned long flags;
@@ -553 +1081 @@
 
 
-static snd_kcontrol_new_t snd_emu10k1_efx_send_volume_control =
-{
-    SNDRV_CTL_ELEM_IFACE_PCM,0,0,
-    "Multichannel PCM Send Volume",0,
-    SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-    16,
-    snd_emu10k1_efx_send_volume_info,
-    snd_emu10k1_efx_send_volume_get,
-    snd_emu10k1_efx_send_volume_put,0
-};
-
-static int snd_emu10k1_efx_attn_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static struct snd_kcontrol_new snd_emu10k1_efx_send_volume_control =
+{
+    .access =   SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+    .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+    .name =         "Multichannel PCM Send Volume",
+    .count =    16,
+    .info =         snd_emu10k1_efx_send_volume_info,
+    .get =          snd_emu10k1_efx_send_volume_get,
+    .put =          snd_emu10k1_efx_send_volume_put
+};
+
+static int snd_emu10k1_efx_attn_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
     uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
@@ -573 +1101 @@
 }
 
-static int snd_emu10k1_efx_attn_get(snd_kcontrol_t * kcontrol,
-                                    snd_ctl_elem_value_t * ucontrol)
-{
-    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-    struct snd_emu10k1_pcm_mixer *mix = &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
+static int snd_emu10k1_efx_attn_get(struct snd_kcontrol *kcontrol,
+                                    struct snd_ctl_elem_value *ucontrol)
+{
+    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+    struct snd_emu10k1_pcm_mixer *mix =
+        &emu->efx_pcm_mixer[snd_ctl_get_ioffidx(kcontrol, &ucontrol->id)];
     unsigned long flags;
 
@@ -586 +1115 @@
 }
 
-static int snd_emu10k1_efx_attn_put(snd_kcontrol_t * kcontrol,
-                                    snd_ctl_elem_value_t * ucontrol)
+static int snd_emu10k1_efx_attn_put(struct snd_kcontrol *kcontrol,
+                                    struct snd_ctl_elem_value *ucontrol)
 {
     unsigned long flags;
@@ -610 +1139 @@
 }
 
-static snd_kcontrol_new_t snd_emu10k1_efx_attn_control =
-{
-    SNDRV_CTL_ELEM_IFACE_PCM,0,0,
-    "Multichannel PCM Volume",0,
-    SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
-    16,
-    snd_emu10k1_efx_attn_info,
-    snd_emu10k1_efx_attn_get,
-    snd_emu10k1_efx_attn_put,0
-};
-
-static int snd_emu10k1_shared_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static struct snd_kcontrol_new snd_emu10k1_efx_attn_control =
+{
+    .access =   SNDRV_CTL_ELEM_ACCESS_READWRITE | SNDRV_CTL_ELEM_ACCESS_INACTIVE,
+    .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+    .name =         "Multichannel PCM Volume",
+    .count =    16,
+    .info =         snd_emu10k1_efx_attn_info,
+    .get =          snd_emu10k1_efx_attn_get,
+    .put =          snd_emu10k1_efx_attn_put
+};
+
+static int snd_emu10k1_shared_spdif_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
     uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
@@ -630 +1159 @@
 }
 
-static int snd_emu10k1_shared_spdif_get(snd_kcontrol_t * kcontrol,
-                                        snd_ctl_elem_value_t * ucontrol)
+static int snd_emu10k1_shared_spdif_get(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
 {
     struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
@@ -642 +1171 @@
 }
 
-static int snd_emu10k1_shared_spdif_put(snd_kcontrol_t * kcontrol,
-                                        snd_ctl_elem_value_t * ucontrol)
+static int snd_emu10k1_shared_spdif_put(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
 {
     unsigned long flags;
@@ -673 +1202 @@
 }
 
-static snd_kcontrol_new_t snd_emu10k1_shared_spdif __devinitdata =
-{
-    SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    "SB Live Analog/Digital Output Jack",0,0,0,
-    snd_emu10k1_shared_spdif_info,
-    snd_emu10k1_shared_spdif_get,
-    snd_emu10k1_shared_spdif_put,0
-};
-
-static snd_kcontrol_new_t snd_audigy_shared_spdif __devinitdata =
-{
-    SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    "Audigy Analog/Digital Output Jack",0,0,0,
-    snd_emu10k1_shared_spdif_info,
-    snd_emu10k1_shared_spdif_get,
-    snd_emu10k1_shared_spdif_put,0
+static struct snd_kcontrol_new snd_emu10k1_shared_spdif __devinitdata =
+{
+    .iface =    SNDRV_CTL_ELEM_IFACE_MIXER,
+    .name =             "SB Live Analog/Digital Output Jack",
+    .info =             snd_emu10k1_shared_spdif_info,
+    .get =              snd_emu10k1_shared_spdif_get,
+    .put =              snd_emu10k1_shared_spdif_put
+};
+
+static struct snd_kcontrol_new snd_audigy_shared_spdif __devinitdata =
+{
+    .iface =    SNDRV_CTL_ELEM_IFACE_MIXER,
+    .name =             "Audigy Analog/Digital Output Jack",
+    .info =             snd_emu10k1_shared_spdif_info,
+    .get =              snd_emu10k1_shared_spdif_get,
+    .put =              snd_emu10k1_shared_spdif_put
 };
 
 /*
  */
-static void snd_emu10k1_mixer_free_ac97(ac97_t *ac97)
+static void snd_emu10k1_mixer_free_ac97(struct snd_ac97 *ac97)
 {
     struct snd_emu10k1 *emu = ac97->private_data;
@@ -701 +1230 @@
 /*
  */
-static int remove_ctl(snd_card_t *card, const char *name)
-{
-    snd_ctl_elem_id_t id;
+static int remove_ctl(struct snd_card *card, const char *name)
+{
+    struct snd_ctl_elem_id id;
     memset(&id, 0, sizeof(id));
     strcpy(id.name, name);
@@ -710 +1239 @@
 }
 
-static snd_kcontrol_t *ctl_find(snd_card_t *card, const char *name)
-{
-    snd_ctl_elem_id_t sid;
+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);
@@ -719 +1248 @@
 }
 
-static int rename_ctl(snd_card_t *card, const char *src, const char *dst)
-{
-    snd_kcontrol_t *kctl = ctl_find(card, src);
+static int rename_ctl(struct snd_card *card, const char *src, const char *dst)
+{
+    struct snd_kcontrol *kctl = ctl_find(card, src);
     if (kctl) {
         strcpy(kctl->id.name, dst);
@@ -733 +1262 @@
 {
     int err, pcm;
-    snd_kcontrol_t *kctl;
-    snd_card_t *card = emu->card;
+    struct snd_kcontrol *kctl;
+    struct snd_card *card = emu->card;
     char **c;
     static char *emu10k1_remove_ctls[] = {
@@ -742 +1271 @@
         "PCM Out Path & Mute",
         "Mono Output Select",
+        "Front Playback Switch",
+        "Front Playback Volume",
         "Surround Playback Switch",
         "Surround Playback Volume",
@@ -758 +1289 @@
     static char *audigy_remove_ctls[] = {
         /* Master/PCM controls on ac97 of Audigy has no effect */
+        /* On the Audigy2 the AC97 playback is piped into
+         * the Philips ADC for 24bit capture */
         "PCM Playback Switch",
         "PCM Playback Volume",
@@ -786 +1319 @@
     };
 
+    static char *audigy_remove_ctls_1361t_adc[] = {
+        /* On the Audigy2 the AC97 playback is piped into
+         * the Philips ADC for 24bit capture */
+        "PCM Playback Switch",
+        "PCM Playback Volume",
+        "Master Mono Playback Switch",
+        "Master Mono Playback Volume",
+        "Capture Source",
+        "Capture Switch",
+        "Capture Volume",
+        "Mic Capture Volume",
+        "Headphone Playback Switch",
+        "Headphone Playback Volume",
+        "3D Control - Center",
+        "3D Control - Depth",
+        "3D Control - Switch",
+        "Line2 Playback Volume",
+        "Line2 Capture Volume",
+        NULL
+    };
+    static char *audigy_rename_ctls_1361t_adc[] = {
+        "Master Playback Switch", "Master Capture Switch",
+        "Master Playback Volume", "Master Capture Volume",
+        "Wave Master Playback Volume", "Master Playback Volume",
+        "PC Speaker Playback Switch", "PC Speaker Capture Switch",
+        "PC Speaker Playback Volume", "PC Speaker Capture Volume",
+        "Phone Playback Switch", "Phone Capture Switch",
+        "Phone Playback Volume", "Phone Capture Volume",
+        "Mic Playback Switch", "Mic Capture Switch",
+        "Mic Playback Volume", "Mic Capture Volume",
+        "Line Playback Switch", "Line Capture Switch",
+        "Line Playback Volume", "Line Capture Volume",
+        "CD Playback Switch", "CD Capture Switch",
+        "CD Playback Volume", "CD Capture Volume",
+        "Aux Playback Switch", "Aux Capture Switch",
+        "Aux Playback Volume", "Aux Capture Volume",
+        "Video Playback Switch", "Video Capture Switch",
+        "Video Playback Volume", "Video Capture Volume",
+
+        NULL
+    };
+
     if (emu->card_capabilities->ac97_chip) {
-        ac97_bus_t *pbus;
-        ac97_template_t ac97;
-        static ac97_bus_ops_t ops = {
-            0,snd_emu10k1_ac97_write,
-            snd_emu10k1_ac97_read,0,0
+        struct snd_ac97_bus *pbus;
+        struct snd_ac97_template ac97;
+        static struct snd_ac97_bus_ops ops = {
+            .write = snd_emu10k1_ac97_write,
+            .read = snd_emu10k1_ac97_read,
         };
 
         if ((err = snd_ac97_bus(emu->card, 0, &ops, NULL, &pbus)) < 0)
-                return err;
-
+            return err;
         pbus->no_vra = 1; /* we don't need VRA */
+
         memset(&ac97, 0, sizeof(ac97));
         ac97.private_data = emu;
@@ -812 +1387 @@
         if (emu->audigy) {
             /* set master volume to 0 dB */
-            snd_ac97_write(emu->ac97, AC97_MASTER, 0x0000);
+            snd_ac97_write_cache(emu->ac97, AC97_MASTER, 0x0000);
             /* set capture source to mic */
-            snd_ac97_write(emu->ac97, AC97_REC_SEL, 0x0000);
-            c = audigy_remove_ctls;
+            snd_ac97_write_cache(emu->ac97, AC97_REC_SEL, 0x0000);
+            if (emu->card_capabilities->adc_1361t)
+                c = audigy_remove_ctls_1361t_adc;
+            else
+                c = audigy_remove_ctls;
         } else {
+            /*
+             * Credits for cards based on STAC9758:
+             *   James Courtier-Dutton <James@superbug.demon.co.uk>
+             *   Voluspa <voluspa@comhem.se>
+             */
             if (emu->ac97->id == AC97_ID_STAC9758) {
                 emu->rear_ac97 = 1;
@@ -822 +1405 @@
             }
             /* remove unused AC97 controls */
-            snd_ac97_write(emu->ac97, AC97_SURROUND_MASTER, 0x0202);
-            snd_ac97_write(emu->ac97, AC97_CENTER_LFE_MASTER, 0x0202);
+            snd_ac97_write_cache(emu->ac97, AC97_SURROUND_MASTER, 0x0202);
+            snd_ac97_write_cache(emu->ac97, AC97_CENTER_LFE_MASTER, 0x0202);
             c = emu10k1_remove_ctls;
         }
@@ -839 +1422 @@
 
     if (emu->audigy)
-        c = audigy_rename_ctls;
+        if (emu->card_capabilities->adc_1361t)
+            c = audigy_rename_ctls_1361t_adc;
+        else
+            c = audigy_rename_ctls;
     else
         c = emu10k1_rename_ctls;
@@ -845 +1431 @@
         rename_ctl(card, c[0], c[1]);
 
+    if (emu->card_capabilities->subsystem == 0x20071102) {  /* Audigy 4 Pro */
+        rename_ctl(card, "Line2 Capture Volume", "Line1/Mic Capture Volume");
+        rename_ctl(card, "Analog Mix Capture Volume", "Line2 Capture Volume");
+        rename_ctl(card, "Aux2 Capture Volume", "Line3 Capture Volume");
+        rename_ctl(card, "Mic Capture Volume", "Unknown1 Capture Volume");
+        remove_ctl(card, "Headphone Playback Switch");
+        remove_ctl(card, "Headphone Playback Volume");
+        remove_ctl(card, "3D Control - Center");
+        remove_ctl(card, "3D Control - Depth");
+        remove_ctl(card, "3D Control - Switch");
+    }
     if ((kctl = emu->ctl_send_routing = snd_ctl_new1(&snd_emu10k1_send_routing_control, emu)) == NULL)
         return -ENOMEM;
@@ -937 +1534 @@
     }
 
-    if (emu->audigy) {
+    if ( emu->card_capabilities->emu1010) {
+        ;  /* Disable the snd_audigy_spdif_shared_spdif */
+    } else if (emu->audigy) {
         if ((kctl = snd_ctl_new1(&snd_audigy_shared_spdif, emu)) == NULL)
             return -ENOMEM;
@@ -959 +1558 @@
             return err;
     }
-    return 0;
-}
+    if ( emu->card_capabilities->emu1010) {
+        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;
+    }
+
+    return 0;
+}

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

@@ -31 +31 @@
 static inline unsigned char mpu401_read(struct snd_emu10k1 *emu, struct snd_emu10k1_midi *mpu, int idx)
 {
-        if (emu->audigy)
-                return (unsigned char)snd_emu10k1_ptr_read(emu, mpu->port + idx, 0);
-        else
-                return inb(emu->port + mpu->port + idx);
+    if (emu->audigy)
+        return (unsigned char)snd_emu10k1_ptr_read(emu, mpu->port + idx, 0);
+    else
+        return inb(emu->port + mpu->port + idx);
 }
 
 static inline void mpu401_write(struct snd_emu10k1 *emu, struct snd_emu10k1_midi *mpu, int data, int idx)
 {
-        if (emu->audigy)
-                snd_emu10k1_ptr_write(emu, mpu->port + idx, 0, data);
-        else
-                outb(data, emu->port + mpu->port + idx);
+    if (emu->audigy)
+        snd_emu10k1_ptr_write(emu, mpu->port + idx, 0, data);
+    else
+        outb(data, emu->port + mpu->port + idx);
 }
 
@@ -59 +59 @@
 static void mpu401_clear_rx(struct snd_emu10k1 *emu, struct snd_emu10k1_midi *mpu)
 {
-        int timeout = 100000;
-        for (; timeout > 0 && mpu401_input_avail(emu, mpu); timeout--)
-                mpu401_read_data(emu, mpu);
+    int timeout = 100000;
+    for (; timeout > 0 && mpu401_input_avail(emu, mpu); timeout--)
+        mpu401_read_data(emu, mpu);
 #ifdef CONFIG_SND_DEBUG
-        if (timeout <= 0)
-                snd_printk(KERN_ERR "cmd: clear rx timeout (status = 0x%x)\n", mpu401_read_stat(emu, mpu));
+    if (timeout <= 0)
+        snd_printk(KERN_ERR "cmd: clear rx timeout (status = 0x%x)\n", mpu401_read_stat(emu, mpu));
 #endif
 }
@@ -70 +70 @@
 /*
 
- */
+*/
 
 static void do_emu10k1_midi_interrupt(struct snd_emu10k1 *emu, struct snd_emu10k1_midi *midi, unsigned int status)
 {
-        unsigned char byte;
-
-        if (midi->rmidi == NULL) {
-                snd_emu10k1_intr_disable(emu, midi->tx_enable | midi->rx_enable);
-                return;
-        }
-
-        spin_lock(&midi->input_lock);
-        if ((status & midi->ipr_rx) && mpu401_input_avail(emu, midi)) {
-                if (!(midi->midi_mode & EMU10K1_MIDI_MODE_INPUT)) {
-                        mpu401_clear_rx(emu, midi);
-                } else {
-                        byte = mpu401_read_data(emu, midi);
-                        spin_unlock(&midi->input_lock);
-                        if (midi->substream_input)
-                                snd_rawmidi_receive(midi->substream_input, &byte, 1);
-                        spin_lock(&midi->input_lock);
-                }
-        }
-        spin_unlock(&midi->input_lock);
-
-        spin_lock(&midi->output_lock);
-        if ((status & midi->ipr_tx) && mpu401_output_ready(emu, midi)) {
-                if (midi->substream_output &&
-                    snd_rawmidi_transmit(midi->substream_output, &byte, 1) == 1) {
-                        mpu401_write_data(emu, midi, byte);
-                } else {
-                        snd_emu10k1_intr_disable(emu, midi->tx_enable);
-                }
-        }
-        spin_unlock(&midi->output_lock);
+    unsigned char byte;
+
+    if (midi->rmidi == NULL) {
+        snd_emu10k1_intr_disable(emu, midi->tx_enable | midi->rx_enable);
+        return;
+    }
+
+    spin_lock(&midi->input_lock);
+    if ((status & midi->ipr_rx) && mpu401_input_avail(emu, midi)) {
+        if (!(midi->midi_mode & EMU10K1_MIDI_MODE_INPUT)) {
+            mpu401_clear_rx(emu, midi);
+        } else {
+            byte = mpu401_read_data(emu, midi);
+            if (midi->substream_input)
+                snd_rawmidi_receive(midi->substream_input, &byte, 1);
+        }
+    }
+    spin_unlock(&midi->input_lock);
+
+    spin_lock(&midi->output_lock);
+    if ((status & midi->ipr_tx) && mpu401_output_ready(emu, midi)) {
+        if (midi->substream_output &&
+            snd_rawmidi_transmit(midi->substream_output, &byte, 1) == 1) {
+            mpu401_write_data(emu, midi, byte);
+        } else {
+            snd_emu10k1_intr_disable(emu, midi->tx_enable);
+        }
+    }
+    spin_unlock(&midi->output_lock);
 }
 
 static void snd_emu10k1_midi_interrupt(struct snd_emu10k1 *emu, unsigned int status)
 {
-        do_emu10k1_midi_interrupt(emu, &emu->midi, status);
+    do_emu10k1_midi_interrupt(emu, &emu->midi, status);
 }
 
 static void snd_emu10k1_midi_interrupt2(struct snd_emu10k1 *emu, unsigned int status)
 {
-        do_emu10k1_midi_interrupt(emu, &emu->midi2, status);
-}
-
-static void snd_emu10k1_midi_cmd(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);
-        mpu401_write_data(emu, midi, 0x00);
-        /* mpu401_clear_rx(emu, midi); */
-
-        mpu401_write_cmd(emu, midi, cmd);
-        if (ack) {
-                ok = 0;
-                timeout = 10000;
-                while (!ok && timeout-- > 0) {
-                        if (mpu401_input_avail(emu, midi)) {
-                                if (mpu401_read_data(emu, midi) == MPU401_ACK)
-                                        ok = 1;
-                        }
-                }
-                if (!ok && mpu401_read_data(emu, midi) == MPU401_ACK)
-                        ok = 1;
-        } else {
-                ok = 1;
-        }
-        spin_unlock_irqrestore(&midi->input_lock, flags);
-        if (!ok)
-                snd_printk(KERN_ERR "midi_cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)!!!\n",
-                           cmd, emu->port,
-                           mpu401_read_stat(emu, midi),
-                           mpu401_read_data(emu, midi));
-}
-
-static int snd_emu10k1_midi_input_open(snd_rawmidi_substream_t * substream)
-{
-        struct snd_emu10k1 *emu;
-        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
-        unsigned long flags;
-
-        emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
-        spin_lock_irqsave(&midi->open_lock, flags);
-        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);
-                snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1);
-                snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART, 1);
-        } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
-        }
-        return 0;
-}
-
-static int snd_emu10k1_midi_output_open(snd_rawmidi_substream_t * substream)
-{
-        struct snd_emu10k1 *emu;
-        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
-        unsigned long flags;
-
-        emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
-        spin_lock_irqsave(&midi->open_lock, flags);
-        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);
-                snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1);
-                snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART, 1);
-        } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
-        }
-        return 0;
-}
-
-static int snd_emu10k1_midi_input_close(snd_rawmidi_substream_t * substream)
-{
-        struct snd_emu10k1 *emu;
-        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
-        unsigned long flags;
-
-        emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
-        spin_lock_irqsave(&midi->open_lock, flags);
-        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);
-                snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
-        } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
-        }
-        return 0;
-}
-
-static int snd_emu10k1_midi_output_close(snd_rawmidi_substream_t * substream)
-{
-        struct snd_emu10k1 *emu;
-        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
-        unsigned long flags;
-
-        emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
-        spin_lock_irqsave(&midi->open_lock, flags);
-        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);
-                snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
-        } else {
-                spin_unlock_irqrestore(&midi->open_lock, flags);
-        }
-        return 0;
-}
-
-static void snd_emu10k1_midi_input_trigger(snd_rawmidi_substream_t * substream, int up)
-{
-        struct snd_emu10k1 *emu;
-        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
-        emu = midi->emu;
-        snd_assert(emu, return);
-
-        if (up)
-                snd_emu10k1_intr_enable(emu, midi->rx_enable);
-        else
-                snd_emu10k1_intr_disable(emu, midi->rx_enable);
-}
-
-static void snd_emu10k1_midi_output_trigger(snd_rawmidi_substream_t * substream, int up)
-{
-        struct snd_emu10k1 *emu;
-        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
-        unsigned long flags;
-
-        emu = midi->emu;
-        snd_assert(emu, return);
-
-        if (up) {
-                int max = 4;
-                unsigned char byte;
-        
-                /* try to send some amount of bytes here before interrupts */
-                spin_lock_irqsave(&midi->output_lock, flags);
-                while (max > 0) {
-                        if (mpu401_output_ready(emu, midi)) {
-                                if (!(midi->midi_mode & EMU10K1_MIDI_MODE_OUTPUT) ||
-                                    snd_rawmidi_transmit(substream, &byte, 1) != 1) {
-                                        /* no more data */
-                                        spin_unlock_irqrestore(&midi->output_lock, flags);
-                                        return;
-                                }
-                                mpu401_write_data(emu, midi, byte);
-                                max--;
-                        } else {
-                                break;
-                        }
-                }
-                spin_unlock_irqrestore(&midi->output_lock, flags);
-                snd_emu10k1_intr_enable(emu, midi->tx_enable);
-        } else {
-                snd_emu10k1_intr_disable(emu, midi->tx_enable);
-        }
+    do_emu10k1_midi_interrupt(emu, &emu->midi2, status);
+}
+
+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);
+    mpu401_write_data(emu, midi, 0x00);
+    /* mpu401_clear_rx(emu, midi); */
+
+    mpu401_write_cmd(emu, midi, cmd);
+    if (ack) {
+        ok = 0;
+        timeout = 10000;
+        while (!ok && timeout-- > 0) {
+            if (mpu401_input_avail(emu, midi)) {
+                if (mpu401_read_data(emu, midi) == MPU401_ACK)
+                    ok = 1;
+            }
+        }
+        if (!ok && mpu401_read_data(emu, midi) == MPU401_ACK)
+            ok = 1;
+    } else {
+        ok = 1;
+    }
+    spin_unlock_irqrestore(&midi->input_lock, flags);
+    if (!ok) {
+        snd_printk(KERN_ERR "midi_cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)!!!\n",
+                   cmd, emu->port,
+                   mpu401_read_stat(emu, midi),
+                   mpu401_read_data(emu, midi));
+        return 1;
+    }
+    return 0;
+}
+
+static int snd_emu10k1_midi_input_open(struct snd_rawmidi_substream *substream)
+{
+    struct snd_emu10k1 *emu;
+    struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
+    unsigned long flags;
+
+    emu = midi->emu;
+    snd_assert(emu, return -ENXIO);
+    spin_lock_irqsave(&midi->open_lock, flags);
+    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);
+        if (snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1))
+            goto error_out;
+        if (snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))
+            goto error_out;
+    } else {
+        spin_unlock_irqrestore(&midi->open_lock, flags);
+    }
+    return 0;
+
+    error_out:
+        return -EIO;
+}
+
+static int snd_emu10k1_midi_output_open(struct snd_rawmidi_substream *substream)
+{
+    struct snd_emu10k1 *emu;
+    struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
+    unsigned long flags;
+
+    emu = midi->emu;
+    snd_assert(emu, return -ENXIO);
+    spin_lock_irqsave(&midi->open_lock, flags);
+    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);
+        if (snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1))
+            goto error_out;
+        if (snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))
+            goto error_out;
+    } else {
+        spin_unlock_irqrestore(&midi->open_lock, flags);
+    }
+    return 0;
+
+    error_out:
+        return -EIO;
+}
+
+static int snd_emu10k1_midi_input_close(struct snd_rawmidi_substream *substream)
+{
+    struct snd_emu10k1 *emu;
+    struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
+    unsigned long flags;
+    int err = 0;
+
+    emu = midi->emu;
+    snd_assert(emu, return -ENXIO);
+    spin_lock_irqsave(&midi->open_lock, flags);
+    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);
+        err = snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
+    } else {
+        spin_unlock_irqrestore(&midi->open_lock, flags);
+    }
+    return err;
+}
+
+static int snd_emu10k1_midi_output_close(struct snd_rawmidi_substream *substream)
+{
+    struct snd_emu10k1 *emu;
+    struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
+    unsigned long flags;
+    int err = 0;
+
+    emu = midi->emu;
+    snd_assert(emu, return -ENXIO);
+    spin_lock_irqsave(&midi->open_lock, flags);
+    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);
+        err = snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
+    } else {
+        spin_unlock_irqrestore(&midi->open_lock, flags);
+    }
+    return err;
+}
+
+static void snd_emu10k1_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)
+{
+    struct snd_emu10k1 *emu;
+    struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
+    emu = midi->emu;
+    snd_assert(emu, return);
+
+    if (up)
+        snd_emu10k1_intr_enable(emu, midi->rx_enable);
+    else
+        snd_emu10k1_intr_disable(emu, midi->rx_enable);
+}
+
+static void snd_emu10k1_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)
+{
+    struct snd_emu10k1 *emu;
+    struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
+    unsigned long flags;
+
+    emu = midi->emu;
+    snd_assert(emu, return);
+
+    if (up) {
+        int max = 4;
+        unsigned char byte;
+
+        /* try to send some amount of bytes here before interrupts */
+        spin_lock_irqsave(&midi->output_lock, flags);
+        while (max > 0) {
+            if (mpu401_output_ready(emu, midi)) {
+                if (!(midi->midi_mode & EMU10K1_MIDI_MODE_OUTPUT) ||
+                    snd_rawmidi_transmit(substream, &byte, 1) != 1) {
+                    /* no more data */
+                    spin_unlock_irqrestore(&midi->output_lock, flags);
+                    return;
+                }
+                mpu401_write_data(emu, midi, byte);
+                max--;
+            } else {
+                break;
+            }
+        }
+        spin_unlock_irqrestore(&midi->output_lock, flags);
+        snd_emu10k1_intr_enable(emu, midi->tx_enable);
+    } else {
+        snd_emu10k1_intr_disable(emu, midi->tx_enable);
+    }
 }
 
 /*
 
- */
-
-#ifdef TARGET_OS2
-static snd_rawmidi_ops_t snd_emu10k1_midi_output =
-{
-        snd_emu10k1_midi_output_open,
-        snd_emu10k1_midi_output_close,
-        snd_emu10k1_midi_output_trigger,0
+*/
+
+static struct snd_rawmidi_ops snd_emu10k1_midi_output =
+{
+    .open =             snd_emu10k1_midi_output_open,
+    .close =    snd_emu10k1_midi_output_close,
+    .trigger =  snd_emu10k1_midi_output_trigger,
 };
 
-static snd_rawmidi_ops_t snd_emu10k1_midi_input =
-{
-        snd_emu10k1_midi_input_open,
-        snd_emu10k1_midi_input_close,
-        snd_emu10k1_midi_input_trigger,0
+static struct snd_rawmidi_ops snd_emu10k1_midi_input =
+{
+    .open =             snd_emu10k1_midi_input_open,
+    .close =    snd_emu10k1_midi_input_close,
+    .trigger =  snd_emu10k1_midi_input_trigger,
 };
-#else
-static snd_rawmidi_ops_t snd_emu10k1_midi_output =
-{
-        open:           snd_emu10k1_midi_output_open,
-        close:          snd_emu10k1_midi_output_close,
-        trigger:        snd_emu10k1_midi_output_trigger,
-};
-
-static snd_rawmidi_ops_t snd_emu10k1_midi_input =
-{
-        open:           snd_emu10k1_midi_input_open,
-        close:          snd_emu10k1_midi_input_close,
-        trigger:        snd_emu10k1_midi_input_trigger,
-};
-#endif
-
-static void snd_emu10k1_midi_free(snd_rawmidi_t *rmidi)
-{
-        struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)rmidi->private_data;
-        midi->interrupt = NULL;
-        midi->rmidi = NULL;
+
+static void snd_emu10k1_midi_free(struct snd_rawmidi *rmidi)
+{
+    struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)rmidi->private_data;
+    midi->interrupt = NULL;
+    midi->rmidi = NULL;
 }
 
 static int __devinit emu10k1_midi_init(struct snd_emu10k1 *emu, struct snd_emu10k1_midi *midi, int device, char *name)
 {
-        snd_rawmidi_t *rmidi;
-        int err;
-
-        if ((err = snd_rawmidi_new(emu->card, name, device, 1, 1, &rmidi)) < 0)
-                return err;
-        midi->emu = emu;
-        spin_lock_init(&midi->open_lock);
-        spin_lock_init(&midi->input_lock);
-        spin_lock_init(&midi->output_lock);
-        strcpy(rmidi->name, name);
-        snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &snd_emu10k1_midi_output);
-        snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &snd_emu10k1_midi_input);
-        rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT |
-                             SNDRV_RAWMIDI_INFO_INPUT |
-                             SNDRV_RAWMIDI_INFO_DUPLEX;
-        rmidi->private_data = midi;
-        rmidi->private_free = snd_emu10k1_midi_free;
-        midi->rmidi = rmidi;
-        return 0;
+    struct snd_rawmidi *rmidi;
+    int err;
+
+    if ((err = snd_rawmidi_new(emu->card, name, device, 1, 1, &rmidi)) < 0)
+        return err;
+    midi->emu = emu;
+    spin_lock_init(&midi->open_lock);
+    spin_lock_init(&midi->input_lock);
+    spin_lock_init(&midi->output_lock);
+    strcpy(rmidi->name, name);
+    snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &snd_emu10k1_midi_output);
+    snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &snd_emu10k1_midi_input);
+    rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT |
+        SNDRV_RAWMIDI_INFO_INPUT |
+        SNDRV_RAWMIDI_INFO_DUPLEX;
+    rmidi->private_data = midi;
+    rmidi->private_free = snd_emu10k1_midi_free;
+    midi->rmidi = rmidi;
+    return 0;
 }
 
 int __devinit snd_emu10k1_midi(struct snd_emu10k1 *emu)
 {
-        struct snd_emu10k1_midi *midi = &emu->midi;
-        int err;
-
-        if ((err = emu10k1_midi_init(emu, midi, 0, "EMU10K1 MPU-401 (UART)")) < 0)
-                return err;
-
-        midi->tx_enable = INTE_MIDITXENABLE;
-        midi->rx_enable = INTE_MIDIRXENABLE;
-        midi->port = MUDATA;
-        midi->ipr_tx = IPR_MIDITRANSBUFEMPTY;
-        midi->ipr_rx = IPR_MIDIRECVBUFEMPTY;
-        midi->interrupt = snd_emu10k1_midi_interrupt;
-        return 0;
+    struct snd_emu10k1_midi *midi = &emu->midi;
+    int err;
+
+    if ((err = emu10k1_midi_init(emu, midi, 0, "EMU10K1 MPU-401 (UART)")) < 0)
+        return err;
+
+    midi->tx_enable = INTE_MIDITXENABLE;
+    midi->rx_enable = INTE_MIDIRXENABLE;
+    midi->port = MUDATA;
+    midi->ipr_tx = IPR_MIDITRANSBUFEMPTY;
+    midi->ipr_rx = IPR_MIDIRECVBUFEMPTY;
+    midi->interrupt = snd_emu10k1_midi_interrupt;
+    return 0;
 }
 
 int __devinit snd_emu10k1_audigy_midi(struct snd_emu10k1 *emu)
 {
-        struct snd_emu10k1_midi *midi;
-        int err;
-
-        midi = &emu->midi;
-        if ((err = emu10k1_midi_init(emu, midi, 0, "Audigy MPU-401 (UART)")) < 0)
-                return err;
-
-        midi->tx_enable = INTE_MIDITXENABLE;
-        midi->rx_enable = INTE_MIDIRXENABLE;
-        midi->port = A_MUDATA1;
-        midi->ipr_tx = IPR_MIDITRANSBUFEMPTY;
-        midi->ipr_rx = IPR_MIDIRECVBUFEMPTY;
-        midi->interrupt = snd_emu10k1_midi_interrupt;
-
-        midi = &emu->midi2;
-        if ((err = emu10k1_midi_init(emu, midi, 1, "Audigy MPU-401 #2")) < 0)
-                return err;
-
-        midi->tx_enable = INTE_A_MIDITXENABLE2;
-        midi->rx_enable = INTE_A_MIDIRXENABLE2;
-        midi->port = A_MUDATA2;
-        midi->ipr_tx = IPR_A_MIDITRANSBUFEMPTY2;
-        midi->ipr_rx = IPR_A_MIDIRECVBUFEMPTY2;
-        midi->interrupt = snd_emu10k1_midi_interrupt2;
-        return 0;
-}
+    struct snd_emu10k1_midi *midi;
+    int err;
+
+    midi = &emu->midi;
+    if ((err = emu10k1_midi_init(emu, midi, 0, "Audigy MPU-401 (UART)")) < 0)
+        return err;
+
+    midi->tx_enable = INTE_MIDITXENABLE;
+    midi->rx_enable = INTE_MIDIRXENABLE;
+    midi->port = A_MUDATA1;
+    midi->ipr_tx = IPR_MIDITRANSBUFEMPTY;
+    midi->ipr_rx = IPR_MIDIRECVBUFEMPTY;
+    midi->interrupt = snd_emu10k1_midi_interrupt;
+
+    midi = &emu->midi2;
+    if ((err = emu10k1_midi_init(emu, midi, 1, "Audigy MPU-401 #2")) < 0)
+        return err;
+
+    midi->tx_enable = INTE_A_MIDITXENABLE2;
+    midi->rx_enable = INTE_A_MIDIRXENABLE2;
+    midi->port = A_MUDATA2;
+    midi->ipr_tx = IPR_A_MIDITRANSBUFEMPTY2;
+    midi->ipr_rx = IPR_A_MIDIRECVBUFEMPTY2;
+    midi->interrupt = snd_emu10k1_midi_interrupt2;
+    return 0;
+}

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

@@ -3 +3 @@
  *                   Creative Labs, Inc.
  *  Routines for control of EMU10K1 chips / PCM routines
+ *  Multichannel PCM support Copyright (c) Lee Revell <rlrevell@joe-job.com>
  *
  *  BUGS:
@@ -26 +27 @@
  */
 
-#define __NO_VERSION__
 #include <sound/driver.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/time.h>
+#include <linux/init.h>
 #include <sound/core.h>
 #include <sound/emu10k1.h>
 
-static inline snd_ctl_elem_id_t *snd_ctl_build_ioff(snd_ctl_elem_id_t *dst_id,
-                                                    snd_kcontrol_t *src_kctl,
-                                                    unsigned int offset)
-{
-    *dst_id = src_kctl->id;
-    dst_id->index += offset;
-    dst_id->numid += offset;
-    return dst_id;
-}
-
-static void snd_emu10k1_pcm_interrupt(struct snd_emu10k1 *emu, struct snd_emu10k1_voice *voice)
-{
-    struct snd_emu10k1_pcm *epcm;
-
-    if ((epcm = voice->epcm) == NULL)
-        return;
-    if (epcm->substream == NULL)
-        return;
+static void snd_emu10k1_pcm_interrupt(struct snd_emu10k1 *emu,
+                                      struct snd_emu10k1_voice *voice)
+{
+        struct snd_emu10k1_pcm *epcm;
+
+        if ((epcm = voice->epcm) == NULL)
+                return;
+        if (epcm->substream == NULL)
+                return;
 #if 0
-    printk("IRQ: position = 0x%x, period = 0x%x, size = 0x%x\n",
-           epcm->substream->runtime->hw->pointer(emu, epcm->substream),
-           snd_pcm_lib_period_bytes(epcm->substream),
-           snd_pcm_lib_buffer_bytes(epcm->substream));
+        printk("IRQ: position = 0x%x, period = 0x%x, size = 0x%x\n",
+                        epcm->substream->runtime->hw->pointer(emu, epcm->substream),
+                        snd_pcm_lib_period_bytes(epcm->substream),
+                        snd_pcm_lib_buffer_bytes(epcm->substream));
 #endif
-    snd_pcm_period_elapsed(epcm->substream);
-}
-
-static void snd_emu10k1_pcm_ac97adc_interrupt(struct snd_emu10k1 *emu, unsigned int status)
+        snd_pcm_period_elapsed(epcm->substream);
+}
+
+static void snd_emu10k1_pcm_ac97adc_interrupt(struct snd_emu10k1 *emu,
+                                              unsigned int status)
 {
 #if 0
-    if (status & IPR_ADCBUFHALFFULL) {
-        if (emu->pcm_capture_substream->runtime->mode == SNDRV_PCM_MODE_FRAME)
-            return;
-    }
+        if (status & IPR_ADCBUFHALFFULL) {
+                if (emu->pcm_capture_substream->runtime->mode == SNDRV_PCM_MODE_FRAME)
+                        return;
+        }
 #endif
-    snd_pcm_period_elapsed(emu->pcm_capture_substream);
-}
-
-static void snd_emu10k1_pcm_ac97mic_interrupt(struct snd_emu10k1 *emu, unsigned int status)
+        snd_pcm_period_elapsed(emu->pcm_capture_substream);
+}
+
+static void snd_emu10k1_pcm_ac97mic_interrupt(struct snd_emu10k1 *emu,
+                                              unsigned int status)
 {
 #if 0
-    if (status & IPR_MICBUFHALFFULL) {
-        if (emu->pcm_capture_mic_substream->runtime->mode == SNDRV_PCM_MODE_FRAME)
-            return;
-    }
+        if (status & IPR_MICBUFHALFFULL) {
+                if (emu->pcm_capture_mic_substream->runtime->mode == SNDRV_PCM_MODE_FRAME)
+                        return;
+        }
 #endif
-    snd_pcm_period_elapsed(emu->pcm_capture_mic_substream);
-}
-
-static void snd_emu10k1_pcm_efx_interrupt(struct snd_emu10k1 *emu, unsigned int status)
+        snd_pcm_period_elapsed(emu->pcm_capture_mic_substream);
+}
+
+static void snd_emu10k1_pcm_efx_interrupt(struct snd_emu10k1 *emu,
+                                          unsigned int status)
 {
 #if 0
-    if (status & IPR_EFXBUFHALFFULL) {
-        if (emu->pcm_capture_efx_substream->runtime->mode == SNDRV_PCM_MODE_FRAME)
-            return;
-    }
+        if (status & IPR_EFXBUFHALFFULL) {
+                if (emu->pcm_capture_efx_substream->runtime->mode == SNDRV_PCM_MODE_FRAME)
+                        return;
+        }
 #endif
-    snd_pcm_period_elapsed(emu->pcm_capture_efx_substream);
-}
-
-static snd_pcm_uframes_t snd_emu10k1_efx_playback_pointer(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    struct snd_emu10k1_pcm *epcm = runtime->private_data;
-    unsigned int ptr;
-
-    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;
+        snd_pcm_period_elapsed(emu->pcm_capture_efx_substream);
+}        
+
+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++) {
-        if (epcm->voices[i]) {
-            snd_emu10k1_voice_free(epcm->emu, epcm->voices[i]);
-            epcm->voices[i] = NULL;
-        }
-    }
-    err = snd_emu10k1_voice_alloc(epcm->emu,
-                                  epcm->type == PLAYBACK_EMUVOICE ? EMU10K1_PCM : EMU10K1_EFX,
-                                  voices,
-                                  &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) {
-        err = snd_emu10k1_voice_alloc(epcm->emu,
-                                      epcm->type == PLAYBACK_EMUVOICE ? EMU10K1_PCM : EMU10K1_EFX,
-                                      1,
-                                      &epcm->extra);
-        if (err < 0) {
-            // printk("pcm_channel_alloc: failed extra: voices=%d, frame=%d\n", voices, frame);
-            for (i = 0; i < voices; i++) {
-                snd_emu10k1_voice_free(epcm->emu, epcm->voices[i]);
-                epcm->voices[i] = NULL;
-            }
-            return err;
-        }
-        epcm->extra->epcm = epcm;
-        epcm->extra->interrupt = snd_emu10k1_pcm_interrupt;
-    }
-    return 0;
+        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++) {
+                if (epcm->voices[i]) {
+                        snd_emu10k1_voice_free(epcm->emu, epcm->voices[i]);
+                        epcm->voices[i] = NULL;
+                }
+        }
+        err = snd_emu10k1_voice_alloc(epcm->emu,
+                                      epcm->type == PLAYBACK_EMUVOICE ? EMU10K1_PCM : EMU10K1_EFX,
+                                      voices,
+                                      &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) {
+                err = snd_emu10k1_voice_alloc(epcm->emu,
+                                              epcm->type == PLAYBACK_EMUVOICE ? EMU10K1_PCM : EMU10K1_EFX,
+                                              1,
+                                              &epcm->extra);
+                if (err < 0) {
+                        /* printk("pcm_channel_alloc: failed extra: voices=%d, frame=%d\n", voices, frame); */
+                        for (i = 0; i < voices; i++) {
+                                snd_emu10k1_voice_free(epcm->emu, epcm->voices[i]);
+                                epcm->voices[i] = NULL;
+                        }
+                        return err;
+                }
+                epcm->extra->epcm = epcm;
+                epcm->extra->interrupt = snd_emu10k1_pcm_interrupt;
+        }
+        return 0;
 }
 
 static unsigned int capture_period_sizes[31] = {
-    384,        448,    512,    640,
-    384*2,      448*2,  512*2,  640*2,
-    384*4,      448*4,  512*4,  640*4,
-    384*8,      448*8,  512*8,  640*8,
-    384*16,     448*16, 512*16, 640*16,
-    384*32,     448*32, 512*32, 640*32,
-    384*64,     448*64, 512*64, 640*64,
-    384*128,448*128,512*128
+        384,    448,    512,    640,
+        384*2,  448*2,  512*2,  640*2,
+        384*4,  448*4,  512*4,  640*4,
+        384*8,  448*8,  512*8,  640*8,
+        384*16, 448*16, 512*16, 640*16,
+        384*32, 448*32, 512*32, 640*32,
+        384*64, 448*64, 512*64, 640*64,
+        384*128,448*128,512*128
 };
 
-static snd_pcm_hw_constraint_list_t hw_constraints_capture_period_sizes = {
-    31,
-    capture_period_sizes,
-    0
+static struct snd_pcm_hw_constraint_list hw_constraints_capture_period_sizes = {
+        .count = 31,
+        .list = capture_period_sizes,
+        .mask = 0
 };
 
 static unsigned int capture_rates[8] = {
-    8000, 11025, 16000, 22050, 24000, 32000, 44100, 48000
+        8000, 11025, 16000, 22050, 24000, 32000, 44100, 48000
 };
 
-static snd_pcm_hw_constraint_list_t hw_constraints_capture_rates = {
-    8,
-    capture_rates,
-    0
+static struct snd_pcm_hw_constraint_list hw_constraints_capture_rates = {
+        .count = 8,
+        .list = capture_rates,
+        .mask = 0
 };
 
 static unsigned int snd_emu10k1_capture_rate_reg(unsigned int rate)
 {
-    switch (rate) {
-    case 8000:  return ADCCR_SAMPLERATE_8;
-    case 11025: return ADCCR_SAMPLERATE_11;
-    case 16000: return ADCCR_SAMPLERATE_16;
-    case 22050: return ADCCR_SAMPLERATE_22;
-    case 24000: return ADCCR_SAMPLERATE_24;
-    case 32000: return ADCCR_SAMPLERATE_32;
-    case 44100: return ADCCR_SAMPLERATE_44;
-    case 48000: return ADCCR_SAMPLERATE_48;
-    default:
-        snd_BUG();
-        return ADCCR_SAMPLERATE_8;
-    }
+        switch (rate) {
+        case 8000:      return ADCCR_SAMPLERATE_8;
+        case 11025:     return ADCCR_SAMPLERATE_11;
+        case 16000:     return ADCCR_SAMPLERATE_16;
+        case 22050:     return ADCCR_SAMPLERATE_22;
+        case 24000:     return ADCCR_SAMPLERATE_24;
+        case 32000:     return ADCCR_SAMPLERATE_32;
+        case 44100:     return ADCCR_SAMPLERATE_44;
+        case 48000:     return ADCCR_SAMPLERATE_48;
+        default:
+                        snd_BUG();
+                        return ADCCR_SAMPLERATE_8;
+        }
 }
 
 static unsigned int snd_emu10k1_audigy_capture_rate_reg(unsigned int rate)
 {
-    switch (rate) {
-    case 8000:  return A_ADCCR_SAMPLERATE_8;
-    case 11025: return A_ADCCR_SAMPLERATE_11;
-    case 12000: return A_ADCCR_SAMPLERATE_12; /* really supported? */
-    case 16000: return ADCCR_SAMPLERATE_16;
-    case 22050: return ADCCR_SAMPLERATE_22;
-    case 24000: return ADCCR_SAMPLERATE_24;
-    case 32000: return ADCCR_SAMPLERATE_32;
-    case 44100: return ADCCR_SAMPLERATE_44;
-    case 48000: return ADCCR_SAMPLERATE_48;
-    default:
-        snd_BUG();
-        return A_ADCCR_SAMPLERATE_8;
-    }
+        switch (rate) {
+        case 8000:      return A_ADCCR_SAMPLERATE_8;
+        case 11025:     return A_ADCCR_SAMPLERATE_11;
+        case 12000:     return A_ADCCR_SAMPLERATE_12; /* really supported? */
+        case 16000:     return ADCCR_SAMPLERATE_16;
+        case 22050:     return ADCCR_SAMPLERATE_22;
+        case 24000:     return ADCCR_SAMPLERATE_24;
+        case 32000:     return ADCCR_SAMPLERATE_32;
+        case 44100:     return ADCCR_SAMPLERATE_44;
+        case 48000:     return ADCCR_SAMPLERATE_48;
+        default:
+                        snd_BUG();
+                        return A_ADCCR_SAMPLERATE_8;
+        }
 }
 
 static unsigned int emu10k1_calc_pitch_target(unsigned int rate)
 {
-    unsigned int pitch_target;
-
-    pitch_target = (rate << 8) / 375;
-    pitch_target = (pitch_target >> 1) + (pitch_target & 1);
-    return pitch_target;
+        unsigned int pitch_target;
+
+        pitch_target = (rate << 8) / 375;
+        pitch_target = (pitch_target >> 1) + (pitch_target & 1);
+        return pitch_target;
 }
 
@@ -242 +241 @@
 static unsigned int emu10k1_select_interprom(unsigned int pitch_target)
 {
-    if (pitch_target == PITCH_48000)
-        return CCCA_INTERPROM_0;
-    else if (pitch_target < PITCH_48000)
-        return CCCA_INTERPROM_1;
-    else if (pitch_target >= PITCH_96000)
-        return CCCA_INTERPROM_0;
-    else if (pitch_target >= PITCH_85000)
-        return CCCA_INTERPROM_6;
-    else if (pitch_target >= PITCH_80726)
-        return CCCA_INTERPROM_5;
-    else if (pitch_target >= PITCH_67882)
-        return CCCA_INTERPROM_4;
-    else if (pitch_target >= PITCH_57081)
-        return CCCA_INTERPROM_3;
-    else
-        return CCCA_INTERPROM_2;
+        if (pitch_target == PITCH_48000)
+                return CCCA_INTERPROM_0;
+        else if (pitch_target < PITCH_48000)
+                return CCCA_INTERPROM_1;
+        else if (pitch_target >= PITCH_96000)
+                return CCCA_INTERPROM_0;
+        else if (pitch_target >= PITCH_85000)
+                return CCCA_INTERPROM_6;
+        else if (pitch_target >= PITCH_80726)
+                return CCCA_INTERPROM_5;
+        else if (pitch_target >= PITCH_67882)
+                return CCCA_INTERPROM_4;
+        else if (pitch_target >= PITCH_57081)
+                return CCCA_INTERPROM_3;
+        else  
+                return CCCA_INTERPROM_2;
 }
 
 /*
- * calculate cache invalidate size
+ * calculate cache invalidate size 
  *
  * stereo: channel is stereo
@@ -268 +267 @@
  * returns: cache invalidate size in samples
  */
-static int inline emu10k1_ccis(int stereo, int w_16)
-{
-    if (w_16) {
-        return stereo ? 24 : 26;
-    } else {
-        return stereo ? 24*2 : 26*2;
-    }
+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 void snd_emu10k1_pcm_init_voice(struct snd_emu10k1 *emu,
-                                       int master, int extra,
-                                       struct snd_emu10k1_voice *evoice,
-                                       unsigned int start_addr,
-                                       unsigned int end_addr,
-                                       struct snd_emu10k1_pcm_mixer *mix)
-{
-    snd_pcm_substream_t *substream = evoice->epcm->substream;
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    unsigned int silent_page, tmp;
-    int voice, stereo, w_16;
-    unsigned char attn, send_amount[8];
-    unsigned char send_routing[8];
-    unsigned long flags;
-    unsigned int pitch_target;
-    unsigned int ccis;
-
-    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) {
-        attn = 0;
-        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));
-    } 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;
-        }
-        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 | (send_amount[2] << 24));
-    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 << 1) | MAP_PTI_MASK;
-    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);
-}
-
-static int snd_emu10k1_playback_hw_params(snd_pcm_substream_t * substream,
-                                          snd_pcm_hw_params_t * hw_params)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    struct snd_emu10k1_pcm *epcm = runtime->private_data;
-    int err;
-
-    if ((err = snd_emu10k1_pcm_channel_alloc(epcm, params_channels(hw_params))) < 0)
-        return err;
-    if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0)
-        return err;
-    if (err > 0) {      /* change */
-        snd_util_memblk_t *memblk;
-        if (epcm->memblk != NULL)
-            snd_emu10k1_free_pages(emu, epcm->memblk);
-        memblk = snd_emu10k1_alloc_pages(emu, substream);
-        if ((epcm->memblk = memblk) == NULL || ((struct snd_emu10k1_memblk *)memblk)->mapped_page < 0) {
-            epcm->start_addr = 0;
-            return -ENOMEM;
-        }
-        epcm->start_addr = ((struct snd_emu10k1_memblk *)memblk)->mapped_page << PAGE_SHIFT;
-    }
-    return 0;
-}
-
-static int snd_emu10k1_playback_hw_free(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    struct snd_emu10k1_pcm *epcm;
-
-    if (runtime->private_data == NULL)
-        return 0;
-    epcm = runtime->private_data;
-    if (epcm->extra) {
-        snd_emu10k1_voice_free(epcm->emu, epcm->extra);
-        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;
-    }
-    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_efx_playback_hw_free(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *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(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    struct snd_emu10k1_pcm *epcm = runtime->private_data;
-    unsigned int start_addr, end_addr;
-
-    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]);
-    return 0;
-}
-
-static int snd_emu10k1_efx_playback_prepare(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    struct snd_emu10k1_pcm *epcm = runtime->private_data;
-    unsigned int start_addr, end_addr;
-    unsigned int channel_size;
-    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]);
-        start_addr += channel_size;
-    }
-
-    return 0;
-}
-
-static snd_pcm_hardware_t snd_emu10k1_efx_playback =
-{
-/*.info =           */      (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_NONINTERLEAVED |
-                             SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                             SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE),
-/*.formats =            */  SNDRV_PCM_FMTBIT_S16_LE,
-/*.rates =              */  SNDRV_PCM_RATE_48000,
-/*.rate_min =           */  48000,
-/*.rate_max =           */  48000,
-/*.channels_min =       */  NUM_EFX_PLAYBACK,
-/*.channels_max =       */  NUM_EFX_PLAYBACK,
-/*.buffer_bytes_max =   */  (64*1024),
-/*.period_bytes_min =   */  64,
-/*.period_bytes_max =   */  (64*1024),
-/*.periods_min =        */  2,
-/*.periods_max =        */  2,
-/*.fifo_size =          */  0
+                                       int master, int extra,
+                                       struct snd_emu10k1_voice *evoice,
+                                       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 attn, send_amount[8];
+        unsigned char send_routing[8];
+        unsigned long flags;
+        unsigned int pitch_target;
+        unsigned int ccis;
+
+        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) {
+                attn = 0;
+                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));
+        } 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;
+                }
+                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 | (send_amount[2] << 24));
+        if (emu->card_capabilities->emu1010)
+                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 << 1) | MAP_PTI_MASK;
+        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);
+}
+
+static int snd_emu10k1_playback_hw_params(struct snd_pcm_substream *substream,
+                                          struct snd_pcm_hw_params *hw_params)
+{
+        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 err;
+
+        if ((err = snd_emu10k1_pcm_channel_alloc(epcm, params_channels(hw_params))) < 0)
+                return err;
+        if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0)
+                return err;
+        if (err > 0) {  /* change */
+                int mapped;
+                if (epcm->memblk != NULL)
+                        snd_emu10k1_free_pages(emu, epcm->memblk);
+                epcm->memblk = snd_emu10k1_alloc_pages(emu, substream);
+                epcm->start_addr = 0;
+                if (! epcm->memblk)
+                        return -ENOMEM;
+                mapped = ((struct snd_emu10k1_memblk *)epcm->memblk)->mapped_page;
+                if (mapped < 0)
+                        return -ENOMEM;
+                epcm->start_addr = mapped << PAGE_SHIFT;
+        }
+        return 0;
+}
+
+static int snd_emu10k1_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;
+
+        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;
+        }
+        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;
+        }
+        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_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)
+{
+        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 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]);
+        return 0;
+}
+
+static int snd_emu10k1_efx_playback_prepare(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 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]);
+                start_addr += channel_size;
+        }
+
+        return 0;
+}
+
+static struct snd_pcm_hardware snd_emu10k1_efx_playback =
+{
+        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_NONINTERLEAVED |
+                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                 SNDRV_PCM_INFO_RESUME |
+                                 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE),
+        .formats =              SNDRV_PCM_FMTBIT_S16_LE,
+        .rates =                SNDRV_PCM_RATE_48000,
+        .rate_min =             48000,
+        .rate_max =             48000,
+        .channels_min =         NUM_EFX_PLAYBACK,
+        .channels_max =         NUM_EFX_PLAYBACK,
+        .buffer_bytes_max =     (64*1024),
+        .period_bytes_min =     64,
+        .period_bytes_max =     (64*1024),
+        .periods_min =          2,
+        .periods_max =          2,
+        .fifo_size =            0,
 };
 
-static int snd_emu10k1_capture_hw_params(snd_pcm_substream_t * substream,
-                                         snd_pcm_hw_params_t * hw_params)
-{
-    return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
-}
-
-static int snd_emu10k1_capture_hw_free(snd_pcm_substream_t * substream)
-{
-    return snd_pcm_lib_free_pages(substream);
-}
-
-static int snd_emu10k1_capture_prepare(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    struct snd_emu10k1_pcm *epcm = runtime->private_data;
-    int idx;
-
-    /* zeroing the buffer size will stop capture */
-    snd_emu10k1_ptr_write(emu, epcm->capture_bs_reg, 0, 0);
-    switch (epcm->type) {
-    case CAPTURE_AC97ADC:
-        snd_emu10k1_ptr_write(emu, ADCCR, 0, 0);
-        break;
-    case CAPTURE_EFX:
-        if (emu->audigy) {
-            snd_emu10k1_ptr_write(emu, A_FXWC1, 0, 0);
-            snd_emu10k1_ptr_write(emu, A_FXWC2, 0, 0);
-        } else
-            snd_emu10k1_ptr_write(emu, FXWC, 0, 0);
-        break;
-    default:
-        break;
-    }
-    snd_emu10k1_ptr_write(emu, epcm->capture_ba_reg, 0, runtime->dma_addr);
-    epcm->capture_bufsize = snd_pcm_lib_buffer_bytes(substream);
-    epcm->capture_bs_val = 0;
-    for (idx = 0; idx < 31; idx++) {
-        if (capture_period_sizes[idx] == epcm->capture_bufsize) {
-            epcm->capture_bs_val = idx + 1;
-            break;
-        }
-    }
-    if (epcm->capture_bs_val == 0) {
-        snd_BUG();
-        epcm->capture_bs_val++;
-    }
-    if (epcm->type == CAPTURE_AC97ADC) {
-        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 int snd_emu10k1_capture_hw_params(struct snd_pcm_substream *substream,
+                                         struct snd_pcm_hw_params *hw_params)
+{
+        return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
+}
+
+static int snd_emu10k1_capture_hw_free(struct snd_pcm_substream *substream)
+{
+        return snd_pcm_lib_free_pages(substream);
+}
+
+static int snd_emu10k1_capture_prepare(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;
+        int idx;
+
+        /* zeroing the buffer size will stop capture */
+        snd_emu10k1_ptr_write(emu, epcm->capture_bs_reg, 0, 0);
+        switch (epcm->type) {
+        case CAPTURE_AC97ADC:
+                snd_emu10k1_ptr_write(emu, ADCCR, 0, 0);
+                break;
+        case CAPTURE_EFX:
+                if (emu->audigy) {
+                        snd_emu10k1_ptr_write(emu, A_FXWC1, 0, 0);
+                        snd_emu10k1_ptr_write(emu, A_FXWC2, 0, 0);
+                } else
+                        snd_emu10k1_ptr_write(emu, FXWC, 0, 0);
+                break;
+        default:
+                break;
+        }       
+        snd_emu10k1_ptr_write(emu, epcm->capture_ba_reg, 0, runtime->dma_addr);
+        epcm->capture_bufsize = snd_pcm_lib_buffer_bytes(substream);
+        epcm->capture_bs_val = 0;
+        for (idx = 0; idx < 31; idx++) {
+                if (capture_period_sizes[idx] == epcm->capture_bufsize) {
+                        epcm->capture_bs_val = idx + 1;
+                        break;
+                }
+        }
+        if (epcm->capture_bs_val == 0) {
+                snd_BUG();
+                epcm->capture_bs_val++;
+        }
+        if (epcm->type == CAPTURE_AC97ADC) {
+                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)
 {
-    snd_pcm_runtime_t *runtime;
-    unsigned int voice, stereo, i, ccis, cra = 64, cs, sample;
-
-    if (evoice == NULL)
-        return;
-    runtime = evoice->epcm->substream->runtime;
-    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);
-    }
+        struct snd_pcm_runtime *runtime;
+        unsigned int voice, stereo, i, ccis, cra = 64, cs, sample;
+
+        if (evoice == NULL)
+                return;
+        runtime = evoice->epcm->substream->runtime;
+        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)
-{
-    snd_pcm_substream_t *substream;
-    snd_pcm_runtime_t *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;
-    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);
-}
+                                               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;
+        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)
 {
-    snd_pcm_substream_t *substream;
-    snd_pcm_runtime_t *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;
-    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);
+        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->emu1010)
+                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 int snd_emu10k1_playback_trigger(snd_pcm_substream_t * substream,
-                                        int cmd)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    struct snd_emu10k1_pcm *epcm = runtime->private_data;
-    struct snd_emu10k1_pcm_mixer *mix;
-    int result = 0;
-
-    spin_lock(&emu->reg_lock);
-    switch (cmd) {
-    case SNDRV_PCM_TRIGGER_START:
-        // hmm this should cause full and half full interrupt to be raised?
-        snd_emu10k1_playback_invalidate_cache(emu, 1, epcm->extra);     /* do we need this? */
-        snd_emu10k1_playback_invalidate_cache(emu, 0, epcm->voices[0]);
-        /* follow thru */
-    case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-        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;
-        break;
-    case SNDRV_PCM_TRIGGER_STOP:
-    case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-        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);
-        break;
-    default:
-        result = -EINVAL;
-        break;
-    }
-    spin_unlock(&emu->reg_lock);
-    return result;
-}
-
-static int snd_emu10k1_capture_trigger(snd_pcm_substream_t * substream,
-                                       int cmd)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    struct snd_emu10k1_pcm *epcm = runtime->private_data;
-    int result = 0;
-
-    // printk("trigger - emu10k1 = %p, cmd = %i, pointer = %i\n", emu, cmd, substream->ops->pointer(substream));
-    spin_lock(&emu->reg_lock);
-    switch (cmd) {
-    case SNDRV_PCM_TRIGGER_START:
-        outl(epcm->capture_ipr, emu->port + IPR);
-        snd_emu10k1_intr_enable(emu, epcm->capture_inte);
-        // printk("adccr = 0x%x, adcbs = 0x%x\n", epcm->adccr, epcm->adcbs);
-        switch (epcm->type) {
-        case CAPTURE_AC97ADC:
-            snd_emu10k1_ptr_write(emu, ADCCR, 0, epcm->capture_cr_val);
-            break;
-        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);
-            } else
-                snd_emu10k1_ptr_write(emu, FXWC, 0, epcm->capture_cr_val);
-            break;
-        default:
-            break;
-        }
-        snd_emu10k1_ptr_write(emu, epcm->capture_bs_reg, 0, epcm->capture_bs_val);
-        epcm->running = 1;
-        epcm->first_ptr = 1;
-        break;
-    case SNDRV_PCM_TRIGGER_STOP:
-        epcm->running = 0;
-        snd_emu10k1_intr_disable(emu, epcm->capture_inte);
-        outl(epcm->capture_ipr, emu->port + IPR);
-        snd_emu10k1_ptr_write(emu, epcm->capture_bs_reg, 0, 0);
-        switch (epcm->type) {
-        case CAPTURE_AC97ADC:
-            snd_emu10k1_ptr_write(emu, ADCCR, 0, 0);
-            break;
-        case CAPTURE_EFX:
-            if (emu->audigy) {
-                snd_emu10k1_ptr_write(emu, A_FXWC1, 0, 0);
-                snd_emu10k1_ptr_write(emu, A_FXWC2, 0, 0);
-            } else
-                snd_emu10k1_ptr_write(emu, FXWC, 0, 0);
-            break;
-        default:
-            break;
-        }
-        break;
-    default:
-        result = -EINVAL;
-    }
-    spin_unlock(&emu->reg_lock);
-    return result;
-}
-
-static snd_pcm_uframes_t snd_emu10k1_playback_pointer(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    struct snd_emu10k1_pcm *epcm = runtime->private_data;
-    unsigned int ptr;
-
-    if (!epcm->running)
-        return 0;
-    ptr = snd_emu10k1_ptr_read(emu, CCCA, epcm->voices[0]->number) & 0x00ffffff;
+        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 int snd_emu10k1_playback_trigger(struct snd_pcm_substream *substream,
+                                        int cmd)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_emu10k1_pcm *epcm = runtime->private_data;
+        struct snd_emu10k1_pcm_mixer *mix;
+        int result = 0;
+
+        /* printk("trigger - emu10k1 = 0x%x, cmd = %i, pointer = %i\n", (int)emu, cmd, substream->ops->pointer(substream)); */
+        spin_lock(&emu->reg_lock);
+        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]);
+                /* follow thru */
+        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+        case SNDRV_PCM_TRIGGER_RESUME:
+                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;
+                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);
+                break;
+        default:
+                result = -EINVAL;
+                break;
+        }
+        spin_unlock(&emu->reg_lock);
+        return result;
+}
+
+static int snd_emu10k1_capture_trigger(struct snd_pcm_substream *substream,
+                                       int cmd)
+{
+        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 result = 0;
+
+        spin_lock(&emu->reg_lock);
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+        case SNDRV_PCM_TRIGGER_RESUME:
+                /* hmm this should cause full and half full interrupt to be raised? */
+                outl(epcm->capture_ipr, emu->port + IPR);
+                snd_emu10k1_intr_enable(emu, epcm->capture_inte);
+                /* printk("adccr = 0x%x, adcbs = 0x%x\n", epcm->adccr, epcm->adcbs); */
+                switch (epcm->type) {
+                case CAPTURE_AC97ADC:
+                        snd_emu10k1_ptr_write(emu, ADCCR, 0, epcm->capture_cr_val);
+                        break;
+                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_printdd("cr_val=0x%x, cr_val2=0x%x\n", epcm->capture_cr_val, epcm->capture_cr_val2);
+                        } else
+                                snd_emu10k1_ptr_write(emu, FXWC, 0, epcm->capture_cr_val);
+                        break;
+                default:        
+                        break;
+                }
+                snd_emu10k1_ptr_write(emu, epcm->capture_bs_reg, 0, epcm->capture_bs_val);
+                epcm->running = 1;
+                epcm->first_ptr = 1;
+                break;
+        case SNDRV_PCM_TRIGGER_STOP:
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+                epcm->running = 0;
+                snd_emu10k1_intr_disable(emu, epcm->capture_inte);
+                outl(epcm->capture_ipr, emu->port + IPR);
+                snd_emu10k1_ptr_write(emu, epcm->capture_bs_reg, 0, 0);
+                switch (epcm->type) {
+                case CAPTURE_AC97ADC:
+                        snd_emu10k1_ptr_write(emu, ADCCR, 0, 0);
+                        break;
+                case CAPTURE_EFX:
+                        if (emu->audigy) {
+                                snd_emu10k1_ptr_write(emu, A_FXWC1, 0, 0);
+                                snd_emu10k1_ptr_write(emu, A_FXWC2, 0, 0);
+                        } else
+                                snd_emu10k1_ptr_write(emu, FXWC, 0, 0);
+                        break;
+                default:
+                        break;
+                }
+                break;
+        default:
+                result = -EINVAL;
+        }
+        spin_unlock(&emu->reg_lock);
+        return result;
+}
+
+static snd_pcm_uframes_t snd_emu10k1_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;
 #if 0   /* Perex's code */
-    ptr += runtime->buffer_size;
-    ptr -= epcm->ccca_start_addr;
-    ptr %= runtime->buffer_size;
+        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;
-    }
+        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
-    // printk("ptr = 0x%x, buffer_size = 0x%x, period_size = 0x%x\n", ptr, runtime->buffer_size, runtime->period_size);
-    return ptr;
-}
-
-static int snd_emu10k1_efx_playback_trigger(snd_pcm_substream_t * substream,
-                                            int cmd)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    struct snd_emu10k1_pcm *epcm = runtime->private_data;
-    int i;
-    int result = 0;
-
-    spin_lock(&emu->reg_lock);
-    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);
-
-        /* follow thru */
-    case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-        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;
-        break;
-    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);
-        break;
-    default:
-        result = -EINVAL;
-        break;
-    }
-    spin_unlock(&emu->reg_lock);
-    return result;
-}
-
-static snd_pcm_uframes_t snd_emu10k1_capture_pointer(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    struct snd_emu10k1_pcm *epcm = runtime->private_data;
-    unsigned int ptr;
-
-    if (!epcm->running)
-        return 0;
-    if (epcm->first_ptr) {
-        udelay(50);     // hack, it takes awhile until capture is started
-        epcm->first_ptr = 0;
-    }
-    ptr = snd_emu10k1_ptr_read(emu, epcm->capture_idx_reg, 0) & 0x0000ffff;
-    return bytes_to_frames(runtime, ptr);
+        /* printk("ptr = 0x%x, buffer_size = 0x%x, period_size = 0x%x\n", ptr, runtime->buffer_size, runtime->period_size); */
+        return ptr;
+}
+
+
+static int snd_emu10k1_efx_playback_trigger(struct snd_pcm_substream *substream,
+                                        int cmd)
+{
+        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 i;
+        int result = 0;
+
+        spin_lock(&emu->reg_lock);
+        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);
+
+                /* follow thru */
+        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;
+                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);
+                break;
+        default:
+                result = -EINVAL;
+                break;
+        }
+        spin_unlock(&emu->reg_lock);
+        return result;
+}
+
+
+static snd_pcm_uframes_t snd_emu10k1_capture_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;
+        if (epcm->first_ptr) {
+                udelay(50);     /* hack, it takes awhile until capture is started */
+                epcm->first_ptr = 0;
+        }
+        ptr = snd_emu10k1_ptr_read(emu, epcm->capture_idx_reg, 0) & 0x0000ffff;
+        return bytes_to_frames(runtime, ptr);
 }
 
@@ -918 +936 @@
  */
 
-#if 0
-int snd_emu10k1_playback_ioctl(snd_pcm_substream_t *substream, unsigned int cmd, void *arg)
-{
-    switch(cmd) {
-    case SNDRV_PCM_IOCTL1_SETVOLUME:
-        {
-            struct snd_emu10k1_pcm_mixer *mix;
-            snd_pcm_volume_t    *volume = (snd_pcm_volume_t *)arg;
-            struct snd_emu10k1           *emu    = snd_pcm_substream_chip(substream);
-            snd_ctl_elem_value_t *ucontrol;
-            snd_ctl_elem_info_t  *uinfo;
-            void                 *iwishihadmorestack;
-            int                  range;
-
-
-            iwishihadmorestack = kmalloc(sizeof(snd_ctl_elem_value_t) + sizeof(snd_ctl_elem_info_t), GFP_KERNEL);
-            if(iwishihadmorestack == NULL) {
-                kfree(iwishihadmorestack);
-                return -ENOMEM;
-            }
-            ucontrol = (snd_ctl_elem_value_t *)iwishihadmorestack;
-            uinfo    = (snd_ctl_elem_info_t *)(ucontrol + 1);
-
-            mix = &emu->pcm_mixer[substream->number];
-            mix->ctl_attn->info(mix->ctl_attn, uinfo);
-            range = uinfo->value.integer.max - uinfo->value.integer.min;
-
-            if (mix->epcm->voices[0] && mix->epcm->voices[1]) {
-                ucontrol->value.integer.value[1] = (volume->volume[SNDRV_PCM_VOL_FRONT_LEFT] * range)/SNDRV_PCM_VOL_MAX;
-                ucontrol->value.integer.value[2] = (volume->volume[SNDRV_PCM_VOL_FRONT_RIGHT] * range)/SNDRV_PCM_VOL_MAX;
-            }
-            else
-                if (mix->epcm->voices[0])
-                    ucontrol->value.integer.value[0] = (volume->volume[SNDRV_PCM_VOL_FRONT_LEFT] * range)/SNDRV_PCM_VOL_MAX;
-
-            mix->ctl_attn->put(mix->ctl_attn, ucontrol);
-            kfree(iwishihadmorestack);
-            return 0;
-        }
-    case SNDRV_PCM_IOCTL1_GETVOLUME:
-        {
-            struct snd_emu10k1_pcm_mixer *mix;
-            snd_pcm_volume_t    *volume = (snd_pcm_volume_t *)arg;
-            struct snd_emu10k1           *emu    = snd_pcm_substream_chip(substream);
-            int                  range;
-            snd_ctl_elem_value_t *ucontrol;
-            snd_ctl_elem_info_t  *uinfo;
-            void                 *iwishihadmorestack;
-
-            iwishihadmorestack = kmalloc(sizeof(snd_ctl_elem_value_t) + sizeof(snd_ctl_elem_info_t), GFP_KERNEL);
-            if(iwishihadmorestack == NULL) {
-                return -ENOMEM;
-            }
-            ucontrol = (snd_ctl_elem_value_t *)iwishihadmorestack;
-            uinfo    = (snd_ctl_elem_info_t *)(ucontrol + 1);
-
-            mix = &emu->pcm_mixer[substream->number];
-            mix->ctl_attn->info(mix->ctl_attn, uinfo);
-            range = uinfo->value.integer.max - uinfo->value.integer.min;
-            if(range == 0) {
-                kfree(iwishihadmorestack);
-                return -EPERM;
-            }
-            mix->ctl_attn->get(mix->ctl_attn, ucontrol);
-
-            if (mix->epcm->voices[0] && mix->epcm->voices[1]) {
-                volume->nrchannels = 2;
-                volume->volume[SNDRV_PCM_VOL_FRONT_LEFT]  = (ucontrol->value.integer.value[1] * SNDRV_PCM_VOL_MAX) / range;
-                volume->volume[SNDRV_PCM_VOL_FRONT_RIGHT] = (ucontrol->value.integer.value[2] * SNDRV_PCM_VOL_MAX) / range;
-                volume->volume[SNDRV_PCM_VOL_REAR_LEFT]   = volume->volume[SNDRV_PCM_VOL_FRONT_LEFT];
-                volume->volume[SNDRV_PCM_VOL_REAR_RIGHT]  = volume->volume[SNDRV_PCM_VOL_FRONT_RIGHT];
-            }
-            else
-                if (mix->epcm->voices[0]){
-                    volume->nrchannels = 1;
-                    volume->volume[SNDRV_PCM_VOL_FRONT_LEFT]  = (ucontrol->value.integer.value[0] * SNDRV_PCM_VOL_MAX) / range;
-                    volume->volume[SNDRV_PCM_VOL_FRONT_RIGHT] = volume->volume[SNDRV_PCM_VOL_FRONT_LEFT];
-                    volume->volume[SNDRV_PCM_VOL_REAR_LEFT]   = volume->volume[SNDRV_PCM_VOL_FRONT_LEFT];
-                    volume->volume[SNDRV_PCM_VOL_REAR_RIGHT]  = volume->volume[SNDRV_PCM_VOL_FRONT_RIGHT];
-                }
-            kfree(iwishihadmorestack);
-            return 0;
-        }
-
-    }
-    return snd_pcm_lib_ioctl(substream, cmd, arg);
-}
-#endif
-
-static snd_pcm_hardware_t snd_emu10k1_playback =
-{
-    /*  info:            */     (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
-                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE),
-                                 /*     formats:         */     SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-                                 SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_96000,
-                                 /*     rate_min:        */     4000,
-                                 /*     rate_max:        */     96000,
-                                 /*     channels_min:    */     1,
-                                 /*     channels_max:    */     2,
-                                 /*     buffer_bytes_max: */    (128*1024),
-                                 /*     period_bytes_min: */    64,
-                                 /*     period_bytes_max: */    (128*1024),
-                                 /*     periods_min:     */     1,
-                                 /*     periods_max:     */     1024,
-                                 /*     fifo_size:       */     0,
+static struct snd_pcm_hardware snd_emu10k1_playback =
+{
+        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                 SNDRV_PCM_INFO_RESUME |
+                                 SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE),
+        .formats =              SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+        .rates =                SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_96000,
+        .rate_min =             4000,
+        .rate_max =             96000,
+        .channels_min =         1,
+        .channels_max =         2,
+        .buffer_bytes_max =     (128*1024),
+        .period_bytes_min =     64,
+        .period_bytes_max =     (128*1024),
+        .periods_min =          1,
+        .periods_max =          1024,
+        .fifo_size =            0,
 };
 
@@ -1030 +960 @@
  */
 
-static snd_pcm_hardware_t snd_emu10k1_capture =
-{
-    /*  info:            */     (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
-                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                 SNDRV_PCM_INFO_MMAP_VALID),
-                                 /*     formats:         */     SNDRV_PCM_FMTBIT_S16_LE,
-                                 /*     rates:           */     SNDRV_PCM_RATE_8000_48000,
-                                 /*     rate_min:        */     8000,
-                                 /*     rate_max:        */     48000,
-                                 /*     channels_min:    */     1,
-                                 /*     channels_max:    */     2,
-                                 /*     buffer_bytes_max: */    (64*1024),
-                                 /*     period_bytes_min: */    384,
-                                 /*     period_bytes_max: */    (64*1024),
-                                 /*     periods_min:     */     2,
-                                 /*     periods_max:     */     2,
-                                 /*     fifo_size:        */    0,
+static struct snd_pcm_hardware snd_emu10k1_capture =
+{
+        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                 SNDRV_PCM_INFO_RESUME |
+                                 SNDRV_PCM_INFO_MMAP_VALID),
+        .formats =              SNDRV_PCM_FMTBIT_S16_LE,
+        .rates =                SNDRV_PCM_RATE_8000_48000,
+        .rate_min =             8000,
+        .rate_max =             48000,
+        .channels_min =         1,
+        .channels_max =         2,
+        .buffer_bytes_max =     (64*1024),
+        .period_bytes_min =     384,
+        .period_bytes_max =     (64*1024),
+        .periods_min =          2,
+        .periods_max =          2,
+        .fifo_size =            0,
+};
+
+static struct snd_pcm_hardware snd_emu10k1_capture_efx =
+{
+        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                 SNDRV_PCM_INFO_RESUME |
+                                 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,
+        .buffer_bytes_max =     (64*1024),
+        .period_bytes_min =     384,
+        .period_bytes_max =     (64*1024),
+        .periods_min =          2,
+        .periods_max =          2,
+        .fifo_size =            0,
 };
 
@@ -1053 +1006 @@
  */
 
-static void snd_emu10k1_pcm_mixer_notify1(struct snd_emu10k1 *emu, snd_kcontrol_t *kctl, int idx, int activate)
-{
-    snd_ctl_elem_id_t id;
-
-    if (! kctl)
-        return;
-    if (activate)
-        kctl->vd[idx].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
-    else
-        kctl->vd[idx].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
-    snd_ctl_notify(emu->card, SNDRV_CTL_EVENT_MASK_VALUE |
-                   SNDRV_CTL_EVENT_MASK_INFO,
-                   snd_ctl_build_ioff(&id, kctl, idx));
+static void snd_emu10k1_pcm_mixer_notify1(struct snd_emu10k1 *emu, struct snd_kcontrol *kctl, int idx, int activate)
+{
+        struct snd_ctl_elem_id id;
+
+        if (! kctl)
+                return;
+        if (activate)
+                kctl->vd[idx].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE;
+        else
+                kctl->vd[idx].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE;
+        snd_ctl_notify(emu->card, SNDRV_CTL_EVENT_MASK_VALUE |
+                       SNDRV_CTL_EVENT_MASK_INFO,
+                       snd_ctl_build_ioff(&id, kctl, idx));
 }
 
 static void snd_emu10k1_pcm_mixer_notify(struct snd_emu10k1 *emu, int idx, int activate)
 {
-    snd_emu10k1_pcm_mixer_notify1(emu, emu->ctl_send_routing, idx, activate);
-    snd_emu10k1_pcm_mixer_notify1(emu, emu->ctl_send_volume, idx, activate);
-    snd_emu10k1_pcm_mixer_notify1(emu, emu->ctl_attn, idx, activate);
+        snd_emu10k1_pcm_mixer_notify1(emu, emu->ctl_send_routing, idx, activate);
+        snd_emu10k1_pcm_mixer_notify1(emu, emu->ctl_send_volume, idx, activate);
+        snd_emu10k1_pcm_mixer_notify1(emu, emu->ctl_attn, idx, activate);
 }
 
 static void snd_emu10k1_pcm_efx_mixer_notify(struct snd_emu10k1 *emu, int idx, int activate)
 {
-    snd_emu10k1_pcm_mixer_notify1(emu, emu->ctl_efx_send_routing, idx, activate);
-    snd_emu10k1_pcm_mixer_notify1(emu, emu->ctl_efx_send_volume, idx, activate);
-    snd_emu10k1_pcm_mixer_notify1(emu, emu->ctl_efx_attn, idx, activate);
-}
-
-static void snd_emu10k1_pcm_free_substream(snd_pcm_runtime_t *runtime)
-{
-    struct snd_emu10k1_pcm *epcm = runtime->private_data;
-    if (epcm)
-        kfree(epcm);
-}
-
-static int snd_emu10k1_efx_playback_close(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    struct snd_emu10k1_pcm_mixer *mix;
-    int i;
-
-    for (i=0; i < NUM_EFX_PLAYBACK; i++) {
-        mix = &emu->efx_pcm_mixer[i];
-        mix->epcm = NULL;
-        snd_emu10k1_pcm_efx_mixer_notify(emu, i, 0);
-    }
-    return 0;
-}
-
-static int snd_emu10k1_efx_playback_open(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    struct snd_emu10k1_pcm *epcm;
-    struct snd_emu10k1_pcm_mixer *mix;
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    int i;
-
-    epcm = (struct snd_emu10k1_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
-    if (epcm == NULL)
-        return -ENOMEM;
-    epcm->emu = emu;
-    epcm->type = PLAYBACK_EFX;
-    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;
-
-    for (i=0; i < NUM_EFX_PLAYBACK; i++) {
-        mix = &emu->efx_pcm_mixer[i];
-        mix->send_routing[0][0] = i;
-        memset(&mix->send_volume, 0, sizeof(mix->send_volume));
-        mix->send_volume[0][0] = 255;
-        mix->attn[0] = 0xffff;
-        mix->epcm = epcm;
-        snd_emu10k1_pcm_efx_mixer_notify(emu, i, 1);
-    }
-    return 0;
-}
-
-static int snd_emu10k1_playback_open(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    struct snd_emu10k1_pcm *epcm;
-    struct snd_emu10k1_pcm_mixer *mix;
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    int i, err;
-
-    epcm = (struct snd_emu10k1_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
-    if (epcm == NULL)
-        return -ENOMEM;
-    epcm->emu = emu;
-    epcm->type = PLAYBACK_EMUVOICE;
-    epcm->substream = substream;
-    runtime->private_data = epcm;
-    runtime->private_free = snd_emu10k1_pcm_free_substream;
-    runtime->hw = snd_emu10k1_playback;
-    if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0) {
-        kfree(epcm);
-        return err;
-    }
-    if ((err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 256, UINT_MAX)) < 0) {
-        kfree(epcm);
-        return err;
-    }
-    mix = &emu->pcm_mixer[substream->number];
-    for (i = 0; i < 4; 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->epcm = epcm;
-    snd_emu10k1_pcm_mixer_notify(emu, substream->number, 1);
-    return 0;
-}
-
-static int snd_emu10k1_playback_close(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[substream->number];
-
-    mix->epcm = NULL;
-    snd_emu10k1_pcm_mixer_notify(emu, substream->number, 0);
-    return 0;
-}
-
-static int snd_emu10k1_capture_open(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    struct snd_emu10k1_pcm *epcm;
-
-    epcm = (struct snd_emu10k1_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
-    if (epcm == NULL)
-        return -ENOMEM;
-    epcm->emu = emu;
-    epcm->type = CAPTURE_AC97ADC;
-    epcm->substream = substream;
-    epcm->capture_ipr = IPR_ADCBUFFULL|IPR_ADCBUFHALFFULL;
-    epcm->capture_inte = INTE_ADCBUFENABLE;
-    epcm->capture_ba_reg = ADCBA;
-    epcm->capture_bs_reg = ADCBS;
-    epcm->capture_idx_reg = emu->audigy ? A_ADCIDX : ADCIDX;
-    runtime->private_data = epcm;
-    runtime->private_free = snd_emu10k1_pcm_free_substream;
-    runtime->hw = snd_emu10k1_capture;
-    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;
-}
-
-static int snd_emu10k1_capture_close(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-
-    emu->capture_interrupt = NULL;
-    emu->pcm_capture_substream = NULL;
-    return 0;
-}
-
-static int snd_emu10k1_capture_mic_open(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    struct snd_emu10k1_pcm *epcm;
-    snd_pcm_runtime_t *runtime = substream->runtime;
-
-    epcm = (struct snd_emu10k1_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
-    if (epcm == NULL)
-        return -ENOMEM;
-    epcm->emu = emu;
-    epcm->type = CAPTURE_AC97MIC;
-    epcm->substream = substream;
-    epcm->capture_ipr = IPR_MICBUFFULL|IPR_MICBUFHALFFULL;
-    epcm->capture_inte = INTE_MICBUFENABLE;
-    epcm->capture_ba_reg = MICBA;
-    epcm->capture_bs_reg = MICBS;
-    epcm->capture_idx_reg = emu->audigy ? A_MICIDX : MICIDX;
-    substream->runtime->private_data = epcm;
-    substream->runtime->private_free = snd_emu10k1_pcm_free_substream;
-    runtime->hw = snd_emu10k1_capture;
-    runtime->hw.rates = SNDRV_PCM_RATE_8000;
-    runtime->hw.rate_min = runtime->hw.rate_max = 8000;
-    runtime->hw.channels_min = 1;
-    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;
-}
-
-static int snd_emu10k1_capture_mic_close(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-
-    emu->capture_interrupt = NULL;
-    emu->pcm_capture_mic_substream = NULL;
-    return 0;
-}
-
-static int snd_emu10k1_capture_efx_open(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    struct snd_emu10k1_pcm *epcm;
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    int nefx = emu->audigy ? 64 : 32;
-    int idx;
-
-    epcm = (struct snd_emu10k1_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
-    if (epcm == NULL)
-        return -ENOMEM;
-    epcm->emu = emu;
-    epcm->type = CAPTURE_EFX;
-    epcm->substream = substream;
-    epcm->capture_ipr = IPR_EFXBUFFULL|IPR_EFXBUFHALFFULL;
-    epcm->capture_inte = INTE_EFXBUFENABLE;
-    epcm->capture_ba_reg = FXBA;
-    epcm->capture_bs_reg = FXBS;
-    epcm->capture_idx_reg = FXIDX;
-    substream->runtime->private_data = epcm;
-    substream->runtime->private_free = snd_emu10k1_pcm_free_substream;
-    runtime->hw = snd_emu10k1_capture;
-    runtime->hw.rates = SNDRV_PCM_RATE_48000;
-    runtime->hw.rate_min = runtime->hw.rate_max = 48000;
-    spin_lock_irq(&emu->reg_lock);
-    runtime->hw.channels_min = runtime->hw.channels_max = 0;
-    for (idx = 0; idx < nefx; idx++) {
-        if (emu->efx_voices_mask[idx/32] & (1 << (idx%32))) {
-            runtime->hw.channels_min++;
-            runtime->hw.channels_max++;
-        }
-    }
-    epcm->capture_cr_val = emu->efx_voices_mask[0];
-    epcm->capture_cr_val2 = emu->efx_voices_mask[1];
-    spin_unlock_irq(&emu->reg_lock);
-    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;
-}
-
-static int snd_emu10k1_capture_efx_close(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-
-    emu->capture_interrupt = NULL;
-    emu->pcm_capture_efx_substream = NULL;
-    return 0;
-}
-
-static snd_pcm_ops_t snd_emu10k1_playback_ops = {
-    snd_emu10k1_playback_open,
-    snd_emu10k1_playback_close,
-    snd_pcm_lib_ioctl,
-    snd_emu10k1_playback_hw_params,
-    snd_emu10k1_playback_hw_free,
-    snd_emu10k1_playback_prepare,
-    snd_emu10k1_playback_trigger,
-    snd_emu10k1_playback_pointer,0,0,
-    snd_pcm_sgbuf_ops_page,0
+        snd_emu10k1_pcm_mixer_notify1(emu, emu->ctl_efx_send_routing, idx, activate);
+        snd_emu10k1_pcm_mixer_notify1(emu, emu->ctl_efx_send_volume, idx, activate);
+        snd_emu10k1_pcm_mixer_notify1(emu, emu->ctl_efx_attn, idx, activate);
+}
+
+static void snd_emu10k1_pcm_free_substream(struct snd_pcm_runtime *runtime)
+{
+        kfree(runtime->private_data);
+}
+
+static int snd_emu10k1_efx_playback_close(struct snd_pcm_substream *substream)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+        struct snd_emu10k1_pcm_mixer *mix;
+        int i;
+
+        for (i = 0; i < NUM_EFX_PLAYBACK; i++) {
+                mix = &emu->efx_pcm_mixer[i];
+                mix->epcm = NULL;
+                snd_emu10k1_pcm_efx_mixer_notify(emu, i, 0);
+        }
+        return 0;
+}
+
+static int snd_emu10k1_efx_playback_open(struct snd_pcm_substream *substream)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+        struct snd_emu10k1_pcm *epcm;
+        struct snd_emu10k1_pcm_mixer *mix;
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        int i;
+
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
+        if (epcm == NULL)
+                return -ENOMEM;
+        epcm->emu = emu;
+        epcm->type = PLAYBACK_EFX;
+        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;
+        
+        for (i = 0; i < NUM_EFX_PLAYBACK; i++) {
+                mix = &emu->efx_pcm_mixer[i];
+                mix->send_routing[0][0] = i;
+                memset(&mix->send_volume, 0, sizeof(mix->send_volume));
+                mix->send_volume[0][0] = 255;
+                mix->attn[0] = 0xffff;
+                mix->epcm = epcm;
+                snd_emu10k1_pcm_efx_mixer_notify(emu, i, 1);
+        }
+        return 0;
+}
+
+static int snd_emu10k1_playback_open(struct snd_pcm_substream *substream)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+        struct snd_emu10k1_pcm *epcm;
+        struct snd_emu10k1_pcm_mixer *mix;
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        int i, err;
+
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
+        if (epcm == NULL)
+                return -ENOMEM;
+        epcm->emu = emu;
+        epcm->type = PLAYBACK_EMUVOICE;
+        epcm->substream = substream;
+        runtime->private_data = epcm;
+        runtime->private_free = snd_emu10k1_pcm_free_substream;
+        runtime->hw = snd_emu10k1_playback;
+        if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0) {
+                kfree(epcm);
+                return err;
+        }
+        if ((err = snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 256, UINT_MAX)) < 0) {
+                kfree(epcm);
+                return err;
+        }
+        mix = &emu->pcm_mixer[substream->number];
+        for (i = 0; i < 4; 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->epcm = epcm;
+        snd_emu10k1_pcm_mixer_notify(emu, substream->number, 1);
+        return 0;
+}
+
+static int snd_emu10k1_playback_close(struct snd_pcm_substream *substream)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+        struct snd_emu10k1_pcm_mixer *mix = &emu->pcm_mixer[substream->number];
+
+        mix->epcm = NULL;
+        snd_emu10k1_pcm_mixer_notify(emu, substream->number, 0);
+        return 0;
+}
+
+static int snd_emu10k1_capture_open(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;
+
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
+        if (epcm == NULL)
+                return -ENOMEM;
+        epcm->emu = emu;
+        epcm->type = CAPTURE_AC97ADC;
+        epcm->substream = substream;
+        epcm->capture_ipr = IPR_ADCBUFFULL|IPR_ADCBUFHALFFULL;
+        epcm->capture_inte = INTE_ADCBUFENABLE;
+        epcm->capture_ba_reg = ADCBA;
+        epcm->capture_bs_reg = ADCBS;
+        epcm->capture_idx_reg = emu->audigy ? A_ADCIDX : ADCIDX;
+        runtime->private_data = epcm;
+        runtime->private_free = snd_emu10k1_pcm_free_substream;
+        runtime->hw = snd_emu10k1_capture;
+        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;
+}
+
+static int snd_emu10k1_capture_close(struct snd_pcm_substream *substream)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+
+        emu->capture_interrupt = NULL;
+        emu->pcm_capture_substream = NULL;
+        return 0;
+}
+
+static int snd_emu10k1_capture_mic_open(struct snd_pcm_substream *substream)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+        struct snd_emu10k1_pcm *epcm;
+        struct snd_pcm_runtime *runtime = substream->runtime;
+
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
+        if (epcm == NULL)
+                return -ENOMEM;
+        epcm->emu = emu;
+        epcm->type = CAPTURE_AC97MIC;
+        epcm->substream = substream;
+        epcm->capture_ipr = IPR_MICBUFFULL|IPR_MICBUFHALFFULL;
+        epcm->capture_inte = INTE_MICBUFENABLE;
+        epcm->capture_ba_reg = MICBA;
+        epcm->capture_bs_reg = MICBS;
+        epcm->capture_idx_reg = emu->audigy ? A_MICIDX : MICIDX;
+        substream->runtime->private_data = epcm;
+        substream->runtime->private_free = snd_emu10k1_pcm_free_substream;
+        runtime->hw = snd_emu10k1_capture;
+        runtime->hw.rates = SNDRV_PCM_RATE_8000;
+        runtime->hw.rate_min = runtime->hw.rate_max = 8000;
+        runtime->hw.channels_min = 1;
+        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;
+}
+
+static int snd_emu10k1_capture_mic_close(struct snd_pcm_substream *substream)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+
+        emu->capture_interrupt = NULL;
+        emu->pcm_capture_mic_substream = NULL;
+        return 0;
+}
+
+static int snd_emu10k1_capture_efx_open(struct snd_pcm_substream *substream)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+        struct snd_emu10k1_pcm *epcm;
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        int nefx = emu->audigy ? 64 : 32;
+        int idx;
+
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
+        if (epcm == NULL)
+                return -ENOMEM;
+        epcm->emu = emu;
+        epcm->type = CAPTURE_EFX;
+        epcm->substream = substream;
+        epcm->capture_ipr = IPR_EFXBUFFULL|IPR_EFXBUFHALFFULL;
+        epcm->capture_inte = INTE_EFXBUFENABLE;
+        epcm->capture_ba_reg = FXBA;
+        epcm->capture_bs_reg = FXBS;
+        epcm->capture_idx_reg = FXIDX;
+        substream->runtime->private_data = epcm;
+        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->emu1010) {
+                /* 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 = 8,
+                 * channels_max = 8,
+                 * Need to add mixer control to fix sample rate
+                 *                 
+                 * There are 16 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 8 channels
+                 * for 96kHz 24bit, one has 4 channels
+                 * for 192kHz 24bit, one has 2 channels
+                 */
+#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 = 8;
+                        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 = 8;
+                        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 16bits set
+                 */
+        } else {
+                runtime->hw.channels_min = runtime->hw.channels_max = 0;
+                for (idx = 0; idx < nefx; idx++) {
+                        if (emu->efx_voices_mask[idx/32] & (1 << (idx%32))) {
+                                runtime->hw.channels_min++;
+                                runtime->hw.channels_max++;
+                        }
+                }
+        }
+        epcm->capture_cr_val = emu->efx_voices_mask[0];
+        epcm->capture_cr_val2 = emu->efx_voices_mask[1];
+        spin_unlock_irq(&emu->reg_lock);
+        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;
+}
+
+static int snd_emu10k1_capture_efx_close(struct snd_pcm_substream *substream)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+
+        emu->capture_interrupt = NULL;
+        emu->pcm_capture_efx_substream = NULL;
+        return 0;
+}
+
+static struct snd_pcm_ops snd_emu10k1_playback_ops = {
+        .open =                 snd_emu10k1_playback_open,
+        .close =                snd_emu10k1_playback_close,
+        .ioctl =                snd_pcm_lib_ioctl,
+        .hw_params =            snd_emu10k1_playback_hw_params,
+        .hw_free =              snd_emu10k1_playback_hw_free,
+        .prepare =              snd_emu10k1_playback_prepare,
+        .trigger =              snd_emu10k1_playback_trigger,
+        .pointer =              snd_emu10k1_playback_pointer,
+        .page =                 snd_pcm_sgbuf_ops_page,
 };
 
-static snd_pcm_ops_t snd_emu10k1_capture_ops = {
-    snd_emu10k1_capture_open,
-    snd_emu10k1_capture_close,
-    snd_pcm_lib_ioctl,
-    snd_emu10k1_capture_hw_params,
-    snd_emu10k1_capture_hw_free,
-    snd_emu10k1_capture_prepare,
-    snd_emu10k1_capture_trigger,
-    snd_emu10k1_capture_pointer,0,0,0,0
+static struct snd_pcm_ops snd_emu10k1_capture_ops = {
+        .open =                 snd_emu10k1_capture_open,
+        .close =                snd_emu10k1_capture_close,
+        .ioctl =                snd_pcm_lib_ioctl,
+        .hw_params =            snd_emu10k1_capture_hw_params,
+        .hw_free =              snd_emu10k1_capture_hw_free,
+        .prepare =              snd_emu10k1_capture_prepare,
+        .trigger =              snd_emu10k1_capture_trigger,
+        .pointer =              snd_emu10k1_capture_pointer,
 };
 
 /* EFX playback */
-static snd_pcm_ops_t snd_emu10k1_efx_playback_ops = {
-    /*.open =           */      snd_emu10k1_efx_playback_open,
-    /*.close =          */      snd_emu10k1_efx_playback_close,
-    /*.ioctl =          */      snd_pcm_lib_ioctl,
-    /*.hw_params =      */      snd_emu10k1_playback_hw_params,
-    /*.hw_free =        */      snd_emu10k1_efx_playback_hw_free,
-    /*.prepare =        */      snd_emu10k1_efx_playback_prepare,
-    /*.trigger =        */      snd_emu10k1_efx_playback_trigger,
-    /*.pointer =        */      snd_emu10k1_efx_playback_pointer,
-    0,0,
-    /*.page =           */      snd_pcm_sgbuf_ops_page,
-    0
+static struct snd_pcm_ops snd_emu10k1_efx_playback_ops = {
+        .open =                 snd_emu10k1_efx_playback_open,
+        .close =                snd_emu10k1_efx_playback_close,
+        .ioctl =                snd_pcm_lib_ioctl,
+        .hw_params =            snd_emu10k1_playback_hw_params,
+        .hw_free =              snd_emu10k1_efx_playback_hw_free,
+        .prepare =              snd_emu10k1_efx_playback_prepare,
+        .trigger =              snd_emu10k1_efx_playback_trigger,
+        .pointer =              snd_emu10k1_efx_playback_pointer,
+        .page =                 snd_pcm_sgbuf_ops_page,
 };
 
-static void snd_emu10k1_pcm_free(snd_pcm_t *pcm)
-{
-    struct snd_emu10k1 *emu = pcm->private_data;
-    emu->pcm = NULL;
-    snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
-int __devinit snd_emu10k1_pcm(struct snd_emu10k1 * emu, int device, snd_pcm_t ** rpcm)
-{
-    snd_pcm_t *pcm;
-    snd_pcm_substream_t *substream;
-    int err;
-
-    if (rpcm)
-        *rpcm = NULL;
-
-    if ((err = snd_pcm_new(emu->card, "emu10k1", device, 32, 1, &pcm)) < 0)
-        return err;
-
-    pcm->private_data = emu;
-    pcm->private_free = snd_emu10k1_pcm_free;
-
-    snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_playback_ops);
-    snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_ops);
-
-    pcm->info_flags = 0;
-    pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
-    strcpy(pcm->name, "EMU10K1");
-    emu->pcm = pcm;
-
-    for (substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream->next)
-        if ((err = snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(emu->pci), 64*1024, 64*1024)) < 0)
-            return err;
-
-    for (substream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream; substream; substream = substream->next)
-        snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci), 64*1024, 64*1024);
-
-    if (rpcm)
-        *rpcm = pcm;
-
-    return 0;
-}
-
-int __devinit snd_emu10k1_pcm_multi(struct snd_emu10k1 * emu, int device, snd_pcm_t ** rpcm)
-{
-    snd_pcm_t *pcm;
-    snd_pcm_substream_t *substream;
-    int err;
-
-    if (rpcm)
-        *rpcm = NULL;
-
-    if ((err = snd_pcm_new(emu->card, "emu10k1", device, 1, 0, &pcm)) < 0)
-        return err;
-
-    pcm->private_data = emu;
-    pcm->private_free = snd_emu10k1_pcm_free;
-
-    snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_efx_playback_ops);
-
-    pcm->info_flags = 0;
-    pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
-    strcpy(pcm->name, "EMU10K1 multichannel EFX");
-    emu->pcm = pcm;
-
-    for (substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream->next)
-        if ((err = snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(emu->pci), 64*1024, 64*1024)) < 0)
-            return err;
-
-    if (rpcm)
-        *rpcm = pcm;
-
-    return 0;
-}
-
-static snd_pcm_ops_t snd_emu10k1_capture_mic_ops = {
-    snd_emu10k1_capture_mic_open,
-    snd_emu10k1_capture_mic_close,
-    snd_pcm_lib_ioctl,
-    snd_emu10k1_capture_hw_params,
-    snd_emu10k1_capture_hw_free,
-    snd_emu10k1_capture_prepare,
-    snd_emu10k1_capture_trigger,
-    snd_emu10k1_capture_pointer,0,0,0,0
+int __devinit snd_emu10k1_pcm(struct snd_emu10k1 * emu, int device, struct snd_pcm ** rpcm)
+{
+        struct snd_pcm *pcm;
+        struct snd_pcm_substream *substream;
+        int err;
+
+        if (rpcm)
+                *rpcm = NULL;
+
+        if ((err = snd_pcm_new(emu->card, "emu10k1", device, 32, 1, &pcm)) < 0)
+                return err;
+
+        pcm->private_data = emu;
+
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_playback_ops);
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_ops);
+
+        pcm->info_flags = 0;
+        pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
+        strcpy(pcm->name, "ADC Capture/Standard PCM Playback");
+        emu->pcm = pcm;
+
+        for (substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream->next)
+                if ((err = snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(emu->pci), 64*1024, 64*1024)) < 0)
+                        return err;
+
+        for (substream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream; substream; substream = substream->next)
+                snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci), 64*1024, 64*1024);
+
+        if (rpcm)
+                *rpcm = pcm;
+
+        return 0;
+}
+
+int __devinit snd_emu10k1_pcm_multi(struct snd_emu10k1 * emu, int device, struct snd_pcm ** rpcm)
+{
+        struct snd_pcm *pcm;
+        struct snd_pcm_substream *substream;
+        int err;
+
+        if (rpcm)
+                *rpcm = NULL;
+
+        if ((err = snd_pcm_new(emu->card, "emu10k1", device, 1, 0, &pcm)) < 0)
+                return err;
+
+        pcm->private_data = emu;
+
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_emu10k1_efx_playback_ops);
+
+        pcm->info_flags = 0;
+        pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
+        strcpy(pcm->name, "Multichannel Playback");
+        emu->pcm_multi = pcm;
+
+        for (substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream->next)
+                if ((err = snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV_SG, snd_dma_pci_data(emu->pci), 64*1024, 64*1024)) < 0)
+                        return err;
+
+        if (rpcm)
+                *rpcm = pcm;
+
+        return 0;
+}
+
+
+static struct snd_pcm_ops snd_emu10k1_capture_mic_ops = {
+        .open =                 snd_emu10k1_capture_mic_open,
+        .close =                snd_emu10k1_capture_mic_close,
+        .ioctl =                snd_pcm_lib_ioctl,
+        .hw_params =            snd_emu10k1_capture_hw_params,
+        .hw_free =              snd_emu10k1_capture_hw_free,
+        .prepare =              snd_emu10k1_capture_prepare,
+        .trigger =              snd_emu10k1_capture_trigger,
+        .pointer =              snd_emu10k1_capture_pointer,
 };
 
-static void snd_emu10k1_pcm_mic_free(snd_pcm_t *pcm)
-{
-    struct snd_emu10k1 *emu = pcm->private_data;
-    emu->pcm_mic = NULL;
-    snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
-int __devinit snd_emu10k1_pcm_mic(struct snd_emu10k1 * emu, int device, snd_pcm_t ** rpcm)
-{
-    snd_pcm_t *pcm;
-    int err;
-
-    if (rpcm)
-        *rpcm = NULL;
-
-    if ((err = snd_pcm_new(emu->card, "emu10k1 mic", device, 0, 1, &pcm)) < 0)
-        return err;
-
-    pcm->private_data = emu;
-    pcm->private_free = snd_emu10k1_pcm_mic_free;
-
-    snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_mic_ops);
-
-    pcm->info_flags = 0;
-    strcpy(pcm->name, "EMU10K1 MIC");
-    emu->pcm_mic = pcm;
-
-    snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci), 64*1024, 64*1024);
-
-    if (rpcm)
-        *rpcm = pcm;
-    return 0;
-}
-
-
-static int snd_emu10k1_pcm_efx_voices_mask_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
-{
-    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-    int nefx = emu->audigy ? 64 : 32;
-    uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-    uinfo->count = nefx;
-    uinfo->value.integer.min = 0;
-    uinfo->value.integer.max = 1;
-    return 0;
-}
-
-static int snd_emu10k1_pcm_efx_voices_mask_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
-{
-    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-    int nefx = emu->audigy ? 64 : 32;
-    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;
-}
-
-static int snd_emu10k1_pcm_efx_voices_mask_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
-{
-    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-    unsigned int nval[2], bits;
-    int nefx = emu->audigy ? 64 : 32;
-    int nefxb = emu->audigy ? 7 : 6;
-    int change, idx;
-
-    nval[0] = nval[1] = 0;
-    for (idx = 0, bits = 0; idx < nefx; idx++)
-        if (ucontrol->value.integer.value[idx]) {
-            nval[idx / 32] |= 1 << (idx % 32);
-            bits++;
-        }
-    for (idx = 0; idx < nefxb; idx++)
-        if (1 << idx == bits)
-            break;
-    if (idx >= nefxb)
-        return -EINVAL;
-    spin_lock_irq(&emu->reg_lock);
-    change = (nval[0] != emu->efx_voices_mask[0]) ||
-        (nval[1] != emu->efx_voices_mask[1]);
-    emu->efx_voices_mask[0] = nval[0];
-    emu->efx_voices_mask[1] = nval[1];
-    spin_unlock_irq(&emu->reg_lock);
-    return change;
-}
-
-static snd_kcontrol_new_t snd_emu10k1_pcm_efx_voices_mask = {
-    SNDRV_CTL_ELEM_IFACE_PCM,0,0,
-    "Captured FX8010 Outputs",0,0, 0,
-    snd_emu10k1_pcm_efx_voices_mask_info,
-    snd_emu10k1_pcm_efx_voices_mask_get,
-    snd_emu10k1_pcm_efx_voices_mask_put,0
+int __devinit snd_emu10k1_pcm_mic(struct snd_emu10k1 * emu, int device, struct snd_pcm ** rpcm)
+{
+        struct snd_pcm *pcm;
+        int err;
+
+        if (rpcm)
+                *rpcm = NULL;
+
+        if ((err = snd_pcm_new(emu->card, "emu10k1 mic", device, 0, 1, &pcm)) < 0)
+                return err;
+
+        pcm->private_data = emu;
+
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_emu10k1_capture_mic_ops);
+
+        pcm->info_flags = 0;
+        strcpy(pcm->name, "Mic Capture");
+        emu->pcm_mic = pcm;
+
+        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci), 64*1024, 64*1024);
+
+        if (rpcm)
+                *rpcm = pcm;
+        return 0;
+}
+
+static int snd_emu10k1_pcm_efx_voices_mask_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+        struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+        int nefx = emu->audigy ? 64 : 32;
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = nefx;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int snd_emu10k1_pcm_efx_voices_mask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+        int nefx = emu->audigy ? 64 : 32;
+        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;
+}
+
+static int snd_emu10k1_pcm_efx_voices_mask_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+        unsigned int nval[2], bits;
+        int nefx = emu->audigy ? 64 : 32;
+        int nefxb = emu->audigy ? 7 : 6;
+        int change, idx;
+        
+        nval[0] = nval[1] = 0;
+        for (idx = 0, bits = 0; idx < nefx; idx++)
+                if (ucontrol->value.integer.value[idx]) {
+                        nval[idx / 32] |= 1 << (idx % 32);
+                        bits++;
+                }
+                
+        for (idx = 0; idx < nefxb; idx++)
+                if (1 << idx == bits)
+                        break;
+        
+        if (idx >= nefxb)
+                return -EINVAL;
+
+        spin_lock_irq(&emu->reg_lock);
+        change = (nval[0] != emu->efx_voices_mask[0]) ||
+                (nval[1] != emu->efx_voices_mask[1]);
+        emu->efx_voices_mask[0] = nval[0];
+        emu->efx_voices_mask[1] = nval[1];
+        spin_unlock_irq(&emu->reg_lock);
+        return change;
+}
+
+static struct snd_kcontrol_new snd_emu10k1_pcm_efx_voices_mask = {
+        .iface = SNDRV_CTL_ELEM_IFACE_PCM,
+        .name = "Captured FX8010 Outputs",
+        .info = snd_emu10k1_pcm_efx_voices_mask_info,
+        .get = snd_emu10k1_pcm_efx_voices_mask_get,
+        .put = snd_emu10k1_pcm_efx_voices_mask_put
 };
 
-static snd_pcm_ops_t snd_emu10k1_capture_efx_ops = {
-    snd_emu10k1_capture_efx_open,
-    snd_emu10k1_capture_efx_close,
-    snd_pcm_lib_ioctl,
-    snd_emu10k1_capture_hw_params,
-    snd_emu10k1_capture_hw_free,
-    snd_emu10k1_capture_prepare,
-    snd_emu10k1_capture_trigger,
-    snd_emu10k1_capture_pointer,0,0,0,0
+static struct snd_pcm_ops snd_emu10k1_capture_efx_ops = {
+        .open =                 snd_emu10k1_capture_efx_open,
+        .close =                snd_emu10k1_capture_efx_close,
+        .ioctl =                snd_pcm_lib_ioctl,
+        .hw_params =            snd_emu10k1_capture_hw_params,
+        .hw_free =              snd_emu10k1_capture_hw_free,
+        .prepare =              snd_emu10k1_capture_prepare,
+        .trigger =              snd_emu10k1_capture_trigger,
+        .pointer =              snd_emu10k1_capture_pointer,
 };
 
@@ -1545 +1534 @@
 static void snd_emu10k1_fx8010_playback_irq(struct snd_emu10k1 *emu, void *private_data)
 {
-    snd_pcm_substream_t *substream = private_data;
-    snd_pcm_period_elapsed(substream);
+        struct snd_pcm_substream *substream = private_data;
+        snd_pcm_period_elapsed(substream);
 }
 
 static void snd_emu10k1_fx8010_playback_tram_poke1(unsigned short *dst_left,
-                                                   unsigned short *dst_right,
-                                                   unsigned short *src,
-                                                   unsigned int count,
-                                                   unsigned int tram_shift)
-{
-    // printk("tram_poke1: dst_left = 0x%p, dst_right = 0x%p, src = 0x%p, count = 0x%x\n", dst_left, dst_right, src, count);
-    if ((tram_shift & 1) == 0) {
-        while (count--) {
-            *dst_left-- = *src++;
-            *dst_right-- = *src++;
-        }
-    } else {
-        while (count--) {
-            *dst_right-- = *src++;
-            *dst_left-- = *src++;
-        }
-    }
-}
-
-
-static void fx8010_pb_trans_copy(snd_pcm_substream_t *substream,
-                                 struct snd_pcm_indirect *rec, size_t bytes)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
-    unsigned int tram_size = pcm->buffer_size;
-    unsigned short *src = (unsigned short *)(substream->runtime->dma_area + rec->sw_data);
-    unsigned int frames = bytes >> 2, count;
-    unsigned int tram_pos = pcm->tram_pos;
-    unsigned int tram_shift = pcm->tram_shift;
-
-    while (frames > tram_pos) {
-        count = tram_pos + 1;
-        snd_emu10k1_fx8010_playback_tram_poke1((unsigned short *)emu->fx8010.etram_pages.area + tram_pos,
-                                               (unsigned short *)emu->fx8010.etram_pages.area + tram_pos + tram_size / 2,
-                                               src, count, tram_shift);
-        src += count * 2;
-        frames -= count;
-        tram_pos = (tram_size / 2) - 1;
-        tram_shift++;
-    }
-    snd_emu10k1_fx8010_playback_tram_poke1((unsigned short *)emu->fx8010.etram_pages.area + tram_pos,
-                                           (unsigned short *)emu->fx8010.etram_pages.area + tram_pos + tram_size / 2,
-                                           src, frames, tram_shift);
-    tram_pos -= frames;
-    pcm->tram_pos = tram_pos;
-    pcm->tram_shift = tram_shift;
-}
-
-static int snd_emu10k1_fx8010_playback_transfer(snd_pcm_substream_t *substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
-
-    snd_pcm_indirect_playback_transfer(substream, &pcm->pcm_rec, fx8010_pb_trans_copy);
-    return 0;
-}
-
-static int snd_emu10k1_fx8010_playback_hw_params(snd_pcm_substream_t * substream,
-                                                 snd_pcm_hw_params_t * hw_params)
-{
-    return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
-}
-
-static int snd_emu10k1_fx8010_playback_hw_free(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
-    unsigned int i;
-
-    for (i = 0; i < pcm->channels; i++)
-        snd_emu10k1_ptr_write(emu, TANKMEMADDRREGBASE + 0x80 + pcm->etram[i], 0, 0);
-    snd_pcm_lib_free_pages(substream);
-    return 0;
-}
-
-static int snd_emu10k1_fx8010_playback_prepare(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
-    unsigned int i;
-
-    // printk("prepare: etram_pages = 0x%p, dma_area = 0x%x, buffer_size = 0x%x (0x%x)\n", emu->fx8010.etram_pages, runtime->dma_area, runtime->buffer_size, runtime->buffer_size << 2);
-    memset(&pcm->pcm_rec, 0, sizeof(pcm->pcm_rec));
-    pcm->pcm_rec.hw_buffer_size = pcm->buffer_size * 2; /* byte size */
-    pcm->pcm_rec.sw_buffer_size = snd_pcm_lib_buffer_bytes(substream);
-    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);
-    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));
-    return 0;
-}
-
-static int snd_emu10k1_fx8010_playback_trigger(snd_pcm_substream_t * substream, int cmd)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
-    int result = 0;
-
-    spin_lock(&emu->reg_lock);
-    switch (cmd) {
-    case SNDRV_PCM_TRIGGER_START:
-        /* follow thru */
-    case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+                                                   unsigned short *dst_right,
+                                                   unsigned short *src,
+                                                   unsigned int count,
+                                                   unsigned int tram_shift)
+{
+        /* printk("tram_poke1: dst_left = 0x%p, dst_right = 0x%p, src = 0x%p, count = 0x%x\n", dst_left, dst_right, src, count); */
+        if ((tram_shift & 1) == 0) {
+                while (count--) {
+                        *dst_left-- = *src++;
+                        *dst_right-- = *src++;
+                }
+        } else {
+                while (count--) {
+                        *dst_right-- = *src++;
+                        *dst_left-- = *src++;
+                }
+        }
+}
+
+static void fx8010_pb_trans_copy(struct snd_pcm_substream *substream,
+                                 struct snd_pcm_indirect *rec, size_t bytes)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+        struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
+        unsigned int tram_size = pcm->buffer_size;
+        unsigned short *src = (unsigned short *)(substream->runtime->dma_area + rec->sw_data);
+        unsigned int frames = bytes >> 2, count;
+        unsigned int tram_pos = pcm->tram_pos;
+        unsigned int tram_shift = pcm->tram_shift;
+
+        while (frames > tram_pos) {
+                count = tram_pos + 1;
+                snd_emu10k1_fx8010_playback_tram_poke1((unsigned short *)emu->fx8010.etram_pages.area + tram_pos,
+                                                       (unsigned short *)emu->fx8010.etram_pages.area + tram_pos + tram_size / 2,
+                                                       src, count, tram_shift);
+                src += count * 2;
+                frames -= count;
+                tram_pos = (tram_size / 2) - 1;
+                tram_shift++;
+        }
+        snd_emu10k1_fx8010_playback_tram_poke1((unsigned short *)emu->fx8010.etram_pages.area + tram_pos,
+                                               (unsigned short *)emu->fx8010.etram_pages.area + tram_pos + tram_size / 2,
+                                               src, frames, tram_shift);
+        tram_pos -= frames;
+        pcm->tram_pos = tram_pos;
+        pcm->tram_shift = tram_shift;
+}
+
+static int snd_emu10k1_fx8010_playback_transfer(struct snd_pcm_substream *substream)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+        struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
+
+        snd_pcm_indirect_playback_transfer(substream, &pcm->pcm_rec, fx8010_pb_trans_copy);
+        return 0;
+}
+
+static int snd_emu10k1_fx8010_playback_hw_params(struct snd_pcm_substream *substream,
+                                                 struct snd_pcm_hw_params *hw_params)
+{
+        return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
+}
+
+static int snd_emu10k1_fx8010_playback_hw_free(struct snd_pcm_substream *substream)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+        struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
+        unsigned int i;
+
+        for (i = 0; i < pcm->channels; i++)
+                snd_emu10k1_ptr_write(emu, TANKMEMADDRREGBASE + 0x80 + pcm->etram[i], 0, 0);
+        snd_pcm_lib_free_pages(substream);
+        return 0;
+}
+
+static int snd_emu10k1_fx8010_playback_prepare(struct snd_pcm_substream *substream)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
+        unsigned int i;
+        
+        /* printk("prepare: etram_pages = 0x%p, dma_area = 0x%x, buffer_size = 0x%x (0x%x)\n", emu->fx8010.etram_pages, runtime->dma_area, runtime->buffer_size, runtime->buffer_size << 2); */
+        memset(&pcm->pcm_rec, 0, sizeof(pcm->pcm_rec));
+        pcm->pcm_rec.hw_buffer_size = pcm->buffer_size * 2; /* byte size */
+        pcm->pcm_rec.sw_buffer_size = snd_pcm_lib_buffer_bytes(substream);
+        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);
+        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));
+        return 0;
+}
+
+static int snd_emu10k1_fx8010_playback_trigger(struct snd_pcm_substream *substream, int cmd)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+        struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
+        int result = 0;
+
+        spin_lock(&emu->reg_lock);
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+                /* follow thru */
+        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+        case SNDRV_PCM_TRIGGER_RESUME:
 #ifdef EMU10K1_SET_AC3_IEC958
-        {
-            int i;
-            for (i = 0; i < 3; i++) {
-                unsigned int bits;
-                bits = SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
-                    SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC | SPCS_GENERATIONSTATUS |
-                    0x00001200 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT | SPCS_NOTAUDIODATA;
-                snd_emu10k1_ptr_write(emu, SPCS0 + i, 0, bits);
-            }
-        }
+        {
+                int i;
+                for (i = 0; i < 3; i++) {
+                        unsigned int bits;
+                        bits = SPCS_CLKACCY_1000PPM | SPCS_SAMPLERATE_48 |
+                               SPCS_CHANNELNUM_LEFT | SPCS_SOURCENUM_UNSPEC | SPCS_GENERATIONSTATUS |
+                               0x00001200 | SPCS_EMPHASIS_NONE | SPCS_COPYRIGHT | SPCS_NOTAUDIODATA;
+                        snd_emu10k1_ptr_write(emu, SPCS0 + i, 0, bits);
+                }
+        }
 #endif
-        result = snd_emu10k1_fx8010_register_irq_handler(emu, snd_emu10k1_fx8010_playback_irq, pcm->gpr_running, substream, &pcm->irq);
-        if (result < 0)
-            goto __err;
-        snd_emu10k1_fx8010_playback_transfer(substream);        /* roll the ball */
-        snd_emu10k1_ptr_write(emu, emu->gpr_base + pcm->gpr_trigger, 0, 1);
-        break;
-    case SNDRV_PCM_TRIGGER_STOP:
-    case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-        snd_emu10k1_fx8010_unregister_irq_handler(emu, pcm->irq); pcm->irq = NULL;
-        snd_emu10k1_ptr_write(emu, emu->gpr_base + pcm->gpr_trigger, 0, 0);
-        pcm->tram_pos = INITIAL_TRAM_POS(pcm->buffer_size);
-        pcm->tram_shift = 0;
-        break;
-    default:
-        result = -EINVAL;
-        break;
-    }
-__err:
-    spin_unlock(&emu->reg_lock);
-    return result;
-}
-
-static snd_pcm_uframes_t snd_emu10k1_fx8010_playback_pointer(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
-    size_t ptr; /* byte pointer */
-
-    if (!snd_emu10k1_ptr_read(emu, emu->gpr_base + pcm->gpr_trigger, 0))
-        return 0;
-    ptr = snd_emu10k1_ptr_read(emu, emu->gpr_base + pcm->gpr_ptr, 0) << 2;
-    return snd_pcm_indirect_playback_pointer(substream, &pcm->pcm_rec, ptr);
+                result = snd_emu10k1_fx8010_register_irq_handler(emu, snd_emu10k1_fx8010_playback_irq, pcm->gpr_running, substream, &pcm->irq);
+                if (result < 0)
+                        goto __err;
+                snd_emu10k1_fx8010_playback_transfer(substream);        /* roll the ball */
+                snd_emu10k1_ptr_write(emu, emu->gpr_base + pcm->gpr_trigger, 0, 1);
+                break;
+        case SNDRV_PCM_TRIGGER_STOP:
+        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+                snd_emu10k1_fx8010_unregister_irq_handler(emu, pcm->irq); pcm->irq = NULL;
+                snd_emu10k1_ptr_write(emu, emu->gpr_base + pcm->gpr_trigger, 0, 0);
+                pcm->tram_pos = INITIAL_TRAM_POS(pcm->buffer_size);
+                pcm->tram_shift = 0;
+                break;
+        default:
+                result = -EINVAL;
+                break;
+        }
+      __err:
+        spin_unlock(&emu->reg_lock);
+        return result;
+}
+
+static snd_pcm_uframes_t snd_emu10k1_fx8010_playback_pointer(struct snd_pcm_substream *substream)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+        struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
+        size_t ptr; /* byte pointer */
+
+        if (!snd_emu10k1_ptr_read(emu, emu->gpr_base + pcm->gpr_trigger, 0))
+                return 0;
+        ptr = snd_emu10k1_ptr_read(emu, emu->gpr_base + pcm->gpr_ptr, 0) << 2;
+        return snd_pcm_indirect_playback_pointer(substream, &pcm->pcm_rec, ptr);
 }
 
 static struct snd_pcm_hardware snd_emu10k1_fx8010_playback =
 {
-    .info =                     (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
-                                 SNDRV_PCM_INFO_RESUME |
-                                 /* SNDRV_PCM_INFO_MMAP_VALID | */ SNDRV_PCM_INFO_PAUSE),
-                                 .formats =             SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-                                 .rates =               SNDRV_PCM_RATE_48000,
-                                 .rate_min =            48000,
-                                 .rate_max =            48000,
-                                 .channels_min =                1,
-                                 .channels_max =                1,
-                                 .buffer_bytes_max =    (128*1024),
-                                 .period_bytes_min =    1024,
-                                 .period_bytes_max =    (128*1024),
-                                 .periods_min =         1,
-                                 .periods_max =         1024,
-                                 .fifo_size =           0,
+        .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+                                 SNDRV_PCM_INFO_RESUME |
+                                 /* SNDRV_PCM_INFO_MMAP_VALID | */ SNDRV_PCM_INFO_PAUSE),
+        .formats =              SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+        .rates =                SNDRV_PCM_RATE_48000,
+        .rate_min =             48000,
+        .rate_max =             48000,
+        .channels_min =         1,
+        .channels_max =         1,
+        .buffer_bytes_max =     (128*1024),
+        .period_bytes_min =     1024,
+        .period_bytes_max =     (128*1024),
+        .periods_min =          1,
+        .periods_max =          1024,
+        .fifo_size =            0,
 };
 
-static int snd_emu10k1_fx8010_playback_open(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
-
-    runtime->hw = snd_emu10k1_fx8010_playback;
-    runtime->hw.channels_min = runtime->hw.channels_max = pcm->channels;
-    runtime->hw.period_bytes_max = (pcm->buffer_size * 2) / 2;
-    spin_lock_irq(&emu->reg_lock);
-    if (pcm->valid == 0) {
-        spin_unlock_irq(&emu->reg_lock);
-        return -ENODEV;
-    }
-    pcm->opened = 1;
-    spin_unlock_irq(&emu->reg_lock);
-    return 0;
-}
-
-static int snd_emu10k1_fx8010_playback_close(snd_pcm_substream_t * substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
-
-    spin_lock_irq(&emu->reg_lock);
-    pcm->opened = 0;
-    spin_unlock_irq(&emu->reg_lock);
-    return 0;
+static int snd_emu10k1_fx8010_playback_open(struct snd_pcm_substream *substream)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
+
+        runtime->hw = snd_emu10k1_fx8010_playback;
+        runtime->hw.channels_min = runtime->hw.channels_max = pcm->channels;
+        runtime->hw.period_bytes_max = (pcm->buffer_size * 2) / 2;
+        spin_lock_irq(&emu->reg_lock);
+        if (pcm->valid == 0) {
+                spin_unlock_irq(&emu->reg_lock);
+                return -ENODEV;
+        }
+        pcm->opened = 1;
+        spin_unlock_irq(&emu->reg_lock);
+        return 0;
+}
+
+static int snd_emu10k1_fx8010_playback_close(struct snd_pcm_substream *substream)
+{
+        struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+        struct snd_emu10k1_fx8010_pcm *pcm = &emu->fx8010.pcm[substream->number];
+
+        spin_lock_irq(&emu->reg_lock);
+        pcm->opened = 0;
+        spin_unlock_irq(&emu->reg_lock);
+        return 0;
 }
 
@@ -1768 +1758 @@
 };
 
-static void snd_emu10k1_pcm_efx_free(snd_pcm_t *pcm)
-{
-    struct snd_emu10k1 *emu = pcm->private_data;
-    emu->pcm_efx = NULL;
-    snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
-int __devinit snd_emu10k1_pcm_efx(struct snd_emu10k1 * emu, int device, snd_pcm_t ** rpcm)
-{
-    snd_pcm_t *pcm;
-    snd_kcontrol_t *kctl;
-    int err;
-
-    if (rpcm)
-        *rpcm = NULL;
-
-    if ((err = snd_pcm_new(emu->card, "emu10k1 efx", device, 8, 1, &pcm)) < 0)
-        return err;
-
-    pcm->private_data = emu;
-    pcm->private_free = snd_emu10k1_pcm_efx_free;
-
-    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, "EMU10K1 EFX");
-    emu->pcm_efx = pcm;
-    if (rpcm)
-        *rpcm = 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;
-        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;
-    snd_ctl_add(emu->card, kctl);
-    snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci), 64*1024, 64*1024);
-
-    return 0;
-}
-
+int __devinit snd_emu10k1_pcm_efx(struct snd_emu10k1 * emu, int device, struct snd_pcm ** rpcm)
+{
+        struct snd_pcm *pcm;
+        struct snd_kcontrol *kctl;
+        int err;
+
+        if (rpcm)
+                *rpcm = NULL;
+
+        if ((err = snd_pcm_new(emu->card, "emu10k1 efx", device, 8, 1, &pcm)) < 0)
+                return err;
+
+        pcm->private_data = emu;
+
+        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");
+        emu->pcm_efx = pcm;
+        if (rpcm)
+                *rpcm = 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;
+                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;
+        snd_ctl_add(emu->card, kctl);
+
+        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(emu->pci), 64*1024, 64*1024);
+
+        return 0;
+}

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

@@ -26 +26 @@
  */
 
-#define __NO_VERSION__
 #include <sound/driver.h>
 #include <linux/time.h>
@@ -62 +61 @@
         }
 }
+
+EXPORT_SYMBOL(snd_emu10k1_ptr_read);
 
 void snd_emu10k1_ptr_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned int chn, unsigned int data)
@@ -93 +94 @@
 }
 
+EXPORT_SYMBOL(snd_emu10k1_ptr_write);
+
 unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu,
                                     unsigned int reg,
@@ -123 +126 @@
     outl(data, emu->port + 0x20 + DATA);
     spin_unlock_irqrestore(&emu->emu_lock, flags);
+}
+
+int snd_emu10k1_spi_write(struct snd_emu10k1 * emu,
+                                   unsigned int data)
+{
+        unsigned int reset, set;
+        unsigned int reg, tmp;
+        int n, result;
+        if (emu->card_capabilities->ca0108_chip)
+                reg = 0x3c; /* PTR20, reg 0x3c */
+        else {
+                /* For other chip types the SPI register
+                 * is currently unknown. */
+                return 1;
+        }
+        if (data > 0xffff) /* Only 16bit values allowed */
+                return 1;
+
+        tmp = snd_emu10k1_ptr20_read(emu, reg, 0);
+        reset = (tmp & ~0x3ffff) | 0x20000; /* Set xxx20000 */
+        set = reset | 0x10000; /* Set xxx1xxxx */
+        snd_emu10k1_ptr20_write(emu, reg, 0, reset | data);
+        tmp = snd_emu10k1_ptr20_read(emu, reg, 0); /* write post */
+        snd_emu10k1_ptr20_write(emu, reg, 0, set | data);
+        result = 1;
+        /* Wait for status bit to return to 0 */
+        for (n = 0; n < 100; n++) {
+                udelay(10);
+                tmp = snd_emu10k1_ptr20_read(emu, reg, 0);
+                if (!(tmp & 0x10000)) {
+                        result = 0;
+                        break;
+                }
+        }
+        if (result) /* Timed out */
+                return 1;
+        snd_emu10k1_ptr20_write(emu, reg, 0, reset | data);
+        tmp = snd_emu10k1_ptr20_read(emu, reg, 0); /* Write post */
+        return 0;
+}
+
+int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, int reg, int value)
+{
+        if (reg < 0 || reg > 0x3f)
+                return 1;
+        reg += 0x40; /* 0x40 upwards are registers. */
+        if (value < 0 || value > 0x3f) /* 0 to 0x3f are values */
+                return 1;
+        outl(reg, emu->port + A_IOCFG);
+        udelay(10);
+        outl(reg | 0x80, emu->port + A_IOCFG);  /* High bit clocks the value into the fpga. */
+        udelay(10);
+        outl(value, emu->port + A_IOCFG);
+        udelay(10);
+        outl(value | 0x80 , emu->port + A_IOCFG);  /* High bit clocks the value into the fpga. */
+
+        return 0;
+}
+
+int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, int reg, int *value)
+{
+        if (reg < 0 || reg > 0x3f)
+                return 1;
+        reg += 0x40; /* 0x40 upwards are registers. */
+        outl(reg, emu->port + A_IOCFG);
+        udelay(10);
+        outl(reg | 0x80, emu->port + A_IOCFG);  /* High bit clocks the value into the fpga. */
+        udelay(10);
+        *value = ((inl(emu->port + A_IOCFG) >> 8) & 0x7f);
+
+        return 0;
+}
+
+/* Each Destination has one and only one Source,
+ * but one Source can feed any number of Destinations simultaneously.
+ */
+int snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 * emu, int dst, int 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;
 }
 
@@ -320 +407 @@
 }
 
-unsigned short snd_emu10k1_ac97_read(ac97_t *ac97, unsigned short reg)
+unsigned short snd_emu10k1_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
 {
     struct snd_emu10k1 *emu = ac97->private_data;
@@ -333 +420 @@
 }
 
-void snd_emu10k1_ac97_write(ac97_t *ac97, unsigned short reg, unsigned short data)
+void snd_emu10k1_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short data)
 {
     struct snd_emu10k1 *emu = ac97->private_data;
@@ -403 +490 @@
         return 0;               /* Should never reach this point */
 }
-
-/*
- *  Returns an attenuation based upon a cumulative volume value
- *  Algorithm calculates 0x200 - 0x10 log2 (input)
- */
-
-unsigned char snd_emu10k1_sum_vol_attn(unsigned int value)
-{
-        unsigned short count = 16, ans;
-
-        if (value == 0)
-                return 0xFF;
-
-        /* Find first SET bit. This is the integer part of the value */
-        while ((value & 0x10000) == 0) {
-                value <<= 1;
-                count--;
-        }
-
-        /* The REST of the data is the fractional part. */
-        ans = (unsigned short) (0x110 - ((count << 4) + ((value & 0x0FFFFL) >> 12)));
-        if (ans > 0xFF)
-                ans = 0xFF;
-
-        return (unsigned char) ans;
-}

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

@@ -32 +32 @@
 #include <sound/emu10k1.h>
 
-irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id)
 {
     struct snd_emu10k1 *emu = dev_id;
     unsigned int status, status2, orig_status, orig_status2;
     int handled = 0;
-#ifdef TARGET_OS2
-    int fOurIrq = FALSE;
-#endif
 
     while ((status = inl(emu->port + IPR)) != 0) {
-        // printk("irq - status = 0x%x\n", status);
-#ifdef TARGET_OS2
-#if 1
-        if (status & (IPR_CHANNELNUMBERMASK|IPR_A_MIDITRANSBUFEMPTY2|IPR_A_MIDIRECVBUFEMPTY2|
-                      IPR_SAMPLERATETRACKER|IPR_FXDSP|IPR_FORCEINT|IPR_PCIERROR|IPR_VOLINCR|
-                      IPR_VOLDECR|IPR_MUTE|IPR_MICBUFFULL|IPR_MICBUFHALFFULL|IPR_ADCBUFFULL|
-                      IPR_ADCBUFHALFFULL|IPR_EFXBUFFULL|IPR_EFXBUFHALFFULL|IPR_GPSPDIFSTATUSCHANGE|
-                      IPR_CDROMSTATUSCHANGE|IPR_INTERVALTIMER|IPR_MIDITRANSBUFEMPTY|IPR_MIDIRECVBUFEMPTY|
-                      IPR_CHANNELLOOP))
-#else
-            if (status)
-#endif
-            {
-                fOurIrq = TRUE;
-            }
-#endif
+        //snd_printk(KERN_INFO "emu10k1 irq - status = 0x%x\n", status);
         orig_status = status;
         handled = 1;
+        if ((status & 0xffffffff) == 0xffffffff) {
+            snd_printk(KERN_INFO "snd-emu10k1: Suspected sound card removal\n");
+            break;
+        }
         if (status & IPR_PCIERROR) {
-            //                  snd_printk("interrupt: PCI error\n");
+            snd_printk("interrupt: PCI error\n");
             snd_emu10k1_intr_disable(emu, INTE_PCIERRORENABLE);
             status &= ~IPR_PCIERROR;

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

@@ -65 +65 @@
             /* do not increment ptr */
             __set_ptb_entry(emu, page, emu->silent_page.addr);
-//              __set_ptb_entry(emu, page, emu->silent_page_dmaaddr);
 }
 #endif /* PAGE_SIZE */
@@ -290 +289 @@
  * page allocation for DMA
  */
-snd_util_memblk_t *
-snd_emu10k1_alloc_pages(struct snd_emu10k1 *emu, snd_pcm_substream_t *substream)
-{
-    snd_pcm_runtime_t *runtime = substream->runtime;
+struct snd_util_memblk *
+snd_emu10k1_alloc_pages(struct snd_emu10k1 *emu, struct snd_pcm_substream *substream)
+{
+    struct snd_pcm_runtime *runtime = substream->runtime;
     struct snd_sg_buf *sgbuf = snd_pcm_substream_sgbuf(substream);
-    snd_util_memhdr_t *hdr;
+    struct snd_util_memhdr *hdr;
     struct snd_emu10k1_memblk *blk;
     int page, err, idx;
@@ -338 +337 @@
     err = snd_emu10k1_memblk_map(emu, blk);
     if (err < 0) {
-        __snd_util_mem_free(hdr, (snd_util_memblk_t *)blk);
+        __snd_util_mem_free(hdr, (struct snd_util_memblk *)blk);
         up(&hdr->block_mutex);
         return NULL;
     }
     up(&hdr->block_mutex);
-    return (snd_util_memblk_t *)blk;
+    return (struct snd_util_memblk *)blk;
 }
 
@@ -350 +349 @@
  * release DMA buffer from page table
  */
-int snd_emu10k1_free_pages(struct snd_emu10k1 *emu, snd_util_memblk_t *blk)
+int snd_emu10k1_free_pages(struct snd_emu10k1 *emu, struct snd_util_memblk *blk)
 {
         snd_assert(emu && blk, return -EINVAL);
@@ -365 +364 @@
  * allocate a synth sample area
  */
-snd_util_memblk_t *
+struct snd_util_memblk *
 snd_emu10k1_synth_alloc(struct snd_emu10k1 *hw, unsigned int size)
 {
-        struct snd_emu10k1_memblk *blk;
-        snd_util_memhdr_t *hdr = hw->memhdr;
+    struct snd_emu10k1_memblk *blk;
+    struct snd_util_memhdr *hdr = hw->memhdr; 
 
         down(&hdr->block_mutex);
@@ -377 +376 @@
                 return NULL;
         }
-        if (synth_alloc_pages(hw, blk)) {
-                __snd_util_mem_free(hdr, (snd_util_memblk_t *)blk);
+        if (synth_alloc_pages(hw, blk)) {
+            __snd_util_mem_free(hdr, (struct snd_util_memblk *)blk);
                 up(&hdr->block_mutex);
                 return NULL;
@@ -384 +383 @@
         snd_emu10k1_memblk_map(hw, blk);
         up(&hdr->block_mutex);
-        return (snd_util_memblk_t *)blk;
+        return (struct snd_util_memblk *)blk;
 }
 

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

@@ -100 +100 @@
 #include <sound/ac97_codec.h>
 #include <sound/info.h>
+#include <sound/tlv.h>
 #include <sound/emu10k1.h>
 #include "p16v.h"
@@ -107 +108 @@
 #define PCM_REAR_CHANNEL 1
 #define PCM_CENTER_LFE_CHANNEL 2
-#define PCM_UNKNOWN_CHANNEL 3
+#define PCM_SIDE_CHANNEL 3
 #define CONTROL_FRONT_CHANNEL 0
 #define CONTROL_REAR_CHANNEL 3
 #define CONTROL_CENTER_LFE_CHANNEL 1
-#define CONTROL_UNKNOWN_CHANNEL 2
+#define CONTROL_SIDE_CHANNEL 2
 
 /* Card IDs:
@@ -122 +123 @@
 
 /* hardware definition */
-static snd_pcm_hardware_t snd_p16v_playback_hw = {
-    /*.info =                  */ (SNDRV_PCM_INFO_MMAP |
-                                 SNDRV_PCM_INFO_INTERLEAVED |
-                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                                 SNDRV_PCM_INFO_MMAP_VALID),
-    /* .formats =             */     SNDRV_PCM_FMTBIT_S32_LE, /* Only supports 24-bit samples padded to 32 bits. */
-    /* .rates =       */     SNDRV_PCM_RATE_192000 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_44100,
-    /* .rate_min =            */  44100,
-    /* .rate_max =            */  192000,
-    /* .channels_min =    */    8,
-    /* .channels_max =    */    8,
-    /* .buffer_bytes_max =*/    ((65536 - 64) * 8),
-    /* .period_bytes_min =*/    64,
-    /* .period_bytes_max =*/    (65536 - 64),
-    /* .periods_min =     */    2,
-    /* .periods_max =     */    8,
-    /* .fifo_size =           */  0
+static struct snd_pcm_hardware snd_p16v_playback_hw = {
+        .info =                 (SNDRV_PCM_INFO_MMAP | 
+                                 SNDRV_PCM_INFO_INTERLEAVED |
+                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                 SNDRV_PCM_INFO_RESUME |
+                                 SNDRV_PCM_INFO_MMAP_VALID),
+        .formats =              SNDRV_PCM_FMTBIT_S32_LE, /* Only supports 24-bit samples padded to 32 bits. */
+        .rates =                SNDRV_PCM_RATE_192000 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_44100, 
+        .rate_min =             44100,
+        .rate_max =             192000,
+        .channels_min =         8, 
+        .channels_max =         8,
+        .buffer_bytes_max =     ((65536 - 64) * 8),
+        .period_bytes_min =     64,
+        .period_bytes_max =     (65536 - 64),
+        .periods_min =          2,
+        .periods_max =          8,
+        .fifo_size =            0,
 };
 
-static snd_pcm_hardware_t snd_p16v_capture_hw = {
-    /*.info =                */ (SNDRV_PCM_INFO_MMAP |
-                             SNDRV_PCM_INFO_INTERLEAVED |
-                             SNDRV_PCM_INFO_BLOCK_TRANSFER |
-                             SNDRV_PCM_INFO_MMAP_VALID),
-    /*  .formats =            */  SNDRV_PCM_FMTBIT_S32_LE,
-    /*  .rates =              */  SNDRV_PCM_RATE_192000 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_44100,
-    /*  .rate_min =           */  44100,
-    /*  .rate_max =           */  192000,
-    /*  .channels_min =       */  2,
-    /*  .channels_max =       */  2,
-    /*  .buffer_bytes_max =   */  (65536 - 64),
-    /*  .period_bytes_min =   */  64,
-    /*  .period_bytes_max =   */  (65536 - 128) >> 1,  /* size has to be N*64 bytes */
-    /*  .periods_min =        */  2,
-    /*  .periods_max =        */  2,
-    /*  .fifo_size =          */  0
+static struct snd_pcm_hardware snd_p16v_capture_hw = {
+        .info =                 (SNDRV_PCM_INFO_MMAP |
+                                 SNDRV_PCM_INFO_INTERLEAVED |
+                                 SNDRV_PCM_INFO_BLOCK_TRANSFER |
+                                 SNDRV_PCM_INFO_RESUME |
+                                 SNDRV_PCM_INFO_MMAP_VALID),
+        .formats =              SNDRV_PCM_FMTBIT_S32_LE,
+        .rates =                SNDRV_PCM_RATE_192000 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_44100, 
+        .rate_min =             44100,
+        .rate_max =             192000,
+        .channels_min =         2,
+        .channels_max =         2,
+        .buffer_bytes_max =     (65536 - 64),
+        .period_bytes_min =     64,
+        .period_bytes_max =     (65536 - 128) >> 1,  /* size has to be N*64 bytes */
+        .periods_min =          2,
+        .periods_max =          2,
+        .fifo_size =            0,
 };
 
-static void snd_p16v_pcm_free_substream(snd_pcm_runtime_t *runtime)
+static void snd_p16v_pcm_free_substream(struct snd_pcm_runtime *runtime)
 {
     struct snd_emu10k1_pcm *epcm = runtime->private_data;
@@ -171 +174 @@
 
 /* open_playback callback */
-static int snd_p16v_pcm_open_playback_channel(snd_pcm_substream_t *substream, int channel_id)
+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;
-    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_pcm_runtime *runtime = substream->runtime;
     int err;
 
-    epcm = (struct snd_emu10k1_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
+    epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
     //snd_printk("epcm kcalloc: %p\n", epcm);
 
@@ -208 +211 @@
 
 /* open_capture callback */
-static int snd_p16v_pcm_open_capture_channel(snd_pcm_substream_t *substream, int channel_id)
+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;
-    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_pcm_runtime *runtime = substream->runtime;
     int err;
 
-    epcm = (struct snd_emu10k1_pcm *)kzalloc(sizeof(*epcm), GFP_KERNEL);
+    epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
     //snd_printk("epcm kcalloc: %p\n", epcm);
 
@@ -246 +249 @@
 
 /* close callback */
-static int snd_p16v_pcm_close_playback(snd_pcm_substream_t *substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    //snd_pcm_runtime_t *runtime = substream->runtime;
+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;
@@ -257 +260 @@
 
 /* close callback */
-static int snd_p16v_pcm_close_capture(snd_pcm_substream_t *substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    //snd_pcm_runtime_t *runtime = substream->runtime;
+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;
@@ -267 +270 @@
 }
 
-static int snd_p16v_pcm_open_playback_front(snd_pcm_substream_t *substream)
+static int snd_p16v_pcm_open_playback_front(struct snd_pcm_substream *substream)
 {
     return snd_p16v_pcm_open_playback_channel(substream, PCM_FRONT_CHANNEL);
 }
 
-static int snd_p16v_pcm_open_capture(snd_pcm_substream_t *substream)
+static int snd_p16v_pcm_open_capture(struct snd_pcm_substream *substream)
 {
     // Only using channel 0 for now, but the card has 2 channels.
@@ -279 +282 @@
 
 /* hw_params callback */
-static int snd_p16v_pcm_hw_params_playback(snd_pcm_substream_t *substream,
-                                           snd_pcm_hw_params_t * hw_params)
+static int snd_p16v_pcm_hw_params_playback(struct snd_pcm_substream *substream,
+                                      struct snd_pcm_hw_params *hw_params)
 {
     int result;
@@ -289 +292 @@
 
 /* hw_params callback */
-static int snd_p16v_pcm_hw_params_capture(snd_pcm_substream_t *substream,
-                                          snd_pcm_hw_params_t * hw_params)
+static int snd_p16v_pcm_hw_params_capture(struct snd_pcm_substream *substream,
+                                      struct snd_pcm_hw_params *hw_params)
 {
     int result;
@@ -300 +303 @@
 
 /* hw_free callback */
-static int snd_p16v_pcm_hw_free_playback(snd_pcm_substream_t *substream)
+static int snd_p16v_pcm_hw_free_playback(struct snd_pcm_substream *substream)
 {
     int result;
@@ -308 +311 @@
 
 /* hw_free callback */
-static int snd_p16v_pcm_hw_free_capture(snd_pcm_substream_t *substream)
+static int snd_p16v_pcm_hw_free_capture(struct snd_pcm_substream *substream)
 {
     int result;
@@ -317 +320 @@
 
 /* prepare playback callback */
-static int snd_p16v_pcm_prepare_playback(snd_pcm_substream_t *substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
+static int snd_p16v_pcm_prepare_playback(struct snd_pcm_substream *substream)
+{
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_pcm_runtime *runtime = substream->runtime;
     int channel = substream->pcm->device - emu->p16v_device_offset;
     u32 *table_base = (u32 *)(emu->p16v_buffer.area+(8*16*channel));
@@ -366 +369 @@
 
 /* prepare capture callback */
-static int snd_p16v_pcm_prepare_capture(snd_pcm_substream_t *substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
+static int snd_p16v_pcm_prepare_capture(struct snd_pcm_substream *substream)
+{
+    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
+    struct snd_pcm_runtime *runtime = substream->runtime;
     int channel = substream->pcm->device - emu->p16v_device_offset;
     u32 tmp;
@@ -423 +426 @@
 
 /* trigger_playback callback */
-static int snd_p16v_pcm_trigger_playback(snd_pcm_substream_t *substream,
+static int snd_p16v_pcm_trigger_playback(struct snd_pcm_substream *substream,
                                          int cmd)
 {
     struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime;
+    struct snd_pcm_runtime *runtime;
     struct snd_emu10k1_pcm *epcm;
     int channel;
     int result = 0;
     struct list_head *pos;
-    snd_pcm_substream_t *s;
+    struct snd_pcm_substream *s;
     u32 basic = 0;
     u32 inte = 0;
@@ -476 +479 @@
 
 /* trigger_capture callback */
-static int snd_p16v_pcm_trigger_capture(snd_pcm_substream_t *substream,
+static int snd_p16v_pcm_trigger_capture(struct snd_pcm_substream *substream,
                                         int cmd)
 {
     struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
+    struct snd_pcm_runtime *runtime = substream->runtime;
     struct snd_emu10k1_pcm *epcm = runtime->private_data;
     int channel = 0;
@@ -507 +510 @@
 /* pointer_playback callback */
 static snd_pcm_uframes_t
-snd_p16v_pcm_pointer_playback(snd_pcm_substream_t *substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
+snd_p16v_pcm_pointer_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;
     snd_pcm_uframes_t ptr, ptr1, ptr2,ptr3,ptr4 = 0;
@@ -532 +535 @@
 /* pointer_capture callback */
 static snd_pcm_uframes_t
-snd_p16v_pcm_pointer_capture(snd_pcm_substream_t *substream)
-{
-    struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
+snd_p16v_pcm_pointer_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;
     snd_pcm_uframes_t ptr, ptr1, ptr2 = 0;
@@ -556 +559 @@
 
 /* operators */
-static snd_pcm_ops_t snd_p16v_playback_front_ops = {
-    /*.open =        */snd_p16v_pcm_open_playback_front,
-    /*.close =       */snd_p16v_pcm_close_playback,
-    /*.ioctl =       */snd_pcm_lib_ioctl,
-    /*.hw_params =   */snd_p16v_pcm_hw_params_playback,
-    /*.hw_free =     */snd_p16v_pcm_hw_free_playback,
-    /*.prepare =     */snd_p16v_pcm_prepare_playback,
-    /*.trigger =     */snd_p16v_pcm_trigger_playback,
-    /*.pointer =     */snd_p16v_pcm_pointer_playback,
-    0,0,0,0
+static struct snd_pcm_ops snd_p16v_playback_front_ops = {
+        .open =        snd_p16v_pcm_open_playback_front,
+        .close =       snd_p16v_pcm_close_playback,
+        .ioctl =       snd_pcm_lib_ioctl,
+        .hw_params =   snd_p16v_pcm_hw_params_playback,
+        .hw_free =     snd_p16v_pcm_hw_free_playback,
+        .prepare =     snd_p16v_pcm_prepare_playback,
+        .trigger =     snd_p16v_pcm_trigger_playback,
+        .pointer =     snd_p16v_pcm_pointer_playback,
 };
 
-static snd_pcm_ops_t snd_p16v_capture_ops = {
-    /*.open =        */snd_p16v_pcm_open_capture,
-    /*.close =       */snd_p16v_pcm_close_capture,
-    /*.ioctl =       */snd_pcm_lib_ioctl,
-    /*.hw_params =   */snd_p16v_pcm_hw_params_capture,
-    /*.hw_free =     */snd_p16v_pcm_hw_free_capture,
-    /*.prepare =     */snd_p16v_pcm_prepare_capture,
-    /*.trigger =     */snd_p16v_pcm_trigger_capture,
-    /*.pointer =     */snd_p16v_pcm_pointer_capture,
-    0,0,0,0
+static struct snd_pcm_ops snd_p16v_capture_ops = {
+        .open =        snd_p16v_pcm_open_capture,
+        .close =       snd_p16v_pcm_close_capture,
+        .ioctl =       snd_pcm_lib_ioctl,
+        .hw_params =   snd_p16v_pcm_hw_params_capture,
+        .hw_free =     snd_p16v_pcm_hw_free_capture,
+        .prepare =     snd_p16v_pcm_prepare_capture,
+        .trigger =     snd_p16v_pcm_trigger_capture,
+        .pointer =     snd_p16v_pcm_pointer_capture,
 };
 
@@ -590 +591 @@
 }
 
-static void snd_p16v_pcm_free(snd_pcm_t *pcm)
-{
-    struct snd_emu10k1 *emu = pcm->private_data;
-    //snd_printk("snd_p16v_pcm_free pcm: called\n");
-    snd_pcm_lib_preallocate_free_for_all(pcm);
-    emu->pcm = NULL;
-}
-
-int snd_p16v_pcm(struct snd_emu10k1 *emu, int device, snd_pcm_t **rpcm)
-{
-    snd_pcm_t *pcm;
-    snd_pcm_substream_t *substream;
+int __devinit snd_p16v_pcm(struct snd_emu10k1 *emu, int device, struct snd_pcm **rpcm)
+{
+    struct snd_pcm *pcm;
+    struct snd_pcm_substream *substream;
     int err;
     int capture=1;
@@ -613 +606 @@
 
     pcm->private_data = emu;
-    pcm->private_free = snd_p16v_pcm_free;
     // Single playback 8 channel device.
     // Single capture 2 channel device.
@@ -622 +614 @@
     pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
     strcpy(pcm->name, "p16v");
-    emu->pcm = pcm;
+    emu->pcm_p16v = pcm;
 
     for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
@@ -652 +644 @@
 }
 
-static int snd_p16v_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
-{
-    uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
-    uinfo->count = 2;
-    uinfo->value.integer.min = 0;
-    uinfo->value.integer.max = 255;
-    return 0;
-}
-
-static int snd_p16v_volume_get(snd_kcontrol_t * kcontrol,
-                               snd_ctl_elem_value_t * ucontrol, int reg, int high_low)
-{
-    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-    u32 value;
-
-    value = snd_emu10k1_ptr20_read(emu, reg, high_low);
-    if (high_low == 1) {
-        ucontrol->value.integer.value[0] = 0xff - ((value >> 24) & 0xff); /* Left */
-        ucontrol->value.integer.value[1] = 0xff - ((value >> 16) & 0xff); /* Right */
-    } else {
-        ucontrol->value.integer.value[0] = 0xff - ((value >> 8) & 0xff); /* Left */
-        ucontrol->value.integer.value[1] = 0xff - ((value >> 0) & 0xff); /* Right */
-    }
-    return 0;
-}
-
-static int snd_p16v_volume_get_spdif_front(snd_kcontrol_t * kcontrol,
-                                           snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 0;
-    int reg = PLAYBACK_VOLUME_MIXER7;
-    return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
-}
-
-static int snd_p16v_volume_get_spdif_center_lfe(snd_kcontrol_t * kcontrol,
-                                                snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 1;
-    int reg = PLAYBACK_VOLUME_MIXER7;
-    return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
-}
-static int snd_p16v_volume_get_spdif_unknown(snd_kcontrol_t * kcontrol,
-                                             snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 0;
-    int reg = PLAYBACK_VOLUME_MIXER8;
-    return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
-}
-static int snd_p16v_volume_get_spdif_rear(snd_kcontrol_t * kcontrol,
-                                          snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 1;
-    int reg = PLAYBACK_VOLUME_MIXER8;
-    return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
-}
-
-static int snd_p16v_volume_get_analog_front(snd_kcontrol_t * kcontrol,
-                                            snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 0;
-    int reg = PLAYBACK_VOLUME_MIXER9;
-    return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
-}
-
-static int snd_p16v_volume_get_analog_center_lfe(snd_kcontrol_t * kcontrol,
-                                                 snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 1;
-    int reg = PLAYBACK_VOLUME_MIXER9;
-    return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
-}
-static int snd_p16v_volume_get_analog_rear(snd_kcontrol_t * kcontrol,
-                                           snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 1;
-    int reg = PLAYBACK_VOLUME_MIXER10;
-    return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
-}
-
-static int snd_p16v_volume_get_analog_unknown(snd_kcontrol_t * kcontrol,
-                                              snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 0;
-    int reg = PLAYBACK_VOLUME_MIXER10;
-    return snd_p16v_volume_get(kcontrol, ucontrol, reg, high_low);
-}
-
-static int snd_p16v_volume_put(snd_kcontrol_t * kcontrol,
-                               snd_ctl_elem_value_t * ucontrol, int reg, int high_low)
-{
-    struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
-    u32 value;
-    value = snd_emu10k1_ptr20_read(emu, reg, 0);
-    //value = value & 0xffff;
-    if (high_low == 1) {
-        value &= 0xffff;
-        value = value | ((0xff - ucontrol->value.integer.value[0]) << 24) | ((0xff - ucontrol->value.integer.value[1]) << 16);
-    } else {
-        value &= 0xffff0000;
-        value = value | ((0xff - ucontrol->value.integer.value[0]) << 8) | ((0xff - ucontrol->value.integer.value[1]) );
-    }
-    snd_emu10k1_ptr20_write(emu, reg, 0, value);
-    return 1;
-}
-
-static int snd_p16v_volume_put_spdif_front(snd_kcontrol_t * kcontrol,
-                                           snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 0;
-    int reg = PLAYBACK_VOLUME_MIXER7;
-    return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
-}
-
-static int snd_p16v_volume_put_spdif_center_lfe(snd_kcontrol_t * kcontrol,
-                                                snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 1;
-    int reg = PLAYBACK_VOLUME_MIXER7;
-    return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
-}
-
-static int snd_p16v_volume_put_spdif_unknown(snd_kcontrol_t * kcontrol,
-                                             snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 0;
-    int reg = PLAYBACK_VOLUME_MIXER8;
-    return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
-}
-
-static int snd_p16v_volume_put_spdif_rear(snd_kcontrol_t * kcontrol,
-                                          snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 1;
-    int reg = PLAYBACK_VOLUME_MIXER8;
-    return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
-}
-
-static int snd_p16v_volume_put_analog_front(snd_kcontrol_t * kcontrol,
-                                            snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 0;
-    int reg = PLAYBACK_VOLUME_MIXER9;
-    return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
-}
-
-static int snd_p16v_volume_put_analog_center_lfe(snd_kcontrol_t * kcontrol,
-                                                 snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 1;
-    int reg = PLAYBACK_VOLUME_MIXER9;
-    return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
-}
-
-static int snd_p16v_volume_put_analog_rear(snd_kcontrol_t * kcontrol,
-                                           snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 1;
-    int reg = PLAYBACK_VOLUME_MIXER10;
-    return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
-}
-
-static int snd_p16v_volume_put_analog_unknown(snd_kcontrol_t * kcontrol,
-                                              snd_ctl_elem_value_t * ucontrol)
-{
-    int high_low = 0;
-    int reg = PLAYBACK_VOLUME_MIXER10;
-    return snd_p16v_volume_put(kcontrol, ucontrol, reg, high_low);
-}
-
-static snd_kcontrol_new_t snd_p16v_volume_control_analog_front =
-{
-    SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    "HD Analog Front Playback Volume",0,0,0,
-    snd_p16v_volume_info,
-    snd_p16v_volume_get_analog_front,
-    snd_p16v_volume_put_analog_front,0
-};
-
-static snd_kcontrol_new_t snd_p16v_volume_control_analog_center_lfe =
-{
-    SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    "HD Analog Center/LFE Playback Volume",0,0,0,
-    snd_p16v_volume_info,
-    snd_p16v_volume_get_analog_center_lfe,
-    snd_p16v_volume_put_analog_center_lfe
-};
-
-static snd_kcontrol_new_t snd_p16v_volume_control_analog_unknown =
-{
-    SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    "HD Analog Unknown Playback Volume",0,0,0,
-    snd_p16v_volume_info,
-    snd_p16v_volume_get_analog_unknown,
-    snd_p16v_volume_put_analog_unknown,0
-};
-
-static snd_kcontrol_new_t snd_p16v_volume_control_analog_rear =
-{
-    SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    "HD Analog Rear Playback Volume",0,0,0,
-    snd_p16v_volume_info,
-    snd_p16v_volume_get_analog_rear,
-    snd_p16v_volume_put_analog_rear,0
-};
-
-static snd_kcontrol_new_t snd_p16v_volume_control_spdif_front =
-{
-    SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    "HD SPDIF Front Playback Volume",0,0,0,
-    snd_p16v_volume_info,
-    snd_p16v_volume_get_spdif_front,
-    snd_p16v_volume_put_spdif_front,0
-};
-
-static snd_kcontrol_new_t snd_p16v_volume_control_spdif_center_lfe =
-{
-    SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    "HD SPDIF Center/LFE Playback Volume",0,0,0,
-    snd_p16v_volume_info,
-    snd_p16v_volume_get_spdif_center_lfe,
-    snd_p16v_volume_put_spdif_center_lfe,0
-};
-
-static snd_kcontrol_new_t snd_p16v_volume_control_spdif_unknown =
-{
-    SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    "HD SPDIF Unknown Playback Volume",0,0,0,
-    snd_p16v_volume_info,
-    snd_p16v_volume_get_spdif_unknown,
-    snd_p16v_volume_put_spdif_unknown,0
-};
-
-static snd_kcontrol_new_t snd_p16v_volume_control_spdif_rear =
-{
-    SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    "HD SPDIF Rear Playback Volume",0,0,0,
-    snd_p16v_volume_info,
-    snd_p16v_volume_get_spdif_rear,
-    snd_p16v_volume_put_spdif_rear,0
-};
-
-static int snd_p16v_capture_source_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
-{
-    static char *texts[8] = { "SPDIF", "I2S", "SRC48", "SRCMulti_SPDIF", "SRCMulti_I2S", "CDIF", "FX", "AC97" };
+static int snd_p16v_volume_info(struct snd_kcontrol *kcontrol,
+                                struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 2;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 255;
+        return 0;
+}
+
+static int snd_p16v_volume_get(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+        int high_low = (kcontrol->private_value >> 8) & 0xff;
+        int reg = kcontrol->private_value & 0xff;
+        u32 value;
+
+        value = snd_emu10k1_ptr20_read(emu, reg, high_low);
+        if (high_low) {
+                ucontrol->value.integer.value[0] = 0xff - ((value >> 24) & 0xff); /* Left */
+                ucontrol->value.integer.value[1] = 0xff - ((value >> 16) & 0xff); /* Right */
+        } else {
+                ucontrol->value.integer.value[0] = 0xff - ((value >> 8) & 0xff); /* Left */
+                ucontrol->value.integer.value[1] = 0xff - ((value >> 0) & 0xff); /* Right */
+        }
+        return 0;
+}
+
+static int snd_p16v_volume_put(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
+        int high_low = (kcontrol->private_value >> 8) & 0xff;
+        int reg = kcontrol->private_value & 0xff;
+        u32 value, oval;
+
+        oval = value = snd_emu10k1_ptr20_read(emu, reg, 0);
+        if (high_low == 1) {
+                value &= 0xffff;
+                value |= ((0xff - ucontrol->value.integer.value[0]) << 24) |
+                        ((0xff - ucontrol->value.integer.value[1]) << 16);
+        } else {
+                value &= 0xffff0000;
+                value |= ((0xff - ucontrol->value.integer.value[0]) << 8) |
+                        ((0xff - ucontrol->value.integer.value[1]) );
+        }
+        if (value != oval) {
+                snd_emu10k1_ptr20_write(emu, reg, 0, value);
+                return 1;
+        }
+        return 0;
+}
+
+
+static int snd_p16v_capture_source_info(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_info *uinfo)
+{
+    static char *texts[8] = {
+        "SPDIF", "I2S", "SRC48", "SRCMulti_SPDIF", "SRCMulti_I2S",
+        "CDIF", "FX", "AC97"
+    };
 
     uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
@@ -906 +716 @@
 }
 
-static int snd_p16v_capture_source_get(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
+static int snd_p16v_capture_source_get(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
 {
     struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
@@ -915 +725 @@
 }
 
-static int snd_p16v_capture_source_put(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
+static int snd_p16v_capture_source_put(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
 {
     struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
@@ -935 +745 @@
 }
 
-static snd_kcontrol_new_t snd_p16v_capture_source __devinitdata =
-{
-    SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    "HD source Capture",0,0,0,
-    snd_p16v_capture_source_info,
-    snd_p16v_capture_source_get,
-    snd_p16v_capture_source_put,0
-};
-
-static int snd_p16v_capture_channel_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_p16v_capture_channel_info(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_info *uinfo)
 {
     static char *texts[4] = { "0", "1", "2", "3",  };
@@ -957 +759 @@
 }
 
-static int snd_p16v_capture_channel_get(snd_kcontrol_t * kcontrol,
-                                        snd_ctl_elem_value_t * ucontrol)
+static int snd_p16v_capture_channel_get(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
 {
     struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
@@ -966 +768 @@
 }
 
-static int snd_p16v_capture_channel_put(snd_kcontrol_t * kcontrol,
-                                        snd_ctl_elem_value_t * ucontrol)
+static int snd_p16v_capture_channel_put(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
 {
     struct snd_emu10k1 *emu = snd_kcontrol_chip(kcontrol);
@@ -984 +786 @@
 }
 
-static snd_kcontrol_new_t snd_p16v_capture_channel __devinitdata =
-{
-    SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    "HD channel Capture",0,0,0,
-    snd_p16v_capture_channel_info,
-    snd_p16v_capture_channel_get,
-    snd_p16v_capture_channel_put,0
+static DECLARE_TLV_DB_SCALE(snd_p16v_db_scale1, -5175, 25, 1);
+
+#define P16V_VOL(xname,xreg,xhl) { \
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \
+        .access = SNDRV_CTL_ELEM_ACCESS_READWRITE |             \
+                  SNDRV_CTL_ELEM_ACCESS_TLV_READ,               \
+        .info = snd_p16v_volume_info, \
+        .get = snd_p16v_volume_get, \
+        .put = snd_p16v_volume_put, \
+        .tlv = { .p = snd_p16v_db_scale1 },     \
+        .private_value = ((xreg) | ((xhl) << 8)) \
+}
+
+static struct snd_kcontrol_new p16v_mixer_controls[] __devinitdata = {
+        P16V_VOL("HD Analog Front Playback Volume", PLAYBACK_VOLUME_MIXER9, 0),
+        P16V_VOL("HD Analog Rear Playback Volume", PLAYBACK_VOLUME_MIXER10, 1),
+        P16V_VOL("HD Analog Center/LFE Playback Volume", PLAYBACK_VOLUME_MIXER9, 1),
+        P16V_VOL("HD Analog Side Playback Volume", PLAYBACK_VOLUME_MIXER10, 0),
+        P16V_VOL("HD SPDIF Front Playback Volume", PLAYBACK_VOLUME_MIXER7, 0),
+        P16V_VOL("HD SPDIF Rear Playback Volume", PLAYBACK_VOLUME_MIXER8, 1),
+        P16V_VOL("HD SPDIF Center/LFE Playback Volume", PLAYBACK_VOLUME_MIXER7, 1),
+        P16V_VOL("HD SPDIF Side Playback Volume", PLAYBACK_VOLUME_MIXER8, 0),
+        {
+                .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name =         "HD source Capture",
+                .info =         snd_p16v_capture_source_info,
+                .get =          snd_p16v_capture_source_get,
+                .put =          snd_p16v_capture_source_put
+        },
+        {
+                .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name =         "HD channel Capture",
+                .info =         snd_p16v_capture_channel_info,
+                .get =          snd_p16v_capture_channel_get,
+                .put =          snd_p16v_capture_channel_put
+        },
 };
 
-int snd_p16v_mixer(struct snd_emu10k1 *emu)
-{
-    int err;
-    snd_kcontrol_t *kctl;
-    snd_card_t *card = emu->card;
-    if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_analog_front, emu)) == NULL)
-        return -ENOMEM;
-    if ((err = snd_ctl_add(card, kctl)))
-        return err;
-    if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_analog_rear, emu)) == NULL)
-        return -ENOMEM;
-    if ((err = snd_ctl_add(card, kctl)))
-        return err;
-    if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_analog_center_lfe, emu)) == NULL)
-        return -ENOMEM;
-    if ((err = snd_ctl_add(card, kctl)))
-        return err;
-    if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_analog_unknown, emu)) == NULL)
-        return -ENOMEM;
-    if ((err = snd_ctl_add(card, kctl)))
-        return err;
-    if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_spdif_front, emu)) == NULL)
-        return -ENOMEM;
-    if ((err = snd_ctl_add(card, kctl)))
-        return err;
-    if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_spdif_rear, emu)) == NULL)
-        return -ENOMEM;
-    if ((err = snd_ctl_add(card, kctl)))
-        return err;
-    if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_spdif_center_lfe, emu)) == NULL)
-        return -ENOMEM;
-    if ((err = snd_ctl_add(card, kctl)))
-        return err;
-    if ((kctl = snd_ctl_new1(&snd_p16v_volume_control_spdif_unknown, emu)) == NULL)
-        return -ENOMEM;
-    if ((err = snd_ctl_add(card, kctl)))
-        return err;
-    if ((kctl = snd_ctl_new1(&snd_p16v_capture_source, emu)) == NULL)
-        return -ENOMEM;
-    if ((err = snd_ctl_add(card, kctl)))
-        return err;
-    if ((kctl = snd_ctl_new1(&snd_p16v_capture_channel, emu)) == NULL)
-        return -ENOMEM;
-    if ((err = snd_ctl_add(card, kctl)))
-        return err;
-    return 0;
-}
-
+int __devinit snd_p16v_mixer(struct snd_emu10k1 *emu)
+{
+        int i, err;
+        struct snd_card *card = emu->card;
+
+        for (i = 0; i < ARRAY_SIZE(p16v_mixer_controls); i++) {
+                if ((err = snd_ctl_add(card, snd_ctl_new1(&p16v_mixer_controls[i],
+                                                          emu))) < 0)
+                        return err;
+        }
+        return 0;
+}
+
+#ifdef CONFIG_PM
+
+#define NUM_CHS 1       /* up to 4, but only first channel is used */
+
+int __devinit snd_p16v_alloc_pm_buffer(struct snd_emu10k1 *emu)
+{
+        emu->p16v_saved = vmalloc(NUM_CHS * 4 * 0x80);
+        if (! emu->p16v_saved)
+                return -ENOMEM;
+        return 0;
+}
+
+void snd_p16v_free_pm_buffer(struct snd_emu10k1 *emu)
+{
+        vfree(emu->p16v_saved);
+}
+
+void snd_p16v_suspend(struct snd_emu10k1 *emu)
+{
+        int i, ch;
+        unsigned int *val;
+
+        val = emu->p16v_saved;
+        for (ch = 0; ch < NUM_CHS; ch++)
+                for (i = 0; i < 0x80; i++, val++)
+                        *val = snd_emu10k1_ptr20_read(emu, i, ch);
+}
+
+void snd_p16v_resume(struct snd_emu10k1 *emu)
+{
+        int i, ch;
+        unsigned int *val;
+
+        val = emu->p16v_saved;
+        for (ch = 0; ch < NUM_CHS; ch++)
+                for (i = 0; i < 0x80; i++, val++)
+                        snd_emu10k1_ptr20_write(emu, i, ch, *val);
+}
+#endif
+

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

@@ -47 +47 @@
  */
 
-static int voice_alloc(struct snd_emu10k1 *emu, int type, int number, struct snd_emu10k1_voice **rvoice)
+static int voice_alloc(struct snd_emu10k1 *emu, int type, int number,
+                       struct snd_emu10k1_voice **rvoice)
 {
     struct snd_emu10k1_voice *voice;
@@ -63 +64 @@
         }
 
-        /* make sure the block of voices does not cross the 32 voice boundary */
-        //if (((i % 32) + number) > 32)
-        //      continue;
-
         skip = 0;
         for (k = 0; k < number; k++) {
@@ -72 +69 @@
             if (voice->use) {
                 skip = 1;
+                break;
             }
         }

GPL/trunk/alsa-kernel/pci/hda/hda_intel.c

@@ -1040 +1040 @@
         runtime->hw.channels_max = hinfo->channels_max;
         runtime->hw.formats = hinfo->formats;
-        runtime->hw.rates = hinfo->rates;
+        runtime->hw.rates = hinfo->rates;
+        printk("azx hw rates: %x. ratemin: %i, ratemax: %i\n",
+               runtime->hw.rates, runtime->hw.rate_min, runtime->hw.rate_max);
         snd_pcm_limit_hw_rates(runtime);
         snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);

GPL/trunk/alsa-kernel/pci/trident/trident_main.c

@@ -33 +33 @@
 #include <sound/control.h>
 #include <sound/trident.h>
-
-static inline snd_ctl_elem_id_t *snd_ctl_build_ioff(snd_ctl_elem_id_t *dst_id,
-                                                    snd_kcontrol_t *src_kctl,
-                                                    unsigned int offset)
-{
-        *dst_id = src_kctl->id;
-        dst_id->index += offset;
-        dst_id->numid += offset;
-        return dst_id;
-}
 
 static int snd_trident_pcm_mixer_build(struct snd_trident *trident, struct snd_trident_voice* voice, snd_pcm_substream_t *substream);

GPL/trunk/alsa-kernel/pci/ymfpci/ymfpci_main.c

@@ -1792 +1792 @@
         return err;
 
+    /* to be sure */
+    snd_ac97_update_bits(chip->ac97, AC97_EXTENDED_STATUS,
+                         AC97_EA_VRA|AC97_EA_VRM, 0);
 
     for (idx = 0; idx < ARRAY_SIZE(snd_ymfpci_controls); idx++) {

GPL/trunk/drv32/dispatch.c

@@ -95 +95 @@
     ULONG ctl_id;
 
+#ifdef DEBUG
+    printk("StratIOCtl\n");
+#endif
     if (rp->Category != CAT_IOCTL_OSS32)
     {

GPL/trunk/drv32/init.c

@@ -283 +283 @@
         WriteString(szEOL, sizeof(szEOL)-1);
     }
-
+#ifdef DEBUG
+    dprintf(("DiscardableInit. cp1"));
+#endif
     // Complete the installation
     rp->Out.FinalCS = _OffsetFinalCS16;
     rp->Out.FinalDS = _OffsetFinalDS16;
+#ifdef DEBUG
+    dprintf(("DiscardableInit. cp2"));
+#endif
 
 //    SaveBuffer();

GPL/trunk/drv32/strategy.c

@@ -70 +70 @@
     RPInit __far* rp = (RPInit __far*)_rp;
     rc = DiscardableInit(rp);
-
+#ifdef DEBUG
+    dprintf(("StratInit. cp1.rc %d", rc));
+#endif
     return rc;
 }
@@ -80 +82 @@
 #pragma on (unreferenced)
 {
+#ifdef DEBUG
+    dprintf(("StratInitComplete"));
+#endif
   return(RPDONE);
 }
@@ -90 +95 @@
  RPShutdown __far *rp = (RPShutdown __far *)_rp;
 
-  dprintf(("StratShutdown %d", rp->Function));
+#ifdef DEBUG
+ dprintf(("StratShutdown %d", rp->Function));
+#endif
   if(rp->Function == 1) {//end of shutdown
         OSS32_Shutdown(); 

GPL/trunk/include/ossdefos2.h

@@ -86 +86 @@
 #define OSS_MIXER_3DDEPTH       25    
 #define OSS_MIXER_3DCENTER      26
-#define OSS_MIXER_NRDEVICES     27
+#define OSS_MIXER_FRONT         27
+#define OSS_MIXER_NRDEVICES     28
 
 #endif

GPL/trunk/include/version.mak

@@ -11 +11 @@
 BLDLVL_REVISION = 1.1
 BLDLVL_FILEVER = 4
-BLDLVL_DATETIME = 25.09.2006 22:56:59
+BLDLVL_DATETIME = 23.10.2006 23:58:13
 BLDLVL_MACHINE = VLAD

GPL/trunk/lib32/irq.c

@@ -176 +176 @@
 
 #ifdef DEBUG
-    dprintf(("enter int proc %d %d",ulSlotNo, *pulIrq));
+//    dprintf(("enter int proc %d %d",ulSlotNo, *pulIrq));
 #endif
 
@@ -213 +213 @@
                     OSS32_ProcessIRQ();
 #ifdef DEBUG
-                    dprintf(("exit(1) int proc %d %d",ulSlotNo, *pulIrq));
+//                    dprintf(("exit(1) int proc %d %d",ulSlotNo, *pulIrq));
 #endif
                     eoiIrq[pSlot->irqNo] = 0;
@@ -222 +222 @@
     }
 #ifdef DEBUG
-                    dprintf(("exit(0) int proc %d %d",ulSlotNo, *pulIrq));
+//                    dprintf(("exit(0) int proc %d %d",ulSlotNo, *pulIrq));
 #endif
 

GPL/trunk/lib32/ossidc.cpp

@@ -283 +283 @@
 
     if(nrCardsDetected != 0) {
+        dprintf(("OSS32_Initialize2"));
         pcm_info();
+        dprintf(("OSS32_Initialize3"));
         for(int i=0;i<nrCardsDetected;i++) {
+            dprintf(("OSS32_Initialize4 start: %d",i));
             FillCaps(i);
+            dprintf(("OSS32_Initialize4 end: %d",i));
         }
+        dprintf(("OSS32_Initialize: SUCCESS. nr. of cards: %d",nrCardsDetected));
         return OSSERR_SUCCESS;
     }
+    dprintf(("OSS32_Initialize. FAILED"));
     return OSSERR_INIT_FAILED;
 }

GPL/trunk/lib32/sound.c

@@ -754 +754 @@
     soundhandle        *pHandle = (soundhandle *)streamid;
     snd_pcm_hw_params_t params;
+    snd_pcm_status_t    status;
     snd_pcm_sw_params_t swparams;
     int                 ret, ret1, nrperiods, minnrperiods, maxnrperiods, samplesize, i;
@@ -889 +890 @@
             }
         }
+
 //        ret1 = pHandle->file.f_op->release(&pHandle->inode, &pHandle->file);
         DebugInt3();
@@ -1040 +1042 @@
     total = 0;
     per_bytes = periodbytes;
+    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
+    if ( ((status.state != SNDRV_PCM_STATE_PREPARED) &&
+          (status.state != SNDRV_PCM_STATE_RUNNING) &&
+          (status.state != SNDRV_PCM_STATE_DRAINING))) {
+        printk("Device is not in proper state: %i. Calling prepare\n", status.state);
+        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
+    }
     printk("OSS32_WaveSetHwParams return %d after SNDRV_PCM_IOCTL_SW_PARAMS ioctl, streamid %X", ret,(ULONG)pHandle);
     return UNIXToOSSError(ret);
@@ -1133 +1142 @@
                     printk("OSS32_WaveAddBuffer failed on partial transfer %x %i; ret = %i\n", buffer, size, ret);
                     *pTransferred = transferred;
-                    return OSSERR_SUCCESS;
+                    if (toret)
+                        return OSSERR_SUCCESS; /* avoid infinite loop */
+                    toret = 1;
+                    goto again;
                 }
 
@@ -1143 +1155 @@
                     ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
                     printk("OSS32_WaveAddBuffer buffer overrun: size %i, ret %i, trans %i, prev sz %i per sz %i total %i\n", size, ret, transferred, prev_size, per_bytes, total);
-                    ret = size;
-                    transferred = size;
-                    break; /* UGLY hack*/
-                    //goto again;
+                    //ret = size;
+                    //transferred = size;
+                    if (toret) break; /* avoid infinite loop */
+                    toret = 1;
+                    goto again;
                 }
                 else {
@@ -1162 +1175 @@
                 break;
             }
+            toret = 0;
             transferred += ret;
 //            printk("written: now: %i, buffer: %i, total: %i\n", ret, transferred, total);

GPL/trunk/lib32/soundmixer.c

@@ -72 +72 @@
         /* OSS_MIXER_3DDEPTH  */ { "3D Control - Depth", 0 , -1},
         /* OSS_MIXER_3DCENTER */ { "3D Control - Center", 0 , -1},
+        /* OSS_MIXER_FRONT    */ { "Front", 0 , -1},
 };
 char *szRecSources[OSS32_MIX_RECSRC_MAX] = {
@@ -201 +202 @@
                 int controlnamelen = strlen(pHandle->pids[i].name);
 
-                if(namelen == controlnamelen) 
+                if(namelen == controlnamelen)
                 {//control names are identical; found exact match
                     pHandle->controls[j].idxVolume = i;
@@ -392 +393 @@
         idx = pHandle->controls[OSS_MIXER_VOLUME].idxVolume;
         idxMute = pHandle->controls[OSS_MIXER_VOLUME].idxMute;
+        if (idx == -1)
+        {
+            /* HDA codecs workaround */
+            idx = pHandle->controls[OSS_MIXER_FRONT].idxVolume;
+            idxMute = pHandle->controls[OSS_MIXER_FRONT].idxMute;
+        }
         break;
     case OSS32_MIX_VOLUME_MASTER_REAR: //TODO:
@@ -400 +407 @@
         idx = pHandle->controls[OSS_MIXER_PCM].idxVolume;
         idxMute = pHandle->controls[OSS_MIXER_PCM].idxMute;
+        if (idx == -1)
+        {
+            /* HDA codecs workaround */
+            idx = pHandle->controls[OSS_MIXER_FRONT].idxVolume;
+            idxMute = pHandle->controls[OSS_MIXER_FRONT].idxMute;
+        }
         break;
     case OSS32_MIX_VOLUME_MIDI:

GPL/trunk/lib32/stack.cpp

@@ -33 +33 @@
 #endif
 
-#define MAX_STACK               8
+#define MAX_STACK               16
 #define STACKSIZE               (16*1024)
 #define TOTAL_STACKSIZE     MAX_STACK*(16*1024)