Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 82290
b: refs/heads/master
c: 41dceed
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Feb 1, 2008
1 parent be583b8 commit 87776a7
Show file tree
Hide file tree
Showing 12 changed files with 221 additions and 206 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 969ab2ee9d68bd037e2db7ea12ff78baae5d2f94
refs/heads/master: 41dceed51f0e6105ca2bf45c3835a7cd9eaa077b
14 changes: 7 additions & 7 deletions trunk/include/linux/usb/audio.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@

/* 4.3.2 Class-Specific AC Interface Descriptor */
struct usb_ac_header_descriptor {
__u8 bLength; // 8+n
__u8 bDescriptorType; // USB_DT_CS_INTERFACE
__u8 bDescriptorSubtype; // USB_MS_HEADER
__le16 bcdADC; // 0x0100
__le16 wTotalLength; // includes Unit and Terminal desc.
__u8 bInCollection; // n
__u8 baInterfaceNr[]; // [n]
__u8 bLength; /* 8+n */
__u8 bDescriptorType; /* USB_DT_CS_INTERFACE */
__u8 bDescriptorSubtype; /* USB_MS_HEADER */
__le16 bcdADC; /* 0x0100 */
__le16 wTotalLength; /* includes Unit and Terminal desc. */
__u8 bInCollection; /* n */
__u8 baInterfaceNr[]; /* [n] */
} __attribute__ ((packed));

#define USB_DT_AC_HEADER_SIZE(n) (8+(n))
Expand Down
16 changes: 8 additions & 8 deletions trunk/include/linux/usb/cdc.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@
* Class-Specific descriptors ... there are a couple dozen of them
*/

#define USB_CDC_HEADER_TYPE 0x00 /* header_desc */
#define USB_CDC_CALL_MANAGEMENT_TYPE 0x01 /* call_mgmt_descriptor */
#define USB_CDC_ACM_TYPE 0x02 /* acm_descriptor */
#define USB_CDC_UNION_TYPE 0x06 /* union_desc */
#define USB_CDC_HEADER_TYPE 0x00 /* header_desc */
#define USB_CDC_CALL_MANAGEMENT_TYPE 0x01 /* call_mgmt_descriptor */
#define USB_CDC_ACM_TYPE 0x02 /* acm_descriptor */
#define USB_CDC_UNION_TYPE 0x06 /* union_desc */
#define USB_CDC_COUNTRY_TYPE 0x07
#define USB_CDC_NETWORK_TERMINAL_TYPE 0x0a /* network_terminal_desc */
#define USB_CDC_ETHERNET_TYPE 0x0f /* ether_desc */
#define USB_CDC_NETWORK_TERMINAL_TYPE 0x0a /* network_terminal_desc */
#define USB_CDC_ETHERNET_TYPE 0x0f /* ether_desc */
#define USB_CDC_WHCM_TYPE 0x11
#define USB_CDC_MDLM_TYPE 0x12 /* mdlm_desc */
#define USB_CDC_MDLM_DETAIL_TYPE 0x13 /* mdlm_detail_desc */
#define USB_CDC_MDLM_TYPE 0x12 /* mdlm_desc */
#define USB_CDC_MDLM_DETAIL_TYPE 0x13 /* mdlm_detail_desc */
#define USB_CDC_DMM_TYPE 0x14
#define USB_CDC_OBEX_TYPE 0x15

Expand Down
Loading

0 comments on commit 87776a7

Please sign in to comment.