fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / sound / pci / emu10k1 / emu10k1_main.c
index 4f7a0ea..972ec40 100644 (file)
@@ -3,6 +3,10 @@
  *                   Creative Labs, Inc.
  *  Routines for control of EMU10K1 chips
  *
+ *  Copyright (c) by James Courtier-Dutton <James@superbug.demon.co.uk>
+ *      Added support for Audigy 2 Value.
+ *
+ *
  *  BUGS:
  *    --
  *
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/mutex.h>
+
 
 #include <sound/core.h>
 #include <sound/emu10k1.h>
+#include "p16v.h"
+#include "tina2.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
 
 /*************************************************************************
  * EMU10K1 init / done
  *************************************************************************/
 
-void snd_emu10k1_voice_init(emu10k1_t * emu, int ch)
+void snd_emu10k1_voice_init(struct snd_emu10k1 * emu, int ch)
 {
        snd_emu10k1_ptr_write(emu, DCYSUSV, ch, 0);
        snd_emu10k1_ptr_write(emu, IP, ch, 0);
@@ -91,17 +94,38 @@ void snd_emu10k1_voice_init(emu10k1_t * emu, int ch)
        }
 }
 
-static int __devinit snd_emu10k1_init(emu10k1_t * 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 */
        snd_emu10k1_ptr_write(emu, MICBS, 0, ADCBS_BUFSIZE_NONE);
@@ -122,53 +146,44 @@ static int __devinit snd_emu10k1_init(emu10k1_t * emu, int enable_ir)
                /* set SPDIF bypass mode */
                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;
+
+               //Setup SRCMulti_I2S SamplingRate
+               tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);
+               tmp &= 0xfffff1ff;
+               tmp |= (0x2<<9);
+               snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, 0, tmp);
+               
+               /* 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. */
+               snd_emu10k1_ptr20_write(emu, SRCMULTI_ENABLE, 0, 0xFFFFFFFF);
+
+               /* Enabled Phased (8-channel) P16V playback */
+               outl(0x0201, emu->port + HCFG2);
+               /* Set playback routing. */
+               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_INFO "Audigy2 value: Special config.\n");
                //Setup SRCMulti_I2S SamplingRate
                tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, 0);
                tmp &= 0xfffff1ff;
@@ -180,17 +195,40 @@ static int __devinit snd_emu10k1_init(emu10k1_t * emu, int enable_ir)
                outl(0x14, emu->port + 0x24);
 
                /* Setup SRCMulti Input Audio Enable */
-               outl(0x6E0000, emu->port + 0x20);
-               outl(0xFF00FF00, emu->port + 0x24);
+               outl(0x7b0000, emu->port + 0x20);
+               outl(0xFF000000, emu->port + 0x24);
+
+               /* Setup SPDIF Out Audio Enable */
+               /* The Audigy 2 Value has a separate SPDIF out,
+                * so no need for a mixer switch
+                */
+               outl(0x7a0000, emu->port + 0x20);
+               outl(0xFF000000, emu->port + 0x24);
+               tmp = inl(emu->port + A_IOCFG) & ~0x8; /* Clear bit 3 */
+               outl(tmp, emu->port + A_IOCFG);
        }
+       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 */
 
-       /*
-        *  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);
+       }
+       
        snd_emu10k1_ptr_write(emu, PTB, 0, emu->ptb_pages.addr);
        snd_emu10k1_ptr_write(emu, TCB, 0, 0);  /* taken from original driver */
        snd_emu10k1_ptr_write(emu, TCBS, 0, 4); /* taken from original driver */
@@ -216,6 +254,8 @@ static int __devinit snd_emu10k1_init(emu10k1_t * emu, int enable_ir)
                             HCFG_AUTOMUTE | HCFG_JOYENABLE, emu->port + HCFG);
                else
                        outl(HCFG_AUTOMUTE | HCFG_JOYENABLE, emu->port + HCFG);
+       /* FIXME: Remove all these emu->model and replace it with a card recognition parameter,
+        * e.g. card_capabilities->joystick */
        } else if (emu->model == 0x20 ||
            emu->model == 0xc400 ||
            (emu->model == 0x21 && emu->revision < 6))
