diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-29 18:31:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-29 18:31:57 -0400 |
| commit | 52b0ace7dfe8f70350218017a95d7cab1eb41fbb (patch) | |
| tree | e474f8e2c5ac1712e1e1155b879420dde4aa3922 /include | |
| parent | 24010e460454ec0d2f4f0213b667b4349cbdb8e1 (diff) | |
| parent | d6695f09ea30de712662fcf8dd0e8c4d4306a15a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (26 commits)
ALSA: snd-usb-caiaq: Bump version number to 1.3.21
ALSA: Revert "ALSA: snd-usb-caiaq: Set default input mode of A4DJ"
ALSA: snd-usb-caiaq: Simplify single case to an 'if'
ALSA: snd-usb-caiaq: Restore 'Control vinyl' input mode on A4DJ
ALSA: hda: Use LPIB for a Shuttle device
ALSA: hda: Add support for another Lenovo ThinkPad Edge in conexant codec
ALSA: hda: Use LPIB for Sony VPCS11V9E
ALSA: usb-audio: fix feature unit parser for UAC2
ALSA: asihpi - Minor code cleanup
ALSA: asihpi - Add support for new ASI8800 family
ALSA: asihpi - Fix bug preventing outstream_write preload from happening
ALSA: asihpi - Fix imbalanced lock path in hw_message
ALSA: asihpi - Remove support for old ASI8800 family
ALSA: asihpi - Add hd radio blend functions
ALSA: asihpi - Remove unused io map functions
ALSA: usb-audio: add support for UAC2 pitch control
ALSA: usb-audio: parse UAC2 endpoint descriptors correctly
ALSA: usb-audio: fix return values
ALSA: usb-audio: parse more format descriptors with structs
sound: Add missing spin_unlock
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/audio-v2.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h index 2389f93a28b5..92f1d99f0f17 100644 --- a/include/linux/usb/audio-v2.h +++ b/include/linux/usb/audio-v2.h | |||
| @@ -105,6 +105,22 @@ struct uac_as_header_descriptor_v2 { | |||
| 105 | __u8 iChannelNames; | 105 | __u8 iChannelNames; |
| 106 | } __attribute__((packed)); | 106 | } __attribute__((packed)); |
| 107 | 107 | ||
| 108 | /* 4.10.1.2 Class-Specific AS Isochronous Audio Data Endpoint Descriptor */ | ||
| 109 | |||
| 110 | struct uac2_iso_endpoint_descriptor { | ||
| 111 | __u8 bLength; /* in bytes: 8 */ | ||
| 112 | __u8 bDescriptorType; /* USB_DT_CS_ENDPOINT */ | ||
| 113 | __u8 bDescriptorSubtype; /* EP_GENERAL */ | ||
| 114 | __u8 bmAttributes; | ||
| 115 | __u8 bmControls; | ||
| 116 | __u8 bLockDelayUnits; | ||
| 117 | __le16 wLockDelay; | ||
| 118 | } __attribute__((packed)); | ||
| 119 | |||
| 120 | #define UAC2_CONTROL_PITCH (3 << 0) | ||
| 121 | #define UAC2_CONTROL_DATA_OVERRUN (3 << 2) | ||
| 122 | #define UAC2_CONTROL_DATA_UNDERRUN (3 << 4) | ||
| 123 | |||
| 108 | /* 6.1 Interrupt Data Message */ | 124 | /* 6.1 Interrupt Data Message */ |
| 109 | 125 | ||
| 110 | #define UAC2_INTERRUPT_DATA_MSG_VENDOR (1 << 0) | 126 | #define UAC2_INTERRUPT_DATA_MSG_VENDOR (1 << 0) |