Changeset 85

Timestamp:

Oct 24, 2006, 8:25:27 PM (19 years ago)

Author:

vladest

Message:

Added VIA 8251 support

Location:

GPL/trunk

Files:

• alsa-kernel/include/sound/driver.h (modified) (1 diff)
• alsa-kernel/pci/via82xx.c (modified) (14 diffs)
• include/version.mak (modified) (1 diff)
• lib32/sound.c (modified) (3 diffs)

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

@@ -186 +186 @@
 #define PCI_D3hot  3
 #define PCI_D3cold 4
+#define pci_choose_state(pci,state)     ((state) ? PCI_D3hot : PCI_D0)
 #endif
 

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

@@ -60 +60 @@
 #include <sound/pcm_params.h>
 #include <sound/info.h>
+#include <sound/tlv.h>
 #include <sound/ac97_codec.h>
 #include <sound/mpu401.h>
@@ -128 +129 @@
 #define VIA_REV_8235            0x50    /* 2 rec, 4 pb, 1 multi-pb, spdif */
 #define VIA_REV_8237            0x60
+#define VIA_REV_8251            0x70
 
 /*
@@ -616 +618 @@
  *  Used for 686 and 8233A
  */
-static irqreturn_t snd_via686_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t snd_via686_interrupt(int irq, void *dev_id)
 {
         struct via82xx *chip = dev_id;
@@ -625 +627 @@
         if (! (status & chip->intr_mask)) {
                 if (chip->rmidi)
-                        /* check mpu401 interrupt */
-                        return snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data, regs);
+                    /* check mpu401 interrupt */
+                    //return snd_mpu401_uart_interrupt(irq, chip->rmidi->private_data);
                 return IRQ_NONE;
         }
@@ -662 +664 @@
  *  Interrupt handler
  */
-static irqreturn_t snd_via8233_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t snd_via8233_interrupt(int irq, void *dev_id)
 {
         struct via82xx *chip = dev_id;
@@ -867 +869 @@
                 status = inb(VIADEV_REG(viadev, OFFSET_STATUS));
 
+        /* An apparent bug in the 8251 is worked around by sending a
+         * REG_CTRL_START. */
+        if (chip->revision == VIA_REV_8251 && (status & VIA_REG_STAT_EOL))
+                snd_via82xx_pcm_trigger(substream, SNDRV_PCM_TRIGGER_START);
+
         if (!(status & VIA_REG_STAT_ACTIVE)) {
                 res = 0;
@@ -1697 +1704 @@
         return change;
 }
+static DECLARE_TLV_DB_SCALE(db_scale_dxs, -9450, 150, 1);
 
 static struct snd_kcontrol_new snd_via8233_pcmdxs_volume_control __devinitdata = {
         .name = "PCM Playback Volume",
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |
+                   SNDRV_CTL_ELEM_ACCESS_TLV_READ),
         .info = snd_via8233_dxs_volume_info,
         .get = snd_via8233_pcmdxs_volume_get,
-        .put = snd_via8233_pcmdxs_volume_put,
+        .put = snd_via8233_pcmdxs_volume_put,
+        .tlv = { .p = db_scale_dxs }
 };
 
@@ -1709 +1720 @@
         .name = "VIA DXS Playback Volume",
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .access = (SNDRV_CTL_ELEM_ACCESS_READWRITE |
+                   SNDRV_CTL_ELEM_ACCESS_TLV_READ),
         .count = 4,
         .info = snd_via8233_dxs_volume_info,
         .get = snd_via8233_dxs_volume_get,
-        .put = snd_via8233_dxs_volume_put,
+        .put = snd_via8233_dxs_volume_put,
+        .tlv = { .p = db_scale_dxs }
 };
 
@@ -2176 +2190 @@
         }
 
-        pci_set_power_state(pci, PCI_D3hot);
         pci_disable_device(pci);
-        pci_save_state(pci);
+        pci_save_state(pci);
+        pci_set_power_state(pci, pci_choose_state(pci, state));
         return 0;
 }
@@ -2188 +2202 @@
         int i;
 
+        pci_set_power_state(pci, PCI_D0);
         pci_restore_state(pci);
