Changeset 86 for GPL/trunk/alsa-kernel/pci/intel8x0.c

Timestamp:

Jan 23, 2007, 10:34:32 PM (19 years ago)

Author:

vladest

Message:

Added missed files
Applied latest modifications of ALSA
Reworked sharing strategy between MMOS2 and UNIAUD API

File:

• GPL/trunk/alsa-kernel/pci/intel8x0.c (modified) (4 diffs)

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

@@ -2294 +2294 @@
     /* put logic to right state */
     /* first clear status bits */
-#if 1 // noone do it. wtf? //vladest 06.10.2003 13:51
     status = ICH_RCS | ICH_MCINT | ICH_POINT | ICH_PIINT;
     if (chip->device_type == DEVICE_NFORCE)
@@ -2300 +2299 @@
     cnt = igetdword(chip, ICHREG(GLOB_STA));
     iputdword(chip, ICHREG(GLOB_STA), cnt & status);
-#endif
-    // hmm. at least we should try
-    //iputdword(chip, ICHREG(GLOB_CNT), igetdword(chip, ICHREG(GLOB_CNT)) & ~ICH_AC97COLD);
     /* ACLink on, 2 channels */
     cnt = igetdword(chip, ICHREG(GLOB_CNT));
-    // added by vladest
     //    cnt &= ~ICH_ACLINK;
     cnt &= ~(ICH_ACLINK | ICH_PCM_246_MASK);
-#ifdef CONFIG_SND_AC97_POWER_SAVE
+#if 0
+    //def CONFIG_SND_AC97_POWER_SAVE
     /* do cold reset - the full ac97 powerdown may leave the controller
      * in a warm state but actually it cannot communicate with the codec.
@@ -2319 +2315 @@
 #else
     cnt |= (cnt & ICH_AC97COLD) == 0 ? ICH_AC97COLD : ICH_AC97WARM;
-
-    //  ??? 25.03.2004 by vladest  cnt &= ~(ICH_ACLINK | ICH_PCM_246_MASK);
-    // FIXME!!! cmi drivers didnt uses ICH_PCM_246_MASK
     /* finish cold or do warm reset */
 #ifdef DEBUG
@@ -2327 +2320 @@
 #endif
     iputdword(chip, ICHREG(GLOB_CNT), cnt);
-//    mdelay(500); //vladest 06.10.2003 15:08
+    mdelay(500); //vladest 06.10.2003 15:08
     end_time = (jiffies + (HZ / 4)) + 1;
     i = 0;