Changeset 4ee5272 in mainline

Timestamp:

2014-01-19T04:45:39Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2be477d5

Parents:

615abda

Message:

libusb, usbhub: Add USB2 features and structures

Location:

uspace

Files:

• drv/bus/usb/usbhub/status.h (modified) (1 diff)
• lib/usb/include/usb/classes/hub.h (modified) (5 diffs)
• lib/usb/include/usb/descriptor.h (modified) (3 diffs)
• lib/usb/include/usb/request.h (modified) (2 diffs)
• lib/usb/src/usb.c (modified) (1 diff)
• lib/usbdev/src/request.c (modified) (1 diff)

uspace/drv/bus/usb/usbhub/status.h

@@ -64 +64 @@
 #define USB_HUB_PORT_STATUS_HIGH_SPEED \
     (uint32_usb2host(1 << 10))
+#define USB_HUB_PORT_STATUS_TEST_MODE \
+    (uint32_usb2host(1 << 11))
+#define USB_HUB_PORT_INDICATOR_CONTROL \
+    (uint32_usb2host(1 << 12))
 
 #define USB_HUB_PORT_C_STATUS_CONNECTION \

uspace/lib/usb/include/usb/classes/hub.h

@@ -43 +43 @@
  */
 typedef enum {
+        USB_HUB_FEATURE_C_HUB_LOCAL_POWER = 0,
+        USB_HUB_FEATURE_C_HUB_OVER_CURRENT = 1,
         USB_HUB_FEATURE_HUB_LOCAL_POWER = 0,
         USB_HUB_FEATURE_HUB_OVER_CURRENT = 1,
-        USB_HUB_FEATURE_C_HUB_LOCAL_POWER = 0,
-        USB_HUB_FEATURE_C_HUB_OVER_CURRENT = 1,
         USB_HUB_FEATURE_PORT_CONNECTION = 0,
         USB_HUB_FEATURE_PORT_ENABLE = 1,
@@ -59 +59 @@
         USB_HUB_FEATURE_C_PORT_OVER_CURRENT = 19,
         USB_HUB_FEATURE_C_PORT_RESET = 20,
+        USB_HUB_FEATURE_PORT_TEST = 21,
+        USB_HUB_FEATURE_PORT_INDICATOR = 22
         /* USB_HUB_FEATURE_ = , */
 } usb_hub_class_feature_t;
@@ -171 +173 @@
     /** */
     USB_HUB_REQUEST_CLEAR_FEATURE = 1,
-    /** */
+    /** USB 1.0 only */
     USB_HUB_REQUEST_GET_STATE = 2,
     /** */
@@ -178 +180 @@
     USB_HUB_REQUEST_GET_DESCRIPTOR = 6,
     /** */
-    USB_HUB_REQUEST_SET_DESCRIPTOR = 7
+    USB_HUB_REQUEST_SET_DESCRIPTOR = 7,
+    /** */
+    USB_HUB_REQUEST_CLEAR_TT_BUFFER = 8,
+    /** */
+    USB_HUB_REQUEST_RESET_TT = 9,
+    /** */
+    USB_HUB_GET_TT_STATE = 10,
+    /** */
+    USB_HUB_STOP_TT = 11,
 } usb_hub_request_t;
 
@@ -185 +195 @@
  */
 /* 7 (basic size) + 2*32 (port bitmasks) */
-#define USB_HUB_MAX_DESCRIPTOR_SIZE 71
+#define USB_HUB_MAX_DESCRIPTOR_SIZE (7 + 2 * 32)
 
 #endif

uspace/lib/usb/include/usb/descriptor.h

@@ -45 +45 @@
         USB_DESCTYPE_INTERFACE = 4,
         USB_DESCTYPE_ENDPOINT = 5,
