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

Timestamp:

Apr 9, 2006, 12:09:39 PM (20 years ago)

Author:

vladest

Message:

Latest ALSA patches
HDA patches
Patch for Intel from Rudy's
Fixes locks on NM256 chipsets
Fixes PM on Maestro3 chipsets

Location:

GPL/trunk/alsa-kernel/include/sound

Files:

• ac97_codec.h (modified) (5 diffs)
• driver.h (modified) (2 diffs)

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

@@ -306 +306 @@
 #define AC97_ALC650_SOUCE_MASK      0x000f  /* Source number */
 #define AC97_ALC650_CHANNEL_MASK    0x00f0  /* Channel number */
-#define AC97_ALC650_CHANNEL_SHIFT   4 
+#define AC97_ALC650_CHANNEL_SHIFT   4
 #define AC97_ALC650_SPSR_MASK       0x0f00  /* S/PDIF Sample Rate bits */
 #define AC97_ALC650_SPSR_SHIFT      8
@@ -434 +434 @@
 };
 
+/* static resolution table */
+struct snd_ac97_res_table {
+    unsigned short reg;     /* register */
+    unsigned short bits;    /* resolution bitmask */
+};
+
 struct snd_ac97_template {
         void *private_data;
@@ -441 +447 @@
         unsigned short addr;    /* physical address of codec [0-3] */
         unsigned int scaps;     /* driver capabilities */
-        unsigned int limited_regs; /* allow limited registers only */
-        DECLARE_BITMAP(reg_accessed, 0x80); /* bit flags */
+        const struct snd_ac97_res_table *res_table;     /* static resolution */
 };
 
@@ -464 +469 @@
         unsigned short caps;    /* capabilities (register 0) */
         unsigned short ext_id;  /* extended feature identification (register 28) */
-        unsigned short ext_mid; /* extended modem ID (register 3C) */
+        unsigned short ext_mid; /* extended modem ID (register 3C) */
+        const struct snd_ac97_res_table *res_table;     /* static resolution */
         unsigned int scaps;     /* driver capabilities */
         unsigned int flags;     /* specific code */
@@ -470 +476 @@
         unsigned int spdif_status;
         unsigned short regs[0x80]; /* register cache */
-        unsigned int limited_regs; /* allow limited registers only */
         DECLARE_BITMAP(reg_accessed, 0x80); /* bit flags */
         union {                 /* vendor specific code */

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

@@ -655 +655 @@
                 ##retval;\
         }
-
 #define snd_runtime_check snd_assert
 
@@ -749 +748 @@
 typedef unsigned gfp_t;
 
+#ifndef cpu_relax
+#define cpu_relax()
+#endif
+
 #endif                          /* __DRIVER_H */