Changeset 77 for GPL/trunk/alsa-kernel/include/sound

Timestamp:

Jul 23, 2006, 11:54:27 AM (19 years ago)

Author:

vladest

Message:

Provide sources to latest exist binary. See changelog for changes

Location:

GPL/trunk/alsa-kernel/include/sound

Files:

• ac97_codec.h (modified) (8 diffs)
• asound.h (modified) (3 diffs)
• compat_22.h (modified) (1 diff)
• control.h (modified) (2 diffs)
• mpu401.h (modified) (3 diffs)

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
@@ -141 +142 @@
 #define AC97_GP_DRSS_78         0x0400  /* LR 7+8 */
 
+/* powerdown bits */
+#define AC97_PD_ADC_STATUS      0x0001  /* ADC status (RO) */
+#define AC97_PD_DAC_STATUS      0x0002  /* DAC status (RO) */
+#define AC97_PD_MIXER_STATUS    0x0004  /* Analog mixer status (RO) */
+#define AC97_PD_VREF_STATUS     0x0008  /* Vref status (RO) */
+#define AC97_PD_PR0             0x0100  /* Power down PCM ADCs and input MUX */
+#define AC97_PD_PR1             0x0200  /* Power down PCM front DAC */
+#define AC97_PD_PR2             0x0400  /* Power down Mixer (Vref still on) */
+#define AC97_PD_PR3             0x0800  /* Power down Mixer (Vref off) */
+#define AC97_PD_PR4             0x1000  /* Power down AC-Link */
+#define AC97_PD_PR5             0x2000  /* Disable internal clock usage */
+#define AC97_PD_PR6             0x4000  /* Headphone amplifier */
+#define AC97_PD_EAPD            0x8000  /* External Amplifer Power Down (EAPD) */
+
 /* extended audio ID bit defines */
 #define AC97_EI_VRA             0x0001  /* Variable bit rate supported */
@@ -266 +281 @@
 /* specific - Analog Devices */
 #define AC97_AD_TEST            0x5a    /* test register */
+#define AC97_AD_TEST2           0x5c    /* undocumented test register 2 */
 #define AC97_AD_CODEC_CFG       0x70    /* codec configuration */
 #define AC97_AD_JACK_SPDIF      0x72    /* Jack Sense & S/PDIF */
@@ -359 +375 @@
 #define AC97_SCAP_DETECT_BY_VENDOR (1<<8) /* use vendor registers for read tests */
 #define AC97_SCAP_NO_SPDIF      (1<<9)  /* don't build SPDIF controls */
+#define AC97_SCAP_EAPD_LED      (1<<10) /* EAPD as mute LED */
 
 /* ac97->flags */
@@ -379 +396 @@
 #define AC97_HAS_NO_TONE        (1<<16) /* no Tone volume */
 #define AC97_HAS_NO_STD_PCM     (1<<17) /* no standard AC97 PCM volume and mute */
+#define AC97_HAS_NO_AUX         (1<<18) /* no standard AC97 AUX volume and mute */
 
 /* rates indexes */
@@ -489 +507 @@
         /* jack-sharing info */
         unsigned char indep_surround;
-        unsigned char channel_mode;
+        unsigned char channel_mode;
+
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+        unsigned int power_up;  /* power states */
+        struct workqueue_struct *power_workq;
+        struct work_struct power_work;
+#endif
         struct device dev;
 };
@@ -531 +555 @@
 int snd_ac97_update(struct snd_ac97 *ac97, unsigned short reg, unsigned short value);
 int snd_ac97_update_bits(struct snd_ac97 *ac97, unsigned short reg, unsigned short mask, unsigned short value);
+#ifdef CONFIG_SND_AC97_POWER_SAVE
+int snd_ac97_update_power(struct snd_ac97 *ac97, int reg, int powerup);
+#else
+static inline int snd_ac97_update_power(struct snd_ac97 *ac97, int reg,
+                                        int powerup)
+{
+        return 0;
+}
+#endif
 #ifdef CONFIG_PM
 void snd_ac97_suspend(struct snd_ac97 *ac97);
@@ -588 +621 @@
     unsigned int spdif;            /* spdif pcm */
 #endif
