Changeset 621ba8c in mainline

Timestamp:

2011-09-23T14:44:31Z (13 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.

Location:

uspace

Files:

• drv/bus/usb/usbhub/Makefile (modified) (1 diff)
• drv/bus/usb/usbhub/port.c (modified) (1 diff)
• drv/bus/usb/usbhub/usbhub.c (modified) (5 diffs)
• drv/bus/usb/usbhub/utils.c (deleted)
• drv/bus/usb/usbhub/utils.h (deleted)
• lib/usb/include/usb/classes/hub.h (modified) (4 diffs)

uspace/drv/bus/usb/usbhub/Makefile

@@ -44 +44 @@
 SOURCES = \
         main.c \
-        utils.c \
         usbhub.c \
         port.c

uspace/drv/bus/usb/usbhub/port.c

@@ -45 +45 @@
 #include "port.h"
 #include "usbhub.h"
-#include "utils.h"
 #include "port_status.h"
 

uspace/drv/bus/usb/usbhub/usbhub.c

@@ -54 +54 @@
 
 #include "usbhub.h"
-#include "utils.h"
 #include "port_status.h"
 
@@ -242 +241 @@
         usb_log_debug("Retrieving descriptor\n");
         usb_pipe_t *control_pipe = &hub_info->usb_device->ctrl_pipe;
-        uint8_t serialized_descriptor[USB_HUB_MAX_DESCRIPTOR_SIZE];
-        int opResult;
-
+
+        usb_hub_descriptor_header_t descriptor;
         size_t received_size;
-        opResult = usb_request_get_descriptor(control_pipe,
+        int opResult = usb_request_get_descriptor(control_pipe,
             USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
-            USB_DESCTYPE_HUB, 0, 0, serialized_descriptor,
-            USB_HUB_MAX_DESCRIPTOR_SIZE, &received_size);
-
+            USB_DESCTYPE_HUB, 0, 0, &descriptor,
+            sizeof(usb_hub_descriptor_t), &received_size);
         if (opResult != EOK) {
                 usb_log_error("Failed to receive hub descriptor: %s.\n",
@@ -256 +253 @@
                 return opResult;
         }
-        usb_log_debug2("Parsing descriptor\n");
-        usb_hub_descriptor_t descriptor;
-        opResult = usb_deserialize_hub_desriptor(
-                serialized_descriptor, received_size, &descriptor);
-        if (opResult != EOK) {
-                usb_log_error("Could not parse descriptor: %s\n",
-                    str_error(opResult));
-                return opResult;
-        }
-        usb_log_debug("Setting port count to %d.\n", descriptor.ports_count);
-        hub_info->port_count = descriptor.ports_count;
+
+        usb_log_debug("Setting port count to %d.\n", descriptor.port_count);
+        hub_info->port_count = descriptor.port_count;
 
         // TODO Why +1 ?
@@ -281 +270 @@
 
         const bool is_power_switched =
-            !(descriptor.hub_characteristics & HUB_CHAR_NO_POWER_SWITCH_FLAG);
+            !(descriptor.characteristics & HUB_CHAR_NO_POWER_SWITCH_FLAG);
         if (is_power_switched) {
                 usb_log_debug("Hub power switched\n");
-                const bool per_port_power = descriptor.hub_characteristics
+                const bool per_port_power = descriptor.characteristics
                     & HUB_CHAR_POWER_PER_PORT_FLAG;
 
@@ -303 +292 @@
                         }
                 }
-
         } else {
                 usb_log_debug("Power not switched, ports always powered\n");

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