Changeset 366 for GPL/branches/alsa-resync1/alsa-kernel/pci

Timestamp:

Aug 30, 2008, 9:18:38 PM (17 years ago)

Author:

Brendan Oakley

Message:

Missed stuff in 1.0.4

Location:

GPL/branches/alsa-resync1/alsa-kernel/pci

Files:

• ac97/ac97_pcm.c (modified) (1 diff)
• cmipci.c (modified) (2 diffs)
• intel8x0.c (modified) (3 diffs)

GPL/branches/alsa-resync1/alsa-kernel/pci/ac97/ac97_pcm.c

@@ -213 +213 @@
                 snd_ac97_update_bits_nolock(ac97, reg, mask, bits);
                 /* update the internal spdif bits */
-                sbits = ac97->spdif_status;
-                if (sbits & IEC958_AES0_PROFESSIONAL) {
-                        sbits &= ~IEC958_AES0_PRO_FS;
-                        switch (rate) {
-                        case 44100: sbits |= IEC958_AES0_PRO_FS_44100; break;
-                        case 48000: sbits |= IEC958_AES0_PRO_FS_48000; break;
-                        case 32000: sbits |= IEC958_AES0_PRO_FS_32000; break;
-                        }
-                } else {
-                        sbits &= ~(IEC958_AES3_CON_FS << 24);
-                        switch (rate) {
-                        case 44100: sbits |= IEC958_AES3_CON_FS_44100<<24; break;
-                        case 48000: sbits |= IEC958_AES3_CON_FS_48000<<24; break;
-                        case 32000: sbits |= IEC958_AES3_CON_FS_32000<<24; break;
-                        }
-                }
-                ac97->spdif_status = sbits;
-                /* update the internal spdif bits */
 #ifndef TARGET_OS2
                 spin_lock(&ac97->reg_lock);

GPL/branches/alsa-resync1/alsa-kernel/pci/cmipci.c

@@ -2627 +2627 @@
  */
 
-static void snd_cmipci_proc_read(struct snd_info_entry *entry,
+#ifdef CONFIG_PROC_FS
+static void snd_cmipci_proc_read(struct snd_info_entry *entry, 
                                  struct snd_info_buffer *buffer)
 {
@@ -2649 +2650 @@
 {
     struct snd_info_entry *entry;
+
     if (! snd_card_proc_new(cm->card, "cmipci", &entry))
         snd_info_set_text_ops(entry, cm, 1024, snd_cmipci_proc_read);
 }
+#else /* !CONFIG_PROC_FS */
+static inline void snd_cmipci_proc_init(struct cmipci *cm) {}
+#endif
+
 
 static struct pci_device_id snd_cmipci_ids[] = {

GPL/branches/alsa-resync1/alsa-kernel/pci/intel8x0.c

@@ -42 +42 @@
 #define SNDRV_GET_ID
 #include <sound/initval.h>
+/* for 440MX workaround */
+#include <asm/pgtable.h>
+#include <asm/cacheflush.h>
 
 #define I810_DEBUG
@@ -82 +85 @@
 #else
 static int ac97_clock[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 0};
+static int ac97_quirk[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = AC97_TUNE_DEFAULT};
 #endif
 #ifdef SUPPORT_JOYSTICK
@@ -865 +869 @@
             /* ack */
             iputdword(chip, chip->int_sta_reg, status);
-            /* FIXME: on some ICH5 board shows the same
-             *        problem.  So we return IRQ_HANDLED
-             *        in any cases.
-             * (or, maybe add a new module param to control this?)
-             */
-#if 0
-            if (chip->device_type != DEVICE_NFORCE)
-                status ^= igetdword(chip, chip->int_sta_reg);
-#endif
-        }
-        return IRQ_NONE/*RETVAL(status)*/;
+                        /* some Nforce[2] boards have problems when
+                           IRQ_NONE is returned here.
+                        */
+                        if (chip->device_type != DEVICE_NFORCE)
+                                status = 0;
+        }
+                spin_unlock(&chip->reg_lock);
+        return IRQ_RETVAL(status);
     }
 #ifdef TARGET_OS2