diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-11 22:57:36 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-11 22:57:36 +0200 |
| commit | 39694afaa3af39662faa4e23171d5bda013f40f4 (patch) | |
| tree | 7f0e77bc875c58b5481f5f2c32f8f67ae0bd8f0a | |
| parent | 06e360803322c09d3a3ba4fb1762e43b9666a7f6 (diff) | |
| download | alsa-driver-build-unstable-39694afaa3af39662faa4e23171d5bda013f40f4.tar.gz | |
Update usb/audio*.h compat files, too
Copied from sound git tree for the commit
e213e9cf707c51808e372dabd1070a61af17e77b
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | include/usb_audio_compat.h | 15 | ||||
| -rw-r--r-- | include/usb_audio_v2_compat.h | 12 |
2 files changed, 27 insertions, 0 deletions
diff --git a/include/usb_audio_compat.h b/include/usb_audio_compat.h index 9fae6bdab..c0ef18dc2 100644 --- a/include/usb_audio_compat.h +++ b/include/usb_audio_compat.h @@ -488,6 +488,21 @@ struct uac_iso_endpoint_descriptor { #define UAC_FU_BASS_BOOST (1 << (UAC_BASS_BOOST_CONTROL - 1)) #define UAC_FU_LOUDNESS (1 << (UAC_LOUDNESS_CONTROL - 1)) +/* status word format (3.7.1.1) */ + +#define UAC1_STATUS_TYPE_ORIG_MASK 0x0f +#define UAC1_STATUS_TYPE_ORIG_AUDIO_CONTROL_IF 0x0 +#define UAC1_STATUS_TYPE_ORIG_AUDIO_STREAM_IF 0x1 +#define UAC1_STATUS_TYPE_ORIG_AUDIO_STREAM_EP 0x2 + +#define UAC1_STATUS_TYPE_IRQ_PENDING (1 << 7) +#define UAC1_STATUS_TYPE_MEM_CHANGED (1 << 6) + +struct uac1_status_word { + __u8 bStatusType; + __u8 bOriginator; +} __attribute__((packed)); + #ifdef __KERNEL__ struct usb_audio_control { diff --git a/include/usb_audio_v2_compat.h b/include/usb_audio_v2_compat.h index 0952231e6..2389f93a2 100644 --- a/include/usb_audio_v2_compat.h +++ b/include/usb_audio_v2_compat.h @@ -105,6 +105,17 @@ struct uac_as_header_descriptor_v2 { __u8 iChannelNames; } __attribute__((packed)); +/* 6.1 Interrupt Data Message */ + +#define UAC2_INTERRUPT_DATA_MSG_VENDOR (1 << 0) +#define UAC2_INTERRUPT_DATA_MSG_EP (1 << 1) + +struct uac2_interrupt_data_msg { + __u8 bInfo; + __u8 bAttribute; + __le16 wValue; + __le16 wIndex; +} __attribute__((packed)); /* A.7 Audio Function Category Codes */ #define UAC2_FUNCTION_SUBCLASS_UNDEFINED 0x00 @@ -153,6 +164,7 @@ struct uac_as_header_descriptor_v2 { /* A.14 Audio Class-Specific Request Codes */ #define UAC2_CS_CUR 0x01 #define UAC2_CS_RANGE 0x02 +#define UAC2_CS_MEM 0x03 /* A.15 Encoder Type Codes */ #define UAC2_ENCODER_UNDEFINED 0x00 |