[src/trunk]: src/sys/dev/usb add USB interface assoc descriptor (IAD) info

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2896d30f15a4
branches:  trunk
changeset: 760056:2896d30f15a4
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Dec 25 14:06:14 2010 +0000

description:
add USB interface assoc descriptor (IAD) info

diffstat:

 sys/dev/usb/usb.h |  15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r 77a0f3ed1a86 -r 2896d30f15a4 sys/dev/usb/usb.h
--- a/sys/dev/usb/usb.h Sat Dec 25 12:12:49 2010 +0000
+++ b/sys/dev/usb/usb.h Sat Dec 25 14:06:14 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: usb.h,v 1.88 2010/11/19 18:21:48 phx Exp $     */
+/*     $NetBSD: usb.h,v 1.89 2010/12/25 14:06:14 jmcneill Exp $        */
 /*     $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $        */
 
 /*
@@ -195,6 +195,7 @@
 #define  UDESC_INTERFACE_POWER 0x08
 #define  UDESC_OTG             0x09
 #define  UDESC_DEBUG           0x0a
+#define  UDESC_INTERFACE_ASSOC 0x0b
 #define  UDESC_CS_DEVICE       0x21    /* class specific */
 #define  UDESC_CS_CONFIG       0x22
 #define  UDESC_CS_STRING       0x23
@@ -276,6 +277,18 @@
 typedef struct {
        uByte           bLength;
        uByte           bDescriptorType;
+       uByte           bFirstInterface;
+       uByte           bInterfaceCount;
+       uByte           bFunctionClass;
+       uByte           bFunctionSubClass;
+       uByte           bFunctionProtocol;
+       uByte           iFunction
+} UPACKED usb_interface_assoc_descriptor_t;
+#define USB_INTERFACE_ASSOC_DESCRIPTOR_SIZE 8
+
+typedef struct {
+       uByte           bLength;
+       uByte           bDescriptorType;
        uByte           bEndpointAddress;
 #define UE_GET_DIR(a)  ((a) & 0x80)
 #define UE_SET_DIR(a,d)        ((a) | (((d)&1) << 7))