Linux-2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 633 insertions, 0 deletions

diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
new file mode 100644
index 00000000000..46776cc0c15
--- /dev/null
+++ b/sound/isa/cmi8330.c
@@ -0,0 +1,633 @@
+/*
+ *  Driver for C-Media's CMI8330 soundcards.
+ *  Copyright (c) by George Talusan <gstalusan@uwaterloo.ca>
+ *    http://www.undergrad.math.uwaterloo.ca/~gstalusa
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+/*
+ * NOTES
+ *
+ *  The extended registers contain mixer settings which are largely
+ *  untapped for the time being.
+ *
+ *  MPU401 and SPDIF are not supported yet.  I don't have the hardware
+ *  to aid in coding and testing, so I won't bother.
+ *
+ *  To quickly load the module,
+ *
+ *  modprobe -a snd-cmi8330 sbport=0x220 sbirq=5 sbdma8=1
+ *    sbdma16=5 wssport=0x530 wssirq=11 wssdma=0
+ *
+ *  This card has two mixers and two PCM devices.  I've cheesed it such
+ *  that recording and playback can be done through the same device.
+ *  The driver "magically" routes the capturing to the AD1848 codec,
+ *  and playback to the SB16 codec.  This allows for full-duplex mode
+ *  to some extent.
+ *  The utilities in alsa-utils are aware of both devices, so passing
+ *  the appropriate parameters to amixer and alsactl will give you
+ *  full control over both mixers.
+ */
+
+#include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/pnp.h>
+#include <linux/moduleparam.h>
+#include <sound/core.h>
+#include <sound/ad1848.h>
+#include <sound/sb.h>
+#include <sound/initval.h>
+
+/*
+ */
+/* #define ENABLE_SB_MIXER */
+#define PLAYBACK_ON_SB
+
+/*
+ */
+MODULE_AUTHOR("George Talusan <gstalusan@uwaterloo.ca>");
+MODULE_DESCRIPTION("C-Media CMI8330");
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("{{C-Media,CMI8330,isapnp:{CMI0001,@@@0001,@X@0001}}}");
+
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;
+#ifdef CONFIG_PNP
+static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+#endif
+static long sbport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
+static int sbirq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;
+static int sbdma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;
+static int sbdma16[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;
+static long wssport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
+static int wssirq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;
+static int wssdma[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;
+
+module_param_array(index, int, NULL, 0444);
+MODULE_PARM_DESC(index, "Index value for CMI8330 soundcard.");
+module_param_array(id, charp, NULL, 0444);
+MODULE_PARM_DESC(id, "ID string  for CMI8330 soundcard.");
+module_param_array(enable, bool, NULL, 0444);
+MODULE_PARM_DESC(enable, "Enable CMI8330 soundcard.");
+#ifdef CONFIG_PNP
+module_param_array(isapnp, bool, NULL, 0444);
+MODULE_PARM_DESC(isapnp, "PnP detection for specified soundcard.");
+#endif
+
+module_param_array(sbport, long, NULL, 0444);
+MODULE_PARM_DESC(sbport, "Port # for CMI8330 SB driver.");
+module_param_array(sbirq, int, NULL, 0444);
+MODULE_PARM_DESC(sbirq, "IRQ # for CMI8330 SB driver.");
+module_param_array(sbdma8, int, NULL, 0444);
+MODULE_PARM_DESC(sbdma8, "DMA8 for CMI8330 SB driver.");
+module_param_array(sbdma16, int, NULL, 0444);
+MODULE_PARM_DESC(sbdma16, "DMA16 for CMI8330 SB driver.");
+
+module_param_array(wssport, long, NULL, 0444);
+MODULE_PARM_DESC(wssport, "Port # for CMI8330 WSS driver.");
+module_param_array(wssirq, int, NULL, 0444);
+MODULE_PARM_DESC(wssirq, "IRQ # for CMI8330 WSS driver.");
+module_param_array(wssdma, int, NULL, 0444);
+MODULE_PARM_DESC(wssdma, "DMA for CMI8330 WSS driver.");
+
+#define CMI8330_RMUX3D    16
+#define CMI8330_MUTEMUX   17
+#define CMI8330_OUTPUTVOL 18
+#define CMI8330_MASTVOL   19
+#define CMI8330_LINVOL    20
+#define CMI8330_CDINVOL   21
+#define CMI8330_WAVVOL    22
+#define CMI8330_RECMUX    23
+#define CMI8330_WAVGAIN   24
+#define CMI8330_LINGAIN   25
+#define CMI8330_CDINGAIN  26
+
+static unsigned char snd_cmi8330_image[((CMI8330_CDINGAIN)-16) + 1] =
+{
+        0x40,                   /* 16 - recording mux (SB-mixer-enabled) */
+#ifdef ENABLE_SB_MIXER
+        0x40,                   /* 17 - mute mux (Mode2) */
+#else
+        0x0,                    /* 17 - mute mux */
+#endif
+        0x0,                    /* 18 - vol */
+        0x0,                    /* 19 - master volume */
+        0x0,                    /* 20 - line-in volume */
+        0x0,                    /* 21 - cd-in volume */
+        0x0,                    /* 22 - wave volume */
+        0x0,                    /* 23 - mute/rec mux */
+        0x0,                    /* 24 - wave rec gain */
+        0x0,                    /* 25 - line-in rec gain */
+        0x0                     /* 26 - cd-in rec gain */
+};
+
+typedef int (*snd_pcm_open_callback_t)(snd_pcm_substream_t *);
+
+struct snd_cmi8330 {
+#ifdef CONFIG_PNP
+        struct pnp_dev *cap;
+        struct pnp_dev *play;
+#endif
+        snd_card_t *card;
+        ad1848_t *wss;
+        sb_t *sb;
+
+        snd_pcm_t *pcm;
+        struct snd_cmi8330_stream {
+                snd_pcm_ops_t ops;
+                snd_pcm_open_callback_t open;
+                void *private_data; /* sb or wss */
+        } streams[2];
+};
+
+static snd_card_t *snd_cmi8330_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
+
+#ifdef CONFIG_PNP
+
+static struct pnp_card_device_id snd_cmi8330_pnpids[] = {
+        { .id = "CMI0001", .devs = { { "@@@0001" }, { "@X@0001" } } },
+        { .id = "" }
+};
+
+MODULE_DEVICE_TABLE(pnp_card, snd_cmi8330_pnpids);
+
+#endif
+
+
+static struct ad1848_mix_elem snd_cmi8330_controls[] __initdata = {
+AD1848_DOUBLE("Master Playback Volume", 0, CMI8330_MASTVOL, CMI8330_MASTVOL, 4, 0, 15, 0),
+AD1848_SINGLE("Loud Playback Switch", 0, CMI8330_MUTEMUX, 6, 1, 1),
+AD1848_DOUBLE("PCM Playback Switch", 0, AD1848_LEFT_OUTPUT, AD1848_RIGHT_OUTPUT, 7, 7, 1, 1),
+AD1848_DOUBLE("PCM Playback Volume", 0, AD1848_LEFT_OUTPUT, AD1848_RIGHT_OUTPUT, 0, 0, 63, 1),
+AD1848_DOUBLE("Line Playback Switch", 0, CMI8330_MUTEMUX, CMI8330_MUTEMUX, 4, 3, 1, 0),
+AD1848_DOUBLE("Line Playback Volume", 0, CMI8330_LINVOL, CMI8330_LINVOL, 4, 0, 15, 0),
+AD1848_DOUBLE("Line Capture Switch", 0, CMI8330_RMUX3D, CMI8330_RMUX3D, 2, 1, 1, 0),
+AD1848_DOUBLE("Line Capture Volume", 0, CMI8330_LINGAIN, CMI8330_LINGAIN, 4, 0, 15, 0),
+AD1848_DOUBLE("CD Playback Switch", 0, CMI8330_MUTEMUX, CMI8330_MUTEMUX, 2, 1, 1, 0),
+AD1848_DOUBLE("CD Capture Switch", 0, CMI8330_RMUX3D, CMI8330_RMUX3D, 4, 3, 1, 0),
+AD1848_DOUBLE("CD Playback Volume", 0, CMI8330_CDINVOL, CMI8330_CDINVOL, 4, 0, 15, 0),
+AD1848_DOUBLE("CD Capture Volume", 0, CMI8330_CDINGAIN, CMI8330_CDINGAIN, 4, 0, 15, 0),
+AD1848_SINGLE("Mic Playback Switch", 0, CMI8330_MUTEMUX, 0, 1, 0),
+AD1848_SINGLE("Mic Playback Volume", 0, CMI8330_OUTPUTVOL, 0, 7, 0),
+AD1848_SINGLE("Mic Capture Switch", 0, CMI8330_RMUX3D, 0, 1, 0),
+AD1848_SINGLE("Mic Capture Volume", 0, CMI8330_OUTPUTVOL, 5, 7, 0),
+AD1848_DOUBLE("Wavetable Playback Switch", 0, CMI8330_RECMUX, CMI8330_RECMUX, 1, 0, 1, 0),
+AD1848_DOUBLE("Wavetable Playback Volume", 0, CMI8330_WAVVOL, CMI8330_WAVVOL, 4, 0, 15, 0),
+AD1848_DOUBLE("Wavetable Capture Switch", 0, CMI8330_RECMUX, CMI8330_RECMUX, 5, 4, 1, 0),
+AD1848_DOUBLE("Wavetable Capture Volume", 0, CMI8330_WAVGAIN, CMI8330_WAVGAIN, 4, 0, 15, 0),
+AD1848_SINGLE("3D Control - Switch", 0, CMI8330_RMUX3D, 5, 1, 1),
+AD1848_SINGLE("PC Speaker Playback Volume", 0, CMI8330_OUTPUTVOL, 3, 3, 0),
+AD1848_SINGLE("FM Playback Switch", 0, CMI8330_RECMUX, 3, 1, 1),
+AD1848_SINGLE("IEC958 Input Capture Switch", 0, CMI8330_RMUX3D, 7, 1, 1),
+AD1848_SINGLE("IEC958 Input Playback Switch", 0, CMI8330_MUTEMUX, 7, 1, 1),
+};
+
+#ifdef ENABLE_SB_MIXER
+static struct sbmix_elem cmi8330_sb_mixers[] __initdata = {
+SB_DOUBLE("SB Master Playback Volume", SB_DSP4_MASTER_DEV, (SB_DSP4_MASTER_DEV + 1), 3, 3, 31),
+SB_DOUBLE("Tone Control - Bass", SB_DSP4_BASS_DEV, (SB_DSP4_BASS_DEV + 1), 4, 4, 15),
+SB_DOUBLE("Tone Control - Treble", SB_DSP4_TREBLE_DEV, (SB_DSP4_TREBLE_DEV + 1), 4, 4, 15),
+SB_DOUBLE("SB PCM Playback Volume", SB_DSP4_PCM_DEV, (SB_DSP4_PCM_DEV + 1), 3, 3, 31),
+SB_DOUBLE("SB Synth Playback Volume", SB_DSP4_SYNTH_DEV, (SB_DSP4_SYNTH_DEV + 1), 3, 3, 31),
+SB_DOUBLE("SB CD Playback Switch", SB_DSP4_OUTPUT_SW, SB_DSP4_OUTPUT_SW, 2, 1, 1),
+SB_DOUBLE("SB CD Playback Volume", SB_DSP4_CD_DEV, (SB_DSP4_CD_DEV + 1), 3, 3, 31),
+SB_DOUBLE("SB Line Playback Switch", SB_DSP4_OUTPUT_SW, SB_DSP4_OUTPUT_SW, 4, 3, 1),
+SB_DOUBLE("SB Line Playback Volume", SB_DSP4_LINE_DEV, (SB_DSP4_LINE_DEV + 1), 3, 3, 31),
+SB_SINGLE("SB Mic Playback Switch", SB_DSP4_OUTPUT_SW, 0, 1),
+SB_SINGLE("SB Mic Playback Volume", SB_DSP4_MIC_DEV, 3, 31),
+SB_SINGLE("SB PC Speaker Volume", SB_DSP4_SPEAKER_DEV, 6, 3),
+SB_DOUBLE("SB Capture Volume", SB_DSP4_IGAIN_DEV, (SB_DSP4_IGAIN_DEV + 1), 6, 6, 3),
+SB_DOUBLE("SB Playback Volume", SB_DSP4_OGAIN_DEV, (SB_DSP4_OGAIN_DEV + 1), 6, 6, 3),
+SB_SINGLE("SB Mic Auto Gain", SB_DSP4_MIC_AGC, 0, 1),
+};
+
+static unsigned char cmi8330_sb_init_values[][2] __initdata = {
+        { SB_DSP4_MASTER_DEV + 0, 0 },
+        { SB_DSP4_MASTER_DEV + 1, 0 },
+        { SB_DSP4_PCM_DEV + 0, 0 },
+        { SB_DSP4_PCM_DEV + 1, 0 },
+        { SB_DSP4_SYNTH_DEV + 0, 0 },
+        { SB_DSP4_SYNTH_DEV + 1, 0 },
+        { SB_DSP4_INPUT_LEFT, 0 },
+        { SB_DSP4_INPUT_RIGHT, 0 },
+        { SB_DSP4_OUTPUT_SW, 0 },
+        { SB_DSP4_SPEAKER_DEV, 0 },
+};
+
+
+static int __devinit cmi8330_add_sb_mixers(sb_t *chip)
+{
+        int idx, err;
+        unsigned long flags;
+
+        spin_lock_irqsave(&chip->mixer_lock, flags);
+        snd_sbmixer_write(chip, 0x00, 0x00);            /* mixer reset */
+        spin_unlock_irqrestore(&chip->mixer_lock, flags);
+
+        /* mute and zero volume channels */
+        for (idx = 0; idx < ARRAY_SIZE(cmi8330_sb_init_values); idx++) {
+                spin_lock_irqsave(&chip->mixer_lock, flags);
+                snd_sbmixer_write(chip, cmi8330_sb_init_values[idx][0],
+                                  cmi8330_sb_init_values[idx][1]);
+                spin_unlock_irqrestore(&chip->mixer_lock, flags);
+        }
+
+        for (idx = 0; idx < ARRAY_SIZE(cmi8330_sb_mixers); idx++) {
+                if ((err = snd_sbmixer_add_ctl_elem(chip, &cmi8330_sb_mixers[idx])) < 0)
+                        return err;
+        }
+        return 0;
+}
+#endif
+
+static int __devinit snd_cmi8330_mixer(snd_card_t *card, struct snd_cmi8330 *acard)
+{
+        unsigned int idx;
+        int err;
+
+        strcpy(card->mixername, "CMI8330/C3D");
+
+        for (idx = 0; idx < ARRAY_SIZE(snd_cmi8330_controls); idx++) {
+                if ((err = snd_ad1848_add_ctl_elem(acard->wss, &snd_cmi8330_controls[idx])) < 0)
+                        return err;
+        }
+
+#ifdef ENABLE_SB_MIXER
+        if ((err = cmi8330_add_sb_mixers(acard->sb)) < 0)
+                return err;
+#endif
+        return 0;
+}
+
+#ifdef CONFIG_PNP
+static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,
+                                     struct pnp_card_link *card,
+                                     const struct pnp_card_device_id *id)
+{
+        struct pnp_dev *pdev;
+        struct pnp_resource_table * cfg = kmalloc(sizeof(struct pnp_resource_table), GFP_KERNEL);
+        int err;
+
+        acard->cap = pnp_request_card_device(card, id->devs[0].id, NULL);
+        if (acard->cap == NULL) {
+                kfree(cfg);
+                return -EBUSY;
+        }
+        acard->play = pnp_request_card_device(card, id->devs[1].id, NULL);
+        if (acard->play == NULL) {
+                kfree(cfg);
+                return -EBUSY;
+        }
+
+        pdev = acard->cap;
+        pnp_init_resource_table(cfg);
+        /* allocate AD1848 resources */
+        if (wssport[dev] != SNDRV_AUTO_PORT)
+                pnp_resource_change(&cfg->port_resource[0], wssport[dev], 8);
+        if (wssdma[dev] != SNDRV_AUTO_DMA)
+                pnp_resource_change(&cfg->dma_resource[0], wssdma[dev], 1);
+        if (wssirq[dev] != SNDRV_AUTO_IRQ)
+                pnp_resource_change(&cfg->irq_resource[0], wssirq[dev], 1);
+
+        err = pnp_manual_config_dev(pdev, cfg, 0);
+        if (err < 0)
+                snd_printk(KERN_ERR "CMI8330/C3D (AD1848) PnP manual resources are invalid, using auto config\n");
+        err = pnp_activate_dev(pdev);
+        if (err < 0) {
+                snd_printk(KERN_ERR "CMI8330/C3D (AD1848) PnP configure failure\n");
+                kfree(cfg);
+                return -EBUSY;
+        }
+        wssport[dev] = pnp_port_start(pdev, 0);
+        wssdma[dev] = pnp_dma(pdev, 0);
+        wssirq[dev] = pnp_irq(pdev, 0);
+
+        /* allocate SB16 resources */
+        pdev = acard->play;
+        pnp_init_resource_table(cfg);
+        if (sbport[dev] != SNDRV_AUTO_PORT)
+                pnp_resource_change(&cfg->port_resource[0], sbport[dev], 16);
+        if (sbdma8[dev] != SNDRV_AUTO_DMA)
+                pnp_resource_change(&cfg->dma_resource[0], sbdma8[dev], 1);
+        if (sbdma16[dev] != SNDRV_AUTO_DMA)
+                pnp_resource_change(&cfg->dma_resource[1], sbdma16[dev], 1);
+        if (sbirq[dev] != SNDRV_AUTO_IRQ)
+                pnp_resource_change(&cfg->irq_resource[0], sbirq[dev], 1);
+
+        err = pnp_manual_config_dev(pdev, cfg, 0);
+        if (err < 0)
+                snd_printk(KERN_ERR "CMI8330/C3D (SB16) PnP manual resources are invalid, using auto config\n");
+        err = pnp_activate_dev(pdev);
+        if (err < 0) {
+                snd_printk(KERN_ERR "CMI8330/C3D (SB16) PnP configure failure\n");
+                kfree(cfg);
+                return -EBUSY;
+        }
+        sbport[dev] = pnp_port_start(pdev, 0);
+        sbdma8[dev] = pnp_dma(pdev, 0);
+        sbdma16[dev] = pnp_dma(pdev, 1);
+        sbirq[dev] = pnp_irq(pdev, 0);
+
+        kfree(cfg);
+        return 0;
+}
+#endif
+
+/*
+ * PCM interface
+ *
+ * since we call the different chip interfaces for playback and capture
+ * directions, we need a trick.
+ *
+ * - copy the ops for each direction into a local record.
+ * - replace the open callback with the new one, which replaces the
+ *   substream->private_data with the corresponding chip instance
+ *   and calls again the original open callback of the chip.
+ *
+ */
+
+#ifdef PLAYBACK_ON_SB
+#define CMI_SB_STREAM   SNDRV_PCM_STREAM_PLAYBACK
+#define CMI_AD_STREAM   SNDRV_PCM_STREAM_CAPTURE
+#else
+#define CMI_SB_STREAM   SNDRV_PCM_STREAM_CAPTURE
+#define CMI_AD_STREAM   SNDRV_PCM_STREAM_PLAYBACK
+#endif
+
+static int snd_cmi8330_playback_open(snd_pcm_substream_t * substream)
+{
+        struct snd_cmi8330 *chip = snd_pcm_substream_chip(substream);
+
+        /* replace the private_data and call the original open callback */
+        substream->private_data = chip->streams[SNDRV_PCM_STREAM_PLAYBACK].private_data;
+        return chip->streams[SNDRV_PCM_STREAM_PLAYBACK].open(substream);
+}
+
+static int snd_cmi8330_capture_open(snd_pcm_substream_t * substream)
+{
+        struct snd_cmi8330 *chip = snd_pcm_substream_chip(substream);
+
+        /* replace the private_data and call the original open callback */
+        substream->private_data = chip->streams[SNDRV_PCM_STREAM_CAPTURE].private_data;
+        return chip->streams[SNDRV_PCM_STREAM_CAPTURE].open(substream);
+}
+
+static void snd_cmi8330_pcm_free(snd_pcm_t *pcm)
+{
+        snd_pcm_lib_preallocate_free_for_all(pcm);
+}
+
+static int __devinit snd_cmi8330_pcm(snd_card_t *card, struct snd_cmi8330 *chip)
+{
+        snd_pcm_t *pcm;
+        const snd_pcm_ops_t *ops;
+        int err;
+        static snd_pcm_open_callback_t cmi_open_callbacks[2] = {
+                snd_cmi8330_playback_open,
+                snd_cmi8330_capture_open
+        };
+
+        if ((err = snd_pcm_new(card, "CMI8330", 0, 1, 1, &pcm)) < 0)
+                return err;
+        strcpy(pcm->name, "CMI8330");
+        pcm->private_data = chip;
+        pcm->private_free = snd_cmi8330_pcm_free;
+        
+        /* SB16 */
+        ops = snd_sb16dsp_get_pcm_ops(CMI_SB_STREAM);
+        chip->streams[CMI_SB_STREAM].ops = *ops;
+        chip->streams[CMI_SB_STREAM].open = ops->open;
+        chip->streams[CMI_SB_STREAM].ops.open = cmi_open_callbacks[CMI_SB_STREAM];
+        chip->streams[CMI_SB_STREAM].private_data = chip->sb;
+
+        /* AD1848 */
+        ops = snd_ad1848_get_pcm_ops(CMI_AD_STREAM);
+        chip->streams[CMI_AD_STREAM].ops = *ops;
+        chip->streams[CMI_AD_STREAM].open = ops->open;
+        chip->streams[CMI_AD_STREAM].ops.open = cmi_open_callbacks[CMI_AD_STREAM];
+        chip->streams[CMI_AD_STREAM].private_data = chip->wss;
+
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &chip->streams[SNDRV_PCM_STREAM_PLAYBACK].ops);
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &chip->streams[SNDRV_PCM_STREAM_CAPTURE].ops);
+
+        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                              snd_dma_isa_data(),
+                                              64*1024, 128*1024);
+        chip->pcm = pcm;
+
+        return 0;
+}
+
+
+/*
+ */
+
+static int __devinit snd_cmi8330_probe(int dev,
+                                       struct pnp_card_link *pcard,
+                                       const struct pnp_card_device_id *pid)
+{
+        snd_card_t *card;
+        struct snd_cmi8330 *acard;
+        unsigned long flags;
+        int i, err;
+
+#ifdef CONFIG_PNP
+        if (!isapnp[dev]) {
+#endif
+                if (wssport[dev] == SNDRV_AUTO_PORT) {
+                        snd_printk("specify wssport\n");
+                        return -EINVAL;
+                }
+                if (sbport[dev] == SNDRV_AUTO_PORT) {
+                        snd_printk("specify sbport\n");
+                        return -EINVAL;
+                }
+#ifdef CONFIG_PNP
+        }
+#endif
+        card = snd_card_new(index[dev], id[dev], THIS_MODULE,
+                            sizeof(struct snd_cmi8330));
+        if (card == NULL) {
+                snd_printk("could not get a new card\n");
+                return -ENOMEM;
+        }
+        acard = (struct snd_cmi8330 *)card->private_data;
+        acard->card = card;
+
+#ifdef CONFIG_PNP
+        if (isapnp[dev]) {
+                if ((err = snd_cmi8330_pnp(dev, acard, pcard, pid)) < 0) {
+                        snd_printk("PnP detection failed\n");
+                        snd_card_free(card);
+                        return err;
+                }
+                snd_card_set_dev(card, &pcard->card->dev);
+        }
+#endif
+
+        if ((err = snd_ad1848_create(card,
+                                     wssport[dev] + 4,
+                                     wssirq[dev],
+                                     wssdma[dev],
+                                     AD1848_HW_DETECT,
+                                     &acard->wss)) < 0) {
+                snd_printk("(AD1848) device busy??\n");
+                snd_card_free(card);
+                return err;
+        }
+        if (acard->wss->hardware != AD1848_HW_CMI8330) {
+                snd_printk("(AD1848) not found during probe\n");
+                snd_card_free(card);
+                return -ENODEV;
+        }
+
+        if ((err = snd_sbdsp_create(card, sbport[dev],
+                                    sbirq[dev],
+                                    snd_sb16dsp_interrupt,
+                                    sbdma8[dev],
+                                    sbdma16[dev],
+                                    SB_HW_AUTO, &acard->sb)) < 0) {
+                snd_printk("(SB16) device busy??\n");
+                snd_card_free(card);
+                return err;
+        }
+        if (acard->sb->hardware != SB_HW_16) {
+                snd_printk("(SB16) not found during probe\n");
+                snd_card_free(card);
+                return -ENODEV;
+        }
+
+        spin_lock_irqsave(&acard->wss->reg_lock, flags);
+        snd_ad1848_out(acard->wss, AD1848_MISC_INFO, 0x40); /* switch on MODE2 */
+        for (i = CMI8330_RMUX3D; i <= CMI8330_CDINGAIN; i++)
+                snd_ad1848_out(acard->wss, i, snd_cmi8330_image[i - CMI8330_RMUX3D]);
+        spin_unlock_irqrestore(&acard->wss->reg_lock, flags);
+
+        if ((err = snd_cmi8330_mixer(card, acard)) < 0) {
+                snd_printk("failed to create mixers\n");
+                snd_card_free(card);
+                return err;
+        }
+
+        if ((err = snd_cmi8330_pcm(card, acard)) < 0) {
+                snd_printk("failed to create pcms\n");
+                snd_card_free(card);
+                return err;
+        }
+
+        strcpy(card->driver, "CMI8330/C3D");
+        strcpy(card->shortname, "C-Media CMI8330/C3D");
+        sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
+                card->shortname,
+                acard->wss->port,
+                wssirq[dev],
+                wssdma[dev]);
+
+        if ((err = snd_card_register(card)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+
+        if (pcard)
+                pnp_set_card_drvdata(pcard, card);
+        else
+                snd_cmi8330_legacy[dev] = card;
+        return 0;
+}
+
+#ifdef CONFIG_PNP
+static int __devinit snd_cmi8330_pnp_detect(struct pnp_card_link *card,
+                                            const struct pnp_card_device_id *id)
+{
+        static int dev;
+        int res;
+
+        for ( ; dev < SNDRV_CARDS; dev++) {
+                if (!enable[dev] || !isapnp[dev])
+                        continue;
+                res = snd_cmi8330_probe(dev, card, id);
+                if (res < 0)
+                        return res;
+                dev++;
+                return 0;
+        }
+        return -ENODEV;
+}
+
+static void __devexit snd_cmi8330_pnp_remove(struct pnp_card_link * pcard)
+{
+        snd_card_t *card = (snd_card_t *) pnp_get_card_drvdata(pcard);
+
+        snd_card_disconnect(card);
+        snd_card_free_in_thread(card);
+}
+
+static struct pnp_card_driver cmi8330_pnpc_driver = {
+        .flags = PNP_DRIVER_RES_DISABLE,
+        .name = "cmi8330",
+        .id_table = snd_cmi8330_pnpids,
+        .probe = snd_cmi8330_pnp_detect,
+        .remove = __devexit_p(snd_cmi8330_pnp_remove),
+};
+#endif /* CONFIG_PNP */
+
+static int __init alsa_card_cmi8330_init(void)
+{
+        int dev, cards = 0;
+
+        for (dev = 0; dev < SNDRV_CARDS; dev++) {
+                if (!enable[dev])
+                        continue;
+#ifdef CONFIG_PNP
+                if (isapnp[dev])
+                        continue;
+#endif
+                if (snd_cmi8330_probe(dev, NULL, NULL) >= 0)
+                        cards++;
+        }
+#ifdef CONFIG_PNP
+        cards += pnp_register_card_driver(&cmi8330_pnpc_driver);
+#endif
+
+        if (!cards) {
+#ifdef CONFIG_PNP
+                pnp_unregister_card_driver(&cmi8330_pnpc_driver);
+#endif
+#ifdef MODULE
+                snd_printk(KERN_ERR "CMI8330 not found or device busy\n");
+#endif
+                return -ENODEV;
+        }
+        return 0;
+}
+
+static void __exit alsa_card_cmi8330_exit(void)
+{
+        int i;
+
+#ifdef CONFIG_PNP
+        /* PnP cards first */
+        pnp_unregister_card_driver(&cmi8330_pnpc_driver);
+#endif
+        for (i = 0; i < SNDRV_CARDS; i++)
+                snd_card_free(snd_cmi8330_legacy[i]);
+}
+
+module_init(alsa_card_cmi8330_init)
+module_exit(alsa_card_cmi8330_exit)