@@ -225,7 +265,9 @@ static int __devinit snd_emu10k1_init(emu10k1_t * emu, int enable_ir)
                outl(HCFG_LOCKTANKCACHE_MASK | HCFG_AUTOMUTE | HCFG_JOYENABLE, emu->port + HCFG);
 
        if (enable_ir) {        /* enable IR for SB Live */
-               if (emu->audigy) {
+               if ( emu->card_capabilities->emu1212m) {
+                       ;  /* Disable all access to A_IOCFG for the emu1212m */
+               } else if (emu->audigy) {
                        unsigned int reg = inl(emu->port + A_IOCFG);
                        outl(reg | A_IOCFG_GPOUT2, emu->port + A_IOCFG);
                        udelay(500);
@@ -242,31 +284,37 @@ static int __devinit snd_emu10k1_init(emu10k1_t * emu, int enable_ir)
                }
        }
        
-       if (emu->audigy) {      /* enable analog output */
+       if ( emu->card_capabilities->emu1212m) {
+               ;  /* Disable all access to A_IOCFG for the emu1212m */
+       } 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
         */
        outl(inl(emu->port + HCFG) | HCFG_AUDIOENABLE, emu->port + HCFG);
 
        /* Enable analog/digital outs on audigy */
-       if (emu->audigy) {
+       if ( emu->card_capabilities->emu1212m) {
+               ;  /* Disable all access to A_IOCFG for the emu1212m */
+       } else if (emu->audigy) {
                outl(inl(emu->port + A_IOCFG) & ~0x44, emu->port + A_IOCFG);
  
-               if (emu->revision == 4) { /* audigy2 */
+               if (emu->card_capabilities->ca0151_chip) { /* audigy2 */
                        /* Unmute Analog now.  Set GPO6 to 1 for Apollo.
                         * This has to be done after init ALice3 I2SOut beyond 48KHz.
                         * So, sequence is important. */
                        outl(inl(emu->port + A_IOCFG) | 0x0040, emu->port + A_IOCFG);
+               } else if (emu->card_capabilities->ca0108_chip) { /* audigy2 value */
+                       /* Unmute Analog now. */
+                       outl(inl(emu->port + A_IOCFG) | 0x0060, emu->port + A_IOCFG);
                } else {
                        /* Disable routing from AC97 line out to Front speakers */
                        outl(inl(emu->port + A_IOCFG) | 0x0080, emu->port + A_IOCFG);
@@ -292,15 +340,9 @@ static int __devinit snd_emu10k1_init(emu10k1_t * emu, int enable_ir)
 #endif
 
        snd_emu10k1_intr_enable(emu, INTE_PCIERRORENABLE);
-
-       emu->reserved_page = (emu10k1_memblk_t *)snd_emu10k1_synth_alloc(emu, 4096);
-       if (emu->reserved_page)
-               emu->reserved_page->map_locked = 1;
-       
-       return 0;
 }
 
-static int snd_emu10k1_done(emu10k1_t * emu)
+int snd_emu10k1_done(struct snd_emu10k1 * emu)
 {
        int ch;
 
@@ -339,18 +381,10 @@ static int snd_emu10k1_done(emu10k1_t * emu)
        snd_emu10k1_ptr_write(emu, SOLEL, 0, 0);
        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;
 }
 
@@ -431,7 +465,7 @@ static int snd_emu10k1_done(emu10k1_t * emu)
  *  register.
  */
 
-static void snd_emu10k1_ecard_write(emu10k1_t * emu, unsigned int value)
+static void snd_emu10k1_ecard_write(struct snd_emu10k1 * emu, unsigned int value)
 {
        unsigned short count;
        unsigned int data;
@@ -469,7 +503,7 @@ static void snd_emu10k1_ecard_write(emu10k1_t * emu, unsigned int value)
  * channel.
  */
 
-static void snd_emu10k1_ecard_setadcgain(emu10k1_t * emu,
+static void snd_emu10k1_ecard_setadcgain(struct snd_emu10k1 * emu,
                                         unsigned short gain)
 {
        unsigned int bit;
@@ -497,7 +531,7 @@ static void snd_emu10k1_ecard_setadcgain(emu10k1_t * emu,
        snd_emu10k1_ecard_write(emu, emu->ecard_ctrl);
 }
 
-static int __devinit snd_emu10k1_ecard_init(emu10k1_t * emu)
+static int snd_emu10k1_ecard_init(struct snd_emu10k1 * emu)
 {
        unsigned int hc_value;
 
@@ -537,15 +571,181 @@ static int __devinit snd_emu10k1_ecard_init(emu10k1_t * emu)
        return 0;
 }
 
+static int snd_emu10k1_cardbus_init(struct snd_emu10k1 * emu)
+{
+       unsigned long special_port;
+       unsigned int value;
+
+       /* Special initialisation routine
+        * before the rest of the IO-Ports become active.
+        */
+       special_port = emu->port + 0x38;
+       value = inl(special_port);
+       outl(0x00d00000, special_port);
+       value = inl(special_port);
+       outl(0x00d00001, special_port);
+       value = inl(special_port);
+       outl(0x00d0005f, special_port);
+       value = inl(special_port);
+       outl(0x00d0007f, special_port);
+       value = inl(special_port);
+       outl(0x0090007f, special_port);
+       value = inl(special_port);
+
+       snd_emu10k1_ptr20_write(emu, TINA2_VOLUME, 0, 0xfefefefe); /* Defaults to 0x30303030 */
+       return 0;
+}
+
+static int snd_emu1212m_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);
+       outl(reg | 0x80, emu->port + A_IOCFG);  /* High bit clocks the value into the fpga. */
+       outl(value, emu->port + A_IOCFG);
+       outl(value | 0x80 , emu->port + A_IOCFG);  /* High bit clocks the value into the fpga. */
+
+       return 0;
+}
+
+static int snd_emu1212m_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);
+       outl(reg | 0x80, emu->port + A_IOCFG);  /* High bit clocks the value into the fpga. */
+       *value = inl(emu->port + A_IOCFG);
+
+       return 0;
+}
+
+static int snd_emu1212m_fpga_netlist_write(struct snd_emu10k1 * emu, int reg, int value)
+{
+       snd_emu1212m_fpga_write(emu, 0x00, ((reg >> 8) & 0x3f) );
+       snd_emu1212m_fpga_write(emu, 0x01, (reg & 0x3f) );
+       snd_emu1212m_fpga_write(emu, 0x02, ((value >> 8) & 0x3f) );
+       snd_emu1212m_fpga_write(emu, 0x03, (value & 0x3f) );
+
+       return 0;
+}
+
+static int snd_emu10k1_emu1212m_init(struct snd_emu10k1 * emu)
+{
+       unsigned int i;
+       int tmp;
+
+       snd_printk(KERN_ERR "emu1212m: Special config.\n");
+       outl(0x0005a00c, emu->port + HCFG);
+       outl(0x0005a004, emu->port + HCFG);
+       outl(0x0005a000, emu->port + HCFG);
+       outl(0x0005a000, emu->port + HCFG);
+
+       snd_emu1212m_fpga_read(emu, 0x22, &tmp );
+       snd_emu1212m_fpga_read(emu, 0x23, &tmp );
+       snd_emu1212m_fpga_read(emu, 0x24, &tmp );
+       snd_emu1212m_fpga_write(emu, 0x04, 0x01 );
+       snd_emu1212m_fpga_read(emu, 0x0b, &tmp );
+       snd_emu1212m_fpga_write(emu, 0x0b, 0x01 );
+       snd_emu1212m_fpga_read(emu, 0x10, &tmp );
+       snd_emu1212m_fpga_write(emu, 0x10, 0x00 );
+       snd_emu1212m_fpga_read(emu, 0x11, &tmp );
+       snd_emu1212m_fpga_write(emu, 0x11, 0x30 );
+       snd_emu1212m_fpga_read(emu, 0x13, &tmp );
+       snd_emu1212m_fpga_write(emu, 0x13, 0x0f );
+       snd_emu1212m_fpga_read(emu, 0x11, &tmp );
+       snd_emu1212m_fpga_write(emu, 0x11, 0x30 );
+       snd_emu1212m_fpga_read(emu, 0x0a, &tmp );
+       snd_emu1212m_fpga_write(emu, 0x0a, 0x10 );
+       snd_emu1212m_fpga_write(emu, 0x0c, 0x19 );
+       snd_emu1212m_fpga_write(emu, 0x12, 0x0c );
+       snd_emu1212m_fpga_write(emu, 0x09, 0x0f );
+       snd_emu1212m_fpga_write(emu, 0x06, 0x00 );
+       snd_emu1212m_fpga_write(emu, 0x05, 0x00 );
+       snd_emu1212m_fpga_write(emu, 0x0e, 0x12 );
+       snd_emu1212m_fpga_netlist_write(emu, 0x0000, 0x0200);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0001, 0x0201);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0002, 0x0500);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0003, 0x0501);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0004, 0x0400);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0005, 0x0401);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0006, 0x0402);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0007, 0x0403);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0008, 0x0404);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0009, 0x0405);
+       snd_emu1212m_fpga_netlist_write(emu, 0x000a, 0x0406);
+       snd_emu1212m_fpga_netlist_write(emu, 0x000b, 0x0407);
+       snd_emu1212m_fpga_netlist_write(emu, 0x000c, 0x0100);
+       snd_emu1212m_fpga_netlist_write(emu, 0x000d, 0x0104);
+       snd_emu1212m_fpga_netlist_write(emu, 0x000e, 0x0200);
+       snd_emu1212m_fpga_netlist_write(emu, 0x000f, 0x0201);
+       for (i=0;i < 0x20;i++) {
+               snd_emu1212m_fpga_netlist_write(emu, 0x0100+i, 0x0000);
+       }
+       for (i=0;i < 4;i++) {
+               snd_emu1212m_fpga_netlist_write(emu, 0x0200+i, 0x0000);
+       }
+       for (i=0;i < 7;i++) {
+               snd_emu1212m_fpga_netlist_write(emu, 0x0300+i, 0x0000);
+       }
+       for (i=0;i < 7;i++) {
+               snd_emu1212m_fpga_netlist_write(emu, 0x0400+i, 0x0000);
+       }
+       snd_emu1212m_fpga_netlist_write(emu, 0x0500, 0x0108);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0501, 0x010c);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0600, 0x0110);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0601, 0x0114);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0700, 0x0118);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0701, 0x011c);
+       snd_emu1212m_fpga_write(emu, 0x07, 0x01 );
+
+       snd_emu1212m_fpga_read(emu, 0x21, &tmp );
+
+       outl(0x0000a000, emu->port + HCFG);
+       outl(0x0000a001, emu->port + HCFG);
+       /* Initial boot complete. Now patches */
+
+       snd_emu1212m_fpga_read(emu, 0x21, &tmp );
+       snd_emu1212m_fpga_write(emu, 0x0c, 0x19 );
+       snd_emu1212m_fpga_write(emu, 0x12, 0x0c );
+       snd_emu1212m_fpga_write(emu, 0x0c, 0x19 );
+       snd_emu1212m_fpga_write(emu, 0x12, 0x0c );
+       snd_emu1212m_fpga_read(emu, 0x0a, &tmp );
+       snd_emu1212m_fpga_write(emu, 0x0a, 0x10 );
+
+       snd_emu1212m_fpga_read(emu, 0x20, &tmp );
+       snd_emu1212m_fpga_read(emu, 0x21, &tmp );
+
+       snd_emu1212m_fpga_netlist_write(emu, 0x0300, 0x0312);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0301, 0x0313);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0200, 0x0302);
+       snd_emu1212m_fpga_netlist_write(emu, 0x0201, 0x0303);
+
+       return 0;
+}
 /*
  *  Create the EMU10K1 instance
  */
 
