Changeset 621ba8c in mainline for uspace/lib/usb

Timestamp:

2011-09-23T14:44:31Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4559d89

Parents:

3b617579

Message:

usbhub: Request only hub descriptor header. DOn't use deserialize function.

Remove utils.h/c.

File:

• uspace/lib/usb/include/usb/classes/hub.h (modified) (4 diffs)

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

@@ -72 +72 @@
         uint8_t port_count;
         /** Characteristics bitmask. */
-        uint16_t characteristics;
+        uint8_t characteristics;
+#define HUB_CHAR_POWER_PER_PORT_FLAG  (1 << 0)
+#define HUB_CHAR_NO_POWER_SWITCH_FLAG (1 << 1)
+        /* Unused part of characteristics field */
+        uint8_t characteristics_reservered;
         /** Time from power-on to stabilization of current on the port. */
         uint8_t power_good_time;
@@ -92 +96 @@
 
     /** Number of downstream ports that this hub supports */
-    uint8_t ports_count;
+    uint8_t port_count;
 
     /**
@@ -119 +123 @@
      */
     uint16_t hub_characteristics;
-#define HUB_CHAR_POWER_PER_PORT_FLAG  (1 << 0)
-#define HUB_CHAR_NO_POWER_SWITCH_FLAG (1 << 1)
 
     /**
@@ -214 +216 @@
  *      Maximum size of usb hub descriptor in bytes
  */
-extern size_t USB_HUB_MAX_DESCRIPTOR_SIZE;
-
-
-
-
-
-
+/* 7 (basic size) + 2*32 (port bitmasks) */
+#define USB_HUB_MAX_DESCRIPTOR_SIZE 71
 
 #endif