-        unsigned short aslots;             /* active slots */
-        unsigned int rates;                /* available rates */
+    unsigned short aslots;                 /* active slots */
+    unsigned short cur_dbl;                /* current double-rate state */
+    unsigned int rates;            /* available rates */
         struct {
                 unsigned short slots;      /* driver input: requested AC97 slot numbers */

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

@@ -714 +714 @@
  ****************************************************************************/
 
-#define SNDRV_CTL_VERSION               SNDRV_PROTOCOL_VERSION(2, 0, 3)
+#define SNDRV_CTL_VERSION               SNDRV_PROTOCOL_VERSION(2, 0, 4)
 
 struct snd_ctl_card_info {
@@ -844 +844 @@
 };
 
+struct snd_ctl_tlv {
+    unsigned int numid; /* control element numeric identification */
+    unsigned int length;        /* in bytes aligned to 4 */
+    unsigned int tlv[1];        /* first TLV */
+};
+
 enum {
         SNDRV_CTL_IOCTL_PVERSION = _IOR('U', 0x00, int),
@@ -856 +862 @@
         SNDRV_CTL_IOCTL_ELEM_ADD = _IOWR('U', 0x17, struct snd_ctl_elem_info),
         SNDRV_CTL_IOCTL_ELEM_REPLACE = _IOWR('U', 0x18, struct snd_ctl_elem_info),
-        SNDRV_CTL_IOCTL_ELEM_REMOVE = _IOWR('U', 0x19, struct snd_ctl_elem_id),
+        SNDRV_CTL_IOCTL_ELEM_REMOVE = _IOWR('U', 0x19, struct snd_ctl_elem_id),
+        SNDRV_CTL_IOCTL_TLV_READ = _IOWR('U', 0x1a, struct snd_ctl_tlv),
         SNDRV_CTL_IOCTL_HWDEP_NEXT_DEVICE = _IOWR('U', 0x20, int),
         SNDRV_CTL_IOCTL_HWDEP_INFO = _IOR('U', 0x21, struct snd_hwdep_info),

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

@@ -122 +122 @@
 #define list_for_each_safe(pos, npos, head) \
         for (pos = (head)->next, npos = pos->next ; pos != (head); pos = npos, npos = pos->next)
+
+/**
+ * list_for_each_entry  -       iterate over list of given type
+ * @pos:        the type * to use as a loop counter.
+ * @head:       the head for your list.
+ * @member:     the name of the list_struct within the struct.
+ */
+#define list_for_each_entry(pos, head, member)                          \
+        for (pos = list_entry((head)->next, typeof(*pos), member);      \
+             pos->member.next, &pos->member != (head);  \
+             pos = list_entry(pos->member.next, typeof(*pos), member))
 
 #ifndef IORESOURCE_IO

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

@@ -40 +40 @@
     snd_kcontrol_get_t *get;
     snd_kcontrol_put_t *put;
+    unsigned int *tlv;
     unsigned long private_value;
 };
@@ -55 +56 @@
         snd_kcontrol_info_t *info;
         snd_kcontrol_get_t *get;
-        snd_kcontrol_put_t *put;
+        snd_kcontrol_put_t *put;
+        unsigned int *tlv;
         unsigned long private_value;
 #ifdef TARGET_OS2

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

@@ -46 +46 @@
 #define MPU401_HW_AUREAL                19      /* Aureal Vortex */
 
+#define MPU401_INFO_INPUT       (1 << 0)        /* input stream */
+#define MPU401_INFO_OUTPUT      (1 << 1)        /* output stream */
+#define MPU401_INFO_INTEGRATED  (1 << 2)        /* integrated h/w port */
+#define MPU401_INFO_MMIO        (1 << 3)        /* MMIO access */
+#define MPU401_INFO_TX_IRQ      (1 << 4)        /* independent TX irq */
+
 #define MPU401_MODE_BIT_INPUT           0
 #define MPU401_MODE_BIT_OUTPUT          1
@@ -62 +68 @@
         struct snd_rawmidi *rmidi;
 
-        unsigned short hardware;        /* MPU401_HW_XXXX */
+        unsigned short hardware;        /* MPU401_HW_XXXX */
+        unsigned int info_flags;        /* MPU401_INFO_XXX */
         unsigned long port;             /* base port of MPU-401 chip */
         unsigned long cport;            /* port + 1 (usually) */
@@ -100 +107 @@
  */
 
-irqreturn_t snd_mpu401_uart_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+irqreturn_t snd_mpu401_uart_interrupt(int irq, void *dev_id,
+                                      struct pt_regs *regs);
+irqreturn_t snd_mpu401_uart_interrupt_tx(int irq, void *dev_id,
+                                         struct pt_regs *regs);
 
 int snd_mpu401_uart_new(struct snd_card *card,
                         int device,
                         unsigned short hardware,
-                        unsigned long port,
-                        int integrated,
+                        unsigned long port,
+                        unsigned int info_flags,
                         int irq,
                         int irq_flags,