Changeset 485

Timestamp:

May 23, 2010, 10:17:06 PM (15 years ago)

Author:

David Azarewicz

Message:

Added quirk for Gateway 2000 ICH2/AD1885

Location:

GPL/trunk

Files:

• alsa-kernel/pci/ac97/ac97_codec.c (modified) (17 diffs)
• alsa-kernel/pci/intel8x0.c (modified) (9 diffs)
• drv32/dispatch.c (modified) (1 diff)
• include/ossidc.h (modified) (1 diff)
• lib32/memory.cpp (modified) (12 diffs)
• lib32/soundmixer.c (modified) (1 diff)
• uniaud.inc (modified) (1 diff)

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

@@ -153 +153 @@
 { 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 },
@@ -159 +159 @@
 { 0x4e534300, 0xffffffff, "LM4540,43,45,46,48", NULL,           NULL }, // only guess --jk
 { 0x4e534331, 0xffffffff, "LM4549",             NULL,           NULL },
-{ 0x4e534350, 0xffffffff, "LM4550",             patch_lm4550,   NULL }, // volume wrap fix 
+{ 0x4e534350, 0xffffffff, "LM4550",             patch_lm4550,   NULL }, // volume wrap fix
 { 0x50534304, 0xffffffff, "UCB1400",            patch_ucb1400,  NULL },
 { 0x53494c20, 0xffffffe0, "Si3036,8",           mpatch_si3036,  mpatch_si3036, AC97_MODEM_PATCH },
@@ -276 +276 @@
 /**
  * snd_ac97_read - read a value from the given register
- * 
+ *
  * @ac97: the ac97 instance
  * @reg: the register to read
@@ -624 +624 @@
 };
 
-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 =
@@ -692 +692 @@
         return 0;
 }
-                        
+
 static int snd_ac97_spdif_cmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -704 +704 @@
         return 0;
 }
-                        
+
 static int snd_ac97_spdif_pmask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -727 +727 @@
         return 0;
 }
-                        
+
 static int snd_ac97_spdif_default_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
@@ -779 +779 @@
                 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);
@@ -1365 +1365 @@
 
         /* build center controls */