+        /* New in USB2.0 */
+        USB_DESCTYPE_DEVICE_QUALIFIER = 6,
+        USB_DESCTYPE_OTHER_SPEED_CONFIGURATION = 7,
+        USB_DESCTYPE_INTERFACE_POWER = 8,
+        /* Class specific */
         USB_DESCTYPE_HID = 0x21,
         USB_DESCTYPE_HID_REPORT = 0x22,
@@ -89 +94 @@
 } __attribute__ ((packed)) usb_standard_device_descriptor_t;
 
+/** USB device qualifier decriptor is basically a cut down version of the device
+ * descriptor with values that would be valid if the device operated on the
+ * other speed (HIGH vs. FULL)
+ */
+typedef struct {
+        /** Size of this descriptor in bytes */
+        uint8_t length;
+        /** Descriptor type (USB_DESCTYPE_DEVICE_QUALIFIER) */
+        uint8_t descriptor_type;
+        /** USB specification release number.
+         * The number shall be coded as binary-coded decimal (BCD).
+         */
+        uint16_t usb_spec_version;
+        /** Device class. */
+        uint8_t device_class;
+        /** Device sub-class. */
+        uint8_t device_subclass;
+        /** Device protocol. */
+        uint8_t device_protocol;
+        /** Maximum packet size for endpoint zero.
+         * Valid values are only 8, 16, 32, 64).
+         */
+        uint8_t max_packet_size;
+        /** Number of possible configurations. */
+        uint8_t configuration_count;
+        uint8_t reserved;
+} __attribute__ ((packed)) usb_standard_device_qualifier_descriptor_t;
+
 /** Standard USB configuration descriptor.
  */
@@ -116 +149 @@
 } __attribute__ ((packed)) usb_standard_configuration_descriptor_t;
 
+/** USB Other Speed Configuration descriptor shows values that would change
+ * in the configuration descriptor if the device operated at its other
+ * possible speed (HIGH vs. FULL)
+ */
+typedef usb_standard_configuration_descriptor_t
+    usb_other_speed_configuration_descriptor_t;
+
 /** Standard USB interface descriptor.
  */

uspace/lib/usb/include/usb/request.h

@@ -54 +54 @@
 } usb_stddevreq_t;
 
+/** Standard device features */
+typedef enum {
+        USB_FEATURE_ENDPOINT_HALT = 0,
+        USB_FEATURE_DEVICE_REMOTE_WAKEUP = 1,
+        USB_FEATURE_TEST_MODE = 2
+} usb_std_feature_t;
+
 /** USB device status - device is self powered (opposed to bus powered). */
 #define USB_DEVICE_STATUS_SELF_POWERED ((uint16_t)(1 << 0))
@@ -62 +69 @@
 /** USB endpoint status - endpoint is halted (stalled). */
 #define USB_ENDPOINT_STATUS_HALTED ((uint16_t)(1 << 0))
-
-/** USB feature selector - endpoint halt (stall). */
-#define USB_FEATURE_SELECTOR_ENDPOINT_HALT (0)
-
-/** USB feature selector - device remote wake-up. */
-#define USB_FEATURE_SELECTOR_REMOTE_WAKEUP (1)
 
 /** Device request setup packet.

uspace/lib/usb/src/usb.c

@@ -135 +135 @@
                 /* 0x2 ( HOST to device | STANDART | TO ENPOINT) */
                 if ((request->request_type == 0x2) &&
-                    (request->value == USB_FEATURE_SELECTOR_ENDPOINT_HALT))
+                    (request->value == USB_FEATURE_ENDPOINT_HALT))
                         return uint16_usb2host(request->index);
                 break;

uspace/lib/usbdev/src/request.c

@@ -823 +823 @@
         return usb_request_clear_feature(pipe,
             USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_ENDPOINT,
-            uint16_host2usb(USB_FEATURE_SELECTOR_ENDPOINT_HALT),
+            uint16_host2usb(USB_FEATURE_ENDPOINT_HALT),
             uint16_host2usb(ep_index));
 }