-static int snd_emu10k1_free(emu10k1_t *emu)
+#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)
 {
        if (emu->port) {        /* avoid access to already used hardware */
                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->memhdr)
                snd_util_memhdr_free(emu->memhdr);
@@ -553,58 +753,407 @@ static int snd_emu10k1_free(emu10k1_t *emu)
                snd_dma_free_pages(&emu->silent_page);
        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);
+               free_irq(emu->irq, emu);
        if (emu->port)
                pci_release_regions(emu->pci);
+       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)
 {
-       emu10k1_t *emu = device->device_data;
+       struct snd_emu10k1 *emu = device->device_data;
        return snd_emu10k1_free(emu);
 }
 
-int __devinit snd_emu10k1_create(snd_card_t * card,
+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 */
+       /* 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 1212m [4001]", 
+        .id = "EMU1212m",
+        .emu10k2_chip = 1,
+        .ca0102_chip = 1,
+        .emu1212m = 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,
+        .adc_1361t = 1,  /* 24 bit capture instead of 16bit. Fixes ALSA bug#324 */
+        .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} ,
+       { } /* terminator */
+};
+
+int __devinit snd_emu10k1_create(struct snd_card *card,
                       struct pci_dev * pci,
                       unsigned short extin_mask,
                       unsigned short extout_mask,
                       long max_cache_bytes,
                       int enable_ir,
-                      emu10k1_t ** remu)
+                      uint subsystem,
+                      struct snd_emu10k1 ** remu)
 {
-       emu10k1_t *emu;
-       int err;
+       struct snd_emu10k1 *emu;
+       int idx, err;
        int is_audigy;
-       static snd_device_ops_t ops = {
+       unsigned char revision;
+       unsigned int silent_page;
+       const struct snd_emu_chip_details *c;
+       static struct snd_device_ops ops = {
                .dev_free =     snd_emu10k1_dev_free,
        };
        
        *remu = NULL;
 
-       // is_audigy = (int)pci->driver_data;
-       is_audigy = (pci->device == 0x0004);
-
        /* enable PCI device */
        if ((err = pci_enable_device(pci)) < 0)
                return err;
 
-       emu = kcalloc(1, sizeof(*emu), GFP_KERNEL);
-       if (emu == NULL)
+       emu = kzalloc(sizeof(*emu), GFP_KERNEL);
+       if (emu == NULL) {
+               pci_disable_device(pci);
                return -ENOMEM;
-       /* set the DMA transfer mask */
-       emu->dma_mask = is_audigy ? AUDIGY_DMA_MASK : EMU10K1_DMA_MASK;
-       if (pci_set_dma_mask(pci, emu->dma_mask) < 0 ||
-           pci_set_consistent_dma_mask(pci, emu->dma_mask) < 0) {
-               snd_printk(KERN_ERR "architecture does not support PCI busmaster DMA with mask 0x%lx\n", emu->dma_mask);
-               kfree(emu);
-               return -ENXIO;
        }
        emu->card = card;
        spin_lock_init(&emu->reg_lock);
@@ -612,16 +1161,79 @@ int __devinit snd_emu10k1_create(snd_card_t * card,
        spin_lock_init(&emu->voice_lock);
        spin_lock_init(&emu->synth_lock);
        spin_lock_init(&emu->memblk_lock);
-       init_MUTEX(&emu->ptb_lock);
-       init_MUTEX(&emu->fx8010.lock);
+       mutex_init(&emu->fx8010.lock);
        INIT_LIST_HEAD(&emu->mapped_link_head);
        INIT_LIST_HEAD(&emu->mapped_order_link_head);
        emu->pci = pci;
        emu->irq = -1;
        emu->synth = NULL;
        emu->get_synth_voice = NULL;
+       /* read revision & serial */
+       pci_read_config_byte(pci, PCI_REVISION_ID, &revision);
+       emu->revision = revision;
+       pci_read_config_dword(pci, PCI_SUBSYSTEM_VENDOR_ID, &emu->serial);
+       pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &emu->model);
+       snd_printdd("vendor=0x%x, device=0x%x, subsystem_vendor_id=0x%x, subsystem_id=0x%x\n",pci->vendor, pci->device, emu->serial, emu->model);
+
+       for (c = emu_chip_details; c->vendor; c++) {
+               if (c->vendor == pci->vendor && c->device == pci->device) {
+                       if (subsystem) {
+                               if (c->subsystem && (c->subsystem == subsystem) ) {
+                                       break;
+                               } else continue;
+                       } else {
+                               if (c->subsystem && (c->subsystem != emu->serial) )
+                                       continue;
+                               if (c->revision && c->revision != emu->revision)
+                                       continue;
+                       }
+                       break;
+               }
+       }
+       if (c->vendor == 0) {
+               snd_printk(KERN_ERR "emu10k1: Card not recognised\n");
+               kfree(emu);
+               pci_disable_device(pci);
+               return -ENOENT;
+       }
+       emu->card_capabilities = c;
+       if (c->subsystem && !subsystem)
+               snd_printdd("Sound card name=%s\n", c->name);
+       else if (subsystem) 
+               snd_printdd("Sound card name=%s, vendor=0x%x, device=0x%x, subsystem=0x%x. Forced to subsytem=0x%x\n",
+                       c->name, pci->vendor, pci->device, emu->serial, c->subsystem);
+       else 
+               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;
+                       snprintf(card->id, sizeof(card->id), "%s_%d", c->id, n);
+               }
+       }
 
-       emu->audigy = is_audigy;
+       is_audigy = emu->audigy = c->emu10k2_chip;
+
+       /* set the DMA transfer mask */
+       emu->dma_mask = is_audigy ? AUDIGY_DMA_MASK : EMU10K1_DMA_MASK;
+       if (pci_set_dma_mask(pci, emu->dma_mask) < 0 ||
+           pci_set_consistent_dma_mask(pci, emu->dma_mask) < 0) {
+               snd_printk(KERN_ERR "architecture does not support PCI busmaster DMA with mask 0x%lx\n", emu->dma_mask);
+               kfree(emu);
+               pci_disable_device(pci);
+               return -ENXIO;
+       }
        if (is_audigy)
                emu->gpr_base = A_FXGPREGBASE;
        else
@@ -629,68 +1241,47 @@ int __devinit snd_emu10k1_create(snd_card_t * card,
 
        if ((err = pci_request_regions(pci, "EMU10K1")) < 0) {
                kfree(emu);
+               pci_disable_device(pci);
                return err;
        }
        emu->port = pci_resource_start(pci, 0);
 
-       if (request_irq(pci->irq, snd_emu10k1_interrupt, SA_INTERRUPT|SA_SHIRQ, "EMU10K1", (void *)emu)) {
-               snd_emu10k1_free(emu);
-               return -EBUSY;
+       if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED,
+                       "EMU10K1", emu)) {
+               err = -EBUSY;
+               goto error;
        }
        emu->irq = pci->irq;
 
        emu->max_cache_pages = max_cache_bytes >> PAGE_SHIFT;
        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;
        }
 
        emu->page_ptr_table = (void **)vmalloc(emu->max_cache_pages * sizeof(void*));
        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;