-        pci_enable_device(pci);
-        pci_set_power_state(pci, PCI_D0);
+        if (pci_enable_device(pci) < 0) {
+                printk(KERN_ERR "via82xx: pci_enable_device failed, "
+                       "disabling device\n");
+                snd_card_disconnect(card);
+                return -EIO;
+        }
+        pci_set_master(pci);
 
         snd_via82xx_chip_init(chip);
@@ -2335 +2355 @@
         { VIA_REV_8233A, "VIA 8233A", TYPE_VIA8233A },
         { VIA_REV_8235, "VIA 8235", TYPE_VIA8233 },
-        { VIA_REV_8237, "VIA 8237", TYPE_VIA8233 },
+        { VIA_REV_8237, "VIA 8237", TYPE_VIA8233 },
+        { VIA_REV_8251, "VIA 8251", TYPE_VIA8233 },
 };
 
@@ -2355 +2376 @@
                 { .subvendor = 0x1019, .subdevice = 0x0a81, .action = VIA_DXS_NO_VRA }, /* ECS K7VTA3 v8.0 */
                 { .subvendor = 0x1019, .subdevice = 0x0a85, .action = VIA_DXS_NO_VRA }, /* ECS L7VMM2 */
-                { .subvendor = 0x1019, .subdevice = 0xa101, .action = VIA_DXS_SRC },
+                { .subvendor = 0x1019, .subdevice = 0xa101, .action = VIA_DXS_SRC },
+                { .subvendor = 0x1019, .subdevice = 0xaa01, .action = VIA_DXS_SRC }, /* ECS K8T890-A */
                 { .subvendor = 0x1025, .subdevice = 0x0033, .action = VIA_DXS_NO_VRA }, /* Acer Inspire 1353LM */
                 { .subvendor = 0x1025, .subdevice = 0x0046, .action = VIA_DXS_SRC }, /* Acer Aspire 1524 WLMi */
@@ -2364 +2386 @@
                 { .subvendor = 0x1043, .subdevice = 0x812a, .action = VIA_DXS_SRC    }, /* ASUS A8V Deluxe */ 
                 { .subvendor = 0x1043, .subdevice = 0x8174, .action = VIA_DXS_SRC    }, /* ASUS */
+                { .subvendor = 0x1043, .subdevice = 0x81b9, .action = VIA_DXS_SRC    }, /* ASUS A8V-MX */
                 { .subvendor = 0x1071, .subdevice = 0x8375, .action = VIA_DXS_NO_VRA }, /* Vobis/Yakumo/Mitac notebook */
                 { .subvendor = 0x1071, .subdevice = 0x8399, .action = VIA_DXS_NO_VRA }, /* Umax AB 595T (VIA K8N800A - VT8237) */
@@ -2401 +2424 @@
                 { .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 = 0x1734, .subdevice = 0x10ab, .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 */
                 { .subvendor = 0x4005, .subdevice = 0x4710, .action = VIA_DXS_SRC },    /* MSI K7T266 Pro2 (MS-6380 V2.0) BIOS 3.7 */
                 {0} /* terminator */
-        };
-        struct dxs_whitelist *w;
+        };
+        const struct dxs_whitelist *w;
         unsigned short subsystem_vendor;
         unsigned short subsystem_device;

GPL/trunk/include/version.mak

@@ -11 +11 @@
 BLDLVL_REVISION = 1.1
 BLDLVL_FILEVER = 4
-BLDLVL_DATETIME = 23.10.2006 23:58:13
+BLDLVL_DATETIME = 24.10.2006 21:24:02
 BLDLVL_MACHINE = VLAD

GPL/trunk/lib32/sound.c

@@ -532 +532 @@
     }
 
-    printk("OSS32_WaveOpen: cp1\n");
     ret = alsa_fops->open(&pHandle->inode, &pHandle->file);
-    printk("OSS32_WaveOpen. ret: %i\n", ret);
+    //printk("OSS32_WaveOpen. ret: %i\n", ret);
     /* check if PCM already opened (stupid uniaud16.sys doesnt closes it) */
     if (ret == -16)
@@ -556 +555 @@
         }
     }
-    printk("OSS32_WaveOpen: cp3\n");
 
     if(ret) {
@@ -565 +563 @@
     }
     pHandle->magic = MAGIC_WAVE_ALSA32;
-    printk("OSS32_WaveOpen: cp4\n");
-
     if (pStreamId)
         *pStreamId = (ULONG)pHandle;