-        if ((snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER)) 
+        if ((snd_ac97_try_volume_mix(ac97, AC97_CENTER_LFE_MASTER))
                 && !(ac97->flags & AC97_AD_MULTI)) {
                 if ((err = snd_ctl_add(card, snd_ac97_cnew(&snd_ac97_controls_center[0], ac97))) < 0)
@@ -1393 +1393 @@
 
         /* build surround controls */
-        if ((snd_ac97_try_volume_mix(ac97, AC97_SURROUND_MASTER)) 
+        if ((snd_ac97_try_volume_mix(ac97, AC97_SURROUND_MASTER))
                 && !(ac97->flags & AC97_AD_MULTI)) {
                 /* Surround Master (0x38) is with stereo mutes */
@@ -1433 +1433 @@
         
         /* 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))) {
@@ -1827 +1827 @@
                     (! modem && ! (pid->flags & AC97_MODEM_PATCH)))
                         pid->patch(ac97);
-        } 
+        }
 
         pid = look_for_codec_id(snd_ac97_codec_ids, id);
@@ -1915 +1915 @@
  * 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.
@@ -2019 +2019 @@
  * 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.
@@ -2747 +2747 @@
 }
 
-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);
 
@@ -2904 +2904 @@
         int result;
 
+        snd_printdd("ac97_tune_hardware quirk=%lx override=%s pci=(%04x:%04x %04x:%04x) ac97=(%04x:%04x)\n",
+                quirk, override,
+                ac97->pci->vendor, ac97->pci->device, ac97->pci->subsystem_vendor, ac97->pci->subsystem_device,         
+                ac97->subsystem_vendor, ac97->subsystem_device);
         /* quirk overriden? */
         if (override && strcmp(override, "-1") && strcmp(override, "default")) {
+                snd_printdd("ac97 quirk for %s (%04x:%04x)\n", override, ac97->subsystem_vendor, ac97->subsystem_device);
                 result = apply_quirk_str(ac97, override);
                 if (result < 0)
@@ -2916 +2921 @@
 
         for (; quirk->subvendor; quirk++) {
-                if (quirk->subvendor != ac97->subsystem_vendor)
-                        continue;
-                if ((! quirk->mask && quirk->subdevice == ac97->subsystem_device) ||
-                    quirk->subdevice == (quirk->mask & ac97->subsystem_device)) {
-                        if (quirk->codec_id && quirk->codec_id != ac97->id)
-                                continue;
-                        snd_printdd("ac97 quirk for %s (%04x:%04x)\n", quirk->name, ac97->subsystem_vendor, ac97->subsystem_device);
-                        result = apply_quirk(ac97, quirk->type);
-                        if (result < 0)
-                                snd_printk(KERN_ERR "applying quirk type %d for %s failed (%d)\n", quirk->type, quirk->name, result);
-                        return result;
-                }
+                if (quirk->subvendor != ac97->subsystem_vendor) continue;
+                /* DAZ - the comments in ac97_codec.h say that if mask=0 then 'accept all' but it appears not to be the way the code works.
+                 * it really is: if mask=0 then 'accept exact match only'
+                 * functionality not changed, I just made the code easier to read
+                 * if ((! quirk->mask && quirk->subdevice == ac97->subsystem_device) || quirk->subdevice == (quirk->mask & ac97->subsystem_device)) {
+                 */
+                if (quirk->mask) {
+                        if ( quirk->subdevice != (quirk->mask & ac97->subsystem_device) ) continue;
+                } else {
+                        if (quirk->subdevice != ac97->subsystem_device) continue;
+                }
+                if ( quirk->codec_id && (quirk->codec_id != ac97->id) ) continue;
+                snd_printdd("ac97 quirk for %s (%04x:%04x)\n", quirk->name, ac97->subsystem_vendor, ac97->subsystem_device);
+                result = apply_quirk(ac97, quirk->type);
+                if (result < 0) snd_printk(KERN_ERR "applying quirk type %d for %s failed (%d)\n", quirk->type, quirk->name, result);
+                return result;
         }
         return 0;

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

@@ -25 +25 @@
 
  *
- */      
+ */
 
 #include <asm/io.h>
@@ -269 +269 @@
 
 /* interrupts for the whole chip by interrupt status register finish */
- 
+
 #define ALI_INT_MICIN2          (1<<26)
 #define ALI_INT_PCMIN2          (1<<25)
@@ -313 +313 @@
 
 /*
- *  
+ *
  */
 
@@ -544 +544 @@
         return -EBUSY;
 }
- 
+
 static void snd_intel8x0_codec_write(struct snd_ac97 *ac97,
                                      unsigned short reg,
@@ -662 +662 @@
  * DMA I/O
  */
-static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ichdev) 
+static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ichdev)
 {
         int idx;
@@ -886 +886 @@
                         /* clear FIFO for synchronization of channels */
                         fifo = igetdword(chip, fiforeg[ichdev->ali_slot / 4]);
-                        fifo &= ~(0xff << (ichdev->ali_slot % 4));  
-                        fifo |= 0x83 << (ichdev->ali_slot % 4); 
+                        fifo &= ~(0xff << (ichdev->ali_slot % 4));
+                        fifo |= 0x83 << (ichdev->ali_slot % 4);
                         iputdword(chip, fiforeg[ichdev->ali_slot / 4], fifo);
                 }
@@ -1753 +1753 @@
 
 static struct ac97_quirk ac97_quirks[] __devinitdata = {
-        {
+    {
                 .subvendor = 0x0e11,
                 .subdevice = 0x000e,
                 .name = "Compaq Deskpro EN",    /* AD1885 */
                 .type = AC97_TUNE_HP_ONLY
-        },
+    },
         {
                 .subvendor = 0x0e11,
@@ -1771 +1771 @@
                 .type = AC97_TUNE_HP_ONLY
         },
-        {
+    {
                 .subvendor = 0x0e11,
                 .subdevice = 0x0860,
                 .name = "HP/Compaq nx7010",
                 .type = AC97_TUNE_MUTE_LED
-        },
+    },
         {
                 .subvendor = 0x1014,
@@ -2051 +2051 @@
                 .subdevice = 0x0088,
                 .name = "Fujitsu-Siemens D1522",        /* AD1981 */
+                .type = AC97_TUNE_HP_ONLY
+        },
+        {
+                .subvendor = 0x107B,
+                .subdevice = 0x0111,
+                .name = "Gateway 2000 ICH2/AD1885",
                 .type = AC97_TUNE_HP_ONLY
         },

GPL/trunk/drv32/dispatch.c

@@ -103 +103 @@
 
 #ifdef DEBUG
-    printk("StratIOCtl 0x%x\n", rp->Function);
+    //printk("StratIOCtl 0x%x\n", rp->Function);
 #endif
 //    printk("cmd: %x, len: %i, pack: %x\n",rp->Function, rp->ParmLength, rp->ParmPacket);

GPL/trunk/include/ossidc.h

@@ -245 +245 @@
 #define OSS32_MIX_VOLUME_CAPTURE        13      //Recording volume
 #define OSS32_MIX_VOLUME_SPEAKER        14      //Speaker volume
-#define OSS32_MIX_VOLUME_MAX            OSS32_MIX_VOLUME_CAPTURE
+//DAZ not used #define OSS32_MIX_VOLUME_MAX            OSS32_MIX_VOLUME_SPEAKER
 
 #define OSS32_MIX_FIRST_PROPERTY        20

GPL/trunk/lib32/memory.cpp

@@ -106 +106 @@
     pCur = pBaseAddrHead;
 
-    if(pCur->retaddr == addr) 
+    if(pCur->retaddr == addr)
     {
         addr = pCur->base;
@@ -160 +160 @@
     APIRET rc = 0;
     ULONG addr = 0;
-    
+
 #ifdef KEE
     SHORT sel;
@@ -176 +176 @@
 extern "C" int fStrategyInit;
 //******************************************************************************
-APIRET VMAlloc(ULONG size, ULONG flags, LINEAR *pAddr) 
+APIRET VMAlloc(ULONG size, ULONG flags, LINEAR *pAddr)
 {
     APIRET rc;
@@ -211 +211 @@
 //******************************************************************************
 //******************************************************************************
-APIRET VMFree(LINEAR addr) 
+APIRET VMFree(LINEAR addr)
 {
     APIRET rc;
@@ -302 +302 @@
     size = order * PAGE_SIZE;
 
-    if(gfp_mask & (GFP_DMA|GFP_DMAHIGHMEM)) 
+    if(gfp_mask & (GFP_DMA|GFP_DMAHIGHMEM))
     {//below 16 mb for legacy DMA?
         if(gfp_mask & GFP_DMA)
@@ -326 +326 @@
     }
     else allocsize = size;
-    
+
     if(VMAlloc(allocsize, flags, (LINEAR *)&addr)) {
                 DebugInt3();
                 return 0;
         }
-////    dprintf(("__get_free_pages %d returned %x", order*PAGE_SIZE, addr));    
-    if(gfp_mask & (GFP_DMA|GFP_DMAHIGHMEM)) 
+////    dprintf(("__get_free_pages %d returned %x", order*PAGE_SIZE, addr));
+    if(gfp_mask & (GFP_DMA|GFP_DMAHIGHMEM))
     {//must be aligned at 64kb boundary
         ULONG physaddr = virt_to_phys((void *)addr);
@@ -377 +377 @@
     //check if it really is the base of the allocation (see above)
     addr = GetBaseAddress(addr, (ULONG NEAR *)__Stack32ToFlat(&size));
-    
+
     if(VMFree((LINEAR)addr)) {
         DebugInt3();
@@ -410 +410 @@
     if(addr) {
 #ifdef DEBUG
-        dprintf(("vmalloc %d -> %x (phys %x)", size, addr, virt_to_phys((void *)addr)));
+        //dprintf(("vmalloc %d -> %x (phys %x)", size, addr, virt_to_phys((void *)addr)));
 #endif
         //only done to save size of memory block
@@ -416 +416 @@
         ulget_free_pagesMemUsed += size;
 #ifdef DEBUG
-        dprintf(("vmalloc: total alloc size %d", ulget_free_pagesMemUsed));
+        //dprintf(("vmalloc: total alloc size %d", ulget_free_pagesMemUsed));
 #endif
     }
@@ -429 +429 @@
 
     GetBaseAddress((ULONG)ptr, (ULONG NEAR *)__Stack32ToFlat(&size));
-    
+
     if(VMFree((LINEAR)ptr)) {
         DebugInt3();
@@ -435 +435 @@
     else {
 #ifdef DEBUG
-        dprintf(("vfree %x size %d", (ULONG)ptr, size));
+        //dprintf(("vfree %x size %d", (ULONG)ptr, size));
 #endif
         ulget_free_pagesMemUsed -= size;
 #ifdef DEBUG
-        dprintf(("vfree: total alloc size %d", ulget_free_pagesMemUsed));
+        //dprintf(("vfree: total alloc size %d", ulget_free_pagesMemUsed));
 #endif
     }
@@ -635 +635 @@
     }
 ////  dprintf(("kfree %x", addr));
-    if(IsHeapAddr(addr)) {  
+    if(IsHeapAddr(addr)) {
 #ifdef DEBUGHEAP
-        free((void *)addr, filename, lineno);  
-#else
-            free((void *)addr);  
+        free((void *)addr, filename, lineno);
+#else
+            free((void *)addr);
 #endif
     }

GPL/trunk/lib32/soundmixer.c

@@ -71 +71 @@
         /* OSS_MIXER_MONITOR  */ { "Monitor", 0 , -1},
         /* OSS_MIXER_3DDEPTH  */ { "3D Control - Depth", 0 , -1},
-        /* OSS_MIXER_3DCENTER */ { "3D Control - Center", 0 , -1},
-        /* OSS_MIXER_FRONT    */ { "Front", 0 , -1},
-        /* OSS_MIXER_SPEAKER  */ { "Speaker", 0 , -1},
-        /* OSS_MIXER_HEADPHONE */ { "Headphone", 0 , -1},
+    /* OSS_MIXER_3DCENTER */ { "3D Control - Center", 0 , -1},
+        /* OSS_MIXER_FRONT    */ { "Front", 0 , -1},
+        /* OSS_MIXER_SPEAKER  */ { "Speaker", 0 , -1},
+        /* OSS_MIXER_HEADPHONE */ { "Headphone", 0 , -1},
 };
 char *szRecSources[OSS32_MIX_RECSRC_MAX] = {

GPL/trunk/uniaud.inc

@@ -13 +13 @@
 # ex RC3  GA  FIXPACK2 beta_47
 # Comment out to avoid a fixpack line in bldlevel
-FIXPACK = SVN r484
+FIXPACK = SVN r485
 
 # ALSA BUILD VERSION