Changeset 745d2ad in mainline

Timestamp:

2011-02-20T12:35:56Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

540e2d2

Parents:

0a46c41e

Message:

Add standard USB descriptor nesting to libusb

Location:

uspace/lib/usb

Files:

• include/usb/dp.h (modified) (1 diff)
• src/dp.c (modified) (1 diff)

uspace/lib/usb/include/usb/dp.h

@@ -45 +45 @@
 } usb_dp_descriptor_nesting_t;
 
+extern usb_dp_descriptor_nesting_t usb_dp_standard_descriptor_nesting[];
+
 typedef struct {
         usb_dp_descriptor_nesting_t *nesting;

uspace/lib/usb/src/dp.c

@@ -40 +40 @@
 #include <bool.h>
 #include <usb/dp.h>
+#include <usb/descriptor.h>
+
+#define NESTING(parentname, childname) \
+        { \
+                .child = USB_DESCTYPE_##childname, \
+                .parent = USB_DESCTYPE_##parentname, \
+        }
+#define LAST_NESTING { -1, -1 }
+
+/** Nesting of standard USB descriptors. */
+usb_dp_descriptor_nesting_t usb_dp_standard_descriptor_nesting[] = {
+        NESTING(CONFIGURATION, INTERFACE),
+        NESTING(INTERFACE, ENDPOINT),
+        NESTING(INTERFACE, HUB),
+        NESTING(INTERFACE, HID),
+        NESTING(HID, HID_REPORT),
+        LAST_NESTING
+};
+
+#undef NESTING
+#undef LAST_NESTING
 
 /** Tells whether pointer points inside descriptor data.