Changeset 2193471 in mainline

Timestamp:

2010-10-12T16:45:02Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

2b887bf7

Parents:

bbf79e0

Message:

Add missing standard USB descriptors

Now, following standard descriptors are ready (in usb/descriptor.h):
device, configuration, interface, endpoint. String descriptors will be
added later.

Location:

uspace

Files:

• app/virtusbkbd/kbdconfig.h (modified) (1 diff)
• app/virtusbkbd/virtusbkbd.c (modified) (1 diff)
• lib/usb/descriptor.h (added)
• lib/usb/device.h (deleted)
• lib/usb/devreq.h (modified) (1 diff)
• lib/usb/hcd.h (modified) (1 diff)
• lib/usbvirt/device.h (modified) (1 diff)

uspace/app/virtusbkbd/kbdconfig.h

@@ -36 +36 @@
 #define VUK_KBDCONFIG_H_
 
-#include <usb/device.h>
+#include <usb/descriptor.h>
 #include "report.h"
 #include "descriptor.h"

uspace/app/virtusbkbd/virtusbkbd.c

@@ -46 +46 @@
 
 #include <usb/hcd.h>
-#include <usb/device.h>
+#include <usb/descriptor.h>
 #include <usb/hid.h>
 #include <usbvirt/device.h>

uspace/lib/usb/devreq.h

@@ -55 +55 @@
 } usb_stddevreq_t;
 
-/** Descriptor type. */
-typedef enum {
-        USB_DESCTYPE_DEVICE = 1,
-        USB_DESCTYPE_CONFIGURATION = 2,
-        USB_DESCTYPE_STRING = 3,
-        USB_DESCTYPE_INTERFACE = 4,
-        USB_DESCTYPE_ENDPOINT = 5
-} usb_descriptor_type_t;
-
 /** Device request setup packet.
  * The setup packet describes the request.

uspace/lib/usb/hcd.h

@@ -44 +44 @@
 /** USB transfer type. */
 typedef enum {
-        USB_TRANSFER_ISOCHRONOUS,
-        USB_TRANSFER_INTERRUPT,
-        USB_TRANSFER_CONTROL,
-        USB_TRANSFER_BULK
+        USB_TRANSFER_CONTROL = 0,
+        USB_TRANSFER_ISOCHRONOUS = 1,
+        USB_TRANSFER_BULK = 2,
+        USB_TRANSFER_INTERRUPT = 3
 } usb_transfer_type_t;
 

uspace/lib/usbvirt/device.h

@@ -37 +37 @@
 
 #include <usb/hcd.h>
-#include <usb/device.h>
+#include <usb/descriptor.h>
 #include <usb/devreq.h>