Changeset 86 for GPL/trunk/alsa-kernel/include

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

Location:

GPL/trunk/alsa-kernel/include/sound

Files:

• ac97_codec.h (modified) (4 diffs)
• config.h (modified) (1 diff)
• driver.h (modified) (1 diff)

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

@@ -32 +32 @@
 #include "info.h"
 
-#define CONFIG_SND_AC97_POWER_SAVE /* experimental !!! */
 /*
  *  AC'97 codec registers
@@ -376 +375 @@
 #define AC97_SCAP_NO_SPDIF      (1<<9)  /* don't build SPDIF controls */
 #define AC97_SCAP_EAPD_LED      (1<<10) /* EAPD as mute LED */
+#define AC97_SCAP_POWER_SAVE    (1<<11) /* capable for aggresive power-saving */
 
 /* ac97->flags */
@@ -425 +425 @@
 
 struct snd_ac97_bus_ops {
-        void (*reset) (struct snd_ac97 *ac97);
+    void (*reset) (struct snd_ac97 *ac97);
+    void (*warm_reset)(struct snd_ac97 *ac97);
         void (*write) (struct snd_ac97 *ac97, unsigned short reg, unsigned short val);
         unsigned short (*read) (struct snd_ac97 *ac97, unsigned short reg);
@@ -501 +502 @@
                         unsigned short id[3];           // codec IDs (lower 16-bit word)
                         unsigned short pcmreg[3];       // PCM registers
-                        unsigned short codec_cfg[3];    // CODEC_CFG bits
+                        unsigned short codec_cfg[3];    // CODEC_CFG bits
+                        unsigned char swap_mic_linein;  // AD1986/AD1986A only
                 } ad18xx;
                 unsigned int dev_flags;         /* device specific */

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

@@ -204 +204 @@
 };
 
+/* PCI quirk list helper */
+struct snd_pci_quirk {
+        unsigned short subvendor;       /* PCI subvendor ID */
+        unsigned short subdevice;       /* PCI subdevice ID */
+        int value;                      /* value */
+#ifdef CONFIG_SND_DEBUG_DETECT
+        const char *name;               /* name of the device (optional) */
+#endif
+};
+
+#define _SND_PCI_QUIRK_ID(vend,dev) \
+        .subvendor = (vend), .subdevice = (dev)
+#define SND_PCI_QUIRK_ID(vend,dev) {_SND_PCI_QUIRK_ID(vend, dev)}
+#ifdef CONFIG_SND_DEBUG_DETECT
+#define SND_PCI_QUIRK(vend,dev,xname,val) \
+        {_SND_PCI_QUIRK_ID(vend, dev), .value = (val), .name = (xname)}
+#else
+#define SND_PCI_QUIRK(vend,dev,xname,val) \
+        {_SND_PCI_QUIRK_ID(vend, dev), .value = (val)}
+#endif
+
+const struct snd_pci_quirk *
+snd_pci_quirk_lookup(struct pci_dev *pci, const struct snd_pci_quirk *list);
+
 /* misc.c */
 struct resource;

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

@@ -753 +753 @@
 #endif
 
+static inline int snd_pci_enable_msi(struct pci_dev *dev) { return -1; }
+#undef pci_enable_msi
+#define pci_enable_msi(dev) snd_pci_enable_msi(dev)
+#undef pci_disable_msi
+#define pci_disable_msi(dev)
+
+#undef pci_intx
+#define pci_intx(pci,x)
+
+
 #endif                          /* __DRIVER_H */