Changeset deece2f in mainline for uspace/lib/usb/src/dp.c

Timestamp:

2011-02-21T22:25:58Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

233e68d

Parents:

fb78ae72 (diff), dbe25f1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Development branch merge

File:

• uspace/lib/usb/src/dp.c (modified) (1 diff)

uspace/lib/usb/src/dp.c

@@ -37 +37 @@
 #include <str_error.h>
 #include <errno.h>
-#include <usb/usbdrv.h>
+#include <assert.h>
 #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.