Changeset 76

Timestamp:

Apr 9, 2006, 12:09:39 PM (19 years ago)

Author:

vladest

Message:

Latest ALSA patches
HDA patches
Patch for Intel from Rudy's
Fixes locks on NM256 chipsets
Fixes PM on Maestro3 chipsets

Location:

GPL/trunk

Files:

• alsa-kernel/core/control.c (modified) (17 diffs)
• alsa-kernel/core/memalloc.c (modified) (8 diffs)
• alsa-kernel/core/pcm_native.c (modified) (10 diffs)
• alsa-kernel/include/sound/ac97_codec.h (modified) (5 diffs)
• alsa-kernel/include/sound/driver.h (modified) (2 diffs)
• alsa-kernel/pci/ac97/ac97_codec.c (modified) (40 diffs)
• alsa-kernel/pci/ac97/ac97_patch.c (modified) (25 diffs)
• alsa-kernel/pci/ac97/ac97_patch.h (modified) (1 diff)
• alsa-kernel/pci/bt87x.c (modified) (3 diffs)
• alsa-kernel/pci/ca0106/ca0106.h (modified) (12 diffs)
• alsa-kernel/pci/ca0106/ca0106_main.c (modified) (49 diffs)
• alsa-kernel/pci/ca0106/ca0106_mixer.c (modified) (21 diffs)
• alsa-kernel/pci/ca0106/ca0106_proc.c (modified) (17 diffs)
• alsa-kernel/pci/ca0106/makefile.os2 (modified) (1 diff)
• alsa-kernel/pci/cs4281.c (modified) (9 diffs)
• alsa-kernel/pci/cs46xx/cs46xx.c (modified) (2 diffs)
• alsa-kernel/pci/cs46xx/cs46xx_lib.c (modified) (34 diffs)
• alsa-kernel/pci/cs46xx/cs46xx_lib.h (modified) (4 diffs)
• alsa-kernel/pci/cs46xx/dsp_spos.c (modified) (37 diffs)
• alsa-kernel/pci/cs46xx/dsp_spos_scb_lib.c (modified) (17 diffs)
• alsa-kernel/pci/cs46xx/makefile.os2 (modified) (2 diffs)
• alsa-kernel/pci/es1968.c (modified) (2 diffs)
• alsa-kernel/pci/hda/hda_codec.c (modified) (9 diffs)
• alsa-kernel/pci/hda/hda_generic.c (modified) (17 diffs)
• alsa-kernel/pci/hda/hda_intel.c (modified) (20 diffs)
• alsa-kernel/pci/hda/hda_local.h (modified) (3 diffs)
• alsa-kernel/pci/hda/patch_analog.c (modified) (20 diffs)
• alsa-kernel/pci/hda/patch_realtek.c (modified) (92 diffs)
• alsa-kernel/pci/hda/patch_si3054.c (modified) (1 diff)
• alsa-kernel/pci/hda/patch_sigmatel.c (modified) (29 diffs)
• alsa-kernel/pci/intel8x0.c (modified) (11 diffs)
• alsa-kernel/pci/maestro3.c (modified) (16 diffs)
• alsa-kernel/pci/nm256/nm256.c (modified) (23 diffs)
• alsa-kernel/pci/via82xx.c (modified) (2 diffs)
• drv32/pciids.h (modified) (1 diff)
• include/linux/mutex.h (added)
• include/version.mak (modified) (1 diff)
• lib32/fminstrload.c (modified) (1 diff)
• lib32/ioctl.c (modified) (2 diffs)
• lib32/irq.c (modified) (7 diffs)
• lib32/memory.cpp (modified) (1 diff)
• lib32/ossidc.cpp (modified) (2 diffs)
• lib32/pci.c (modified) (1 diff)
• lib32/sound.c (modified) (2 diffs)
• lib32/stack.cpp (modified) (1 diff)
• lib32/timer.c (modified) (1 diff)

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

@@ -316 +316 @@
     struct snd_ctl_elem_id id;
     unsigned int idx;
-
-    snd_runtime_check(card != NULL && kcontrol != NULL, return -EINVAL);
-    snd_assert(kcontrol->info != NULL, return -EINVAL);
+    int err = -EINVAL;
+
+    if (! kcontrol)
+        return err;
+
+    snd_assert(card != NULL, goto error);
+    snd_assert(kcontrol->info != NULL, goto error);
+
     id = kcontrol->id;
     down_write(&card->controls_rwsem);
-#if 0 // doesnt works, traps on some systems
+#if 1 // doesnt works, traps on some systems
     if (snd_ctl_find_id(card, &id)) {
         up_write(&card->controls_rwsem);
@@ -331 +336 @@
                    id.name,
                    id.index);
-        return -EBUSY;
+        err = -EBUSY;
+        goto error;
     }
     if (snd_ctl_find_hole(card, kcontrol->count) < 0) {
         up_write(&card->controls_rwsem);
-        snd_ctl_free_one(kcontrol);
-        return -ENOMEM;
+        err = -ENOMEM;
+        goto error;
     }
 #endif
@@ -347 +353 @@
         snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id);
     return 0;
+
+error:
+    snd_ctl_free_one(kcontrol);
+    return err;
 }
 
@@ -395 +405 @@
 }
 
-static struct snd_kcontrol *_ctl_find_id
-(struct snd_card * card, struct snd_ctl_elem_id *id); /* w/o lock */
-
 /**
  * snd_ctl_remove_unlocked_id - remove the unlocked control of the given id and release it
@@ -441 +448 @@
  * Returns zero if successful, or a negative error code on failure.
  */
-int snd_ctl_rename_id(struct snd_card * card, struct snd_ctl_elem_id *src_id, struct snd_ctl_elem_id *dst_id)
-{
-    struct snd_kcontrol *kctl;
-
-    down_write(&card->controls_rwsem);
-    kctl = _ctl_find_id(card, src_id);
-    if (kctl == NULL) {
-        up_write(&card->controls_rwsem);
-        return -ENOENT;
-    }
-    kctl->id = *dst_id;
-    kctl->id.numid = card->last_numid + 1;
-    card->last_numid += kctl->count;
-    up_write(&card->controls_rwsem);
-    return 0;
-}
-
-static struct snd_kcontrol *_ctl_find_numid(struct snd_card * card, unsigned int numid)
+int snd_ctl_rename_id(struct snd_card *card, struct snd_ctl_elem_id *src_id,
+                      struct snd_ctl_elem_id *dst_id)
+{
+        struct snd_kcontrol *kctl;
+
+        down_write(&card->controls_rwsem);
+        kctl = snd_ctl_find_id(card, src_id);
+        if (kctl == NULL) {
+                up_write(&card->controls_rwsem);
+                return -ENOENT;
+        }
+        kctl->id = *dst_id;
+        kctl->id.numid = card->last_numid + 1;
+        card->last_numid += kctl->count;
+        up_write(&card->controls_rwsem);
+        return 0;
+}
+
+/**
+ * snd_ctl_find_numid - find the control instance with the given number-id
+ * @card: the card instance
+ * @numid: the number-id to search
+ *
+ * Finds the control instance with the given number-id from the card.
+ *
+ * Returns the pointer of the instance if found, or NULL if not.
+ *
+ * The caller must down card->controls_rwsem before calling this function
+ * (if the race condition can happen).
+ */
+struct snd_kcontrol *snd_ctl_find_numid(struct snd_card *card, unsigned int numid)
 {
     struct list_head *list;
     struct snd_kcontrol *kctl;
 
-    snd_runtime_check(card != NULL && numid != 0, return NULL);
+    snd_assert(card != NULL && numid != 0, return NULL);
     list_for_each(list, &card->controls) {
         kctl = snd_kcontrol(list);
@@ -472 +492 @@
 }
 
-static struct snd_kcontrol *_ctl_find_id(struct snd_card * card, struct snd_ctl_elem_id *id)
-{
-    struct list_head *list;
-    struct snd_kcontrol *kctl;
-
-    snd_runtime_check(card != NULL && id != NULL, return NULL);
-    if (id->numid != 0)
-        return _ctl_find_numid(card, id->numid);
-    list_for_each(list, &card->controls) {
-        kctl = snd_kcontrol(list);
-        if (kctl->id.iface != id->iface)
-            continue;
-        if (kctl->id.device != id->device)
-            continue;
-        if (kctl->id.subdevice != id->subdevice)
-            continue;
-        if (strncmp(kctl->id.name, id->name, sizeof(kctl->id.name)))
-            continue;
-        if (kctl->id.index > id->index)
-            continue;
-        if (kctl->id.index + kctl->count <= id->index)
-            continue;
-        return kctl;
-    }
-    return NULL;
-}
-
 /**
- * snd_ctl_find_id - find the control instance with the given id
- * @card: the card instance
- * @id: the id to search
- *
- * Finds the control instance with the given id from the card.
- *
- * Returns the pointer of the instance if found, or NULL if not.
- */
-struct snd_kcontrol *snd_ctl_find_id(struct snd_card * card, struct snd_ctl_elem_id *id)
-{
-    struct snd_kcontrol *kctl;
-    down_read(&card->controls_rwsem);
-    kctl = _ctl_find_id(card, id);
-    up_read(&card->controls_rwsem);
-    return kctl;
-}
-
-/**
- * snd_ctl_find_numid - find the control instance with the given number-id
- * @card: the card instance
- * @numid: the number-id to search
- *
- * Finds the control instance with the given number-id from the card.
- *
- * Returns the pointer of the instance if found, or NULL if not.
- */
-struct snd_kcontrol *snd_ctl_find_numid(struct snd_card * card, unsigned int numid)
-{
-    struct snd_kcontrol *kctl;
-    down_read(&card->controls_rwsem);
-    kctl = _ctl_find_numid(card, numid);
-    up_read(&card->controls_rwsem);
-    return kctl;
-}
+* snd_ctl_find_id - find the control instance with the given id
+* @card: the card instance
+* @id: the id to search
+*
+    * Finds the control instance with the given id from the card.
+    *
+    * Returns the pointer of the instance if found, or NULL if not.
+        *
+            * The caller must down card->controls_rwsem before calling this function
+            * (if the race condition can happen).
+            */
+            struct snd_kcontrol *snd_ctl_find_id(struct snd_card *card,
+                                                 struct snd_ctl_elem_id *id)
+    {
+        struct list_head *list;
+        struct snd_kcontrol *kctl;
+
+        snd_assert(card != NULL && id != NULL, return NULL);
+        if (id->numid != 0)
+            return snd_ctl_find_numid(card, id->numid);
+        list_for_each(list, &card->controls) {
+            kctl = snd_kcontrol(list);
+            if (kctl->id.iface != id->iface)
+                continue;
+            if (kctl->id.device != id->device)
+                continue;
+            if (kctl->id.subdevice != id->subdevice)
+                continue;
+            if (strncmp(kctl->id.name, id->name, sizeof(kctl->id.name)))
+                continue;
+            if (kctl->id.index > id->index)
+                continue;
+            if (kctl->id.index + kctl->count <= id->index)
+                continue;
+            return kctl;
+        }
+        return NULL;
+    }
 
 static int snd_ctl_card_info(struct snd_card * card, struct snd_ctl_file * ctl,
@@ -617 +614 @@
 }
 
-static int snd_ctl_elem_info(struct snd_ctl_file *ctl, struct snd_ctl_elem_info *_info)
+static int snd_ctl_elem_info(struct snd_ctl_file *ctl,
+                             struct snd_ctl_elem_info *info)
 {
     struct snd_card *card = ctl->card;
-    struct snd_ctl_elem_info info;
     struct snd_kcontrol *kctl;
     struct snd_kcontrol_volatile *vd;
@@ -626 +623 @@
     int result;
 
-    if (copy_from_user(&info, _info, sizeof(info)))
-        return -EFAULT;
     down_read(&card->controls_rwsem);
-    kctl = _ctl_find_id(card, &info.id);
+    kctl = snd_ctl_find_id(card, &info->id);
     if (kctl == NULL) {
         up_read(&card->controls_rwsem);
@@ -635 +630 @@
     }
 #ifdef CONFIG_SND_DEBUG
-    info.access = 0;
+    info->access = 0;
 #endif
-    result = kctl->info(kctl, &info);
+    result = kctl->info(kctl, info);
     if (result >= 0) {
-        snd_assert(info.access == 0, );
-        index_offset = snd_ctl_get_ioff(kctl, &info.id);
+        snd_assert(info->access == 0, );
+        index_offset = snd_ctl_get_ioff(kctl, &info->id);
         vd = &kctl->vd[index_offset];
-        snd_ctl_build_ioff(&info.id, kctl, index_offset);
-        info.access = vd->access;
+        snd_ctl_build_ioff(&info->id, kctl, index_offset);
+        info->access = vd->access;
         if (vd->owner) {
-            info.access |= SNDRV_CTL_ELEM_ACCESS_LOCK;
+            info->access |= SNDRV_CTL_ELEM_ACCESS_LOCK;
             if (vd->owner == ctl)
-                info.access |= SNDRV_CTL_ELEM_ACCESS_OWNER;
-            info.owner = vd->owner_pid;
+                info->access |= SNDRV_CTL_ELEM_ACCESS_OWNER;
+            info->owner = vd->owner_pid;
         } else {
-            info.owner = -1;
+            info->owner = -1;
         }
     }
     up_read(&card->controls_rwsem);
-    if (result >= 0)
-        if (copy_to_user(_info, &info, sizeof(info)))
-            return -EFAULT;
     return result;
 }
-#if 0
-int snd_ctl_elem_read(struct snd_card *card, struct snd_ctl_elem_value *_control)
-{
-
-    struct snd_ctl_elem_value *control;
-    struct snd_kcontrol *kctl;
-    struct snd_kcontrol_volatile *vd;
-    unsigned int index_offset;
-    int result, indirect;
-
-    control = kmalloc(sizeof(*control), GFP_KERNEL);
-    if (control == NULL)
-        return -ENOMEM;
-    if (copy_from_user(control, _control, sizeof(*control)))
-        return -EFAULT;
-    down_read(&card->controls_rwsem);
-    kctl = _ctl_find_id(card, &control->id);
-    if (kctl == NULL) {
-        result = -ENOENT;
-    } else {
-        index_offset = snd_ctl_get_ioff(kctl, &control->id);
-        vd = &kctl->vd[index_offset];
-        indirect = vd->access & SNDRV_CTL_ELEM_ACCESS_INDIRECT ? 1 : 0;
-        if (control->indirect != indirect) {
-            result = -EACCES;
-        } else {
-            if ((vd->access & SNDRV_CTL_ELEM_ACCESS_READ) && kctl->get != NULL) {
-                snd_ctl_build_ioff(&control->id, kctl, index_offset);
-                result = kctl->get(kctl, control);
-            } else {
-                result = -EPERM;
-            }
-        }
-    }
-    up_read(&card->controls_rwsem);
-    if (result >= 0)
-        if (copy_to_user(_control, control, sizeof(*control)))
-            return -EFAULT;
-    kfree(control);
-    return result;
-}
-
-int snd_ctl_elem_write(struct snd_ctl_file *file, struct snd_ctl_elem_value *_control)
-{
-    struct snd_card *card = file->card;
-    struct snd_ctl_elem_value *control;
-    struct snd_kcontrol *kctl;
-    struct snd_kcontrol_volatile *vd;
-    unsigned int index_offset;
-    int result, indirect;
-
-    control = kmalloc(sizeof(*control), GFP_KERNEL);
-    if (control == NULL)
-        return -ENOMEM;
-    if (copy_from_user(control, _control, sizeof(*control)))
-        return -EFAULT;
-    down_read(&card->controls_rwsem);
-    kctl = _ctl_find_id(card, &control->id);
-    if (kctl == NULL) {
-        result = -ENOENT;
-    } else {
-        index_offset = snd_ctl_get_ioff(kctl, &control->id);
-        vd = &kctl->vd[index_offset];
-        indirect = vd->access & SNDRV_CTL_ELEM_ACCESS_INDIRECT ? 1 : 0;
-        if (control->indirect != indirect) {
-            result = -EACCES;
-        } else {
-            if (!(vd->access & SNDRV_CTL_ELEM_ACCESS_WRITE) ||
-                kctl->put == NULL ||
-                (vd->owner != NULL && vd->owner != file)) {
-                result = -EPERM;
-            } else {
-                snd_ctl_build_ioff(&control->id, kctl, index_offset);
-                result = kctl->put(kctl, control);
-            }
-            if (result > 0) {
-                up_read(&card->controls_rwsem);
-                snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_VALUE, &control->id);
-                result = 0;
-                goto __unlocked;
-            }
-        }
-    }
-    up_read(&card->controls_rwsem);
-__unlocked:
-    if (result >= 0)
-        if (copy_to_user(_control, control, sizeof(*control)))
-            return -EFAULT;
-    kfree(control);
-    return result;
-}
-#else
+
 int snd_ctl_elem_read(struct snd_card *card, struct snd_ctl_elem_value *control)
 {
@@ -785 +686 @@
         struct snd_ctl_elem_value *control;
         int result;
-        
+
         control = kmalloc(sizeof(*control), GFP_KERNEL);
         if (control == NULL)
-                return -ENOMEM; 
+                return -ENOMEM;
         if (copy_from_user(control, _control, sizeof(*control))) {
                 kfree(control);
@@ -845 +746 @@
         control = kmalloc(sizeof(*control), GFP_KERNEL);
         if (control == NULL)
-                return -ENOMEM; 
+                return -ENOMEM;
         if (copy_from_user(control, _control, sizeof(*control))) {
                 kfree(control);
@@ -858 +759 @@
 }
 
-#endif
-static int snd_ctl_elem_lock(struct snd_ctl_file *file, struct snd_ctl_elem_id *_id)
+
+static int snd_ctl_elem_lock(struct snd_ctl_file *file,
+                             struct snd_ctl_elem_id __user *_id)
 {
     struct snd_card *card = file->card;
@@ -870 +772 @@
         return -EFAULT;
     down_write(&card->controls_rwsem);
-    kctl = _ctl_find_id(card, &id);
+    kctl = snd_ctl_find_id(card, &id);
     if (kctl == NULL) {
         result = -ENOENT;
@@ -887 +789 @@
 }
 
-static int snd_ctl_elem_unlock(struct snd_ctl_file *file, struct snd_ctl_elem_id *_id)
+static int snd_ctl_elem_unlock(struct snd_ctl_file *file,
+                               struct snd_ctl_elem_id __user *_id)
 {
     struct snd_card *card = file->card;
@@ -898 +801 @@
         return -EFAULT;
     down_write(&card->controls_rwsem);
-    kctl = _ctl_find_id(card, &id);
+    kctl = snd_ctl_find_id(card, &id);
     if (kctl == NULL) {
         result = -ENOENT;
@@ -948 +851 @@
         int change;
         struct user_element *ue = kcontrol->private_data;
-        
+
         change = memcmp(&ucontrol->value, ue->elem_data, ue->elem_data_size) != 0;
         if (change)
@@ -970 +873 @@
         struct user_element *ue;
         int idx, err;
-        
+
         if (card->user_ctl_count >= MAX_USER_CONTROLS)
                 return -ENOMEM;

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

@@ -149 +149 @@
         res = dma_alloc_coherent(dev, PAGE_SIZE << pg, dma, gfp_flags);
         if (res != NULL) {
-#ifdef NEED_RESERVE_PAGES
-                mark_pages(virt_to_page(res), pg); /* should be dma_to_page() */
-#endif
                 inc_snd_pages(pg);
         }
@@ -168 +165 @@
         pg = get_order(size);
         dec_snd_pages(pg);
-#ifdef NEED_RESERVE_PAGES
-        unmark_pages(virt_to_page(ptr), pg); /* should be dma_to_page() */
-#endif
         dma_free_coherent(dev, PAGE_SIZE << pg, ptr, dma);
 }
@@ -402 +396 @@
 }
 
-static void mark_pages(struct page *page, int order)
-{
-    struct page *last_page = page + (1 << order);
-    while (page < last_page)
-        SetPageReserved(page++);
-}
-
-static void unmark_pages(struct page *page, int order)
-{
-    struct page *last_page = page + (1 << order);
-    while (page < last_page)
-        ClearPageReserved(page++);
-}
 
 /**
@@ -434 +415 @@
     pg = get_order(size);
     if ((res = (void *) __get_free_pages(dma_flags, pg)) != NULL) {
-        mark_pages(virt_to_page(res), pg);
         inc_snd_pages(pg);
     }
@@ -456 +436 @@
     pg = get_order(size);
     dec_snd_pages(pg);
-    unmark_pages(virt_to_page(ptr), pg);
     free_pages((unsigned long) ptr, pg);
 }
@@ -532 +511 @@
         res = pci_alloc_consistent(pci, PAGE_SIZE * (1 << pg), dmaaddr);
         if (res != NULL) {
-#ifdef NEED_RESERVE_PAGES
-            mark_pages(virt_to_page(res), pg); /* should be dma_to_page() */
-#endif
             inc_snd_pages(pg);
         }
@@ -589 +565 @@
         for (pg = 0; PAGE_SIZE * (1 << pg) < size; pg++);
         dec_snd_pages(pg);
-#ifdef NEED_RESERVE_PAGES
-        unmark_pages(virt_to_page(ptr), pg); /* should be dma_to_page() */
-#endif
         pci_free_consistent(pci, PAGE_SIZE * (1 << pg), ptr, dmaaddr);
 }
@@ -638 +611 @@
         if (ptr) {
                 memset(ptr, 0, PAGE_SIZE);
-                mark_pages(ptr, 0);
         }
         *addrp = addr;

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

@@ -1106 +1106 @@
 static int snd_pcm_pre_resume(snd_pcm_substream_t *substream, int state)
 {
-    snd_pcm_runtime_t *runtime = substream->runtime;
+    snd_pcm_runtime_t *runtime;
+    if (substream) runtime = substream->runtime;
+    if (!runtime) return 0;
     if (!(runtime->info & SNDRV_PCM_INFO_RESUME))
         return -ENOSYS;
@@ -1115 +1117 @@
 static int snd_pcm_do_resume(snd_pcm_substream_t *substream, int state)
 {
-    snd_pcm_runtime_t *runtime = substream->runtime;
+    snd_pcm_runtime_t *runtime;
+    if (substream) runtime = substream->runtime;
+    if (!runtime) return 0;
     if (runtime->trigger_master != substream)
         return 0;
@@ -1123 +1127 @@
          substream->stream != SNDRV_PCM_STREAM_PLAYBACK))
         return 0;
-    return substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_RESUME);
+    if (substream->ops->trigger)
+        return substream->ops->trigger(substream, SNDRV_PCM_TRIGGER_RESUME);
+    else return 0;
 }
 
@@ -1135 +1141 @@
 static void snd_pcm_post_resume(snd_pcm_substream_t *substream, int state)
 {
-    snd_pcm_runtime_t *runtime = substream->runtime;
+    snd_pcm_runtime_t *runtime;
+    if (substream) runtime = substream->runtime;
+    if (!runtime) return;
     snd_pcm_trigger_tstamp(substream);
     if (substream->timer)
@@ -1153 +1161 @@
 static int snd_pcm_resume(snd_pcm_substream_t *substream)
 {
-    snd_card_t *card = substream->pcm->card;
+    snd_card_t *card;
     int res;
 
-    snd_power_lock(card);
-    if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0, substream->ffile)) >= 0)
-        res = snd_pcm_action_lock_irq(&snd_pcm_action_resume, substream, 0);
-    snd_power_unlock(card);
+    if(substream && substream->pcm)
+    {
+        card = substream->pcm->card;
+        snd_power_lock(card);
+        if ((res = snd_power_wait(card, SNDRV_CTL_POWER_D0, substream->ffile)) >= 0)
+            res = snd_pcm_action_lock_irq(&snd_pcm_action_resume, substream, 0);
+        snd_power_unlock(card);
+    }
     return res;
 }
@@ -2060 +2072 @@
     err = snd_pcm_hw_constraints_init(substream);
     if (err < 0) {
-        snd_printd("snd_pcm_hw_constraints_init failed\n");
+        snd_printd("snd_pcm_hw_constraints_init failed: %i\n", err);
         snd_pcm_release_file(pcm_file);
         return err;
@@ -2067 +2079 @@
     if ((err = substream->ops->open(substream)) < 0) {
         snd_pcm_release_file(pcm_file);
+        snd_printd("supbstream open failed: %i\n", err);
         return err;
     }
@@ -2073 +2086 @@
     err = snd_pcm_hw_constraints_complete(substream);
     if (err < 0) {
-        snd_printd("snd_pcm_hw_constraints_complete failed\n");
+        snd_printd("snd_pcm_hw_constraints_complete failed: %i\n", err);
         snd_pcm_release_file(pcm_file);
         return err;
@@ -2532 +2545 @@
     case SNDRV_PCM_IOCTL_DROP:
         return snd_pcm_drop(substream);
+    case SNDRV_PCM_IOCTL_PAUSE:
+        {
+            int res;
+            snd_pcm_stream_lock_irq(substream);
+            res = snd_pcm_pause(substream, (int)(unsigned long)arg);
+            snd_pcm_stream_unlock_irq(substream);
+            return res;
+        }
     }
     snd_printd("unknown ioctl = 0x%x\n", cmd);
@@ -2611 +2632 @@
             return result < 0 ? result : 0;
         }
-    case SNDRV_PCM_IOCTL_PAUSE:
-        {
-            int res;
-            snd_pcm_stream_lock_irq(substream);
-            res = snd_pcm_pause(substream, (long) arg);
-            snd_pcm_stream_unlock_irq(substream);
-            return res;
-        }
     }
     return snd_pcm_common_ioctl1(substream, cmd, arg);

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

@@ -306 +306 @@
 #define AC97_ALC650_SOUCE_MASK      0x000f  /* Source number */
 #define AC97_ALC650_CHANNEL_MASK    0x00f0  /* Channel number */
-#define AC97_ALC650_CHANNEL_SHIFT   4 
+#define AC97_ALC650_CHANNEL_SHIFT   4
 #define AC97_ALC650_SPSR_MASK       0x0f00  /* S/PDIF Sample Rate bits */
 #define AC97_ALC650_SPSR_SHIFT      8
@@ -434 +434 @@
 };
 
+/* static resolution table */
+struct snd_ac97_res_table {
+    unsigned short reg;     /* register */
+    unsigned short bits;    /* resolution bitmask */
+};
+
 struct snd_ac97_template {
         void *private_data;
@@ -441 +447 @@
         unsigned short addr;    /* physical address of codec [0-3] */
         unsigned int scaps;     /* driver capabilities */
-        unsigned int limited_regs; /* allow limited registers only */
-        DECLARE_BITMAP(reg_accessed, 0x80); /* bit flags */
+        const struct snd_ac97_res_table *res_table;     /* static resolution */
 };
 
@@ -464 +469 @@
         unsigned short caps;    /* capabilities (register 0) */
         unsigned short ext_id;  /* extended feature identification (register 28) */
-        unsigned short ext_mid; /* extended modem ID (register 3C) */
+        unsigned short ext_mid; /* extended modem ID (register 3C) */
+        const struct snd_ac97_res_table *res_table;     /* static resolution */
         unsigned int scaps;     /* driver capabilities */
         unsigned int flags;     /* specific code */
@@ -470 +476 @@
         unsigned int spdif_status;
         unsigned short regs[0x80]; /* register cache */
-        unsigned int limited_regs; /* allow limited registers only */
         DECLARE_BITMAP(reg_accessed, 0x80); /* bit flags */
         union {                 /* vendor specific code */

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

@@ -655 +655 @@
                 ##retval;\
         }
-
 #define snd_runtime_check snd_assert
 
@@ -749 +748 @@
 typedef unsigned gfp_t;
 
+#ifndef cpu_relax
+#define cpu_relax()
+#endif
+
 #endif                          /* __DRIVER_H */

GPL/trunk/alsa-kernel/pci/ac97/ac97_codec.c

@@ -144 +144 @@
 { 0x49434511, 0xffffffff, "ICE1232",            NULL,           NULL }, // alias VIA VT1611A?
 { 0x49434514, 0xffffffff, "ICE1232A",           NULL,           NULL },
-{ 0x49434551, 0xffffffff, "VT1616",             patch_vt1616,   NULL }, 
+{ 0x49434551, 0xffffffff, "VT1616",             patch_vt1616,   NULL },
 { 0x49434552, 0xffffffff, "VT1616i",            patch_vt1616,   NULL }, // VT1616 compatible (chipset integrated)
 { 0x49544520, 0xffffffff, "IT2226E",            NULL,           NULL },
@@ -151 +151 @@
 { 0x4e534331, 0xffffffff, "LM4549",             NULL,           NULL },
 { 0x4e534350, 0xffffffff, "LM4550",             NULL,           NULL },
+{ 0x4e534350, 0xffffffff, "LM4550",             patch_lm4550,   NULL }, // volume wrap fix
 { 0x50534304, 0xffffffff, "UCB1400",            NULL,           NULL },
 { 0x53494c20, 0xffffffe0, "Si3036,8",           mpatch_si3036,  mpatch_si3036, AC97_MODEM_PATCH },
@@ -192 +193 @@
 static int snd_ac97_valid_reg(struct snd_ac97 *ac97, unsigned short reg)
 {
-        if (ac97->limited_regs && ! test_bit(reg, ac97->reg_accessed))
-                return 0;
-
         /* filter some registers for buggy codecs */
         switch (ac97->id) {
@@ -257 +255 @@
 /**
  * snd_ac97_read - read a value from the given register
- * 
+ *
  * @ac97: the ac97 instance
  * @reg: the register to read
@@ -411 +409 @@
 {
         struct ac97_enum *e = (struct ac97_enum *)kcontrol->private_value;
-        
+
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
         uinfo->count = e->shift_l == e->shift_r ? 1 : 2;
         uinfo->value.enumerated.items = e->mask;
-        
+
         if (uinfo->value.enumerated.item > e->mask - 1)
                 uinfo->value.enumerated.item = e->mask - 1;
@@ -427 +425 @@
         struct ac97_enum *e = (struct ac97_enum *)kcontrol->private_value;
         unsigned short val, bitmask;
-        
+
         for (bitmask = 1; bitmask < e->mask; bitmask <<= 1)
                 ;
@@ -444 +442 @@
         unsigned short val;
         unsigned short mask, bitmask;
-        
+
         for (bitmask = 1; bitmask < e->mask; bitmask <<= 1)
                 ;
@@ -530 +528 @@
         int err, page_save;
         unsigned short val, val2, val_mask;
-        
+
         page_save = snd_ac97_page_save(ac97, reg, kcontrol);
         val = (ucontrol->value.integer.value[0] & mask);
@@ -580 +578 @@
 };
 
-static const struct snd_kcontrol_new snd_ac97_control_capture_src = 
-AC97_ENUM("Capture Source", std_enum[0]); 
+static const struct snd_kcontrol_new snd_ac97_control_capture_src =
+AC97_ENUM("Capture Source", std_enum[0]);
 
 static const struct snd_kcontrol_new snd_ac97_control_capture_vol =
@@ -648 +646 @@
         return 0;
 }
-                        
+
 static int snd_ac97_spdif_cmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -660 +658 @@
         return 0;
 }
-                        
+
 static int snd_ac97_spdif_pmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -683 +681 @@
         return 0;
 }
-                        
+
 static int snd_ac97_spdif_default_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -735 +733 @@
                 v = new & (IEC958_AES0_CON_EMPHASIS_5015|IEC958_AES0_CON_NOT_COPYRIGHT) ? 0 : AC97_CXR_COPYRGT;
                 v |= new & IEC958_AES0_NONAUDIO ? AC97_CXR_SPDIF_AC3 : AC97_CXR_SPDIF_PCM;
-                change |= snd_ac97_update_bits_nolock(ac97, AC97_CXR_AUDIO_MISC, 
+                change |= snd_ac97_update_bits_nolock(ac97, AC97_CXR_AUDIO_MISC,
                                                       AC97_CXR_SPDIF_MASK | AC97_CXR_COPYRGT,
                                                       v);
@@ -845 +843 @@
         int rshift = (kcontrol->private_value >> 12) & 0x0f;
         int mask = (kcontrol->private_value >> 16) & 0xff;
-        
+
         ucontrol->value.integer.value[0] = mask - ((ac97->spec.ad18xx.pcmreg[codec] >> lshift) & mask);
         if (lshift != rshift && (ac97->flags & AC97_STEREO_MUTES))
@@ -860 +858 @@
         int mask = (kcontrol->private_value >> 16) & 0xff;
         unsigned short val, valmask;
-        
+
         val = (mask - (ucontrol->value.integer.value[0] & mask)) << lshift;
         valmask = mask << lshift;
@@ -888 +886 @@
         struct snd_ac97 *ac97 = snd_kcontrol_chip(kcontrol);
         int codec = kcontrol->private_value & 3;
-        
+
         down(&ac97->page_mutex);
         ucontrol->value.integer.value[0] = 31 - ((ac97->spec.ad18xx.pcmreg[codec] >> 0) & 31);
@@ -901 +899 @@
         int codec = kcontrol->private_value & 3;
         unsigned short val1, val2;
-        
+
         val1 = 31 - (ucontrol->value.integer.value[0] & 31);
         val2 = 31 - (ucontrol->value.integer.value[1] & 31);
@@ -1008 +1006 @@
         }
 
-        if (ac97->limited_regs && test_bit(reg, ac97->reg_accessed))
-                return 1; /* allow without check */
-
         val = snd_ac97_read(ac97, reg);
         if (!(val & mask)) {
@@ -1030 +1025 @@
         int i;
 
-        *lo_max = *hi_max = 0;
+        /* first look up the static resolution table */
+        if (ac97->res_table) {
+            const struct snd_ac97_res_table *tbl;
+            for (tbl = ac97->res_table; tbl->reg; tbl++) {
+                if (tbl->reg == reg) {
+                    *lo_max = tbl->bits & 0xff;
+                    *hi_max = (tbl->bits >> 8) & 0xff;
+                    return;
+                }
+            }
+        }
+
+        *lo_max = *hi_max = 0;
         for (i = 0 ; i < ARRAY_SIZE(cbit); i++) {
                 unsigned short val;
@@ -1243 +1250 @@
         /* build master controls */
         /* AD claims to remove this control from AD1887, although spec v2.2 does not allow this */
-        if (snd_ac97_try_volume_mix(ac97, AC97_MASTER)) {
+        if (snd_ac97_try_volume_mix(ac97, AC97_MASTER)) {
+#ifndef TARGET_OS2
                 if (ac97->flags & AC97_HAS_NO_MASTER_VOL)
                         err = snd_ac97_cmute_new(card, "Master Playback Switch", AC97_MASTER, ac97);
-                else
+                else
+#endif
                         err = snd_ac97_cmix_new(card, "Master Playback", AC97_MASTER, ac97);
                 if (err < 0)
@@ -1290 +1299 @@
                         return err;
         }
-        
+
         /* build master mono controls */
         if (snd_ac97_try_volume_mix(ac97, AC97_MASTER_MONO)) {
@@ -1296 +1305 @@
                         return err;
         }
-        
+
         /* build master tone controls */
         if (!(ac97->flags & AC97_HAS_NO_TONE)) {
@@ -1311 +1320 @@
                 }
         }
-        
+
         /* build PC Speaker controls */
-        if (!(ac97->flags & AC97_HAS_NO_PC_BEEP) && 
+        if (!(ac97->flags & AC97_HAS_NO_PC_BEEP) &&
                 ((ac97->flags & AC97_HAS_PC_BEEP) ||
             snd_ac97_try_volume_mix(ac97, AC97_PC_BEEP))) {
@@ -1322 +1331 @@
                                      snd_ac97_read(ac97, AC97_PC_BEEP) | 0x801e);
         }
-        
+
         /* build Phone controls */
         if (!(ac97->flags & AC97_HAS_NO_PHONE)) {
@@ -1330 +1339 @@
                 }
         }
-        
+
         /* build MIC controls */
         if (!(ac97->flags & AC97_HAS_NO_MIC)) {
@@ -1346 +1355 @@
                         return err;
         }
-        
+
         /* build CD controls */
         if (!(ac97->flags & AC97_HAS_NO_CD)) {
@@ -1354 +1363 @@
                 }
         }
-        
+
         /* build Video controls */
         if (!(ac97->flags & AC97_HAS_NO_VIDEO)) {
@@ -1397 +1406 @@
                 snd_ac97_write_cache(ac97, AC97_PCM, init_val);
         } else {
-                if (!(ac97->flags & AC97_HAS_NO_STD_PCM)) {
+            if (!(ac97->flags & AC97_HAS_NO_STD_PCM)) {
+#ifndef TARGET_OS2
                         if (ac97->flags & AC97_HAS_NO_PCM_VOL)
                                 err = snd_ac97_cmute_new(card, "PCM Playback Switch", AC97_PCM, ac97);
-                        else
+                        else
+#endif
                                 err = snd_ac97_cmix_new(card, "PCM Playback", AC97_PCM, ac97);
                         if (err < 0)
@@ -1514 +1525 @@
                 ac97->spdif_status = SNDRV_PCM_DEFAULT_CON_SPDIF;
         }
-        
+
         /* build chip specific controls */
         if (ac97->build_ops->build_specific)
@@ -1575 +1586 @@
         unsigned short saved;
 
-        if (ac97->bus->no_vra) {
+        if (ac97->bus->no_vra || !(ac97->ext_id & AC97_EI_VRA) ) {
                 *r_result = SNDRV_PCM_RATE_48000;
                 if ((ac97->flags & AC97_DOUBLE_RATE) &&
@@ -1678 +1689 @@
                     (! modem && ! (pid->flags & AC97_MODEM_PATCH)))
                         pid->patch(ac97);
-        } 
+        }
 
         pid = look_for_codec_id(snd_ac97_codec_ids, id);
@@ -1722 +1733 @@
         end_time = jiffies + timeout;
         do {
-                
+
                 /* use preliminary reads to settle the communication */
                 snd_ac97_read(ac97, AC97_RESET);
@@ -1765 +1776 @@
  * The ops table must include valid callbacks (at least read and
  * write).  The other callbacks, wait and reset, are not mandatory.
- * 
+ *
  * The clock is set to 48000.  If another clock is needed, set
  * (*rbus)->clock manually.
@@ -1860 +1871 @@
  * The template must include the codec number (num) and address (addr),
  * and the private data (private_data).
- * 
+ *
  * The ac97 instance is registered as a low-level device, so you don't
  * have to release it manually.
@@ -1897 +1908 @@
         ac97->addr = template->addr;
         ac97->scaps = template->scaps;
-        ac97->limited_regs = template->limited_regs;
-        memcpy(ac97->reg_accessed, template->reg_accessed, sizeof(ac97->reg_accessed));
+        ac97->res_table = template->res_table;
         bus->codec[ac97->num] = ac97;
         init_MUTEX(&ac97->reg_mutex);
@@ -1955 +1965 @@
         if (pid)
                 ac97->flags |= pid->flags;
-        
+
         /* test for AC'97 */
         if (!(ac97->scaps & AC97_SCAP_SKIP_AUDIO) && !(ac97->scaps & AC97_SCAP_AUDIO)) {
@@ -2040 +2050 @@
                 snd_printk(KERN_WARNING "MC'97 %d converters and GPIO not ready (0x%x)\n", ac97->num, snd_ac97_read(ac97, AC97_EXTENDED_MSTATUS));
         }
-        
+
       __ready_ok:
         if (ac97_is_audio(ac97))
@@ -2139 +2149 @@
         if (ac97->scaps && ac97_is_audio(ac97)) {
                 reg = snd_ac97_read(ac97, AC97_EXTENDED_STATUS);
-                if (ac97->scaps & AC97_SCAP_SURROUND_DAC) 
+                if (ac97->scaps & AC97_SCAP_SURROUND_DAC)
                         reg &= ~AC97_EA_PRJ;
-                if (ac97->scaps & AC97_SCAP_CENTER_LFE_DAC) 
+                if (ac97->scaps & AC97_SCAP_CENTER_LFE_DAC)
                         reg &= ~(AC97_EA_PRI | AC97_EA_PRK);
                 snd_ac97_write_cache(ac97, AC97_EXTENDED_STATUS, reg);
@@ -2316 +2326 @@
         else
                 strcpy(dst, src);
-}       
+}
 
 /* remove the control with the given name and optional suffix */
@@ -2443 +2453 @@
 }
 
-static const struct snd_kcontrol_new snd_ac97_alc_jack_detect = 
+static const struct snd_kcontrol_new snd_ac97_alc_jack_detect =
 AC97_SINGLE("Jack Detect", AC97_ALC650_CLOCK, 5, 1, 0);
 

GPL/trunk/alsa-kernel/pci/ac97/ac97_patch.c

@@ -390 +390 @@
         /* This is known to work for the ViewSonic ViewPad 1000
          * Randolph Bentson <bentson@holmsjoen.com>
-         * WM9703/9707/9708/9717 
+         * WM9703/9707/9708/9717
          */
         int err, i;
-        
+
         for (i = 0; i < ARRAY_SIZE(wm97xx_snd_ac97_controls); i++) {
                 if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&wm97xx_snd_ac97_controls[i], ac97))) < 0)
@@ -474 +474 @@
 static const char* wm9711_rec_gain[] = {"+1.5dB Steps", "+0.75dB Steps"};
 static const char* wm9711_mic[] = {"Mic 1", "Differential", "Mic 2", "Stereo"};
-static const char* wm9711_rec_sel[] = 
+static const char* wm9711_rec_sel[] =
         {"Mic 1", "NC", "NC", "Master Mix", "Line", "Headphone Mix", "Phone Mix", "Phone"};
 static const char* wm9711_ng_type[] = {"Constant Gain", "Mute"};
@@ -572 +572 @@
 {
         int err, i;
-        
+
         for (i = 0; i < ARRAY_SIZE(wm9711_snd_ac97_controls); i++) {
                 if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&wm9711_snd_ac97_controls[i], ac97))) < 0)
@@ -597 +597 @@
         ac97->flags |= AC97_HAS_NO_REC_GAIN | AC97_STEREO_MUTES | AC97_HAS_NO_MIC |
                 AC97_HAS_NO_PC_BEEP | AC97_HAS_NO_VIDEO | AC97_HAS_NO_CD;
-        
+
         return 0;
 }
@@ -603 +603 @@
 static const char* wm9713_mic_mixer[] = {"Stereo", "Mic 1", "Mic 2", "Mute"};
 static const char* wm9713_rec_mux[] = {"Stereo", "Left", "Right", "Mute"};
-static const char* wm9713_rec_src[] = 
-        {"Mic 1", "Mic 2", "Line", "Mono In", "Headphone Mix", "Master Mix", 
+static const char* wm9713_rec_src[] =
+        {"Mic 1", "Mic 2", "Line", "Mono In", "Headphone Mix", "Master Mix",
         "Mono Mix", "Zh"};
 static const char* wm9713_rec_gain[] = {"+1.5dB Steps", "+0.75dB Steps"};
 static const char* wm9713_alc_select[] = {"None", "Left", "Right", "Stereo"};
 static const char* wm9713_mono_pga[] = {"Vmid", "Zh", "Mono Mix", "Inv 1"};
-static const char* wm9713_spk_pga[] = 
+static const char* wm9713_spk_pga[] =
         {"Vmid", "Zh", "Headphone Mix", "Master Mix", "Inv", "NC", "NC", "NC"};
 static const char* wm9713_hp_pga[] = {"Vmid", "Zh", "Headphone Mix", "NC"};
 static const char* wm9713_out3_pga[] = {"Vmid", "Zh", "Inv 1", "NC"};
 static const char* wm9713_out4_pga[] = {"Vmid", "Zh", "Inv 2", "NC"};
-static const char* wm9713_dac_inv[] = 
-        {"Off", "Mono Mix", "Master Mix", "Headphone Mix L", "Headphone Mix R", 
+static const char* wm9713_dac_inv[] =
+        {"Off", "Mono Mix", "Master Mix", "Headphone Mix L", "Headphone Mix R",
         "Headphone Mix Mono", "NC", "Vmid"};
 static const char* wm9713_base[] = {"Linear Control", "Adaptive Boost"};
@@ -739 +739 @@
 {
         int err, i;
-    
+
         for (i = 0; i < ARRAY_SIZE(wm13_snd_ac97_controls_3d); i++) {
                 if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&wm13_snd_ac97_controls_3d[i], ac97))) < 0)
@@ -750 +750 @@
 {
         int err, i;
-        
+
         for (i = 0; i < ARRAY_SIZE(wm13_snd_ac97_controls); i++) {
                 if ((err = snd_ctl_add(ac97->bus->card, snd_ac97_cnew(&wm13_snd_ac97_controls[i], ac97))) < 0)
@@ -783 +783 @@
         .build_specific = patch_wolfson_wm9713_specific,
         .build_3d = patch_wolfson_wm9713_3d,
-#ifdef CONFIG_PM        
+#ifdef CONFIG_PM
         .suspend = patch_wolfson_wm9713_suspend,
         .resume = patch_wolfson_wm9713_resume
@@ -1184 +1184 @@
 
         /* Gateway M675 notebook */
-        if (ac97->pci && 
+        if (ac97->pci &&
             ac97->subsystem_vendor == 0x107b &&
             ac97->subsystem_device == 0x0601)
@@ -1248 +1248 @@
 
         ac97->build_ops = &patch_cirrus_ops;
-        ac97->flags |= AC97_CS_SPDIF; 
+        ac97->flags |= AC97_CS_SPDIF;
         ac97->rates[AC97_RATES_SPDIF] &= ~SNDRV_PCM_RATE_32000;
         ac97->ext_id |= AC97_EI_SPDIF;  /* force the detection of spdif */
@@ -1259 +1259 @@
         /* force the detection of PC Beep */
         ac97->flags |= AC97_HAS_PC_BEEP;
-        
+
         return patch_cirrus_spdif(ac97);
 }
@@ -1398 +1398 @@
         static int cfg_bits[3] = { 1<<12, 1<<14, 1<<13 };
         unsigned short val;
-        
+
         snd_ac97_update_bits(ac97, AC97_AD_SERIAL_CFG, 0x7000, cfg_bits[idx]);
         snd_ac97_write_cache(ac97, AC97_AD_CODEC_CFG, 0x0004);  // SDIE
@@ -1449 +1449 @@
                 {0, 1}
         };
-        
+
         // patch for Analog Devices
         unsigned short codecs[3];
@@ -1487 +1487 @@
                 /* ok, deselect all ID bits */
                 snd_ac97_write_cache(ac97, AC97_AD_CODEC_CFG, 0x0000);
-                ac97->spec.ad18xx.codec_cfg[0] = 
-                        ac97->spec.ad18xx.codec_cfg[1] = 
+                ac97->spec.ad18xx.codec_cfg[0] =
+                        ac97->spec.ad18xx.codec_cfg[1] =
                         ac97->spec.ad18xx.codec_cfg[2] = 0x0000;
         }
@@ -1846 +1846 @@
 {
         unsigned short misc;
-        
+
         patch_ad1881(ac97);
         ac97->build_ops = &patch_ad1888_build_ops;
@@ -1920 +1920 @@
 {
         unsigned short misc;
-        
+
         patch_ad1881(ac97);
         ac97->build_ops = &patch_ad1985_build_ops;
@@ -1949 +1949 @@
 {
         int shared;
-        
+
         /* shared Line-In */
         shared = is_shared_linein(ac97);
@@ -2041 +2041 @@
 
         /* enable AC97_ALC650_GPIO_SETUP, AC97_ALC650_CLOCK for R/W */
-        snd_ac97_write_cache(ac97, AC97_ALC650_GPIO_STATUS, 
+        snd_ac97_write_cache(ac97, AC97_ALC650_GPIO_STATUS,
                 snd_ac97_read(ac97, AC97_ALC650_GPIO_STATUS) | 0x8000);
 
@@ -2076 +2076 @@
 {
         int shared;
-        
+
         /* shared Line-In */
         shared = is_shared_linein(ac97);
@@ -2222 +2222 @@
 {
         int shared;
-        
+
         /* shared Line-In */
         shared = is_shared_linein(ac97);
@@ -2365 +2365 @@
 
         return snd_ac97_update_bits(ac97, AC97_CM9739_SPDIF_CTRL,
-                                    0x01 << 1, 
+                                    0x01 << 1,
                                     (ucontrol->value.enumerated.item[0] & 0x01) << 1);
 }
@@ -2381 +2381 @@
         AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Valid Switch", AC97_CM9739_SPDIF_CTRL, 2, 1, 0),
         /* BIT 3: SPI2F */
-        AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Monitor", AC97_CM9739_SPDIF_CTRL, 3, 1, 0), 
+        AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Monitor", AC97_CM9739_SPDIF_CTRL, 3, 1, 0),
         /* BIT 4: SPI2SDI */
         AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), AC97_CM9739_SPDIF_CTRL, 4, 1, 0),
@@ -2569 +2569 @@
         AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Valid Switch", AC97_CM9761_SPDIF_CTRL, 2, 1, 0),
         /* BIT 3: SPI2F */
-        AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Monitor", AC97_CM9761_SPDIF_CTRL, 3, 1, 0), 
+        AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,NONE) "Monitor", AC97_CM9761_SPDIF_CTRL, 3, 1, 0),
         /* BIT 4: SPI2SDI */
         AC97_SINGLE(SNDRV_CTL_NAME_IEC958("",CAPTURE,SWITCH), AC97_CM9761_SPDIF_CTRL, 4, 1, 0),
@@ -2661 +2661 @@
         return 0;
 }
-       
+
 #define AC97_CM9780_SIDE        0x60
 #define AC97_CM9780_JACK        0x62
@@ -2824 +2824 @@
         return 0;
 }
+
+/*
+ * LM 4550 Codec
+ *
+ * We use a static resolution table since LM4550 codec cannot be
+ * properly autoprobed to determine the resolution via
+ * check_volume_resolution().
+ */
+
+static struct snd_ac97_res_table lm4550_restbl[] = {
+    { AC97_MASTER, 0x1f1f },
+    { AC97_HEADPHONE, 0x1f1f },
+    { AC97_MASTER_MONO, 0x001f },
+    { AC97_PC_BEEP, 0x001f },       /* LSB is ignored */
+    { AC97_PHONE, 0x001f },
+    { AC97_MIC, 0x001f },
+    { AC97_LINE, 0x1f1f },
+    { AC97_CD, 0x1f1f },
+    { AC97_VIDEO, 0x1f1f },
+    { AC97_AUX, 0x1f1f },
+    { AC97_PCM, 0x1f1f },
+    { AC97_REC_GAIN, 0x0f0f },
+    {0} /* terminator */
+};
+
+int patch_lm4550(struct snd_ac97 *ac97)
+{
+    ac97->res_table = lm4550_restbl;
+    return 0;
+}
+

GPL/trunk/alsa-kernel/pci/ac97/ac97_patch.h

@@ -60 +60 @@
 int patch_it2646(struct snd_ac97 * ac97);
 int mpatch_si3036(struct snd_ac97 * ac97);
+int patch_lm4550(struct snd_ac97 * ac97);

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

@@ -794 +794 @@
     /* AVerMedia Studio No. 103, 203, ...? */
     BT_DEVICE(878, 0x1461, 0x0003, 48000),
+    /* Leadtek Winfast tv 2000xp delux */
+    BT_DEVICE(878, 0x107d, 0x6606, 32000),
     {0}
 };
@@ -804 +806 @@
 } blacklist[] __devinitdata = {
     {0x0071, 0x0101}, /* Nebula Electronics DigiTV */
+    {0x11bd, 0x001c}, /* Pinnacle PCTV Sat */
     {0x11bd, 0x0026}, /* Pinnacle PCTV SAT CI */
     {0x1461, 0x0761}, /* AVermedia AverTV DVB-T */
     {0x1461, 0x0771}, /* AVermedia DVB-T 771 */
     {0x1822, 0x0001}, /* Twinhan VisionPlus DVB-T */
+    {0x18ac, 0xd500}, /* DVICO FusionHDTV 5 Lite */
     {0x18ac, 0xdb10}, /* DVICO FusionHDTV DVB-T Lite */
     {0x270f, 0xfc00}, /* Chaintech Digitop DST-1000 DVB-S */
+    {0x7063, 0x2000}, /* pcHDTV HD-2000 TV */
 };
 
@@ -825 +830 @@
         if (blacklist[i].subvendor == pci->subsystem_vendor &&
             blacklist[i].subdevice == pci->subsystem_device) {
-            snd_printdd(KERN_INFO "card %#04x:%#04x has no audio\n",
-                        pci->subsystem_vendor, pci->subsystem_device);
+            snd_printdd(KERN_INFO "card %#04x-%#04x:%#04x has no audio\n",
+                        pci->device, pci->subsystem_vendor, pci->subsystem_device);
             return -EBUSY;
         }
 
-    snd_printk(KERN_INFO "unknown card %#04x:%#04x, using default rate 32000\n",
-               pci->subsystem_vendor, pci->subsystem_device);
+    snd_printk(KERN_INFO "unknown card %#04x-%#04x:%#04x, using default rate 32000\n",
+               pci->device, pci->subsystem_vendor, pci->subsystem_device);
     snd_printk(KERN_DEBUG "please mail id, board name, and, "
                "if it works, the correct digital_rate option to "

GPL/trunk/alsa-kernel/pci/ca0106/ca0106.h

@@ -6 +6 @@
  *  FEATURES currently supported:
  *    See ca0106_main.c for features.
- *
+ * 
  *  Changelog:
  *    Support interrupts per period.
@@ -154 +154 @@
                                                  * bit 9 0 = Mute / 1 = Analog out.
                                                  * bit 10 0 = Line-in / 1 = Mic-in.
-                                                 * bit 11 0 = ? / 1 = ?
-                                                 * bit 12 0 = 48 Khz / 1 = 96 Khz Analog out on SB Live 24bit.
+                                                 * bit 11 0 = ? / 1 = ?
+                                                 * bit 12 0 = 48 Khz / 1 = 96 Khz Analog out on SB Live 24bit.
                                                  * bit 13 0 = ? / 1 = ?
                                                  * bit 14 0 = Mute / 1 = Analog out
@@ -173 +173 @@
 /* CA0106 pointer-offset register set, accessed through the PTR and DATA registers                     */
 /********************************************************************************************************/
-
+                                                                                                                           
 /* Initally all registers from 0x00 to 0x3f have zero contents. */
 #define PLAYBACK_LIST_ADDR      0x00            /* Base DMA address of a list of pointers to each period/size */
-                                                /* One list entry: 4 bytes for DMA address,
+                                                /* One list entry: 4 bytes for DMA address, 
                                                  * 4 bytes for period_size << 16.
                                                  * One list entry is 8 bytes long.
@@ -218 +218 @@
                                                  * Playback mixer out enable [31:28] (one bit per channel)
                                                  */
-/* The Digital out jack is shared with the Center/LFE Analogue output.
+/* The Digital out jack is shared with the Center/LFE Analogue output. 
  * The jack has 4 poles. I will call 1 - Tip, 2 - Next to 1, 3 - Next to 2, 4 - Next to 3
  * For Analogue: 1 -> Center Speaker, 2 -> Sub Woofer, 3 -> Ground, 4 -> Ground
@@ -231 +231 @@
  */
 /* A standard 2 pole mono mini-jack to RCA plug can be used for SPDIF Stereo PCM output from the Front channel.
- * A standard 3 pole stereo mini-jack to 2 RCA plugs can be used for SPDIF AC3/DTS and Stereo PCM output utilising the Rear channel and just one of the RCA plugs.
+ * A standard 3 pole stereo mini-jack to 2 RCA plugs can be used for SPDIF AC3/DTS and Stereo PCM output utilising the Rear channel and just one of the RCA plugs. 
  */
 #define SPCS0                   0x41            /* SPDIF output Channel Status 0 register. For Rear. default=0x02108004, non-audio=0x02108006   */
@@ -331 +331 @@
 #define CAPTURE_SOURCE_CHANNEL3 0x000f0000      /* 3 - Mic in, Line in, TAD in, Aux in. */
 #define CAPTURE_SOURCE_RECORD_MAP 0x0000ffff    /* Default 0x00e4 */
-                                                /* Record Map [7:0] (2 bits per channel) 0=mapped to channel 0, 1=mapped to channel 1, 2=mapped to channel2, 3=mapped to channel3
+                                                /* Record Map [7:0] (2 bits per channel) 0=mapped to channel 0, 1=mapped to channel 1, 2=mapped to channel2, 3=mapped to channel3 
                                                  * Record source select for channel 0 [18:16]
                                                  * Record source select for channel 1 [22:20]
@@ -400 +400 @@
                                                 /* Similar to register 0x66, except that the destination is the I2S mixer instead of the SPDIF mixer. I.E. Outputs to the Analog outputs instead of SPDIF. */
 #define UNKNOWN6b               0x6b            /* Unknown. Readonly. Default 00400000 00400000 00400000 00400000 */
-#define UART_A_DATA             0x6c            /* Uart, used in setting sample rates, bits per sample etc. */
-#define UART_A_CMD              0x6d            /* Uart, used in setting sample rates, bits per sample etc. */
-#define UART_B_DATA             0x6e            /* Uart, Unknown. */
-#define UART_B_CMD              0x6f            /* Uart, Unknown. */
+#define MIDI_UART_A_DATA                0x6c            /* Midi Uart A Data */
+#define MIDI_UART_A_CMD         0x6d            /* Midi Uart A Command/Status */
+#define MIDI_UART_B_DATA                0x6e            /* Midi Uart B Data (currently unused) */
+#define MIDI_UART_B_CMD         0x6f            /* Midi Uart B Command/Status (currently unused) */
+
+/* unique channel identifier for midi->channel */
+
+#define CA0106_MIDI_CHAN_A              0x1
+#define CA0106_MIDI_CHAN_B              0x2
+
+/* from mpu401 */
+
+#define CA0106_MIDI_INPUT_AVAIL         0x80
+#define CA0106_MIDI_OUTPUT_READY        0x40
+#define CA0106_MPU401_RESET             0xff
+#define CA0106_MPU401_ENTER_UART        0x3f
+#define CA0106_MPU401_ACK               0xfe
+
 #define SAMPLE_RATE_TRACKER_STATUS 0x70         /* Readonly. Default 00108000 00108000 00500000 00500000 */
                                                 /* Estimated sample rate [19:0] Relative to 48kHz. 0x8000 =  1.0
@@ -418 +432 @@
                                                  * SRC input source select [4] 0=Audio from digital mixer, 1=Audio from analog source.
                                                  * Record rate [9:8] (0=48kHz, 1=Not available, 2=96kHz, 3=192Khz)
-                                                 * Record mixer output enable [12:10]
+                                                 * Record mixer output enable [12:10] 
                                                  * I2S input rate master mode [15:14] (0=48kHz, 1=44.1kHz, 2=96kHz, 3=192Khz)
                                                  * I2S output rate [17:16] (0=48kHz, 1=44.1kHz, 2=96kHz, 3=192Khz)
@@ -431 +445 @@
                                                  * Record Source 0 input [29:28] (0=SPDIF in, 1=I2S in, 2=AC97 Mic, 3=AC97 PCM)
                                                  * Record Source 1 input [31:30] (0=SPDIF in, 1=I2S in, 2=AC97 Mic, 3=AC97 PCM)
-                                                 */
+                                                 */ 
                                                 /* Sample rate output control register Channel=1
                                                  * I2S Input 0 volume Right [7:0]
@@ -453 +467 @@
                                                  * I2S output enable [19:16]
                                                  * SPDIF output enable [27:24]
-                                                 */
+                                                 */ 
 #define UNKNOWN73               0x73            /* Unknown. Readonly. Default 0x0 */
 #define CHIP_VERSION            0x74            /* P17 Chip version. Channel_id 0 only. Default 00000071 */
@@ -478 +492 @@
 #define SPI                     0x7a            /* SPI: Serial Interface Register */
 #define I2C_A                   0x7b            /* I2C Address. 32 bit */
-#define I2C_D0                  0x7c            /* I2C Data Port 0. 32 bit */
-#define I2C_D1                  0x7d            /* I2C Data Port 1. 32 bit */
+#define I2C_D0                  0x7c            /* I2C Data Port 0. 32 bit */
+#define I2C_D1                  0x7d            /* I2C Data Port 1. 32 bit */
 //I2C values
-#define I2C_A_ADC_ADD_MASK      0x000000fe      //The address is a 7 bit address
-#define I2C_A_ADC_RW_MASK       0x00000001      //bit mask for R/W
-#define I2C_A_ADC_TRANS_MASK    0x00000010      //Bit mask for I2c address DAC value
-#define I2C_A_ADC_ABORT_MASK    0x00000020      //Bit mask for I2C transaction abort flag
-#define I2C_A_ADC_LAST_MASK     0x00000040      //Bit mask for Last word transaction
-#define I2C_A_ADC_BYTE_MASK     0x00000080      //Bit mask for Byte Mode
-
-#define I2C_A_ADC_ADD           0x00000034      //This is the Device address for ADC
-#define I2C_A_ADC_READ          0x00000001      //To perform a read operation
-#define I2C_A_ADC_START         0x00000100      //Start I2C transaction
-#define I2C_A_ADC_ABORT         0x00000200      //I2C transaction abort
-#define I2C_A_ADC_LAST          0x00000400      //I2C last transaction
-#define I2C_A_ADC_BYTE          0x00000800      //I2C one byte mode
-
-#define I2C_D_ADC_REG_MASK      0xfe000000      //ADC address register
-#define I2C_D_ADC_DAT_MASK      0x01ff0000      //ADC data register
-
-#define ADC_TIMEOUT             0x00000007      //ADC Timeout Clock Disable
-#define ADC_IFC_CTRL            0x0000000b      //ADC Interface Control
-#define ADC_MASTER              0x0000000c      //ADC Master Mode Control
-#define ADC_POWER               0x0000000d      //ADC PowerDown Control
-#define ADC_ATTEN_ADCL          0x0000000e      //ADC Attenuation ADCL
-#define ADC_ATTEN_ADCR          0x0000000f      //ADC Attenuation ADCR
-#define ADC_ALC_CTRL1           0x00000010      //ADC ALC Control 1
-#define ADC_ALC_CTRL2           0x00000011      //ADC ALC Control 2
-#define ADC_ALC_CTRL3           0x00000012      //ADC ALC Control 3
-#define ADC_NOISE_CTRL          0x00000013      //ADC Noise Gate Control
-#define ADC_LIMIT_CTRL          0x00000014      //ADC Limiter Control
-#define ADC_MUX                 0x00000015      //ADC Mux offset
+#define I2C_A_ADC_ADD_MASK      0x000000fe      //The address is a 7 bit address
+#define I2C_A_ADC_RW_MASK       0x00000001      //bit mask for R/W
+#define I2C_A_ADC_TRANS_MASK    0x00000010      //Bit mask for I2c address DAC value
+#define I2C_A_ADC_ABORT_MASK    0x00000020      //Bit mask for I2C transaction abort flag
+#define I2C_A_ADC_LAST_MASK     0x00000040      //Bit mask for Last word transaction
+#define I2C_A_ADC_BYTE_MASK     0x00000080      //Bit mask for Byte Mode
+
+#define I2C_A_ADC_ADD           0x00000034      //This is the Device address for ADC 
+#define I2C_A_ADC_READ          0x00000001      //To perform a read operation
+#define I2C_A_ADC_START         0x00000100      //Start I2C transaction
+#define I2C_A_ADC_ABORT         0x00000200      //I2C transaction abort
+#define I2C_A_ADC_LAST          0x00000400      //I2C last transaction
+#define I2C_A_ADC_BYTE          0x00000800      //I2C one byte mode
+
+#define I2C_D_ADC_REG_MASK      0xfe000000      //ADC address register 
+#define I2C_D_ADC_DAT_MASK      0x01ff0000      //ADC data register
+
+#define ADC_TIMEOUT             0x00000007      //ADC Timeout Clock Disable
+#define ADC_IFC_CTRL            0x0000000b      //ADC Interface Control
+#define ADC_MASTER              0x0000000c      //ADC Master Mode Control
+#define ADC_POWER               0x0000000d      //ADC PowerDown Control
+#define ADC_ATTEN_ADCL          0x0000000e      //ADC Attenuation ADCL
+#define ADC_ATTEN_ADCR          0x0000000f      //ADC Attenuation ADCR
+#define ADC_ALC_CTRL1           0x00000010      //ADC ALC Control 1
+#define ADC_ALC_CTRL2           0x00000011      //ADC ALC Control 2
+#define ADC_ALC_CTRL3           0x00000012      //ADC ALC Control 3
+#define ADC_NOISE_CTRL          0x00000013      //ADC Noise Gate Control
+#define ADC_LIMIT_CTRL          0x00000014      //ADC Limiter Control
+#define ADC_MUX                 0x00000015      //ADC Mux offset
 
 #if 0
 /* FIXME: Not tested yet. */
-#define ADC_GAIN_MASK           0x000000ff      //Mask for ADC Gain
-#define ADC_ZERODB              0x000000cf      //Value to set ADC to 0dB
-#define ADC_MUTE_MASK           0x000000c0      //Mask for ADC mute
-#define ADC_MUTE                0x000000c0      //Value to mute ADC
-#define ADC_OSR                 0x00000008      //Mask for ADC oversample rate select
-#define ADC_TIMEOUT_DISABLE     0x00000008      //Value and mask to disable Timeout clock
-#define ADC_HPF_DISABLE         0x00000100      //Value and mask to disable High pass filter
-#define ADC_TRANWIN_MASK        0x00000070      //Mask for Length of Transient Window
+#define ADC_GAIN_MASK           0x000000ff      //Mask for ADC Gain
+#define ADC_ZERODB              0x000000cf      //Value to set ADC to 0dB
+#define ADC_MUTE_MASK           0x000000c0      //Mask for ADC mute
+#define ADC_MUTE                0x000000c0      //Value to mute ADC
+#define ADC_OSR                 0x00000008      //Mask for ADC oversample rate select
+#define ADC_TIMEOUT_DISABLE     0x00000008      //Value and mask to disable Timeout clock
+#define ADC_HPF_DISABLE         0x00000100      //Value and mask to disable High pass filter
+#define ADC_TRANWIN_MASK        0x00000070      //Mask for Length of Transient Window
 #endif
 
-#define ADC_MUX_MASK            0x0000000f      //Mask for ADC Mux
-#define ADC_MUX_MIC             0x00000002      //Value to select Mic at ADC Mux
-#define ADC_MUX_LINEIN          0x00000004      //Value to select LineIn at ADC Mux
-#define ADC_MUX_PHONE           0x00000001      //Value to select TAD at ADC Mux (Not used)
-#define ADC_MUX_AUX             0x00000008      //Value to select Aux at ADC Mux
+#define ADC_MUX_MASK            0x0000000f      //Mask for ADC Mux
+#define ADC_MUX_MIC             0x00000002      //Value to select Mic at ADC Mux
+#define ADC_MUX_LINEIN          0x00000004      //Value to select LineIn at ADC Mux
+#define ADC_MUX_PHONE           0x00000001      //Value to select TAD at ADC Mux (Not used)
+#define ADC_MUX_AUX             0x00000008      //Value to select Aux at ADC Mux
 
 #define SET_CHANNEL 0  /* Testing channel outputs 0=Front, 1=Center/LFE, 2=Unknown, 3=Rear */
@@ -539 +553 @@
 #define CONTROL_UNKNOWN_CHANNEL 2
 
-typedef struct snd_ca0106_channel ca0106_channel_t;
-typedef struct snd_ca0106 ca0106_t;
-typedef struct snd_ca0106_pcm ca0106_pcm_t;
+#include "ca_midi.h"
+
+struct snd_ca0106;
 
 struct snd_ca0106_channel {
-        ca0106_t *emu;
+        struct snd_ca0106 *emu;
         int number;
         int use;
-        void (*interrupt)(ca0106_t *emu, ca0106_channel_t *channel);
-        ca0106_pcm_t *epcm;
+        void (*interrupt)(struct snd_ca0106 *emu, struct snd_ca0106_channel *channel);
+        struct snd_ca0106_pcm *epcm;
 };
 
 struct snd_ca0106_pcm {
-        ca0106_t *emu;
-        snd_pcm_substream_t *substream;
+        struct snd_ca0106 *emu;
+        struct snd_pcm_substream *substream;
         int channel_id;
         unsigned short running;
 };
 
-typedef struct {
-    u32 serial;
-    char * name;
-    int ac97;
-    int gpio_type;
-    int i2c_adc;
-} ca0106_details_t;
+struct snd_ca0106_details {
+        u32 serial;
+        char * name;
+        int ac97;
+        int gpio_type;
+        int i2c_adc;
+        int spi_dac;
+};
 
 // definition of the chip-specific record
 struct snd_ca0106 {
-    snd_card_t *card;
-    ca0106_details_t *details;
-    struct pci_dev *pci;
-
-    unsigned long port;
-    struct resource *res_port;
-    int irq;
-
-    unsigned int revision;              /* chip revision */
-    unsigned int serial;            /* serial number */
-    unsigned short model;               /* subsystem id */
-
-    spinlock_t emu_lock;
-
-    ac97_t *ac97;
-    snd_pcm_t *pcm;
-
-    ca0106_channel_t playback_channels[4];
-    ca0106_channel_t capture_channels[4];
-    u32 spdif_bits[4];             /* s/pdif out setup */
-    int spdif_enable;
-    int capture_source;
-    int capture_mic_line_in;
-
-    struct snd_dma_buffer buffer;
+        struct snd_card *card;
+        struct snd_ca0106_details *details;
+        struct pci_dev *pci;
+
+        unsigned long port;
+        struct resource *res_port;
+        int irq;
+
+        unsigned int revision;          /* chip revision */
+        unsigned int serial;            /* serial number */
+        unsigned short model;           /* subsystem id */
+
+        spinlock_t emu_lock;
+
+        struct snd_ac97 *ac97;
+        struct snd_pcm *pcm;
+
+        struct snd_ca0106_channel playback_channels[4];
+        struct snd_ca0106_channel capture_channels[4];
+        u32 spdif_bits[4];             /* s/pdif out setup */
+        int spdif_enable;
+        int capture_source;
+        int capture_mic_line_in;
+
+        struct snd_dma_buffer buffer;
+
+        struct snd_ca_midi midi;
+        struct snd_ca_midi midi2;
 };
 
-int __devinit snd_ca0106_mixer(ca0106_t *emu);
-int __devinit snd_ca0106_proc_init(ca0106_t * emu);
-
-unsigned int snd_ca0106_ptr_read(ca0106_t * emu,
-                                          unsigned int reg,
-                                          unsigned int chn);
-
-void snd_ca0106_ptr_write(ca0106_t *emu,
-                                   unsigned int reg,
-                                   unsigned int chn,
-                                   unsigned int data);
-
-int snd_ca0106_i2c_write(ca0106_t *emu, u32 reg, u32 value);
+int snd_ca0106_mixer(struct snd_ca0106 *emu);
+int snd_ca0106_proc_init(struct snd_ca0106 * emu);
+
+unsigned int snd_ca0106_ptr_read(struct snd_ca0106 * emu, 
+                                 unsigned int reg, 
+                                 unsigned int chn);
+
+void snd_ca0106_ptr_write(struct snd_ca0106 *emu, 
+                          unsigned int reg, 
+                          unsigned int chn, 
+                          unsigned int data);
+
+int snd_ca0106_i2c_write(struct snd_ca0106 *emu, u32 reg, u32 value);
+
+

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

@@ -19 +19 @@
  *      unmute the MIC and turn up the MASTER Playback volume.
  *      So, to prevent feedback when capturing, minimise the "Capture feedback into Playback" volume.
- *
+ *   
  *    The only playback controls that currently do anything are: -
  *    Analog Front
@@ -27 +27 @@
  *    SPDIF Rear
  *    SPDIF Center/LFE
- *
+ *   
  *    For capture from Mic in or Line in.
  *    Digital/Analog ( switch must be in Analog mode for CAPTURE. )
- *
+ * 
  *    CAPTURE feedback into PLAYBACK
- *
+ * 
  *  Changelog:
  *    Support interrupts per period.
@@ -105 +105 @@
  *    SPDIF Out control switches between Mic in and SPDIF out.
  *    No sound out or mic input working yet.
- *
+ * 
  *  GENERAL INFO:
  *    Model: SB0413
@@ -138 +138 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
-//#include <linux/moduleparam.h>
+#include <linux/moduleparam.h>
+//#include <linux/dma-mapping.h>
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -164 +165 @@
 #include "ca0106.h"
 
-static ca0106_details_t ca0106_chip_details[] = {
-    /* AudigyLS[SB0310] */
-    { /*.serial = */0x10021102,
-    /*.name   = */"AudigyLS [SB0310]",
-    /*.ac97   = */1,0,0 } ,
-    /* Unknown AudigyLS that also says SB0310 on it */
-    { /*.serial = */0x10051102,
-    /*.name   = */"AudigyLS [SB0310b]",
-    /*.ac97   = */1,0,0 } ,
-    /* New Sound Blaster Live! 7.1 24bit. This does not have an AC97. 53SB041000001 */
-    { /*.serial = */0x10061102,
-    /*.name   = */"Live! 7.1 24bit [SB0410]",0,
-    /*.gpio_type = */1,
-    /*.i2c_adc = */1 } ,
-    /* New Dell Sound Blaster Live! 7.1 24bit. This does not have an AC97.  */
-    { /*.serial = */0x10071102,
-    /*.name   = */"Live! 7.1 24bit [SB0413]",0,
-    /*.gpio_type = */1,
-    /*.i2c_adc = */1 } ,
-    /* MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97 */
-    { /*.serial = */0x10091462,
-    /*.name   = */"MSI K8N Diamond MB [SB0438]",0,
-    /*.gpio_type = */1,
-    /*.i2c_adc = */1 } ,
-    /* Shuttle XPC SD31P which has an onboard Creative Labs Sound Blaster Live! 24-bit EAX
-     * high-definition 7.1 audio processor".
-     * Added using info from andrewvegan in alsa bug #1298
-     */
-    { .serial = 0x30381297,
-    .name   = "Shuttle XPC SD31P [SD31P]",
-    .gpio_type = 1,
-    .i2c_adc = 1 } ,
-    { /*.serial = */0,
-    /*.name   = */"AudigyLS [Unknown]",0,0,0 }
+static struct snd_ca0106_details ca0106_chip_details[] = {
+         /* AudigyLS[SB0310] */
+         { .serial = 0x10021102,
+           .name   = "AudigyLS [SB0310]",
+           .ac97   = 1 } , 
+         /* Unknown AudigyLS that also says SB0310 on it */
+         { .serial = 0x10051102,
+           .name   = "AudigyLS [SB0310b]",
+           .ac97   = 1 } ,
+         /* New Sound Blaster Live! 7.1 24bit. This does not have an AC97. 53SB041000001 */
+         { .serial = 0x10061102,
+           .name   = "Live! 7.1 24bit [SB0410]",
+           .gpio_type = 1,
+           .i2c_adc = 1 } ,
+         /* New Dell Sound Blaster Live! 7.1 24bit. This does not have an AC97.  */
+         { .serial = 0x10071102,
+           .name   = "Live! 7.1 24bit [SB0413]",
+           .gpio_type = 1,
+           .i2c_adc = 1 } ,
+         /* New Audigy SE. Has a different DAC. */
+         /* SB0570:
+          * CTRL:CA0106-DAT
+          * ADC: WM8768GEDS
+          * DAC: WM8775EDS
+          */
+         { .serial = 0x100a1102,
+           .name   = "Audigy SE [SB0570]",
+           .gpio_type = 1,
+           .i2c_adc = 1,
+           .spi_dac = 1 } ,
+         /* MSI K8N Diamond Motherboard with onboard SB Live 24bit without AC97 */
+         { .serial = 0x10091462,
+           .name   = "MSI K8N Diamond MB [SB0438]",
+           .gpio_type = 1,
+           .i2c_adc = 1 } ,
+         /* Shuttle XPC SD31P which has an onboard Creative Labs
+          * Sound Blaster Live! 24-bit EAX
+          * high-definition 7.1 audio processor".
+          * Added using info from andrewvegan in alsa bug #1298
+          */
+         { .serial = 0x30381297,
+           .name   = "Shuttle XPC SD31P [SD31P]",
+           .gpio_type = 1,
+           .i2c_adc = 1 } ,
+        /* Shuttle XPC SD11G5 which has an onboard Creative Labs
+         * Sound Blaster Live! 24-bit EAX
+         * high-definition 7.1 audio processor".
+         * Fixes ALSA bug#1600
+         */
+        { .serial = 0x30411297,
+          .name = "Shuttle XPC SD11G5 [SD11G5]",
+          .gpio_type = 1,
+          .i2c_adc = 1 } ,
+         { .serial = 0,
+           .name   = "AudigyLS [Unknown]" }
 };
 
 /* hardware definition */
-static snd_pcm_hardware_t snd_ca0106_playback_hw = {
-        /*.info =               */(SNDRV_PCM_INFO_MMAP |
+static struct snd_pcm_hardware snd_ca0106_playback_hw = {
+        .info =                 (SNDRV_PCM_INFO_MMAP | 
                                  SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
                                  SNDRV_PCM_INFO_MMAP_VALID),
-        /*.formats =            */SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE,
-        /*.rates =              */SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000,
-        /*.rate_min =           */48000,
-        /*.rate_max =           */192000,
-        /*.channels_min =       */2,  //1,
-        /*.channels_max =       */2,  //6,
-        /*.buffer_bytes_max =   */((65536 - 64) * 8),
-        /*.period_bytes_min =   */64,
-        /*.period_bytes_max =   */(65536 - 64),
-        /*.periods_min =        */2,
-        /*.periods_max =        */8,
-        /*.fifo_size =          */0,
+        .formats =              SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE,
+        .rates =                (SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 |
+                                 SNDRV_PCM_RATE_192000),
+        .rate_min =             48000,
+        .rate_max =             192000,
+        .channels_min =         2,  //1,
+        .channels_max =         2,  //6,
+        .buffer_bytes_max =     ((65536 - 64) * 8),
+        .period_bytes_min =     64,
+        .period_bytes_max =     (65536 - 64),
+        .periods_min =          2,
+        .periods_max =          8,
+        .fifo_size =            0,
 };
 
-static snd_pcm_hardware_t snd_ca0106_capture_hw = {
-        /*.info =               */      (SNDRV_PCM_INFO_MMAP |
+static struct snd_pcm_hardware snd_ca0106_capture_hw = {
+        .info =                 (SNDRV_PCM_INFO_MMAP | 
                                  SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_BLOCK_TRANSFER |
                                  SNDRV_PCM_INFO_MMAP_VALID),
-        /*.formats =            */SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE,
-        /*.rates =              */SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000,
-        /*.rate_min =           */44100,
-        /*.rate_max =           */192000,
-        /*.channels_min =       */2,
-        /*.channels_max =       */2,
-        /*.buffer_bytes_max =   */((65536 - 64) * 8),
-        /*.period_bytes_min =   */64,
-        /*.period_bytes_max =   */(65536 - 64),
-        /*.periods_min =        */2,
-        /*.periods_max =        */2,
-        /*.fifo_size =          */0,
+        .formats =              SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE,
+        .rates =                (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |
+                                 SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000),
+        .rate_min =             44100,
+        .rate_max =             192000,
+        .channels_min =         2,
+        .channels_max =         2,
+        .buffer_bytes_max =     ((65536 - 64) * 8),
+        .period_bytes_min =     64,
+        .period_bytes_max =     (65536 - 64),
+        .periods_min =          2,
+        .periods_max =          2,
+        .fifo_size =            0,
 };
 
-unsigned int snd_ca0106_ptr_read(ca0106_t * emu,
-                                          unsigned int reg,
+unsigned int snd_ca0106_ptr_read(struct snd_ca0106 * emu, 
+                                          unsigned int reg, 
                                           unsigned int chn)
 {
         unsigned long flags;
         unsigned int regptr, val;
-
+  
         regptr = (reg << 16) | chn;
 
@@ -255 +279 @@
 }
 
-void snd_ca0106_ptr_write(ca0106_t *emu,
-                                   unsigned int reg,
-                                   unsigned int chn,
+void snd_ca0106_ptr_write(struct snd_ca0106 *emu, 
+                                   unsigned int reg, 
+                                   unsigned int chn, 
                                    unsigned int data)
 {
@@ -271 +295 @@
 }
 
-int snd_ca0106_i2c_write(ca0106_t *emu,
-                         u32 reg,
-                         u32 value)
-{
-    u32 tmp;
-    int timeout=0;
-    int status;
-    int retry;
-    if ((reg > 0x7f) || (value > 0x1ff))
-    {
-        snd_printk("i2c_write: invalid values.\n");
-        return -EINVAL;
-    }
-
-    tmp = reg << 25 | value << 16;
-    /* Not sure what this I2C channel controls. */
-    /* snd_ca0106_ptr_write(emu, I2C_D0, 0, tmp); */
-
-    /* This controls the I2C connected to the WM8775 ADC Codec */
-    snd_ca0106_ptr_write(emu, I2C_D1, 0, tmp);
-
-    for(retry=0;retry<10;retry++)
-    {
-        /* Send the data to i2c */
-        tmp = snd_ca0106_ptr_read(emu, I2C_A, 0);
-        tmp = tmp & ~(I2C_A_ADC_READ|I2C_A_ADC_LAST|I2C_A_ADC_START|I2C_A_ADC_ADD_MASK);
-        tmp = tmp | (I2C_A_ADC_LAST|I2C_A_ADC_START|I2C_A_ADC_ADD);
-        snd_ca0106_ptr_write(emu, I2C_A, 0, tmp);
-
-        /* Wait till the transaction ends */
-        while(1)
-        {
-            status = snd_ca0106_ptr_read(emu, I2C_A, 0);
-            //snd_printk("I2C:status=0x%x\n", status);
-            timeout++;
-            if((status & I2C_A_ADC_START)==0)
-                break;
-
-            if(timeout>1000)
-                break;
-        }
-        //Read back and see if the transaction is successful
-        if((status & I2C_A_ADC_ABORT)==0)
-            break;
-    }
-
-    if(retry==10)
-    {
-        snd_printk("Writing to ADC failed!\n");
-        return -EINVAL;
-    }
-
-    return 0;
-}
-
-
-static void snd_ca0106_intr_enable(ca0106_t *emu, unsigned int intrenb)
+int snd_ca0106_spi_write(struct snd_ca0106 * emu,
+                                   unsigned int data)
+{
+        unsigned int reset, set;
+        unsigned int reg, tmp;
+        int n, result;
+        reg = SPI;
+        if (data > 0xffff) /* Only 16bit values allowed */
+                return 1;
+        tmp = snd_ca0106_ptr_read(emu, reg, 0);
+        reset = (tmp & ~0x3ffff) | 0x20000; /* Set xxx20000 */
+        set = reset | 0x10000; /* Set xxx1xxxx */
+        snd_ca0106_ptr_write(emu, reg, 0, reset | data);
+        tmp = snd_ca0106_ptr_read(emu, reg, 0); /* write post */
+        snd_ca0106_ptr_write(emu, reg, 0, set | data);
+        result = 1;
+        /* Wait for status bit to return to 0 */
+        for (n = 0; n < 100; n++) {
+                udelay(10);
+                tmp = snd_ca0106_ptr_read(emu, reg, 0);
+                if (!(tmp & 0x10000)) {
+                        result = 0;
+                        break;
+                }
+        }
+        if (result) /* Timed out */
+                return 1;
+        snd_ca0106_ptr_write(emu, reg, 0, reset | data);
+        tmp = snd_ca0106_ptr_read(emu, reg, 0); /* Write post */
+        return 0;
+}
+
+int snd_ca0106_i2c_write(struct snd_ca0106 *emu,
+                                u32 reg,
+                                u32 value)
+{
+        u32 tmp;
+        int timeout = 0;
+        int status;
+        int retry;
+        if ((reg > 0x7f) || (value > 0x1ff)) {
+                snd_printk(KERN_ERR "i2c_write: invalid values.\n");
+                return -EINVAL;
+        }
+
+        tmp = reg << 25 | value << 16;
+        /* Not sure what this I2C channel controls. */
+        /* snd_ca0106_ptr_write(emu, I2C_D0, 0, tmp); */
+
+        /* This controls the I2C connected to the WM8775 ADC Codec */
+        snd_ca0106_ptr_write(emu, I2C_D1, 0, tmp);
+
+        for (retry = 0; retry < 10; retry++) {
+                /* Send the data to i2c */
+                tmp = snd_ca0106_ptr_read(emu, I2C_A, 0);
+                tmp = tmp & ~(I2C_A_ADC_READ|I2C_A_ADC_LAST|I2C_A_ADC_START|I2C_A_ADC_ADD_MASK);
+                tmp = tmp | (I2C_A_ADC_LAST|I2C_A_ADC_START|I2C_A_ADC_ADD);
+                snd_ca0106_ptr_write(emu, I2C_A, 0, tmp);
+
+                /* Wait till the transaction ends */
+                while (1) {
+                        status = snd_ca0106_ptr_read(emu, I2C_A, 0);
+                        //snd_printk("I2C:status=0x%x\n", status);
+                        timeout++;
+                        if ((status & I2C_A_ADC_START) == 0)
+                                break;
+
+                        if (timeout > 1000)
+                                break;
+                }
+                //Read back and see if the transaction is successful
+                if ((status & I2C_A_ADC_ABORT) == 0)
+                        break;
+        }
+
+        if (retry == 10) {
+                snd_printk(KERN_ERR "Writing to ADC failed!\n");
+                return -EINVAL;
+        }
+    
+        return 0;
+}
+
+
+static void snd_ca0106_intr_enable(struct snd_ca0106 *emu, unsigned int intrenb)
 {
         unsigned long flags;
         unsigned int enable;
-
+  
         spin_lock_irqsave(&emu->emu_lock, flags);
         enable = inl(emu->port + INTE) | intrenb;
@@ -338 +390 @@
 }
 
-static void snd_ca0106_pcm_free_substream(snd_pcm_runtime_t *runtime)
-{
-        ca0106_pcm_t *epcm = runtime->private_data;
-
-        if (epcm) {
-                kfree(epcm);
-        }
+static void snd_ca0106_intr_disable(struct snd_ca0106 *emu, unsigned int intrenb)
+{
+        unsigned long flags;
+        unsigned int enable;
+  
+        spin_lock_irqsave(&emu->emu_lock, flags);
+        enable = inl(emu->port + INTE) & ~intrenb;
+        outl(enable, emu->port + INTE);
+        spin_unlock_irqrestore(&emu->emu_lock, flags);
+}
+
+
+static void snd_ca0106_pcm_free_substream(struct snd_pcm_runtime *runtime)
+{
+        kfree(runtime->private_data);
 }
 
 /* open_playback callback */
-static int snd_ca0106_pcm_open_playback_channel(snd_pcm_substream_t *substream, int channel_id)
-{
-        ca0106_t *chip = snd_pcm_substream_chip(substream);
-        ca0106_channel_t *channel = &(chip->playback_channels[channel_id]);
-        ca0106_pcm_t *epcm;
-        snd_pcm_runtime_t *runtime = substream->runtime;
+static int snd_ca0106_pcm_open_playback_channel(struct snd_pcm_substream *substream,
+                                                int channel_id)
+{
+        struct snd_ca0106 *chip = snd_pcm_substream_chip(substream);
+        struct snd_ca0106_channel *channel = &(chip->playback_channels[channel_id]);
+        struct snd_ca0106_pcm *epcm;
+        struct snd_pcm_runtime *runtime = substream->runtime;
         int err;
 
-        epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
 
         if (epcm == NULL)
@@ -363 +424 @@
         epcm->substream = substream;
         epcm->channel_id=channel_id;
-
+  
         runtime->private_data = epcm;
         runtime->private_free = snd_ca0106_pcm_free_substream;
-
+  
         runtime->hw = snd_ca0106_playback_hw;
 
@@ -372 +433 @@
         channel->number = channel_id;
 
-        channel->use=1;
+        channel->use = 1;
         //printk("open:channel_id=%d, chip=%p, channel=%p\n",channel_id, chip, channel);
         //channel->interrupt = snd_ca0106_pcm_channel_interrupt;
-        channel->epcm=epcm;
+        channel->epcm = epcm;
         if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
                 return err;
@@ -384 +445 @@
 
 /* close callback */
-static int snd_ca0106_pcm_close_playback(snd_pcm_substream_t *substream)
-{
-        ca0106_t *chip = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        ca0106_pcm_t *epcm = runtime->private_data;
-        chip->playback_channels[epcm->channel_id].use=0;
-/* FIXME: maybe zero others */
+static int snd_ca0106_pcm_close_playback(struct snd_pcm_substream *substream)
+{
+        struct snd_ca0106 *chip = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_ca0106_pcm *epcm = runtime->private_data;
+        chip->playback_channels[epcm->channel_id].use = 0;
+        /* FIXME: maybe zero others */
         return 0;
 }
 
-static int snd_ca0106_pcm_open_playback_front(snd_pcm_substream_t *substream)
+static int snd_ca0106_pcm_open_playback_front(struct snd_pcm_substream *substream)
 {
         return snd_ca0106_pcm_open_playback_channel(substream, PCM_FRONT_CHANNEL);
 }
 
-static int snd_ca0106_pcm_open_playback_center_lfe(snd_pcm_substream_t *substream)
+static int snd_ca0106_pcm_open_playback_center_lfe(struct snd_pcm_substream *substream)
 {
         return snd_ca0106_pcm_open_playback_channel(substream, PCM_CENTER_LFE_CHANNEL);
 }
 
-static int snd_ca0106_pcm_open_playback_unknown(snd_pcm_substream_t *substream)
+static int snd_ca0106_pcm_open_playback_unknown(struct snd_pcm_substream *substream)
 {
         return snd_ca0106_pcm_open_playback_channel(substream, PCM_UNKNOWN_CHANNEL);
 }
 
-static int snd_ca0106_pcm_open_playback_rear(snd_pcm_substream_t *substream)
+static int snd_ca0106_pcm_open_playback_rear(struct snd_pcm_substream *substream)
 {
         return snd_ca0106_pcm_open_playback_channel(substream, PCM_REAR_CHANNEL);
@@ -415 +476 @@
 
 /* open_capture callback */
-static int snd_ca0106_pcm_open_capture_channel(snd_pcm_substream_t *substream, int channel_id)
-{
-        ca0106_t *chip = snd_pcm_substream_chip(substream);
-        ca0106_channel_t *channel = &(chip->capture_channels[channel_id]);
-        ca0106_pcm_t *epcm;
-        snd_pcm_runtime_t *runtime = substream->runtime;
+static int snd_ca0106_pcm_open_capture_channel(struct snd_pcm_substream *substream,
+                                               int channel_id)
+{
+        struct snd_ca0106 *chip = snd_pcm_substream_chip(substream);
+        struct snd_ca0106_channel *channel = &(chip->capture_channels[channel_id]);
+        struct snd_ca0106_pcm *epcm;
+        struct snd_pcm_runtime *runtime = substream->runtime;
         int err;
 
-        epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
+        epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
         if (epcm == NULL) {
-                snd_printk("open_capture_channel: failed epcm alloc\n");
+                snd_printk(KERN_ERR "open_capture_channel: failed epcm alloc\n");
                 return -ENOMEM;
         }
@@ -431 +493 @@
         epcm->substream = substream;
         epcm->channel_id=channel_id;
-
+  
         runtime->private_data = epcm;
         runtime->private_free = snd_ca0106_pcm_free_substream;
-
+  
         runtime->hw = snd_ca0106_capture_hw;
 
@@ -440 +502 @@
         channel->number = channel_id;
 
-        channel->use=1;
+        channel->use = 1;
         //printk("open:channel_id=%d, chip=%p, channel=%p\n",channel_id, chip, channel);
         //channel->interrupt = snd_ca0106_pcm_channel_interrupt;
-        channel->epcm=epcm;
+        channel->epcm = epcm;
         if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
                 return err;
@@ -453 +515 @@
 
 /* close callback */
-static int snd_ca0106_pcm_close_capture(snd_pcm_substream_t *substream)
-{
-        ca0106_t *chip = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        ca0106_pcm_t *epcm = runtime->private_data;
-        chip->capture_channels[epcm->channel_id].use=0;
-/* FIXME: maybe zero others */
+static int snd_ca0106_pcm_close_capture(struct snd_pcm_substream *substream)
+{
+        struct snd_ca0106 *chip = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_ca0106_pcm *epcm = runtime->private_data;
+        chip->capture_channels[epcm->channel_id].use = 0;
+        /* FIXME: maybe zero others */
         return 0;
 }
 
-static int snd_ca0106_pcm_open_0_capture(snd_pcm_substream_t *substream)
+static int snd_ca0106_pcm_open_0_capture(struct snd_pcm_substream *substream)
 {
         return snd_ca0106_pcm_open_capture_channel(substream, 0);
 }
 
-static int snd_ca0106_pcm_open_1_capture(snd_pcm_substream_t *substream)
+static int snd_ca0106_pcm_open_1_capture(struct snd_pcm_substream *substream)
 {
         return snd_ca0106_pcm_open_capture_channel(substream, 1);
 }
 
-static int snd_ca0106_pcm_open_2_capture(snd_pcm_substream_t *substream)
+static int snd_ca0106_pcm_open_2_capture(struct snd_pcm_substream *substream)
 {
         return snd_ca0106_pcm_open_capture_channel(substream, 2);
 }
 
-static int snd_ca0106_pcm_open_3_capture(snd_pcm_substream_t *substream)
+static int snd_ca0106_pcm_open_3_capture(struct snd_pcm_substream *substream)
 {
         return snd_ca0106_pcm_open_capture_channel(substream, 3);
@@ -484 +546 @@
 
 /* hw_params callback */
-static int snd_ca0106_pcm_hw_params_playback(snd_pcm_substream_t *substream,
-                                      snd_pcm_hw_params_t * hw_params)
+static int snd_ca0106_pcm_hw_params_playback(struct snd_pcm_substream *substream,
+                                      struct snd_pcm_hw_params *hw_params)
 {
         return snd_pcm_lib_malloc_pages(substream,
@@ -492 +554 @@
 
 /* hw_free callback */
-static int snd_ca0106_pcm_hw_free_playback(snd_pcm_substream_t *substream)
+static int snd_ca0106_pcm_hw_free_playback(struct snd_pcm_substream *substream)
 {
         return snd_pcm_lib_free_pages(substream);
@@ -498 +560 @@
 
 /* hw_params callback */
-static int snd_ca0106_pcm_hw_params_capture(snd_pcm_substream_t *substream,
-                                      snd_pcm_hw_params_t * hw_params)
+static int snd_ca0106_pcm_hw_params_capture(struct snd_pcm_substream *substream,
+                                      struct snd_pcm_hw_params *hw_params)
 {
         return snd_pcm_lib_malloc_pages(substream,
@@ -506 +568 @@
 
 /* hw_free callback */
-static int snd_ca0106_pcm_hw_free_capture(snd_pcm_substream_t *substream)
+static int snd_ca0106_pcm_hw_free_capture(struct snd_pcm_substream *substream)
 {
         return snd_pcm_lib_free_pages(substream);
@@ -512 +574 @@
 
 /* prepare playback callback */
-static int snd_ca0106_pcm_prepare_playback(snd_pcm_substream_t *substream)
-{
-        ca0106_t *emu = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        ca0106_pcm_t *epcm = runtime->private_data;
+static int snd_ca0106_pcm_prepare_playback(struct snd_pcm_substream *substream)
+{
+        struct snd_ca0106 *emu = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_ca0106_pcm *epcm = runtime->private_data;
         int channel = epcm->channel_id;
         u32 *table_base = (u32 *)(emu->buffer.area+(8*16*channel));
@@ -531 +593 @@
         u32 reg71;
         int i;
-
+        
         //snd_printk("prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, periods=%u, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size, runtime->periods, frames_to_bytes(runtime, 1));
         //snd_printk("dma_addr=%x, dma_area=%p, table_base=%p\n",runtime->dma_addr, runtime->dma_area, table_base);
@@ -541 +603 @@
         case 44100:
                 reg40_set = 0x10000 << (channel<<1);
-                reg71_set = 0x01010000;
+                reg71_set = 0x01010000; 
                 break;
         case 48000:
                 reg40_set = 0;
-                reg71_set = 0;
+                reg71_set = 0; 
                 break;
         case 96000:
                 reg40_set = 0x20000 << (channel<<1);
-                reg71_set = 0x02020000;
+                reg71_set = 0x02020000; 
                 break;
         case 192000:
                 reg40_set = 0x30000 << (channel<<1);
-                reg71_set = 0x03030000;
+                reg71_set = 0x03030000; 
                 break;
         default:
                 reg40_set = 0;
-                reg71_set = 0;
+                reg71_set = 0; 
                 break;
         }
@@ -585 +647 @@
         /* FIXME: Check emu->buffer.size before actually writing to it. */
         for(i=0; i < runtime->periods; i++) {
-                table_base[i*2]=runtime->dma_addr+(i*period_size_bytes);
-                table_base[(i*2)+1]=period_size_bytes<<16;
-        }
-
+                table_base[i*2] = runtime->dma_addr + (i * period_size_bytes);
+                table_base[i*2+1] = period_size_bytes << 16;
+        }
+ 
         snd_ca0106_ptr_write(emu, PLAYBACK_LIST_ADDR, channel, emu->buffer.addr+(8*16*channel));
         snd_ca0106_ptr_write(emu, PLAYBACK_LIST_SIZE, channel, (runtime->periods - 1) << 19);
         snd_ca0106_ptr_write(emu, PLAYBACK_LIST_PTR, channel, 0);
         snd_ca0106_ptr_write(emu, PLAYBACK_DMA_ADDR, channel, runtime->dma_addr);
-        snd_ca0106_ptr_write(emu, PLAYBACK_PERIOD_SIZE, channel, frames_to_bytes(runtime, runtime->period_size)<<16); // buffer size in bytes
-        /* FIXME  test what 0 bytes does. */
-        snd_ca0106_ptr_write(emu, PLAYBACK_PERIOD_SIZE, channel, 0); // buffer size in bytes
+        snd_ca0106_ptr_write(emu, PLAYBACK_PERIOD_SIZE, channel, frames_to_bytes(runtime, runtime->period_size)<<16); // buffer size in bytes
+        /* FIXME  test what 0 bytes does. */
+        snd_ca0106_ptr_write(emu, PLAYBACK_PERIOD_SIZE, channel, 0); // buffer size in bytes
         snd_ca0106_ptr_write(emu, PLAYBACK_POINTER, channel, 0);
         snd_ca0106_ptr_write(emu, 0x07, channel, 0x0);
@@ -613 +675 @@
 
 /* prepare capture callback */
-static int snd_ca0106_pcm_prepare_capture(snd_pcm_substream_t *substream)
-{
-        ca0106_t *emu = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        ca0106_pcm_t *epcm = runtime->private_data;
-        int channel = epcm->channel_id;
-        u32 hcfg_mask = HCFG_CAPTURE_S32_LE;
-        u32 hcfg_set = 0x00000000;
-        u32 hcfg;
-        u32 over_sampling=0x2;
-        u32 reg71_mask = 0x0000c000 ; /* Global. Set ADC rate. */
-        u32 reg71_set = 0;
-        u32 reg71;
-
+static int snd_ca0106_pcm_prepare_capture(struct snd_pcm_substream *substream)
+{
+        struct snd_ca0106 *emu = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_ca0106_pcm *epcm = runtime->private_data;
+        int channel = epcm->channel_id;
+        u32 hcfg_mask = HCFG_CAPTURE_S32_LE;
+        u32 hcfg_set = 0x00000000;
+        u32 hcfg;
+        u32 over_sampling=0x2;
+        u32 reg71_mask = 0x0000c000 ; /* Global. Set ADC rate. */
+        u32 reg71_set = 0;
+        u32 reg71;
+        
         //snd_printk("prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, periods=%u, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size, runtime->periods, frames_to_bytes(runtime, 1));
         //snd_printk("dma_addr=%x, dma_area=%p, table_base=%p\n",runtime->dma_addr, runtime->dma_area, table_base);
-        //snd_printk("dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",emu->buffer.addr, emu->buffer.area, emu->buffer.bytes);
-        /* reg71 controls ADC rate. */
-        switch (runtime->rate) {
-        case 44100:
-            reg71_set = 0x00004000;
-            break;
+        //snd_printk("dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",emu->buffer.addr, emu->buffer.area, emu->buffer.bytes);
+        /* reg71 controls ADC rate. */
+        switch (runtime->rate) {
+        case 44100:
+                reg71_set = 0x00004000;
+                break;
         case 48000:
-            reg71_set = 0;
-            break;
-        case 96000:
-            reg71_set = 0x00008000;
-            over_sampling=0xa;
-            break;
-        case 192000:
-            reg71_set = 0x0000c000;
-            over_sampling=0xa;
-            break;
-        default:
-            reg71_set = 0;
-            break;
-        }
-        /* Format is a global setting */
-        /* FIXME: Only let the first channel accessed set this. */
-        switch (runtime->format) {
-        case SNDRV_PCM_FORMAT_S16_LE:
-            hcfg_set = 0;
-            break;
-        case SNDRV_PCM_FORMAT_S32_LE:
-            hcfg_set = HCFG_CAPTURE_S32_LE;
-            break;
-        default:
-            hcfg_set = 0;
-            break;
-        }
-        hcfg = inl(emu->port + HCFG) ;
-        hcfg = (hcfg & ~hcfg_mask) | hcfg_set;
-        outl(hcfg, emu->port + HCFG);
-        reg71 = snd_ca0106_ptr_read(emu, 0x71, 0);
-        reg71 = (reg71 & ~reg71_mask) | reg71_set;
-        snd_ca0106_ptr_write(emu, 0x71, 0, reg71);
+                reg71_set = 0; 
+                break;
+        case 96000:
+                reg71_set = 0x00008000;
+                over_sampling=0xa;
+                break;
+        case 192000:
+                reg71_set = 0x0000c000; 
+                over_sampling=0xa;
+                break;
+        default:
+                reg71_set = 0; 
+                break;
+        }
+        /* Format is a global setting */
+        /* FIXME: Only let the first channel accessed set this. */
+        switch (runtime->format) {
+        case SNDRV_PCM_FORMAT_S16_LE:
+                hcfg_set = 0;
+                break;
+        case SNDRV_PCM_FORMAT_S32_LE:
+                hcfg_set = HCFG_CAPTURE_S32_LE;
+                break;
+        default:
+                hcfg_set = 0;
+                break;
+        }
+        hcfg = inl(emu->port + HCFG) ;
+        hcfg = (hcfg & ~hcfg_mask) | hcfg_set;
+        outl(hcfg, emu->port + HCFG);
+        reg71 = snd_ca0106_ptr_read(emu, 0x71, 0);
+        reg71 = (reg71 & ~reg71_mask) | reg71_set;
+        snd_ca0106_ptr_write(emu, 0x71, 0, reg71);
         if (emu->details->i2c_adc == 1) { /* The SB0410 and SB0413 use I2C to control ADC. */
-            snd_ca0106_i2c_write(emu, ADC_MASTER, over_sampling); /* Adjust the over sampler to better suit the capture rate. */
-        }
+                snd_ca0106_i2c_write(emu, ADC_MASTER, over_sampling); /* Adjust the over sampler to better suit the capture rate. */
+        }
 
 
@@ -684 +746 @@
 
 /* trigger_playback callback */
-static int snd_ca0106_pcm_trigger_playback(snd_pcm_substream_t *substream,
+static int snd_ca0106_pcm_trigger_playback(struct snd_pcm_substream *substream,
                                     int cmd)
 {
-        ca0106_t *emu = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime;
-        ca0106_pcm_t *epcm;
+        struct snd_ca0106 *emu = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime;
+        struct snd_ca0106_pcm *epcm;
         int channel;
         int result = 0;
         struct list_head *pos;
-        snd_pcm_substream_t *s;
+        struct snd_pcm_substream *s;
         u32 basic = 0;
         u32 extended = 0;
@@ -737 +799 @@
 
 /* trigger_capture callback */
-static int snd_ca0106_pcm_trigger_capture(snd_pcm_substream_t *substream,
+static int snd_ca0106_pcm_trigger_capture(struct snd_pcm_substream *substream,
                                     int cmd)
 {
-        ca0106_t *emu = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        ca0106_pcm_t *epcm = runtime->private_data;
+        struct snd_ca0106 *emu = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_ca0106_pcm *epcm = runtime->private_data;
         int channel = epcm->channel_id;
         int result = 0;
@@ -766 +828 @@
 /* pointer_playback callback */
 static snd_pcm_uframes_t
-snd_ca0106_pcm_pointer_playback(snd_pcm_substream_t *substream)
-{
-        ca0106_t *emu = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        ca0106_pcm_t *epcm = runtime->private_data;
+snd_ca0106_pcm_pointer_playback(struct snd_pcm_substream *substream)
+{
+        struct snd_ca0106 *emu = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_ca0106_pcm *epcm = runtime->private_data;
         snd_pcm_uframes_t ptr, ptr1, ptr2,ptr3,ptr4 = 0;
         int channel = epcm->channel_id;
@@ -793 +855 @@
 /* pointer_capture callback */
 static snd_pcm_uframes_t
-snd_ca0106_pcm_pointer_capture(snd_pcm_substream_t *substream)
-{
-        ca0106_t *emu = snd_pcm_substream_chip(substream);
-        snd_pcm_runtime_t *runtime = substream->runtime;
-        ca0106_pcm_t *epcm = runtime->private_data;
+snd_ca0106_pcm_pointer_capture(struct snd_pcm_substream *substream)
+{
+        struct snd_ca0106 *emu = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct snd_ca0106_pcm *epcm = runtime->private_data;
         snd_pcm_uframes_t ptr, ptr1, ptr2 = 0;
         int channel = channel=epcm->channel_id;
@@ -815 +877 @@
 
 /* operators */
-static snd_pcm_ops_t snd_ca0106_playback_front_ops = {
-        /*.open =        */snd_ca0106_pcm_open_playback_front,
-        /*.close =       */snd_ca0106_pcm_close_playback,
-        /*.ioctl =       */snd_pcm_lib_ioctl,
-        /*.hw_params =   */snd_ca0106_pcm_hw_params_playback,
-        /*.hw_free =     */snd_ca0106_pcm_hw_free_playback,
-        /*.prepare =     */snd_ca0106_pcm_prepare_playback,
-        /*.trigger =     */snd_ca0106_pcm_trigger_playback,
-        /*.pointer =     */snd_ca0106_pcm_pointer_playback,
-        0,0,0,0
+static struct snd_pcm_ops snd_ca0106_playback_front_ops = {
+        .open =        snd_ca0106_pcm_open_playback_front,
+        .close =       snd_ca0106_pcm_close_playback,
+        .ioctl =       snd_pcm_lib_ioctl,
+        .hw_params =   snd_ca0106_pcm_hw_params_playback,
+        .hw_free =     snd_ca0106_pcm_hw_free_playback,
+        .prepare =     snd_ca0106_pcm_prepare_playback,
+        .trigger =     snd_ca0106_pcm_trigger_playback,
+        .pointer =     snd_ca0106_pcm_pointer_playback,
 };
 
-static snd_pcm_ops_t snd_ca0106_capture_0_ops = {
-        /*.open =        */snd_ca0106_pcm_open_0_capture,
-        /*.close =       */snd_ca0106_pcm_close_capture,
-        /*.ioctl =       */snd_pcm_lib_ioctl,
-        /*.hw_params =   */snd_ca0106_pcm_hw_params_capture,
-        /*.hw_free =     */snd_ca0106_pcm_hw_free_capture,
-        /*.prepare =     */snd_ca0106_pcm_prepare_capture,
-        /*.trigger =     */snd_ca0106_pcm_trigger_capture,
-        /*.pointer =     */snd_ca0106_pcm_pointer_capture,
-        0,0,0,0
+static struct snd_pcm_ops snd_ca0106_capture_0_ops = {
+        .open =        snd_ca0106_pcm_open_0_capture,
+        .close =       snd_ca0106_pcm_close_capture,
+        .ioctl =       snd_pcm_lib_ioctl,
+        .hw_params =   snd_ca0106_pcm_hw_params_capture,
+        .hw_free =     snd_ca0106_pcm_hw_free_capture,
+        .prepare =     snd_ca0106_pcm_prepare_capture,
+        .trigger =     snd_ca0106_pcm_trigger_capture,
+        .pointer =     snd_ca0106_pcm_pointer_capture,
 };
 
-static snd_pcm_ops_t snd_ca0106_capture_1_ops = {
-        /*.open =        */snd_ca0106_pcm_open_1_capture,
-        /*.close =       */snd_ca0106_pcm_close_capture,
-        /*.ioctl =       */snd_pcm_lib_ioctl,
-        /*.hw_params =   */snd_ca0106_pcm_hw_params_capture,
-        /*.hw_free =     */snd_ca0106_pcm_hw_free_capture,
-        /*.prepare =     */snd_ca0106_pcm_prepare_capture,
-        /*.trigger =     */snd_ca0106_pcm_trigger_capture,
-        /*.pointer =     */snd_ca0106_pcm_pointer_capture,
-        0,0,0,0
+static struct snd_pcm_ops snd_ca0106_capture_1_ops = {
+        .open =        snd_ca0106_pcm_open_1_capture,
+        .close =       snd_ca0106_pcm_close_capture,
+        .ioctl =       snd_pcm_lib_ioctl,
+        .hw_params =   snd_ca0106_pcm_hw_params_capture,
+        .hw_free =     snd_ca0106_pcm_hw_free_capture,
+        .prepare =     snd_ca0106_pcm_prepare_capture,
+        .trigger =     snd_ca0106_pcm_trigger_capture,
+        .pointer =     snd_ca0106_pcm_pointer_capture,
 };
 
-static snd_pcm_ops_t snd_ca0106_capture_2_ops = {
-        /*.open =        */snd_ca0106_pcm_open_2_capture,
-        /*.close =       */snd_ca0106_pcm_close_capture,
-        /*.ioctl =       */snd_pcm_lib_ioctl,
-        /*.hw_params =   */snd_ca0106_pcm_hw_params_capture,
-        /*.hw_free =     */snd_ca0106_pcm_hw_free_capture,
-        /*.prepare =     */snd_ca0106_pcm_prepare_capture,
-        /*.trigger =     */snd_ca0106_pcm_trigger_capture,
-        /*.pointer =     */snd_ca0106_pcm_pointer_capture,
-        0,0,0,0
+static struct snd_pcm_ops snd_ca0106_capture_2_ops = {
+        .open =        snd_ca0106_pcm_open_2_capture,
+        .close =       snd_ca0106_pcm_close_capture,
+        .ioctl =       snd_pcm_lib_ioctl,
+        .hw_params =   snd_ca0106_pcm_hw_params_capture,
+        .hw_free =     snd_ca0106_pcm_hw_free_capture,
+        .prepare =     snd_ca0106_pcm_prepare_capture,
+        .trigger =     snd_ca0106_pcm_trigger_capture,
+        .pointer =     snd_ca0106_pcm_pointer_capture,
 };
 
-static snd_pcm_ops_t snd_ca0106_capture_3_ops = {
-        /*.open =        */snd_ca0106_pcm_open_3_capture,
-        /*.close =       */snd_ca0106_pcm_close_capture,
-        /*.ioctl =       */snd_pcm_lib_ioctl,
-        /*.hw_params =   */snd_ca0106_pcm_hw_params_capture,
-        /*.hw_free =     */snd_ca0106_pcm_hw_free_capture,
-        /*.prepare =     */snd_ca0106_pcm_prepare_capture,
-        /*.trigger =     */snd_ca0106_pcm_trigger_capture,
-        /*.pointer =     */snd_ca0106_pcm_pointer_capture,
-        0,0,0,0
+static struct snd_pcm_ops snd_ca0106_capture_3_ops = {
+        .open =        snd_ca0106_pcm_open_3_capture,
+        .close =       snd_ca0106_pcm_close_capture,
+        .ioctl =       snd_pcm_lib_ioctl,
+        .hw_params =   snd_ca0106_pcm_hw_params_capture,
+        .hw_free =     snd_ca0106_pcm_hw_free_capture,
+        .prepare =     snd_ca0106_pcm_prepare_capture,
+        .trigger =     snd_ca0106_pcm_trigger_capture,
+        .pointer =     snd_ca0106_pcm_pointer_capture,
 };
 
-static snd_pcm_ops_t snd_ca0106_playback_center_lfe_ops = {
-        /*.open =         */snd_ca0106_pcm_open_playback_center_lfe,
-        /*.close =        */snd_ca0106_pcm_close_playback,
-        /*.ioctl =        */snd_pcm_lib_ioctl,
-        /*.hw_params =    */snd_ca0106_pcm_hw_params_playback,
-        /*.hw_free =      */snd_ca0106_pcm_hw_free_playback,
-        /*.prepare =      */snd_ca0106_pcm_prepare_playback,
-        /*.trigger =      */snd_ca0106_pcm_trigger_playback,
-        /*.pointer =      */snd_ca0106_pcm_pointer_playback,
-        0,0,0,0
+static struct snd_pcm_ops snd_ca0106_playback_center_lfe_ops = {
+        .open =         snd_ca0106_pcm_open_playback_center_lfe,
+        .close =        snd_ca0106_pcm_close_playback,
+        .ioctl =        snd_pcm_lib_ioctl,
+        .hw_params =    snd_ca0106_pcm_hw_params_playback,
+        .hw_free =      snd_ca0106_pcm_hw_free_playback,
+        .prepare =      snd_ca0106_pcm_prepare_playback,     
+        .trigger =      snd_ca0106_pcm_trigger_playback,  
+        .pointer =      snd_ca0106_pcm_pointer_playback, 
 };
 
-static snd_pcm_ops_t snd_ca0106_playback_unknown_ops = {
-        /*.open =         */snd_ca0106_pcm_open_playback_unknown,
-        /*.close =        */snd_ca0106_pcm_close_playback,
-        /*.ioctl =        */snd_pcm_lib_ioctl,
-        /*.hw_params =    */snd_ca0106_pcm_hw_params_playback,
-        /*.hw_free =      */snd_ca0106_pcm_hw_free_playback,
-        /*.prepare =      */snd_ca0106_pcm_prepare_playback,
-        /*.trigger =      */snd_ca0106_pcm_trigger_playback,
-        /*.pointer =      */snd_ca0106_pcm_pointer_playback,
-        0,0,0,0
+static struct snd_pcm_ops snd_ca0106_playback_unknown_ops = {
+        .open =         snd_ca0106_pcm_open_playback_unknown,
+        .close =        snd_ca0106_pcm_close_playback,
+        .ioctl =        snd_pcm_lib_ioctl,
+        .hw_params =    snd_ca0106_pcm_hw_params_playback,
+        .hw_free =      snd_ca0106_pcm_hw_free_playback,
+        .prepare =      snd_ca0106_pcm_prepare_playback,     
+        .trigger =      snd_ca0106_pcm_trigger_playback,  
+        .pointer =      snd_ca0106_pcm_pointer_playback, 
 };
 
-static snd_pcm_ops_t snd_ca0106_playback_rear_ops = {
-        /*.open =         */snd_ca0106_pcm_open_playback_rear,
-        /*.close =        */snd_ca0106_pcm_close_playback,
-        /*.ioctl =        */snd_pcm_lib_ioctl,
-        /*.hw_params =    */snd_ca0106_pcm_hw_params_playback,
-        /*.hw_free =      */snd_ca0106_pcm_hw_free_playback,
-        /*.prepare =      */snd_ca0106_pcm_prepare_playback,
-        /*.trigger =      */snd_ca0106_pcm_trigger_playback,
-        /*.pointer =      */snd_ca0106_pcm_pointer_playback,
-        0,0,0,0
+static struct snd_pcm_ops snd_ca0106_playback_rear_ops = {
+        .open =         snd_ca0106_pcm_open_playback_rear,
+        .close =        snd_ca0106_pcm_close_playback,
+        .ioctl =        snd_pcm_lib_ioctl,
+        .hw_params =    snd_ca0106_pcm_hw_params_playback,
+                .hw_free =      snd_ca0106_pcm_hw_free_playback,
+        .prepare =      snd_ca0106_pcm_prepare_playback,     
+        .trigger =      snd_ca0106_pcm_trigger_playback,  
+        .pointer =      snd_ca0106_pcm_pointer_playback, 
 };
 
 
-static unsigned short snd_ca0106_ac97_read(ac97_t *ac97,
+static unsigned short snd_ca0106_ac97_read(struct snd_ac97 *ac97,
                                              unsigned short reg)
 {
-        ca0106_t *emu = ac97->private_data;
+        struct snd_ca0106 *emu = ac97->private_data;
         unsigned long flags;
         unsigned short val;
@@ -926 +980 @@
 }
 
-static void snd_ca0106_ac97_write(ac97_t *ac97,
+static void snd_ca0106_ac97_write(struct snd_ac97 *ac97,
                                     unsigned short reg, unsigned short val)
 {
-        ca0106_t *emu = ac97->private_data;
+        struct snd_ca0106 *emu = ac97->private_data;
         unsigned long flags;
-
+  
         spin_lock_irqsave(&emu->emu_lock, flags);
         outb(reg, emu->port + AC97ADDRESS);
@@ -938 +992 @@
 }
 
-static int snd_ca0106_ac97(ca0106_t *chip)
-{
-        ac97_bus_t *pbus;
-        ac97_template_t ac97;
+static int snd_ca0106_ac97(struct snd_ca0106 *chip)
+{
+        struct snd_ac97_bus *pbus;
+        struct snd_ac97_template ac97;
         int err;
-        static ac97_bus_ops_t ops = {
-            0,
-              /*  .write = */snd_ca0106_ac97_write,
-              /*  .read = */snd_ca0106_ac97_read,
-              0,0
+        static struct snd_ac97_bus_ops ops = {
+                .write = snd_ca0106_ac97_write,
+                .read = snd_ca0106_ac97_read,
         };
-
+  
         if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus)) < 0)
-            return err;
-        pbus->no_vra = 1; /* we don't need VRA */
+                return err;
+        pbus->no_vra = 1; /* we don't need VRA */
+
         memset(&ac97, 0, sizeof(ac97));
-        ac97.private_data = chip;
-        ac97.scaps = AC97_SCAP_NO_SPDIF;
+        ac97.private_data = chip;
+        ac97.scaps = AC97_SCAP_NO_SPDIF;
         return snd_ac97_mixer(pbus, &ac97, &chip->ac97);
 }
 
-static int snd_ca0106_free(ca0106_t *chip)
+static int snd_ca0106_free(struct snd_ca0106 *chip)
 {
         if (chip->res_port != NULL) {    /* avoid access to already used hardware */
@@ -982 +1035 @@
 
         // release the i/o port
-        if (chip->res_port) {
-                release_resource(chip->res_port);
-                kfree_nocheck(chip->res_port);
-        }
+        release_and_free_resource(chip->res_port);
+
         // release the irq
         if (chip->irq >= 0)
@@ -994 +1045 @@
 }
 
-static int snd_ca0106_dev_free(snd_device_t *device)
-{
-        ca0106_t *chip = device->device_data;
+static int snd_ca0106_dev_free(struct snd_device *device)
+{
+        struct snd_ca0106 *chip = device->device_data;
         return snd_ca0106_free(chip);
 }
@@ -1005 +1056 @@
         unsigned int status;
 
-        ca0106_t *chip = dev_id;
+        struct snd_ca0106 *chip = dev_id;
         int i;
         int mask;
         unsigned int stat76;
-        ca0106_channel_t *pchannel;
-
-        spin_lock(&chip->emu_lock);
+        struct snd_ca0106_channel *pchannel;
 
         status = inl(chip->port + IPR);
-
-        // call updater, unlock before it
-        spin_unlock(&chip->emu_lock);
-
         if (! status)
                 return IRQ_NONE;
@@ -1027 +1072 @@
         for(i = 0; i < 4; i++) {
                 pchannel = &(chip->playback_channels[i]);
-                if(stat76 & mask) {
+                if (stat76 & mask) {
 /* FIXME: Select the correct substream for period elapsed */
                         if(pchannel->use) {
-                          snd_pcm_period_elapsed(pchannel->epcm->substream);
-                        //printk(KERN_INFO "interrupt [%d] used\n", i);
+                                snd_pcm_period_elapsed(pchannel->epcm->substream);
+                                //printk(KERN_INFO "interrupt [%d] used\n", i);
                         }
                 }
@@ -1041 +1086 @@
         for(i = 0; i < 4; i++) {
                 pchannel = &(chip->capture_channels[i]);
-                if(stat76 & mask) {
+                if (stat76 & mask) {
 /* FIXME: Select the correct substream for period elapsed */
                         if(pchannel->use) {
-                          snd_pcm_period_elapsed(pchannel->epcm->substream);
-                        //printk(KERN_INFO "interrupt [%d] used\n", i);
+                                snd_pcm_period_elapsed(pchannel->epcm->substream);
+                                //printk(KERN_INFO "interrupt [%d] used\n", i);
                         }
                 }
@@ -1054 +1099 @@
 
         snd_ca0106_ptr_write(chip, EXTENDED_INT, 0, stat76);
-        spin_lock(&chip->emu_lock);
+
+        if (chip->midi.dev_id &&
+            (status & (chip->midi.ipr_tx|chip->midi.ipr_rx))) {
+                if (chip->midi.interrupt)
+                        chip->midi.interrupt(&chip->midi, status);
+                else
+                        chip->midi.interrupt_disable(&chip->midi, chip->midi.tx_enable | chip->midi.rx_enable);
+        }
+
         // acknowledge the interrupt if necessary
         outl(status, chip->port+IPR);
 
-        spin_unlock(&chip->emu_lock);
-
-        eoi_irq(irq);
-
         return IRQ_HANDLED;
 }
 
-static void snd_ca0106_pcm_free(snd_pcm_t *pcm)
-{
-        ca0106_t *emu = pcm->private_data;
-        emu->pcm = NULL;
-        snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
-static int __devinit snd_ca0106_pcm(ca0106_t *emu, int device, snd_pcm_t **rpcm)
-{
-        snd_pcm_t *pcm;
-        snd_pcm_substream_t *substream;
+static int __devinit snd_ca0106_pcm(struct snd_ca0106 *emu, int device, struct snd_pcm **rpcm)
+{
+        struct snd_pcm *pcm;
+        struct snd_pcm_substream *substream;
         int err;
-
+  
         if (rpcm)
                 *rpcm = NULL;
         if ((err = snd_pcm_new(emu->card, "ca0106", device, 1, 1, &pcm)) < 0)
                 return err;
-
+  
         pcm->private_data = emu;
-        pcm->private_free = snd_ca0106_pcm_free;
 
         switch (device) {
@@ -1110 +1151 @@
         emu->pcm = pcm;
 
-        for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
-            substream;
+        for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; 
+            substream; 
             substream = substream->next) {
-                if ((err = snd_pcm_lib_preallocate_pages(substream,
-                                                         SNDRV_DMA_TYPE_DEV,
-                                                         snd_dma_pci_data(emu->pci),
+                if ((err = snd_pcm_lib_preallocate_pages(substream, 
+                                                         SNDRV_DMA_TYPE_DEV, 
+                                                         snd_dma_pci_data(emu->pci), 
                                                          64*1024, 64*1024)) < 0) /* FIXME: 32*1024 for sound buffer, between 32and64 for Periods table. */
                         return err;
         }
 
-        for (substream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream;
-              substream;
+        for (substream = pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream; 
+              substream; 
               substream = substream->next) {
-                if ((err = snd_pcm_lib_preallocate_pages(substream,
-                                                   SNDRV_DMA_TYPE_DEV,
-                                                   snd_dma_pci_data(emu->pci),
+                if ((err = snd_pcm_lib_preallocate_pages(substream, 
+                                                   SNDRV_DMA_TYPE_DEV, 
+                                                   snd_dma_pci_data(emu->pci), 
                                                    64*1024, 64*1024)) < 0)
                         return err;
         }
-
+  
         if (rpcm)
                 *rpcm = pcm;
-
+  
         return 0;
 }
 
-static int __devinit snd_ca0106_create(snd_card_t *card,
+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 __devinit snd_ca0106_create(struct snd_card *card,
                                          struct pci_dev *pci,
-                                         ca0106_t **rchip)
-{
-    ca0106_t *chip;
-    ca0106_details_t *c;
+                                         struct snd_ca0106 **rchip)
+{
+        struct snd_ca0106 *chip;
+        struct snd_ca0106_details *c;
         int err;
         int ch;
-        static snd_device_ops_t ops = {
-                /*.dev_free = */snd_ca0106_dev_free, 0,0,0
+        static struct snd_device_ops ops = {
+                .dev_free = snd_ca0106_dev_free,
         };
-
+  
         *rchip = NULL;
-
+  
         if ((err = pci_enable_device(pci)) < 0)
-            return err;
-        pci_set_dma_mask(pci, 0xffffffffUL);
-        pci_set_consistent_dma_mask(pci, 0xffffffffUL);
-
-        chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
+                return err;
+        pci_set_dma_mask(pci, 0xFFFFFFFF);
+  
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (chip == NULL) {
                 pci_disable_device(pci);
                 return -ENOMEM;
         }
-
+  
         chip->card = card;
         chip->pci = pci;
@@ -1166 +1230 @@
 
         spin_lock_init(&chip->emu_lock);
-
+  
         chip->port = pci_resource_start(pci, 0);
         if ((chip->res_port = request_region(chip->port, 0x20,
-                                             "snd_ca0106")) == NULL) {
+                                             "snd_ca0106")) == NULL) { 
                 snd_ca0106_free(chip);
                 printk(KERN_ERR "cannot allocate the port\n");
@@ -1183 +1247 @@
         }
         chip->irq = pci->irq;
-
-        /* This stores the periods table. */
+  
+        /* This stores the periods table. */ 
         if(snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci), 1024, &chip->buffer) < 0) {
                 snd_ca0106_free(chip);
@@ -1199 +1263 @@
                chip->revision, chip->serial);
 #endif
-        strcpy(card->driver, "CA0106");
-        strcpy(card->shortname, "CA0106");
-
-        for (c=ca0106_chip_details; c->serial; c++) {
-            if (c->serial == chip->serial) break;
-        }
-        chip->details = c;
-        sprintf(card->longname, "%s at 0x%lx irq %i",
-                c->name, chip->port, chip->irq);
+        strcpy(card->driver, "CA0106");
+        strcpy(card->shortname, "CA0106");
+
+        for (c = ca0106_chip_details; c->serial; c++) {
+                if (c->serial == chip->serial)
+                        break;
+        }
+        chip->details = c;
+        sprintf(card->longname, "%s at 0x%lx irq %i",
+                c->name, chip->port, chip->irq);
 
         outl(0, chip->port + INTE);
@@ -1266 +1331 @@
         //snd_ca0106_ptr_write(chip, SPDIF_SELECT2, 0, 0xf0f003f); /* OSS drivers set this. */
         /* Analog or Digital output */
-        snd_ca0106_ptr_write(chip, SPDIF_SELECT1, 0, 0xf);
-        snd_ca0106_ptr_write(chip, SPDIF_SELECT2, 0, 0x000f0000); /* 0x0b000000 for digital, 0x000b0000 for analog, from win2000 drivers. Use 0x000f0000 for surround71 */
+        snd_ca0106_ptr_write(chip, SPDIF_SELECT1, 0, 0xf);
+        snd_ca0106_ptr_write(chip, SPDIF_SELECT2, 0, 0x000f0000); /* 0x0b000000 for digital, 0x000b0000 for analog, from win2000 drivers. Use 0x000f0000 for surround71 */
         chip->spdif_enable = 0; /* Set digital SPDIF output off */
         chip->capture_source = 3; /* Set CAPTURE_SOURCE */
@@ -1295 +1360 @@
                 /* FIXME: Still need to find out what the other GPIO bits do. E.g. For digital spdif out. */
                 outl(0x0, chip->port+GPIO);
-                //outl(0x00f0e000, chip->port+GPIO); /* Analog */
-                outl(0x005f5301, chip->port+GPIO); /* Analog */
+                //outl(0x00f0e000, chip->port+GPIO); /* Analog */
+                outl(0x005f5301, chip->port+GPIO); /* Analog */
         } else {
                 outl(0x0, chip->port+GPIO);
@@ -1310 +1375 @@
 
         if (chip->details->i2c_adc == 1) { /* The SB0410 and SB0413 use I2C to control ADC. */
-            snd_ca0106_i2c_write(chip, ADC_MUX, ADC_MUX_LINEIN); /* Enable Line-in capture. MIC in currently untested. */
-        }
+                snd_ca0106_i2c_write(chip, ADC_MUX, ADC_MUX_LINEIN); /* Enable Line-in capture. MIC in currently untested. */
+        }
+        if (chip->details->spi_dac == 1) { /* The SB0570 use SPI to control DAC. */
+                int size, n;
+
+                size = ARRAY_SIZE(spi_dac_init);
+                for (n=0; n < size; n++)
+                        snd_ca0106_spi_write(chip, spi_dac_init[n]);
+        }
 
         if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
@@ -1322 +1394 @@
 }
 
+
+static void ca0106_midi_interrupt_enable(struct snd_ca_midi *midi, int intr)
+{
+        snd_ca0106_intr_enable((struct snd_ca0106 *)(midi->dev_id), intr);
+}
+
+static void ca0106_midi_interrupt_disable(struct snd_ca_midi *midi, int intr)
+{
+        snd_ca0106_intr_disable((struct snd_ca0106 *)(midi->dev_id), intr);
+}
+
+static unsigned char ca0106_midi_read(struct snd_ca_midi *midi, int idx)
+{
+        return (unsigned char)snd_ca0106_ptr_read((struct snd_ca0106 *)(midi->dev_id),
+                                                  midi->port + idx, 0);
+}
+
+static void ca0106_midi_write(struct snd_ca_midi *midi, int data, int idx)
+{
+        snd_ca0106_ptr_write((struct snd_ca0106 *)(midi->dev_id), midi->port + idx, 0, data);
+}
+
+static struct snd_card *ca0106_dev_id_card(void *dev_id)
+{
+        return ((struct snd_ca0106 *)dev_id)->card;
+}
+
+static int ca0106_dev_id_port(void *dev_id)
+{
+        return ((struct snd_ca0106 *)dev_id)->port;
+}
+
+static int __devinit snd_ca0106_midi(struct snd_ca0106 *chip, unsigned int channel)
+{
+        struct snd_ca_midi *midi;
+        char *name;
+        int err;
+
+        if (channel == CA0106_MIDI_CHAN_B) {
+                name = "CA0106 MPU-401 (UART) B";
+                midi =  &chip->midi2;
+                midi->tx_enable = INTE_MIDI_TX_B;
+                midi->rx_enable = INTE_MIDI_RX_B;
+                midi->ipr_tx = IPR_MIDI_TX_B;
+                midi->ipr_rx = IPR_MIDI_RX_B;
+                midi->port = MIDI_UART_B_DATA;
+        } else {
+                name = "CA0106 MPU-401 (UART)";
+                midi =  &chip->midi;
+                midi->tx_enable = INTE_MIDI_TX_A;
+                midi->rx_enable = INTE_MIDI_TX_B;
+                midi->ipr_tx = IPR_MIDI_TX_A;
+                midi->ipr_rx = IPR_MIDI_RX_A;
+                midi->port = MIDI_UART_A_DATA;
+        }
+
+        midi->reset = CA0106_MPU401_RESET;
+        midi->enter_uart = CA0106_MPU401_ENTER_UART;
+        midi->ack = CA0106_MPU401_ACK;
+
+        midi->input_avail = CA0106_MIDI_INPUT_AVAIL;
+        midi->output_ready = CA0106_MIDI_OUTPUT_READY;
+
+        midi->channel = channel;
+
+        midi->interrupt_enable = ca0106_midi_interrupt_enable;
+        midi->interrupt_disable = ca0106_midi_interrupt_disable;
+
+        midi->read = ca0106_midi_read;
+        midi->write = ca0106_midi_write;
+
+        midi->get_dev_id_card = ca0106_dev_id_card;
+        midi->get_dev_id_port = ca0106_dev_id_port;
+
+        midi->dev_id = chip;
+        
+        if ((err = ca_midi_init(chip, midi, 0, name)) < 0)
+                return err;
+
+        return 0;
+}
+
+
 static int __devinit snd_ca0106_probe(struct pci_dev *pci,
                                         const struct pci_device_id *pci_id)
 {
         static int dev;
-        snd_card_t *card;
-        ca0106_t *chip;
+        struct snd_card *card;
+        struct snd_ca0106 *chip;
         int err;
 
@@ -1361 +1516 @@
                 snd_card_free(card);
                 return err;
-        }
+        }
         if (chip->details->ac97 == 1) { /* The SB0410 and SB0413 do not have an AC97 chip. */
-            if ((err = snd_ca0106_ac97(chip)) < 0) {
-                snd_card_free(card);
-                return err;
-            }
-        }
+                if ((err = snd_ca0106_ac97(chip)) < 0) {
+                        snd_card_free(card);
+                        return err;
+                }
+        }
         if ((err = snd_ca0106_mixer(chip)) < 0) {
                 snd_card_free(card);
@@ -1373 +1528 @@
         }
 
+        snd_printdd("ca0106: probe for MIDI channel A ...");
+        if ((err = snd_ca0106_midi(chip,CA0106_MIDI_CHAN_A)) < 0) {
+                snd_card_free(card);
+                snd_printdd(" failed, err=0x%x\n",err);
+                return err;
+        }
+        snd_printdd(" done.\n");
+
+#ifdef CONFIG_PROC_FS
         snd_ca0106_proc_init(chip);
+#endif
 
         if ((err = snd_card_register(card)) < 0) {
@@ -1400 +1565 @@
 // pci_driver definition
 static struct pci_driver driver = {
-    0,0,0,
-        /*.name = */"CA0106",
-        /*.id_table = */snd_ca0106_ids,
-        /*.probe = */snd_ca0106_probe,
-        /*.remove = */snd_ca0106_remove,
-        0,0
+        .name = "CA0106",
+        .id_table = snd_ca0106_ids,
+        .probe = snd_ca0106_probe,
+        .remove = __devexit_p(snd_ca0106_remove),
 };
 
@@ -1411 +1574 @@
 static int __init alsa_card_ca0106_init(void)
 {
-        int err;
-
-        if ((err = pci_module_init(&driver)) > 0)
-                return err;
-
-        return 0;
+        return pci_register_driver(&driver);
 }
 

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

@@ -1 @@
-#define __NO_VERSION__
 /*
  *  Copyright (c) 2004 James Courtier-Dutton <James@superbug.demon.co.uk>
@@ -7 +6 @@
  *  FEATURES currently supported:
  *    See ca0106_main.c for features.
- *
+ * 
  *  Changelog:
  *    Support interrupts per period.
@@ -66 +65 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
-//#include <linux/moduleparam.h>
+#include <linux/moduleparam.h>
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -75 +74 @@
 #include "ca0106.h"
 
-static int snd_ca0106_shared_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_ca0106_shared_spdif_info(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_info *uinfo)
 {
         uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
@@ -84 +84 @@
 }
 
-static int snd_ca0106_shared_spdif_get(snd_kcontrol_t * kcontrol,
-                                        snd_ctl_elem_value_t * ucontrol)
-{
-        ca0106_t *emu = snd_kcontrol_chip(kcontrol);
+static int snd_ca0106_shared_spdif_get(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
 
         ucontrol->value.enumerated.item[0] = emu->spdif_enable;
@@ -93 +93 @@
 }
 
-static int snd_ca0106_shared_spdif_put(snd_kcontrol_t * kcontrol,
-                                        snd_ctl_elem_value_t * ucontrol)
-{
-        ca0106_t *emu = snd_kcontrol_chip(kcontrol);
+static int snd_ca0106_shared_spdif_put(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
         unsigned int val;
         int change = 0;
@@ -116 +116 @@
                 } else {
                         /* Analog */
-                    snd_ca0106_ptr_write(emu, SPDIF_SELECT1, 0, 0xf);
-                    snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x000f0000);
-                    snd_ca0106_ptr_write(emu, CAPTURE_CONTROL, 0,
-                                         snd_ca0106_ptr_read(emu, CAPTURE_CONTROL, 0) | 0x1000);
-                    mask = inl(emu->port + GPIO) | 0x101;
-                    outl(mask, emu->port + GPIO);
+                        snd_ca0106_ptr_write(emu, SPDIF_SELECT1, 0, 0xf);
+                        snd_ca0106_ptr_write(emu, SPDIF_SELECT2, 0, 0x000f0000);
+                        snd_ca0106_ptr_write(emu, CAPTURE_CONTROL, 0,
+                                snd_ca0106_ptr_read(emu, CAPTURE_CONTROL, 0) | 0x1000);
+                        mask = inl(emu->port + GPIO) | 0x101;
+                        outl(mask, emu->port + GPIO);
                 }
         }
@@ -127 +127 @@
 }
 
-static snd_kcontrol_new_t snd_ca0106_shared_spdif __devinitdata =
-{
-        /*.iface =      */SNDRV_CTL_ELEM_IFACE_MIXER, 0,0,
-        /*.name =       */      "SPDIF Out", 0,0,0,
-        /*.info =       */      snd_ca0106_shared_spdif_info,
-        /*.get =        */      snd_ca0106_shared_spdif_get,
-        /*.put =        */      snd_ca0106_shared_spdif_put,0
-};
-
-static int snd_ca0106_capture_source_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
-{
-        static char *texts[6] = { "SPDIF out", "i2s mixer out", "SPDIF in", "i2s in", "AC97 in", "SRC out" };
+static int snd_ca0106_capture_source_info(struct snd_kcontrol *kcontrol,
+                                          struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[6] = {
+                "IEC958 out", "i2s mixer out", "IEC958 in", "i2s in", "AC97 in", "SRC out"
+        };
 
         uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
@@ -149 +143 @@
 }
 
-static int snd_ca0106_capture_source_get(snd_kcontrol_t * kcontrol,
-                                        snd_ctl_elem_value_t * ucontrol)
-{
-        ca0106_t *emu = snd_kcontrol_chip(kcontrol);
+static int snd_ca0106_capture_source_get(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
 
         ucontrol->value.enumerated.item[0] = emu->capture_source;
@@ -158 +152 @@
 }
 
-static int snd_ca0106_capture_source_put(snd_kcontrol_t * kcontrol,
-                                        snd_ctl_elem_value_t * ucontrol)
-{
-        ca0106_t *emu = snd_kcontrol_chip(kcontrol);
+static int snd_ca0106_capture_source_put(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
         unsigned int val;
         int change = 0;
@@ -178 +172 @@
 }
 
-static snd_kcontrol_new_t snd_ca0106_capture_source __devinitdata =
-{
-        /*.iface =    */  SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        /*.name =     */        "Capture Source",0,0,0,
-        /*.info =     */        snd_ca0106_capture_source_info,
-        /*.get =      */        snd_ca0106_capture_source_get,
-        /*.put =      */        snd_ca0106_capture_source_put,0
+static int snd_ca0106_capture_mic_line_in_info(struct snd_kcontrol *kcontrol,
+                                               struct snd_ctl_elem_info *uinfo)
+{
+        static char *texts[2] = { "Line in", "Mic in" };
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = 2;
+        if (uinfo->value.enumerated.item > 1)
+                uinfo->value.enumerated.item = 1;
+        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
+        return 0;
+}
+
+static int snd_ca0106_capture_mic_line_in_get(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
+
+        ucontrol->value.enumerated.item[0] = emu->capture_mic_line_in;
+        return 0;
+}
+
+static int snd_ca0106_capture_mic_line_in_put(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
+        unsigned int val;
+        int change = 0;
+        u32 tmp;
+
+        val = ucontrol->value.enumerated.item[0] ;
+        change = (emu->capture_mic_line_in != val);
+        if (change) {
+                emu->capture_mic_line_in = val;
+                if (val) {
+                        snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_PHONE); /* Mute input */
+                        tmp = inl(emu->port+GPIO) & ~0x400;
+                        tmp = tmp | 0x400;
+                        outl(tmp, emu->port+GPIO);
+                        snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_MIC);
+                } else {
+                        snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_PHONE); /* Mute input */
+                        tmp = inl(emu->port+GPIO) & ~0x400;
+                        outl(tmp, emu->port+GPIO);
+                        snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_LINEIN);
+                }
+        }
+        return change;
+}
+
+static struct snd_kcontrol_new snd_ca0106_capture_mic_line_in __devinitdata =
+{
+        .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name =         "Mic/Line in Capture",
+        .info =         snd_ca0106_capture_mic_line_in_info,
+        .get =          snd_ca0106_capture_mic_line_in_get,
+        .put =          snd_ca0106_capture_mic_line_in_put
 };
 
-static int snd_ca0106_capture_mic_line_in_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
-{
-    static char *texts[2] = { "Line in", "Mic in" };
-
-    uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-    uinfo->count = 1;
-    uinfo->value.enumerated.items = 2;
-    if (uinfo->value.enumerated.item > 1)
-        uinfo->value.enumerated.item = 1;
-    strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-    return 0;
-}
-
-static int snd_ca0106_capture_mic_line_in_get(snd_kcontrol_t * kcontrol,
-                                              snd_ctl_elem_value_t * ucontrol)
-{
-    ca0106_t *emu = snd_kcontrol_chip(kcontrol);
-
-    ucontrol->value.enumerated.item[0] = emu->capture_mic_line_in;
-    return 0;
-}
-
-static int snd_ca0106_capture_mic_line_in_put(snd_kcontrol_t * kcontrol,
-                                              snd_ctl_elem_value_t * ucontrol)
-{
-    ca0106_t *emu = snd_kcontrol_chip(kcontrol);
-    unsigned int val;
-    int change = 0;
-    u32 tmp;
-
-    val = ucontrol->value.enumerated.item[0] ;
-    change = (emu->capture_mic_line_in != val);
-    if (change) {
-        emu->capture_mic_line_in = val;
-        if (val) {
-            snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_PHONE); /* Mute input */
-            tmp = inl(emu->port+GPIO) & ~0x400;
-            tmp = tmp | 0x400;
-            outl(tmp, emu->port+GPIO);
-            snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_MIC);
-        } else {
-            snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_PHONE); /* Mute input */
-            tmp = inl(emu->port+GPIO) & ~0x400;
-            outl(tmp, emu->port+GPIO);
-            snd_ca0106_i2c_write(emu, ADC_MUX, ADC_MUX_LINEIN);
-        }
-    }
-    return change;
-}
-
-static snd_kcontrol_new_t snd_ca0106_capture_mic_line_in __devinitdata =
-{
-    SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    "Mic/Line in Capture",0,0,0,
-    snd_ca0106_capture_mic_line_in_info,
-    snd_ca0106_capture_mic_line_in_get,
-    snd_ca0106_capture_mic_line_in_put,0
-};
-
-static int snd_ca0106_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_ca0106_spdif_info(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_info *uinfo)
 {
         uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
@@ -253 +240 @@
 }
 
-static int snd_ca0106_spdif_get(snd_kcontrol_t * kcontrol,
-                                 snd_ctl_elem_value_t * ucontrol)
-{
-        ca0106_t *emu = snd_kcontrol_chip(kcontrol);
+static int snd_ca0106_spdif_get(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
         unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
 
@@ -266 +253 @@
 }
 
-static int snd_ca0106_spdif_get_mask(snd_kcontrol_t * kcontrol,
-                                      snd_ctl_elem_value_t * ucontrol)
+static int snd_ca0106_spdif_get_mask(struct snd_kcontrol *kcontrol,
+                                      struct snd_ctl_elem_value *ucontrol)
 {
         ucontrol->value.iec958.status[0] = 0xff;
@@ -276 +263 @@
 }
 
-static int snd_ca0106_spdif_put(snd_kcontrol_t * kcontrol,
-                                 snd_ctl_elem_value_t * ucontrol)
-{
-        ca0106_t *emu = snd_kcontrol_chip(kcontrol);
+static int snd_ca0106_spdif_put(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
         unsigned int idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
         int change;
@@ -296 +283 @@
 }
 
-static snd_kcontrol_new_t snd_ca0106_spdif_mask_control =
-{
-      /*  .iface =      */  SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-      /*  .name =       */  SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK), 0,
-      /*  .access =     */  SNDRV_CTL_ELEM_ACCESS_READ,
-      /*  .count =      */  4,
-      /*  .info =       */  snd_ca0106_spdif_info,
-      /*  .get =        */  snd_ca0106_spdif_get_mask,0,0
-};
-
-static snd_kcontrol_new_t snd_ca0106_spdif_control =
-{
-      /*  .iface =      */  SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-      /*  .name =       */  SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),0,0,
-      /*  .count =      */  4,
-      /*  .info =       */  snd_ca0106_spdif_info,
-      /*  .get =        */  snd_ca0106_spdif_get,
-      /*  .put =        */  snd_ca0106_spdif_put, 0
-};
-
-static int snd_ca0106_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+static int snd_ca0106_volume_info(struct snd_kcontrol *kcontrol,
+                                  struct snd_ctl_elem_info *uinfo)
 {
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
@@ -325 +293 @@
 }
 
-static int snd_ca0106_volume_get(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol, int reg, int channel_id)
-{
-        ca0106_t *emu = snd_kcontrol_chip(kcontrol);
+static int snd_ca0106_volume_get(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
         unsigned int value;
+        int channel_id, reg;
+
+        channel_id = (kcontrol->private_value >> 8) & 0xff;
+        reg = kcontrol->private_value & 0xff;
 
         value = snd_ca0106_ptr_read(emu, reg, channel_id);
@@ -337 +309 @@
 }
 
-static int snd_ca0106_volume_get_spdif_front(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_FRONT_CHANNEL;
-        int reg = PLAYBACK_VOLUME1;
-        return snd_ca0106_volume_get(kcontrol, ucontrol, reg, channel_id);
-}
-
-static int snd_ca0106_volume_get_spdif_center_lfe(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_CENTER_LFE_CHANNEL;
-        int reg = PLAYBACK_VOLUME1;
-        return snd_ca0106_volume_get(kcontrol, ucontrol, reg, channel_id);
-}
-static int snd_ca0106_volume_get_spdif_unknown(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_UNKNOWN_CHANNEL;
-        int reg = PLAYBACK_VOLUME1;
-        return snd_ca0106_volume_get(kcontrol, ucontrol, reg, channel_id);
-}
-static int snd_ca0106_volume_get_spdif_rear(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_REAR_CHANNEL;
-        int reg = PLAYBACK_VOLUME1;
-        return snd_ca0106_volume_get(kcontrol, ucontrol, reg, channel_id);
-}
-static int snd_ca0106_volume_get_analog_front(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_FRONT_CHANNEL;
-        int reg = PLAYBACK_VOLUME2;
-        return snd_ca0106_volume_get(kcontrol, ucontrol, reg, channel_id);
-}
-
-static int snd_ca0106_volume_get_analog_center_lfe(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_CENTER_LFE_CHANNEL;
-        int reg = PLAYBACK_VOLUME2;
-        return snd_ca0106_volume_get(kcontrol, ucontrol, reg, channel_id);
-}
-static int snd_ca0106_volume_get_analog_unknown(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_UNKNOWN_CHANNEL;
-        int reg = PLAYBACK_VOLUME2;
-        return snd_ca0106_volume_get(kcontrol, ucontrol, reg, channel_id);
-}
-static int snd_ca0106_volume_get_analog_rear(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_REAR_CHANNEL;
-        int reg = PLAYBACK_VOLUME2;
-        return snd_ca0106_volume_get(kcontrol, ucontrol, reg, channel_id);
-}
-
-static int snd_ca0106_volume_get_feedback(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = 1;
-        int reg = CAPTURE_CONTROL;
-        return snd_ca0106_volume_get(kcontrol, ucontrol, reg, channel_id);
-}
-
-static int snd_ca0106_volume_put(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol, int reg, int channel_id)
-{
-        ca0106_t *emu = snd_kcontrol_chip(kcontrol);
-        unsigned int value;
-        //value = snd_ca0106_ptr_read(emu, reg, channel_id);
-        //value = value & 0xffff;
-        value = ((0xff - ucontrol->value.integer.value[0]) << 24) | ((0xff - ucontrol->value.integer.value[1]) << 16);
-        value = value | ((0xff - ucontrol->value.integer.value[0]) << 8) | ((0xff - ucontrol->value.integer.value[1]) );
-        snd_ca0106_ptr_write(emu, reg, channel_id, value);
-        return 1;
-}
-static int snd_ca0106_volume_put_spdif_front(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_FRONT_CHANNEL;
-        int reg = PLAYBACK_VOLUME1;
-        return snd_ca0106_volume_put(kcontrol, ucontrol, reg, channel_id);
-}
-static int snd_ca0106_volume_put_spdif_center_lfe(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_CENTER_LFE_CHANNEL;
-        int reg = PLAYBACK_VOLUME1;
-        return snd_ca0106_volume_put(kcontrol, ucontrol, reg, channel_id);
-}
-static int snd_ca0106_volume_put_spdif_unknown(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_UNKNOWN_CHANNEL;
-        int reg = PLAYBACK_VOLUME1;
-        return snd_ca0106_volume_put(kcontrol, ucontrol, reg, channel_id);
-}
-static int snd_ca0106_volume_put_spdif_rear(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_REAR_CHANNEL;
-        int reg = PLAYBACK_VOLUME1;
-        return snd_ca0106_volume_put(kcontrol, ucontrol, reg, channel_id);
-}
-static int snd_ca0106_volume_put_analog_front(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_FRONT_CHANNEL;
-        int reg = PLAYBACK_VOLUME2;
-        return snd_ca0106_volume_put(kcontrol, ucontrol, reg, channel_id);
-}
-static int snd_ca0106_volume_put_analog_center_lfe(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_CENTER_LFE_CHANNEL;
-        int reg = PLAYBACK_VOLUME2;
-        return snd_ca0106_volume_put(kcontrol, ucontrol, reg, channel_id);
-}
-static int snd_ca0106_volume_put_analog_unknown(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_UNKNOWN_CHANNEL;
-        int reg = PLAYBACK_VOLUME2;
-        return snd_ca0106_volume_put(kcontrol, ucontrol, reg, channel_id);
-}
-static int snd_ca0106_volume_put_analog_rear(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = CONTROL_REAR_CHANNEL;
-        int reg = PLAYBACK_VOLUME2;
-        return snd_ca0106_volume_put(kcontrol, ucontrol, reg, channel_id);
-}
-
-static int snd_ca0106_volume_put_feedback(snd_kcontrol_t * kcontrol,
-                                       snd_ctl_elem_value_t * ucontrol)
-{
-        int channel_id = 1;
-        int reg = CAPTURE_CONTROL;
-        return snd_ca0106_volume_put(kcontrol, ucontrol, reg, channel_id);
-}
-
-static snd_kcontrol_new_t snd_ca0106_volume_control_analog_front =
-{
-    SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-    "Analog Front Playback Volume"
-        ,0,0,0,
-        snd_ca0106_volume_info,
-        snd_ca0106_volume_get_analog_front,
-        snd_ca0106_volume_put_analog_front,0
+static int snd_ca0106_volume_put(struct snd_kcontrol *kcontrol,
+                                 struct snd_ctl_elem_value *ucontrol)
+{
+        struct snd_ca0106 *emu = snd_kcontrol_chip(kcontrol);
+        unsigned int oval, nval;
+        int channel_id, reg;
+
+        channel_id = (kcontrol->private_value >> 8) & 0xff;
+        reg = kcontrol->private_value & 0xff;
+
+        oval = snd_ca0106_ptr_read(emu, reg, channel_id);
+        nval = ((0xff - ucontrol->value.integer.value[0]) << 24) |
+                ((0xff - ucontrol->value.integer.value[1]) << 16);
+        nval |= ((0xff - ucontrol->value.integer.value[0]) << 8) |
+                ((0xff - ucontrol->value.integer.value[1]) );
+        if (oval == nval)
+                return 0;
+        snd_ca0106_ptr_write(emu, reg, channel_id, nval);
+        return 1;
+}
+
+#define CA_VOLUME(xname,chid,reg) \
+{                                                               \
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname,     \
+        .info = snd_ca0106_volume_info,                         \
+        .get =          snd_ca0106_volume_get,                  \
+        .put =          snd_ca0106_volume_put,                  \
+        .private_value = ((chid) << 8) | (reg)                  \
+}
+
+
+static struct snd_kcontrol_new snd_ca0106_volume_ctls[] __devinitdata = {
+        CA_VOLUME("Analog Front Playback Volume",
+                  CONTROL_FRONT_CHANNEL, PLAYBACK_VOLUME2),
+        CA_VOLUME("Analog Rear Playback Volume",
+                  CONTROL_REAR_CHANNEL, PLAYBACK_VOLUME2),
+        CA_VOLUME("Analog Center/LFE Playback Volume",
+                  CONTROL_CENTER_LFE_CHANNEL, PLAYBACK_VOLUME2),
+        CA_VOLUME("Analog Side Playback Volume",
+                  CONTROL_UNKNOWN_CHANNEL, PLAYBACK_VOLUME2),
+
+        CA_VOLUME("IEC958 Front Playback Volume",
+                  CONTROL_FRONT_CHANNEL, PLAYBACK_VOLUME1),
+        CA_VOLUME("IEC958 Rear Playback Volume",
+                  CONTROL_REAR_CHANNEL, PLAYBACK_VOLUME1),
+        CA_VOLUME("IEC958 Center/LFE Playback Volume",
+                  CONTROL_CENTER_LFE_CHANNEL, PLAYBACK_VOLUME1),
+        CA_VOLUME("IEC958 Unknown Playback Volume",
+                  CONTROL_UNKNOWN_CHANNEL, PLAYBACK_VOLUME1),
+
+        CA_VOLUME("CAPTURE feedback Playback Volume",
+                  1, CAPTURE_CONTROL),
+
+        {
+                .access =       SNDRV_CTL_ELEM_ACCESS_READ,
+                .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+                .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,MASK),
+                .count =        4,
+                .info =         snd_ca0106_spdif_info,
+                .get =          snd_ca0106_spdif_get_mask
+        },
+        {
+                .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name =         "IEC958 Playback Switch",
+                .info =         snd_ca0106_shared_spdif_info,
+                .get =          snd_ca0106_shared_spdif_get,
+                .put =          snd_ca0106_shared_spdif_put
+        },
+        {
+                .iface =        SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name =         "Capture Source",
+                .info =         snd_ca0106_capture_source_info,
+                .get =          snd_ca0106_capture_source_get,
+                .put =          snd_ca0106_capture_source_put
+        },
+        {
+                .iface =        SNDRV_CTL_ELEM_IFACE_PCM,
+                .name =         SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
+                .count =        4,
+                .info =         snd_ca0106_spdif_info,
+                .get =          snd_ca0106_spdif_get,
+                .put =          snd_ca0106_spdif_put
+        },
 };
-static snd_kcontrol_new_t snd_ca0106_volume_control_analog_center_lfe =
-{
-         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-         "Analog Center/LFE Playback Volume",0,0,0,
-         snd_ca0106_volume_info,
-         snd_ca0106_volume_get_analog_center_lfe,
-         snd_ca0106_volume_put_analog_center_lfe,0
-};
-static snd_kcontrol_new_t snd_ca0106_volume_control_analog_unknown =
-{
-         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-         "Analog Side Playback Volume",0,0,0,
-         snd_ca0106_volume_info,
-         snd_ca0106_volume_get_analog_unknown,
-         snd_ca0106_volume_put_analog_unknown,0
-};
-static snd_kcontrol_new_t snd_ca0106_volume_control_analog_rear =
-{
-        SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-        "Analog Rear Playback Volume",0,0,0,
-        snd_ca0106_volume_info,
-        snd_ca0106_volume_get_analog_rear,
-        snd_ca0106_volume_put_analog_rear,0
-};
-static snd_kcontrol_new_t snd_ca0106_volume_control_spdif_front =
-{
-         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-         "SPDIF Front Playback Volume",0,0,0,
-         snd_ca0106_volume_info,
-         snd_ca0106_volume_get_spdif_front,
-         snd_ca0106_volume_put_spdif_front,0
-};
-static snd_kcontrol_new_t snd_ca0106_volume_control_spdif_center_lfe =
-{
-         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-         "SPDIF Center/LFE Playback Volume",0,0,0,
-         snd_ca0106_volume_info,
-         snd_ca0106_volume_get_spdif_center_lfe,
-         snd_ca0106_volume_put_spdif_center_lfe,0
-};
-static snd_kcontrol_new_t snd_ca0106_volume_control_spdif_unknown =
-{
-         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-         "SPDIF Unknown Playback Volume",0,0,0,
-         snd_ca0106_volume_info,
-         snd_ca0106_volume_get_spdif_unknown,
-         snd_ca0106_volume_put_spdif_unknown,0
-};
-static snd_kcontrol_new_t snd_ca0106_volume_control_spdif_rear =
-{
-         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-         "SPDIF Rear Playback Volume",0,0,0,
-         snd_ca0106_volume_info,
-         snd_ca0106_volume_get_spdif_rear,
-         snd_ca0106_volume_put_spdif_rear,0
-};
-
-static snd_kcontrol_new_t snd_ca0106_volume_control_feedback =
-{
-         SNDRV_CTL_ELEM_IFACE_MIXER,0,0,
-         "CAPTURE feedback Playback",0,0,0,
-         snd_ca0106_volume_info,
-         snd_ca0106_volume_get_feedback,
-         snd_ca0106_volume_put_feedback,0
-};
-
-
-static int remove_ctl(snd_card_t *card, const char *name)
-{
-        snd_ctl_elem_id_t id;
+
+static int __devinit remove_ctl(struct snd_card *card, const char *name)
+{
+        struct snd_ctl_elem_id id;
         memset(&id, 0, sizeof(id));
         strcpy(id.name, name);
@@ -566 +403 @@
 }
 
-static snd_kcontrol_t *ctl_find(snd_card_t *card, const char *name)
-{
-        snd_ctl_elem_id_t sid;
+static struct snd_kcontrol __devinit *ctl_find(struct snd_card *card, const char *name)
+{
+        struct snd_ctl_elem_id sid;
         memset(&sid, 0, sizeof(sid));
         /* FIXME: strcpy is bad. */
@@ -576 +413 @@
 }
 
-static int rename_ctl(snd_card_t *card, const char *src, const char *dst)
-{
-        snd_kcontrol_t *kctl = ctl_find(card, src);
+static int __devinit rename_ctl(struct snd_card *card, const char *src, const char *dst)
+{
+        struct snd_kcontrol *kctl = ctl_find(card, src);
         if (kctl) {
                 strcpy(kctl->id.name, dst);
@@ -586 +423 @@
 }
 
-int __devinit snd_ca0106_mixer(ca0106_t *emu)
-{
-        int err;
-        snd_kcontrol_t *kctl;
-        snd_card_t *card = emu->card;
+int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
+{
+        int i, err;
+        struct snd_card *card = emu->card;
         char **c;
         static char *ca0106_remove_ctls[] = {
@@ -630 +466 @@
         };
 #if 1
-        for (c=ca0106_remove_ctls; *c; c++)
+        for (c = ca0106_remove_ctls; *c; c++)
                 remove_ctl(card, *c);
-        for (c=ca0106_rename_ctls; *c; c += 2)
+        for (c = ca0106_rename_ctls; *c; c += 2)
                 rename_ctl(card, c[0], c[1]);
 #endif
 
-        if ((kctl = snd_ctl_new1(&snd_ca0106_volume_control_analog_front, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-                return err;
-        if ((kctl = snd_ctl_new1(&snd_ca0106_volume_control_analog_rear, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-                return err;
-        if ((kctl = snd_ctl_new1(&snd_ca0106_volume_control_analog_center_lfe, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-                return err;
-        if ((kctl = snd_ctl_new1(&snd_ca0106_volume_control_analog_unknown, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-                return err;
-        if ((kctl = snd_ctl_new1(&snd_ca0106_volume_control_spdif_front, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-                return err;
-        if ((kctl = snd_ctl_new1(&snd_ca0106_volume_control_spdif_rear, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-                return err;
-        if ((kctl = snd_ctl_new1(&snd_ca0106_volume_control_spdif_center_lfe, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-                return err;
-        if ((kctl = snd_ctl_new1(&snd_ca0106_volume_control_spdif_unknown, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-                return err;
-        if ((kctl = snd_ctl_new1(&snd_ca0106_volume_control_feedback, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-                return err;
-        if ((kctl = snd_ctl_new1(&snd_ca0106_spdif_mask_control, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-                return err;
-        if ((kctl = snd_ctl_new1(&snd_ca0106_shared_spdif, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-                return err;
-        if ((kctl = snd_ctl_new1(&snd_ca0106_capture_source, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-            return err;
-        if (emu->details->i2c_adc == 1) {
-            if ((kctl = snd_ctl_new1(&snd_ca0106_capture_mic_line_in, emu)) == NULL)
-                return -ENOMEM;
-            if ((err = snd_ctl_add(card, kctl)))
-                return err;
-        }
-        if ((kctl = snd_ctl_new1(&snd_ca0106_spdif_control, emu)) == NULL)
-                return -ENOMEM;
-        if ((err = snd_ctl_add(card, kctl)))
-                return err;
+        for (i = 0; i < ARRAY_SIZE(snd_ca0106_volume_ctls); i++) {
+                err = snd_ctl_add(card, snd_ctl_new1(&snd_ca0106_volume_ctls[i], emu));
+                if (err < 0)
+                        return err;
+        }
+        if (emu->details->i2c_adc == 1) {
+                err = snd_ctl_add(card, snd_ctl_new1(&snd_ca0106_capture_mic_line_in, emu));
+                if (err < 0)
+                        return err;
+        }
         return 0;
 }

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

@@ -1 @@
-#define __NO_VERSION__
 /*
  *  Copyright (c) 2004 James Courtier-Dutton <James@superbug.demon.co.uk>
  *  Driver CA0106 chips. e.g. Sound Blaster Audigy LS and Live 24bit
- *  Version: 0.0.17
+ *  Version: 0.0.18
  *
  *  FEATURES currently supported:
@@ -41 +40 @@
  *  0.0.17
  *    Add iec958 file in proc file system to show status of SPDIF in.
- *    
+ *  0.0.18
+ *    Implement support for Line-in capture on SB Live 24bit.
+ *
  *  This code was initally based on code from ALSA's emu10k1x.c which is:
  *  Copyright (c) by Francisco Moraes <fmoraes@nc.rr.com>
@@ -66 +67 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
-//#include <linux/moduleparam.h>
+#include <linux/moduleparam.h>
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -76 +77 @@
 #include "ca0106.h"
 
+
+#ifdef CONFIG_PROC_FS
 
 struct snd_ca0106_category_str {
@@ -97 +100 @@
 
 
-void snd_ca0106_proc_dump_iec958( snd_info_buffer_t *buffer, u32 value)
+static void snd_ca0106_proc_dump_iec958( struct snd_info_buffer *buffer, u32 value)
 {
         int i;
@@ -271 +274 @@
 }
 
-static void snd_ca0106_proc_iec958(snd_info_entry_t *entry, 
-                                       snd_info_buffer_t * buffer)
-{
-        ca0106_t *emu = entry->private_data;
+static void snd_ca0106_proc_iec958(struct snd_info_entry *entry, 
+                                       struct snd_info_buffer *buffer)
+{
+        struct snd_ca0106 *emu = entry->private_data;
         u32 value;
 
@@ -293 +296 @@
 }
 
-static void snd_ca0106_proc_reg_write32(snd_info_entry_t *entry, 
-                                       snd_info_buffer_t * buffer)
-{
-        ca0106_t *emu = entry->private_data;
+static void snd_ca0106_proc_reg_write32(struct snd_info_entry *entry, 
+                                       struct snd_info_buffer *buffer)
+{
+        struct snd_ca0106 *emu = entry->private_data;
         unsigned long flags;
         char line[64];
@@ -313 +316 @@
 }
 
-static void snd_ca0106_proc_reg_read32(snd_info_entry_t *entry, 
-                                       snd_info_buffer_t * buffer)
-{
-        ca0106_t *emu = entry->private_data;
+static void snd_ca0106_proc_reg_read32(struct snd_info_entry *entry, 
+                                       struct snd_info_buffer *buffer)
+{
+        struct snd_ca0106 *emu = entry->private_data;
         unsigned long value;
         unsigned long flags;
@@ -329 +332 @@
 }
 
-static void snd_ca0106_proc_reg_read16(snd_info_entry_t *entry, 
-                                       snd_info_buffer_t * buffer)
-{
-        ca0106_t *emu = entry->private_data;
+static void snd_ca0106_proc_reg_read16(struct snd_info_entry *entry, 
+                                       struct snd_info_buffer *buffer)
+{
+        struct snd_ca0106 *emu = entry->private_data;
         unsigned int value;
         unsigned long flags;
@@ -345 +348 @@
 }
 
-static void snd_ca0106_proc_reg_read8(snd_info_entry_t *entry, 
-                                       snd_info_buffer_t * buffer)
-{
-        ca0106_t *emu = entry->private_data;
+static void snd_ca0106_proc_reg_read8(struct snd_info_entry *entry, 
+                                       struct snd_info_buffer *buffer)
+{
+        struct snd_ca0106 *emu = entry->private_data;
         unsigned int value;
         unsigned long flags;
@@ -361 +364 @@
 }
 
-static void snd_ca0106_proc_reg_read1(snd_info_entry_t *entry, 
-                                       snd_info_buffer_t * buffer)
-{
-        ca0106_t *emu = entry->private_data;
+static void snd_ca0106_proc_reg_read1(struct snd_info_entry *entry, 
+                                       struct snd_info_buffer *buffer)
+{
+        struct snd_ca0106 *emu = entry->private_data;
         unsigned long value;
         int i,j;
@@ -379 +382 @@
 }
 
-static void snd_ca0106_proc_reg_read2(snd_info_entry_t *entry, 
-                                       snd_info_buffer_t * buffer)
-{
-        ca0106_t *emu = entry->private_data;
+static void snd_ca0106_proc_reg_read2(struct snd_info_entry *entry, 
+                                       struct snd_info_buffer *buffer)
+{
+        struct snd_ca0106 *emu = entry->private_data;
         unsigned long value;
         int i,j;
@@ -397 +400 @@
 }
 
-static void snd_ca0106_proc_reg_write(snd_info_entry_t *entry, 
-                                       snd_info_buffer_t * buffer)
-{
-        ca0106_t *emu = entry->private_data;
+static void snd_ca0106_proc_reg_write(struct snd_info_entry *entry, 
+                                       struct snd_info_buffer *buffer)
+{
+        struct snd_ca0106 *emu = entry->private_data;
         char line[64];
         unsigned int reg, channel_id , val;
@@ -413 +416 @@
 }
 
-
-int __devinit snd_ca0106_proc_init(ca0106_t * emu)
-{
-        snd_info_entry_t *entry;
+static void snd_ca0106_proc_i2c_write(struct snd_info_entry *entry, 
+                                       struct snd_info_buffer *buffer)
+{
+        struct snd_ca0106 *emu = entry->private_data;
+        char line[64];
+        unsigned int reg, val;
+#if 0
+        while (!snd_info_get_line(buffer, line, sizeof(line))) {
+                if (sscanf(line, "%x %x", &reg, &val) != 2)
+                        continue;
+                if ((reg <= 0x7f) || (val <= 0x1ff)) {
+                        snd_ca0106_i2c_write(emu, reg, val);
+                }
+        }
+#endif
+}
+
+int __devinit snd_ca0106_proc_init(struct snd_ca0106 * emu)
+{
+        struct snd_info_entry *entry;
         
         if(! snd_card_proc_new(emu->card, "iec958", &entry))
@@ -424 +443 @@
                 entry->c.text.write_size = 64;
                 entry->c.text.write = snd_ca0106_proc_reg_write32;
+                entry->mode |= S_IWUSR;
         }
         if(! snd_card_proc_new(emu->card, "ca0106_reg16", &entry))
@@ -433 +453 @@
                 entry->c.text.write_size = 64;
                 entry->c.text.write = snd_ca0106_proc_reg_write;
+                entry->mode |= S_IWUSR;
+//              entry->private_data = emu;
+        }
+        if(! snd_card_proc_new(emu->card, "ca0106_i2c", &entry)) {
+                snd_info_set_text_ops(entry, emu, 1024, snd_ca0106_proc_i2c_write);
+                entry->c.text.write_size = 64;
+                entry->c.text.write = snd_ca0106_proc_i2c_write;
+                entry->mode |= S_IWUSR;
 //              entry->private_data = emu;
         }
@@ -440 +468 @@
 }
 
+#endif /* CONFIG_PROC_FS */

GPL/trunk/alsa-kernel/pci/ca0106/makefile.os2

@@ -14 +14 @@
 #===================================================================
 FILE1    = ca0106_main.obj ca0106_proc.obj ca0106_mixer.obj
-FILE2    = 
+FILE2    = ca_midi.obj
 FILE3    = 
 FILE4    = 

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

@@ -1092 +1092 @@
         change = 1;
     }
-    if (ucontrol->value.integer.value[0] != volL) {
+    if (ucontrol->value.integer.value[0] != volR) {
         volR = CS_VOL_MASK - (ucontrol->value.integer.value[1] & CS_VOL_MASK);
         snd_cs4281_pokeBA0(chip, regR, volR);
@@ -1462 +1462 @@
 {
     unsigned int tmp;
-    int timeout;
+    unsigned long end_time;
     int retry_count = 2;
 
@@ -1541 +1541 @@
      * Wait for the DLL ready signal from the clock logic.
      */
-#ifdef TARGET_OS2
-    //  end_time = (jiffies + 1000) + 1;
-#else
-    //  end_time = (jiffies + HZ / 4) + 1;
-#endif
-    timeout = HZ;
+    end_time = jiffies + HZ;
     do {
         /*
@@ -1554 +1549 @@
         if (snd_cs4281_peekBA0(chip, BA0_CLKCR1) & BA0_CLKCR1_DLLRDY)
             goto __ok0;
-        snd_cs4281_delay_long();
-    } while (timeout-- > 0);
+        schedule_timeout_uninterruptible(1);
+    } while (time_after_eq(end_time, jiffies));
 
     snd_printk(KERN_ERR "DLLRDY not seen\n");
@@ -1572 +1567 @@
      * Wait for the codec ready signal from the AC97 codec.
      */
-#ifdef TARGET_OS2
-    //  end_time = (jiffies + 1000) + 1;
-#else
-    //  end_time = (jiffies + (3 * HZ) / 4) + 1;
-#endif
-    timeout = HZ;
+    end_time = jiffies + HZ;
     do {
         /*
@@ -1585 +1575 @@
         if (snd_cs4281_peekBA0(chip, BA0_ACSTS) & BA0_ACSTS_CRDY)
             goto __ok1;
-        snd_cs4281_delay_long();
-    } while (timeout-- > 0);
+        schedule_timeout_uninterruptible(1);
+    } while (time_after_eq(end_time, jiffies));
 
     snd_printk(KERN_ERR "never read codec ready from AC'97 (0x%x)\n", snd_cs4281_peekBA0(chip, BA0_ACSTS));
@@ -1593 +1583 @@
 __ok1:
     if (chip->dual_codec) {
-        timeout = HZ;
+        end_time = jiffies + HZ;
         do {
             if (snd_cs4281_peekBA0(chip, BA0_ACSTS2) & BA0_ACSTS_CRDY)
                 goto __codec2_ok;
-            snd_cs4281_delay_long();
-        } while (timeout-- > 0);
+            schedule_timeout_uninterruptible(1);
+        } while (time_after_eq(end_time, jiffies));
         snd_printk(KERN_INFO "secondary codec doesn't respond. disable it...\n");
         chip->dual_codec = 0;
@@ -1615 +1605 @@
      *  the codec is pumping ADC data across the AC-link.
      */
-
-#ifdef TARGET_OS2
-    //  end_time = (jiffies + 5000);
-#else
-    //  end_time = (jiffies + (5 * HZ) / 4) + 1;
-#endif
-    timeout = HZ;
+    end_time = jiffies + HZ;
     do {
         /*
@@ -1629 +1613 @@
         if ((snd_cs4281_peekBA0(chip, BA0_ACISV) & (BA0_ACISV_SLV(3) | BA0_ACISV_SLV(4))) == (BA0_ACISV_SLV(3) | BA0_ACISV_SLV(4)))
             goto __ok2;
-        snd_cs4281_delay_long();
-    } while (timeout-- > 0);
+        schedule_timeout_uninterruptible(1);
+    } while (time_after_eq(end_time, jiffies));
 
     if (--retry_count > 0)

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

@@ -49 +49 @@
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;      /* Enable this card */
-static int external_amp[SNDRV_CARDS] = {0};
-static int thinkpad[SNDRV_CARDS] = {1,0,0,0,0,0,0,0};
-static int mmap_valid[SNDRV_CARDS] = {0};
+static int external_amp[SNDRV_CARDS] = {0,0,0,0,0,0,0,0};
+static int thinkpad[SNDRV_CARDS] = {0,0,0,0,0,0,0,0};
+static int mmap_valid[SNDRV_CARDS] = {1,1,1,1,1,1,1,1};
 
 //module_param_array(index, int, NULL, 0444);
@@ -167 +167 @@
         .id_table = snd_cs46xx_ids,
         .probe = snd_card_cs46xx_probe,
-        .remove = snd_card_cs46xx_remove,
+        .remove = __devexit_p(snd_card_cs46xx_remove),
 #ifdef CONFIG_PM
         .suspend = snd_cs46xx_suspend,

GPL/trunk/alsa-kernel/pci/cs46xx/cs46xx_lib.c

@@ -54 +54 @@
 #include <linux/slab.h>
 //#include <linux/gameport.h>
+#include <linux/mutex.h>
+
 
 #include <sound/core.h>
@@ -316 +318 @@
 
         snd_assert(!(offset & 3) && !(len & 3), return -EINVAL);
-        dst = (char*)chip->region.idx[bank+1].remap_addr + offset;
+        dst = chip->region.idx[bank+1].remap_addr + offset;
         len /= sizeof(u32);
 
@@ -322 +324 @@
         while (len-- > 0) {
                 writel(*src++, dst);
-                (char*)dst += sizeof(u32);
+                dst += sizeof(u32);
         }
         return 0;
@@ -910 +912 @@
         snd_assert (sample_rate != 0, return -ENXIO);
 
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
 
         if (_cs46xx_adjust_sample_rate (chip,cpcm,sample_rate)) {
-                up (&chip->spos_mutex);
+                mutex_unlock(&chip->spos_mutex);
                 return -ENXIO;
         }
 
-        snd_assert (cpcm->pcm_channel != NULL);
+        snd_assert (cpcm->pcm_channel != NULL, return -ENXIO);
         if (!cpcm->pcm_channel) {
-                up (&chip->spos_mutex);
+                mutex_unlock(&chip->spos_mutex);
                 return -ENXIO;
         }
@@ -925 +927 @@
 
         if (cs46xx_dsp_pcm_channel_set_period (chip,cpcm->pcm_channel,period_size)) {
-                 up (&chip->spos_mutex);
+                 mutex_unlock(&chip->spos_mutex);
                  return -EINVAL;
          }
@@ -952 +954 @@
                         substream->ops = &snd_cs46xx_playback_iec958_ops;
                 } else {
-                        snd_assert(0);
+                        snd_assert(0, return -ENXIO);
                 }
 #else
@@ -966 +968 @@
                 if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0) {
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
-                        up (&chip->spos_mutex);
+                        mutex_unlock(&chip->spos_mutex);
 #endif
                         return err;
@@ -981 +983 @@
                         substream->ops = &snd_cs46xx_playback_indirect_iec958_ops;
                 } else {
-                        snd_assert(0);
+                        snd_assert(0, return -ENXIO);
                 }
 #else
@@ -990 +992 @@
 
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 #endif
 
@@ -1305 +1307 @@
         struct snd_pcm_runtime *runtime = substream->runtime;
 
-        cpcm = (struct snd_cs46xx_pcm * )kzalloc(sizeof(*cpcm), GFP_KERNEL);
+        cpcm = kzalloc(sizeof(*cpcm), GFP_KERNEL);
         if (cpcm == NULL)
                 return -ENOMEM;
@@ -1320 +1322 @@
         cpcm->substream = substream;
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         cpcm->pcm_channel = NULL; 
         cpcm->pcm_channel_id = pcm_channel_id;
@@ -1329 +1331 @@
                                    &hw_constraints_period_sizes);
 
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 #else
         chip->playback_pcm = cpcm; /* HACK */
@@ -1368 +1370 @@
         snd_printdd("open raw iec958 channel\n");
 
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         cs46xx_iec958_pre_open (chip);
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return _cs46xx_playback_open_channel(substream,DSP_IEC958_CHANNEL);
@@ -1386 +1388 @@
         err = snd_cs46xx_playback_close(substream);
 
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         cs46xx_iec958_post_close (chip);
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return err;
@@ -1429 +1431 @@
 
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         if (cpcm->pcm_channel) {
                 cs46xx_dsp_destroy_pcm_channel(chip,cpcm->pcm_channel);
                 cpcm->pcm_channel = NULL;
         }
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 #else
         chip->playback_pcm = NULL;
@@ -1849 +1851 @@
         switch (kcontrol->private_value) {
         case CS46XX_MIXER_SPDIF_OUTPUT_ELEMENT:
-                down (&chip->spos_mutex);
+                mutex_lock(&chip->spos_mutex);
                 change = (chip->dsp_spos_instance->spdif_status_out & DSP_SPDIF_STATUS_OUTPUT_ENABLED);
                 if (ucontrol->value.integer.value[0] && !change) 
@@ -1857 +1859 @@
 
                 res = (change != (chip->dsp_spos_instance->spdif_status_out & DSP_SPDIF_STATUS_OUTPUT_ENABLED));
-                up (&chip->spos_mutex);
+                mutex_unlock(&chip->spos_mutex);
                 break;
         case CS46XX_MIXER_SPDIF_INPUT_ELEMENT:
@@ -1998 +2000 @@
         struct dsp_spos_instance * ins = chip->dsp_spos_instance;
 
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         ucontrol->value.iec958.status[0] = _wrap_all_bits((ins->spdif_csuv_default >> 24) & 0xff);
         ucontrol->value.iec958.status[1] = _wrap_all_bits((ins->spdif_csuv_default >> 16) & 0xff);
         ucontrol->value.iec958.status[2] = 0;
         ucontrol->value.iec958.status[3] = _wrap_all_bits((ins->spdif_csuv_default) & 0xff);
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return 0;
@@ -2016 +2018 @@
         int change;
 
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         val = ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[0]) << 24) |
                 ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[2]) << 16) |
@@ -2030 +2032 @@
                 cs46xx_poke_via_dsp (chip,SP_SPDOUT_CSUV,val);
 
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return change;
@@ -2051 +2053 @@
         struct dsp_spos_instance * ins = chip->dsp_spos_instance;
 
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         ucontrol->value.iec958.status[0] = _wrap_all_bits((ins->spdif_csuv_stream >> 24) & 0xff);
         ucontrol->value.iec958.status[1] = _wrap_all_bits((ins->spdif_csuv_stream >> 16) & 0xff);
         ucontrol->value.iec958.status[2] = 0;
         ucontrol->value.iec958.status[3] = _wrap_all_bits((ins->spdif_csuv_stream) & 0xff);
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return 0;
@@ -2069 +2071 @@
         int change;
 
-        down (&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         val = ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[0]) << 24) |
                 ((unsigned int)_wrap_all_bits(ucontrol->value.iec958.status[1]) << 16) |
@@ -2083 +2085 @@
                 cs46xx_poke_via_dsp (chip,SP_SPDOUT_CSUV,val);
 
-        up (&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return change;
@@ -2343 +2345 @@
                 snd_cs46xx_ac97_write(ac97,AC97_CSR_ACMODE,0x3);
         } else {
-                snd_assert(0); /* should never happen ... */
+                snd_assert(0, return); /* should never happen ... */
         }
 
@@ -2748 +2750 @@
 #endif /* CONFIG_GAMEPORT */
 
+#ifdef CONFIG_PROC_FS
 /*
  *  proc interface
@@ -2763 +2766 @@
                 size = region->size - pos;
         if (size > 0) {
-                if (copy_to_user_fromio(buf, (char*)region->remap_addr + pos, size))
+                if (copy_to_user_fromio(buf, region->remap_addr + pos, size))
                         return -EFAULT;
         }
@@ -2801 +2804 @@
         return 0;
 }
+#else /* !CONFIG_PROC_FS */
+#define snd_cs46xx_proc_init(card, chip)
+#define snd_cs46xx_proc_done(chip)
+#endif
 
 /*
@@ -3037 +3044 @@
                 if (snd_cs46xx_peekBA0(chip, BA0_ACSTS) & ACSTS_CRDY)
                         goto ok1;
-                msleep(10);
+                //msleep(10);
+                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout((HZ+99)/100);
         }
 
@@ -3086 +3095 @@
                 if ((snd_cs46xx_peekBA0(chip, BA0_ACISV) & (ACISV_ISV3 | ACISV_ISV4)) == (ACISV_ISV3 | ACISV_ISV4))
                         goto ok2;
-                msleep(10);
+                //msleep(10);
+                set_current_state(TASK_UNINTERRUPTIBLE);
+                schedule_timeout((HZ+99)/100);
         }
 
@@ -3661 +3672 @@
         int amp_saved;
 
-        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
         snd_pcm_suspend_all(chip->pcm);
         // chip->ac97_powerdown = snd_cs46xx_codec_read(chip, AC97_POWER_CONTROL);
@@ -3678 +3688 @@
         pci_disable_device(pci);
         pci_save_state(pci);
+        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
         return 0;
 }
@@ -3715 +3726 @@
                 chip->active_ctrl(chip, -1); /* disable CLKRUN */
         chip->amplifier = amp_saved;
-        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+        printk("CS46XX: resume\n");
         return 0;
 }
@@ -3744 +3756 @@
                 return err;
 
-        chip = (struct snd_cs46xx *)kzalloc(sizeof(*chip), GFP_KERNEL);
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
         if (chip == NULL) {
                 pci_disable_device(pci);
@@ -3751 +3763 @@
         spin_lock_init(&chip->reg_lock);
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
-        init_MUTEX(&chip->spos_mutex);
+        mutex_init(&chip->spos_mutex);
 #endif
         chip->card = card;

GPL/trunk/alsa-kernel/pci/cs46xx/cs46xx_lib.h

@@ -64 +64 @@
 
         /*if (bank == 0) printk("snd_cs46xx_poke: %04X - %08X\n",reg >> 2,val); */
-        writel(val, (char*)chip->region.idx[bank+1].remap_addr + offset);
+        writel(val, chip->region.idx[bank+1].remap_addr + offset);
 }
 
@@ -71 +71 @@
         unsigned int bank = reg >> 16;
         unsigned int offset = reg & 0xffff;
-        return readl((char*)chip->region.idx[bank+1].remap_addr + offset);
+        return readl(chip->region.idx[bank+1].remap_addr + offset);
 }
 
 static inline void snd_cs46xx_pokeBA0(struct snd_cs46xx *chip, unsigned long offset, unsigned int val)
 {
-        writel(val, (char*)chip->region.name.ba0.remap_addr + offset);
+        writel(val, chip->region.name.ba0.remap_addr + offset);
 }
 
 static inline unsigned int snd_cs46xx_peekBA0(struct snd_cs46xx *chip, unsigned long offset)
 {
-        return readl((char*)chip->region.name.ba0.remap_addr + offset);
+        return readl(chip->region.name.ba0.remap_addr + offset);
 }
 
@@ -89 +89 @@
 struct dsp_symbol_entry *cs46xx_dsp_lookup_symbol (struct snd_cs46xx * chip, char * symbol_name,
                                                    int symbol_type);
+#ifdef CONFIG_PROC_FS
 int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip);
 int cs46xx_dsp_proc_done (struct snd_cs46xx *chip);
+#else
+#define cs46xx_dsp_proc_init(card, chip)
+#define cs46xx_dsp_proc_done(chip)
+#endif
 int cs46xx_dsp_scb_and_task_init (struct snd_cs46xx *chip);
 int snd_cs46xx_download (struct snd_cs46xx *chip, u32 *src, unsigned long offset,
@@ -107 +112 @@
 struct dsp_scb_descriptor * cs46xx_dsp_create_scb (struct snd_cs46xx *chip, char * name,
                                                    u32 * scb_data, u32 dest);
+#ifdef CONFIG_PROC_FS
 void cs46xx_dsp_proc_free_scb_desc (struct dsp_scb_descriptor * scb);
 void cs46xx_dsp_proc_register_scb_desc (struct snd_cs46xx *chip,
                                         struct dsp_scb_descriptor * scb);
+#else
+#define cs46xx_dsp_proc_free_scb_desc(scb)
+#define cs46xx_dsp_proc_register_scb_desc(chip, scb)
+#endif
 struct dsp_scb_descriptor * cs46xx_dsp_create_timing_master_scb (struct snd_cs46xx *chip);
 struct dsp_scb_descriptor *

GPL/trunk/alsa-kernel/pci/cs46xx/dsp_spos.c

@@ -29 +29 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/mutex.h>
+
 #include <sound/core.h>
 #include <sound/control.h>
@@ -234 +236 @@
         ins->symbol_table.highest_frag_index = 0;
 
-        if (ins->symbol_table.symbols == NULL) {
-                cs46xx_dsp_spos_destroy(chip);
-                return NULL;
+        if (ins->symbol_table.symbols == NULL) {
+            cs46xx_dsp_spos_destroy(chip);
+            goto error;
         }
 
@@ -244 +246 @@
 
         if (ins->code.data == NULL) {
-                cs46xx_dsp_spos_destroy(chip);
-                return NULL;
+            cs46xx_dsp_spos_destroy(chip);
+            goto error;
         }
 
@@ -255 +257 @@
 
         if (ins->modules == NULL) {
-                cs46xx_dsp_spos_destroy(chip);
-                return NULL;
+            cs46xx_dsp_spos_destroy(chip);
+            goto error;
         }
 
@@ -277 +279 @@
          /* byte 3 */   (unsigned int)_wrap_all_bits(  (SNDRV_PCM_DEFAULT_CON_SPDIF >> 24) & 0xff) |
          /* left and right validity bits */ (1 << 13) | (1 << 12);
-
-        return ins;
+        return ins;
+    error:
+        kfree(ins);
+        return NULL;
 }
 
@@ -288 +292 @@
         snd_assert(ins != NULL, return);
 
-        down(&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         for (i = 0; i < ins->nscb; ++i) {
                 if (ins->scbs[i].deleted) continue;
@@ -299 +303 @@
         kfree(ins->modules);
         kfree(ins);
-        up(&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 }
 
@@ -440 +444 @@
 
 
+#ifdef CONFIG_PROC_FS
 static struct dsp_symbol_entry *
 cs46xx_dsp_lookup_symbol_addr (struct snd_cs46xx * chip, u32 address, int symbol_type)
@@ -497 +502 @@
         int i,j;
 
-        down(&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         snd_iprintf(buffer, "MODULES:\n");
         for ( i = 0; i < ins->nmodules; ++i ) {
@@ -510 +515 @@
                 }
         }
-        up(&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 }
 
@@ -521 +526 @@
         void __iomem *dst = chip->region.idx[1].remap_addr + DSP_PARAMETER_BYTE_OFFSET;
 
-        down(&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         snd_iprintf(buffer, "TASK TREES:\n");
         for ( i = 0; i < ins->ntask; ++i) {
@@ -538 +543 @@
 
         snd_iprintf(buffer,"\n");  
-        up(&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 }
 
@@ -548 +553 @@
         int i;
 
-        down(&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         snd_iprintf(buffer, "SCB's:\n");
         for ( i = 0; i < ins->nscb; ++i) {
@@ -571 +576 @@
 
         snd_iprintf(buffer,"\n");
-        up(&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 }
 
@@ -852 +857 @@
         ins->proc_scb_info_entry = entry;
 
-        down(&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         /* register/update SCB's entries on proc */
         for (i = 0; i < ins->nscb; ++i) {
@@ -859 +864 @@
                 cs46xx_dsp_proc_register_scb_desc (chip, (ins->scbs + i));
         }
-        up(&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return 0;
@@ -899 +904 @@
         }
 
-        down(&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         for (i = 0; i < ins->nscb; ++i) {
                 if (ins->scbs[i].deleted) continue;
                 cs46xx_dsp_proc_free_scb_desc ( (ins->scbs + i) );
         }
-        up(&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         if (ins->proc_dsp_dir) {
@@ -913 +918 @@
         return 0;
 }
+#endif /* CONFIG_PROC_FS */
 
 static int debug_tree;
@@ -1360 +1366 @@
         valid_slots = snd_cs46xx_peekBA0(chip, BA0_ACOSV);
 
-        snd_assert (chip->nr_ac97_codecs == 1 || chip->nr_ac97_codecs == 2);
+        snd_assert (chip->nr_ac97_codecs == 1 || chip->nr_ac97_codecs == 2, return -ENXIO);
 
         if (chip->nr_ac97_codecs == 1) {
@@ -1510 +1516 @@
                         /* 8 */ 0, 
                         /* 9 */ FG_TASK_HEADER_ADDR, NULL_SCB_ADDR, 
-                        /* A */ spdifo_task->address,
+                        /* A */ /*spdifo_task->address*/0,
                         SPDIFO_SCB_INST + SPDIFOFIFOPointer,
                         {
@@ -1519 +1525 @@
                         /* E */ 0x0108,0x0001,                                    /* SPDIFOStMoFormat:SPDIFOFIFOBaseAddr; */
                         /* F */ DSP_SPOS_UUUU                                     /* SPDIFOFree; */
-                };
+                };
 
                 /* 0xBB0 */
@@ -1533 +1539 @@
                         /* 8 */ DSP_SPOS_UUUU,  /* TempStatus */
                         /* 9 */ SPDIFO_SCB_INST, NULL_SCB_ADDR,
-                        /* A */ spdifi_task->address,
+                        /* A */ /*spdifi_task->address*/0,
                         SPDIFI_SCB_INST + SPDIFIFIFOPointer,
                         /* NOTE: The SPDIF input task write the sample in mono
@@ -1544 +1550 @@
                         /* E */ 0x01f0,0x0001,
                         /* F */ DSP_SPOS_UUUU /* SPDIN_STATUS monitor */
-                };
+                };
 
                 /* 0xBA0 */
@@ -1558 +1564 @@
                         /* 8 */ DSP_SPOS_UUUU,
                         /* 9 */ SPDIFI_SCB_INST,NULL_SCB_ADDR,
-                        /* A */ s16_async_codec_input_task->address,
+                        /* A */ /*s16_async_codec_input_task->address*/0,
                         HFG_TREE_SCB + AsyncCIOFIFOPointer,
               
@@ -1596 +1602 @@
                            the output buffer of this task */
                         /* F */ 0, /* DSP_SPOS_UUUU */
-                };
+                };
+
+                spdifo_scb.entry_point = spdifo_task->address;
+                spdifi_scb.entry_point = spdifi_task->address;
+                async_codec_input_scb.io_entry_point =
+                    s16_async_codec_input_task->address;
 
                 spdifo_scb_desc = cs46xx_dsp_create_scb(chip,"SPDIFOSCB",(u32 *)&spdifo_scb,SPDIFO_SCB_INST);
@@ -1693 +1704 @@
         snd_assert (ins->spdif_in_src != NULL,return -EINVAL);
 
-        down(&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
 
         if ( ! (ins->spdif_status_out & DSP_SPDIF_STATUS_INPUT_CTRL_ENABLED) ) {
@@ -1737 +1748 @@
         /* monitor state */
         ins->spdif_status_in = 1;
-        up(&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return 0;
@@ -1749 +1760 @@
         snd_assert (ins->spdif_in_src != NULL,return -EINVAL);  
 
-        down(&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
 
         /* Remove the asynchronous receiver SCB */
@@ -1759 +1770 @@
         /* monitor state */
         ins->spdif_status_in = 0;
-        up(&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         /* restore amplifier */
@@ -1775 +1786 @@
         snd_assert (ins->ref_snoop_scb != NULL,return -EINVAL);
 
-        down(&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         ins->pcm_input = cs46xx_add_record_source(chip,ins->ref_snoop_scb,PCMSERIALIN_PCM_SCB_ADDR,
                                                   "PCMSerialInput_Wave");
-        up(&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return 0;
@@ -1789 +1800 @@
         snd_assert (ins->pcm_input != NULL,return -EINVAL);
 
-        down(&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         cs46xx_dsp_remove_scb (chip,ins->pcm_input);
         ins->pcm_input = NULL;
-        up(&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return 0;
@@ -1804 +1815 @@
         snd_assert (ins->codec_in_scb != NULL,return -EINVAL);
 
-        down(&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         ins->adc_input = cs46xx_add_record_source(chip,ins->codec_in_scb,PCMSERIALIN_SCB_ADDR,
                                                   "PCMSerialInput_ADC");
-        up(&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return 0;
@@ -1818 +1829 @@
         snd_assert (ins->adc_input != NULL,return -EINVAL);
 
-        down(&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         cs46xx_dsp_remove_scb (chip,ins->adc_input);
         ins->adc_input = NULL;
-        up(&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return 0;
@@ -1868 +1879 @@
         struct dsp_scb_descriptor * scb; 
 
-        down(&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         
         /* main output */
@@ -1887 +1898 @@
         ins->dac_volume_right = right;
 
-        up(&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return 0;
@@ -1896 +1907 @@
         struct dsp_spos_instance * ins = chip->dsp_spos_instance;
 
-        down(&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
 
         if (ins->asynch_rx_scb != NULL)
@@ -1905 +1916 @@
         ins->spdif_input_volume_right = right;
 
-        up(&chip->spos_mutex);
+        mutex_unlock(&chip->spos_mutex);
 
         return 0;

GPL/trunk/alsa-kernel/pci/cs46xx/dsp_spos_scb_lib.c

@@ -29 +29 @@
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/mutex.h>
+
 #include <sound/core.h>
 #include <sound/control.h>
@@ -65 +67 @@
 }
 
+#ifdef CONFIG_PROC_FS
 static void cs46xx_dsp_proc_scb_info_read (struct snd_info_entry *entry,
                                            struct snd_info_buffer *buffer)
@@ -77 +80 @@
         ins = chip->dsp_spos_instance;
 
-        down(&chip->spos_mutex);
+        mutex_lock(&chip->spos_mutex);
         snd_iprintf(buffer,"%04x %s:\n",scb->address,scb->scb_name);
 
@@ -105 +108 @@
 
         snd_iprintf(buffer,"index [%d] ref_count [%d]\n",scb->index,scb->ref_count);  
-        up(&chip->spos_mutex);
-}
+        mutex_unlock(&chip->spos_mutex);
+}
+#endif
 
 static void _dsp_unlink_scb (struct snd_cs46xx *chip, struct dsp_scb_descriptor * scb)
@@ -221 +225 @@
 
 
+#ifdef CONFIG_PROC_FS
 void cs46xx_dsp_proc_free_scb_desc (struct dsp_scb_descriptor * scb)
 {
@@ -276 +281 @@
         }
 }
+#endif /* CONFIG_PROC_FS */
 
 static struct dsp_scb_descriptor * 
@@ -425 +431 @@
                 0,                      /* COstrmRsConfig */
                 0,                      /* COstrmBufPtr */
-                channel_disp,fifo_addr, /* leftChanBaseIOaddr:rightChanIOdisp */
+                /*channel_disp*/0,/*fifo_addr*/0, /* leftChanBaseIOaddr:rightChanIOdisp */
                 0x0000,0x0080,          /* (!AC97!) COexpVolChangeRate:COscaleShiftCount */
-                0,child_scb_addr        /* COreserved - need child scb to work with rom code */
-        };
-  
-  
+                0,/*child_scb_addr*/0        /* COreserved - need child scb to work with rom code */
+        };
+
+        codec_out_scb.left_chan_base_IO_addr = channel_disp;
+        codec_out_scb.right_chan_IO_disp = fifo_addr;
+        codec_out_scb.last_sub_ptr = child_scb_addr;
+
         scb = cs46xx_dsp_create_generic_scb(chip,codec_name,(u32 *)&codec_out_scb,
                                             dest,"S16_CODECOUTPUTTASK",parent_scb,
@@ -468 +477 @@
 
                 RSCONFIG_SAMPLE_16STEREO + RSCONFIG_MODULO_64,  /* strmRsConfig */
-                sample_buffer_addr << 0x10,       /* strmBufPtr; defined as a dword ptr, used as a byte ptr */
-                channel_disp,fifo_addr,           /* (!AC97!) leftChanBaseINaddr=AC97primary 
+                /*sample_buffer_addr << 0x10*/0,       /* strmBufPtr; defined as a dword ptr, used as a byte ptr */
+                /*channel_disp*/0,/*fifo_addr*/0,           /* (!AC97!) leftChanBaseINaddr=AC97primary
                                                      link input slot 3 :rightChanINdisp=""slot 4 */
                 0x0000,0x0000,                    /* (!AC97!) ????:scaleShiftCount; no shift needed 
@@ -475 +484 @@
                 0x80008000                        /* ??clw cwcgame.scb has 0 */
         };
-  
+
+        codec_input_scb.strm_buf_ptr = sample_buffer_addr << 0x10;
+        codec_input_scb.rightChanINdisp = channel_disp;
+        codec_input_scb.left_chan_base_IN_addr = fifo_addr;
+
         scb = cs46xx_dsp_create_generic_scb(chip,codec_name,(u32 *)&codec_input_scb,
                                             dest,"S16_CODECINPUTTASK",parent_scb,
@@ -546 +559 @@
                 NULL_SCB_ADDR,NULL_SCB_ADDR,
                 /* Pointer to this tasks parameter block & stream function pointer */
-                0,NULL_SCB_ADDR,
+                0,NULL_SCB_ADDR,
+#ifndef TARGET_OS2
                 /* rsConfig register for stream buffer (rsDMA reg. is loaded from basicReq.daw */
                 /*   for incoming streams, or basicReq.saw, for outgoing streams) */
@@ -554 +568 @@
                 ((dest >> 4) << RSCONFIG_STREAM_NUM_SHIFT) + /* stream number = SCBaddr/16 */
                 RSCONFIG_SAMPLE_16STEREO +
-                RSCONFIG_MODULO_32,             /* dest buffer(PCMreaderBuf) is 32 dwords (256 bytes) */
+                RSCONFIG_MODULO_32,             /* dest buffer(PCMreaderBuf) is 32 dwords (256 bytes) */
+#else
+                0,
+#endif
                 /* Stream sample pointer & MAC-unit mode for this stream */
-                (sample_buffer_addr << 0x10),
+                /*(sample_buffer_addr << 0x10)*/0,
                 /* Fractional increment per output sample in the input sample buffer */
                 0, 
@@ -565 +582 @@
                         0xffff,0xffff
                 }
-        };
+        };
+
+        pcm_reader_scb.strm_rs_config = RSCONFIG_DMA_ENABLE +
+            (19 << RSCONFIG_MAX_DMA_SIZE_SHIFT) +
+            ((dest >> 4) << RSCONFIG_STREAM_NUM_SHIFT) +
+            RSCONFIG_SAMPLE_16STEREO +
+            RSCONFIG_MODULO_32;
+        pcm_reader_scb.strm_buf_ptr = sample_buffer_addr << 0x10;
 
         if (ins->null_algorithm == NULL) {
@@ -672 +696 @@
                         /* wont work with any other rate than
                            the native DSP rate */
-                        snd_assert (rate = 48000);
+                        snd_assert (rate == 48000, return NULL);
 
                         scb = cs46xx_dsp_create_generic_scb(chip,scb_name,(u32 *)&src_task_scb,
@@ -1243 +1267 @@
         case DSP_PCM_S71_CHANNEL:
                 /* TODO */
-                snd_assert(0);
+                snd_assert(0, return NULL);
                 break;
         case DSP_IEC958_CHANNEL:
@@ -1259 +1283 @@
                 break;
         default:
-                snd_assert (0);
+                snd_assert (0, return NULL);
                 return NULL;
         }
@@ -1316 +1340 @@
                 }
 
-                sprintf (scb_name,"SrcTask_SCB%d",src_index);
+                snprintf (scb_name,DSP_MAX_SCB_NAME,"SrcTask_SCB%d",src_index);
                 
                 snd_printdd( "dsp_spos: creating SRC \"%s\"\n",scb_name);
@@ -1340 +1364 @@
   
   
-        sprintf (scb_name,"PCMReader_SCB%d",pcm_index);
+        snprintf (scb_name,DSP_MAX_SCB_NAME,"PCMReader_SCB%d",pcm_index);
 
         snd_printdd( "dsp_spos: creating PCM \"%s\" (%d)\n",scb_name,

GPL/trunk/alsa-kernel/pci/cs46xx/makefile.os2

@@ -3 +3 @@
 
 CDEFINES = -D__KERNEL__ -DMODULE -dTARGET_OS2 -dALSA_BUILD -D__ISAPNP__ -DCONFIG_ISAPNP -D__i386_ 
-#-dCONFIG_SND_CS46XX_NEW_DSP
+#-DCONFIG_SND_CS46XX_NEW_DSP
 
 32BIT=1
@@ -14 +14 @@
 #
 #===================================================================
-FILE1    = cs46xx.obj cs46xx_lib.obj
-##dsp_spos.obj dsp_spos_scb_lib.obj
-FILE2    = 
+FILE1    = cs46xx.obj cs46xx_lib.obj 
+#FILE2    = dsp_spos.obj dsp_spos_scb_lib.obj
 FILE3    = 
 FILE4    = 

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

@@ -1817 +1817 @@
     offset &= 0xfffe;
     offset += chip->measure_count * (CLOCK_MEASURE_BUFSIZE/2);
-
+#if 0 /* vladest patch baseg on r.ihle suggestion */
     t = stop_time.tv_sec - start_time.tv_sec;
     t *= 1000000;
@@ -1824 +1824 @@
     else
         t += stop_time.tv_usec - start_time.tv_usec;
+#else
+    t = 50000;
+#endif
     if (t == 0) {
         snd_printk("?? calculation error..\n");

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

@@ -530 +530 @@
         bus->caddr_tbl[codec_addr] = codec;
 
-        codec->vendor_id = snd_hda_param_read(codec, AC_NODE_ROOT, AC_PAR_VENDOR_ID);
+        codec->vendor_id = snd_hda_param_read(codec, AC_NODE_ROOT, AC_PAR_VENDOR_ID);
+        if (codec->vendor_id == -1)
+            /* read again, hopefully the access method was corrected
+             * in the last read...
+             */
+            codec->vendor_id = snd_hda_param_read(codec, AC_NODE_ROOT,
+                                                  AC_PAR_VENDOR_ID);
         codec->subsystem_id = snd_hda_param_read(codec, AC_NODE_ROOT, AC_PAR_SUBSYSTEM_ID);
         codec->revision_id = snd_hda_param_read(codec, AC_NODE_ROOT, AC_PAR_REV_ID);
@@ -723 +729 @@
  * read AMP value.  The volume is between 0 to 0x7f, 0x80 = mute bit.
  */
-static int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch, int direction, int index)
+int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch,
+                           int direction, int index)
 {
         struct hda_amp_info *info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, index));
@@ -734 +741 @@
  * update the AMP value, mask = bit mask to set, val = the value
  */
-static int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch, int direction, int idx, int mask, int val)
+int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch,
+                             int direction, int idx, int mask, int val)
 {
         struct hda_amp_info *info = get_alloc_amp_hash(codec, HDA_HASH_KEY(nid, direction, idx));
@@ -863 +871 @@
                 change |= snd_hda_codec_amp_update(codec, nid, 1, dir, idx,
                                                    0x80, *valp ? 0 : 0x80);
-        
+
         return change;
 }
@@ -1890 +1898 @@
         if (mout->hp_nid)
                 /* headphone out will just decode front left/right (stereo) */
-                snd_hda_codec_setup_stream(codec, mout->hp_nid, stream_tag, 0, format);
+            snd_hda_codec_setup_stream(codec, mout->hp_nid, stream_tag, 0, format);
+        /* extra outputs copied from front */
+        for (i = 0; i < ARRAY_SIZE(mout->extra_out_nid); i++)
+            if (mout->extra_out_nid[i])
+                snd_hda_codec_setup_stream(codec,
+                                           mout->extra_out_nid[i],
+                                           stream_tag, 0, format);
+
         /* surrounds */
         for (i = 1; i < mout->num_dacs; i++) {
@@ -1914 +1929 @@
                 snd_hda_codec_setup_stream(codec, nids[i], 0, 0, 0);
         if (mout->hp_nid)
-                snd_hda_codec_setup_stream(codec, mout->hp_nid, 0, 0, 0);
+            snd_hda_codec_setup_stream(codec, mout->hp_nid, 0, 0, 0);
+        for (i = 0; i < ARRAY_SIZE(mout->extra_out_nid); i++)
+            if (mout->extra_out_nid[i])
+                snd_hda_codec_setup_stream(codec,
+                                           mout->extra_out_nid[i],
+                                           0, 0, 0);
         down(&codec->spdif_mutex);
         if (mout->dig_out_nid && mout->dig_out_used == HDA_DIG_ANALOG_DUP) {
@@ -1936 +1956 @@
 }
 
-/* parse all pin widgets and store the useful pin nids to cfg */
+/*
+ * Parse all pin widgets and store the useful pin nids to cfg
+ *
+ * The number of line-outs or any primary output is stored in line_outs,
+ * and the corresponding output pins are assigned to line_out_pins[],
+ * in the order of front, rear, CLFE, side, ...
+ *
+ * If more extra outputs (speaker and headphone) are found, the pins are
+ * assisnged to hp_pin and speaker_pins[], respectively.  If no line-out jack
+ * is detected, one of speaker of HP pins is assigned as the primary
+ * output, i.e. to line_out_pins[0].  So, line_outs is always positive
+ * if any analog output exists.
+ *
+ * The analog input pins are assigned to input_pins array.
+ * The digital input/output pins are assigned to dig_in_pin and dig_out_pin,
+ * respectively.
+ */
 int snd_hda_parse_pin_def_config(struct hda_codec *codec, struct auto_pin_cfg *cfg,
                                  hda_nid_t *ignore_nids)
 {
         hda_nid_t nid, nid_start;
-        int i, j, nodes;
-        short seq, sequences[4], assoc_line_out;
+        int i, j, nodes;
+        short seq, assoc_line_out, sequences[ARRAY_SIZE(cfg->line_out_pins)];
 
         memset(cfg, 0, sizeof(*cfg));
@@ -1983 +2019 @@
                         cfg->line_outs++;
                         break;
-                case AC_JACK_SPEAKER:
-                        cfg->speaker_pin = nid;
-                        break;
+                case AC_JACK_SPEAKER:
+                    if (cfg->speaker_outs >= ARRAY_SIZE(cfg->speaker_pins))
+                        continue;
+                    cfg->speaker_pins[cfg->speaker_outs] = nid;
+                    cfg->speaker_outs++;
+                    break;
                 case AC_JACK_HP_OUT:
                         cfg->hp_pin = nid;
@@ -2048 +2087 @@
                 break;
         }
+        /*
+         * debug prints of the parsed results
+         */
+        snd_printd("autoconfig: line_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",
+                   cfg->line_outs, cfg->line_out_pins[0], cfg->line_out_pins[1],
+                   cfg->line_out_pins[2], cfg->line_out_pins[3],
+                   cfg->line_out_pins[4]);
+        snd_printd("   speaker_outs=%d (0x%x/0x%x/0x%x/0x%x/0x%x)\n",
+                   cfg->speaker_outs, cfg->speaker_pins[0],
+                   cfg->speaker_pins[1], cfg->speaker_pins[2],
+                   cfg->speaker_pins[3], cfg->speaker_pins[4]);
+        snd_printd("   hp=0x%x, dig_out=0x%x, din_in=0x%x\n",
+                   cfg->hp_pin, cfg->dig_out_pin, cfg->dig_in_pin);
+        snd_printd("   inputs: mic=0x%x, fmic=0x%x, line=0x%x, fline=0x%x,"
+                   " cd=0x%x, aux=0x%x\n",
+                   cfg->input_pins[AUTO_PIN_MIC],
+                   cfg->input_pins[AUTO_PIN_FRONT_MIC],
+                   cfg->input_pins[AUTO_PIN_LINE],
+                   cfg->input_pins[AUTO_PIN_FRONT_LINE],
+                   cfg->input_pins[AUTO_PIN_CD],
+                   cfg->input_pins[AUTO_PIN_AUX]);
+
+        /*
+         * FIX-UP: if no line-outs are detected, try to use speaker or HP pin
+         * as a primary output
+         */
+        if (! cfg->line_outs) {
+            if (cfg->speaker_outs) {
+                cfg->line_outs = cfg->speaker_outs;
+                memcpy(cfg->line_out_pins, cfg->speaker_pins,
+                       sizeof(cfg->speaker_pins));
+                cfg->speaker_outs = 0;
+                memset(cfg->speaker_pins, 0, sizeof(cfg->speaker_pins));
+            } else if (cfg->hp_pin) {
+                cfg->line_outs = 1;
+                cfg->line_out_pins[0] = cfg->hp_pin;
+                cfg->hp_pin = 0;
+            }
+        }
 
         return 0;

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

@@ -48 +48 @@
 /* patch-specific record */
 struct hda_gspec {
-        struct hda_gnode *dac_node;     /* DAC node */
-        struct hda_gnode *out_pin_node; /* Output pin (Line-Out) node */
-        struct hda_gnode *pcm_vol_node; /* Node for PCM volume */
-        unsigned int pcm_vol_index;     /* connection of PCM volume */
+    struct hda_gnode *dac_node[2];  /* DAC node */
+    struct hda_gnode *out_pin_node[2];      /* Output pin (Line-Out) node */
+    struct hda_gnode *pcm_vol_node[2];      /* Node for PCM volume */
+    unsigned int pcm_vol_index[2];  /* connection of PCM volume */
 
         struct hda_gnode *adc_node;     /* ADC node */
@@ -70 +70 @@
  * retrieve the default device type from the default config value
  */
-#define defcfg_type(node) (((node)->def_cfg & AC_DEFCFG_DEVICE) >> AC_DEFCFG_DEVICE_SHIFT)
-#define defcfg_location(node) (((node)->def_cfg & AC_DEFCFG_LOCATION) >> AC_DEFCFG_LOCATION_SHIFT)
-
+#define defcfg_type(node) (((node)->def_cfg & AC_DEFCFG_DEVICE) >> \
+    AC_DEFCFG_DEVICE_SHIFT)
+#define defcfg_location(node) (((node)->def_cfg & AC_DEFCFG_LOCATION) >> \
+    AC_DEFCFG_LOCATION_SHIFT)
+#define defcfg_port_conn(node) (((node)->def_cfg & AC_DEFCFG_PORT_CONN) >> \
+    AC_DEFCFG_PORT_CONN_SHIFT)
 /*
  * destructor
@@ -262 +265 @@
  */
 static int parse_output_path(struct hda_codec *codec, struct hda_gspec *spec,
-                             struct hda_gnode *node)
+                             struct hda_gnode *node, int dac_idx)
 {
         int i, err;
@@ -276 +279 @@
                         return 0;
                 }
-                snd_printdd("AUD_OUT found %x\n", node->nid);
-                if (spec->dac_node) {
-                        /* already DAC node is assigned, just unmute & connect */
-                        return node == spec->dac_node;
-                }
-                spec->dac_node = node;
-                if (node->wid_caps & AC_WCAP_OUT_AMP) {
-                        spec->pcm_vol_node = node;
-                        spec->pcm_vol_index = 0;
+                snd_printdd("AUD_OUT found %x\n", node->nid);
+                if (spec->dac_node[dac_idx]) {
+                    /* already DAC node is assigned, just unmute & connect */
+                    return node == spec->dac_node[dac_idx];
+                }
+                spec->dac_node[dac_idx] = node;
+                if (node->wid_caps & AC_WCAP_OUT_AMP) {
+                    spec->pcm_vol_node[dac_idx] = node;
+                    spec->pcm_vol_index[dac_idx] = 0;
                 }
                 return 1; /* found */
@@ -292 +295 @@
                 child = hda_get_node(spec, node->conn_list[i]);
                 if (! child)
-                        continue;
-                err = parse_output_path(codec, spec, child);
+                    continue;
+                err = parse_output_path(codec, spec, child, dac_idx);
                 if (err < 0)
                         return err;
@@ -303 +306 @@
                                 select_input_connection(codec, node, i);
                         unmute_input(codec, node, i);
-                        unmute_output(codec, node);
-                        if (! spec->pcm_vol_node) {
-                                if (node->wid_caps & AC_WCAP_IN_AMP) {
-                                        spec->pcm_vol_node = node;
-                                        spec->pcm_vol_index = i;
-                                } else if (node->wid_caps & AC_WCAP_OUT_AMP) {
-                                        spec->pcm_vol_node = node;
-                                        spec->pcm_vol_index = 0;
-                                }
+                        unmute_output(codec, node);
+                        if (! spec->pcm_vol_node[dac_idx]) {
+                            if (node->wid_caps & AC_WCAP_IN_AMP) {
+                                spec->pcm_vol_node[dac_idx] = node;
+                                spec->pcm_vol_index[dac_idx] = i;
+                            } else if (node->wid_caps & AC_WCAP_OUT_AMP) {
+                                spec->pcm_vol_node[dac_idx] = node;
+                                spec->pcm_vol_index[dac_idx] = 0;
+                            }
                         }
                         return 1;
@@ -339 +342 @@
                 /* output capable? */
                 if (! (node->pin_caps & AC_PINCAP_OUT))
-                        continue;
+                    continue;
+                if (defcfg_port_conn(node) == AC_JACK_PORT_NONE)
+                    continue; /* unconnected */
                 if (jack_type >= 0) {
                         if (jack_type != defcfg_type(node))
@@ -350 +355 @@
                                 continue;
                 }
-                clear_check_flags(spec);
-                err = parse_output_path(codec, spec, node);
+                clear_check_flags(spec);
+                err = parse_output_path(codec, spec, node, 0);
                 if (err < 0)
-                        return NULL;
-                else if (err > 0) {
+                    return NULL;
+                if (! err && spec->out_pin_node[0]) {
+                    err = parse_output_path(codec, spec, node, 1);
+                    if (err < 0)
+                        return NULL;
+                }
+                if (err > 0) {
                         /* unmute the PIN output */
                         unmute_output(codec, node);
@@ -381 +391 @@
         /* first, look for the line-out pin */
         node = parse_output_jack(codec, spec, AC_JACK_LINE_OUT);
-        if (node) /* found, remember the PIN node */
-                spec->out_pin_node = node;
+        if (node) /* found, remember the PIN node */
+            spec->out_pin_node[0] = node;
+        else {
+            /* if no line-out is found, try speaker out */
+            node = parse_output_jack(codec, spec, AC_JACK_SPEAKER);
+            if (node)
+                spec->out_pin_node[0] = node;
+        }
         /* look for the HP-out pin */
         node = parse_output_jack(codec, spec, AC_JACK_HP_OUT);
-        if (node) {
-                if (! spec->out_pin_node)
-                        spec->out_pin_node = node;
-        }
-
-        if (! spec->out_pin_node) {
+        if (node) {
+            if (! spec->out_pin_node[0])
+                spec->out_pin_node[0] = node;
+            else
+                spec->out_pin_node[1] = node;
+        }
+
+        if (! spec->out_pin_node[0]) {
                 /* no line-out or HP pins found,
                  * then choose for the first output pin
-                 */
-                spec->out_pin_node = parse_output_jack(codec, spec, -1);
-                if (! spec->out_pin_node)
-                        snd_printd("hda_generic: no proper output path found\n");
+                 */
+            spec->out_pin_node[0] = parse_output_jack(codec, spec, -1);
+            if (! spec->out_pin_node[0])
+                snd_printd("hda_generic: no proper output path found\n");
         }
 
@@ -506 +524 @@
                 return 0;
 
-        if (node->wid_caps & AC_WCAP_DIGITAL)
+        if (defcfg_port_conn(node) == AC_JACK_PORT_NONE)
+            return 0; /* unconnected */
+
+        if (node->wid_caps & AC_WCAP_DIGITAL)
                 return 0; /* skip SPDIF */
 
@@ -549 +570 @@
         // awk added - fixed no recording due to muted widget
         unmute_input(codec, adc_node, 0);
-        
+
         /*
          * check each connection of the ADC
@@ -732 +753 @@
 {
         struct hda_gspec *spec = codec->spec;
-        int err;
-
-        err = create_mixer(codec, spec->pcm_vol_node, spec->pcm_vol_index,
-                           "PCM", "Playback");
-        if (err < 0)
-                return err;
+        static const char *types[2] = { "Master", "Headphone" };
+        int i, err;
+
+        for (i = 0; i < 2 && spec->pcm_vol_node[i]; i++) {
+            err = create_mixer(codec, spec->pcm_vol_node[i],
+                               spec->pcm_vol_index[i],
+                               types[i], "Playback");
+            if (err < 0)
+                return err;
+        }
         return 0;
 }
@@ -834 +859 @@
         const char *type;
 
-        if (! spec->out_pin_node)
+        if (! spec->out_pin_node[0])
                 return 0;
 
@@ -848 +873 @@
                         if (check_existing_control(codec, type, "Playback"))
                                 continue;
-                        clear_check_flags(spec);
-                        err = parse_loopback_path(codec, spec, spec->out_pin_node,
+                        clear_check_flags(spec);
+                        err = parse_loopback_path(codec, spec,
+                                                  spec->out_pin_node[0],
                                                   node, type);
                         if (err < 0)
@@ -884 +910 @@
 };
 
+static int generic_pcm2_prepare(struct hda_pcm_stream *hinfo,
+                                struct hda_codec *codec,
+                                unsigned int stream_tag,
+                                unsigned int format,
+                                struct snd_pcm_substream *substream)
+{
+    struct hda_gspec *spec = codec->spec;
+
+    snd_hda_codec_setup_stream(codec, hinfo->nid, stream_tag, 0, format);
+    snd_hda_codec_setup_stream(codec, spec->dac_node[1]->nid,
+                               stream_tag, 0, format);
+    return 0;
+}
+
+static int generic_pcm2_cleanup(struct hda_pcm_stream *hinfo,
+                                struct hda_codec *codec,
+                                struct snd_pcm_substream *substream)
+{
+    struct hda_gspec *spec = codec->spec;
+
+    snd_hda_codec_setup_stream(codec, hinfo->nid, 0, 0, 0);
+    snd_hda_codec_setup_stream(codec, spec->dac_node[1]->nid, 0, 0, 0);
+    return 0;
+}
+
 static int build_generic_pcms(struct hda_codec *codec)
 {
@@ -889 +940 @@
         struct hda_pcm *info = &spec->pcm_rec;
 
-        if (! spec->dac_node && ! spec->adc_node) {
+        if (! spec->dac_node[0] && ! spec->adc_node) {
                 snd_printd("hda_generic: no PCM found\n");
                 return 0;
@@ -897 +948 @@
         codec->pcm_info = info;
 
-        info->name = "HDA Generic";
-        if (spec->dac_node) {
-                info->stream[0] = generic_pcm_playback;
-                info->stream[0].nid = spec->dac_node->nid;
+        info->name = "HDA Generic";
+        if (spec->dac_node[0]) {
+            info->stream[0] = generic_pcm_playback;
+            info->stream[0].nid = spec->dac_node[0]->nid;
+            if (spec->dac_node[1]) {
+                info->stream[0].ops.prepare = generic_pcm2_prepare;
+                info->stream[0].ops.cleanup = generic_pcm2_cleanup;
+            }
         }
         if (spec->adc_node) {

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

@@ -31 +31 @@
  *
  *  2004.12.01  Major rewrite by tiwai, merged the work of pshou
- * 
+ *
  */
 
@@ -104 +104 @@
 #define ICH6_REG_INTSTS                 0x24
 #define ICH6_REG_WALCLK                 0x30
-#define ICH6_REG_SYNC                   0x34    
+#define ICH6_REG_SYNC                   0x34
 #define ICH6_REG_CORBLBASE              0x40
 #define ICH6_REG_CORBUBASE              0x44
@@ -250 +250 @@
         unsigned int frags;             /* number for period in the play buffer */
         unsigned int fifo_size;         /* FIFO size */
-        unsigned int last_pos;          /* last updated period position */
 
         void __iomem *sd_addr;          /* stream descriptor pointer */
@@ -260 +259 @@
         unsigned int format_val;        /* format value to be set in the controller and the codec */
         unsigned char stream_tag;       /* assigned stream */
-        unsigned char index;            /* stream index */
+        unsigned char index;            /* stream index */
+        /* for sanity check of position buffer */
+        unsigned int period_intr;
 
         unsigned int opened: 1;
         unsigned int running: 1;
-        unsigned int period_updating: 1;
 };
 
@@ -446 +446 @@
 
 /* send a command */
-static int azx_send_cmd(struct hda_codec *codec, hda_nid_t nid, int direct,
+static int azx_corb_send_cmd(struct hda_codec *codec, hda_nid_t nid, int direct,
                         unsigned int verb, unsigned int para)
 {
@@ -485 +485 @@
                 return;
         chip->rirb.wp = wp;
-                
+
         while (chip->rirb.rp != wp) {
                 chip->rirb.rp++;
@@ -503 +503 @@
 
 /* receive a response */
-static unsigned int azx_get_response(struct hda_codec *codec)
+static unsigned int azx_rirb_get_response(struct hda_codec *codec)
 {
         struct azx *chip = codec->bus->private_data;
@@ -509 +509 @@
 
         while (chip->rirb.cmds) {
-                if (! --timeout) {
-                        if (printk_ratelimit())
-                                snd_printk(KERN_ERR
-                                        "azx_get_response timeout\n");
-                        chip->rirb.rp = azx_readb(chip, RIRBWP);
-                        chip->rirb.cmds = 0;
-                        return -1;
-                }
-                msleep(1);
+            if (! --timeout) {
+                snd_printk(KERN_ERR
+                           "hda_intel: azx_get_response timeout, "
+                           "switching to single_cmd mode...\n");
+                chip->rirb.rp = azx_readb(chip, RIRBWP);
+                chip->rirb.cmds = 0;
+                /* switch to single_cmd mode */
+                chip->single_cmd = 1;
+                azx_free_cmd_io(chip);
+                return -1;
+            }
+            msleep(1);
         }
         return chip->rirb.res; /* the last value */
@@ -578 +581 @@
 }
 
+/*
+ * The below are the main callbacks from hda_codec.
+ *
+ * They are just the skeleton to call sub-callbacks according to the
+ * current setting of chip->single_cmd.
+ */
+
+/* send a command */
+static int azx_send_cmd(struct hda_codec *codec, hda_nid_t nid,
+                        int direct, unsigned int verb,
+                        unsigned int para)
+{
+    struct azx *chip = codec->bus->private_data;
+    if (chip->single_cmd)
+        return azx_single_send_cmd(codec, nid, direct, verb, para);
+    else
+        return azx_corb_send_cmd(codec, nid, direct, verb, para);
+}
+
+/* get a response */
+static unsigned int azx_get_response(struct hda_codec *codec)
+{
+    struct azx *chip = codec->bus->private_data;
+    if (chip->single_cmd)
+        return azx_single_get_response(codec);
+    else
+        return azx_rirb_get_response(codec);
+}
+
+
 /* reset codec link */
 static int azx_reset(struct azx *chip)
@@ -626 +659 @@
 /*
  * Lowlevel interface
- */  
+ */
 
 /* enable interrupts */
@@ -733 +766 @@
         case AZX_DRIVER_ATI:
                 /* For ATI SB450 azalia HD audio, we need to enable snoop */
-                pci_read_config_byte(chip->pci, ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR, 
+                pci_read_config_byte(chip->pci, ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR,
                                      &reg);
-                pci_write_config_byte(chip->pci, ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR, 
+                pci_write_config_byte(chip->pci, ATI_SB450_HDAUDIO_MISC_CNTR2_ADDR,
                                       (reg & 0xf8) | ATI_SB450_HDAUDIO_ENABLE_SNOOP);
                 break;
@@ -765 +798 @@
                 return IRQ_NONE;
         }
-        
+
         for (i = 0; i < chip->num_streams; i++) {
                 azx_dev = &chip->azx_dev[i];
                 if (status & azx_dev->sd_int_sta_mask) {
                         azx_sd_writeb(azx_dev, SD_STS, SD_INT_MASK);
-                        if (azx_dev->substream && azx_dev->running) {
-                                azx_dev->period_updating = 1;
+                        if (azx_dev->substream && azx_dev->running) {
+                            azx_dev->period_intr++;
                                 spin_unlock(&chip->reg_lock);
                                 snd_pcm_period_elapsed(azx_dev->substream);
                                 spin_lock(&chip->reg_lock);
-                                azx_dev->period_updating = 0;
                         }
                 }
@@ -794 +826 @@
 #endif
         spin_unlock(&chip->reg_lock);
-        
+
         return IRQ_HANDLED;
 }
@@ -899 +931 @@
         bus_temp.private_data = chip;
         bus_temp.modelname = model;
-        bus_temp.pci = chip->pci;
-        if (chip->single_cmd) {
-                bus_temp.ops.command = azx_single_send_cmd;
-                bus_temp.ops.get_response = azx_single_get_response;
-        } else {
-                bus_temp.ops.command = azx_send_cmd;
-                bus_temp.ops.get_response = azx_get_response;
-        }
+        bus_temp.pci = chip->pci;
+        bus_temp.ops.command = azx_send_cmd;
+        bus_temp.ops.get_response = azx_get_response;
 
         if ((err = snd_hda_bus_new(chip->card, &bus_temp, &chip->bus)) < 0)
@@ -1091 +1118 @@
         else
                 azx_dev->fifo_size = 0;
-        azx_dev->last_pos = 0;
 
         return hinfo->ops.prepare(hinfo, apcm->codec, azx_dev->stream_tag,
@@ -1139 +1165 @@
         unsigned int pos;
 
-        if (chip->position_fix == POS_FIX_POSBUF) {
+        if (chip->position_fix == POS_FIX_POSBUF ||
+            chip->position_fix == POS_FIX_AUTO) {
                 /* use the position buffer */
-                pos = *azx_dev->posbuf;
-        } else {
+            pos = *azx_dev->posbuf;
+            if (chip->position_fix == POS_FIX_AUTO &&
+                azx_dev->period_intr == 1 && ! pos) {
+                printk(KERN_WARNING
+                       "hda-intel: Invalid position buffer, "
+                       "using LPIB read method instead.\n");
+                chip->position_fix = POS_FIX_NONE;
+                goto read_lpib;
+            }
+        } else {
+        read_lpib:
                 /* read LPIB */
                 pos = azx_sd_readl(azx_dev, SD_LPIB);
@@ -1307 +1343 @@
         for (i = 0; i < chip->pcm_devs; i++)
                 snd_pcm_suspend_all(chip->pcm[i]);
-        snd_hda_suspend(chip->bus, state);
-        if (! chip->single_cmd)
-                azx_free_cmd_io(chip);
+        snd_hda_suspend(chip->bus, state);
+        azx_free_cmd_io(chip);
         pci_disable_device(pci);
         pci_save_state(pci);
@@ -1346 +1381 @@
                 azx_int_clear(chip);
 
-                /* disable CORB/RIRB */
-                if (! chip->single_cmd)
-                        azx_free_cmd_io(chip);
+                /* disable CORB/RIRB */
+                azx_free_cmd_io(chip);
 
                 /* disable position buffer */
@@ -1396 +1430 @@
 
         *rchip = NULL;
-        
+
         if ((err = pci_enable_device(pci)) < 0)
                 return err;
 
         chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-        
+
         if (NULL == chip) {
                 snd_printk(KERN_ERR SFX "cannot allocate chip\n");
@@ -1415 +1449 @@
         chip->driver_type = driver_type;
 
-        chip->position_fix = position_fix ? position_fix : POS_FIX_POSBUF;
+        chip->position_fix = position_fix;
         chip->single_cmd = single_cmd;
 

GPL/trunk/alsa-kernel/pci/hda/hda_local.h

@@ -67 +67 @@
 int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
 int snd_hda_mixer_amp_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);
+/* lowlevel accessor with caching; use carefully */
+int snd_hda_codec_amp_read(struct hda_codec *codec, hda_nid_t nid, int ch,
+                           int direction, int index);
+int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid, int ch,
+                             int direction, int idx, int mask, int val);
 
 /* mono switch binding multiple inputs */
@@ -130 +135 @@
         int num_dacs;           /* # of DACs, must be more than 1 */
         hda_nid_t *dac_nids;    /* DAC list */
-        hda_nid_t hp_nid;       /* optional DAC for HP, 0 when not exists */
+        hda_nid_t hp_nid;       /* optional DAC for HP, 0 when not exists */
+        hda_nid_t extra_out_nid[3];     /* optional DACs, 0 when not exists */
         hda_nid_t dig_out_nid;  /* digital out audio widget */
         int max_channels;       /* currently supported analog channels */
@@ -216 +222 @@
 struct auto_pin_cfg {
         int line_outs;
-        hda_nid_t line_out_pins[5]; /* sorted in the order of Front/Surr/CLFE/Side */
-        hda_nid_t speaker_pin;
+        hda_nid_t line_out_pins[5]; /* sorted in the order of Front/Surr/CLFE/Side */
+        int speaker_outs;
+        hda_nid_t speaker_pins[5];
         hda_nid_t hp_pin;
         hda_nid_t input_pins[AUTO_PIN_LAST];

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

@@ -132 +132 @@
                 if (err < 0)
                         return err;
-        } 
+        }
         if (spec->dig_in_nid) {
                 err = snd_hda_create_spdif_in_ctls(codec, spec->dig_in_nid);
@@ -309 +309 @@
         int i;
 
-        ad198x_init(codec);
+        codec->patch_ops.init(codec);
         for (i = 0; i < spec->num_mixers; i++)
                 snd_hda_resume_ctls(codec, spec->mixers[i]);
@@ -332 +332 @@
 
 /*
+ * EAPD control
+ * the private value = nid | (invert << 8)
+ */
+static int ad198x_eapd_info(struct snd_kcontrol *kcontrol,
+                            struct snd_ctl_elem_info *uinfo)
+{
+    uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+    uinfo->count = 1;
+    uinfo->value.integer.min = 0;
+    uinfo->value.integer.max = 1;
+    return 0;
+}
+
+static int ad198x_eapd_get(struct snd_kcontrol *kcontrol,
+                           struct snd_ctl_elem_value *ucontrol)
+{
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    struct ad198x_spec *spec = codec->spec;
+    int invert = (kcontrol->private_value >> 8) & 1;
+    if (invert)
+        ucontrol->value.integer.value[0] = ! spec->cur_eapd;
+    else
+        ucontrol->value.integer.value[0] = spec->cur_eapd;
+    return 0;
+}
+
+static int ad198x_eapd_put(struct snd_kcontrol *kcontrol,
+                           struct snd_ctl_elem_value *ucontrol)
+{
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    struct ad198x_spec *spec = codec->spec;
+    int invert = (kcontrol->private_value >> 8) & 1;
+    hda_nid_t nid = kcontrol->private_value & 0xff;
+    unsigned int eapd;
+    eapd = ucontrol->value.integer.value[0];
+    if (invert)
+        eapd = !eapd;
+    if (eapd == spec->cur_eapd && ! codec->in_resume)
+        return 0;
+    spec->cur_eapd = eapd;
+    snd_hda_codec_write(codec, nid,
+                        0, AC_VERB_SET_EAPD_BTLENABLE,
+                        eapd ? 0x02 : 0x00);
+    return 1;
+}
+
+static int ad198x_ch_mode_info(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_info *uinfo);
+static int ad198x_ch_mode_get(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol);
+static int ad198x_ch_mode_put(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol);
+
+/*
  * AD1986A specific
  */
@@ -345 +399 @@
 };
 static hda_nid_t ad1986a_adc_nids[1] = { AD1986A_ADC };
+static hda_nid_t ad1986a_capsrc_nids[1] = { 0x12 };
 
 static struct hda_input_mux ad1986a_capture_source = {
@@ -476 +531 @@
         HDA_CODEC_MUTE("Stereo Downmix Switch", 0x09, 0x0, HDA_OUTPUT),
         {0} /* end */
+};
+
+/* additional mixers for 3stack mode */
+static struct snd_kcontrol_new ad1986a_3st_mixers[] = {
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Channel Mode",
+        .info = ad198x_ch_mode_info,
+        .get = ad198x_ch_mode_get,
+        .put = ad198x_ch_mode_put,
+    },
+    {0} /* end */
+};
+
+/* laptop model - 2ch only */
+static hda_nid_t ad1986a_laptop_dac_nids[1] = { AD1986A_FRONT_DAC };
+
+static struct snd_kcontrol_new ad1986a_laptop_mixers[] = {
+    HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("Master Playback Volume", 0x1b, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Master Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
+    /* HDA_CODEC_VOLUME("Headphone Playback Volume", 0x1a, 0x0, HDA_OUTPUT),
+     HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x0, HDA_OUTPUT), */
+    HDA_CODEC_VOLUME("CD Playback Volume", 0x15, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("CD Playback Switch", 0x15, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("Line Playback Volume", 0x17, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Line Playback Switch", 0x17, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("Aux Playback Volume", 0x16, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Aux Playback Switch", 0x16, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),
+    /* HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x18, 0x0, HDA_OUTPUT),
+     HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x18, 0x0, HDA_OUTPUT),
+     HDA_CODEC_VOLUME("Mono Playback Volume", 0x1e, 0x0, HDA_OUTPUT),
+     HDA_CODEC_MUTE("Mono Playback Switch", 0x1e, 0x0, HDA_OUTPUT), */
+    HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Capture Source",
+        .info = ad198x_mux_enum_info,
+        .get = ad198x_mux_enum_get,
+        .put = ad198x_mux_enum_put,
+    },
+    {0} /* end */
+};
+
+/* laptop-eapd model - 2ch only */
+
+/* master controls both pins 0x1a and 0x1b */
+static int ad1986a_laptop_master_vol_put(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    long *valp = ucontrol->value.integer.value;
+    int change;
+
+    change = snd_hda_codec_amp_update(codec, 0x1a, 0, HDA_OUTPUT, 0,
+                                      0x7f, valp[0] & 0x7f);
+    change |= snd_hda_codec_amp_update(codec, 0x1a, 1, HDA_OUTPUT, 0,
+                                       0x7f, valp[1] & 0x7f);
+    snd_hda_codec_amp_update(codec, 0x1b, 0, HDA_OUTPUT, 0,
+                             0x7f, valp[0] & 0x7f);
+    snd_hda_codec_amp_update(codec, 0x1b, 1, HDA_OUTPUT, 0,
+                             0x7f, valp[1] & 0x7f);
+    return change;
+}
+
+static int ad1986a_laptop_master_sw_put(struct snd_kcontrol *kcontrol,
+                                        struct snd_ctl_elem_value *ucontrol)
+{
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    long *valp = ucontrol->value.integer.value;
+    int change;
+
+    change = snd_hda_codec_amp_update(codec, 0x1a, 0, HDA_OUTPUT, 0,
+                                      0x80, valp[0] ? 0 : 0x80);
+    change |= snd_hda_codec_amp_update(codec, 0x1a, 1, HDA_OUTPUT, 0,
+                                       0x80, valp[1] ? 0 : 0x80);
+    snd_hda_codec_amp_update(codec, 0x1b, 0, HDA_OUTPUT, 0,
+                             0x80, valp[0] ? 0 : 0x80);
+    snd_hda_codec_amp_update(codec, 0x1b, 1, HDA_OUTPUT, 0,
+                             0x80, valp[1] ? 0 : 0x80);
+    return change;
+}
+
+static struct hda_input_mux ad1986a_laptop_eapd_capture_source = {
+    .num_items = 3,
+    .items = {
+        { "Mic", 0x0 },
+        { "Internal Mic", 0x4 },
+        { "Mix", 0x5 },
+    },
+};
+
+static struct snd_kcontrol_new ad1986a_laptop_eapd_mixers[] = {
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Master Playback Volume",
+        .info = snd_hda_mixer_amp_volume_info,
+        .get = snd_hda_mixer_amp_volume_get,
+        .put = ad1986a_laptop_master_vol_put,
+        .private_value = HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),
+    },
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Master Playback Switch",
+        .info = snd_hda_mixer_amp_switch_info,
+        .get = snd_hda_mixer_amp_switch_get,
+        .put = ad1986a_laptop_master_sw_put,
+        .private_value = HDA_COMPOSE_AMP_VAL(0x1a, 3, 0, HDA_OUTPUT),
+    },
+    HDA_CODEC_VOLUME("PCM Playback Volume", 0x03, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x17, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x17, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("Mic Playback Volume", 0x13, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Mic Playback Switch", 0x13, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("Capture Volume", 0x12, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x12, 0x0, HDA_OUTPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Capture Source",
+        .info = ad198x_mux_enum_info,
+        .get = ad198x_mux_enum_get,
+        .put = ad198x_mux_enum_put,
+    },
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "External Amplifier",
+        .info = ad198x_eapd_info,
+        .get = ad198x_eapd_get,
+        .put = ad198x_eapd_put,
+        .private_value = 0x1b | (1 << 8), /* port-D, inversed */
+    },
+    {0} /* end */
 };
 
@@ -536 +728 @@
 };
 
+/* additional verbs for 3-stack model */
+static struct hda_verb ad1986a_3st_init_verbs[] = {
+    /* Mic and line-in selectors */
+    {0x0f, AC_VERB_SET_CONNECT_SEL, 0x2},
+    {0x10, AC_VERB_SET_CONNECT_SEL, 0x1},
+    {0} /* end */
+};
+
+static struct hda_verb ad1986a_ch2_init[] = {
+    /* Surround out -> Line In */
+    { 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+    { 0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+    /* CLFE -> Mic in */
+    { 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+    { 0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+    {0} /* end */
+};
+
+static struct hda_verb ad1986a_ch4_init[] = {
+    /* Surround out -> Surround */
+    { 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+    { 0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+    /* CLFE -> Mic in */
+    { 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x24 },
+    { 0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+    {0} /* end */
+};
+
+static struct hda_verb ad1986a_ch6_init[] = {
+    /* Surround out -> Surround out */
+    { 0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+    { 0x1c, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+    /* CLFE -> CLFE */
+    { 0x1d, AC_VERB_SET_PIN_WIDGET_CONTROL, 0x40 },
+    { 0x1d, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+    {0} /* end */
+};
+
+static struct hda_channel_mode ad1986a_modes[3] = {
+    { 2, ad1986a_ch2_init },
+    { 4, ad1986a_ch4_init },
+    { 6, ad1986a_ch6_init },
+};
+
+/* eapd initialization */
+static struct hda_verb ad1986a_eapd_init_verbs[] = {
+    {0x1b, AC_VERB_SET_EAPD_BTLENABLE, 0x00},
+    {0}
+};
+
+/* models */
+enum { AD1986A_6STACK, AD1986A_3STACK, AD1986A_LAPTOP, AD1986A_LAPTOP_EAPD };
+
+static struct hda_board_config ad1986a_cfg_tbl[] = {
+    { .modelname = "6stack",        .config = AD1986A_6STACK },
+    { .modelname = "3stack",        .config = AD1986A_3STACK },
+    { .pci_subvendor = 0x10de, .pci_subdevice = 0xcb84,
+    .config = AD1986A_3STACK }, /* ASUS A8N-VM CSM */
+    { .modelname = "laptop",        .config = AD1986A_LAPTOP },
+    { .pci_subvendor = 0x144d, .pci_subdevice = 0xc01e,
+    .config = AD1986A_LAPTOP }, /* FSC V2060 */
+    { .pci_subvendor = 0x17c0, .pci_subdevice = 0x2017,
+    .config = AD1986A_LAPTOP }, /* Samsung M50 */
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x818f,
+    .config = AD1986A_LAPTOP }, /* ASUS P5GV-MX */
+    { .modelname = "laptop-eapd",   .config = AD1986A_LAPTOP_EAPD },
+    { .pci_subvendor = 0x144d, .pci_subdevice = 0xc024,
+    .config = AD1986A_LAPTOP_EAPD }, /* Samsung R65-T2300 Charis */
+    { .pci_subvendor = 0x1043, .pci_subdevice = 0x1213,
+                   .config = AD1986A_LAPTOP_EAPD }, /* ASUS A6J */
+    {0}
+};
 
 static int patch_ad1986a(struct hda_codec *codec)
 {
-        struct ad198x_spec *spec;
+    struct ad198x_spec *spec;
+    int board_config;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
@@ -553 +818 @@
         spec->multiout.dig_out_nid = AD1986A_SPDIF_OUT;
         spec->num_adc_nids = 1;
-        spec->adc_nids = ad1986a_adc_nids;
-        spec->capsrc_nids = ad1986a_adc_nids;
+        spec->adc_nids = ad1986a_adc_nids;
+        spec->capsrc_nids = ad1986a_capsrc_nids;
         spec->input_mux = &ad1986a_capture_source;
         spec->num_mixers = 1;
@@ -562 +827 @@
 
         codec->patch_ops = ad198x_patch_ops;
+        /* override some parameters */
+        board_config = snd_hda_check_board_config(codec, ad1986a_cfg_tbl);
+        switch (board_config) {
+        case AD1986A_3STACK:
+            spec->num_mixers = 2;
+            spec->mixers[1] = ad1986a_3st_mixers;
+            spec->num_init_verbs = 2;
+            spec->init_verbs[1] = ad1986a_3st_init_verbs;
+            spec->channel_mode = ad1986a_modes;
+            spec->num_channel_mode = ARRAY_SIZE(ad1986a_modes);
+            break;
+        case AD1986A_LAPTOP:
+            spec->mixers[0] = ad1986a_laptop_mixers;
+            spec->multiout.max_channels = 2;
+            spec->multiout.num_dacs = 1;
+            spec->multiout.dac_nids = ad1986a_laptop_dac_nids;
+            break;
+        case AD1986A_LAPTOP_EAPD:
+            spec->mixers[0] = ad1986a_laptop_eapd_mixers;
+            spec->num_init_verbs = 2;
+            spec->init_verbs[1] = ad1986a_eapd_init_verbs;
+            spec->multiout.max_channels = 2;
+            spec->multiout.num_dacs = 1;
+            spec->multiout.dac_nids = ad1986a_laptop_dac_nids;
+            spec->multiout.dig_out_nid = 0;
+            spec->input_mux = &ad1986a_laptop_eapd_capture_source;
+                         break;
+        }
 
         return 0;
@@ -576 +869 @@
 static hda_nid_t ad1983_dac_nids[1] = { AD1983_DAC };
 static hda_nid_t ad1983_adc_nids[1] = { AD1983_ADC };
+static hda_nid_t ad1983_capsrc_nids[1] = { 0x15 };
 
 static struct hda_input_mux ad1983_capture_source = {
@@ -717 +1011 @@
         spec->multiout.dig_out_nid = AD1983_SPDIF_OUT;
         spec->num_adc_nids = 1;
-        spec->adc_nids = ad1983_adc_nids;
-        spec->capsrc_nids = ad1983_adc_nids;
+        spec->adc_nids = ad1983_adc_nids;
+        spec->capsrc_nids = ad1983_capsrc_nids;
         spec->input_mux = &ad1983_capture_source;
         spec->num_mixers = 1;
@@ -742 +1036 @@
 static hda_nid_t ad1981_dac_nids[1] = { AD1981_DAC };
 static hda_nid_t ad1981_adc_nids[1] = { AD1981_ADC };
+static hda_nid_t ad1981_capsrc_nids[1] = { 0x15 };
 
 /* 0x0c, 0x09, 0x0e, 0x0f, 0x19, 0x05, 0x18, 0x17 */
@@ -847 +1142 @@
 };
 
+/*
+ * Patch for HP nx6320
+ *
+ * nx6320 uses EAPD in the reserve way - EAPD-on means the internal
+ * speaker output enabled _and_ mute-LED off.
+ */
+
+#define AD1981_HP_EVENT         0x37
+#define AD1981_MIC_EVENT        0x38
+
+static struct hda_verb ad1981_hp_init_verbs[] = {
+    {0x05, AC_VERB_SET_EAPD_BTLENABLE, 0x00 }, /* default off */
+    /* pin sensing on HP and Mic jacks */
+    {0x06, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1981_HP_EVENT},
+    {0x08, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | AD1981_MIC_EVENT},
+    {0}
+};
+
+/* turn on/off EAPD (+ mute HP) as a master switch */
+static int ad1981_hp_master_sw_put(struct snd_kcontrol *kcontrol,
+                                   struct snd_ctl_elem_value *ucontrol)
+{
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    struct ad198x_spec *spec = codec->spec;
+
+    if (! ad198x_eapd_put(kcontrol, ucontrol))
+        return 0;
+
+    /* toggle HP mute appropriately */
+    snd_hda_codec_amp_update(codec, 0x06, 0, HDA_OUTPUT, 0,
+                             0x80, spec->cur_eapd ? 0 : 0x80);
+    snd_hda_codec_amp_update(codec, 0x06, 1, HDA_OUTPUT, 0,
+                             0x80, spec->cur_eapd ? 0 : 0x80);
+    return 1;
+}
+
+/* bind volumes of both NID 0x05 and 0x06 */
+static int ad1981_hp_master_vol_put(struct snd_kcontrol *kcontrol,
+                                    struct snd_ctl_elem_value *ucontrol)
+{
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    long *valp = ucontrol->value.integer.value;
+    int change;
+
+    change = snd_hda_codec_amp_update(codec, 0x05, 0, HDA_OUTPUT, 0,
+                                      0x7f, valp[0] & 0x7f);
+    change |= snd_hda_codec_amp_update(codec, 0x05, 1, HDA_OUTPUT, 0,
+                                       0x7f, valp[1] & 0x7f);
+    snd_hda_codec_amp_update(codec, 0x06, 0, HDA_OUTPUT, 0,
+                             0x7f, valp[0] & 0x7f);
+    snd_hda_codec_amp_update(codec, 0x06, 1, HDA_OUTPUT, 0,
+                             0x7f, valp[1] & 0x7f);
+    return change;
+}
+
+/* mute internal speaker if HP is plugged */
+static void ad1981_hp_automute(struct hda_codec *codec)
+{
+    unsigned int present;
+
+    present = snd_hda_codec_read(codec, 0x06, 0,
+                                 AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+    snd_hda_codec_amp_update(codec, 0x05, 0, HDA_OUTPUT, 0,
+                             0x80, present ? 0x80 : 0);
+    snd_hda_codec_amp_update(codec, 0x05, 1, HDA_OUTPUT, 0,
+                             0x80, present ? 0x80 : 0);
+}
+
+/* toggle input of built-in and mic jack appropriately */
+static void ad1981_hp_automic(struct hda_codec *codec)
+{
+    static struct hda_verb mic_jack_on[] = {
+        {0x1f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+        {0}
+    };
+    static struct hda_verb mic_jack_off[] = {
+        {0x1e, AC_VERB_SET_AMP_GAIN_MUTE, 0xb080},
+        {0x1f, AC_VERB_SET_AMP_GAIN_MUTE, 0xb000},
+        {0}
+    };
+    unsigned int present;
+
+    present = snd_hda_codec_read(codec, 0x08, 0,
+                                 AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+    if (present)
+        snd_hda_sequence_write(codec, mic_jack_on);
+    else
+        snd_hda_sequence_write(codec, mic_jack_off);
+}
+
+/* unsolicited event for HP jack sensing */
+static void ad1981_hp_unsol_event(struct hda_codec *codec,
+                                  unsigned int res)
+{
+    res >>= 26;
+    switch (res) {
+    case AD1981_HP_EVENT:
+        ad1981_hp_automute(codec);
+        break;
+    case AD1981_MIC_EVENT:
+        ad1981_hp_automic(codec);
+        break;
+    }
+}
+
+static struct hda_input_mux ad1981_hp_capture_source = {
+    .num_items = 3,
+    .items = {
+        { "Mic", 0x0 },
+        { "Docking-Station", 0x1 },
+        { "Mix", 0x2 },
+    },
+};
+
+static struct snd_kcontrol_new ad1981_hp_mixers[] = {
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Master Playback Volume",
+        .info = snd_hda_mixer_amp_volume_info,
+        .get = snd_hda_mixer_amp_volume_get,
+        .put = ad1981_hp_master_vol_put,
+        .private_value = HDA_COMPOSE_AMP_VAL(0x05, 3, 0, HDA_OUTPUT),
+    },
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Master Playback Switch",
+        .info = ad198x_eapd_info,
+        .get = ad198x_eapd_get,
+        .put = ad1981_hp_master_sw_put,
+        .private_value = 0x05,
+    },
+    HDA_CODEC_VOLUME("PCM Playback Volume", 0x11, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("PCM Playback Switch", 0x11, 0x0, HDA_OUTPUT),
+#if 0
+    /* FIXME: analog mic/line loopback doesn't work with my tests...
+     *        (although recording is OK)
+     */
+    HDA_CODEC_VOLUME("Mic Playback Volume", 0x12, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Mic Playback Switch", 0x12, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("Docking-Station Playback Volume", 0x13, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Docking-Station Playback Switch", 0x13, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x1c, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x1c, 0x0, HDA_OUTPUT),
+    /* FIXME: does this laptop have analog CD connection? */
+    HDA_CODEC_VOLUME("CD Playback Volume", 0x1d, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("CD Playback Switch", 0x1d, 0x0, HDA_OUTPUT),
+#endif
+    HDA_CODEC_VOLUME("Mic Boost", 0x08, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Internal Mic Boost", 0x18, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Capture Volume", 0x15, 0x0, HDA_OUTPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x15, 0x0, HDA_OUTPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Capture Source",
+        .info = ad198x_mux_enum_info,
+        .get = ad198x_mux_enum_get,
+        .put = ad198x_mux_enum_put,
+    },
+    {0} /* end */
+};
+
+/* initialize jack-sensing, too */
+static int ad1981_hp_init(struct hda_codec *codec)
+{
+    ad198x_init(codec);
+    ad1981_hp_automute(codec);
+    ad1981_hp_automic(codec);
+    return 0;
+}
+
+/* models */
+enum { AD1981_BASIC, AD1981_HP };
+
+static struct hda_board_config ad1981_cfg_tbl[] = {
+    { .modelname = "hp", .config = AD1981_HP },
+    { .pci_subvendor = 0x103c, .pci_subdevice = 0x30aa,
+    .config = AD1981_HP }, /* HP nx6320 */
+    { .pci_subvendor = 0x103c, .pci_subdevice = 0x309f,
+    .config = AD1981_HP }, /* HP nx9420 AngelFire */
+    { .modelname = "basic", .config = AD1981_BASIC },
+    {0}
+};
+
 static int patch_ad1981(struct hda_codec *codec)
 {
-        struct ad198x_spec *spec;
+    struct ad198x_spec *spec;
+    int board_config;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
@@ -864 +1344 @@
         spec->num_adc_nids = 1;
         spec->adc_nids = ad1981_adc_nids;
-        spec->capsrc_nids = ad1981_adc_nids;
+        spec->capsrc_nids = ad1981_capsrc_nids;
         spec->input_mux = &ad1981_capture_source;
         spec->num_mixers = 1;
@@ -873 +1353 @@
 
         codec->patch_ops = ad198x_patch_ops;
+
+        /* override some parameters */
+        board_config = snd_hda_check_board_config(codec, ad1981_cfg_tbl);
+        switch (board_config) {
+        case AD1981_HP:
+            spec->mixers[0] = ad1981_hp_mixers;
+            spec->num_init_verbs = 2;
+            spec->init_verbs[1] = ad1981_hp_init_verbs;
+            spec->multiout.dig_out_nid = 0;
+            spec->input_mux = &ad1981_hp_capture_source;
+
+            codec->patch_ops.init = ad1981_hp_init;
+            codec->patch_ops.unsol_event = ad1981_hp_unsol_event;
+            break;
+        }
 
         return 0;
@@ -1061 +1556 @@
 }
 
-/*
- * EAPD control
- */
-static int ad1988_eapd_info(struct snd_kcontrol *kcontrol,
-                            struct snd_ctl_elem_info *uinfo)
-{
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
-        uinfo->count = 1;
-        uinfo->value.integer.min = 0;
-        uinfo->value.integer.max = 1;
-        return 0;
-}
-
-static int ad1988_eapd_get(struct snd_kcontrol *kcontrol,
-                           struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct ad198x_spec *spec = codec->spec;
-        ucontrol->value.enumerated.item[0] = ! spec->cur_eapd;
-        return 0;
-}
-
-static int ad1988_eapd_put(struct snd_kcontrol *kcontrol,
-                           struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        struct ad198x_spec *spec = codec->spec;
-        unsigned int eapd;
-        eapd = ! ucontrol->value.enumerated.item[0];
-        if (eapd == spec->cur_eapd && ! codec->in_resume)
-                return 0;
-        spec->cur_eapd = eapd;
-        snd_hda_codec_write(codec, 0x12 /* port-D */,
-                            0, AC_VERB_SET_EAPD_BTLENABLE,
-                            eapd ? 0x02 : 0x00);
-        return 0;
-}
-
 /* 6-stack mode */
 static struct snd_kcontrol_new ad1988_6stack_mixers1[] = {
@@ -1220 +1677 @@
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "External Amplifier",
-                .info = ad1988_eapd_info,
-                .get = ad1988_eapd_get,
-                .put = ad1988_eapd_put,
+                .name = "External Amplifier",
+                .info = ad198x_eapd_info,
+                .get = ad198x_eapd_get,
+                .put = ad198x_eapd_put,
+                .private_value = 0x12 | (1 << 8), /* port-D, inversed */
         },
 
@@ -1595 +2053 @@
         else
                 snd_hda_sequence_write(codec, ad1988_laptop_hp_off);
-} 
+}
 
 
@@ -1796 +2254 @@
         idx = ad1988_pin_idx(pin);
         nid = ad1988_idx_to_dac(codec, idx);
-        if (! spec->multiout.dac_nids[0]) {
-                /* use this as the primary output */
-                spec->multiout.dac_nids[0] = nid;
-                if (! spec->multiout.num_dacs)
-                        spec->multiout.num_dacs = 1;
-        } else 
-                /* specify the DAC as the extra output */
-                spec->multiout.hp_nid = nid;
+        /* specify the DAC as the extra output */
+        if (! spec->multiout.hp_nid)
+            spec->multiout.hp_nid = nid;
+        else
+            spec->multiout.extra_out_nid[0] = nid;
         /* control HP volume/switch on the output mixer amp */
         sprintf(name, "%s Playback Volume", pfx);
@@ -1922 +2377 @@
         hda_nid_t pin;
 
-        pin = spec->autocfg.speaker_pin;
+        pin = spec->autocfg.speaker_pins[0];
         if (pin) /* connect to front */
                 ad1988_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);
@@ -1970 +2425 @@
                 return err;
         if ((err = ad1988_auto_fill_dac_nids(codec, &spec->autocfg)) < 0)
-                return err;
-        if (! spec->autocfg.line_outs && ! spec->autocfg.speaker_pin &&
-            ! spec->autocfg.hp_pin)
+            return err;
+        if (! spec->autocfg.line_outs)
                 return 0; /* can't find valid BIOS pin config */
-        if ((err = ad1988_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
-            (err = ad1988_auto_create_extra_out(codec, spec->autocfg.speaker_pin,
-                                                "Speaker")) < 0 ||
-            (err = ad1988_auto_create_extra_out(codec, spec->autocfg.speaker_pin,
+        if ((err = ad1988_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
+            (err = ad1988_auto_create_extra_out(codec,
+                                                spec->autocfg.speaker_pins[0],
+                                                "Speaker")) < 0 ||
+            (err = ad1988_auto_create_extra_out(codec, spec->autocfg.hp_pin,
                                                 "Headphone")) < 0 ||
             (err = ad1988_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)

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

@@ -7 +7 @@
  *                    PeiSen Hou <pshou@realtek.com.tw>
  *                    Takashi Iwai <tiwai@suse.de>
+ *                    Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
  *
  *  This driver is free software; you can redistribute it and/or modify
@@ -50 +51 @@
         ALC880_UNIWILL_DIG,
         ALC880_CLEVO,
-        ALC880_TCL_S700,
+        ALC880_TCL_S700,
+        ALC880_LG,
+        ALC880_LG_LW,
 #ifdef CONFIG_SND_DEBUG
         ALC880_TEST,
@@ -64 +67 @@
         ALC260_HP_3013,
         ALC260_FUJITSU_S702X,
+        ALC260_ACER,
+#ifdef CONFIG_SND_DEBUG
+        ALC260_TEST,
+#endif
         ALC260_AUTO,
         ALC260_MODEL_LAST /* last tag */
@@ -71 +78 @@
 enum {
         ALC262_BASIC,
+        ALC262_FUJITSU,
         ALC262_AUTO,
         ALC262_MODEL_LAST /* last tag */
@@ -109 +117 @@
         struct hda_pcm_stream *stream_analog_capture;
 
-        char *stream_name_digital;      /* digital PCM stream */ 
+        char *stream_name_digital;      /* digital PCM stream */
         struct hda_pcm_stream *stream_digital_playback;
         struct hda_pcm_stream *stream_digital_capture;
@@ -133 +141 @@
 
         /* PCM information */
-        struct hda_pcm pcm_rec[2];      /* used in alc_build_pcms() */
+        struct hda_pcm pcm_rec[3];      /* used in alc_build_pcms() */
 
         /* dynamic controls, init_verbs and input_mux */
@@ -141 +149 @@
         struct hda_input_mux private_imux;
         hda_nid_t private_dac_nids[5];
+
+        /* hooks */
+        void (*init_hook)(struct hda_codec *codec);
+        void (*unsol_event)(struct hda_codec *codec, unsigned int res);
+
+        /* for pin sensing */
+        unsigned int sense_updated: 1;
+        unsigned int jack_present: 1;
 };
 
@@ -158 +174 @@
         unsigned int num_channel_mode;
         const struct hda_channel_mode *channel_mode;
-        const struct hda_input_mux *input_mux;
+        const struct hda_input_mux *input_mux;
+        void (*unsol_event)(struct hda_codec *, unsigned int);
+        void (*init_hook)(struct hda_codec *);
 };
 
@@ -219 +237 @@
 }
 
-
-/*
- * Control of pin widget settings via the mixer.  Only boolean settings are
- * supported, so VrefEn can't be controlled using these functions as they
- * stand.
- */
-static int alc_pinctl_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+/*
+ * Control the mode of pin widget settings via the mixer.  "pc" is used
+ * instead of "%" to avoid consequences of accidently treating the % as
+ * being part of a format specifier.  Maximum allowed length of a value is
+ * 63 characters plus NULL terminator.
+ *
+ * Note: some retasking pin complexes seem to ignore requests for input
+ * states other than HiZ (eg: PIN_VREFxx) and revert to HiZ if any of these
+ * are requested.  Therefore order this list so that this behaviour will not
+ * cause problems when mixer clients move through the enum sequentially.
+ * NIDs 0x0f and 0x10 have been observed to have this behaviour.
+ */
+static char *alc_pin_mode_names[] = {
+        "Mic 50pc bias", "Mic 80pc bias",
+        "Line in", "Line out", "Headphone out",
+};
+static unsigned char alc_pin_mode_values[] = {
+        PIN_VREF50, PIN_VREF80, PIN_IN, PIN_OUT, PIN_HP,
+};
+/* The control can present all 5 options, or it can limit the options based
+ * in the pin being assumed to be exclusively an input or an output pin.
+ */
+#define ALC_PIN_DIR_IN    0x00
+#define ALC_PIN_DIR_OUT   0x01
+#define ALC_PIN_DIR_INOUT 0x02
+
+/* Info about the pin modes supported by the three different pin directions.
+ * For each direction the minimum and maximum values are given.
+ */
+static signed char alc_pin_mode_dir_info[3][2] = {
+        { 0, 2 },    /* ALC_PIN_DIR_IN */
+        { 3, 4 },    /* ALC_PIN_DIR_OUT */
+        { 0, 4 },    /* ALC_PIN_DIR_INOUT */
+};
+#define alc_pin_mode_min(_dir) (alc_pin_mode_dir_info[_dir][0])
+#define alc_pin_mode_max(_dir) (alc_pin_mode_dir_info[_dir][1])
+#define alc_pin_mode_n_items(_dir) \
+        (alc_pin_mode_max(_dir)-alc_pin_mode_min(_dir)+1)
+
+static int alc_pin_mode_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+        unsigned int item_num = uinfo->value.enumerated.item;
+        unsigned char dir = (kcontrol->private_value >> 16) & 0xff;
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        uinfo->count = 1;
+        uinfo->value.enumerated.items = alc_pin_mode_n_items(dir);
+
+        if (item_num<alc_pin_mode_min(dir) || item_num>alc_pin_mode_max(dir))
+                item_num = alc_pin_mode_min(dir);
+        strcpy(uinfo->value.enumerated.name, alc_pin_mode_names[item_num]);
+        return 0;
+}
+
+static int alc_pin_mode_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        unsigned int i;
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = kcontrol->private_value & 0xffff;
+        unsigned char dir = (kcontrol->private_value >> 16) & 0xff;
+        long *valp = ucontrol->value.integer.value;
+        unsigned int pinctl = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_PIN_WIDGET_CONTROL,0x00);
+
+        /* Find enumerated value for current pinctl setting */
+        i = alc_pin_mode_min(dir);
+        while (alc_pin_mode_values[i]!=pinctl && i<=alc_pin_mode_max(dir))
+                i++;
+        *valp = i<=alc_pin_mode_max(dir)?i:alc_pin_mode_min(dir);
+        return 0;
+}
+
+static int alc_pin_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        signed int change;
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = kcontrol->private_value & 0xffff;
+        unsigned char dir = (kcontrol->private_value >> 16) & 0xff;
+        long val = *ucontrol->value.integer.value;
+        unsigned int pinctl = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_PIN_WIDGET_CONTROL,0x00);
+
+        if (val<alc_pin_mode_min(dir) || val>alc_pin_mode_max(dir))
+                val = alc_pin_mode_min(dir);
+
+        change = pinctl != alc_pin_mode_values[val];
+        if (change) {
+                /* Set pin mode to that requested */
+                snd_hda_codec_write(codec,nid,0,AC_VERB_SET_PIN_WIDGET_CONTROL,
+                        alc_pin_mode_values[val]);
+
+                /* Also enable the retasking pin's input/output as required
+                 * for the requested pin mode.  Enum values of 2 or less are
+                 * input modes.
+                 *
+                 * Dynamically switching the input/output buffers probably
+                 * reduces noise slightly, particularly on input.  However,
+                 * havingboth input and output buffers enabled
+                 * simultaneously doesn't seem to be problematic.
+                 */
+                if (val <= 2) {
+                        snd_hda_codec_write(codec,nid,0,AC_VERB_SET_AMP_GAIN_MUTE,
+                                AMP_OUT_MUTE);
+                        snd_hda_codec_write(codec,nid,0,AC_VERB_SET_AMP_GAIN_MUTE,
+                                AMP_IN_UNMUTE(0));
+                } else {
+                        snd_hda_codec_write(codec,nid,0,AC_VERB_SET_AMP_GAIN_MUTE,
+                                AMP_IN_MUTE(0));
+                        snd_hda_codec_write(codec,nid,0,AC_VERB_SET_AMP_GAIN_MUTE,
+                                AMP_OUT_UNMUTE);
+                }
+        }
+        return change;
+}
+
+#define ALC_PIN_MODE(xname, nid, dir) \
+        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+          .info = alc_pin_mode_info, \
+          .get = alc_pin_mode_get, \
+          .put = alc_pin_mode_put, \
+          .private_value = nid | (dir<<16) }
+
+/* A switch control for ALC260 GPIO pins.  Multiple GPIOs can be ganged
+ * together using a mask with more than one bit set.  This control is
+ * currently used only by the ALC260 test model.  At this stage they are not
+ * needed for any "production" models.
+ */
+#ifdef CONFIG_SND_DEBUG
+static int alc_gpio_data_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
         uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
@@ -233 +371 @@
         return 0;
 }
-
-static int alc_pinctl_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+static int alc_gpio_data_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         hda_nid_t nid = kcontrol->private_value & 0xffff;
-        long mask = (kcontrol->private_value >> 16) & 0xff;
+        unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
         long *valp = ucontrol->value.integer.value;
-
-        *valp = 0;
-        if (snd_hda_codec_read(codec,nid,0,AC_VERB_GET_PIN_WIDGET_CONTROL,0x00) & mask)
-                *valp = 1;
+        unsigned int val = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_GPIO_DATA,0x00);
+
+        *valp = (val & mask) != 0;
         return 0;
 }
-
-static int alc_pinctl_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
-{
+static int alc_gpio_data_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        signed int change;
         struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
         hda_nid_t nid = kcontrol->private_value & 0xffff;
-        long mask = (kcontrol->private_value >> 16) & 0xff;
+        unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
+        long val = *ucontrol->value.integer.value;
+        unsigned int gpio_data = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_GPIO_DATA,0x00);
+
+        /* Set/unset the masked GPIO bit(s) as needed */
+        change = (val==0?0:mask) != (gpio_data & mask);
+        if (val==0)
+                gpio_data &= ~mask;
+        else
+                gpio_data |= mask;
+        snd_hda_codec_write(codec,nid,0,AC_VERB_SET_GPIO_DATA,gpio_data);
+
+        return change;
+}
+#define ALC_GPIO_DATA_SWITCH(xname, nid, mask) \
+        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
+          .info = alc_gpio_data_info, \
+          .get = alc_gpio_data_get, \
+          .put = alc_gpio_data_put, \
+          .private_value = nid | (mask<<16) }
+#endif   /* CONFIG_SND_DEBUG */
+
+/* A switch control to allow the enabling of the digital IO pins on the
+ * ALC260.  This is incredibly simplistic; the intention of this control is
+ * to provide something in the test model allowing digital outputs to be
+ * identified if present.  If models are found which can utilise these
+ * outputs a more complete mixer control can be devised for those models if
+ * necessary.
+ */
+#ifdef CONFIG_SND_DEBUG
+static int alc_spdif_ctrl_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+static int alc_spdif_ctrl_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = kcontrol->private_value & 0xffff;
+        unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
         long *valp = ucontrol->value.integer.value;
-        unsigned int pinctl = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_PIN_WIDGET_CONTROL,0x00);
-        int change = ((pinctl & mask)!=0) != *valp;
-
-        if (change)
-                snd_hda_codec_write(codec,nid,0,AC_VERB_SET_PIN_WIDGET_CONTROL,
-                        *valp?(pinctl|mask):(pinctl&~mask));
+        unsigned int val = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_DIGI_CONVERT,0x00);
+
+        *valp = (val & mask) != 0;
+        return 0;
+}
+static int alc_spdif_ctrl_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
+{
+        signed int change;
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        hda_nid_t nid = kcontrol->private_value & 0xffff;
+        unsigned char mask = (kcontrol->private_value >> 16) & 0xff;
+        long val = *ucontrol->value.integer.value;
+        unsigned int ctrl_data = snd_hda_codec_read(codec,nid,0,AC_VERB_GET_DIGI_CONVERT,0x00);
+
+        /* Set/unset the masked control bit(s) as needed */
+        change = (val==0?0:mask) != (ctrl_data & mask);
+        if (val==0)
+                ctrl_data &= ~mask;
+        else
+                ctrl_data |= mask;
+        snd_hda_codec_write(codec,nid,0,AC_VERB_SET_DIGI_CONVERT_1,ctrl_data);
+
         return change;
 }
-
-#define ALC_PINCTL_SWITCH(xname, nid, mask) \
+#define ALC_SPDIF_CTRL_SWITCH(xname, nid, mask) \
         { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = 0,  \
-          .info = alc_pinctl_switch_info, \
-          .get = alc_pinctl_switch_get, \
-          .put = alc_pinctl_switch_put, \
-          .private_value = (nid) | (mask<<16) }
-
+          .info = alc_spdif_ctrl_info, \
+          .get = alc_spdif_ctrl_get, \
+          .put = alc_spdif_ctrl_put, \
+          .private_value = nid | (mask<<16) }
+#endif   /* CONFIG_SND_DEBUG */
 
 /*
@@ -281 +474 @@
         for (i = 0; i < ARRAY_SIZE(preset->init_verbs) && preset->init_verbs[i]; i++)
                 spec->init_verbs[spec->num_init_verbs++] = preset->init_verbs[i];
-        
+
         spec->channel_mode = preset->channel_mode;
         spec->num_channel_mode = preset->num_channel_mode;
@@ -291 +484 @@
         spec->multiout.dig_out_nid = preset->dig_out_nid;
         spec->multiout.hp_nid = preset->hp_nid;
-        
+
         spec->input_mux = preset->input_mux;
 
         spec->num_adc_nids = preset->num_adc_nids;
         spec->adc_nids = preset->adc_nids;
-        spec->dig_in_nid = preset->dig_in_nid;
+        spec->dig_in_nid = preset->dig_in_nid;
+        spec->unsol_event = preset->unsol_event;
+        spec->init_hook = preset->init_hook;
 }
 
@@ -494 +689 @@
         /* front, rear, clfe, rear_surr */
         0x02, 0x03, 0x04, 0x05
-};      
+};
 
 static struct hda_input_mux alc880_6stack_capture_source = {
@@ -554 +749 @@
  * The system also has a pair of internal speakers, and a headphone jack.
  * These are both connected to Line2 on the codec, hence to DAC 02.
- * 
+ *
  * There is a variable resistor to control the speaker or headphone
  * volume. This is a hardware-only device without a software API.
@@ -964 +1159 @@
         {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        
+
         {0}
 };
@@ -1026 +1221 @@
         {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x1c, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        
+
         {0}
 };
@@ -1099 +1294 @@
 
 /*
+ * LG m1 express dual
+ *
+ * Pin assignment:
+ *   Rear Line-In/Out (blue): 0x14
+ *   Build-in Mic-In: 0x15
+ *   Speaker-out: 0x17
+ *   HP-Out (green): 0x1b
+ *   Mic-In/Out (red): 0x19
+ *   SPDIF-Out: 0x1e
+ */
+
+/* To make 5.1 output working (green=Front, blue=Surr, red=CLFE) */
+static hda_nid_t alc880_lg_dac_nids[3] = {
+    0x05, 0x02, 0x03
+};
+
+/* seems analog CD is not working */
+static struct hda_input_mux alc880_lg_capture_source = {
+    .num_items = 3,
+    .items = {
+        { "Mic", 0x1 },
+        { "Line", 0x5 },
+        { "Internal Mic", 0x6 },
+    },
+};
+
+/* 2,4,6 channel modes */
+static struct hda_verb alc880_lg_ch2_init[] = {
+    /* set line-in and mic-in to input */
+    { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN },
+    { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
+    {0}
+};
+
+static struct hda_verb alc880_lg_ch4_init[] = {
+    /* set line-in to out and mic-in to input */
+    { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
+    { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 },
+    {0}
+};
+
+static struct hda_verb alc880_lg_ch6_init[] = {
+    /* set line-in and mic-in to output */
+    { 0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
+    { 0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP },
+    {0}
+};
+
+static struct hda_channel_mode alc880_lg_ch_modes[3] = {
+    { 2, alc880_lg_ch2_init },
+    { 4, alc880_lg_ch4_init },
+    { 6, alc880_lg_ch6_init },
+};
+
+static struct snd_kcontrol_new alc880_lg_mixer[] = {
+    /* FIXME: it's not really "master" but front channels */
+    HDA_CODEC_VOLUME("Master Playback Volume", 0x0f, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Master Playback Switch", 0x0f, 2, HDA_INPUT),
+    HDA_CODEC_VOLUME("Surround Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Surround Playback Switch", 0x0c, 2, HDA_INPUT),
+    HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0d, 1, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0d, 2, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE_MONO("Center Playback Switch", 0x0d, 1, 2, HDA_INPUT),
+    HDA_BIND_MUTE_MONO("LFE Playback Switch", 0x0d, 2, 2, HDA_INPUT),
+    HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
+    HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
+    HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x06, HDA_INPUT),
+    HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x06, HDA_INPUT),
+    HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x07, HDA_INPUT),
+    HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x07, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Channel Mode",
+        .info = alc_ch_mode_info,
+        .get = alc_ch_mode_get,
+        .put = alc_ch_mode_put,
+    },
+    {0} /* end */
+};
+
+static struct hda_verb alc880_lg_init_verbs[] = {
+    /* set capture source to mic-in */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
+    /* mute all amp mixer inputs */
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(5)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(6)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(7)},
+    /* line-in to input */
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* built-in mic */
+    {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* speaker-out */
+    {0x17, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    {0x17, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* mic-in to input */
+    {0x11, AC_VERB_SET_CONNECT_SEL, 0x01},
+    {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* HP-out */
+    {0x13, AC_VERB_SET_CONNECT_SEL, 0x03},
+    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* jack sense */
+    {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | 0x1},
+    {0}
+};
+
+/* toggle speaker-output according to the hp-jack state */
+static void alc880_lg_automute(struct hda_codec *codec)
+{
+    unsigned int present;
+
+    present = snd_hda_codec_read(codec, 0x1b, 0,
+                                 AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+    snd_hda_codec_amp_update(codec, 0x17, 0, HDA_OUTPUT, 0,
+                             0x80, present ? 0x80 : 0);
+    snd_hda_codec_amp_update(codec, 0x17, 1, HDA_OUTPUT, 0,
+                             0x80, present ? 0x80 : 0);
+}
+
+static void alc880_lg_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+    /* Looks like the unsol event is incompatible with the standard
+     * definition.  4bit tag is placed at 28 bit!
+     */
+    if ((res >> 28) == 0x01)
+        alc880_lg_automute(codec);
+}
+
+/*
+ * LG LW20
+ *
+ * Pin assignment:
+ *   Speaker-out: 0x14
+ *   Mic-In: 0x18
+ *   Built-in Mic-In: 0x19 (?)
+ *   HP-Out: 0x1b
+ *   SPDIF-Out: 0x1e
+ */
+
+/* seems analog CD is not working */
+static struct hda_input_mux alc880_lg_lw_capture_source = {
+    .num_items = 2,
+    .items = {
+        { "Mic", 0x0 },
+        { "Internal Mic", 0x1 },
+    },
+};
+
+static struct snd_kcontrol_new alc880_lg_lw_mixer[] = {
+    HDA_CODEC_VOLUME("Master Playback Volume", 0x0c, 0x0, HDA_OUTPUT),
+    HDA_BIND_MUTE("Master Playback Switch", 0x0c, 2, HDA_INPUT),
+    HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+    HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x01, HDA_INPUT),
+    HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x01, HDA_INPUT),
+    {0} /* end */
+};
+
+static struct hda_verb alc880_lg_lw_init_verbs[] = {
+    /* set capture source to mic-in */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+    {0x0b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(7)},
+    /* speaker-out */
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* HP-out */
+    {0x13, AC_VERB_SET_CONNECT_SEL, 0x00},
+    {0x1b, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+    {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* mic-in to input */
+    {0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* built-in mic */
+    {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80},
+    {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+    /* jack sense */
+    {0x1b, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | 0x1},
+    {0}
+};
+
+/* toggle speaker-output according to the hp-jack state */
+static void alc880_lg_lw_automute(struct hda_codec *codec)
+{
+    unsigned int present;
+
+    present = snd_hda_codec_read(codec, 0x1b, 0,
+                                 AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
+    snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
+                             0x80, present ? 0x80 : 0);
+    snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
+                             0x80, present ? 0x80 : 0);
+}
+
+static void alc880_lg_lw_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+    /* Looks like the unsol event is incompatible with the standard
+     * definition.  4bit tag is placed at 28 bit!
+     */
+    if ((res >> 28) == 0x01)
+        alc880_lg_lw_automute(codec);
+}
+
+/*
+ * Common callbacks
  */
 
@@ -1107 +1513 @@
 
         for (i = 0; i < spec->num_init_verbs; i++)
-                snd_hda_sequence_write(codec, spec->init_verbs[i]);
+            snd_hda_sequence_write(codec, spec->init_verbs[i]);
+        if (spec->init_hook)
+            spec->init_hook(codec);
         return 0;
+}
+
+static void alc_unsol_event(struct hda_codec *codec, unsigned int res)
+{
+    struct alc_spec *spec = codec->spec;
+
+    if (spec->unsol_event)
+        spec->unsol_event(codec, res);
 }
 
@@ -1249 +1665 @@
         .channels_max = 2,
         /* NID is set in alc_build_pcms */
+};
+
+/* Used by alc_build_pcms to flag that a PCM has no playback stream */
+static struct hda_pcm_stream alc_pcm_null_playback = {
+        .substreams = 0,
+        .channels_min = 0,
+        .channels_max = 0,
 };
 
@@ -1278 +1701 @@
                                 info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = spec->channel_mode[i].channels;
                         }
+                }
+        }
+
+        /* If the use of more than one ADC is requested for the current
+         * model, configure a second analog capture-only PCM.
+         */
+        if (spec->num_adc_nids > 1) {
+                codec->num_pcms++;
+                info++;
+                info->name = spec->stream_name_analog;
+                /* No playback stream for second PCM */
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK] = alc_pcm_null_playback;
+                info->stream[SNDRV_PCM_STREAM_PLAYBACK].nid = 0;
+                if (spec->stream_analog_capture) {
+                        snd_assert(spec->adc_nids, return -EINVAL);
+                        info->stream[SNDRV_PCM_STREAM_CAPTURE] = *(spec->stream_analog_capture);
+                        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[1];
                 }
         }
@@ -1322 +1762 @@
         .build_pcms = alc_build_pcms,
         .init = alc_init,
-        .free = alc_free,
+        .free = alc_free,
+        .unsol_event = alc_unsol_event,
 #ifdef CONFIG_PM
         .resume = alc_resume,
@@ -1341 +1782 @@
 
 static struct hda_input_mux alc880_test_capture_source = {
-        .num_items = 5,
+        .num_items = 7,
         .items = {
                 { "In-1", 0x0 },
@@ -1347 +1788 @@
                 { "In-3", 0x2 },
                 { "In-4", 0x3 },
-                { "CD", 0x4 },
+                { "CD", 0x4 },
+                { "Front", 0x5 },
+                { "Surround", 0x6 },
         },
 };
@@ -1620 +2063 @@
         /* Back 3 jack, front 2 jack (Internal add Aux-In) */
         { .pci_subvendor = 0x1025, .pci_subdevice = 0xe310, .config = ALC880_3ST },
-        { .pci_subvendor = 0x104d, .pci_subdevice = 0x81d6, .config = ALC880_3ST }, 
+        { .pci_subvendor = 0x104d, .pci_subdevice = 0x81d6, .config = ALC880_3ST },
         { .pci_subvendor = 0x104d, .pci_subdevice = 0x81a0, .config = ALC880_3ST },
 
@@ -1653 +2096 @@
         { .pci_subvendor = 0x8086, .pci_subdevice = 0xa100, .config = ALC880_5ST_DIG },
         { .pci_subvendor = 0x1565, .pci_subdevice = 0x8202, .config = ALC880_5ST_DIG },
-        { .pci_subvendor = 0x1019, .pci_subdevice = 0xa880, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0x1019, .pci_subdevice = 0xa880, .config = ALC880_5ST_DIG },
+        { .pci_subvendor = 0xa0a0, .pci_subdevice = 0x0560, .config = ALC880_5ST_DIG }, /* Aopen i915GMm-HFS */
         /* { .pci_subvendor = 0x1019, .pci_subdevice = 0xa884, .config = ALC880_5ST_DIG }, */ /* conflict with 6stack */
         { .pci_subvendor = 0x1695, .pci_subdevice = 0x400d, .config = ALC880_5ST_DIG },
@@ -1669 +2113 @@
         { .pci_subvendor = 0x1043, .pci_subdevice = 0x81b4, .config = ALC880_6ST },
         { .pci_subvendor = 0x1019, .pci_subdevice = 0xa884, .config = ALC880_6ST }, /* Acer APFV */
+        { .pci_subvendor = 0x1458, .pci_subdevice = 0xa102, .config = ALC880_6ST }, /* Gigabyte K8N51 */
 
         { .modelname = "6stack-digout", .config = ALC880_6ST_DIG },
@@ -1679 +2124 @@
         { .pci_subvendor = 0x1025, .pci_subdevice = 0x0078, .config = ALC880_6ST_DIG },
         { .pci_subvendor = 0x1025, .pci_subdevice = 0x0087, .config = ALC880_6ST_DIG },
-        { .pci_subvendor = 0x1297, .pci_subdevice = 0xc790, .config = ALC880_6ST_DIG }, /* Shuttle ST20G5 */
+        { .pci_subvendor = 0x1297, .pci_subdevice = 0xc790, .config = ALC880_6ST_DIG }, /* Shuttle ST20G5 */
+        { .pci_subvendor = 0x1509, .pci_subdevice = 0x925d, .config = ALC880_6ST_DIG }, /* FIC P4M-915GD1 */
 
         { .modelname = "asus", .config = ALC880_ASUS },
@@ -1692 +2138 @@
         { .pci_subvendor = 0x1043, .pci_subdevice = 0x1123, .config = ALC880_ASUS_DIG },
         { .pci_subvendor = 0x1043, .pci_subdevice = 0x1143, .config = ALC880_ASUS },
-        { .pci_subvendor = 0x1043, .pci_subdevice = 0x10b3, .config = ALC880_ASUS_W1V },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x10b3, .config = ALC880_ASUS_W1V },
+        { .pci_subvendor = 0x1043, .pci_subdevice = 0x8181, .config = ALC880_ASUS_DIG }, /* ASUS P4GPL-X */
         { .pci_subvendor = 0x1558, .pci_subdevice = 0x5401, .config = ALC880_ASUS_DIG2 },
 
         { .modelname = "uniwill", .config = ALC880_UNIWILL_DIG },
-        { .pci_subvendor = 0x1584, .pci_subdevice = 0x9050, .config = ALC880_UNIWILL_DIG },     
+        { .pci_subvendor = 0x1584, .pci_subdevice = 0x9050, .config = ALC880_UNIWILL_DIG },
 
         { .modelname = "F1734", .config = ALC880_F1734 },
         { .pci_subvendor = 0x1734, .pci_subdevice = 0x107c, .config = ALC880_F1734 },
         { .pci_subvendor = 0x1584, .pci_subdevice = 0x9054, .config = ALC880_F1734 },
+
+        { .modelname = "lg", .config = ALC880_LG },
+        { .pci_subvendor = 0x1854, .pci_subdevice = 0x003b, .config = ALC880_LG },
+        { .modelname = "lg-lw", .config = ALC880_LG_LW },
+        { .pci_subvendor = 0x1854, .pci_subdevice = 0x0018, .config = ALC880_LG_LW },
 
 #ifdef CONFIG_SND_DEBUG
@@ -1878 +2330 @@
                 .channel_mode = alc880_threestack_modes,
                 .input_mux = &alc880_capture_source,
-        },
+        },
+        [ALC880_LG] = {
+            .mixers = { alc880_lg_mixer },
+            .init_verbs = { alc880_volume_init_verbs,
+            alc880_lg_init_verbs },
+            .num_dacs = ARRAY_SIZE(alc880_lg_dac_nids),
+            .dac_nids = alc880_lg_dac_nids,
+            .dig_out_nid = ALC880_DIGOUT_NID,
+            .num_channel_mode = ARRAY_SIZE(alc880_lg_ch_modes),
+            .channel_mode = alc880_lg_ch_modes,
+            .input_mux = &alc880_lg_capture_source,
+            .unsol_event = alc880_lg_unsol_event,
+            .init_hook = alc880_lg_automute,
+        },
+        [ALC880_LG_LW] = {
+            .mixers = { alc880_lg_lw_mixer },
+            .init_verbs = { alc880_volume_init_verbs,
+            alc880_lg_lw_init_verbs },
+            .num_dacs = 1,
+            .dac_nids = alc880_dac_nids,
+            .dig_out_nid = ALC880_DIGOUT_NID,
+            .num_channel_mode = ARRAY_SIZE(alc880_2_jack_modes),
+            .channel_mode = alc880_2_jack_modes,
+            .input_mux = &alc880_lg_lw_capture_source,
+            .unsol_event = alc880_lg_lw_unsol_event,
+            .init_hook = alc880_lg_lw_automute,
+        },
 #ifdef CONFIG_SND_DEBUG
         [ALC880_TEST] = {
@@ -2043 +2521 @@
         if (alc880_is_fixed_pin(pin)) {
                 nid = alc880_idx_to_dac(alc880_fixed_pin_idx(pin));
-                if (! spec->multiout.dac_nids[0]) {
-                        /* use this as the primary output */
-                        spec->multiout.dac_nids[0] = nid;
-                        if (! spec->multiout.num_dacs)
-                                spec->multiout.num_dacs = 1;
-                } else 
-                        /* specify the DAC as the extra output */
-                        spec->multiout.hp_nid = nid;
+                /* specify the DAC as the extra output */
+                if (! spec->multiout.hp_nid)
+                    spec->multiout.hp_nid = nid;
+                else
+                    spec->multiout.extra_out_nid[0] = nid;
                 /* control HP volume/switch on the output mixer amp */
                 nid = alc880_idx_to_mixer(alc880_fixed_pin_idx(pin));
@@ -2063 +2538 @@
         } else if (alc880_is_multi_pin(pin)) {
                 /* set manual connection */
-                if (! spec->multiout.dac_nids[0]) {
-                        /* use this as the primary output */
-                        spec->multiout.dac_nids[0] = alc880_idx_to_dac(alc880_multi_pin_idx(pin));
-                        if (! spec->multiout.num_dacs)
-                                spec->multiout.num_dacs = 1;
-                }
                 /* we have only a switch on HP-out PIN */
                 sprintf(name, "%s Playback Switch", pfx);
@@ -2152 +2621 @@
         hda_nid_t pin;
 
-        pin = spec->autocfg.speaker_pin;
+        pin = spec->autocfg.speaker_pins[0];
         if (pin) /* connect to front */
                 alc880_auto_set_output_and_unmute(codec, pin, PIN_OUT, 0);
@@ -2187 +2656 @@
         if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
                                                 alc880_ignore)) < 0)
-                return err;
-        if (! spec->autocfg.line_outs && ! spec->autocfg.speaker_pin &&
-            ! spec->autocfg.hp_pin)
-                return 0; /* can't find valid BIOS pin config */
+            return err;
+        if (! spec->autocfg.line_outs)
+            return 0; /* can't find valid BIOS pin config */
 
         if ((err = alc880_auto_fill_dac_nids(spec, &spec->autocfg)) < 0 ||
-            (err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
-            (err = alc880_auto_create_extra_out(spec, spec->autocfg.speaker_pin,
-                                                "Speaker")) < 0 ||
-            (err = alc880_auto_create_extra_out(spec, spec->autocfg.speaker_pin,
+            (err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
+            (err = alc880_auto_create_extra_out(spec,
+                                                spec->autocfg.speaker_pins[0],
+                                                "Speaker")) < 0 ||
+            (err = alc880_auto_create_extra_out(spec, spec->autocfg.hp_pin,
                                                 "Headphone")) < 0 ||
             (err = alc880_auto_create_analog_input_ctls(spec, &spec->autocfg)) < 0)
@@ -2218 +2687 @@
 }
 
-/* init callback for auto-configuration model -- overriding the default init */
-static int alc880_auto_init(struct hda_codec *codec)
-{
-        alc_init(codec);
-        alc880_auto_init_multi_out(codec);
-        alc880_auto_init_extra_out(codec);
-        alc880_auto_init_analog_input(codec);
-        return 0;
+/* additional initialization for auto-configuration model */
+static void alc880_auto_init(struct hda_codec *codec)
+{
+    alc880_auto_init_multi_out(codec);
+    alc880_auto_init_extra_out(codec);
+    alc880_auto_init_analog_input(codec);
 }
 
@@ -2291 +2758 @@
 
         codec->patch_ops = alc_patch_ops;
-        if (board_config == ALC880_AUTO)
-                codec->patch_ops.init = alc880_auto_init;
+        if (board_config == ALC880_AUTO)
+            spec->init_hook = alc880_auto_init;
 
         return 0;
@@ -2320 +2787 @@
         /* ADC1, 0 */
         0x05, 0x04
+};
+
+/* NIDs used when simultaneous access to both ADCs makes sense.  Note that
+ * alc260_capture_mixer assumes ADC0 (nid 0x04) is the first ADC.
+ */
+static hda_nid_t alc260_dual_adc_nids[2] = {
+        /* ADC0, ADC1 */
+        0x04, 0x05
 };
 
@@ -2335 +2810 @@
 };
 
-/* On Fujitsu S702x laptops capture only makes sense from Mic/LineIn jack
- * and the internal CD lines.
+/* On Fujitsu S702x laptops capture only makes sense from Mic/LineIn jack,
+ * headphone jack and the internal CD lines.
  */
 static struct hda_input_mux alc260_fujitsu_capture_source = {
-        .num_items = 2,
+        .num_items = 3,
         .items = {
                 { "Mic/Line", 0x0 },
+                { "CD", 0x4 },
+                { "Headphone", 0x2 },
+        },
+};
+
+/* Acer TravelMate(/Extensa/Aspire) notebooks have similar configutation to
+ * the Fujitsu S702x, but jacks are marked differently. We won't allow
+ * retasking the Headphone jack, so it won't be available here.
+ */
+static struct hda_input_mux alc260_acer_capture_source = {
+        .num_items = 3,
+        .items = {
+                { "Mic", 0x0 },
+                { "Line", 0x2 },
                 { "CD", 0x4 },
         },
@@ -2363 +2852 @@
  * HP_3013: hp_3013 + input + capture
  * fujitsu: fujitsu + capture
+ * acer: acer + capture
  */
 
@@ -2373 +2863 @@
         HDA_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_INPUT),
         {0} /* end */
-};      
+};
 
 static struct snd_kcontrol_new alc260_input_mixer[] = {
@@ -2408 +2898 @@
         HDA_CODEC_VOLUME("Headphone Playback Volume", 0x08, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Headphone Playback Switch", 0x08, 2, HDA_INPUT),
-        ALC_PINCTL_SWITCH("Headphone Amp Switch", 0x14, PIN_HP_AMP),
+        ALC_PIN_MODE("Headphone Jack Mode", 0x14, ALC_PIN_DIR_INOUT),
         HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
         HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
         HDA_CODEC_VOLUME("Mic/Line Playback Volume", 0x07, 0x0, HDA_INPUT),
         HDA_CODEC_MUTE("Mic/Line Playback Switch", 0x07, 0x0, HDA_INPUT),
+        ALC_PIN_MODE("Mic/Line Jack Mode", 0x12, ALC_PIN_DIR_IN),
         HDA_CODEC_VOLUME("Beep Playback Volume", 0x07, 0x05, HDA_INPUT),
         HDA_CODEC_MUTE("Beep Playback Switch", 0x07, 0x05, HDA_INPUT),
         HDA_CODEC_VOLUME("Internal Speaker Playback Volume", 0x09, 0x0, HDA_OUTPUT),
         HDA_BIND_MUTE("Internal Speaker Playback Switch", 0x09, 2, HDA_INPUT),
+        {0} /* end */
+};
+
+static struct snd_kcontrol_new alc260_acer_mixer[] = {
+        HDA_CODEC_VOLUME("Master Playback Volume", 0x08, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("Master Playback Switch", 0x08, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x07, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x07, 0x0, HDA_INPUT),
+        ALC_PIN_MODE("Mic Jack Mode", 0x12, ALC_PIN_DIR_IN),
+        HDA_CODEC_VOLUME("Line Playback Volume", 0x07, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("Line Playback Switch", 0x07, 0x02, HDA_INPUT),
+        ALC_PIN_MODE("Line Jack Mode", 0x14, ALC_PIN_DIR_INOUT),
+        HDA_CODEC_VOLUME("Beep Playback Volume", 0x07, 0x05, HDA_INPUT),
+        HDA_CODEC_MUTE("Beep Playback Switch", 0x07, 0x05, HDA_INPUT),
         {0} /* end */
 };
@@ -2476 +2983 @@
         {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
         /* select line-out */
-        {0x15, AC_VERB_SET_CONNECT_SEL, 0x00},
+        {0x0e, AC_VERB_SET_CONNECT_SEL, 0x00},
         /* LINE-OUT pin */
         {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
@@ -2629 +3136 @@
         /* Headphone/Line-out jack connects to Line1 pin; make it an output */
         {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
-        /* Mic/Line-in jack is connected to mic1 pin, so make it an input */
-        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
-        /* Ensure all other unused pins are disabled and muted.
-         * Note: trying to set widget 0x15 to anything blocks all audio
-         * output for some reason, so just leave that at the default.
+        /* Mic/Line-in jack is connected to mic1 pin, so make it an input */
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        /* Ensure all other unused pins are disabled and muted. */
+        {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+
+        /* Disable digital (SPDIF) pins */
+        {0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},
+        {0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},
+
+        /* Ensure Line1 pin widget takes its input from the OUT1 sum bus
+         * when acting as an output.
          */
-        {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
-        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0d, AC_VERB_SET_CONNECT_SEL, 0},
+
+        /* Start with output sum widgets muted and their output gains at min */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+
+        /* Unmute HP pin widget amp left and right (no equiv mixer ctrl) */
+        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Unmute Line1 pin widget output buffer since it starts as an output.
+         * If the pin mode is changed by the user the pin mode control will
+         * take care of enabling the pin's input/output buffers as needed.
+         * Therefore there's no need to enable the input buffer at this
+         * stage.
+         */
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Unmute input buffer of pin widget used for Line-in (no equiv
+         * mixer ctrl)
+         */
+        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+        /* Mute capture amp left and right */
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        /* Set ADC connection select to match default mixer setting - line
+         * in (on mic1 pin)
+         */
+        {0x04, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        /* Do the same for the second ADC: mute capture input amp and
+         * set ADC connection to line in (on mic1 pin)
+         */
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x05, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        /* Mute all inputs to mixer widget (even unconnected ones) */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */
+
+        {0}
+};
+
+/* Initialisation sequence for ALC260 as configured in Acer TravelMate and
+ * similar laptops (adapted from Fujitsu init verbs).
+ */
+static struct hda_verb alc260_acer_init_verbs[] = {
+        /* On TravelMate laptops, GPIO 0 enables the internal speaker and
+         * the headphone jack.  Turn this on and rely on the standard mute
+         * methods whenever the user wants to turn these outputs off.
+         */
+        {0x01, AC_VERB_SET_GPIO_MASK, 0x01},
+        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x01},
+        {0x01, AC_VERB_SET_GPIO_DATA, 0x01},
+        /* Internal speaker/Headphone jack is connected to Line-out pin */
+        {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        /* Internal microphone/Mic jack is connected to Mic1 pin */
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50},
+        /* Line In jack is connected to Line1 pin */
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
+        /* Ensure all other unused pins are disabled and muted. */
+        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x11, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
-        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
-        {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        /* Disable digital (SPDIF) pins */
-        {0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},
-        {0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},
-
-        /* Start with mixer outputs muted */
-        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
-
-        /* Unmute HP pin widget amp left and right (no equiv mixer ctrl) */
-        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Unmute Line1 pin widget amp left and right (no equiv mixer ctrl) */
-        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        /* Unmute pin widget used for Line-in (no equiv mixer ctrl) */
-        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-
-        /* Mute capture amp left and right */
-        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
-        /* Set ADC connection select to line in (on mic1 pin) */
-        {0x04, AC_VERB_SET_CONNECT_SEL, 0x00},
-
-        /* Mute all inputs to mixer widget (even unconnected ones) */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */
-        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */
+        {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, 0},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        /* Disable digital (SPDIF) pins */
+        {0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},
+        {0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},
+
+        /* Ensure Mic1 and Line1 pin widgets take input from the OUT1 sum
+         * bus when acting as outputs.
+         */
+        {0x0b, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x0d, AC_VERB_SET_CONNECT_SEL, 0},
+
+        /* Start with output sum widgets muted and their output gains at min */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+
+        /* Unmute Line-out pin widget amp left and right (no equiv mixer ctrl) */
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Unmute Mic1 and Line1 pin widget input buffers since they start as
+         * inputs. If the pin mode is changed by the user the pin mode control
+         * will take care of enabling the pin's input/output buffers as needed.
+         * Therefore there's no need to enable the input buffer at this
+         * stage.
+         */
+        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
+
+        /* Mute capture amp left and right */
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        /* Set ADC connection select to match default mixer setting - mic
+         * (on mic1 pin)
+         */
+        {0x04, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        /* Do similar with the second ADC: mute capture input amp and
+         * set ADC connection to line (on line1 pin)
+         */
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x05, AC_VERB_SET_CONNECT_SEL, 0x02},
+
+        /* Mute all inputs to mixer widget (even unconnected ones) */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */
 
         {0}
 };
+
+/* Test configuration for debugging, modelled after the ALC880 test
+ * configuration.
+ */
+#ifdef CONFIG_SND_DEBUG
+static hda_nid_t alc260_test_dac_nids[1] = {
+        0x02,
+};
+static hda_nid_t alc260_test_adc_nids[2] = {
+        0x04, 0x05,
+};
+/* This is a bit messy since the two input muxes in the ALC260 have slight
+ * variations in their signal assignments.  The ideal way to deal with this
+ * is to extend alc_spec.input_mux to allow a different input MUX for each
+ * ADC.  For the purposes of the test model it's sufficient to just list
+ * both options for affected signal indices.  The separate input mux
+ * functionality only needs to be considered if a model comes along which
+ * actually uses signals 0x5, 0x6 and 0x7 for something which makes sense to
+ * record.
+ */
+static struct hda_input_mux alc260_test_capture_source = {
+        .num_items = 8,
+        .items = {
+                { "MIC1 pin", 0x0 },
+                { "MIC2 pin", 0x1 },
+                { "LINE1 pin", 0x2 },
+                { "LINE2 pin", 0x3 },
+                { "CD pin", 0x4 },
+                { "LINE-OUT pin (cap1), Mixer (cap2)", 0x5 },
+                { "HP-OUT pin (cap1), LINE-OUT pin (cap2)", 0x6 },
+                { "HP-OUT pin (cap2 only)", 0x7 },
+        },
+};
+static struct snd_kcontrol_new alc260_test_mixer[] = {
+        /* Output driver widgets */
+        HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE_MONO("Mono Playback Switch", 0x0a, 1, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("LOUT2 Playback Volume", 0x09, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("LOUT2 Playback Switch", 0x09, 2, HDA_INPUT),
+        HDA_CODEC_VOLUME("LOUT1 Playback Volume", 0x08, 0x0, HDA_OUTPUT),
+        HDA_BIND_MUTE("LOUT1 Playback Switch", 0x08, 2, HDA_INPUT),
+
+        /* Modes for retasking pin widgets */
+        ALC_PIN_MODE("HP-OUT pin mode", 0x10, ALC_PIN_DIR_INOUT),
+        ALC_PIN_MODE("LINE-OUT pin mode", 0x0f, ALC_PIN_DIR_INOUT),
+        ALC_PIN_MODE("LINE2 pin mode", 0x15, ALC_PIN_DIR_INOUT),
+        ALC_PIN_MODE("LINE1 pin mode", 0x14, ALC_PIN_DIR_INOUT),
+        ALC_PIN_MODE("MIC2 pin mode", 0x13, ALC_PIN_DIR_INOUT),
+        ALC_PIN_MODE("MIC1 pin mode", 0x12, ALC_PIN_DIR_INOUT),
+
+        /* Loopback mixer controls */
+        HDA_CODEC_VOLUME("MIC1 Playback Volume", 0x07, 0x00, HDA_INPUT),
+        HDA_CODEC_MUTE("MIC1 Playback Switch", 0x07, 0x00, HDA_INPUT),
+        HDA_CODEC_VOLUME("MIC2 Playback Volume", 0x07, 0x01, HDA_INPUT),
+        HDA_CODEC_MUTE("MIC2 Playback Switch", 0x07, 0x01, HDA_INPUT),
+        HDA_CODEC_VOLUME("LINE1 Playback Volume", 0x07, 0x02, HDA_INPUT),
+        HDA_CODEC_MUTE("LINE1 Playback Switch", 0x07, 0x02, HDA_INPUT),
+        HDA_CODEC_VOLUME("LINE2 Playback Volume", 0x07, 0x03, HDA_INPUT),
+        HDA_CODEC_MUTE("LINE2 Playback Switch", 0x07, 0x03, HDA_INPUT),
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x07, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Beep Playback Volume", 0x07, 0x05, HDA_INPUT),
+        HDA_CODEC_MUTE("Beep Playback Switch", 0x07, 0x05, HDA_INPUT),
+        HDA_CODEC_VOLUME("LINE-OUT loopback Playback Volume", 0x07, 0x06, HDA_INPUT),
+        HDA_CODEC_MUTE("LINE-OUT loopback Playback Switch", 0x07, 0x06, HDA_INPUT),
+        HDA_CODEC_VOLUME("HP-OUT loopback Playback Volume", 0x07, 0x7, HDA_INPUT),
+        HDA_CODEC_MUTE("HP-OUT loopback Playback Switch", 0x07, 0x7, HDA_INPUT),
+
+        /* Controls for GPIO pins, assuming they are configured as outputs */
+        ALC_GPIO_DATA_SWITCH("GPIO pin 0", 0x01, 0x01),
+        ALC_GPIO_DATA_SWITCH("GPIO pin 1", 0x01, 0x02),
+        ALC_GPIO_DATA_SWITCH("GPIO pin 2", 0x01, 0x04),
+        ALC_GPIO_DATA_SWITCH("GPIO pin 3", 0x01, 0x08),
+
+        /* Switches to allow the digital IO pins to be enabled.  The datasheet
+         * is ambigious as to which NID is which; testing on laptops which
+         * make this output available should provide clarification.
+         */
+        ALC_SPDIF_CTRL_SWITCH("SPDIF Playback Switch", 0x03, 0x01),
+        ALC_SPDIF_CTRL_SWITCH("SPDIF Capture Switch", 0x06, 0x01),
+
+        {0} /* end */
+};
+static struct hda_verb alc260_test_init_verbs[] = {
+        /* Enable all GPIOs as outputs with an initial value of 0 */
+        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x0f},
+        {0x01, AC_VERB_SET_GPIO_DATA, 0x00},
+        {0x01, AC_VERB_SET_GPIO_MASK, 0x0f},
+
+        /* Enable retasking pins as output, initially without power amp */
+        {0x10, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x13, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+        {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
+
+        /* Disable digital (SPDIF) pins initially, but users can enable
+         * them via a mixer switch.  In the case of SPDIF-out, this initverb
+         * payload also sets the generation to 0, output to be in "consumer"
+         * PCM format, copyright asserted, no pre-emphasis and no validity
+         * control.
+         */
+        {0x03, AC_VERB_SET_DIGI_CONVERT_1, 0},
+        {0x06, AC_VERB_SET_DIGI_CONVERT_1, 0},
+
+        /* Ensure mic1, mic2, line1 and line2 pin widgets take input from the
+         * OUT1 sum bus when acting as an output.
+         */
+        {0x0b, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x0c, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x0d, AC_VERB_SET_CONNECT_SEL, 0},
+        {0x0e, AC_VERB_SET_CONNECT_SEL, 0},
+
+        /* Start with output sum widgets muted and their output gains at min */
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
+        {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
+
+        /* Unmute retasking pin widget output buffers since the default
+         * state appears to be output.  As the pin mode is changed by the
+         * user the pin mode control will take care of enabling the pin's
+         * input/output buffers as needed.
+         */
+        {0x10, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x0f, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x13, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        {0x12, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+        /* Also unmute the mono-out pin widget */
+        {0x11, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
+
+        /* Mute capture amp left and right */
+        {0x04, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        /* Set ADC connection select to match default mixer setting (mic1
+         * pin)
+         */
+        {0x04, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        /* Do the same for the second ADC: mute capture input amp and
+         * set ADC connection to mic1 pin
+         */
+        {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
+        {0x05, AC_VERB_SET_CONNECT_SEL, 0x00},
+
+        /* Mute all inputs to mixer widget (even unconnected ones) */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* mic1 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)}, /* mic2 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, /* line1 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, /* line2 pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, /* CD pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(5)}, /* Beep-gen pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(6)}, /* Line-out pin */
+        {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(7)}, /* HP-pin pin */
+
+        {0}
+};
+#endif
 
 static struct hda_pcm_stream alc260_pcm_analog_playback = {
@@ -2716 +3498 @@
         } else
                 return 0; /* N/A */
-        
-        sprintf(name, "%s Playback Volume", pfx);
+
+        sprintf(name, /*sizeof(name), */"%s Playback Volume", pfx);
         if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, name, vol_val)) < 0)
                 return err;
-        sprintf(name, "%s Playback Switch", pfx);
+        sprintf(name, /*sizeof(name), */"%s Playback Switch", pfx);
         if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, name, sw_val)) < 0)
                 return err;
@@ -2744 +3526 @@
         }
 
-        nid = cfg->speaker_pin;
+        nid = cfg->speaker_pins[0];
         if (nid) {
                 err = alc260_add_playback_controls(spec, nid, "Speaker");
@@ -2757 +3539 @@
                         return err;
         }
-        return 0;       
+        return 0;
 }
 
@@ -2804 +3586 @@
                 snd_hda_codec_write(codec, idx + 0x0b, 0,
                                     AC_VERB_SET_CONNECT_SEL, sel_idx);
-                                    
+
         }
 }
@@ -2813 +3595 @@
         hda_nid_t nid;
 
-        nid = spec->autocfg.line_out_pins[0];   
+        nid = spec->autocfg.line_out_pins[0];
         if (nid)
                 alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);
-        
-        nid = spec->autocfg.speaker_pin;
+
+        nid = spec->autocfg.speaker_pins[0];
         if (nid)
                 alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);
@@ -2824 +3606 @@
         if (nid)
                 alc260_auto_set_output_and_unmute(codec, nid, PIN_OUT, 0);
-}       
+}
 
 #define ALC260_PIN_CD_NID               0x16
@@ -2855 +3637 @@
         {0x05, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        
+
         /* Unmute input amps (CD, Line In, Mic 1 & Mic 2) of the analog-loopback
          * mixer widget
@@ -2883 +3665 @@
         {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x0a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        
+
         {0}
 };
@@ -2932 +3714 @@
 }
 
-/* init callback for auto-configuration model -- overriding the default init */
-static int alc260_auto_init(struct hda_codec *codec)
-{
-        alc_init(codec);
-        alc260_auto_init_multi_out(codec);
-        alc260_auto_init_analog_input(codec);
-        return 0;
+/* additional initialization for auto-configuration model */
+static void alc260_auto_init(struct hda_codec *codec)
+{
+    alc260_auto_init_multi_out(codec);
+    alc260_auto_init_analog_input(codec);
 }
 
@@ -2947 +3727 @@
         { .modelname = "basic", .config = ALC260_BASIC },
         { .pci_subvendor = 0x104d, .pci_subdevice = 0x81bb,
-          .config = ALC260_BASIC }, /* Sony VAIO */
+        .config = ALC260_BASIC }, /* Sony VAIO */
+        { .pci_subvendor = 0x152d, .pci_subdevice = 0x0729,
+        .config = ALC260_BASIC }, /* CTL Travel Master U553W */
         { .modelname = "hp", .config = ALC260_HP },
         { .pci_subvendor = 0x103c, .pci_subdevice = 0x3010, .config = ALC260_HP },
@@ -2958 +3740 @@
         { .modelname = "fujitsu", .config = ALC260_FUJITSU_S702X },
         { .pci_subvendor = 0x10cf, .pci_subdevice = 0x1326, .config = ALC260_FUJITSU_S702X },
+        { .modelname = "acer", .config = ALC260_ACER },
+        { .pci_subvendor = 0x1025, .pci_subdevice = 0x008f, .config = ALC260_ACER },
+#ifdef CONFIG_SND_DEBUG
+        { .modelname = "test", .config = ALC260_TEST },
+#endif
         { .modelname = "auto", .config = ALC260_AUTO },
-        {0}
+        {0}
 };
 
@@ -3009 +3796 @@
                 .num_dacs = ARRAY_SIZE(alc260_dac_nids),
                 .dac_nids = alc260_dac_nids,
-                .num_adc_nids = ARRAY_SIZE(alc260_adc_nids),
-                .adc_nids = alc260_adc_nids,
+                .num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),
+                .adc_nids = alc260_dual_adc_nids,
                 .num_channel_mode = ARRAY_SIZE(alc260_modes),
                 .channel_mode = alc260_modes,
                 .input_mux = &alc260_fujitsu_capture_source,
         },
+        [ALC260_ACER] = {
+                .mixers = { alc260_acer_mixer,
+                            alc260_capture_mixer },
+                .init_verbs = { alc260_acer_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc260_dac_nids),
+                .dac_nids = alc260_dac_nids,
+                .num_adc_nids = ARRAY_SIZE(alc260_dual_adc_nids),
+                .adc_nids = alc260_dual_adc_nids,
+                .num_channel_mode = ARRAY_SIZE(alc260_modes),
+                .channel_mode = alc260_modes,
+                .input_mux = &alc260_acer_capture_source,
+        },
+#ifdef CONFIG_SND_DEBUG
+        [ALC260_TEST] = {
+                .mixers = { alc260_test_mixer,
+                            alc260_capture_mixer },
+                .init_verbs = { alc260_test_init_verbs },
+                .num_dacs = ARRAY_SIZE(alc260_test_dac_nids),
+                .dac_nids = alc260_test_dac_nids,
+                .num_adc_nids = ARRAY_SIZE(alc260_test_adc_nids),
+                .adc_nids = alc260_test_adc_nids,
+                .num_channel_mode = ARRAY_SIZE(alc260_modes),
+                .channel_mode = alc260_modes,
+                .input_mux = &alc260_test_capture_source,
+        },
+#endif
 };
 
@@ -3058 +3871 @@
 
         codec->patch_ops = alc_patch_ops;
-        if (board_config == ALC260_AUTO)
-                codec->patch_ops.init = alc260_auto_init;
+        if (board_config == ALC260_AUTO)
+            spec->init_hook = alc260_auto_init;
 
         return 0;
@@ -3417 +4230 @@
  */
 static struct hda_board_config alc882_cfg_tbl[] = {
-        { .modelname = "3stack-dig", .config = ALC861_3ST_DIG },
-        { .modelname = "6stack-dig", .config = ALC861_6ST_DIG },
+        { .modelname = "3stack-dig", .config = ALC882_3ST_DIG },
+        { .modelname = "6stack-dig", .config = ALC882_6ST_DIG },
         { .pci_subvendor = 0x1462, .pci_subdevice = 0x6668, .config = ALC882_6ST_DIG }, /* MSI  */
         { .pci_subvendor = 0x105b, .pci_subdevice = 0x6668, .config = ALC882_6ST_DIG }, /* Foxconn */
         { .pci_subvendor = 0x1019, .pci_subdevice = 0x6668, .config = ALC882_6ST_DIG }, /* ECS */
-        { .modelname = "auto", .config = ALC861_AUTO },
+        { .modelname = "auto", .config = ALC882_AUTO },
         {0}
 };
@@ -3465 +4278 @@
         /* set as output */
         struct alc_spec *spec = codec->spec;
-        int idx; 
-        
+        int idx;
+
         if (spec->multiout.dac_nids[dac_idx] == 0x25)
                 idx = 4;
@@ -3484 +4297 @@
 
         for (i = 0; i <= HDA_SIDE; i++) {
-                hda_nid_t nid = spec->autocfg.line_out_pins[i]; 
+                hda_nid_t nid = spec->autocfg.line_out_pins[i];
                 if (nid)
                         alc882_auto_set_output_and_unmute(codec, nid, PIN_OUT, i);
@@ -3534 +4347 @@
 }
 
-/* init callback for auto-configuration model -- overriding the default init */
-static int alc882_auto_init(struct hda_codec *codec)
-{
-        alc_init(codec);
-        alc882_auto_init_multi_out(codec);
-        alc882_auto_init_hp_out(codec);
-        alc882_auto_init_analog_input(codec);
-        return 0;
+/* additional initialization for auto-configuration model */
+static void alc882_auto_init(struct hda_codec *codec)
+{
+    alc882_auto_init_multi_out(codec);
+    alc882_auto_init_hp_out(codec);
+    alc882_auto_init_analog_input(codec);
 }
 
@@ -3607 +4418 @@
 
         codec->patch_ops = alc_patch_ops;
-        if (board_config == ALC882_AUTO)
-                codec->patch_ops.init = alc882_auto_init;
+        if (board_config == ALC882_AUTO)
+            spec->init_hook = alc882_auto_init;
 
         return 0;
@@ -3644 +4455 @@
         HDA_CODEC_VOLUME_MONO("Mono Playback Volume", 0x0e, 2, 0x0, HDA_OUTPUT),
         HDA_CODEC_MUTE_MONO("Mono Playback Switch", 0x16, 2, 0x0, HDA_OUTPUT),
-        HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
-        HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Capture Source",
-                .count = 1,
-                .info = alc882_mux_enum_info,
-                .get = alc882_mux_enum_get,
-                .put = alc882_mux_enum_put,
-        },
         {0} /* end */
-};                      
-        
+};
+
 #define alc262_capture_mixer            alc882_capture_mixer
 #define alc262_capture_alt_mixer        alc882_capture_alt_mixer
@@ -3714 +4515 @@
         {0x18, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
         {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, 0x0000},
-        
+
         {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x15, AC_VERB_SET_CONNECT_SEL, 0x01},
-        
+
         /* FIXME: use matrix-type input source selection */
         /* Mixer elements: 0x18, 19, 1a, 1b, 1c, 1d, 14, 15, 16, 17, 0b */
@@ -3734 +4535 @@
         {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x03 << 8))},
         {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x02 << 8))},
-        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},      
+        {0x22, AC_VERB_SET_AMP_GAIN_MUTE, (0x7080 | (0x04 << 8))},
 
         {0}
+};
+
+/*
+ * fujitsu model
+ *  0x14 = headphone/spdif-out, 0x15 = internal speaker
+ */
+
+#define ALC_HP_EVENT    0x37
+
+static struct hda_verb alc262_fujitsu_unsol_verbs[] = {
+        {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC_HP_EVENT},
+        {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP},
+        {0}
+};
+
+static struct hda_input_mux alc262_fujitsu_capture_source = {
+        .num_items = 2,
+        .items = {
+                { "Mic", 0x0 },
+                { "CD", 0x4 },
+        },
+};
+
+/* mute/unmute internal speaker according to the hp jack and mute state */
+static void alc262_fujitsu_automute(struct hda_codec *codec, int force)
+{
+        struct alc_spec *spec = codec->spec;
+        unsigned int mute;
+
+        if (force || ! spec->sense_updated) {
+                unsigned int present;
+                /* need to execute and sync at first */
+                snd_hda_codec_read(codec, 0x14, 0, AC_VERB_SET_PIN_SENSE, 0);
+                present = snd_hda_codec_read(codec, 0x14, 0,
+                                         AC_VERB_GET_PIN_SENSE, 0);
+                spec->jack_present = (present & 0x80000000) != 0;
+                spec->sense_updated = 1;
+        }
+        if (spec->jack_present) {
+                /* mute internal speaker */
+                snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
+                                         0x80, 0x80);
+                snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
+                                         0x80, 0x80);
+        } else {
+                /* unmute internal speaker if necessary */
+                mute = snd_hda_codec_amp_read(codec, 0x14, 0, HDA_OUTPUT, 0);
+                snd_hda_codec_amp_update(codec, 0x15, 0, HDA_OUTPUT, 0,
+                                         0x80, mute & 0x80);
+                mute = snd_hda_codec_amp_read(codec, 0x14, 1, HDA_OUTPUT, 0);
+                snd_hda_codec_amp_update(codec, 0x15, 1, HDA_OUTPUT, 0,
+                                         0x80, mute & 0x80);
+        }
+}
+
+/* unsolicited event for HP jack sensing */
+static void alc262_fujitsu_unsol_event(struct hda_codec *codec,
+                                       unsigned int res)
+{
+        if ((res >> 26) != ALC_HP_EVENT)
+                return;
+        alc262_fujitsu_automute(codec, 1);
+}
+
+/* bind volumes of both NID 0x0c and 0x0d */
+static int alc262_fujitsu_master_vol_put(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        long *valp = ucontrol->value.integer.value;
+        int change;
+
+        change = snd_hda_codec_amp_update(codec, 0x0c, 0, HDA_OUTPUT, 0,
+                                          0x7f, valp[0] & 0x7f);
+        change |= snd_hda_codec_amp_update(codec, 0x0c, 1, HDA_OUTPUT, 0,
+                                           0x7f, valp[1] & 0x7f);
+        snd_hda_codec_amp_update(codec, 0x0d, 0, HDA_OUTPUT, 0,
+                                 0x7f, valp[0] & 0x7f);
+        snd_hda_codec_amp_update(codec, 0x0d, 1, HDA_OUTPUT, 0,
+                                 0x7f, valp[1] & 0x7f);
+        return change;
+}
+
+/* bind hp and internal speaker mute (with plug check) */
+static int alc262_fujitsu_master_sw_put(struct snd_kcontrol *kcontrol,
+                                         struct snd_ctl_elem_value *ucontrol)
+{
+        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+        long *valp = ucontrol->value.integer.value;
+        int change;
+
+        change = snd_hda_codec_amp_update(codec, 0x14, 0, HDA_OUTPUT, 0,
+                                          0x80, valp[0] ? 0 : 0x80);
+        change |= snd_hda_codec_amp_update(codec, 0x14, 1, HDA_OUTPUT, 0,
+                                           0x80, valp[1] ? 0 : 0x80);
+        if (change || codec->in_resume)
+                alc262_fujitsu_automute(codec, codec->in_resume);
+        return change;
+}
+
+static struct snd_kcontrol_new alc262_fujitsu_mixer[] = {
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Master Playback Volume",
+                .info = snd_hda_mixer_amp_volume_info,
+                .get = snd_hda_mixer_amp_volume_get,
+                .put = alc262_fujitsu_master_vol_put,
+                .private_value = HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT),
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "Master Playback Switch",
+                .info = snd_hda_mixer_amp_switch_info,
+                .get = snd_hda_mixer_amp_switch_get,
+                .put = alc262_fujitsu_master_sw_put,
+                .private_value = HDA_COMPOSE_AMP_VAL(0x14, 3, 0, HDA_OUTPUT),
+        },
+        HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT),
+        HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
+        HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
+        {0} /* end */
 };
 
@@ -3759 +4683 @@
         }
 
-        nid = cfg->speaker_pin;
+        nid = cfg->speaker_pins[0];
         if (nid) {
                 if (nid == 0x16) {
-                        if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Speaker Playback Volume",
-                                               HDA_COMPOSE_AMP_VAL(0x0e, 2, 0, HDA_OUTPUT))) < 0)
-                                return err;
                         if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Speaker Playback Switch",
                                                HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT))) < 0)
@@ -3789 +4710 @@
                                 return err;
                 } else {
-                        if (! cfg->line_out_pins[0])
-                                if ((err = add_control(spec, ALC_CTL_WIDGET_VOL, "Headphone Playback Volume",
-                                               HDA_COMPOSE_AMP_VAL(0x0c, 3, 0, HDA_OUTPUT))) < 0)
-                                        return err;
                         if ((err = add_control(spec, ALC_CTL_WIDGET_MUTE, "Headphone Playback Switch",
                                                HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT))) < 0)
@@ -3798 +4715 @@
                 }
         }
-        return 0;       
+        return 0;
 }
 
@@ -3837 +4754 @@
         {0x0d, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
         {0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_ZERO},
-        
+
         /* set up input amps for analog loopback */
         /* Amp Indices: DAC = 0, mixer = 1 */
@@ -3885 +4802 @@
         if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
                                                 alc262_ignore)) < 0)
-                return err;
-        if (! spec->autocfg.line_outs && ! spec->autocfg.speaker_pin &&
-            ! spec->autocfg.hp_pin)
+            return err;
+        if (! spec->autocfg.line_outs)
                 return 0; /* can't find valid BIOS pin config */
         if ((err = alc262_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
@@ -3915 +4831 @@
 
 /* init callback for auto-configuration model -- overriding the default init */
-static int alc262_auto_init(struct hda_codec *codec)
-{
-        alc_init(codec);
-        alc262_auto_init_multi_out(codec);
-        alc262_auto_init_hp_out(codec);
-        alc262_auto_init_analog_input(codec);
-        return 0;
+static void alc262_auto_init(struct hda_codec *codec)
+{
+    alc262_auto_init_multi_out(codec);
+    alc262_auto_init_hp_out(codec);
+    alc262_auto_init_analog_input(codec);
 }
 
@@ -3929 +4843 @@
 static struct hda_board_config alc262_cfg_tbl[] = {
         { .modelname = "basic", .config = ALC262_BASIC },
+        { .modelname = "fujitsu", .config = ALC262_FUJITSU },
+        { .pci_subvendor = 0x10cf, .pci_subdevice = 0x1397, .config = ALC262_FUJITSU },
         { .modelname = "auto", .config = ALC262_AUTO },
-        {0}
+        {0}
 };
 
@@ -3943 +4859 @@
                 .channel_mode = alc262_modes,
                 .input_mux = &alc262_capture_source,
+        },
+        [ALC262_FUJITSU] = {
+                .mixers = { alc262_fujitsu_mixer },
+                .init_verbs = { alc262_init_verbs, alc262_fujitsu_unsol_verbs },
+                .num_dacs = ARRAY_SIZE(alc262_dac_nids),
+                .dac_nids = alc262_dac_nids,
+                .hp_nid = 0x03,
+                .dig_out_nid = ALC262_DIGOUT_NID,
+                .num_channel_mode = ARRAY_SIZE(alc262_modes),
+                .channel_mode = alc262_modes,
+                .input_mux = &alc262_fujitsu_capture_source,
+                .unsol_event = alc262_fujitsu_unsol_event,
         },
 };
@@ -3992 +4920 @@
         spec->stream_analog_playback = &alc262_pcm_analog_playback;
         spec->stream_analog_capture = &alc262_pcm_analog_capture;
-                
+
         spec->stream_name_digital = "ALC262 Digital";
         spec->stream_digital_playback = &alc262_pcm_digital_playback;
@@ -4016 +4944 @@
 
         codec->patch_ops = alc_patch_ops;
-        if (board_config == ALC262_AUTO)
-                codec->patch_ops.init = alc262_auto_init;
-        
+        if (board_config == ALC262_AUTO)
+            spec->init_hook = alc262_auto_init;
+
         return 0;
 }
@@ -4087 +5015 @@
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT),
- 
+
         /* Capture mixer control */
         HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
@@ -4121 +5049 @@
         HDA_CODEC_MUTE("Front Mic Playback Switch", 0x10, 0x01, HDA_OUTPUT),
         HDA_CODEC_MUTE("Headphone Playback Switch", 0x1a, 0x03, HDA_INPUT),
- 
+
         /* Capture mixer control */
         HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT),
@@ -4142 +5070 @@
         },
         {0} /* end */
-};                      
-        
+};
+
 /*
  * generic initialization of ADC, input mixers and output mixers
@@ -4178 +5106 @@
         {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        
+
         /* Unmute DAC0~3 & spdif out*/
         {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
@@ -4185 +5113 @@
         {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        
+
         /* Unmute Mixer 14 (mic) 1c (Line in)*/
         {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -4191 +5119 @@
         {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        
+
         /* Unmute Stereo Mixer 15 */
         {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -4246 +5174 @@
         {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
         {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        
+
         /* Unmute Mixer 14 (mic) 1c (Line in)*/
         {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -4252 +5180 @@
         {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        
+
         /* Unmute Stereo Mixer 15 */
         {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -4280 +5208 @@
 //      {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},
         {0x08, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
-        
+
         /* Unmute DAC0~3 & spdif out*/
         {0x03, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
@@ -4287 +5215 @@
         {0x06, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
         {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
-        
+
         /* Unmute Mixer 14 (mic) 1c (Line in)*/
         {0x014, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -4293 +5221 @@
         {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
         {0x01c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)},
-        
+
         /* Unmute Stereo Mixer 15 */
         {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)},
@@ -4311 +5239 @@
         {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},    
-        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},            
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+        {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
         {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
         {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},    
-        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},    
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
+        {0x1b, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(3)},
 
         {0x08, AC_VERB_SET_CONNECT_SEL, 0x00},  // set Mic 1
@@ -4446 +5374 @@
                 case 0x0d:
                         idx1 = 0;
-                        idx = 1;        // Mic In 
+                        idx = 1;        // Mic In
                         break;
-                case 0x10:      
+                case 0x10:
                         idx1 = 3;
-                        idx = 1;        // Mic In 
+                        idx = 1;        // Mic In
                         break;
                 case 0x11:
@@ -4467 +5395 @@
                 imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
                 imux->items[imux->num_items].index = idx1;
-                imux->num_items++;      
+                imux->num_items++;
         }
         return 0;
@@ -4548 +5476 @@
         if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
                                                 alc861_ignore)) < 0)
-                return err;
-        if (! spec->autocfg.line_outs && ! spec->autocfg.speaker_pin &&
-            ! spec->autocfg.hp_pin)
-                return 0; /* can't find valid BIOS pin config */
+            return err;
+        if (! spec->autocfg.line_outs)
+            return 0; /* can't find valid BIOS pin config */
 
         if ((err = alc861_auto_fill_dac_nids(spec, &spec->autocfg)) < 0 ||
@@ -4579 +5506 @@
 }
 
-/* init callback for auto-configuration model -- overriding the default init */
-static int alc861_auto_init(struct hda_codec *codec)
-{
-        alc_init(codec);
-        alc861_auto_init_multi_out(codec);
-        alc861_auto_init_hp_out(codec);
-        alc861_auto_init_analog_input(codec);
-
-        return 0;
+/* additional initialization for auto-configuration model */
+static void alc861_auto_init(struct hda_codec *codec)
+{
+    alc861_auto_init_multi_out(codec);
+    alc861_auto_init_hp_out(codec);
+    alc861_auto_init_analog_input(codec);
+
 }
 
@@ -4639 +5564 @@
                 .input_mux = &alc861_capture_source,
         },
-};      
+};
 
 
@@ -4652 +5577 @@
                 return -ENOMEM;
 
-        codec->spec = spec;     
+        codec->spec = spec;
 
         board_config = snd_hda_check_board_config(codec, alc861_cfg_tbl);
@@ -4684 +5609 @@
 
         codec->patch_ops = alc_patch_ops;
-        if (board_config == ALC861_AUTO)
-                codec->patch_ops.init = alc861_auto_init;
-                
+        if (board_config == ALC861_AUTO)
+            spec->init_hook = alc861_auto_init;
+
         return 0;
 }

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

@@ -297 +297 @@
 struct hda_codec_preset snd_hda_preset_si3054[] = {
         { .id = 0x163c3055, .name = "Si3054", .patch = patch_si3054 },
-        { .id = 0x163c3155, .name = "Si3054", .patch = patch_si3054 },
+        { .id = 0x163c3155, .name = "Si3054", .patch = patch_si3054 },
+        { .id = 0x11c13026, .name = "Si3054", .patch = patch_si3054 },
         {0}
 };

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

@@ -50 +50 @@
         unsigned int surr_switch: 1;
         unsigned int line_switch: 1;
-        unsigned int mic_switch: 1;
+        unsigned int mic_switch: 1;
+        unsigned int alt_switch: 1;
+        unsigned int hp_detect: 1;
 
         /* playback */
-        struct hda_multi_out multiout;
-        hda_nid_t dac_nids[4];
+        struct hda_multi_out multiout;
+        hda_nid_t dac_nids[5];
 
         /* capture */
@@ -73 +75 @@
 
         /* capture source */
-        struct hda_input_mux *input_mux;
-        unsigned int cur_mux[2];
+        struct hda_input_mux *input_mux;
+        unsigned int cur_mux[3];
 
         /* i/o switches */
@@ -108 +110 @@
 };
 
+static hda_nid_t stac927x_adc_nids[3] = {
+    0x07, 0x08, 0x09
+};
+
+static hda_nid_t stac927x_mux_nids[3] = {
+    0x15, 0x16, 0x17
+};
+
 static hda_nid_t stac9200_pin_nids[8] = {
         0x08, 0x09, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12,
@@ -115 +125 @@
         0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
         0x0f, 0x10, 0x11, 0x15, 0x1b,
+};
+
+static hda_nid_t stac927x_pin_nids[14] = {
+    0x0a, 0x0b, 0x0c, 0x0d, 0x0e,
+    0x0f, 0x10, 0x11, 0x12, 0x13,
+    0x14, 0x21, 0x22, 0x23,
 };
 
@@ -151 +167 @@
 
 static struct hda_verb stac922x_core_init[] = {
-        /* set master volume and direct control */      
+        /* set master volume and direct control */
         { 0x16, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
         {0}
+};
+
+static struct hda_verb stac927x_core_init[] = {
+    /* set master volume and direct control */
+    { 0x24, AC_VERB_SET_VOLUME_KNOB_CONTROL, 0xff},
+    {0}
 };
 
@@ -189 +211 @@
 };
 
+static snd_kcontrol_new_t stac927x_mixer[] = {
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Input Source",
+        .count = 1,
+        .info = stac92xx_mux_enum_info,
+        .get = stac92xx_mux_enum_get,
+        .put = stac92xx_mux_enum_put,
+    },
+    HDA_CODEC_VOLUME("InMux Capture Volume", 0x15, 0x0, HDA_OUTPUT),
+    HDA_CODEC_VOLUME("InVol Capture Volume", 0x18, 0x0, HDA_INPUT),
+    HDA_CODEC_MUTE("ADCMux Capture Switch", 0x1b, 0x0, HDA_OUTPUT),
+    {0} /* end */
+};
+
 static int stac92xx_build_controls(struct hda_codec *codec)
 {
@@ -215 +252 @@
                         return err;
         }
-        return 0;       
+        return 0;
 }
 
@@ -242 +279 @@
 
 static unsigned int d945gtp3_pin_configs[10] = {
-        0x0221401f, 0x01a19022, 0x01813021, 0x01114010,
-        0x40000100, 0x40000100, 0x40000100, 0x40000100,
-        0x02a19120, 0x40000100,
+    0x0221401f, 0x01a19022, 0x01813021, 0x01014010,
+    0x40000100, 0x40000100, 0x40000100, 0x40000100,
+    0x02a19120, 0x40000100,
 };
 
 static unsigned int d945gtp5_pin_configs[10] = {
-        0x0221401f, 0x01111012, 0x01813024, 0x01114010,
-        0x01a19021, 0x01116011, 0x01452130, 0x40000100,
-        0x02a19320, 0x40000100,
+    0x0221401f, 0x01011012, 0x01813024, 0x01014010,
+    0x01a19021, 0x01016011, 0x01452130, 0x40000100,
+    0x02a19320, 0x40000100,
 };
 
@@ -267 +304 @@
           .pci_subdevice = 0x0101,
           .config = STAC_D945GTP3 },    /* Intel D945GTP - 3 Stack */
-        { .pci_subvendor = PCI_VENDOR_ID_INTEL,
+          { .pci_subvendor = PCI_VENDOR_ID_INTEL,
+          .pci_subdevice = 0x0202,
+          .config = STAC_D945GTP3 },    /* Intel D945GNT - 3 Stack, 9221 A1 */
+          { .pci_subvendor = PCI_VENDOR_ID_INTEL,
+          .pci_subdevice = 0x0b0b,
+          .config = STAC_D945GTP3 },    /* Intel D945PSN - 3 Stack, 9221 A1 */
+          { .pci_subvendor = PCI_VENDOR_ID_INTEL,
           .pci_subdevice = 0x0404,
           .config = STAC_D945GTP5 },    /* Intel D945GTP - 5 Stack */
@@ -275 +318 @@
         { .pci_subvendor = PCI_VENDOR_ID_INTEL,
           .pci_subdevice = 0x0013,
-          .config = STAC_D945GTP5 },    /* Intel D955XBK - 5 Stack */
+          .config = STAC_D945GTP5 },    /* Intel D955XBK - 5 Stack */
+        { .pci_subvendor = PCI_VENDOR_ID_INTEL,
+          .pci_subdevice = 0x0417,
+          .config = STAC_D945GTP5 },    /* Intel D975XBK - 5 Stack */
         {0} /* terminator */
+};
+
+static unsigned int ref927x_pin_configs[14] = {
+    0x01813122, 0x01a19021, 0x01014010, 0x01016011,
+    0x01012012, 0x01011014, 0x40000100, 0x40000100,
+    0x40000100, 0x40000100, 0x40000100, 0x01441030,
+    0x01c41030, 0x40000100,
+};
+
+static unsigned int *stac927x_brd_tbl[] = {
+    ref927x_pin_configs,
+};
+
+static struct hda_board_config stac927x_cfg_tbl[] = {
+    { .modelname = "ref",
+    .pci_subvendor = PCI_VENDOR_ID_INTEL,
+    .pci_subdevice = 0x2668,      /* DFI LanParty */
+    .config = STAC_REF },         /* SigmaTel reference board */
+    {0} /* terminator */
 };
 
@@ -300 +365 @@
                 pin_cfg = snd_hda_codec_read(codec, spec->pin_nids[i], 0,
                                              AC_VERB_GET_CONFIG_DEFAULT,
-                                             0x00);     
+                                             0x00);
                 snd_printdd(KERN_INFO "hda_codec: pin nid %2.2x pin config %8.8x\n", spec->pin_nids[i], pin_cfg);
         }
@@ -410 +475 @@
 };
 
+static struct hda_pcm_stream stac92xx_pcm_analog_alt_playback = {
+    .substreams = 1,
+    .channels_min = 2,
+    .channels_max = 2,
+    .nid = 0x06, /* NID to query formats and rates */
+    .ops = {
+        .open = stac92xx_playback_pcm_open,
+        .prepare = stac92xx_playback_pcm_prepare,
+        .cleanup = stac92xx_playback_pcm_cleanup
+    },
+};
+
 static struct hda_pcm_stream stac92xx_pcm_analog_capture = {
         .substreams = 2,
         .channels_min = 2,
-        .channels_max = 2,
-        .nid = 0x06, /* NID to query formats and rates */
+        .channels_max = 2,
+        /* NID is set in stac92xx_build_pcms */
         .ops = {
                 .prepare = stac92xx_capture_pcm_prepare,
@@ -432 +509 @@
         info->stream[SNDRV_PCM_STREAM_PLAYBACK] = stac92xx_pcm_analog_playback;
         info->stream[SNDRV_PCM_STREAM_CAPTURE] = stac92xx_pcm_analog_capture;
-
+        info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
+
+        if (spec->alt_switch) {
+            codec->num_pcms++;
+            info++;
+            info->name = "STAC92xx Analog Alt";
+            info->stream[SNDRV_PCM_STREAM_PLAYBACK] = stac92xx_pcm_analog_alt_playback;
+        }
         if (spec->multiout.dig_out_nid || spec->dig_in_nid) {
                 codec->num_pcms++;
@@ -450 +534 @@
 }
 
+static unsigned int stac92xx_get_vref(struct hda_codec *codec, hda_nid_t nid)
+{
+    unsigned int pincap = snd_hda_param_read(codec, nid,
+                                             AC_PAR_PIN_CAP);
+    pincap = (pincap & AC_PINCAP_VREF) >> AC_PINCAP_VREF_SHIFT;
+    if (pincap & AC_PINCAP_VREF_100)
+        return AC_PINCTL_VREF_100;
+    if (pincap & AC_PINCAP_VREF_80)
+        return AC_PINCTL_VREF_80;
+    if (pincap & AC_PINCAP_VREF_50)
+        return AC_PINCTL_VREF_50;
+    if (pincap & AC_PINCAP_VREF_GRD)
+        return AC_PINCTL_VREF_GRD;
+    return 0;
+}
+
 static void stac92xx_auto_set_pinctl(struct hda_codec *codec, hda_nid_t nid, int pin_type)
 
@@ -486 +586 @@
 
         if (val)
-                stac92xx_auto_set_pinctl(codec, nid, AC_PINCTL_OUT_EN);
-        else
-                stac92xx_auto_set_pinctl(codec, nid, AC_PINCTL_IN_EN);
+            stac92xx_auto_set_pinctl(codec, nid, AC_PINCTL_OUT_EN);
+        else {
+            unsigned int pinctl = AC_PINCTL_IN_EN;
+            if (io_idx) /* set VREF for mic */
+                pinctl |= stac92xx_get_vref(codec, nid);
+            stac92xx_auto_set_pinctl(codec, nid, pinctl);
+        }
 
         return 1;
@@ -590 +694 @@
 }
 
+/*
+ * XXX The line_out pin widget connection list may not be set to the
+ * desired DAC nid. This is the case on 927x where ports A and B can
+ * be routed to several DACs.
+ *
+ * This requires an analysis of the line-out/hp pin configuration
+ * to provide a best fit for pin/DAC configurations that are routable.
+ * For now, 927x DAC4 is not supported and 927x DAC1 output to ports
+ * A and B is not supported.
+ */
 /* fill in the dac_nids table from the parsed pin configuration */
 static int stac92xx_auto_fill_dac_nids(struct hda_codec *codec, const struct auto_pin_cfg *cfg)
@@ -604 +718 @@
         }
 
-        spec->multiout.num_dacs = cfg->line_outs;
+        spec->multiout.num_dacs = cfg->line_outs;
 
         return 0;
@@ -672 +786 @@
                 return 0;
 
-        wid_caps = get_wcaps(codec, pin);
-        if (wid_caps & AC_WCAP_UNSOL_CAP)
+        wid_caps = get_wcaps(codec, pin);
+        if (wid_caps & AC_WCAP_UNSOL_CAP) {
                 /* Enable unsolicited responses on the HP widget */
                 snd_hda_codec_write(codec, pin, 0,
                                 AC_VERB_SET_UNSOLICITED_ENABLE,
-                                STAC_UNSOL_ENABLE);
+                                    STAC_UNSOL_ENABLE);
+                spec->hp_detect = 1;
+        }
 
         nid = snd_hda_codec_read(codec, pin, 0, AC_VERB_GET_CONNECT_LIST, 0) & 0xff;
@@ -711 +827 @@
                 int index = -1;
                 if (cfg->input_pins[i]) {
-                        /* Enable active pin widget as an input */
-                        stac92xx_auto_set_pinctl(codec, cfg->input_pins[i], AC_PINCTL_IN_EN);
-
                         imux->items[imux->num_items].label = auto_pin_cfg_labels[i];
 
@@ -755 +868 @@
 }
 
-static int stac922x_parse_auto_config(struct hda_codec *codec)
+static int stac92xx_parse_auto_config(struct hda_codec *codec, hda_nid_t dig_out, hda_nid_t dig_in)
 {
         struct sigmatel_spec *spec = codec->spec;
@@ -761 +874 @@
 
         if ((err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL)) < 0)
-                return err;
+            return err;
+        if (! spec->autocfg.line_outs)
+            return 0; /* can't find valid pin config */
         if ((err = stac92xx_add_dyn_out_pins(codec, &spec->autocfg)) < 0)
                 return err;
         if ((err = stac92xx_auto_fill_dac_nids(codec, &spec->autocfg)) < 0)
                 return err;
-        if (! spec->autocfg.line_outs && ! spec->autocfg.hp_pin)
-                return 0; /* can't find valid pin config */
 
         if ((err = stac92xx_auto_create_multi_out_ctls(spec, &spec->autocfg)) < 0 ||
@@ -778 +891 @@
                 spec->surr_switch = 1;
 
-        if (spec->autocfg.dig_out_pin) {
-                spec->multiout.dig_out_nid = 0x08;
-                stac92xx_auto_set_pinctl(codec, spec->autocfg.dig_out_pin, AC_PINCTL_OUT_EN);
-        }
-        if (spec->autocfg.dig_in_pin) {
-                spec->dig_in_nid = 0x09;
-                stac92xx_auto_set_pinctl(codec, spec->autocfg.dig_in_pin, AC_PINCTL_IN_EN);
-        }
+        if (spec->autocfg.dig_out_pin)
+            spec->multiout.dig_out_nid = dig_out;
+        if (spec->autocfg.dig_in_pin)
+            spec->dig_in_nid = dig_in;
 
         if (spec->kctl_alloc)
@@ -795 +904 @@
 }
 
+/* add playback controls for HP output */
+static int stac9200_auto_create_hp_ctls(struct hda_codec *codec,
+                                        struct auto_pin_cfg *cfg)
+{
+    struct sigmatel_spec *spec = codec->spec;
+    hda_nid_t pin = cfg->hp_pin;
+    unsigned int wid_caps;
+
+    if (! pin)
+        return 0;
+
+    wid_caps = get_wcaps(codec, pin);
+    if (wid_caps & AC_WCAP_UNSOL_CAP) {
+        /* Enable unsolicited responses on the HP widget */
+        snd_hda_codec_write(codec, pin, 0,
+                            AC_VERB_SET_UNSOLICITED_ENABLE,
+                            STAC_UNSOL_ENABLE);
+        spec->hp_detect = 1;
+    }
+
+    return 0;
+}
+
 static int stac9200_parse_auto_config(struct hda_codec *codec)
 {
@@ -806 +938 @@
                 return err;
 
-        if (spec->autocfg.dig_out_pin) {
-                spec->multiout.dig_out_nid = 0x05;
-                stac92xx_auto_set_pinctl(codec, spec->autocfg.dig_out_pin, AC_PINCTL_OUT_EN);
-        }
-        if (spec->autocfg.dig_in_pin) {
-                spec->dig_in_nid = 0x04;
-                stac92xx_auto_set_pinctl(codec, spec->autocfg.dig_in_pin, AC_PINCTL_IN_EN);
-        }
+        if ((err = stac9200_auto_create_hp_ctls(codec, &spec->autocfg)) < 0)
+            return err;
+
+        if (spec->autocfg.dig_out_pin)
+            spec->multiout.dig_out_nid = 0x05;
+        if (spec->autocfg.dig_in_pin)
+            spec->dig_in_nid = 0x04;
 
         if (spec->kctl_alloc)
@@ -825 +956 @@
 static int stac92xx_init(struct hda_codec *codec)
 {
-        struct sigmatel_spec *spec = codec->spec;
-
-        snd_hda_sequence_write(codec, spec->init);
-
-        stac92xx_auto_init_multi_out(codec);
-        stac92xx_auto_init_hp_out(codec);
-
-        return 0;
+    struct sigmatel_spec *spec = codec->spec;
+    struct auto_pin_cfg *cfg = &spec->autocfg;
+    int i;
+
+    snd_hda_sequence_write(codec, spec->init);
+
+    /* set up pins */
+    if (spec->hp_detect) {
+        /* fake event to set up pins */
+        codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26);
+    } else {
+        stac92xx_auto_init_multi_out(codec);
+        stac92xx_auto_init_hp_out(codec);
+    }
+    for (i = 0; i < AUTO_PIN_LAST; i++) {
+        hda_nid_t nid = cfg->input_pins[i];
+        if (nid) {
+            unsigned int pinctl = AC_PINCTL_IN_EN;
+            if (i == AUTO_PIN_MIC || i == AUTO_PIN_FRONT_MIC)
+                pinctl |= stac92xx_get_vref(codec, nid);
+            stac92xx_auto_set_pinctl(codec, nid, pinctl);
+        }
+    }
+    if (cfg->dig_out_pin)
+        stac92xx_auto_set_pinctl(codec, cfg->dig_out_pin,
+                                 AC_PINCTL_OUT_EN);
+    if (cfg->dig_in_pin)
+        stac92xx_auto_set_pinctl(codec, cfg->dig_in_pin,
+                                 AC_PINCTL_IN_EN);
+
+    return 0;
 }
 
@@ -897 +1051 @@
                 stac92xx_reset_pinctl(codec, cfg->hp_pin, AC_PINCTL_OUT_EN);
         }
-} 
+}
 
 #ifdef CONFIG_PM
@@ -998 +1152 @@
         spec->multiout.dac_nids = spec->dac_nids;
 
-        err = stac922x_parse_auto_config(codec);
-        if (err < 0) {
+        err = stac92xx_parse_auto_config(codec, 0x08, 0x09);
+        if (err < 0) {
+            stac92xx_free(codec);
+            return err;
+        }
+
+        codec->patch_ops = stac92xx_patch_ops;
+
+        return 0;
+}
+
+static int patch_stac927x(struct hda_codec *codec)
+{
+    struct sigmatel_spec *spec;
+    int err;
+
+    spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
+    if (spec == NULL)
+        return -ENOMEM;
+
+    codec->spec = spec;
+    spec->board_config = snd_hda_check_board_config(codec, stac927x_cfg_tbl);
+    if (spec->board_config < 0)
+        snd_printdd(KERN_INFO "hda_codec: Unknown model for STAC927x, using BIOS defaults\n");
+    else {
+        spec->num_pins = 14;
+        spec->pin_nids = stac927x_pin_nids;
+        spec->pin_configs = stac927x_brd_tbl[spec->board_config];
+        stac92xx_set_config_regs(codec);
+    }
+
+    spec->adc_nids = stac927x_adc_nids;
+    spec->mux_nids = stac927x_mux_nids;
+    spec->num_muxes = 3;
+
+    spec->init = stac927x_core_init;
+    spec->mixer = stac927x_mixer;
+
+    spec->multiout.dac_nids = spec->dac_nids;
+
+                 err = stac92xx_parse_auto_config(codec, 0x1e, 0x20);
+        if (err < 0) {
                 stac92xx_free(codec);
                 return err;
@@ -1010 +1204 @@
 
 /*
+ * STAC 7661(?) hack
+ */
+
+/* static config for Sony VAIO FE550G */
+static hda_nid_t vaio_dacs[] = { 0x2 };
+#define VAIO_HP_DAC     0x5
+static hda_nid_t vaio_adcs[] = { 0x8 /*,0x6*/ };
+static hda_nid_t vaio_mux_nids[] = { 0x15 };
+
+static struct hda_input_mux vaio_mux = {
+    .num_items = 2,
+    .items = {
+        /* { "HP", 0x0 },
+         { "Unknown", 0x1 }, */
+        { "Mic", 0x2 },
+        { "PCM", 0x3 },
+    }
+};
+
+static struct hda_verb vaio_init[] = {
+    {0x0a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP }, /* HP <- 0x2 */
+    {0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, /* Speaker <- 0x5 */
+    {0x0d, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* Mic? (<- 0x2) */
+    {0x0e, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, /* CD */
+    {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, /* Mic? */
+    {0x15, AC_VERB_SET_CONNECT_SEL, 0x2}, /* mic-sel: 0a,0d,14,02 */
+    {0x02, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* HP */
+    {0x05, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE}, /* Speaker */
+    {0x09, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, /* capture sw/vol -> 0x8 */
+    {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, /* CD-in -> 0x6 */
+    {0x15, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE}, /* Mic-in -> 0x9 */
+    {0}
+};
+
+/* bind volumes of both NID 0x02 and 0x05 */
+static int vaio_master_vol_put(struct snd_kcontrol *kcontrol,
+                               struct snd_ctl_elem_value *ucontrol)
+{
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    long *valp = ucontrol->value.integer.value;
+    int change;
+
+    change = snd_hda_codec_amp_update(codec, 0x02, 0, HDA_OUTPUT, 0,
+                                      0x7f, valp[0] & 0x7f);
+    change |= snd_hda_codec_amp_update(codec, 0x02, 1, HDA_OUTPUT, 0,
+                                       0x7f, valp[1] & 0x7f);
+    snd_hda_codec_amp_update(codec, 0x05, 0, HDA_OUTPUT, 0,
+                             0x7f, valp[0] & 0x7f);
+    snd_hda_codec_amp_update(codec, 0x05, 1, HDA_OUTPUT, 0,
+                             0x7f, valp[1] & 0x7f);
+    return change;
+}
+
+/* bind volumes of both NID 0x02 and 0x05 */
+static int vaio_master_sw_put(struct snd_kcontrol *kcontrol,
+                              struct snd_ctl_elem_value *ucontrol)
+{
+    struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
+    long *valp = ucontrol->value.integer.value;
+    int change;
+
+    change = snd_hda_codec_amp_update(codec, 0x02, 0, HDA_OUTPUT, 0,
+                                      0x80, valp[0] & 0x80);
+    change |= snd_hda_codec_amp_update(codec, 0x02, 1, HDA_OUTPUT, 0,
+                                       0x80, valp[1] & 0x80);
+    snd_hda_codec_amp_update(codec, 0x05, 0, HDA_OUTPUT, 0,
+                             0x80, valp[0] & 0x80);
+    snd_hda_codec_amp_update(codec, 0x05, 1, HDA_OUTPUT, 0,
+                             0x80, valp[1] & 0x80);
+    return change;
+}
+
+static struct snd_kcontrol_new vaio_mixer[] = {
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Master Playback Volume",
+        .info = snd_hda_mixer_amp_volume_info,
+        .get = snd_hda_mixer_amp_volume_get,
+        .put = vaio_master_vol_put,
+        .private_value = HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
+    },
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Master Playback Switch",
+        .info = snd_hda_mixer_amp_switch_info,
+        .get = snd_hda_mixer_amp_switch_get,
+        .put = vaio_master_sw_put,
+        .private_value = HDA_COMPOSE_AMP_VAL(0x02, 3, 0, HDA_OUTPUT),
+    },
+    /* HDA_CODEC_VOLUME("CD Capture Volume", 0x07, 0, HDA_INPUT), */
+    HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_INPUT),
+    HDA_CODEC_MUTE("Capture Switch", 0x09, 0, HDA_INPUT),
+    {
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "Capture Source",
+        .count = 1,
+        .info = stac92xx_mux_enum_info,
+        .get = stac92xx_mux_enum_get,
+        .put = stac92xx_mux_enum_put,
+    },
+    {0}
+};
+
+static struct hda_codec_ops stac7661_patch_ops = {
+    .build_controls = stac92xx_build_controls,
+    .build_pcms = stac92xx_build_pcms,
+    .init = stac92xx_init,
+    .free = stac92xx_free,
+#ifdef CONFIG_PM
+    .resume = stac92xx_resume,
+#endif
+};
+
+enum { STAC7661_VAIO };
+
+static struct hda_board_config stac7661_cfg_tbl[] = {
+    { .modelname = "vaio", .config = STAC7661_VAIO },
+    { .pci_subvendor = 0x104d, .pci_subdevice = 0x81e6,
+    .config = STAC7661_VAIO },
+    { .pci_subvendor = 0x104d, .pci_subdevice = 0x81ef,
+    .config = STAC7661_VAIO },
+    {0}
+};
+
+static int patch_stac7661(struct hda_codec *codec)
+{
+    struct sigmatel_spec *spec;
+    int board_config;
+
+    board_config = snd_hda_check_board_config(codec, stac7661_cfg_tbl);
+    if (board_config < 0)
+        /* unknown config, let generic-parser do its job... */
+        return snd_hda_parse_generic_codec(codec);
+
+    spec  = kzalloc(sizeof(*spec), GFP_KERNEL);
+    if (spec == NULL)
+        return -ENOMEM;
+
+    codec->spec = spec;
+    switch (board_config) {
+    case STAC7661_VAIO:
+        spec->mixer = vaio_mixer;
+        spec->init = vaio_init;
+        spec->multiout.max_channels = 2;
+        spec->multiout.num_dacs = ARRAY_SIZE(vaio_dacs);
+        spec->multiout.dac_nids = vaio_dacs;
+        spec->multiout.hp_nid = VAIO_HP_DAC;
+        spec->num_adcs = ARRAY_SIZE(vaio_adcs);
+        spec->adc_nids = vaio_adcs;
+        spec->input_mux = &vaio_mux;
+        spec->mux_nids = vaio_mux_nids;
+        break;
+    }
+
+    codec->patch_ops = stac7661_patch_ops;
+    return 0;
+}
+
+
+         /*
  * patch entries
  */
@@ -1019 +1373 @@
         { .id = 0x83847681, .name = "STAC9220D/9223D A2", .patch = patch_stac922x },
         { .id = 0x83847682, .name = "STAC9221 A2", .patch = patch_stac922x },
-        { .id = 0x83847683, .name = "STAC9221D A2", .patch = patch_stac922x },
+        { .id = 0x83847683, .name = "STAC9221D A2", .patch = patch_stac922x },
+        { .id = 0x83847620, .name = "STAC9274", .patch = patch_stac927x },
+        { .id = 0x83847621, .name = "STAC9274D", .patch = patch_stac927x },
+        { .id = 0x83847622, .name = "STAC9273X", .patch = patch_stac927x },
+        { .id = 0x83847623, .name = "STAC9273D", .patch = patch_stac927x },
+        { .id = 0x83847624, .name = "STAC9272X", .patch = patch_stac927x },
+        { .id = 0x83847625, .name = "STAC9272D", .patch = patch_stac927x },
+        { .id = 0x83847626, .name = "STAC9271X", .patch = patch_stac927x },
+        { .id = 0x83847627, .name = "STAC9271D", .patch = patch_stac927x },
+        { .id = 0x83847628, .name = "STAC9274X5NH", .patch = patch_stac927x },
+        { .id = 0x83847629, .name = "STAC9274D5NH", .patch = patch_stac927x },
+        { .id = 0x83847661, .name = "STAC7661", .patch = patch_stac7661 },
         {0} /* terminator */
 };

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

@@ -494 +494 @@
     { 0x10de, 0x00da, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },    /* NFORCE3 */
     { 0x10de, 0x00ea, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },        /* CK8S */
+    { 0x10de, 0x026b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE },        /* MCP51 */
     { 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL },     /* AMD8111 */
     { 0x1022, 0x7445, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL },     /* AMD768 */
@@ -834 +835 @@
     unsigned int status;
     unsigned int i;
+#ifdef TARGET_OS2
+    int fOurIrq = FALSE;
+#endif
 
     status = igetdword(chip, chip->int_sta_reg);
@@ -854 +858 @@
 #endif
         }
-        return IRQ_RETVAL(status);
-    }
+        return IRQ_NONE/*RETVAL(status)*/;
+    }
+#ifdef TARGET_OS2
+    fOurIrq = TRUE;
+#endif
 
     for (i = 0; i < chip->bdbars_count; i++) {
@@ -865 +872 @@
     /* ack them */
     iputdword(chip, chip->int_sta_reg, status & chip->int_sta_mask);
+#ifdef TARGET_OS2
+    if (fOurIrq) {
+        //eoi_irq(irq);
+    }
+#endif //TARGET_OS2
 
     return IRQ_HANDLED;
@@ -1161 +1173 @@
         runtime->hw.period_bytes_max = 64*1024;
     }
+#if 1 /* vladest */
     if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
         return err;
+#endif
     runtime->private_data = ichdev;
     return 0;
@@ -1175 +1189 @@
     err = snd_intel8x0_pcm_open(substream, &chip->ichd[ICHD_PCMOUT]);
     if (err < 0)
+    {
+        printk("snd_intel8x0_pcm_open open error: %i\n", err);
         return err;
+    }
     if (chip->multi6) {
         runtime->hw.channels_max = 6;
@@ -1988 +2005 @@
                 .name = "Fujitsu-Siemens D1522",        /* AD1981 */
                 .type = AC97_TUNE_HP_ONLY
-        },
+        },
+        {
+            .subvendor = 0x8086,
+            .subdevice = 0x0104,
+            .name = "Intel D845GEBV2",              /* AD1981B */
+            .type = AC97_TUNE_HP_ONLY
+        },
         {
                 .subvendor = 0x8086,
@@ -2310 +2333 @@
          */
         end_time = jiffies + HZ;
-        i = 0;
         do {
-            status = igetdword(chip, ICHREG(GLOB_STA)) & chip->codec_isr_bits;;
+            status = igetdword(chip, ICHREG(GLOB_STA)) &
+                chip->codec_isr_bits;
             if (status)
                 break;
             mdelay(1);
             //do_delay(chip);
-            i++;
-        } while (i<100);/*(time_after_eq(end_time, jiffies));*/
+        } while (time_after_eq(end_time, jiffies));
 
         if (! status) {
@@ -2410 +2432 @@
 static int snd_intel8x0_chip_init(struct intel8x0 *chip, int probing)
 {
-    unsigned int i;
+    unsigned int i, timeout;
     int err;
 
@@ -2428 +2450 @@
     for (i = 0; i < chip->bdbars_count; i++)
         iputbyte(chip, ICH_REG_OFF_CR + chip->ichd[i].reg_offset, ICH_RESETREGS);
+    for (i = 0; i < chip->bdbars_count; i++) {
+        timeout = 100000;
+        while (--timeout != 0) {
+            if ((igetbyte(chip, ICH_REG_OFF_CR + chip->ichd[i].reg_offset) & ICH_RESETREGS) == 0)
+                break;
+        }
+        if (timeout == 0)
+            printk(KERN_ERR "intel8x0: reset of registers failed?\n");
+    }
     /* initialize Buffer Descriptor Lists */
     for (i = 0; i < chip->bdbars_count; i++)
@@ -2606 +2637 @@
     iputbyte(chip, port + ICH_REG_OFF_CR, ICH_RESETREGS);
     spin_unlock_irq(&chip->reg_lock);
-
+#if 0
     t = stop_time.tv_sec - start_time.tv_sec;
     t *= 1000000;
     t += stop_time.tv_usec - start_time.tv_usec;
+#else
+    t = 50000; /* patch, suggested by r.ihle */
+#endif
     printk(KERN_INFO "%s: measured %lu usecs\n", __FUNCTION__, t);
     if (t == 0) {

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

@@ -830 +830 @@
 
     struct pci_dev *pci;
-    struct m3_quirk *quirk;
-    struct m3_hv_quirk *hv_quirk;
+    const struct m3_quirk *quirk;
+    const struct m3_hv_quirk *hv_quirk;
 
     int dacs_active;
@@ -918 +918 @@
 
 MODULE_DEVICE_TABLE(pci, snd_m3_ids);
-#if 0
-struct m3_quirk {
-    const char *name;   /* device name */
-    u16 vendor, device; /* subsystem ids */
-    int amp_gpio;               /* gpio pin #  for external amp, -1 = default */
-    int irda_workaround;        /* non-zero if avoid to touch 0x10 on GPIO_DIRECTION
-    (e.g. for IrDA on Dell Inspirons) */
-};
-#endif
-static struct m3_quirk m3_quirk_list[] = {
+
+static const struct m3_quirk m3_quirk_list[] = {
     /* panasonic CF-28 "toughbook" */
     {
-        /*.name = */"Panasonic CF-28",
-        /*.vendor = */0x10f7,
-        /*.device = */0x833e,
-        /*.amp_gpio = */0x0d,
-        0
+        .name = "Panasonic CF-28",
+        .vendor = 0x10f7,
+        .device = 0x833e,
+        .amp_gpio = 0x0d,
     },
     /* panasonic CF-72 "toughbook" */
     {
-        /*.name = */"Panasonic CF-72",
-        /*.vendor = */0x10f7,
-        /*.device = */0x833d,
-        /*.amp_gpio = */0x0d,
-        0
+        .name = "Panasonic CF-72",
+        .vendor = 0x10f7,
+        .device = 0x833d,
+        .amp_gpio = 0x0d,
     },
     /* Dell Inspiron 4000 */
     {
-        /*.name = */"Dell Inspiron 4000",
-        /*.vendor = */0x1028,
-        /*.device = */0x00b0,
-        /*.amp_gpio = */-1,
-        /*.irda_workaround = */1,
+        .name = "Dell Inspiron 4000",
+        .vendor = 0x1028,
+        .device = 0x00b0,
+        .amp_gpio = -1,
+        .irda_workaround = 1,
     },
     /* Dell Inspiron 8000 */
     {
-        /*.name = */"Dell Inspiron 8000",
-        /*.vendor = */0x1028,
-        /*.device = */0x00a4,
-        /*.amp_gpio = */-1,
-        /*.irda_workaround = */1,
+        .name = "Dell Inspiron 8000",
+        .vendor = 0x1028,
+        .device = 0x00a4,
+        .amp_gpio = -1,
+        .irda_workaround = 1,
     },
-#if 1
     /* Dell Inspiron 8100 */
     {
-        /*.name = */"Dell Inspiron 8100",
-        /*.vendor = */0x1028,
-        /*.device = */0x00e6,
-        /*.amp_gpio = */-1,
-        /*.irda_workaround = */1,
+        .name = "Dell Inspiron 8100",
+        .vendor = 0x1028,
+        .device = 0x00e6,
+        .amp_gpio = -1,
+        .irda_workaround = 1,
     },
-#endif
     /* NEC LM800J/7 */
     {
-        /*.name = */"NEC LM800J/7",
-        /*.vendor = */0x1033,
-        /*.device = */0x80f1,
-        /*.amp_gpio = */0x03,
-        0
+        .name = "NEC LM800J/7",
+        .vendor = 0x1033,
+        .device = 0x80f1,
+        .amp_gpio = 0x03,
     },
     /* LEGEND ZhaoYang 3100CF */
     {
-        "LEGEND ZhaoYang 3100CF",
-        0x1509,
-        0x1740,
-        0x03,
-        0
+        .name = "LEGEND ZhaoYang 3100CF",
+        .vendor = 0x1509,
+        .device = 0x1740,
+        .amp_gpio = 0x03,
     },
     /* END */
-    { 0 }
+    { NULL }
 };
 
 /* These values came from the Windows driver. */
-static struct m3_hv_quirk m3_hv_quirk_list[] = {
+static const struct m3_hv_quirk m3_hv_quirk_list[] = {
     /* Allegro chips */
     { 0x125D, 0x1988, 0x0E11, 0x002E, HV_CTRL_ENABLE | HV_BUTTON_FROM_GD, 0 },
@@ -1398 +1384 @@
 }
 
-
-static struct play_vals {
+static const struct play_vals {
     u16 addr, val;
 } pv[] = {
@@ -1465 +1450 @@
  *    Native record driver
  */
-static struct rec_vals {
+static const struct rec_vals {
     u16 addr, val;
 } rv[] = {
@@ -1635 +1620 @@
         return;
 
-    hwptr = snd_m3_get_pointer(chip, s, subs) % s->dma_size;
-    diff = (s->dma_size + hwptr - s->hwptr) % s->dma_size;
+    hwptr = snd_m3_get_pointer(chip, s, subs);
+    /* try to avoid expensive modulo divisions */
+    if (hwptr >= s->dma_size)
+        hwptr %= s->dma_size;
+
+    diff = s->dma_size + hwptr - s->hwptr;
+    if (diff >= s->dma_size)
+        diff %= s->dma_size;
+
     s->hwptr = hwptr;
     s->count += diff;
+
     if (s->count >= (signed)s->period_size) {
-        s->count %= s->period_size;
+        if (s->count < 2 * (signed)s->period_size)
+            s->count -= (signed)s->period_size;
+        else
+            s->count %= s->period_size;
+
         spin_unlock(&chip->reg_lock);
         snd_pcm_period_elapsed(subs);
@@ -1715 +1712 @@
     u8 status;
     int i;
-#ifdef TARGET_OS2
-    int fOurIrq = FALSE;
-#endif
-#ifdef DEBUG
-    dprintf(("int"));
-#endif
+
     status = inb(chip->iobase + HOST_INT_STATUS);
-#ifdef DEBUG
-    dprintf(("%x",status));
-#endif
 
     if (status == 0xff)
         return IRQ_NONE;
 
-#ifdef TARGET_OS2
-    fOurIrq = TRUE;
-#endif
     if (status & HV_INT_PENDING)
         tasklet_hi_schedule(&chip->hwvol_tq);
@@ -1764 +1750 @@
     /* ack ints */
     outb(status, chip->iobase + HOST_INT_STATUS);
-#ifdef TARGET_OS2
-    if (fOurIrq) {
-        eoi_irq(irq);
-    }
-#endif //TARGET_OS2
-
     return IRQ_HANDLED;
 }
@@ -1996 +1976 @@
         if (! (snd_m3_inb(chip, 0x30) & 1))
             return 0;
+        cpu_relax();
     } while (i-- > 0);
 
@@ -2007 +1988 @@
     m3_t *chip = ac97->private_data;
     unsigned long flags;
-    unsigned short data;
+    unsigned short data = 0xffff;
 
     if (snd_m3_ac97_wait(chip))
-        return 0xffff;
+        goto fail;
     spin_lock_irqsave(&chip->ac97_lock, flags);
     snd_m3_outb(chip, 0x80 | (reg & 0x7f), CODEC_COMMAND);
     if (snd_m3_ac97_wait(chip))
-        return 0xffff;
+        goto fail_unlock;
     data = snd_m3_inw(chip, CODEC_DATA);
+fail_unlock:
     spin_unlock_irqrestore(&chip->ac97_lock, flags);
+fail:
     return data;
 }
@@ -2178 +2161 @@
  */
 
-static u16 assp_kernel_image[] __devinitdata = {
+static const u16 assp_kernel_image[] __devinitdata = {
     0x7980, 0x0030, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x00FB, 0x7980, 0x00DD, 0x7980, 0x03B4,
     0x7980, 0x0332, 0x7980, 0x0287, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x03B4, 0x7980, 0x03B4,
@@ -2265 +2248 @@
  * that is to be loaded at 0x400 on the DSP.
  */
-static u16 assp_minisrc_image[] __devinitdata = {
+static const u16 assp_minisrc_image[] __devinitdata = {
 
     0xBF80, 0x101E, 0x906E, 0x006E, 0x8B88, 0x6980, 0xEF88, 0x906F, 0x0D6F, 0x6900, 0xEB08, 0x0412,
@@ -2308 +2291 @@
 
 #define MINISRC_LPF_LEN 10
-static u16 minisrc_lpf[MINISRC_LPF_LEN] __devinitdata = {
+static const u16 minisrc_lpf[MINISRC_LPF_LEN] __devinitdata = {
     0X0743, 0X1104, 0X0A4C, 0XF88D, 0X242C,
     0X1023, 0X1AA9, 0X0B60, 0XEFDD, 0X186F
@@ -2415 +2398 @@
 
     /*
-     * align instance address to 256 bytes so that it's
+     * align instance address to 256 bytes so that its
      * shifted list address is aligned.
      * list address = (mem address >> 1) >> 7;
@@ -2698 +2681 @@
     m3_t *chip;
     int i, err;
-    struct m3_quirk *quirk;
-    struct m3_hv_quirk *hv_quirk;
-#ifdef TARGET_OS2
-    static snd_device_ops_t ops = {
-        snd_m3_dev_free,0,0,0
+    const struct m3_quirk *quirk;
+    const struct m3_hv_quirk *hv_quirk;
+    static struct snd_device_ops ops = {
+        .dev_free =     snd_m3_dev_free,
     };
-#else
-    static snd_device_ops_t ops = {
-    dev_free:   snd_m3_dev_free,
-    };
-#endif
 
     *chip_ret = NULL;
@@ -2854 +2831 @@
 
     pci_read_config_dword(pci, PCI_CLASS_REVISION, &pci->_class);
-
-#ifdef DEBUG
-    dprintf(("m3_probe. %x",pci->_class));
-#endif
 
 #if 0   // os/2 doesnt pickup classes
@@ -2912 +2885 @@
         return err;
     }
-#ifdef DEBUG
-    dprintf(("m3_probe: card registered"));
-#endif
 
 #if 0 /* TODO: not supported yet */
-    /* TODO enable midi irq and i/o */
+    /* TODO enable MIDI IRQ and I/O */
     err = snd_mpu401_uart_new(chip->card, 0, MPU401_HW_MPU401,
                               chip->iobase + MPU401_DATA_PORT, 1,
                               chip->irq, 0, &chip->rmidi);
     if (err < 0)
-        printk(KERN_WARNING "maestro3: no midi support.\n");
+        printk(KERN_WARNING "maestro3: no MIDI support.\n");
 #endif
 

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

@@ -1 @@
-/*
+/* 
  * Driver for NeoMagic 256AV and 256ZX chipsets.
  * Copyright (c) 2000 by Takashi Iwai <tiwai@suse.de>
@@ -24 +24 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
-
+  
 #include <sound/driver.h>
+#include <asm/io.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/slab.h>
+#include <linux/moduleparam.h>
+#include <linux/mutex.h>
+
+#include <sound/core.h>
 #include <sound/info.h>
 #include <sound/control.h>
 #include <sound/pcm.h>
 #include <sound/ac97_codec.h>
-#define SNDRV_GET_ID
 #include <sound/initval.h>
 
@@ -39 +48 @@
 MODULE_DESCRIPTION("NeoMagic NM256AV/ZX");
 MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
-MODULE_DEVICES("{{NeoMagic,NM256AV},"
-               "{NeoMagic,NM256ZX}}");
+MODULE_SUPPORTED_DEVICE("{{NeoMagic,NM256AV},"
+                "{NeoMagic,NM256ZX}}");
 
 /*
@@ -47 +55 @@
  */
 
-static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
-static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
-static int playback_bufsize[SNDRV_CARDS] = {REPEAT_SNDRV(16)};
-static int capture_bufsize[SNDRV_CARDS] = {REPEAT_SNDRV(16)};
-static int force_ac97[SNDRV_CARDS] = {REPEAT_SNDRV(0)}; /* disabled as default */
-static int buffer_top[SNDRV_CARDS] = {REPEAT_SNDRV(0)}; /* not specified */
-static int use_cache[SNDRV_CARDS] = {REPEAT_SNDRV(0)}; /* disabled */
-static int vaio_hack[SNDRV_CARDS] = {REPEAT_SNDRV(0)}; /* disabled */
-static int reset_workaround[SNDRV_CARDS];
-
-MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+static int index = SNDRV_DEFAULT_IDX1;  /* Index */
+static char *id = SNDRV_DEFAULT_STR1;   /* ID for this card */
+static int playback_bufsize = 16;
+static int capture_bufsize = 16;
+static int force_ac97;                  /* disabled as default */
+static int buffer_top;                  /* not specified */
+static int use_cache;                   /* disabled */
+static int vaio_hack;                   /* disabled */
+static int reset_workaround;
+static int reset_workaround_2;
+
+//module_param(index, int, 0444);
 MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard.");
-MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
-MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+//module_param(id, charp, 0444);
 MODULE_PARM_DESC(id, "ID string for " CARD_NAME " soundcard.");
-MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
-MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
-MODULE_PARM_DESC(enable, "Enable this soundcard.");
-MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
-MODULE_PARM(playback_bufsize, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+//module_param(playback_bufsize, int, 0444);
 MODULE_PARM_DESC(playback_bufsize, "DAC frame size in kB for " CARD_NAME " soundcard.");
-MODULE_PARM_SYNTAX(playback_bufsize, SNDRV_ENABLED);
-MODULE_PARM(capture_bufsize, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+//module_param(capture_bufsize, int, 0444);
 MODULE_PARM_DESC(capture_bufsize, "ADC frame size in kB for " CARD_NAME " soundcard.");
-MODULE_PARM_SYNTAX(capture_bufsize, SNDRV_ENABLED);
-MODULE_PARM(force_ac97, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+//module_param(force_ac97, bool, 0444);
 MODULE_PARM_DESC(force_ac97, "Force to use AC97 codec for " CARD_NAME " soundcard.");
-MODULE_PARM_SYNTAX(force_ac97, SNDRV_ENABLED "," SNDRV_BOOLEAN_FALSE_DESC);
-MODULE_PARM(buffer_top, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+//module_param(buffer_top, int, 0444);
 MODULE_PARM_DESC(buffer_top, "Set the top address of audio buffer for " CARD_NAME " soundcard.");
-MODULE_PARM_SYNTAX(buffer_top, SNDRV_ENABLED);
-MODULE_PARM(use_cache, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+//module_param(use_cache, bool, 0444);
 MODULE_PARM_DESC(use_cache, "Enable the cache for coefficient table access.");
-MODULE_PARM_SYNTAX(use_cache, SNDRV_ENABLED "," SNDRV_BOOLEAN_FALSE_DESC);
-MODULE_PARM(vaio_hack, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+//module_param(vaio_hack, bool, 0444);
 MODULE_PARM_DESC(vaio_hack, "Enable workaround for Sony VAIO notebooks.");
-MODULE_PARM_SYNTAX(vaio_hack, SNDRV_ENABLED "," SNDRV_BOOLEAN_FALSE_DESC);
-//module_param_array(reset_workaround, bool, boot_devs, 0444);
+//module_param(reset_workaround, bool, 0444);
 MODULE_PARM_DESC(reset_workaround, "Enable AC97 RESET workaround for some laptops.");
+//module_param(reset_workaround_2, bool, 0444);
+MODULE_PARM_DESC(reset_workaround_2, "Enable extended AC97 RESET workaround for some other laptops.");
+
+/* just for backward compatibility */
+static int enable;
+//module_param(enable, bool, 0444);
+
+
+/* nm256 */
+#ifndef PCI_VENDOR_ID_NEOMAGIC
+#define PCI_VENDOR_ID_NEOMEGIC          0x10c8
+#endif
+#ifndef PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO
+#define PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO 0x8005
+#endif
+#ifndef PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO
+#define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO 0x8006
+#endif
+#ifndef PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO
+#define PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO 0x8016
+#endif
+
 /*
  * hw definitions
@@ -180 +199 @@
 #define NM_PBUFFER_CURRP (NM_PLAYBACK_REG_OFFSET + 0x8)
 
-/*
- * type definitions
- */
-
-typedef struct snd_nm256 nm256_t;
-typedef struct snd_nm256_stream nm256_stream_t;
-
-struct snd_nm256_stream {
-
-    nm256_t *chip;
-    snd_pcm_substream_t *substream;
-    int running;
-    int suspended;
-
-    u32 buf;    /* offset from chip->buffer */
-    int bufsize;        /* buffer size in bytes */
-    unsigned long bufptr;       /* mapped pointer */
-    unsigned long bufptr_addr;  /* physical address of the mapped pointer */
-
-    int dma_size;               /* buffer size of the substream in bytes */
-    int period_size;    /* period size in bytes */
-    int periods;                /* # of periods */
-    int shift;  /* bit shifts */
-    int cur_period;             /* current period # */
+struct nm256_stream {
+
+        struct nm256 *chip;
+        struct snd_pcm_substream *substream;
+        int running;
+        int suspended;
+        
+        u32 buf;        /* offset from chip->buffer */
+        int bufsize;    /* buffer size in bytes */
+        void __iomem *bufptr;           /* mapped pointer */
+        unsigned long bufptr_addr;      /* physical address of the mapped pointer */
+
+        int dma_size;           /* buffer size of the substream in bytes */
+        int period_size;        /* period size in bytes */
+        int periods;            /* # of periods */
+        int shift;              /* bit shifts */
+        int cur_period;         /* current period # */
 
 };
 
-struct snd_nm256 {
-
-    snd_card_t *card;
-
-    unsigned long cport;                /* control port */
-    struct resource *res_cport; /* its resource */
-    unsigned long cport_addr;   /* physical address */
-
-    unsigned long buffer;                       /* buffer */
-    struct resource *res_buffer;        /* its resource */
-    unsigned long buffer_addr;  /* buffer phyiscal address */
-
-    u32 buffer_start;           /* start offset from pci resource 0 */
-    u32 buffer_end;                     /* end offset */
-    u32 buffer_size;            /* total buffer size */
-
-    u32 all_coeff_buf;          /* coefficient buffer */
-    u32 coeff_buf[2];           /* coefficient buffer for each stream */
-
-    unsigned int coeffs_current: 1;     /* coeff. table is loaded? */
-    unsigned int use_cache: 1;  /* use one big coef. table */
-    unsigned int reset_workaround: 1; /* Workaround for some laptops to avoid freeze */
-
-    int mixer_base;                     /* register offset of ac97 mixer */
-    int mixer_status_offset;    /* offset of mixer status reg. */
-    int mixer_status_mask;              /* bit mask to test the mixer status */
-
-    int irq;
-    int irq_acks;
-    irqreturn_t (*interrupt)(int, void *, struct pt_regs *);
-    int badintrcount;           /* counter to check bogus interrupts */
-    struct semaphore irq_mutex;
-
-    nm256_stream_t streams[2];
-
-    ac97_t *ac97;
-
-    snd_pcm_t *pcm;
-
-    struct pci_dev *pci;
-
-    spinlock_t reg_lock;
+struct nm256 {
+        
+        struct snd_card *card;
+
+        void __iomem *cport;            /* control port */
+        struct resource *res_cport;     /* its resource */
+        unsigned long cport_addr;       /* physical address */
+
+        void __iomem *buffer;           /* buffer */
+        struct resource *res_buffer;    /* its resource */
+        unsigned long buffer_addr;      /* buffer phyiscal address */
+
+        u32 buffer_start;               /* start offset from pci resource 0 */
+        u32 buffer_end;                 /* end offset */
+        u32 buffer_size;                /* total buffer size */
+
+        u32 all_coeff_buf;              /* coefficient buffer */
+        u32 coeff_buf[2];               /* coefficient buffer for each stream */
+
+        unsigned int coeffs_current: 1; /* coeff. table is loaded? */
+        unsigned int use_cache: 1;      /* use one big coef. table */
+        unsigned int reset_workaround: 1; /* Workaround for some laptops to avoid freeze */
+        unsigned int reset_workaround_2: 1; /* Extended workaround for some other laptops to avoid freeze */
+        unsigned int in_resume: 1;
+
+        int mixer_base;                 /* register offset of ac97 mixer */
+        int mixer_status_offset;        /* offset of mixer status reg. */
+        int mixer_status_mask;          /* bit mask to test the mixer status */
+
+        int irq;
+        int irq_acks;
+        irqreturn_t (*interrupt)(int, void *, struct pt_regs *);
+        int badintrcount;               /* counter to check bogus interrupts */
+        struct mutex irq_mutex;
+
+        struct nm256_stream streams[2];
+
+        struct snd_ac97 *ac97;
+        unsigned short *ac97_regs; /* register caches, only for valid regs */
+
+        struct snd_pcm *pcm;
+
+        struct pci_dev *pci;
+
+        spinlock_t reg_lock;
 
 };
@@ -262 +277 @@
  * PCI ids
  */
-
-#ifndef PCI_VENDOR_ID_NEOMAGIC
-#define PCI_VENDOR_ID_NEOMEGIC 0x10c8
+static struct pci_device_id snd_nm256_ids[] = {
+        {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+        {0,},
+};
+
+MODULE_DEVICE_TABLE(pci, snd_nm256_ids);
+
+
+/*
+ * lowlvel stuffs
+ */
+
+static inline u8
+snd_nm256_readb(struct nm256 *chip, int offset)
+{
+        return readb(chip->cport + offset);
+}
+
+static inline u16
+snd_nm256_readw(struct nm256 *chip, int offset)
+{
+        return readw(chip->cport + offset);
+}
+
+static inline u32
+snd_nm256_readl(struct nm256 *chip, int offset)
+{
+        return readl(chip->cport + offset);
+}
+
+static inline void
+snd_nm256_writeb(struct nm256 *chip, int offset, u8 val)
+{
+        writeb(val, chip->cport + offset);
+}
+
+static inline void
+snd_nm256_writew(struct nm256 *chip, int offset, u16 val)
+{
+        writew(val, chip->cport + offset);
+}
+
+static inline void
+snd_nm256_writel(struct nm256 *chip, int offset, u32 val)
+{
+        writel(val, chip->cport + offset);
+}
+
+static inline void
+snd_nm256_write_buffer(struct nm256 *chip, void *src, int offset, int size)
+{
+        offset -= chip->buffer_start;
+#ifdef CONFIG_SND_DEBUG
+        if (offset < 0 || offset >= chip->buffer_size) {
+                snd_printk(KERN_ERR "write_buffer invalid offset = %d size = %d\n",
+                           offset, size);
+                return;
+        }
 #endif
-#ifndef PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO
-#define PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO 0x8005
-#endif
-#ifndef PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO
-#define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO 0x8006
-#endif
-
-
-static struct pci_device_id snd_nm256_ids[] = {
-    {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-    {PCI_VENDOR_ID_NEOMAGIC, PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-    {0,},
-};
-
-MODULE_DEVICE_TABLE(pci, snd_nm256_ids);
-
-
-/*
- * lowlvel stuffs
- */
-
-inline static u8
-    snd_nm256_readb(nm256_t *chip, int offset)
-{
-    return readb(chip->cport + offset);
-}
-
-inline static u16
-snd_nm256_readw(nm256_t *chip, int offset)
-{
-    return readw(chip->cport + offset);
-}
-
-inline static u32
-snd_nm256_readl(nm256_t *chip, int offset)
-{
-    return readl(chip->cport + offset);
-}
-
-inline static void
-snd_nm256_writeb(nm256_t *chip, int offset, u8 val)
-{
-    writeb(val, chip->cport + offset);
-}
-
-inline static void
-snd_nm256_writew(nm256_t *chip, int offset, u16 val)
-{
-    writew(val, chip->cport + offset);
-}
-
-inline static void
-snd_nm256_writel(nm256_t *chip, int offset, u32 val)
-{
-    writel(val, chip->cport + offset);
-}
-
-inline static void
-snd_nm256_write_buffer(nm256_t *chip, void *src, int offset, int size)
-{
-    offset -= chip->buffer_start;
-#ifdef SNDRV_CONFIG_DEBUG
-    if (offset < 0 || offset >= chip->buffer_size) {
-        printk("nm256: write_buffer invalid offset = %d size = %d\n", offset, size);
-        return;
-    }
-#endif
-    memcpy_toio(chip->buffer + offset, src, size);
+        memcpy_toio(chip->buffer + offset, src, size);
 }
 
@@ -343 +348 @@
 snd_nm256_get_start_offset(int which)
 {
-    u16 offset = 0;
-    while (which-- > 0)
-        offset += coefficient_sizes[which];
-    return offset;
+        u16 offset = 0;
+        while (which-- > 0)
+                offset += coefficient_sizes[which];
+        return offset;
 }
 
 static void
-snd_nm256_load_one_coefficient(nm256_t *chip, int stream, u32 port, int which)
-{
-    u32 coeff_buf = chip->coeff_buf[stream];
-    u16 offset = snd_nm256_get_start_offset(which);
-    u16 size = coefficient_sizes[which];
-
-    snd_nm256_write_buffer(chip, coefficients + offset, coeff_buf, size);
-    snd_nm256_writel(chip, port, coeff_buf);
-    /* ???  Record seems to behave differently than playback.  */
-    if (stream == SNDRV_PCM_STREAM_PLAYBACK)
-        size--;
-    snd_nm256_writel(chip, port + 4, coeff_buf + size);
+snd_nm256_load_one_coefficient(struct nm256 *chip, int stream, u32 port, int which)
+{
+        u32 coeff_buf = chip->coeff_buf[stream];
+        u16 offset = snd_nm256_get_start_offset(which);
+        u16 size = coefficient_sizes[which];
+
+        snd_nm256_write_buffer(chip, coefficients + offset, coeff_buf, size);
+        snd_nm256_writel(chip, port, coeff_buf);
+        /* ???  Record seems to behave differently than playback.  */
+        if (stream == SNDRV_PCM_STREAM_PLAYBACK)
+                size--;
+        snd_nm256_writel(chip, port + 4, coeff_buf + size);
 }
 
 static void
-snd_nm256_load_coefficient(nm256_t *chip, int stream, int number)
-{
-    /* The enable register for the specified engine.  */
-    u32 poffset = (stream == SNDRV_PCM_STREAM_CAPTURE ? NM_RECORD_ENABLE_REG : NM_PLAYBACK_ENABLE_REG);
-    u32 addr = NM_COEFF_START_OFFSET;
-
-    addr += (stream == SNDRV_PCM_STREAM_CAPTURE ? NM_RECORD_REG_OFFSET : NM_PLAYBACK_REG_OFFSET);
-
-    if (snd_nm256_readb(chip, poffset) & 1) {
-        snd_printd("NM256: Engine was enabled while loading coefficients!\n");
-        return;
-    }
-
-    /* The recording engine uses coefficient values 8-15.  */
-    number &= 7;
-    if (stream == SNDRV_PCM_STREAM_CAPTURE)
-        number += 8;
-
-    if (! chip->use_cache) {
-        snd_nm256_load_one_coefficient(chip, stream, addr, number);
-        return;
-    }
-    if (! chip->coeffs_current) {
-        snd_nm256_write_buffer(chip, coefficients, chip->all_coeff_buf,
-                               NM_TOTAL_COEFF_COUNT * 4);
-        chip->coeffs_current = 1;
-    } else {
-        u32 base = chip->all_coeff_buf;
-        u32 offset = snd_nm256_get_start_offset(number);
-        u32 end_offset = offset + coefficient_sizes[number];
-        snd_nm256_writel(chip, addr, base + offset);
-        if (stream == SNDRV_PCM_STREAM_PLAYBACK)
-            end_offset--;
-        snd_nm256_writel(chip, addr + 4, base + end_offset);
-    }
+snd_nm256_load_coefficient(struct nm256 *chip, int stream, int number)
+{
+        /* The enable register for the specified engine.  */
+        u32 poffset = (stream == SNDRV_PCM_STREAM_CAPTURE ?
+                       NM_RECORD_ENABLE_REG : NM_PLAYBACK_ENABLE_REG);
+        u32 addr = NM_COEFF_START_OFFSET;
+
+        addr += (stream == SNDRV_PCM_STREAM_CAPTURE ?
+                 NM_RECORD_REG_OFFSET : NM_PLAYBACK_REG_OFFSET);
+
+        if (snd_nm256_readb(chip, poffset) & 1) {
+                snd_printd("NM256: Engine was enabled while loading coefficients!\n");
+                return;
+        }
+
+        /* The recording engine uses coefficient values 8-15.  */
+        number &= 7;
+        if (stream == SNDRV_PCM_STREAM_CAPTURE)
+                number += 8;
+
+        if (! chip->use_cache) {
+                snd_nm256_load_one_coefficient(chip, stream, addr, number);
+                return;
+        }
+        if (! chip->coeffs_current) {
+                snd_nm256_write_buffer(chip, coefficients, chip->all_coeff_buf,
+                                       NM_TOTAL_COEFF_COUNT * 4);
+                chip->coeffs_current = 1;
+        } else {
+                u32 base = chip->all_coeff_buf;
+                u32 offset = snd_nm256_get_start_offset(number);
+                u32 end_offset = offset + coefficient_sizes[number];
+                snd_nm256_writel(chip, addr, base + offset);
+                if (stream == SNDRV_PCM_STREAM_PLAYBACK)
+                        end_offset--;
+                snd_nm256_writel(chip, addr + 4, base + end_offset);
+        }
 }
 
@@ -405 +412 @@
 /* The actual rates supported by the card. */
 static unsigned int samplerates[8] = {
-    8000, 11025, 16000, 22050, 24000, 32000, 44100, 48000,
+        8000, 11025, 16000, 22050, 24000, 32000, 44100, 48000,
 };
-#define NUM_SAMPLERATES (sizeof(samplerates) / sizeof(samplerates[0]))
-static snd_pcm_hw_constraint_list_t constraints_rates = {
-    NUM_SAMPLERATES,
-    samplerates,
-    0,
+static struct snd_pcm_hw_constraint_list constraints_rates = {
+        .count = ARRAY_SIZE(samplerates), 
+        .list = samplerates,
+        .mask = 0,
 };
 
@@ -420 +426 @@
 snd_nm256_fixed_rate(unsigned int rate)
 {
-    unsigned int i;
-    for (i = 0; i < NUM_SAMPLERATES; i++) {
-        if (rate == samplerates[i])
-            return i;
-    }
-    snd_BUG();
-    return 0;
+        unsigned int i;
+        for (i = 0; i < ARRAY_SIZE(samplerates); i++) {
+                if (rate == samplerates[i])
+                        return i;
+        }
+        snd_BUG();
+        return 0;
 }
 
@@ -433 +439 @@
  */
 static void
-snd_nm256_set_format(nm256_t *chip, nm256_stream_t *s, snd_pcm_substream_t *substream)
-{
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    int rate_index = snd_nm256_fixed_rate(runtime->rate);
-    unsigned char ratebits = (rate_index << 4) & NM_RATE_MASK;
-
-    s->shift = 0;
-    if (snd_pcm_format_width(runtime->format) == 16) {
-        ratebits |= NM_RATE_BITS_16;
-        s->shift++;
-    }
-    if (runtime->channels > 1) {
-        ratebits |= NM_RATE_STEREO;
-        s->shift++;
-    }
-
-    runtime->rate = samplerates[rate_index];
-
-    switch (substream->stream) {
-    case SNDRV_PCM_STREAM_PLAYBACK:
-        snd_nm256_load_coefficient(chip, 0, rate_index); /* 0 = playback */
-        snd_nm256_writeb(chip,
-                         NM_PLAYBACK_REG_OFFSET + NM_RATE_REG_OFFSET,
-                         ratebits);
-        break;
-    case SNDRV_PCM_STREAM_CAPTURE:
-        snd_nm256_load_coefficient(chip, 1, rate_index); /* 1 = record */
-        snd_nm256_writeb(chip,
-                         NM_RECORD_REG_OFFSET + NM_RATE_REG_OFFSET,
-                         ratebits);
-        break;
-    }
+snd_nm256_set_format(struct nm256 *chip, struct nm256_stream *s,
+                     struct snd_pcm_substream *substream)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        int rate_index = snd_nm256_fixed_rate(runtime->rate);
+        unsigned char ratebits = (rate_index << 4) & NM_RATE_MASK;
+
+        s->shift = 0;
+        if (snd_pcm_format_width(runtime->format) == 16) {
+                ratebits |= NM_RATE_BITS_16;
+                s->shift++;
+        }
+        if (runtime->channels > 1) {
+                ratebits |= NM_RATE_STEREO;
+                s->shift++;
+        }
+
+        runtime->rate = samplerates[rate_index];
+
+        switch (substream->stream) {
+        case SNDRV_PCM_STREAM_PLAYBACK:
+                snd_nm256_load_coefficient(chip, 0, rate_index); /* 0 = playback */
+                snd_nm256_writeb(chip,
+                                 NM_PLAYBACK_REG_OFFSET + NM_RATE_REG_OFFSET,
+                                 ratebits);
+                break;
+        case SNDRV_PCM_STREAM_CAPTURE:
+                snd_nm256_load_coefficient(chip, 1, rate_index); /* 1 = record */
+                snd_nm256_writeb(chip,
+                                 NM_RECORD_REG_OFFSET + NM_RATE_REG_OFFSET,
+                                 ratebits);
+                break;
+        }
 }
 
 /* acquire interrupt */
-static int snd_nm256_acquire_irq(nm256_t *chip)
-{
-    down(&chip->irq_mutex);
-    if (chip->irq < 0) {
-        if (request_irq(chip->pci->irq, chip->interrupt, SA_INTERRUPT|SA_SHIRQ,
-                        chip->card->driver, (void*)chip)) {
-            snd_printk("unable to grab IRQ %d\n", chip->pci->irq);
-            up(&chip->irq_mutex);
-            return -EBUSY;
-        }
-        chip->irq = chip->pci->irq;
-    }
-    chip->irq_acks++;
-    up(&chip->irq_mutex);
-    return 0;
+static int snd_nm256_acquire_irq(struct nm256 *chip)
+{
+        mutex_lock(&chip->irq_mutex);
+        if (chip->irq < 0) {
+                if (request_irq(chip->pci->irq, chip->interrupt, SA_INTERRUPT|SA_SHIRQ,
+                                chip->card->driver, chip)) {
+                        snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->pci->irq);
+                        mutex_unlock(&chip->irq_mutex);
+                        return -EBUSY;
+                }
+                chip->irq = chip->pci->irq;
+        }
+        chip->irq_acks++;
+        mutex_unlock(&chip->irq_mutex);
+        return 0;
 }
 
 /* release interrupt */
-static void snd_nm256_release_irq(nm256_t *chip)
-{
-    down(&chip->irq_mutex);
-    if (chip->irq_acks > 0)
-        chip->irq_acks--;
-    if (chip->irq_acks == 0 && chip->irq >= 0) {
-        free_irq(chip->irq, (void*)chip);
-        chip->irq = -1;
-    }
-    up(&chip->irq_mutex);
+static void snd_nm256_release_irq(struct nm256 *chip)
+{
+        mutex_lock(&chip->irq_mutex);
+        if (chip->irq_acks > 0)
+                chip->irq_acks--;
+        if (chip->irq_acks == 0 && chip->irq >= 0) {
+                free_irq(chip->irq, chip);
+                chip->irq = -1;
+        }
+        mutex_unlock(&chip->irq_mutex);
 }
 
@@ -503 +510 @@
 
 /* update the watermark (current period) */
-static void snd_nm256_pcm_mark(nm256_t *chip, nm256_stream_t *s, int reg)
-{
-    s->cur_period++;
-    s->cur_period %= s->periods;
-    snd_nm256_writel(chip, reg, s->buf + s->cur_period * s->period_size);
+static void snd_nm256_pcm_mark(struct nm256 *chip, struct nm256_stream *s, int reg)
+{
+        s->cur_period++;
+        s->cur_period %= s->periods;
+        snd_nm256_writel(chip, reg, s->buf + s->cur_period * s->period_size);
 }
 
@@ -514 +521 @@
 
 static void
-snd_nm256_playback_start(nm256_t *chip, nm256_stream_t *s, snd_pcm_substream_t *substream)
-{
-    /* program buffer pointers */
-    snd_nm256_writel(chip, NM_PBUFFER_START, s->buf);
-    snd_nm256_writel(chip, NM_PBUFFER_END, s->buf + s->dma_size - (1 << s->shift));
-    snd_nm256_writel(chip, NM_PBUFFER_CURRP, s->buf);
-    snd_nm256_playback_mark(chip, s);
-
-    /* Enable playback engine and interrupts. */
-    snd_nm256_writeb(chip, NM_PLAYBACK_ENABLE_REG,
-                     NM_PLAYBACK_ENABLE_FLAG | NM_PLAYBACK_FREERUN);
-    /* Enable both channels. */
-    snd_nm256_writew(chip, NM_AUDIO_MUTE_REG, 0x0);
+snd_nm256_playback_start(struct nm256 *chip, struct nm256_stream *s,
+                         struct snd_pcm_substream *substream)
+{
+        /* program buffer pointers */
+        snd_nm256_writel(chip, NM_PBUFFER_START, s->buf);
+        snd_nm256_writel(chip, NM_PBUFFER_END, s->buf + s->dma_size - (1 << s->shift));
+        snd_nm256_writel(chip, NM_PBUFFER_CURRP, s->buf);
+        snd_nm256_playback_mark(chip, s);
+
+        /* Enable playback engine and interrupts. */
+        snd_nm256_writeb(chip, NM_PLAYBACK_ENABLE_REG,
+                         NM_PLAYBACK_ENABLE_FLAG | NM_PLAYBACK_FREERUN);
+        /* Enable both channels. */
+        snd_nm256_writew(chip, NM_AUDIO_MUTE_REG, 0x0);
 }
 
 static void
-snd_nm256_capture_start(nm256_t *chip, nm256_stream_t *s, snd_pcm_substream_t *substream)
-{
-    /* program buffer pointers */
-    snd_nm256_writel(chip, NM_RBUFFER_START, s->buf);
-    snd_nm256_writel(chip, NM_RBUFFER_END, s->buf + s->dma_size);
-    snd_nm256_writel(chip, NM_RBUFFER_CURRP, s->buf);
-    snd_nm256_capture_mark(chip, s);
-
-    /* Enable playback engine and interrupts. */
-    snd_nm256_writeb(chip, NM_RECORD_ENABLE_REG,
-                     NM_RECORD_ENABLE_FLAG | NM_RECORD_FREERUN);
+snd_nm256_capture_start(struct nm256 *chip, struct nm256_stream *s,
+                        struct snd_pcm_substream *substream)
+{
+        /* program buffer pointers */
+        snd_nm256_writel(chip, NM_RBUFFER_START, s->buf);
+        snd_nm256_writel(chip, NM_RBUFFER_END, s->buf + s->dma_size);
+        snd_nm256_writel(chip, NM_RBUFFER_CURRP, s->buf);
+        snd_nm256_capture_mark(chip, s);
+
+        /* Enable playback engine and interrupts. */
+        snd_nm256_writeb(chip, NM_RECORD_ENABLE_REG,
+                         NM_RECORD_ENABLE_FLAG | NM_RECORD_FREERUN);
 }
 
 /* Stop the play engine. */
 static void
-snd_nm256_playback_stop(nm256_t *chip)
-{
-    /* Shut off sound from both channels. */
-    snd_nm256_writew(chip, NM_AUDIO_MUTE_REG,
-                     NM_AUDIO_MUTE_LEFT | NM_AUDIO_MUTE_RIGHT);
-    /* Disable play engine. */
-    snd_nm256_writeb(chip, NM_PLAYBACK_ENABLE_REG, 0);
+snd_nm256_playback_stop(struct nm256 *chip)
+{
+        /* Shut off sound from both channels. */
+        snd_nm256_writew(chip, NM_AUDIO_MUTE_REG,
+                         NM_AUDIO_MUTE_LEFT | NM_AUDIO_MUTE_RIGHT);
+        /* Disable play engine. */
+        snd_nm256_writeb(chip, NM_PLAYBACK_ENABLE_REG, 0);
 }
 
 static void
-snd_nm256_capture_stop(nm256_t *chip)
-{
-    /* Disable recording engine. */
-    snd_nm256_writeb(chip, NM_RECORD_ENABLE_REG, 0);
+snd_nm256_capture_stop(struct nm256 *chip)
+{
+        /* Disable recording engine. */
+        snd_nm256_writeb(chip, NM_RECORD_ENABLE_REG, 0);
 }
 
 static int
-snd_nm256_playback_trigger(snd_pcm_substream_t *substream, int cmd)
-{
-    nm256_t *chip = snd_pcm_substream_chip(substream);
-    nm256_stream_t *s = (nm256_stream_t*)substream->runtime->private_data;
-    int err = 0;
-
-    snd_assert(s != NULL, return -ENXIO);
-
-    spin_lock(&chip->reg_lock);
-    switch (cmd) {
-    case SNDRV_PCM_TRIGGER_RESUME:
-        s->suspended = 0;
-        /* fallthru */
-    case SNDRV_PCM_TRIGGER_START:
-        if (! s->running) {
-            snd_nm256_playback_start(chip, s, substream);
-            s->running = 1;
-        }
-        break;
-    case SNDRV_PCM_TRIGGER_SUSPEND:
-        s->suspended = 1;
-        /* fallthru */
-    case SNDRV_PCM_TRIGGER_STOP:
-        if (s->running) {
-            snd_nm256_playback_stop(chip);
-            s->running = 0;
-        }
-        break;
-    default:
-        err = -EINVAL;
-        break;
-    }
-    spin_unlock(&chip->reg_lock);
-    return err;
+snd_nm256_playback_trigger(struct snd_pcm_substream *substream, int cmd)
+{
+        struct nm256 *chip = snd_pcm_substream_chip(substream);
+        struct nm256_stream *s = substream->runtime->private_data;
+        int err = 0;
+
+        snd_assert(s != NULL, return -ENXIO);
+
+        spin_lock(&chip->reg_lock);
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_RESUME:
+                s->suspended = 0;
+                /* fallthru */
+        case SNDRV_PCM_TRIGGER_START:
+                if (! s->running) {
+                        snd_nm256_playback_start(chip, s, substream);
+                        s->running = 1;
+                }
+                break;
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+                s->suspended = 1;
+                /* fallthru */
+        case SNDRV_PCM_TRIGGER_STOP:
+                if (s->running) {
+                        snd_nm256_playback_stop(chip);
+                        s->running = 0;
+                }
+                break;
+        default:
+                err = -EINVAL;
+                break;
+        }
+        spin_unlock(&chip->reg_lock);
+        return err;
 }
 
 static int
-snd_nm256_capture_trigger(snd_pcm_substream_t *substream, int cmd)
-{
-    nm256_t *chip = snd_pcm_substream_chip(substream);
-    nm256_stream_t *s = (nm256_stream_t*)substream->runtime->private_data;
-    int err = 0;
-
-    snd_assert(s != NULL, return -ENXIO);
-
-    spin_lock(&chip->reg_lock);
-    switch (cmd) {
-    case SNDRV_PCM_TRIGGER_START:
-    case SNDRV_PCM_TRIGGER_RESUME:
-        if (! s->running) {
-            snd_nm256_capture_start(chip, s, substream);
-            s->running = 1;
-        }
-        break;
-    case SNDRV_PCM_TRIGGER_STOP:
-    case SNDRV_PCM_TRIGGER_SUSPEND:
-        if (s->running) {
-            snd_nm256_capture_stop(chip);
-            s->running = 0;
-        }
-        break;
-    default:
-        err = -EINVAL;
-        break;
-    }
-    spin_unlock(&chip->reg_lock);
-    return err;
+snd_nm256_capture_trigger(struct snd_pcm_substream *substream, int cmd)
+{
+        struct nm256 *chip = snd_pcm_substream_chip(substream);
+        struct nm256_stream *s = substream->runtime->private_data;
+        int err = 0;
+
+        snd_assert(s != NULL, return -ENXIO);
+
+        spin_lock(&chip->reg_lock);
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+        case SNDRV_PCM_TRIGGER_RESUME:
+                if (! s->running) {
+                        snd_nm256_capture_start(chip, s, substream);
+                        s->running = 1;
+                }
+                break;
+        case SNDRV_PCM_TRIGGER_STOP:
+        case SNDRV_PCM_TRIGGER_SUSPEND:
+                if (s->running) {
+                        snd_nm256_capture_stop(chip);
+                        s->running = 0;
+                }
+                break;
+        default:
+                err = -EINVAL;
+                break;
+        }
+        spin_unlock(&chip->reg_lock);
+        return err;
 }
 
@@ -635 +644 @@
  * prepare playback/capture channel
  */
-static int snd_nm256_pcm_prepare(snd_pcm_substream_t *substream)
-{
-    nm256_t *chip = snd_pcm_substream_chip(substream);
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    nm256_stream_t *s = (nm256_stream_t*)runtime->private_data;
-
-    snd_assert(s, return -ENXIO);
-    s->dma_size = frames_to_bytes(runtime, substream->runtime->buffer_size);
-    s->period_size = frames_to_bytes(runtime, substream->runtime->period_size);
-    s->periods = substream->runtime->periods;
-    s->cur_period = 0;
-
-    spin_lock_irq(&chip->reg_lock);
-    s->running = 0;
-    snd_nm256_set_format(chip, s, substream);
-    spin_unlock_irq(&chip->reg_lock);
-
-    return 0;
+static int snd_nm256_pcm_prepare(struct snd_pcm_substream *substream)
+{
+        struct nm256 *chip = snd_pcm_substream_chip(substream);
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct nm256_stream *s = runtime->private_data;
+
+        snd_assert(s, return -ENXIO);
+        s->dma_size = frames_to_bytes(runtime, substream->runtime->buffer_size);
+        s->period_size = frames_to_bytes(runtime, substream->runtime->period_size);
+        s->periods = substream->runtime->periods;
+        s->cur_period = 0;
+
+        spin_lock_irq(&chip->reg_lock);
+        s->running = 0;
+        snd_nm256_set_format(chip, s, substream);
+        spin_unlock_irq(&chip->reg_lock);
+
+        return 0;
 }
 
@@ -660 +669 @@
  */
 static snd_pcm_uframes_t
-snd_nm256_playback_pointer(snd_pcm_substream_t * substream)
-{
-    nm256_t *chip = snd_pcm_substream_chip(substream);
-    nm256_stream_t *s = (nm256_stream_t*)substream->runtime->private_data;
-    unsigned long curp;
-
-    snd_assert(s, return 0);
-    curp = snd_nm256_readl(chip, NM_PBUFFER_CURRP) - (unsigned long)s->buf;
-    curp %= s->dma_size;
-    return bytes_to_frames(substream->runtime, curp);
+snd_nm256_playback_pointer(struct snd_pcm_substream *substream)
+{
+        struct nm256 *chip = snd_pcm_substream_chip(substream);
+        struct nm256_stream *s = substream->runtime->private_data;
+        unsigned long curp;
+
+        snd_assert(s, return 0);
+        curp = snd_nm256_readl(chip, NM_PBUFFER_CURRP) - (unsigned long)s->buf;
+        curp %= s->dma_size;
+        return bytes_to_frames(substream->runtime, curp);
 }
 
 static snd_pcm_uframes_t
-snd_nm256_capture_pointer(snd_pcm_substream_t * substream)
-{
-    nm256_t *chip = snd_pcm_substream_chip(substream);
-    nm256_stream_t *s = (nm256_stream_t*)substream->runtime->private_data;
-    unsigned long curp;
-
-    snd_assert(s != NULL, return 0);
-    curp = snd_nm256_readl(chip, NM_RBUFFER_CURRP) - (unsigned long)s->buf;
-    curp %= s->dma_size;
-    return bytes_to_frames(substream->runtime, curp);
-}
-
+snd_nm256_capture_pointer(struct snd_pcm_substream *substream)
+{
+        struct nm256 *chip = snd_pcm_substream_chip(substream);
+        struct nm256_stream *s = substream->runtime->private_data;
+        unsigned long curp;
+
+        snd_assert(s != NULL, return 0);
+        curp = snd_nm256_readl(chip, NM_RBUFFER_CURRP) - (unsigned long)s->buf;
+        curp %= s->dma_size;    
+        return bytes_to_frames(substream->runtime, curp);
+}
+
+/* Remapped I/O space can be accessible as pointer on i386 */
+/* This might be changed in the future */
 #ifndef __i386__
-/* FIXME: I/O space is not accessible via pointers on all architectures */
-
 /*
  * silence / copy for playback
  */
 static int
-snd_nm256_playback_silence(snd_pcm_substream_t *substream,
-                           int channel, /* not used (interleaved data) */
-                           snd_pcm_uframes_t pos,
-                           snd_pcm_uframes_t count)
-{
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    nm256_stream_t *s = (nm256_stream_t*)runtime->private_data;
-    count = frames_to_bytes(runtime, count);
-    pos = frames_to_bytes(runtime, pos);
-    memset_io(s->bufptr + pos, 0, count);
-    return 0;
+snd_nm256_playback_silence(struct snd_pcm_substream *substream,
+                           int channel, /* not used (interleaved data) */
+                           snd_pcm_uframes_t pos,
+                           snd_pcm_uframes_t count)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct nm256_stream *s = runtime->private_data;
+        count = frames_to_bytes(runtime, count);
+        pos = frames_to_bytes(runtime, pos);
+        memset_io(s->bufptr + pos, 0, count);
+        return 0;
 }
 
 static int
-snd_nm256_playback_copy(snd_pcm_substream_t *substream,
-                        int channel, /* not used (interleaved data) */
-                        snd_pcm_uframes_t pos,
-                        void *src,
-                        snd_pcm_uframes_t count)
-{
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    nm256_stream_t *s = (nm256_stream_t*)runtime->private_data;
-    count = frames_to_bytes(runtime, count);
-    pos = frames_to_bytes(runtime, pos);
-    if (copy_from_user_toio((volatile void *)(s->bufptr + pos), src, count))
-        return -EFAULT;
-    return 0;
+snd_nm256_playback_copy(struct snd_pcm_substream *substream,
+                        int channel, /* not used (interleaved data) */
+                        snd_pcm_uframes_t pos,
+                        void __user *src,
+                        snd_pcm_uframes_t count)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct nm256_stream *s = runtime->private_data;
+        count = frames_to_bytes(runtime, count);
+        pos = frames_to_bytes(runtime, pos);
+        if (copy_from_user_toio(s->bufptr + pos, src, count))
+                return -EFAULT;
+        return 0;
 }
 
@@ -725 +734 @@
  */
 static int
-snd_nm256_capture_copy(snd_pcm_substream_t *substream,
-                       int channel, /* not used (interleaved data) */
-                       snd_pcm_uframes_t pos,
-                       void *dst,
-                       snd_pcm_uframes_t count)
-{
-    snd_pcm_runtime_t *runtime = substream->runtime;
-    nm256_stream_t *s = (nm256_stream_t*)runtime->private_data;
-    count = frames_to_bytes(runtime, count);
-    pos = frames_to_bytes(runtime, pos);
-    if (copy_to_user_fromio(dst, (volatile void *)(s->bufptr + pos), count))
-        return -EFAULT;
-    return 0;
+snd_nm256_capture_copy(struct snd_pcm_substream *substream,
+                       int channel, /* not used (interleaved data) */
+                       snd_pcm_uframes_t pos,
+                       void __user *dst,
+                       snd_pcm_uframes_t count)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct nm256_stream *s = runtime->private_data;
+        count = frames_to_bytes(runtime, count);
+        pos = frames_to_bytes(runtime, pos);
+        if (copy_to_user_fromio(dst, s->bufptr + pos, count))
+                return -EFAULT;
+        return 0;
 }
 
@@ -749 +758 @@
 /* spinlock held! */
 static void
-snd_nm256_playback_update(nm256_t *chip)
-{
-    nm256_stream_t *s;
-
-    s = &chip->streams[SNDRV_PCM_STREAM_PLAYBACK];
-    if (s->running && s->substream) {
-        spin_unlock(&chip->reg_lock);
-        snd_pcm_period_elapsed(s->substream);
-        spin_lock(&chip->reg_lock);
-        snd_nm256_playback_mark(chip, s);
-    }
+snd_nm256_playback_update(struct nm256 *chip)
+{
+        struct nm256_stream *s;
+
+        s = &chip->streams[SNDRV_PCM_STREAM_PLAYBACK];
+        if (s->running && s->substream) {
+                spin_unlock(&chip->reg_lock);
+                snd_pcm_period_elapsed(s->substream);
+                spin_lock(&chip->reg_lock);
+                snd_nm256_playback_mark(chip, s);
+        }
 }
 
 /* spinlock held! */
 static void
-snd_nm256_capture_update(nm256_t *chip)
-{
-    nm256_stream_t *s;
-
-    s = &chip->streams[SNDRV_PCM_STREAM_CAPTURE];
-    if (s->running && s->substream) {
-        spin_unlock(&chip->reg_lock);
-        snd_pcm_period_elapsed(s->substream);
-        spin_lock(&chip->reg_lock);
-        snd_nm256_capture_mark(chip, s);
-    }
+snd_nm256_capture_update(struct nm256 *chip)
+{
+        struct nm256_stream *s;
+
+        s = &chip->streams[SNDRV_PCM_STREAM_CAPTURE];
+        if (s->running && s->substream) {
+                spin_unlock(&chip->reg_lock);
+                snd_pcm_period_elapsed(s->substream);
+                spin_lock(&chip->reg_lock);
+                snd_nm256_capture_mark(chip, s);
+        }
 }
 
@@ -780 +789 @@
  * hardware info
  */
-
-static snd_pcm_hardware_t snd_nm256_playback =
-{
-    /*  info:             */
-#ifdef __i386__
-    SNDRV_PCM_INFO_MMAP|SNDRV_PCM_INFO_MMAP_VALID|
+static struct snd_pcm_hardware snd_nm256_playback =
+{
+        .info =                 SNDRV_PCM_INFO_MMAP_IOMEM |SNDRV_PCM_INFO_MMAP_VALID |
+                                SNDRV_PCM_INFO_INTERLEAVED |
+                                /*SNDRV_PCM_INFO_PAUSE |*/
+                                SNDRV_PCM_INFO_RESUME,
+        .formats =              SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+        .rates =                SNDRV_PCM_RATE_KNOT/*24k*/ | SNDRV_PCM_RATE_8000_48000,
+        .rate_min =             8000,
+        .rate_max =             48000,
+        .channels_min =         1,
+        .channels_max =         2,
+        .periods_min =          2,
+        .periods_max =          1024,
+        .buffer_bytes_max =     128 * 1024,
+        .period_bytes_min =     256,
+        .period_bytes_max =     128 * 1024,
+};
+
+static struct snd_pcm_hardware snd_nm256_capture =
+{
+        .info =                 SNDRV_PCM_INFO_MMAP_IOMEM | SNDRV_PCM_INFO_MMAP_VALID |
+                                SNDRV_PCM_INFO_INTERLEAVED |
+                                /*SNDRV_PCM_INFO_PAUSE |*/
+                                SNDRV_PCM_INFO_RESUME,
+        .formats =              SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
+        .rates =                SNDRV_PCM_RATE_KNOT/*24k*/ | SNDRV_PCM_RATE_8000_48000,
+        .rate_min =             8000,
+        .rate_max =             48000,
+        .channels_min =         1,
+        .channels_max =         2,
+        .periods_min =          2,
+        .periods_max =          1024,
+        .buffer_bytes_max =     128 * 1024,
+        .period_bytes_min =     256,
+        .period_bytes_max =     128 * 1024,
+};
+
+
+/* set dma transfer size */
+static int snd_nm256_pcm_hw_params(struct snd_pcm_substream *substream,
+                                   struct snd_pcm_hw_params *hw_params)
+{
+        /* area and addr are already set and unchanged */
+        substream->runtime->dma_bytes = params_buffer_bytes(hw_params);
+        return 0;
+}
+
+/*
+ * open
+ */
+static void snd_nm256_setup_stream(struct nm256 *chip, struct nm256_stream *s,
+                                   struct snd_pcm_substream *substream,
+                                   struct snd_pcm_hardware *hw_ptr)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+
+        s->running = 0;
+        runtime->hw = *hw_ptr;
+        runtime->hw.buffer_bytes_max = s->bufsize;
+        runtime->hw.period_bytes_max = s->bufsize / 2;
+        runtime->dma_area = (void __force *) s->bufptr;
+        runtime->dma_addr = s->bufptr_addr;
+        runtime->dma_bytes = s->bufsize;
+        runtime->private_data = s;
+        s->substream = substream;
+
+        snd_pcm_set_sync(substream);
+        snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
+                                   &constraints_rates);
+}
+
+static int
+snd_nm256_playback_open(struct snd_pcm_substream *substream)
+{
+        struct nm256 *chip = snd_pcm_substream_chip(substream);
+
+        if (snd_nm256_acquire_irq(chip) < 0)
+                return -EBUSY;
+        snd_nm256_setup_stream(chip, &chip->streams[SNDRV_PCM_STREAM_PLAYBACK],
+                               substream, &snd_nm256_playback);
+        return 0;
+}
+
+static int
+snd_nm256_capture_open(struct snd_pcm_substream *substream)
+{
+        struct nm256 *chip = snd_pcm_substream_chip(substream);
+
+        if (snd_nm256_acquire_irq(chip) < 0)
+                return -EBUSY;
+        snd_nm256_setup_stream(chip, &chip->streams[SNDRV_PCM_STREAM_CAPTURE],
+                               substream, &snd_nm256_capture);
+        return 0;
+}
+
+/*
+ * close - we don't have to do special..
+ */
+static int
+snd_nm256_playback_close(struct snd_pcm_substream *substream)
+{
+        struct nm256 *chip = snd_pcm_substream_chip(substream);
+
+        snd_nm256_release_irq(chip);
+        return 0;
+}
+
+
+static int
+snd_nm256_capture_close(struct snd_pcm_substream *substream)
+{
+        struct nm256 *chip = snd_pcm_substream_chip(substream);
+
+        snd_nm256_release_irq(chip);
+        return 0;
+}
+
+/*
+ * create a pcm instance
+ */
+static struct snd_pcm_ops snd_nm256_playback_ops = {
+        .open =         snd_nm256_playback_open,
+        .close =        snd_nm256_playback_close,
+        .ioctl =        snd_pcm_lib_ioctl,
+        .hw_params =    snd_nm256_pcm_hw_params,
+        .prepare =      snd_nm256_pcm_prepare,
+        .trigger =      snd_nm256_playback_trigger,
+        .pointer =      snd_nm256_playback_pointer,
+#ifndef __i386__
+        .copy =         snd_nm256_playback_copy,
+        .silence =      snd_nm256_playback_silence,
 #endif
-        SNDRV_PCM_INFO_INTERLEAVED |
-        /*SNDRV_PCM_INFO_PAUSE |*/
-        SNDRV_PCM_INFO_RESUME,
-        /*      formats:          */    SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-        /*      rates:            */    SNDRV_PCM_RATE_KNOT/*24k*/ | SNDRV_PCM_RATE_8000_48000,
-        /*      rate_min:         */    8000,
-        /*      rate_max:         */    48000,
-        /*      channels_min:     */    1,
-        /*      channels_max:     */    2,
-        /*      buffer_bytes_max:  */   128 * 1024,
-        /*      period_bytes_min:  */   256,
-        /*      period_bytes_max:  */   128 * 1024,
-        /*      .periods_min =     */   2,
-        /*      .periods_max =     */   1024,
-        0
+        .mmap =         snd_pcm_lib_mmap_iomem,
 };
 
-static snd_pcm_hardware_t snd_nm256_capture =
-{
-    /*  info:             */
-#ifdef __i386__
-    SNDRV_PCM_INFO_MMAP|SNDRV_PCM_INFO_MMAP_VALID|
+static struct snd_pcm_ops snd_nm256_capture_ops = {
+        .open =         snd_nm256_capture_open,
+        .close =        snd_nm256_capture_close,
+        .ioctl =        snd_pcm_lib_ioctl,
+        .hw_params =    snd_nm256_pcm_hw_params,
+        .prepare =      snd_nm256_pcm_prepare,
+        .trigger =      snd_nm256_capture_trigger,
+        .pointer =      snd_nm256_capture_pointer,
+#ifndef __i386__
+        .copy =         snd_nm256_capture_copy,
 #endif
-        SNDRV_PCM_INFO_INTERLEAVED |
-        /*SNDRV_PCM_INFO_PAUSE |*/
-        SNDRV_PCM_INFO_RESUME,
-        /*      formats:          */    SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-        /*      rates:            */    SNDRV_PCM_RATE_KNOT/*24k*/ | SNDRV_PCM_RATE_8000_48000,
-        /*      rate_min:         */    8000,
-        /*      rate_max:         */    48000,
-        /*      channels_min:     */    1,
-        /*      channels_max:     */    2,
-        /*      buffer_bytes_max:  */   128 * 1024,
-        /*      period_bytes_min:  */   256,
-        /*      period_bytes_max:  */   128 * 1024,
-        /*      .periods_min =     */   2,
-        /*      .periods_max =     */   1024,
-        0
+        .mmap =         snd_pcm_lib_mmap_iomem,
 };
 
-
-/* set dma transfer size */
-static int snd_nm256_pcm_hw_params(snd_pcm_substream_t *substream, snd_pcm_hw_params_t *hw_params)
-{
-    /* area and addr are already set and unchanged */
-    substream->runtime->dma_bytes = params_buffer_bytes(hw_params);
-    return 0;
-}
-
-/*
- * open
- */
-static void snd_nm256_setup_stream(nm256_t *chip, nm256_stream_t *s,
-                                   snd_pcm_substream_t *substream,
-                                   snd_pcm_hardware_t *hw_ptr)
-{
-    snd_pcm_runtime_t *runtime = substream->runtime;
-
-    s->running = 0;
-    runtime->hw = *hw_ptr;
-    runtime->hw.buffer_bytes_max = s->bufsize;
-    runtime->hw.period_bytes_max = s->bufsize / 2;
-    runtime->dma_area = (void *)s->bufptr;
-    runtime->dma_addr = s->bufptr_addr;
-    runtime->dma_bytes = s->bufsize;
-    runtime->private_data = s;
-    s->substream = substream;
-
-    snd_pcm_set_sync(substream);
-    snd_pcm_hw_constraint_list(runtime, 0, SNDRV_PCM_HW_PARAM_RATE,
-                               &constraints_rates);
-}
-
-static int
-snd_nm256_playback_open(snd_pcm_substream_t *substream)
-{
-    nm256_t *chip = snd_pcm_substream_chip(substream);
-
-    if (snd_nm256_acquire_irq(chip) < 0)
-        return -EBUSY;
-    snd_nm256_setup_stream(chip, &chip->streams[SNDRV_PCM_STREAM_PLAYBACK],
-                           substream, &snd_nm256_playback);
-    return 0;
-}
-
-static int
-snd_nm256_capture_open(snd_pcm_substream_t *substream)
-{
-    nm256_t *chip = snd_pcm_substream_chip(substream);
-
-    if (snd_nm256_acquire_irq(chip) < 0)
-        return -EBUSY;
-    snd_nm256_setup_stream(chip, &chip->streams[SNDRV_PCM_STREAM_CAPTURE],
-                           substream, &snd_nm256_capture);
-    return 0;
-}
-
-/*
- * close - we don't have to do special..
- */
-static int
-snd_nm256_playback_close(snd_pcm_substream_t *substream)
-{
-    nm256_t *chip = snd_pcm_substream_chip(substream);
-
-    snd_nm256_release_irq(chip);
-    return 0;
-}
-
-
-static int
-snd_nm256_capture_close(snd_pcm_substream_t *substream)
-{
-    nm256_t *chip = snd_pcm_substream_chip(substream);
-
-    snd_nm256_release_irq(chip);
-    return 0;
-}
-
-/*
- * create a pcm instance
- */
-
-static snd_pcm_ops_t snd_nm256_playback_ops = {
-    /*  .open =      */   snd_nm256_playback_open,
-    /*  .close =     */   snd_nm256_playback_close,
-    /*  .ioctl =     */   snd_pcm_lib_ioctl,
-    /*  .hw_params = */   snd_nm256_pcm_hw_params,
-    NULL,
-    /*  .prepare =   */   snd_nm256_pcm_prepare,
-    /*  .trigger =   */   snd_nm256_playback_trigger,
-    /*  .pointer =   */   snd_nm256_playback_pointer,
-#ifndef __i386__
-    /*  .copy =      */   snd_nm256_playback_copy,
-    /*  .silence =   */   snd_nm256_playback_silence,
-    NULL,NULL
-#else
-    NULL,NULL,NULL,NULL
-#endif
-};
-
-static snd_pcm_ops_t snd_nm256_capture_ops = {
-    /*  .open =      */   snd_nm256_capture_open,
-    /*  .close =     */   snd_nm256_capture_close,
-    /*  .ioctl =     */   snd_pcm_lib_ioctl,
-    /*  .hw_params = */   snd_nm256_pcm_hw_params,
-    NULL,
-    /*  .prepare =   */   snd_nm256_pcm_prepare,
-    /*  .trigger =   */   snd_nm256_capture_trigger,
-    /*  .pointer =   */   snd_nm256_capture_pointer,
-#ifndef __i386__
-    /*  .copy =      */   snd_nm256_capture_copy,
-    NULL,NULL,NULL
-#else
-    NULL,NULL,NULL,NULL
-#endif
-};
-
 static int __devinit
-snd_nm256_pcm(nm256_t *chip, int device)
-{
-    snd_pcm_t *pcm;
-    int i, err;
-
-    for (i = 0; i < 2; i++) {
-        nm256_stream_t *s = &chip->streams[i];
-        s->bufptr = chip->buffer +  s->buf - chip->buffer_start;
-        s->bufptr_addr = chip->buffer_addr + s->buf - chip->buffer_start;
-    }
-
-    err = snd_pcm_new(chip->card, chip->card->driver, device,
-                      1, 1, &pcm);
-    if (err < 0)
-        return err;
-
-    snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_nm256_playback_ops);
-    snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_nm256_capture_ops);
-
-    pcm->private_data = chip;
-    pcm->info_flags = 0;
-    chip->pcm = pcm;
-
-    return 0;
-}
-
-
-/*
- * Initialize the hardware.
+snd_nm256_pcm(struct nm256 *chip, int device)
+{
+        struct snd_pcm *pcm;
+        int i, err;
+
+        for (i = 0; i < 2; i++) {
+                struct nm256_stream *s = &chip->streams[i];
+                s->bufptr = chip->buffer + (s->buf - chip->buffer_start);
+                s->bufptr_addr = chip->buffer_addr + (s->buf - chip->buffer_start);
+        }
+
+        err = snd_pcm_new(chip->card, chip->card->driver, device,
+                          1, 1, &pcm);
+        if (err < 0)
+                return err;
+
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_nm256_playback_ops);
+        snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_nm256_capture_ops);
+
+        pcm->private_data = chip;
+        pcm->info_flags = 0;
+        chip->pcm = pcm;
+
+        return 0;
+}
+
+
+/* 
+ * Initialize the hardware. 
  */
 static void
-snd_nm256_init_chip(nm256_t *chip)
-{
-    /* Reset everything. */
-    snd_nm256_writeb(chip, 0x0, 0x11);
-    snd_nm256_writew(chip, 0x214, 0);
-    /* stop sounds.. */
-    //snd_nm256_playback_stop(chip);
-    //snd_nm256_capture_stop(chip);
-}
+snd_nm256_init_chip(struct nm256 *chip)
+{
+        /* Reset everything. */
+        snd_nm256_writeb(chip, 0x0, 0x11);
+        snd_nm256_writew(chip, 0x214, 0);
+        /* stop sounds.. */
+        //snd_nm256_playback_stop(chip);
+        //snd_nm256_capture_stop(chip);
+}
+
 
 static irqreturn_t
-snd_nm256_intr_check(nm256_t *chip)
-{
-    if (chip->badintrcount++ > 1000) {
-        /*
-         * I'm not sure if the best thing is to stop the card from
-         * playing or just release the interrupt (after all, we're in
-         * a bad situation, so doing fancy stuff may not be such a good
-         * idea).
-         *
-         * I worry about the card engine continuing to play noise
-         * over and over, however--that could become a very
-         * obnoxious problem.  And we know that when this usually
-         * happens things are fairly safe, it just means the user's
-         * inserted a PCMCIA card and someone's spamming us with IRQ 9s.
-         */
-        if (chip->streams[SNDRV_PCM_STREAM_PLAYBACK].running)
-            snd_nm256_playback_stop(chip);
-        if (chip->streams[SNDRV_PCM_STREAM_CAPTURE].running)
-            snd_nm256_capture_stop(chip);
-        chip->badintrcount = 0;
-        return IRQ_HANDLED;
-    }
-    return IRQ_NONE;
-}
-
-/*
- * Handle a potential interrupt for the device referred to by DEV_ID.
+snd_nm256_intr_check(struct nm256 *chip)
+{
+        if (chip->badintrcount++ > 1000) {
+                /*
+                 * I'm not sure if the best thing is to stop the card from
+                 * playing or just release the interrupt (after all, we're in
+                 * a bad situation, so doing fancy stuff may not be such a good
+                 * idea).
+                 *
+                 * I worry about the card engine continuing to play noise
+                 * over and over, however--that could become a very
+                 * obnoxious problem.  And we know that when this usually
+                 * happens things are fairly safe, it just means the user's
+                 * inserted a PCMCIA card and someone's spamming us with IRQ 9s.
+                 */
+                if (chip->streams[SNDRV_PCM_STREAM_PLAYBACK].running)
+                        snd_nm256_playback_stop(chip);
+                if (chip->streams[SNDRV_PCM_STREAM_CAPTURE].running)
+                        snd_nm256_capture_stop(chip);
+                chip->badintrcount = 0;
+                return IRQ_HANDLED;
+        }
+        return IRQ_NONE;
+}
+
+/* 
+ * Handle a potential interrupt for the device referred to by DEV_ID. 
  *
  * I don't like the cut-n-paste job here either between the two routines,
@@ -1025 +1020 @@
 snd_nm256_interrupt(int irq, void *dev_id, struct pt_regs *dummy)
 {
-    nm256_t *chip = dev_id;
-    u16 status;
-    u8 cbyte;
-#ifdef TARGET_OS2
-    int fOurIrq = FALSE;
-#endif
-
-    status = snd_nm256_readw(chip, NM_INT_REG);
-
-    /* Not ours. */
-    if (status == 0) {
-        snd_nm256_intr_check(chip);
-        return IRQ_NONE;
-    }
-#ifdef TARGET_OS2
-    fOurIrq = TRUE;
-#endif
-
-    chip->badintrcount = 0;
-
-    /* Rather boring; check for individual interrupts and process them. */
-
-    spin_lock(&chip->reg_lock);
-    if (status & NM_PLAYBACK_INT) {
-        status &= ~NM_PLAYBACK_INT;
-        NM_ACK_INT(chip, NM_PLAYBACK_INT);
-        snd_nm256_playback_update(chip);
-    }
-
-    if (status & NM_RECORD_INT) {
-        status &= ~NM_RECORD_INT;
-        NM_ACK_INT(chip, NM_RECORD_INT);
-        snd_nm256_capture_update(chip);
-    }
-
-    if (status & NM_MISC_INT_1) {
-        status &= ~NM_MISC_INT_1;
-        NM_ACK_INT(chip, NM_MISC_INT_1);
-        snd_printd("NM256: Got misc interrupt #1\n");
-        snd_nm256_writew(chip, NM_INT_REG, 0x8000);
-        cbyte = snd_nm256_readb(chip, 0x400);
-        snd_nm256_writeb(chip, 0x400, cbyte | 2);
-    }
-
-    if (status & NM_MISC_INT_2) {
-        status &= ~NM_MISC_INT_2;
-        NM_ACK_INT(chip, NM_MISC_INT_2);
-        snd_printd("NM256: Got misc interrupt #2\n");
-        cbyte = snd_nm256_readb(chip, 0x400);
-        snd_nm256_writeb(chip, 0x400, cbyte & ~2);
-    }
-
-    /* Unknown interrupt. */
-    if (status) {
-        snd_printd("NM256: Fire in the hole! Unknown status 0x%x\n",
-                   status);
-        /* Pray. */
-        NM_ACK_INT(chip, status);
-    }
-
-    spin_unlock(&chip->reg_lock);
-#ifdef TARGET_OS2
-    if (fOurIrq) {
-        eoi_irq(irq);
-    }
-#endif //TARGET_OS2
-    return IRQ_HANDLED;
+        struct nm256 *chip = dev_id;
+        u16 status;
+        u8 cbyte;
+
+        status = snd_nm256_readw(chip, NM_INT_REG);
+
+        /* Not ours. */
+        if (status == 0)
+                return snd_nm256_intr_check(chip);
+
+        chip->badintrcount = 0;
+
+        /* Rather boring; check for individual interrupts and process them. */
+
+        spin_lock(&chip->reg_lock);
+        if (status & NM_PLAYBACK_INT) {
+                status &= ~NM_PLAYBACK_INT;
+                NM_ACK_INT(chip, NM_PLAYBACK_INT);
+                snd_nm256_playback_update(chip);
+        }
+
+        if (status & NM_RECORD_INT) {
+                status &= ~NM_RECORD_INT;
+                NM_ACK_INT(chip, NM_RECORD_INT);
+                snd_nm256_capture_update(chip);
+        }
+
+        if (status & NM_MISC_INT_1) {
+                status &= ~NM_MISC_INT_1;
+                NM_ACK_INT(chip, NM_MISC_INT_1);
+                snd_printd("NM256: Got misc interrupt #1\n");
+                snd_nm256_writew(chip, NM_INT_REG, 0x8000);
+                cbyte = snd_nm256_readb(chip, 0x400);
+                snd_nm256_writeb(chip, 0x400, cbyte | 2);
+        }
+
+        if (status & NM_MISC_INT_2) {
+                status &= ~NM_MISC_INT_2;
+                NM_ACK_INT(chip, NM_MISC_INT_2);
+                snd_printd("NM256: Got misc interrupt #2\n");
+                cbyte = snd_nm256_readb(chip, 0x400);
+                snd_nm256_writeb(chip, 0x400, cbyte & ~2);
+        }
+
+        /* Unknown interrupt. */
+        if (status) {
+                snd_printd("NM256: Fire in the hole! Unknown status 0x%x\n",
+                           status);
+                /* Pray. */
+                NM_ACK_INT(chip, status);
+        }
+
+        spin_unlock(&chip->reg_lock);
+        return IRQ_HANDLED;
 }
 
@@ -1103 +1085 @@
 snd_nm256_interrupt_zx(int irq, void *dev_id, struct pt_regs *dummy)
 {
-    nm256_t *chip = dev_id;
-    u32 status;
-    u8 cbyte;
-#ifdef TARGET_OS2
-    int fOurIrq = FALSE;
-#endif
-
-    status = snd_nm256_readl(chip, NM_INT_REG);
-
-    /* Not ours. */
-    if (status == 0)
-    {
-        snd_nm256_intr_check(chip);
-        return IRQ_NONE;
-    }
-#ifdef TARGET_OS2
-    fOurIrq = TRUE;
-#endif
-
-    chip->badintrcount = 0;
-
-    /* Rather boring; check for individual interrupts and process them. */
-
-    spin_lock(&chip->reg_lock);
-    if (status & NM2_PLAYBACK_INT) {
-        status &= ~NM2_PLAYBACK_INT;
-        NM2_ACK_INT(chip, NM2_PLAYBACK_INT);
-        snd_nm256_playback_update(chip);
-    }
-
-    if (status & NM2_RECORD_INT) {
-        status &= ~NM2_RECORD_INT;
-        NM2_ACK_INT(chip, NM2_RECORD_INT);
-        snd_nm256_capture_update(chip);
-    }
-
-    if (status & NM2_MISC_INT_1) {
-        status &= ~NM2_MISC_INT_1;
-        NM2_ACK_INT(chip, NM2_MISC_INT_1);
-        snd_printd("NM256: Got misc interrupt #1\n");
-        cbyte = snd_nm256_readb(chip, 0x400);
-        snd_nm256_writeb(chip, 0x400, cbyte | 2);
-    }
-
-    if (status & NM2_MISC_INT_2) {
-        status &= ~NM2_MISC_INT_2;
-        NM2_ACK_INT(chip, NM2_MISC_INT_2);
-        snd_printd("NM256: Got misc interrupt #2\n");
-        cbyte = snd_nm256_readb(chip, 0x400);
-        snd_nm256_writeb(chip, 0x400, cbyte & ~2);
-    }
-
-    /* Unknown interrupt. */
-    if (status) {
-        snd_printd("NM256: Fire in the hole! Unknown status 0x%x\n",
-                   status);
-        /* Pray. */
-        NM2_ACK_INT(chip, status);
-    }
-
-    spin_unlock(&chip->reg_lock);
-#ifdef TARGET_OS2
-    if (fOurIrq) {
-        eoi_irq(irq);
-    }
-#endif //TARGET_OS2
-    return IRQ_HANDLED;
+        struct nm256 *chip = dev_id;
+        u32 status;
+        u8 cbyte;
+
+        status = snd_nm256_readl(chip, NM_INT_REG);
+
+        /* Not ours. */
+        if (status == 0)
+                return snd_nm256_intr_check(chip);
+
+        chip->badintrcount = 0;
+
+        /* Rather boring; check for individual interrupts and process them. */
+
+        spin_lock(&chip->reg_lock);
+        if (status & NM2_PLAYBACK_INT) {
+                status &= ~NM2_PLAYBACK_INT;
+                NM2_ACK_INT(chip, NM2_PLAYBACK_INT);
+                snd_nm256_playback_update(chip);
+        }
+
+        if (status & NM2_RECORD_INT) {
+                status &= ~NM2_RECORD_INT;
+                NM2_ACK_INT(chip, NM2_RECORD_INT);
+                snd_nm256_capture_update(chip);
+        }
+
+        if (status & NM2_MISC_INT_1) {
+                status &= ~NM2_MISC_INT_1;
+                NM2_ACK_INT(chip, NM2_MISC_INT_1);
+                snd_printd("NM256: Got misc interrupt #1\n");
+                cbyte = snd_nm256_readb(chip, 0x400);
+                snd_nm256_writeb(chip, 0x400, cbyte | 2);
+        }
+
+        if (status & NM2_MISC_INT_2) {
+                status &= ~NM2_MISC_INT_2;
+                NM2_ACK_INT(chip, NM2_MISC_INT_2);
+                snd_printd("NM256: Got misc interrupt #2\n");
+                cbyte = snd_nm256_readb(chip, 0x400);
+                snd_nm256_writeb(chip, 0x400, cbyte & ~2);
+        }
+
+        /* Unknown interrupt. */
+        if (status) {
+                snd_printd("NM256: Fire in the hole! Unknown status 0x%x\n",
+                           status);
+                /* Pray. */
+                NM2_ACK_INT(chip, status);
+        }
+
+        spin_unlock(&chip->reg_lock);
+        return IRQ_HANDLED;
 }
 
@@ -1181 +1149 @@
  */
 static int
-snd_nm256_ac97_ready(nm256_t *chip)
-{
-    int timeout = 10;
-    u32 testaddr;
-    u16 testb;
-
-    testaddr = chip->mixer_status_offset;
-    testb = chip->mixer_status_mask;
-
-    /*
-     * Loop around waiting for the mixer to become ready.
-     */
-    while (timeout-- > 0) {
-        if ((snd_nm256_readw(chip, testaddr) & testb) == 0)
-            return 1;
-        udelay(100);
-    }
-    return 0;
-}
-
-/*
+snd_nm256_ac97_ready(struct nm256 *chip)
+{
+        int timeout = 10;
+        u32 testaddr;
+        u16 testb;
+
+        testaddr = chip->mixer_status_offset;
+        testb = chip->mixer_status_mask;
+
+        /* 
+         * Loop around waiting for the mixer to become ready. 
+         */
+        while (timeout-- > 0) {
+                if ((snd_nm256_readw(chip, testaddr) & testb) == 0)
+                        return 1;
+                udelay(100);
+        }
+        return 0;
+}
+
+/* 
+ * Initial register values to be written to the AC97 mixer.
+ * While most of these are identical to the reset values, we do this
+ * so that we have most of the register contents cached--this avoids
+ * reading from the mixer directly (which seems to be problematic,
+ * probably due to ignorance).
+ */
+
+struct initialValues {
+        unsigned short reg;
+        unsigned short value;
+};
+
+static struct initialValues nm256_ac97_init_val[] =
+{
+        { AC97_MASTER,          0x8000 },
+        { AC97_HEADPHONE,       0x8000 },
+        { AC97_MASTER_MONO,     0x8000 },
+        { AC97_PC_BEEP,         0x8000 },
+        { AC97_PHONE,           0x8008 },
+        { AC97_MIC,             0x8000 },
+        { AC97_LINE,            0x8808 },
+        { AC97_CD,              0x8808 },
+        { AC97_VIDEO,           0x8808 },
+        { AC97_AUX,             0x8808 },
+        { AC97_PCM,             0x8808 },
+        { AC97_REC_SEL,         0x0000 },
+        { AC97_REC_GAIN,        0x0B0B },
+        { AC97_GENERAL_PURPOSE, 0x0000 },
+        { AC97_3D_CONTROL,      0x8000 }, 
+        { AC97_VENDOR_ID1,      0x8384 },
+        { AC97_VENDOR_ID2,      0x7609 },
+};
+
+static int nm256_ac97_idx(unsigned short reg)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(nm256_ac97_init_val); i++)
+                if (nm256_ac97_init_val[i].reg == reg)
+                        return i;
+        return -1;
+}
+
+/*
+ * some nm256 easily crash when reading from mixer registers
+ * thus we're treating it as a write-only mixer and cache the
+ * written values
  */
 static unsigned short
-snd_nm256_ac97_read(ac97_t *ac97, unsigned short reg)
-{
-    nm256_t *chip = ac97->private_data;
-    int res;
-
-    if (reg >= 128)
-        return 0;
-
-    if (! snd_nm256_ac97_ready(chip))
-        return 0;
-    res = snd_nm256_readw(chip, chip->mixer_base + reg);
-    /* Magic delay.  Bleah yucky.  */
-    msleep(1);
-    return res;
-}
-
-/*
+snd_nm256_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
+{
+        struct nm256 *chip = ac97->private_data;
+        int idx = nm256_ac97_idx(reg);
+
+        if (idx < 0)
+                return 0;
+        return chip->ac97_regs[idx];
+}
+
+/* 
  */
 static void
-snd_nm256_ac97_write(ac97_t *ac97,
-                     unsigned short reg, unsigned short val)
-{
-    nm256_t *chip = ac97->private_data;
-    int tries = 2;
-    u32 base;
-
-    base = chip->mixer_base;
-
-    snd_nm256_ac97_ready(chip);
-
-    /* Wait for the write to take, too. */
-    while (tries-- > 0) {
-        snd_nm256_writew(chip, base + reg, val);
-        msleep(1);  /* a little delay here seems better.. */
-        if (snd_nm256_ac97_ready(chip))
-            return;
-    }
-    snd_printd("nm256: ac97 codec not ready..\n");
-}
+snd_nm256_ac97_write(struct snd_ac97 *ac97,
+                     unsigned short reg, unsigned short val)
+{
+        struct nm256 *chip = ac97->private_data;
+        int tries = 2;
+        int idx = nm256_ac97_idx(reg);
+        u32 base;
+
+        if (idx < 0)
+                return;
+
+        base = chip->mixer_base;
+
+        snd_nm256_ac97_ready(chip);
+
+        /* Wait for the write to take, too. */
+        while (tries-- > 0) {
+                snd_nm256_writew(chip, base + reg, val);
+                msleep(1);  /* a little delay here seems better.. */
+                if (snd_nm256_ac97_ready(chip)) {
+                        /* successful write: set cache */
+                        chip->ac97_regs[idx] = val;
+                        return;
+                }
+        }
+        snd_printd("nm256: ac97 codec not ready..\n");
+}
+
+/* static resolution table */
+static struct snd_ac97_res_table nm256_res_table[] = {
+        { AC97_MASTER, 0x1f1f },
+        { AC97_HEADPHONE, 0x1f1f },
+        { AC97_MASTER_MONO, 0x001f },
+        { AC97_PC_BEEP, 0x001f },
+        { AC97_PHONE, 0x001f },
+        { AC97_MIC, 0x001f },
+        { AC97_LINE, 0x1f1f },
+        { AC97_CD, 0x1f1f },
+        { AC97_VIDEO, 0x1f1f },
+        { AC97_AUX, 0x1f1f },
+        { AC97_PCM, 0x1f1f },
+        { AC97_REC_GAIN, 0x0f0f },
+        {0} /* terminator */
+};
 
 /* initialize the ac97 into a known state */
 static void
-snd_nm256_ac97_reset(ac97_t *ac97)
-{
-    nm256_t *chip = ac97->private_data;
-    /* Reset the mixer.  'Tis magic!  */
-    snd_nm256_writeb(chip, 0x6c0, 1);
-    if (! chip->reset_workaround) {
-        /* Dell latitude LS will lock up by this */
-        snd_nm256_writeb(chip, 0x6cc, 0x87);
-    }
-    snd_nm256_writeb(chip, 0x6cc, 0x80);
-    snd_nm256_writeb(chip, 0x6cc, 0x0);
+snd_nm256_ac97_reset(struct snd_ac97 *ac97)
+{
+        struct nm256 *chip = ac97->private_data;
+
+        /* Reset the mixer.  'Tis magic!  */
+        snd_nm256_writeb(chip, 0x6c0, 1);
+        if (! chip->reset_workaround) {
+                /* Dell latitude LS will lock up by this */
+                snd_nm256_writeb(chip, 0x6cc, 0x87);
+        }
+        if (! chip->reset_workaround_2) {
+                /* Dell latitude CSx will lock up by this */
+                snd_nm256_writeb(chip, 0x6cc, 0x80);
+                snd_nm256_writeb(chip, 0x6cc, 0x0);
+        }
+        if (! chip->in_resume) {
+                int i;
+                for (i = 0; i < ARRAY_SIZE(nm256_ac97_init_val); i++) {
+                        /* preload the cache, so as to avoid even a single
+                         * read of the mixer regs
+                         */
+                        snd_nm256_ac97_write(ac97, nm256_ac97_init_val[i].reg,
+                                             nm256_ac97_init_val[i].value);
+                }
+        }
 }
 
 /* create an ac97 mixer interface */
 static int __devinit
-snd_nm256_mixer(nm256_t *chip)
-{
-    ac97_bus_t *pbus;
-    ac97_template_t ac97;
-    int i, err;
-    static ac97_bus_ops_t ops = {
-        snd_nm256_ac97_reset,
-        snd_nm256_ac97_write,
-        snd_nm256_ac97_read,0,0
-    };
-    /* looks like nm256 hangs up when unexpected registers are touched... */
-    static int mixer_regs[] = {
-        AC97_MASTER, AC97_HEADPHONE, AC97_MASTER_MONO,
-        AC97_PC_BEEP, AC97_PHONE, AC97_MIC, AC97_LINE, AC97_CD,
-        AC97_VIDEO, AC97_AUX, AC97_PCM, AC97_REC_SEL,
-        AC97_REC_GAIN, AC97_GENERAL_PURPOSE, AC97_3D_CONTROL,
-        /*AC97_EXTENDED_ID,*/
-        AC97_VENDOR_ID1, AC97_VENDOR_ID2,
-        -1
-    };
-
-    if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus)) < 0)
-        return err;
-
-    memset(&ac97, 0, sizeof(ac97));
-    ac97.scaps = AC97_SCAP_AUDIO; /* we support audio! */
-    ac97.limited_regs = 1;
-    for (i = 0; mixer_regs[i] >= 0; i++)
-        set_bit(mixer_regs[i], ac97.reg_accessed);
-    ac97.private_data = chip;
-    pbus->no_vra = 1;
-    err = snd_ac97_mixer(pbus, &ac97, &chip->ac97);
-    if (err < 0)
-        return err;
-    if (! (chip->ac97->id & (0xf0000000))) {
-        /* looks like an invalid id */
-        sprintf(chip->card->mixername, "%s AC97", chip->card->driver);
-    }
-    return 0;
-}
-
-/*
+snd_nm256_mixer(struct nm256 *chip)
+{
+        struct snd_ac97_bus *pbus;
+        struct snd_ac97_template ac97;
+        int err;
+        static struct snd_ac97_bus_ops ops = {
+                .reset = snd_nm256_ac97_reset,
+                .write = snd_nm256_ac97_write,
+                .read = snd_nm256_ac97_read,
+        };
+
+        chip->ac97_regs = kcalloc(sizeof(short),
+                                  ARRAY_SIZE(nm256_ac97_init_val), GFP_KERNEL);
+        if (! chip->ac97_regs)
+                return -ENOMEM;
+
+        if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus)) < 0)
+                return err;
+
+        memset(&ac97, 0, sizeof(ac97));
+        ac97.scaps = AC97_SCAP_AUDIO; /* we support audio! */
+        ac97.private_data = chip;
+        ac97.res_table = nm256_res_table;
+        pbus->no_vra = 1;
+        err = snd_ac97_mixer(pbus, &ac97, &chip->ac97);
+        if (err < 0)
+                return err;
+        if (! (chip->ac97->id & (0xf0000000))) {
+                /* looks like an invalid id */
+                sprintf(chip->card->mixername, "%s AC97", chip->card->driver);
+        }
+        return 0;
+}
+
+/* 
  * See if the signature left by the NM256 BIOS is intact; if so, we use
  * the associated address as the end of our audio buffer in the video
@@ -1309 +1348 @@
 
 static int __devinit
-snd_nm256_peek_for_sig(nm256_t *chip)
-{
-    /* The signature is located 1K below the end of video RAM.  */
-    unsigned long temp;
-    /* Default buffer end is 5120 bytes below the top of RAM.  */
-    unsigned long pointer_found = chip->buffer_end - 0x1400;
-    u32 sig;
-
-    temp = (unsigned long) ioremap_nocache(chip->buffer_addr + chip->buffer_end - 0x400, 16);
-    if (temp == 0) {
-        snd_printk("Unable to scan for card signature in video RAM\n");
-        return -EBUSY;
-    }
-
-    sig = readl(temp);
-    if ((sig & NM_SIG_MASK) == NM_SIGNATURE) {
-        u32 pointer = readl(temp + 4);
-
-        /*
-         * If it's obviously invalid, don't use it
-         */
-        if (pointer == 0xffffffff ||
-            pointer < chip->buffer_size ||
-            pointer > chip->buffer_end) {
-            snd_printk("invalid signature found: 0x%x\n", pointer);
-            iounmap((void *)temp);
-            return -ENODEV;
-        } else {
-            pointer_found = pointer;
-            printk(KERN_INFO "nm256: found card signature in video RAM: 0x%x\n", pointer);
-        }
-    }
-
-    iounmap((void *)temp);
-    chip->buffer_end = pointer_found;
-
-    return 0;
+snd_nm256_peek_for_sig(struct nm256 *chip)
+{
+        /* The signature is located 1K below the end of video RAM.  */
+        void __iomem *temp;
+        /* Default buffer end is 5120 bytes below the top of RAM.  */
+        unsigned long pointer_found = chip->buffer_end - 0x1400;
+        u32 sig;
+
+        temp = ioremap_nocache(chip->buffer_addr + chip->buffer_end - 0x400, 16);
+        if (temp == NULL) {
+                snd_printk(KERN_ERR "Unable to scan for card signature in video RAM\n");
+                return -EBUSY;
+        }
+
+        sig = readl(temp);
+        if ((sig & NM_SIG_MASK) == NM_SIGNATURE) {
+                u32 pointer = readl(temp + 4);
+
+                /*
+                 * If it's obviously invalid, don't use it
+                 */
+                if (pointer == 0xffffffff ||
+                    pointer < chip->buffer_size ||
+                    pointer > chip->buffer_end) {
+                        snd_printk(KERN_ERR "invalid signature found: 0x%x\n", pointer);
+                        iounmap(temp);
+                        return -ENODEV;
+                } else {
+                        pointer_found = pointer;
+                        printk(KERN_INFO "nm256: found card signature in video RAM: 0x%x\n",
+                               pointer);
+                }
+        }
+
+        iounmap(temp);
+        chip->buffer_end = pointer_found;
+
+        return 0;
 }
 
@@ -1353 +1393 @@
  * event.
  */
-static int nm256_suspend(snd_card_t *card, pm_message_t state)
-{
-    nm256_t *chip = card->pm_private_data;
-    snd_pcm_suspend_all(chip->pcm);
-    snd_ac97_suspend(chip->ac97);
-    chip->coeffs_current = 0;
-    return 0;
-}
-
-static int nm256_resume(snd_card_t *card, u32 state)
-{
-    nm256_t *chip = card->pm_private_data;
-    int i;
-    /* Perform a full reset on the hardware */
-    pci_enable_device(chip->pci);
-    snd_nm256_init_chip(chip);
-
-    /* restore ac97 */
-    snd_ac97_resume(chip->ac97);
-    for (i = 0; i < 2; i++) {
-        nm256_stream_t *s = &chip->streams[i];
-        if (s->substream && s->suspended) {
-            spin_lock_irq(&chip->reg_lock);
-            snd_nm256_set_format(chip, s, s->substream);
-            spin_unlock_irq(&chip->reg_lock);
-        }
-    }
-
-    return 0;
+static int nm256_suspend(struct pci_dev *pci, pm_message_t state)
+{
+        struct snd_card *card = pci_get_drvdata(pci);
+        struct nm256 *chip = card->private_data;
+
+        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+        snd_pcm_suspend_all(chip->pcm);
+        snd_ac97_suspend(chip->ac97);
+        chip->coeffs_current = 0;
+        pci_disable_device(pci);
+        pci_save_state(pci);
+        return 0;
+}
+
+static int nm256_resume(struct pci_dev *pci)
+{
+        struct snd_card *card = pci_get_drvdata(pci);
+        struct nm256 *chip = card->private_data;
+        int i;
+
+        /* Perform a full reset on the hardware */
+        chip->in_resume = 1;
+        pci_restore_state(pci);
+        pci_enable_device(pci);
+        snd_nm256_init_chip(chip);
+
+        /* restore ac97 */
+        snd_ac97_resume(chip->ac97);
+
+        for (i = 0; i < 2; i++) {
+                struct nm256_stream *s = &chip->streams[i];
+                if (s->substream && s->suspended) {
+                        spin_lock_irq(&chip->reg_lock);
+                        snd_nm256_set_format(chip, s, s->substream);
+                        spin_unlock_irq(&chip->reg_lock);
+                }
+        }
+
+        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+        chip->in_resume = 0;
+        return 0;
 }
 #endif /* CONFIG_PM */
 
-static int snd_nm256_free(nm256_t *chip)
-{
-    if (chip->streams[SNDRV_PCM_STREAM_PLAYBACK].running)
-        snd_nm256_playback_stop(chip);
-    if (chip->streams[SNDRV_PCM_STREAM_CAPTURE].running)
-        snd_nm256_capture_stop(chip);
-
-    if (chip->irq >= 0)
-        synchronize_irq(chip->irq);
-
-    if (chip->cport)
-        iounmap((void *) chip->cport);
-    if (chip->buffer)
-        iounmap((void *) chip->buffer);
-    if (chip->res_cport) {
-        release_resource(chip->res_cport);
-        kfree_nocheck(chip->res_cport);
-    }
-    if (chip->res_buffer) {
-        release_resource(chip->res_buffer);
-        kfree_nocheck(chip->res_buffer);
-    }
-    if (chip->irq >= 0)
-        free_irq(chip->irq, (void*)chip);
-
-    kfree(chip);
-    return 0;
-}
-
-static int snd_nm256_dev_free(snd_device_t *device)
-{
-    nm256_t *chip = device->device_data;
-    return snd_nm256_free(chip);
+static int snd_nm256_free(struct nm256 *chip)
+{
+        if (chip->streams[SNDRV_PCM_STREAM_PLAYBACK].running)
+                snd_nm256_playback_stop(chip);
+        if (chip->streams[SNDRV_PCM_STREAM_CAPTURE].running)
+                snd_nm256_capture_stop(chip);
+
+        if (chip->irq >= 0)
+                synchronize_irq(chip->irq);
+
+        if (chip->cport)
+                iounmap(chip->cport);
+        if (chip->buffer)
+                iounmap(chip->buffer);
+        release_and_free_resource(chip->res_cport);
+        release_and_free_resource(chip->res_buffer);
+        if (chip->irq >= 0)
+                free_irq(chip->irq, chip);
+
+        pci_disable_device(chip->pci);
+        kfree(chip->ac97_regs);
+        kfree(chip);
+        return 0;
+}
+
+static int snd_nm256_dev_free(struct snd_device *device)
+{
+        struct nm256 *chip = device->device_data;
+        return snd_nm256_free(chip);
 }
 
 static int __devinit
-snd_nm256_create(snd_card_t *card, struct pci_dev *pci,
-                 int play_bufsize, int capt_bufsize,
-                 int force_load,
-                 u32 buffertop,
-                 int usecache,
-                 nm256_t **chip_ret)
-{
-    nm256_t *chip;
-    int err, pval;
-#ifdef TARGET_OS2
-    static snd_device_ops_t ops = {
-        snd_nm256_dev_free,0,0,0
-    };
-#else
-    static snd_device_ops_t ops = {
-    dev_free:   snd_nm256_dev_free,
-    };
-#endif
-    u32 addr;
-
-    *chip_ret = NULL;
-
-    chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
-    if (chip == NULL)
-        return -ENOMEM;
-
-    chip->card = card;
-    chip->pci = pci;
-    chip->use_cache = usecache;
-    spin_lock_init(&chip->reg_lock);
-    chip->irq = -1;
-    init_MUTEX(&chip->irq_mutex);
-
-    chip->streams[SNDRV_PCM_STREAM_PLAYBACK].bufsize = play_bufsize;
-    chip->streams[SNDRV_PCM_STREAM_CAPTURE].bufsize = capt_bufsize;
-
-    /*
-     * The NM256 has two memory ports.  The first port is nothing
-     * more than a chunk of video RAM, which is used as the I/O ring
-     * buffer.  The second port has the actual juicy stuff (like the
-     * mixer and the playback engine control registers).
-     */
-
-    chip->buffer_addr = pci_resource_start(pci, 0);
-    chip->cport_addr = pci_resource_start(pci, 1);
-
-    /* Init the memory port info.  */
-    /* remap control port (#2) */
-    chip->res_cport = request_mem_region(chip->cport_addr, NM_PORT2_SIZE,
-                                         card->driver);
-    if (chip->res_cport == NULL) {
-        snd_printk("memory region 0x%lx (size 0x%x) busy\n",
-                   chip->cport_addr, NM_PORT2_SIZE);
-        err = -EBUSY;
-        goto __error;
-    }
-    chip->cport = (unsigned long) ioremap_nocache(chip->cport_addr, NM_PORT2_SIZE);
-    if (chip->cport == 0) {
-        snd_printk("unable to map control port %lx\n", chip->cport_addr);
-        err = -ENOMEM;
-        goto __error;
-    }
-
-    if (!strcmp(card->driver, "NM256AV")) {
-        /* Ok, try to see if this is a non-AC97 version of the hardware. */
-        pval = snd_nm256_readw(chip, NM_MIXER_PRESENCE);
-        if ((pval & NM_PRESENCE_MASK) != NM_PRESENCE_VALUE) {
-            if (! force_load) {
-                printk(KERN_ERR "nm256: no ac97 is found!\n");
-                printk(KERN_ERR "  force the driver to load by passing in the module parameter\n");
-                printk(KERN_ERR "    force_ac97=1\n");
-                printk(KERN_ERR "  or try sb16 or cs423x drivers instead.\n");
-                err = -ENXIO;
-                goto __error;
-            }
-        }
-        chip->buffer_end = 2560 * 1024;
-        chip->interrupt = snd_nm256_interrupt;
-        chip->mixer_status_offset = NM_MIXER_STATUS_OFFSET;
-        chip->mixer_status_mask = NM_MIXER_READY_MASK;
-    } else {
-        /* Not sure if there is any relevant detect for the ZX or not.  */
-        if (snd_nm256_readb(chip, 0xa0b) != 0)
-            chip->buffer_end = 6144 * 1024;
-        else
-            chip->buffer_end = 4096 * 1024;
-
-        chip->interrupt = snd_nm256_interrupt_zx;
-        chip->mixer_status_offset = NM2_MIXER_STATUS_OFFSET;
-        chip->mixer_status_mask = NM2_MIXER_READY_MASK;
-    }
-
-    chip->buffer_size = chip->streams[SNDRV_PCM_STREAM_PLAYBACK].bufsize + chip->streams[SNDRV_PCM_STREAM_CAPTURE].bufsize;
-    if (chip->use_cache)
-        chip->buffer_size += NM_TOTAL_COEFF_COUNT * 4;
-    else
-        chip->buffer_size += NM_MAX_PLAYBACK_COEF_SIZE + NM_MAX_RECORD_COEF_SIZE;
-
-    if (buffertop >= chip->buffer_size && buffertop < chip->buffer_end)
-        chip->buffer_end = buffertop;
-    else {
-        /* get buffer end pointer from signature */
-        if ((err = snd_nm256_peek_for_sig(chip)) < 0)
-            goto __error;
-    }
-
-    chip->buffer_start = chip->buffer_end - chip->buffer_size;
-    chip->buffer_addr += chip->buffer_start;
-
-    printk(KERN_INFO "nm256: Mapping port 1 from 0x%x - 0x%x\n",
-           chip->buffer_start, chip->buffer_end);
-
-    chip->res_buffer = request_mem_region(chip->buffer_addr,
-                                          chip->buffer_size,
-                                          card->driver);
-    if (chip->res_buffer == NULL) {
-        snd_printk("nm256: buffer 0x%lx (size 0x%x) busy\n",
-                   chip->buffer_addr, chip->buffer_size);
-        err = -EBUSY;
-        goto __error;
-    }
-    chip->buffer = (unsigned long) ioremap_nocache(chip->buffer_addr, chip->buffer_size);
-    if (chip->buffer == 0) {
-        err = -ENOMEM;
-        snd_printk("unable to map ring buffer at %lx\n", chip->buffer_addr);
-        goto __error;
-    }
-
-    /* set offsets */
-    addr = chip->buffer_start;
-    chip->streams[SNDRV_PCM_STREAM_PLAYBACK].buf = addr;
-    addr += chip->streams[SNDRV_PCM_STREAM_PLAYBACK].bufsize;
-    chip->streams[SNDRV_PCM_STREAM_CAPTURE].buf = addr;
-    addr += chip->streams[SNDRV_PCM_STREAM_CAPTURE].bufsize;
-    if (chip->use_cache) {
-        chip->all_coeff_buf = addr;
-    } else {
-        chip->coeff_buf[SNDRV_PCM_STREAM_PLAYBACK] = addr;
-        addr += NM_MAX_PLAYBACK_COEF_SIZE;
-        chip->coeff_buf[SNDRV_PCM_STREAM_CAPTURE] = addr;
-    }
-
-    /* Fixed setting. */
-    chip->mixer_base = NM_MIXER_OFFSET;
-
-    chip->coeffs_current = 0;
-
-    snd_nm256_init_chip(chip);
-
-    // pci_set_master(pci); /* needed? */
-
-    snd_card_set_pm_callback(card, nm256_suspend, nm256_resume, chip);
-    if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0)
-        goto __error;
-
-    *chip_ret = chip;
-    return 0;
+snd_nm256_create(struct snd_card *card, struct pci_dev *pci,
+                 struct nm256 **chip_ret)
+{
+        struct nm256 *chip;
+        int err, pval;
+        static struct snd_device_ops ops = {
+                .dev_free =     snd_nm256_dev_free,
+        };
+        u32 addr;
+
+        *chip_ret = NULL;
+
+        if ((err = pci_enable_device(pci)) < 0)
+                return err;
+
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
+        if (chip == NULL) {
+                pci_disable_device(pci);
+                return -ENOMEM;
+        }
+
+        chip->card = card;
+        chip->pci = pci;
+        chip->use_cache = use_cache;
+        spin_lock_init(&chip->reg_lock);
+        chip->irq = -1;
+        mutex_init(&chip->irq_mutex);
+
+        /* store buffer sizes in bytes */
+        chip->streams[SNDRV_PCM_STREAM_PLAYBACK].bufsize = playback_bufsize * 1024;
+        chip->streams[SNDRV_PCM_STREAM_CAPTURE].bufsize = capture_bufsize * 1024;
+
+        /* 
+         * The NM256 has two memory ports.  The first port is nothing
+         * more than a chunk of video RAM, which is used as the I/O ring
+         * buffer.  The second port has the actual juicy stuff (like the
+         * mixer and the playback engine control registers).
+         */
+
+        chip->buffer_addr = pci_resource_start(pci, 0);
+        chip->cport_addr = pci_resource_start(pci, 1);
+
+        /* Init the memory port info.  */
+        /* remap control port (#2) */
+        chip->res_cport = request_mem_region(chip->cport_addr, NM_PORT2_SIZE,
+                                             card->driver);
+        if (chip->res_cport == NULL) {
+                snd_printk(KERN_ERR "memory region 0x%lx (size 0x%x) busy\n",
+                           chip->cport_addr, NM_PORT2_SIZE);
+                err = -EBUSY;
+                goto __error;
+        }
+        chip->cport = ioremap_nocache(chip->cport_addr, NM_PORT2_SIZE);
+        if (chip->cport == NULL) {
+                snd_printk(KERN_ERR "unable to map control port %lx\n", chip->cport_addr);
+                err = -ENOMEM;
+                goto __error;
+        }
+
+        if (!strcmp(card->driver, "NM256AV")) {
+                /* Ok, try to see if this is a non-AC97 version of the hardware. */
+                pval = snd_nm256_readw(chip, NM_MIXER_PRESENCE);
+                if ((pval & NM_PRESENCE_MASK) != NM_PRESENCE_VALUE) {
+                        if (! force_ac97) {
+                                printk(KERN_ERR "nm256: no ac97 is found!\n");
+                                printk(KERN_ERR "  force the driver to load by "
+                                       "passing in the module parameter\n");
+                                printk(KERN_ERR "    force_ac97=1\n");
+                                printk(KERN_ERR "  or try sb16 or cs423x drivers instead.\n");
+                                err = -ENXIO;
+                                goto __error;
+                        }
+                }
+                chip->buffer_end = 2560 * 1024;
+                chip->interrupt = snd_nm256_interrupt;
+                chip->mixer_status_offset = NM_MIXER_STATUS_OFFSET;
+                chip->mixer_status_mask = NM_MIXER_READY_MASK;
+        } else {
+                /* Not sure if there is any relevant detect for the ZX or not.  */
+                if (snd_nm256_readb(chip, 0xa0b) != 0)
+                        chip->buffer_end = 6144 * 1024;
+                else
+                        chip->buffer_end = 4096 * 1024;
+
+                chip->interrupt = snd_nm256_interrupt_zx;
+                chip->mixer_status_offset = NM2_MIXER_STATUS_OFFSET;
+                chip->mixer_status_mask = NM2_MIXER_READY_MASK;
+        }
+        
+        chip->buffer_size = chip->streams[SNDRV_PCM_STREAM_PLAYBACK].bufsize +
+                chip->streams[SNDRV_PCM_STREAM_CAPTURE].bufsize;
+        if (chip->use_cache)
+                chip->buffer_size += NM_TOTAL_COEFF_COUNT * 4;
+        else
+                chip->buffer_size += NM_MAX_PLAYBACK_COEF_SIZE + NM_MAX_RECORD_COEF_SIZE;
+
+        if (buffer_top >= chip->buffer_size && buffer_top < chip->buffer_end)
+                chip->buffer_end = buffer_top;
+        else {
+                /* get buffer end pointer from signature */
+                if ((err = snd_nm256_peek_for_sig(chip)) < 0)
+                        goto __error;
+        }
+
+        chip->buffer_start = chip->buffer_end - chip->buffer_size;
+        chip->buffer_addr += chip->buffer_start;
+
+        printk(KERN_INFO "nm256: Mapping port 1 from 0x%x - 0x%x\n",
+               chip->buffer_start, chip->buffer_end);
+
+        chip->res_buffer = request_mem_region(chip->buffer_addr,
+                                              chip->buffer_size,
+                                              card->driver);
+        if (chip->res_buffer == NULL) {
+                snd_printk(KERN_ERR "nm256: buffer 0x%lx (size 0x%x) busy\n",
+                           chip->buffer_addr, chip->buffer_size);
+                err = -EBUSY;
+                goto __error;
+        }
+        chip->buffer = ioremap_nocache(chip->buffer_addr, chip->buffer_size);
+        if (chip->buffer == NULL) {
+                err = -ENOMEM;
+                snd_printk(KERN_ERR "unable to map ring buffer at %lx\n", chip->buffer_addr);
+                goto __error;
+        }
+
+        /* set offsets */
+        addr = chip->buffer_start;
+        chip->streams[SNDRV_PCM_STREAM_PLAYBACK].buf = addr;
+        addr += chip->streams[SNDRV_PCM_STREAM_PLAYBACK].bufsize;
+        chip->streams[SNDRV_PCM_STREAM_CAPTURE].buf = addr;
+        addr += chip->streams[SNDRV_PCM_STREAM_CAPTURE].bufsize;
+        if (chip->use_cache) {
+                chip->all_coeff_buf = addr;
+        } else {
+                chip->coeff_buf[SNDRV_PCM_STREAM_PLAYBACK] = addr;
+                addr += NM_MAX_PLAYBACK_COEF_SIZE;
+                chip->coeff_buf[SNDRV_PCM_STREAM_CAPTURE] = addr;
+        }
+
+        /* Fixed setting. */
+        chip->mixer_base = NM_MIXER_OFFSET;
+
+        chip->coeffs_current = 0;
+
+        snd_nm256_init_chip(chip);
+
+        // pci_set_master(pci); /* needed? */
+        
+        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0)
+                goto __error;
+
+        snd_card_set_dev(card, &pci->dev);
+
+        *chip_ret = chip;
+        return 0;
 
 __error:
-    snd_nm256_free(chip);
-    return err;
-}
+        snd_nm256_free(chip);
+        return err;
+}
+
 
 struct nm256_quirk {
@@ -1590 +1638 @@
 };
 
-enum { NM_BLACKLISTED, NM_RESET_WORKAROUND };
+enum { NM_BLACKLISTED, NM_RESET_WORKAROUND, NM_RESET_WORKAROUND_2 };
 
 static struct nm256_quirk nm256_quirks[] __devinitdata = {
         /* HP omnibook 4150 has cs4232 codec internally */
-        { 0x103c, 0x0007, NM_BLACKLISTED },
+        { .vendor = 0x103c, .device = 0x0007, .type = NM_BLACKLISTED },
         /* Sony PCG-F305 */
-        { 0x104d, 0x8041, NM_RESET_WORKAROUND },
+        { .vendor = 0x104d, .device = 0x8041, .type = NM_RESET_WORKAROUND },
         /* Dell Latitude LS */
-        { 0x1028, 0x0080, NM_RESET_WORKAROUND },
-        {0 } /* terminator */
+        { .vendor = 0x1028, .device = 0x0080, .type = NM_RESET_WORKAROUND },
+        /* Dell Latitude CSx */
+        { .vendor = 0x1028, .device = 0x0091, .type = NM_RESET_WORKAROUND_2 },
+        {0} /* terminator */
 };
 
 
 static int __devinit snd_nm256_probe(struct pci_dev *pci,
-                                     const struct pci_device_id *pci_id)
-{
-    static int dev;
-    snd_card_t *card;
-    nm256_t *chip;
-    int err;
-    unsigned int xbuffer_top;
-    struct nm256_quirk *q;
-    u16 subsystem_vendor, subsystem_device;
-
-    if ((err = pci_enable_device(pci)) < 0)
-        return err;
-
-    if (dev >= SNDRV_CARDS)
-        return -ENODEV;
-    if (!enable[dev]) {
-        dev++;
-        return -ENOENT;
-    }
-
-    pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
-    pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &subsystem_device);
-
-    for (q = nm256_quirks; q->vendor; q++) {
-        if (q->vendor == subsystem_vendor && q->device == subsystem_device) {
-            switch (q->type) {
-            case NM_BLACKLISTED:
-                printk(KERN_INFO "nm256: The device is blacklisted.  Loading stopped\n");
-                return -ENODEV;
-            case NM_RESET_WORKAROUND:
-                reset_workaround[dev] = 1;
-                break;
-            }
-        }
-    }
-
-    card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-    if (card == NULL)
-        return -ENOMEM;
-
-    switch (pci->device) {
-    case PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO:
-        strcpy(card->driver, "NM256AV");
-        break;
-    case PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO:
-        strcpy(card->driver, "NM256ZX");
-        break;
-    default:
-        snd_printk("invalid device id 0x%x\n", pci->device);
-        snd_card_free(card);
-        return -EINVAL;
-    }
-
-    if (vaio_hack[dev])
-        xbuffer_top = 0x25a800; /* this avoids conflicts with XFree86 server */
-    else
-        xbuffer_top = buffer_top[dev];
-
-    if (playback_bufsize[dev] < 4)
-        playback_bufsize[dev] = 4;
-    if (playback_bufsize[dev] > 128)
-        playback_bufsize[dev] = 128;
-    if (capture_bufsize[dev] < 4)
-        capture_bufsize[dev] = 4;
-    if (capture_bufsize[dev] > 128)
-        capture_bufsize[dev] = 128;
-    if ((err = snd_nm256_create(card, pci,
-                                playback_bufsize[dev] * 1024, /* in bytes */
-                                capture_bufsize[dev] * 1024,  /* in bytes */
-                                force_ac97[dev],
-                                xbuffer_top,
-                                use_cache[dev],
-                                &chip)) < 0) {
-        snd_card_free(card);
-        return err;
-    }
-
-    if (reset_workaround[dev]) {
-        snd_printdd(KERN_INFO "nm256: reset_workaround activated\n");
-        chip->reset_workaround = 1;
-    }
-    if ((err = snd_nm256_pcm(chip, 0)) < 0 ||
-        (err = snd_nm256_mixer(chip)) < 0) {
-        snd_card_free(card);
-        return err;
-    }
-
-    sprintf(card->shortname, "NeoMagic %s", card->driver);
-    sprintf(card->longname, "%s at 0x%lx & 0x%lx, irq %d",
-            card->shortname,
-            chip->buffer_addr, chip->cport_addr, chip->irq);
-
-    if ((err = snd_card_register(card)) < 0) {
-        snd_card_free(card);
-        return err;
-    }
-
-    pci_set_drvdata(pci, card);
-    dev++;
-    return 0;
+                                     const struct pci_device_id *pci_id)
+{
+        struct snd_card *card;
+        struct nm256 *chip;
+        int err;
+        struct nm256_quirk *q;
+        u16 subsystem_vendor, subsystem_device;
+
+        pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
+        pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &subsystem_device);
+
+        for (q = nm256_quirks; q->vendor; q++) {
+                if (q->vendor == subsystem_vendor && q->device == subsystem_device) {
+                        switch (q->type) {
+                        case NM_BLACKLISTED:
+                                printk(KERN_INFO "nm256: The device is blacklisted. "
+                                       "Loading stopped\n");
+                                return -ENODEV;
+                        case NM_RESET_WORKAROUND_2:
+                                reset_workaround_2 = 1;
+                                /* Fall-through */
+                        case NM_RESET_WORKAROUND:
+                                reset_workaround = 1;
+                                break;
+                        }
+                }
+        }
+
+        card = snd_card_new(index, id, THIS_MODULE, 0);
+        if (card == NULL)
+                return -ENOMEM;
+
+        switch (pci->device) {
+        case PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO:
+                strcpy(card->driver, "NM256AV");
+                break;
+        case PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO:
+                strcpy(card->driver, "NM256ZX");
+                break;
+        case PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO:
+                strcpy(card->driver, "NM256XL+");
+                break;
+        default:
+                snd_printk(KERN_ERR "invalid device id 0x%x\n", pci->device);
+                snd_card_free(card);
+                return -EINVAL;
+        }
+
+        if (vaio_hack)
+                buffer_top = 0x25a800;  /* this avoids conflicts with XFree86 server */
+
+        if (playback_bufsize < 4)
+                playback_bufsize = 4;
+        if (playback_bufsize > 128)
+                playback_bufsize = 128;
+        if (capture_bufsize < 4)
+                capture_bufsize = 4;
+        if (capture_bufsize > 128)
+                capture_bufsize = 128;
+        if ((err = snd_nm256_create(card, pci, &chip)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+        card->private_data = chip;
+
+        if (reset_workaround) {
+                snd_printdd(KERN_INFO "nm256: reset_workaround activated\n");
+                chip->reset_workaround = 1;
+        }
+
+        if (reset_workaround_2) {
+                snd_printdd(KERN_INFO "nm256: reset_workaround_2 activated\n");
+                chip->reset_workaround_2 = 1;
+        }
+
+        if ((err = snd_nm256_pcm(chip, 0)) < 0 ||
+            (err = snd_nm256_mixer(chip)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+
+        sprintf(card->shortname, "NeoMagic %s", card->driver);
+        sprintf(card->longname, "%s at 0x%lx & 0x%lx, irq %d",
+                card->shortname,
+                chip->buffer_addr, chip->cport_addr, chip->irq);
+
+        if ((err = snd_card_register(card)) < 0) {
+                snd_card_free(card);
+                return err;
+        }
+
+        pci_set_drvdata(pci, card);
+        return 0;
 }
 
 static void __devexit snd_nm256_remove(struct pci_dev *pci)
 {
-    snd_card_free(pci_get_drvdata(pci));
-    pci_set_drvdata(pci, NULL);
-}
+        snd_card_free(pci_get_drvdata(pci));
+        pci_set_drvdata(pci, NULL);
+}
+
 
 static struct pci_driver driver = {
-    0,0,0,"NeoMagic 256",
-    snd_nm256_ids,
-    snd_nm256_probe,
-    snd_nm256_remove,
-    SND_PCI_PM_CALLBACKS
+        .name = "NeoMagic 256",
+        .id_table = snd_nm256_ids,
+        .probe = snd_nm256_probe,
+        .remove = snd_nm256_remove,
+#ifdef CONFIG_PM
+        .suspend = nm256_suspend,
+        .resume = nm256_resume,
+#endif
 };
 
+
 static int __init alsa_card_nm256_init(void)
 {
-    int err;
-    if ((err = pci_module_init(&driver)) < 0) {
-#ifdef MODULE
-        //              printk(KERN_ERR "NeoMagic 256 audio soundchip not found or device busy\n");
-#endif
-        return err;
-    }
-    return 0;
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_nm256_exit(void)
 {
-    pci_unregister_driver(&driver);
+        pci_unregister_driver(&driver);
 }
 
 module_init(alsa_card_nm256_init)
 module_exit(alsa_card_nm256_exit)
-
-#ifndef MODULE
-
-/* format is: snd-nm256=enable,index,id,
- playback_bufsize,capture_bufsize,
- force_ac97,buffer_top,use_cache */
-
-static int __init alsa_card_nm256_setup(char *str)
-{
-    static unsigned __initdata nr_dev = 0;
-
-    if (nr_dev >= SNDRV_CARDS)
-        return 0;
-    (void)(get_option(&str,&enable[nr_dev]) == 2 &&
-           get_option(&str,&index[nr_dev]) == 2 &&
-           get_id(&str,&id[nr_dev]) == 2 &&
-           get_option(&str,&playback_bufsize[nr_dev]) == 2 &&
-           get_option(&str,&capture_bufsize[nr_dev]) == 2 &&
-           get_option(&str,&force_ac97[nr_dev]) == 2 &&
-           get_option(&str,&buffer_top[nr_dev]) == 2 &&
-           get_option(&str,&use_cache[nr_dev]) == 2);
-    nr_dev++;
-    return 1;
-}
-
-__setup("snd-nm256=", alsa_card_nm256_setup);
-
-#endif /* ifndef MODULE */

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

@@ -2363 +2363 @@
                 { .subvendor = 0x1462, .subdevice = 0x7023, .action = VIA_DXS_NO_VRA }, /* MSI K8T Neo2-FI */
                 { .subvendor = 0x1462, .subdevice = 0x7120, .action = VIA_DXS_ENABLE }, /* MSI KT4V */
-                { .subvendor = 0x1462, .subdevice = 0x7142, .action = VIA_DXS_ENABLE }, /* MSI K8MM-V */
+                { .subvendor = 0x1462, .subdevice = 0x7142, .action = VIA_DXS_ENABLE }, /* MSI K8MM-V */
+                { .subvendor = 0x1462, .subdevice = 0xb012, .action = VIA_DXS_SRC }, /* P4M800/VIA8237R */
                 { .subvendor = 0x147b, .subdevice = 0x1401, .action = VIA_DXS_ENABLE }, /* ABIT KD7(-RAID) */
                 { .subvendor = 0x147b, .subdevice = 0x1411, .action = VIA_DXS_ENABLE }, /* ABIT VA-20 */
@@ -2376 +2377 @@
                 { .subvendor = 0x161f, .subdevice = 0x2032, .action = VIA_DXS_48K }, /* m680x machines */
                 { .subvendor = 0x1631, .subdevice = 0xe004, .action = VIA_DXS_ENABLE }, /* Easy Note 3174, Packard Bell */
-                { .subvendor = 0x1695, .subdevice = 0x3005, .action = VIA_DXS_ENABLE }, /* EPoX EP-8K9A */
-                { .subvendor = 0x16f3, .subdevice = 0x6405, .action = VIA_DXS_SRC }, /* Jetway K8M8MS */
-                { .subvendor = 0x1849, .subdevice = 0x3059, .action = VIA_DXS_NO_VRA }, /* ASRock K7VM2 */
+                { .subvendor = 0x1695, .subdevice = 0x3005, .action = VIA_DXS_ENABLE }, /* EPoX EP-8K9A */
+                { .subvendor = 0x1695, .subdevice = 0x300c, .action = VIA_DXS_SRC }, /* EPoX EP-8KRAI */
+                { .subvendor = 0x1695, .subdevice = 0x300e, .action = VIA_DXS_SRC }, /* EPoX 9HEAI */
+                { .subvendor = 0x16f3, .subdevice = 0x6405, .action = VIA_DXS_SRC }, /* Jetway K8M8MS */
+                { .subvendor = 0x1734, .subdevice = 0x1078, .action = VIA_DXS_SRC }, /* FSC Amilo L7300 */
+                { .subvendor = 0x1734, .subdevice = 0x1093, .action = VIA_DXS_SRC }, /* FSC */
+                { .subvendor = 0x1849, .subdevice = 0x3059, .action = VIA_DXS_NO_VRA }, /* ASRock K7VM2 */                { .subvendor = 0x1849, .subdevice = 0x9739, .action = VIA_DXS_SRC }, /* ASRock mobo(?) */
                 { .subvendor = 0x1849, .subdevice = 0x9761, .action = VIA_DXS_SRC }, /* ASRock mobo(?) */
                 { .subvendor = 0x1919, .subdevice = 0x200a, .action = VIA_DXS_NO_VRA }, /* Soltek SL-K8Tpro-939 */

GPL/trunk/drv32/pciids.h

@@ -78 +78 @@
 #define PCIID_INTEL_ICH6           ((PCI_DEVICE_ID_INTEL_ICH6<<16)     | PCI_VENDOR_ID_INTEL)
 #define PCIID_INTEL_ICH7           ((PCI_DEVICE_ID_INTEL_ICH7<<16)     | PCI_VENDOR_ID_INTEL)
-#define PCIID_SI_7012              0x7012
+#define PCIID_SI_7012              0x70121039
 
-#define PCIID_NVIDIA_MCP_AUDIO     0x10de01b1
-#define PCIID_NVIDIA_MCP2_AUDIO    0x10de006a
-#define PCIID_NVIDIA_MCP3_AUDIO    0x10de00da
-#define PCIID_NVIDIA_CK8S_AUDIO    0x10de00ea
-#define PCIID_NVIDIA_CK8_AUDIO     0x10de008a
-
+#define PCIID_NVIDIA_MCP_AUDIO     0x01b110de
+#define PCIID_NVIDIA_MCP2_AUDIO    0x006a10de
+#define PCIID_NVIDIA_MCP3_AUDIO    0x00da10de
+#define PCIID_NVIDIA_CK8S_AUDIO    0x00ea10de
+#define PCIID_NVIDIA_CK8_AUDIO     0x008a10de
 
 #define PCIID_CIRRUS_4281          ((PCI_DEVICE_ID_CIRRUS_4281<<16)    | PCI_VENDOR_ID_CIRRUS)

GPL/trunk/include/version.mak

@@ -11 +11 @@
 BLDLVL_REVISION = 1.1
 BLDLVL_FILEVER = 4
-BLDLVL_DATETIME = 04.01.2006 00:19:06
+BLDLVL_DATETIME = 31.03.2006 01:05:34
 BLDLVL_MACHINE = VLAD

GPL/trunk/lib32/fminstrload.c

@@ -125 +125 @@
 //******************************************************************************
 
-#ifdef DEBUG
+#if 0
+//def DEBUG
 /*
  * Show instrument FM operators

GPL/trunk/lib32/ioctl.c

@@ -1063 +1063 @@
                 if (fileid == opened_handles[i].FileId)
                 {
+                    opened_handles[i].reuse = 0;
                     if (OSS32_WaveClose((OSSSTREAMID)opened_handles[i].handle) == 0)
                         opened_handles[i].handle = 0;
@@ -1069 +1070 @@
             else
             {
+                opened_handles[i].reuse = 0;
                 if (OSS32_WaveClose((OSSSTREAMID)opened_handles[i].handle) == 0)
                     opened_handles[i].handle = 0;

GPL/trunk/lib32/irq.c

@@ -45 +45 @@
 
 static IRQ_SLOT         arSlots[MAX_IRQ_SLOTS] = { 0 };
+static ULONG           eoiIrq[255] = {0};
 
 
@@ -51 +52 @@
 static IRQ_SLOT *FindSlot(unsigned irq)
 {
-  IRQ_SLOT      *pSlot;
-
-  for( pSlot = arSlots; pSlot != &arSlots[MAX_IRQ_SLOTS]; pSlot++ )
-  {
-    if( pSlot->irqNo == irq )   return pSlot;
-  }
-
-  return NULL;
+    IRQ_SLOT      *pSlot;
+
+    for( pSlot = arSlots; pSlot != &arSlots[MAX_IRQ_SLOTS]; pSlot++ )
+    {
+        if( pSlot->irqNo == irq )   return pSlot;
+    }
+
+    return NULL;
 }
 
@@ -71 +72 @@
     IRQ_SLOT    *pSlot = FindSlot(irq);
     unsigned    u, uSlotNo = (unsigned)-1;
-  if( !pSlot )
-  {
-    // find empty slot
-    for( uSlotNo = 0; uSlotNo < MAX_IRQ_SLOTS; uSlotNo++ )
-    {
-      if( arSlots[uSlotNo].flHandlers == 0 )
-      {
-        pSlot = &arSlots[uSlotNo];      break;
-      }
-    }
-
-    }
-
-  if( pSlot )
-  {
-    if(RMRequestIRQ(/*hResMgr,*/ irq, (x0 & SA_SHIRQ) != 0) == FALSE) {
-        dprintf(("RMRequestIRQ failed for irq %d", irq));
-//      return 0;
-    }
-
-    for( u = 0; u < MAX_SHAREDIRQS; u++ )
-    {
-      if( pSlot->irqHandlers[u].handler == NULL )
-      {
-          pSlot->irqNo = irq;
-        pSlot->irqHandlers[u].handler = handler;
-        pSlot->irqHandlers[u].x0 = x0;
-        pSlot->irqHandlers[u].x1 = (char *)x1;
-        pSlot->irqHandlers[u].x2 = x2;
-
-        if( pSlot->flHandlers != 0 ||
-            ALSA_SetIrq(irq, uSlotNo, (x0 & SA_SHIRQ) != 0) )
+    if( !pSlot )
+    {
+        // find empty slot
+        for( uSlotNo = 0; uSlotNo < MAX_IRQ_SLOTS; uSlotNo++ )
+        {
+            if( arSlots[uSlotNo].flHandlers == 0 )
+            {
+                pSlot = &arSlots[uSlotNo];      break;
+            }
+        }
+
+    }
+
+    if( pSlot )
+    {
+        if(RMRequestIRQ(/*hResMgr,*/ irq, (x0 & SA_SHIRQ) != 0) == FALSE) {
+            dprintf(("RMRequestIRQ failed for irq %d", irq));
+            //  return 0;
+        }
+
+        for( u = 0; u < MAX_SHAREDIRQS; u++ )
+        {
+            if( pSlot->irqHandlers[u].handler == NULL )
+            {
+                pSlot->irqNo = irq;
+                pSlot->irqHandlers[u].handler = handler;
+                pSlot->irqHandlers[u].x0 = x0;
+                pSlot->irqHandlers[u].x1 = (char *)x1;
+                pSlot->irqHandlers[u].x2 = x2;
+
+                if( pSlot->flHandlers != 0 ||
+                   ALSA_SetIrq(irq, uSlotNo, (x0 & SA_SHIRQ) != 0) )
                 {
-          pSlot->flHandlers |= 1 << u;
-          return 0;
+                    pSlot->flHandlers |= 1 << u;
+                    return 0;
                 }
 
-        break;
-            }
-        }
-    }
-
-  dprintf(("request_irq: Unable to register irq handler for irq %d\n", irq));
+                break;
+            }
+        }
+    }
+
+    dprintf(("request_irq: Unable to register irq handler for irq %d\n", irq));
     return 1;
 }
@@ -122 +123 @@
 void free_irq(unsigned int irq, void *userdata)
 {
-  unsigned      u;
-  IRQ_SLOT      *pSlot;
-
-  if( (pSlot = FindSlot(irq)) != NULL )
-  {
-    for( u = 0; u < MAX_SHAREDIRQS; u++ )
-    {
-      if( pSlot->irqHandlers[u].x2 == userdata )
-      {
-        pSlot->flHandlers &= ~(1 << u);
-        if( pSlot->flHandlers == 0 )
-        {
-          ALSA_FreeIrq(pSlot->irqNo);
-          pSlot->irqNo = 0;
-//        pSlot->fEOI = 0;
-            }
-
-        pSlot->irqHandlers[u].handler = NULL;
-        pSlot->irqHandlers[u].x0 = 0;
-        pSlot->irqHandlers[u].x1 = NULL;
-        pSlot->irqHandlers[u].x2 = NULL;
-
-        return;
-
-      }
-    }
-}
+    unsigned    u;
+    IRQ_SLOT    *pSlot;
+
+    if( (pSlot = FindSlot(irq)) != NULL )
+    {
+        for( u = 0; u < MAX_SHAREDIRQS; u++ )
+        {
+            if( pSlot->irqHandlers[u].x2 == userdata )
+            {
+                pSlot->flHandlers &= ~(1 << u);
+                if( pSlot->flHandlers == 0 )
+                {
+                    ALSA_FreeIrq(pSlot->irqNo);
+                    pSlot->irqNo = 0;
+                    //    pSlot->fEOI = 0;
+                }
+
+                pSlot->irqHandlers[u].handler = NULL;
+                pSlot->irqHandlers[u].x0 = 0;
+                pSlot->irqHandlers[u].x1 = NULL;
+                pSlot->irqHandlers[u].x2 = NULL;
+
+                return;
+
+            }
+        }
+    }
 }
 
@@ -156 +157 @@
 void eoi_irq(unsigned int irq)
 {
-  (void)irq;
-/*
-  IRQ_SLOT      *pSlot = FindSlot(irq);
-
-  if( pSlot )   pSlot->fEOI = 1;
-*/
+    /*(void)irq; */
+    /*
+     IRQ_SLOT   *pSlot = FindSlot(irq);
+
+     if( pSlot )        pSlot->fEOI = 1;
+     */
+    eoiIrq[irq]++;
 }
 
@@ -169 +171 @@
 BOOL process_interrupt(ULONG ulSlotNo, ULONG *pulIrq)
 {
-  unsigned      u;
- int rc;
-  IRQ_SLOT      *pSlot;
-
-#ifdef DEBUG
-// dprintf(("int proc"));
-#endif
-
-    if(fSuspended) 
+    unsigned    u;
+    int rc;
+    IRQ_SLOT    *pSlot;
+
+#ifdef DEBUG
+    dprintf(("enter int proc %d %d",ulSlotNo, *pulIrq));
+#endif
+
+    if(fSuspended)
     {//If our device is suspended, then we can't receive interrupts, so it must
-     //be for some other device
-     //Don't pass it to the linux handler as the device doesn't respond as expected
+        //be for some other device
+        //Don't pass it to the linux handler as the device doesn't respond as expected
         //when suspended
 #ifdef DEBUG
-        dprintf(("IRQ %d suspended",irq));
+        dprintf(("Slot %d IRQ %d suspended",ulSlotNo, *pulIrq));
 #endif
         return FALSE;
     }
 
-  if( ulSlotNo < MAX_IRQ_SLOTS )
-    {
-    pSlot = &arSlots[ulSlotNo];
-
-    for( u = 0; u < MAX_SHAREDIRQS; u++ )
-    {
-      if( pSlot->irqHandlers[u].handler )
-        {
-            fInInterrupt = TRUE;
-        rc = pSlot->irqHandlers[u].handler(pSlot->irqNo,
-                                           pSlot->irqHandlers[u].x2, 0);
-            fInInterrupt = FALSE;
-
-        if( rc /*== 1 || pSlot->fEOI*/ ) {
-
-            *pulIrq = pSlot->irqNo;
-//          pSlot->fEOI = 0;
-
-                //ok, this interrupt was intended for us; notify the 16 bits MMPM/2 driver
-                OSS32_ProcessIRQ();
-                return TRUE;
-            }
-        }
-    }
-    }
+    if( ulSlotNo < MAX_IRQ_SLOTS )
+    {
+        pSlot = &arSlots[ulSlotNo];
+
+        for( u = 0; u < MAX_SHAREDIRQS; u++ )
+        {
+            if(pSlot && pSlot->irqHandlers[u].handler )
+            {
+                fInInterrupt = TRUE;
+                rc = pSlot->irqHandlers[u].handler(pSlot->irqNo,
+                                                   pSlot->irqHandlers[u].x2, 0);
+                if (rc == 1) eoi_irq(pSlot->irqNo);
+                rc = (eoiIrq[pSlot->irqNo] > 0);
+                fInInterrupt = FALSE;
+
+                if( rc /*== 1 || pSlot->fEOI*/ ) {
+
+                    *pulIrq = pSlot->irqNo;
+                    //      pSlot->fEOI = 0;
+
+                    //ok, this interrupt was intended for us; notify the 16 bits MMPM/2 driver
+                    OSS32_ProcessIRQ();
+#ifdef DEBUG
+                    dprintf(("exit(1) int proc %d %d",ulSlotNo, *pulIrq));
+#endif
+                    eoiIrq[pSlot->irqNo] = 0;
+                    return TRUE;
+                }
+            }
+        }
+    }
+#ifdef DEBUG
+                    dprintf(("exit(0) int proc %d %d",ulSlotNo, *pulIrq));
+#endif
 
     return FALSE;
@@ -236 +247 @@
 //******************************************************************************
 
-
-

GPL/trunk/lib32/memory.cpp

@@ -195 +195 @@
     if (rc == 0) {
         *pAddr = (LINEAR)addr;
+        if (flags & VMDHA_USEHIGHMEM)
+            dprintf(("allocated %X in HIGH memory"), size);
+        else dprintf(("allocated %X in LOW memory"), size);
     }
     if ((rc == 87) &&

GPL/trunk/lib32/ossidc.cpp

@@ -268 +268 @@
         fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_ca0106_exit);
     }
+    if((ForceCard == CARD_NONE || ForceCard == CARD_AZX) &&
+       nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_azx_init) == 0)
+    {
+        fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_azx_exit);
+    }
     if((ForceCard == CARD_NONE || ForceCard == CARD_BT87X) &&
        nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_bt87x_init) == 0)
@@ -273 +278 @@
         fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_bt87x_exit);
     }
-    if((ForceCard == CARD_NONE || ForceCard == CARD_AZX) &&
-       nrCardsDetected < (OSS32_MAX_AUDIOCARDS-1) && call_module_init(alsa_card_azx_init) == 0)
-    {
-        fnCardExitCall[nrCardsDetected] = name_module_exit(alsa_card_azx_exit);
-    }
+
 #endif
     fStrategyInit = FALSE;

GPL/trunk/lib32/pci.c

@@ -465 +465 @@
 
                     // create adapter
-                    RMDone((driver->id_table[i].vendor << 16) | driver->id_table[i].device);
+                    RMDone((driver->id_table[i].device << 16) | driver->id_table[i].vendor);
                     nrCardsDetected++;
                     return 1;

GPL/trunk/lib32/sound.c

@@ -775 +775 @@
         return OSSERR_INVALID_PARAMETER;
     }
-
+tryagain:
     //set operation to non-blocking
     pHandle->file.f_flags = O_NONBLOCK;
@@ -950 +950 @@
     //initialize parameter block & set sample rate, nr of channels and sample format, nr of periods,
     //period size and buffer size
-tryagain:
+//tryagain:
     _snd_pcm_hw_params_any(&params);
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_ACCESS,

GPL/trunk/lib32/stack.cpp

@@ -77 +77 @@
         //allocate our private stack
         rc = DevVMAlloc(VMDHA_USEHIGHMEM|VMDHA_FIXED|VMDHL_CONTIGUOUS, TOTAL_STACKSIZE, (LINEAR)-1, (LINEAR)&StackBase);
+
         if(rc) {
-            DebugInt3();
-            return 0;
+            if (rc == 87)
+            {
+                rc = DevVMAlloc(VMDHA_FIXED|VMDHL_CONTIGUOUS, TOTAL_STACKSIZE, (LINEAR)-1, (LINEAR)&StackBase);
+            }
+            if (rc)
+            {
+                DebugInt3();
+                return 0;
+            }
         }
         Ring0Stack[0].addr = StackBase;

GPL/trunk/lib32/timer.c

@@ -94 +94 @@
 void do_gettimeofday(struct timeval *tv)
 {
+#if 0
     tv->tv_sec  = 0; //os2gettimesec();
     tv->tv_usec = os2gettimemsec() * 1000;
+#else /* r.ihle patch */
+    unsigned u = os2gettimemsec();
+    tv->tv_sec  = u / 1000;
+    tv->tv_usec = (u % 1000) * 1000;
+#endif
 }
 //******************************************************************************