EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: Added support for Interface Association descriptors.

Browse Source
This commit is contained in:
Gareth McMullin
2011-12-28 21:04:36 +13:00
parent 651917aeb4
commit 0731bba610
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/libopencm3/usb/usbstd.h
View File

@@ -75,6 +75,10 @@ struct usb_setup_data {
#define USB_DT_DEVICE_QUALIFIER 6 #define USB_DT_DEVICE_QUALIFIER 6
#define USB_DT_OTHER_SPEED_CONFIGURATION 7 #define USB_DT_OTHER_SPEED_CONFIGURATION 7
#define USB_DT_INTERFACE_POWER 8 #define USB_DT_INTERFACE_POWER 8
/* From ECNs */
#define USB_DT_OTG 9
#define USB_DT_DEBUG 10
#define USB_DT_INTERFACE_ASSOCIATION 11
/* USB Standard Feature Selectors - Table 9-6 */ /* USB Standard Feature Selectors - Table 9-6 */
#define USB_FEAT_ENDPOINT_HALT 0 #define USB_FEAT_ENDPOINT_HALT 0
@@ -134,6 +138,7 @@ struct usb_config_descriptor {
/* Descriptor ends here. The following are used internally: */ /* Descriptor ends here. The following are used internally: */
const struct usb_interface { const struct usb_interface {
int num_altsetting; int num_altsetting;
const struct usb_iface_assoc_descriptor *iface_assoc;
const struct usb_interface_descriptor *altsetting; const struct usb_interface_descriptor *altsetting;
} *interface; } *interface;
} __attribute__((packed)); } __attribute__((packed));
@@ -201,4 +206,18 @@ struct usb_string_descriptor {
u16 wData[]; u16 wData[];
} __attribute__((packed)); } __attribute__((packed));
/* From ECN: Interface Association Descriptors, Table 9-Z */
struct usb_iface_assoc_descriptor {
u8 bLength;
u8 bDescriptorType;
u8 bFirstInterface;
u8 bInterfaceCount;
u8 bFunctionClass;
u8 bFunctionSubClass;
u8 bFunctionProtocol;
u8 iFunction;
} __attribute__((packed));
#define USB_DT_INTERFACE_ASSOCIATION_SIZE \
sizeof(struct usb_iface_assoc_descriptor)
#endif #endif

12
lib/usb/usb_standard.c
View File

@@ -41,10 +41,20 @@ static u16 build_config_descriptor(u8 index, u8 *buf, u16 len)
/* For each interface... */ /* For each interface... */
for (i = 0; i < cfg->bNumInterfaces; i++) { for (i = 0; i < cfg->bNumInterfaces; i++) {
/* Interface Association Descriptor, if any */
if (cfg->interface[i].iface_assoc) {
const struct usb_iface_assoc_descriptor *assoc =
cfg->interface[i].iface_assoc;
memcpy(buf, assoc, count = MIN(len, assoc->bLength));
buf += count;
len -= count;
total += count;
totallen += assoc->bLength;
}
/* For each alternate setting... */ /* For each alternate setting... */
for (j = 0; j < cfg->interface[i].num_altsetting; j++) { for (j = 0; j < cfg->interface[i].num_altsetting; j++) {
const struct usb_interface_descriptor *iface = const struct usb_interface_descriptor *iface =
&cfg->interface[i].altsetting[j]; &cfg->interface[i].altsetting[j];
/* Copy interface descriptor. */ /* Copy interface descriptor. */
memcpy(buf, iface, count = MIN(len, iface->bLength)); memcpy(buf, iface, count = MIN(len, iface->bLength));
buf += count; buf += count;