+               err = -ENOMEM;
+               goto error;
        }
-       emu->memhdr->block_extra_size = sizeof(emu10k1_memblk_t) - sizeof(snd_util_memblk_t);
+       emu->memhdr->block_extra_size = sizeof(struct snd_emu10k1_memblk) -
+               sizeof(struct snd_util_memblk);
 
        pci_set_master(pci);
-       /* read revision & serial */
-       pci_read_config_byte(pci, PCI_REVISION_ID, (char *)&emu->revision);
-       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;
-       if (emu->serial == 0x40011102) {
-               emu->card_type = EMU10K1_CARD_EMUAPS;
-               emu->APS = 1;
-               emu->no_ac97 = 1; /* APS has no AC97 chip */
-       }
-       else if (emu->revision == 4 && emu->serial == 0x10051102) {
-               /* Audigy 2 EX has apparently no effective AC97 controls
-                * (for both input and output), so we skip the AC97 detections
-                */
-               snd_printdd(KERN_INFO "Audigy2 EX is detected. skipping ac97.\n");
-               emu->no_ac97 = 1;       
-       }
-       
-       if (emu->revision == 4 && emu->model == 0x2002) {
-               /* Audigy 2 ZS */
-               snd_printdd(KERN_INFO "Audigy2 ZS is detected. setting 7.1 mode.\n");
-               emu->spk71 = 1;
-       }
-       
-       
+
        emu->fx8010.fxbus_mask = 0x303f;
        if (extin_mask == 0)
                extin_mask = 0x3fcf;
@@ -698,44 +1289,191 @@ int __devinit snd_emu10k1_create(snd_card_t * card,
                extout_mask = 0x7fff;
        emu->fx8010.extin_mask = extin_mask;
        emu->fx8010.extout_mask = extout_mask;
-
-       if (emu->APS) {
-               if ((err = snd_emu10k1_ecard_init(emu)) < 0) {
-                       snd_emu10k1_free(emu);
-                       return err;
-               }
+       emu->enable_ir = enable_ir;
+
+       if (emu->card_capabilities->ecard) {
+               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)
+                       goto error;
+       } else if (emu->card_capabilities->emu1212m) {
+               if ((err = snd_emu10k1_emu1212m_init(emu)) < 0) {
+                       snd_emu10k1_free(emu);
+                       return err;
+               }
        } else {
                /* 5.1: Enable the additional AC97 Slots. If the emu10k1 version
                        does not support this, it shouldn't do any harm */
                snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE);
        }
 
-       if ((err = snd_emu10k1_init(emu, enable_ir)) < 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;
 
-       if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, emu, &ops)) < 0) {
-               snd_emu10k1_free(emu);
-               return err;
+       /*
+        *  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->emu1212m)
+               snd_emu10k1_emu1212m_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