diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-27 10:08:13 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-27 10:08:13 +0200 |
| commit | d04773ab58387642bfc4a65d2a4c1b17b62d44b0 (patch) | |
| tree | 6a79fca5e8816e411bf42779808c562cb72f72a6 | |
| parent | 9192773a097bf90759bfbf030d4d036ae4b06f62 (diff) | |
| download | alsa-driver-build-unstable-d04773ab58387642bfc4a65d2a4c1b17b62d44b0.tar.gz | |
Build with the updated usb-audio driver
A new v2 struct was introduced.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | include/usb_audio_v2_compat.h | 16 | ||||
| -rw-r--r-- | usb/usbaudio.inc | 2 |
3 files changed, 20 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 752dc8e2b..29958191c 100644 --- a/configure.in +++ b/configure.in @@ -2872,8 +2872,8 @@ if test -n "$CONFIG_USB"; then #endif #include <linux/usb/audio-v2.h> ],[ - struct uac2_interrupt_data_msg tmp; - tmp.bInfo = 0; + struct uac2_iso_endpoint_descriptor tmp; + tmp.bLength = 0; ], AC_MSG_RESULT(yes);usb_audio_v2_valid="1", AC_MSG_RESULT(no);usb_audio_v2_valid="0", diff --git a/include/usb_audio_v2_compat.h b/include/usb_audio_v2_compat.h index 2389f93a2..92f1d99f0 100644 --- a/include/usb_audio_v2_compat.h +++ b/include/usb_audio_v2_compat.h @@ -105,6 +105,22 @@ struct uac_as_header_descriptor_v2 { __u8 iChannelNames; } __attribute__((packed)); +/* 4.10.1.2 Class-Specific AS Isochronous Audio Data Endpoint Descriptor */ + +struct uac2_iso_endpoint_descriptor { + __u8 bLength; /* in bytes: 8 */ + __u8 bDescriptorType; /* USB_DT_CS_ENDPOINT */ + __u8 bDescriptorSubtype; /* EP_GENERAL */ + __u8 bmAttributes; + __u8 bmControls; + __u8 bLockDelayUnits; + __le16 wLockDelay; +} __attribute__((packed)); + +#define UAC2_CONTROL_PITCH (3 << 0) +#define UAC2_CONTROL_DATA_OVERRUN (3 << 2) +#define UAC2_CONTROL_DATA_UNDERRUN (3 << 4) + /* 6.1 Interrupt Data Message */ #define UAC2_INTERRUPT_DATA_MSG_VENDOR (1 << 0) diff --git a/usb/usbaudio.inc b/usb/usbaudio.inc index f883782b6..f963c885a 100644 --- a/usb/usbaudio.inc +++ b/usb/usbaudio.inc @@ -31,4 +31,6 @@ #define USB_SUBCLASS_VENDOR_SPEC 0xff #endif +#include <linux/slab.h> + // vim: ft=c |