Changeset 84 for GPL/trunk/alsa-kernel/pci/emu10k1/emufx.c

Timestamp:

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

Author:

vladest

Message:

SB code update
HDA code update
Some other updates

File:

• GPL/trunk/alsa-kernel/pci/emu10k1/emufx.c (modified) (84 diffs)

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