Changeset 499 for GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/atiixp.c

Timestamp:

Jul 5, 2010, 11:51:20 AM (15 years ago)

Author:

Paul Smedley

Message:

Update Uniaud32-2.1.x branch with necessary changes for ALSA 1.0.23

File:

• GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/atiixp.c (modified) (9 diffs)

GPL/branches/uniaud32-2.1.x/alsa-kernel/pci/atiixp.c

@@ -287 +287 @@
 /*
  */
-static struct pci_device_id snd_atiixp_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(snd_atiixp_ids) = {
         { PCI_VDEVICE(ATI, 0x4341), 0 }, /* SB200 */
         { PCI_VDEVICE(ATI, 0x4361), 0 }, /* SB300 */
@@ -298 +298 @@
 
 static struct snd_pci_quirk atiixp_quirks[] __devinitdata = {
+        SND_PCI_QUIRK(0x105b, 0x0c81, "Foxconn RC4107MA-RS2", 0),
         SND_PCI_QUIRK(0x15bd, 0x3100, "DFI RS482", 0),
         {0} /* terminator */
@@ -351 +352 @@
  * a static RING of buffer descriptors is used.
  *
- * the ring is built in this function, and is set up to the hardware.
+ * the ring is built in this function, and is set up to the hardware. 
  */
 static int atiixp_build_dma_packets(struct atiixp *chip, struct atiixp_dma *dma,
@@ -374 +375 @@
         }
 
-        if (dma->periods == periods && dma->period_bytes == period_bytes) {
-                writel((u32)dma->desc_buf.addr | ATI_REG_LINKPTR_EN,
-                        (char*)chip->remap_addr + dma->ops->llp_offset);
+        if (dma->periods == periods && dma->period_bytes == period_bytes) { 
+                writel((u32)dma->desc_buf.addr | ATI_REG_LINKPTR_EN, 
+                        (char*)chip->remap_addr + dma->ops->llp_offset); 
                 return 0;
-        }
 
         /* reset DMA before changing the descriptor table */
@@ -475 +475 @@
 {
         unsigned int data;
-
+    
         if (snd_atiixp_acquire_codec(chip) < 0)
                 return;
@@ -490 +490 @@
         struct atiixp *chip = ac97->private_data;
         return snd_atiixp_codec_read(chip, ac97->num, reg);
-
+    
 }
 
@@ -516 +516 @@
         udelay(10);
         atiixp_update(chip, CMD, ATI_REG_CMD_AC_SOFT_RESET, 0);
-
+    
         timeout = 10;
         while (! (atiixp_read(chip, CMD) & ATI_REG_CMD_ACLINK_ACTIVE)) {
@@ -588 +588 @@
                 ac97_codec = ac97_probing_bugs(chip->pci);
         if (ac97_codec >= 0) {
-                chip->codec_not_ready_bits |=
+                chip->codec_not_ready_bits |= 
                         CODEC_CHECK_BITS ^ (1 << (ac97_codec + 10));
                 return 0;
@@ -936 +936 @@
         atiixp_update(chip, 6CH_REORDER, ATI_REG_6CH_REORDER_EN,
                       substream->runtime->channels >= 6 ? ATI_REG_6CH_REORDER_EN: 0);
-
+    
         spin_unlock_irq(&chip->reg_lock);
         return 0;