Changes in / [c94f643:ab545980] in mainline

Location:

uspace

Files:

• drv/bus/usb/usbhub/Makefile (modified) (2 diffs)
• drv/bus/usb/usbhub/main.c (modified) (6 diffs)
• drv/bus/usb/usbhub/port.c (added)
• drv/bus/usb/usbhub/port.h (added)
• drv/bus/usb/usbhub/port_status.h (deleted)
• drv/bus/usb/usbhub/ports.c (deleted)
• drv/bus/usb/usbhub/ports.h (deleted)
• drv/bus/usb/usbhub/status.h (added)
• drv/bus/usb/usbhub/usbhub.c (modified) (14 diffs)
• drv/bus/usb/usbhub/usbhub.h (modified) (5 diffs)
• drv/bus/usb/usbhub/usbhub_private.h (deleted)
• drv/bus/usb/usbhub/utils.c (deleted)
• lib/usb/include/usb/classes/hub.h (modified) (4 diffs)
• lib/usbdev/include/usb/dev/pipes.h (modified) (1 diff)
• lib/usbdev/src/pipesio.c (modified) (2 diffs)

uspace/drv/bus/usb/usbhub/Makefile

@@ -1 +1 @@
 #
 # Copyright (c) 2010 Vojtech Horky
+# Copyright (c) 2011 Jan Vesely
 # All rights reserved.
 #
@@ -43 +44 @@
 SOURCES = \
         main.c \
-        utils.c \
         usbhub.c \
-        ports.c
+        port.c
 
 include $(USPACE_PREFIX)/Makefile.common

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -38 +39 @@
 #include <usb/dev/driver.h>
 #include <usb/classes/classes.h>
+#include <usb/debug.h>
 
 #include "usbhub.h"
-#include "usbhub_private.h"
 
 /** Hub status-change endpoint description.
@@ -56 +57 @@
 
 /**
- * usb hub driver operations
+ * USB hub driver operations
  *
  * The most important one is add_device, which is set to usb_hub_add_device.
@@ -64 +65 @@
 };
 
-/**
- * hub endpoints, excluding control endpoint
- */
+/** Hub endpoints, excluding control endpoint. */
 static usb_endpoint_description_t *usb_hub_endpoints[] = {
         &hub_status_change_endpoint_description,
-        NULL
+        NULL,
 };
-
-/**
- * static usb hub driver information
- */
+/** Static usb hub driver information. */
 static usb_driver_t usb_hub_driver = {
         .name = NAME,
@@ -85 +81 @@
 {
         printf(NAME ": HelenOS USB hub driver.\n");
-
         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
 
@@ -94 +89 @@
  * @}
  */
-

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Matus Dekanek
+ * Copyright (c) 2011 Jan Vesely
  * All rights reserved.
  *
@@ -38 +39 @@
 #include <str_error.h>
 #include <inttypes.h>
-
-#include <usb_iface.h>
+#include <stdio.h>
+
+#include <usb/usb.h>
+#include <usb/debug.h>
+#include <usb/dev/pipes.h>
+#include <usb/classes/classes.h>
 #include <usb/ddfiface.h>
 #include <usb/descriptor.h>
@@ -46 +51 @@
 #include <usb/classes/hub.h>
 #include <usb/dev/poll.h>
-#include <stdio.h>
+#include <usb_iface.h>
 
 #include "usbhub.h"
-#include "usbhub_private.h"
-#include "port_status.h"
-#include <usb/usb.h>
-#include <usb/dev/pipes.h>
-#include <usb/classes/classes.h>
-
-
+#include "status.h"
+
+#define HUB_FNC_NAME "hub"
+
+/** Standard get hub global status request */
+static const usb_device_request_setup_packet_t get_hub_status_request = {
+        .request_type = USB_HUB_REQ_TYPE_GET_HUB_STATUS,
+        .request = USB_HUB_REQUEST_GET_STATUS,
+        .index = 0,
+        .value = 0,
+        .length = sizeof(usb_hub_status_t),
+};
+
+static int usb_set_first_configuration(usb_device_t *usb_device);
 static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev);
-
 static int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info);
-
-static int usb_hub_set_configuration(usb_hub_info_t *hub_info);
-
-static int usb_hub_start_hub_fibril(usb_hub_info_t *hub_info);
-
-static int usb_process_hub_over_current(usb_hub_info_t *hub_info,
+static void usb_hub_over_current(const usb_hub_info_t *hub_info,
     usb_hub_status_t status);
-
-static int usb_process_hub_local_power_change(usb_hub_info_t *hub_info,
-    usb_hub_status_t status);
-
-static void usb_hub_process_global_interrupt(usb_hub_info_t *hub_info);
-
+static void usb_hub_global_interrupt(const usb_hub_info_t *hub_info);
 static void usb_hub_polling_terminated_callback(usb_device_t *device,
     bool was_error, void *data);
 
-
-//*********************************************
-//
-//  hub driver code, initialization
-//
-//*********************************************
-
 /**
  * Initialize hub device driver fibril
  *
- * Creates hub representation and fibril that periodically checks hub`s status.
+ * Creates hub representation and fibril that periodically checks hub's status.
  * Hub representation is passed to the fibril.
  * @param usb_dev generic usb device information
  * @return error code
  */
-int usb_hub_add_device(usb_device_t *usb_dev) {
-        if (!usb_dev) return EINVAL;
+int usb_hub_add_device(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        /* Create driver soft-state structure */
         usb_hub_info_t *hub_info = usb_hub_info_create(usb_dev);
-        //create hc connection
+        if (hub_info == NULL) {
+                usb_log_error("Failed to create hun driver structure.\n");
+                return ENOMEM;
+        }
+
+        /* Create hc connection */
         usb_log_debug("Initializing USB wire abstraction.\n");
         int opResult = usb_hc_connection_initialize_from_device(
-            &hub_info->connection,
-            hub_info->usb_device->ddf_dev);
-        if (opResult != EOK) {
-                usb_log_error("Could not initialize connection to device, "
-                    " %s\n",
-                    str_error(opResult));
-                free(hub_info);
-                return opResult;
-        }
-
-        //set hub configuration
-        opResult = usb_hub_set_configuration(hub_info);
-        if (opResult != EOK) {
-                usb_log_error("Could not set hub configuration, %s\n",
-                    str_error(opResult));
-                free(hub_info);
-                return opResult;
-        }
+            &hub_info->connection, hub_info->usb_device->ddf_dev);
+        if (opResult != EOK) {
+                usb_log_error("Could not initialize connection to device: %s\n",
+                    str_error(opResult));
+                free(hub_info);
+                return opResult;
+        }
+
+        /* Set hub's first configuration. (There should be only one) */
+        opResult = usb_set_first_configuration(usb_dev);
+        if (opResult != EOK) {
+                usb_log_error("Could not set hub configuration: %s\n",
+                    str_error(opResult));
+                free(hub_info);
+                return opResult;
+        }
+
         //get port count and create attached_devs
         opResult = usb_hub_process_hub_specific_info(hub_info);
@@ -123 +123 @@
         }
 
-        usb_log_debug("Creating 'hub' function in DDF.\n");
+        usb_log_debug("Creating DDF function '" HUB_FNC_NAME "'.\n");
         ddf_fun_t *hub_fun = ddf_fun_create(hub_info->usb_device->ddf_dev,
-            fun_exposed, "hub");
-        assert(hub_fun != NULL);
-        hub_fun->ops = NULL;
+            fun_exposed, HUB_FNC_NAME);
+        if (hub_fun == NULL) {
+                usb_log_error("Failed to create hub function.\n");
+                free(hub_info);
+                return ENOMEM;
+        }
 
         opResult = ddf_fun_bind(hub_fun);
-        assert(opResult == EOK);
-
-        opResult = usb_hub_start_hub_fibril(hub_info);
-        if (opResult != EOK)
-                free(hub_info);
-        return opResult;
-}
-
+        if (opResult != EOK) {
+                usb_log_error("Failed to bind hub function: %s.\n",
+                   str_error(opResult));
+                free(hub_info);
+                ddf_fun_destroy(hub_fun);
+                return opResult;
+        }
+
+        opResult = usb_device_auto_poll(hub_info->usb_device, 0,
+            hub_port_changes_callback, ((hub_info->port_count + 1) / 8) + 1,
+            usb_hub_polling_terminated_callback, hub_info);
+        if (opResult != EOK) {
+                ddf_fun_destroy(hub_fun);
+                free(hub_info);
+                usb_log_error("Failed to create polling fibril: %s.\n",
+                    str_error(opResult));
+                return opResult;
+        }
+        usb_log_info("Controlling hub '%s' (%zu ports).\n",
+            hub_info->usb_device->ddf_dev->name, hub_info->port_count);
+
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
 /** Callback for polling hub for changes.
  *
@@ -147 +166 @@
  */
 bool hub_port_changes_callback(usb_device_t *dev,
-    uint8_t *change_bitmap, size_t change_bitmap_size, void *arg) {
+    uint8_t *change_bitmap, size_t change_bitmap_size, void *arg)
+{
         usb_log_debug("hub_port_changes_callback\n");
-        usb_hub_info_t *hub = (usb_hub_info_t *) arg;
-
-        /* FIXME: check that we received enough bytes. */
+        usb_hub_info_t *hub = arg;
+        assert(hub);
+
+        /* It is an error condition if we didn't receive enough data */
         if (change_bitmap_size == 0) {
-                goto leave;
-        }
-
-        bool change;
-        change = ((uint8_t*) change_bitmap)[0] & 1;
+                return false;
+        }
+
+        /* Lowest bit indicates global change */
+        const bool change = change_bitmap[0] & 1;
         if (change) {
-                usb_hub_process_global_interrupt(hub);
-        }
-
-        size_t port;
-        for (port = 1; port < hub->port_count + 1; port++) {
-                bool change = (change_bitmap[port / 8] >> (port % 8)) % 2;
+                usb_hub_global_interrupt(hub);
+        }
+
+        /* N + 1 bit indicates change on port N */
+        size_t port = 1;
+        for (; port < hub->port_count + 1; port++) {
+                const bool change = (change_bitmap[port / 8] >> (port % 8)) & 1;
                 if (change) {
-                        usb_hub_process_port_interrupt(hub, port);
+                        usb_hub_port_process_interrupt(&hub->ports[port], hub);
                 }
         }
-leave:
-        /* FIXME: proper interval. */
-        async_usleep(1000 * 250);
-
         return true;
 }
-
-
-//*********************************************
-//
-//  support functions
-//
-//*********************************************
-
+/*----------------------------------------------------------------------------*/
 /**
  * create usb_hub_info_t structure
@@ -190 +201 @@
  * @return basic usb_hub_info_t structure
  */
-static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev) {
-        usb_hub_info_t * result = malloc(sizeof (usb_hub_info_t));
-        if (!result) return NULL;
-        result->usb_device = usb_dev;
-        result->status_change_pipe = usb_dev->pipes[0].pipe;
-        result->control_pipe = &usb_dev->ctrl_pipe;
-        result->is_default_address_used = false;
-
-        result->ports = NULL;
-        result->port_count = (size_t) - 1;
-        fibril_mutex_initialize(&result->port_mutex);
-
-        fibril_mutex_initialize(&result->pending_ops_mutex);
-        fibril_condvar_initialize(&result->pending_ops_cv);
-        result->pending_ops_count = 0;
-        return result;
-}
-
+static usb_hub_info_t * usb_hub_info_create(usb_device_t *usb_dev)
+{
+        assert(usb_dev);
+        usb_hub_info_t *info = malloc(sizeof(usb_hub_info_t));
+        if (!info)
+            return NULL;
+
+        info->usb_device = usb_dev;
+
+        info->ports = NULL;
+        info->port_count = -1;
+        fibril_mutex_initialize(&info->pending_ops_mutex);
+        fibril_condvar_initialize(&info->pending_ops_cv);
+        info->pending_ops_count = 0;
+
+        return info;
+}
+/*----------------------------------------------------------------------------*/
 /**
  * Load hub-specific information into hub_info structure and process if needed
  *
- * Particularly read port count and initialize structure holding port
- * information. If there are non-removable devices, start initializing them.
+ * Read port count and initialize structures holding per port information.
+ * If there are any non-removable devices, start initializing them.
  * This function is hub-specific and should be run only after the hub is
- * configured using usb_hub_set_configuration function.
+ * configured using usb_set_first_configuration function.
  * @param hub_info hub representation
  * @return error code
  */
-int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info)
-{
-        // get hub descriptor
+static int usb_hub_process_hub_specific_info(usb_hub_info_t *hub_info)
+{
+        assert(hub_info);
+
+        /* Get hub descriptor. */
         usb_log_debug("Retrieving descriptor\n");
-        uint8_t serialized_descriptor[USB_HUB_MAX_DESCRIPTOR_SIZE];
-        int opResult;
-
+        usb_pipe_t *control_pipe = &hub_info->usb_device->ctrl_pipe;
+
+        usb_hub_descriptor_header_t descriptor;
         size_t received_size;
-        opResult = usb_request_get_descriptor(hub_info->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",
@@ -236 +248 @@
                 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: +1 hack is no longer necessary
         hub_info->ports =
             malloc(sizeof(usb_hub_port_t) * (hub_info->port_count + 1));
@@ -256 +261 @@
         size_t port;
         for (port = 0; port < hub_info->port_count + 1; ++port) {
-                usb_hub_port_init(&hub_info->ports[port]);
+                usb_hub_port_init(&hub_info->ports[port], port, control_pipe);
         }
 
         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;
 
                 for (port = 1; port <= hub_info->port_count; ++port) {
                         usb_log_debug("Powering port %zu.\n", port);
-                        opResult = usb_hub_set_port_feature(
-                            hub_info->control_pipe,
-                            port, USB_HUB_FEATURE_PORT_POWER);
+                        opResult = usb_hub_port_set_feature(
+                            &hub_info->ports[port], USB_HUB_FEATURE_PORT_POWER);
                         if (opResult != EOK) {
                                 usb_log_error("Cannot power on port %zu: %s.\n",
@@ -283 +287 @@
                         }
                 }
-
         } else {
-                usb_log_debug("Power not switched, not going to be powered\n");
+                usb_log_debug("Power not switched, ports always powered\n");
         }
         return EOK;
 }
-
-/**
- * Set configuration of hub
+/*----------------------------------------------------------------------------*/
+/**
+ * Set configuration of and USB device
  *
  * Check whether there is at least one configuration and sets the first one.
  * This function should be run prior to running any hub-specific action.
- * @param hub_info hub representation
+ * @param usb_device usb device representation
  * @return error code
  */
-static int usb_hub_set_configuration(usb_hub_info_t *hub_info) {
-        //device descriptor
-        usb_standard_device_descriptor_t *std_descriptor
-            = &hub_info->usb_device->descriptors.device;
-        usb_log_debug("Hub has %d configurations\n",
-            std_descriptor->configuration_count);
-        if (std_descriptor->configuration_count < 1) {
+static int usb_set_first_configuration(usb_device_t *usb_device)
+{
+        assert(usb_device);
+        /* Get number of possible configurations from device descriptor */
+        const size_t configuration_count =
+            usb_device->descriptors.device.configuration_count;
+        usb_log_debug("Hub has %d configurations.\n", configuration_count);
+
+        if (configuration_count < 1) {
                 usb_log_error("There are no configurations available\n");
                 return EINVAL;
         }
 
+        // TODO: Make sure that there is enough data and the cast is correct
         usb_standard_configuration_descriptor_t *config_descriptor
             = (usb_standard_configuration_descriptor_t *)
-            hub_info->usb_device->descriptors.configuration;
-
-        /* Set configuration. */
-        int opResult = usb_request_set_configuration(
-            &hub_info->usb_device->ctrl_pipe,
-            config_descriptor->configuration_number);
-
+            usb_device->descriptors.configuration;
+
+        /* Set configuration. Use the configuration that was in
+         * usb_device->descriptors.configuration i.e. The first one. */
+        const int opResult = usb_request_set_configuration(
+            &usb_device->ctrl_pipe, config_descriptor->configuration_number);
         if (opResult != EOK) {
                 usb_log_error("Failed to set hub configuration: %s.\n",
                     str_error(opResult));
-                return opResult;
-        }
-        usb_log_debug("\tUsed configuration %d\n",
-            config_descriptor->configuration_number);
-
-        return EOK;
-}
-
-/**
- * create and start fibril with hub control loop
- *
- * Before the fibril is started, the control pipe and host controller
- * connection of the hub is open.
- *
- * @param hub_info hub representing structure
- * @return error code
- */
-static int usb_hub_start_hub_fibril(usb_hub_info_t *hub_info) {
-        int rc;
-
-        rc = usb_device_auto_poll(hub_info->usb_device, 0,
-            hub_port_changes_callback, ((hub_info->port_count + 1) / 8) + 1,
-            usb_hub_polling_terminated_callback, hub_info);
-        if (rc != EOK) {
-                usb_log_error("Failed to create polling fibril: %s.\n",
-                    str_error(rc));
-                free(hub_info);
-                return rc;
-        }
-
-        usb_log_info("Controlling hub `%s' (%zu ports).\n",
-            hub_info->usb_device->ddf_dev->name, hub_info->port_count);
-        return EOK;
-}
-
-//*********************************************
-//
-//  change handling functions
-//
-//*********************************************
-
-/**
- * process hub over current change
+        } else {
+                usb_log_debug("\tUsed configuration %d\n",
+                    config_descriptor->configuration_number);
+        }
+        return opResult;
+}
+/*----------------------------------------------------------------------------*/
+/**
+ * Process hub over current change
  *
  * This means either to power off the hub or power it on.
@@ -370 +341 @@
  * @return error code
  */
-static int usb_process_hub_over_current(usb_hub_info_t *hub_info,
-    usb_hub_status_t status) {
-        int opResult;
-        if (usb_hub_is_status(status, USB_HUB_FEATURE_HUB_OVER_CURRENT)) {
-                //poweroff all ports
-                unsigned int port;
+static void usb_hub_over_current(const usb_hub_info_t *hub_info,
+    usb_hub_status_t status)
+{
+        if (status & USB_HUB_STATUS_OVER_CURRENT) {
+                /* Hub should remove power from all ports if it detects OC */
+                usb_log_warning("Detected hub over-current condition, "
+                    "all ports should be powered off.");
+        } else {
+                /* Over-current condition is gone, it is safe to turn the
+                 * ports on. */
+                size_t port;
                 for (port = 1; port <= hub_info->port_count; ++port) {
-                        opResult = usb_hub_clear_port_feature(
-                            hub_info->control_pipe, port,
-                            USB_HUB_FEATURE_PORT_POWER);
+                        const int opResult = usb_hub_port_set_feature(
+                            &hub_info->ports[port], USB_HUB_FEATURE_PORT_POWER);
                         if (opResult != EOK) {
                                 usb_log_warning(
-                                    "Cannot power off port %d;  %s\n",
+                                    "HUB OVER-CURRENT GONE: Cannot power on "
+                                    "port %d;  %s\n",
                                     port, str_error(opResult));
                         }
                 }
-        } else {
-                //power all ports
-                unsigned int port;
-                for (port = 1; port <= hub_info->port_count; ++port) {
-                        opResult = usb_hub_set_port_feature(
-                            hub_info->control_pipe, port,
-                            USB_HUB_FEATURE_PORT_POWER);
-                        if (opResult != EOK) {
-                                usb_log_warning(
-                                    "Cannot power off port %d;  %s\n",
-                                    port, str_error(opResult));
-                        }
-                }
-        }
-        return opResult;
-}
-
-/**
- * process hub local power change
- *
- * This change is ignored.
+        }
+        const int opResult = usb_request_clear_feature(
+            &hub_info->usb_device->ctrl_pipe, USB_REQUEST_TYPE_CLASS,
+            USB_REQUEST_RECIPIENT_DEVICE,
+            USB_HUB_FEATURE_C_HUB_LOCAL_POWER, 0);
+        if (opResult != EOK) {
+                usb_log_error(
+                    "Failed to clear hub over-current change flag: %s.\n",
+                    str_error(opResult));
+        }
+}
+/*----------------------------------------------------------------------------*/
+/**
+ * Process hub interrupts.
+ *
+ * The change can be either in the over-current condition or local-power change.
  * @param hub_info hub instance
- * @param status hub status bitmask
- * @return error code
- */
-static int usb_process_hub_local_power_change(usb_hub_info_t *hub_info,
-    usb_hub_status_t status) {
-        int opResult = EOK;
-        opResult = usb_hub_clear_feature(hub_info->control_pipe,
-            USB_HUB_FEATURE_C_HUB_LOCAL_POWER);
-        if (opResult != EOK) {
-                usb_log_error("Cannnot clear hub power change flag: "
-                    "%s\n",
-                    str_error(opResult));
-        }
-        return opResult;
-}
-
-/**
- * process hub interrupts
- *
- * The change can be either in the over-current condition or
- * local-power change.
- * @param hub_info hub instance
- */
-static void usb_hub_process_global_interrupt(usb_hub_info_t *hub_info) {
+ */
+static void usb_hub_global_interrupt(const usb_hub_info_t *hub_info)
+{
+        assert(hub_info);
+        assert(hub_info->usb_device);
         usb_log_debug("Global interrupt on a hub\n");
-        usb_pipe_t *pipe = hub_info->control_pipe;
-        int opResult;
-
-        usb_port_status_t status;
+        usb_pipe_t *control_pipe = &hub_info->usb_device->ctrl_pipe;
+
+        usb_hub_status_t status;
         size_t rcvd_size;
-        usb_device_request_setup_packet_t request;
-        //int opResult;
-        usb_hub_set_hub_status_request(&request);
-        //endpoint 0
-
-        opResult = usb_pipe_control_read(
-            pipe,
-            &request, sizeof (usb_device_request_setup_packet_t),
-            &status, 4, &rcvd_size
-            );
+        /* NOTE: We can't use standard USB GET_STATUS request, because
+         * hubs reply is 4byte instead of 2 */
+        const int opResult = usb_pipe_control_read(control_pipe,
+            &get_hub_status_request, sizeof(get_hub_status_request),
+            &status, sizeof(usb_hub_status_t), &rcvd_size);
         if (opResult != EOK) {
                 usb_log_error("Could not get hub status: %s\n",
@@ -453 +399 @@
                 return;
         }
-        if (rcvd_size != sizeof (usb_port_status_t)) {
+        if (rcvd_size != sizeof(usb_hub_status_t)) {
                 usb_log_error("Received status has incorrect size\n");
                 return;
         }
-        //port reset
-        if (
-            usb_hub_is_status(status, 16 + USB_HUB_FEATURE_C_HUB_OVER_CURRENT)) {
-                usb_process_hub_over_current(hub_info, status);
-        }
-        if (
-            usb_hub_is_status(status, 16 + USB_HUB_FEATURE_C_HUB_LOCAL_POWER)) {
-                usb_process_hub_local_power_change(hub_info, status);
-        }
-}
-
+
+        /* Handle status changes */
+        if (status & USB_HUB_STATUS_C_OVER_CURRENT) {
+                usb_hub_over_current(hub_info, status);
+        }
+
+        if (status & USB_HUB_STATUS_C_LOCAL_POWER) {
+                /* NOTE: Handling this is more complicated.
+                 * If the transition is from bus power to local power, all
+                 * is good and we may signal the parent hub that we don't
+                 * need the power.
+                 * If the transition is from local power to bus power
+                 * the hub should turn off all the ports and devices need
+                 * to be reinitialized taking into account the limited power
+                 * that is now available.
+                 * There is no support for power distribution in HelenOS,
+                 * (or other OSes/hub devices that I've seen) so this is not
+                 * implemented.
+                 * Just ACK the change.
+                 */
+                const int opResult = usb_request_clear_feature(
+                    control_pipe, USB_REQUEST_TYPE_CLASS,
+                    USB_REQUEST_RECIPIENT_DEVICE,
+                    USB_HUB_FEATURE_C_HUB_LOCAL_POWER, 0);
+                if (opResult != EOK) {
+                        usb_log_error(
+                            "Failed to clear hub power change flag: %s.\n",
+                            str_error(opResult));
+                }
+        }
+}
+/*----------------------------------------------------------------------------*/
 /**
  * callback called from hub polling fibril when the fibril terminates
@@ -477 +444 @@
  */
 static void usb_hub_polling_terminated_callback(usb_device_t *device,
-    bool was_error, void *data) {
-        usb_hub_info_t * hub = data;
+    bool was_error, void *data)
+{
+        usb_hub_info_t *hub = data;
         assert(hub);
 
@@ -492 +460 @@
          */
         if (hub->pending_ops_count > 0) {
-                fibril_mutex_lock(&hub->port_mutex);
                 size_t port;
                 for (port = 0; port < hub->port_count; port++) {
-                        usb_hub_port_t *the_port = hub->ports + port;
-                        fibril_mutex_lock(&the_port->reset_mutex);
-                        the_port->reset_completed = true;
-                        the_port->reset_okay = false;
-                        fibril_condvar_broadcast(&the_port->reset_cv);
-                        fibril_mutex_unlock(&the_port->reset_mutex);
+                        usb_hub_port_reset_fail(&hub->ports[port]);
                 }
-                fibril_mutex_unlock(&hub->port_mutex);
         }
         /* And now wait for them. */
@@ -516 +477 @@
         free(hub);
 }
-
-
-
-
 /**
  * @}

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -26 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
 /** @addtogroup drvusbhub
  * @{
@@ -49 +49 @@
 #define NAME "usbhub"
 
-#include "ports.h"
+#include "port.h"
 
 /** Information about attached hub. */
@@ -56 +56 @@
         size_t port_count;
 
-        /** attached device handles, for each port one */
+        /** Attached device handles, for each port one */
         usb_hub_port_t *ports;
 
-        fibril_mutex_t port_mutex;
-
-        /** connection to hcd */
+        /** Connection to hcd */
         usb_hc_connection_t connection;
 
-        /** default address is used indicator
-         *
-         * If default address is requested by this device, it cannot
-         * be requested by the same hub again, otherwise a deadlock will occur.
-         */
-        bool is_default_address_used;
-
-        /** convenience pointer to status change pipe
-         *
-         * Status change pipe is initialized in usb_device structure. This is
-         * pointer into this structure, so that it does not have to be
-         * searched again and again for the 'right pipe'.
-         */
-        usb_pipe_t * status_change_pipe;
-
-        /** convenience pointer to control pipe
-         *
-         * Control pipe is initialized in usb_device structure. This is
-         * pointer into this structure, so that it does not have to be
-         * searched again and again for the 'right pipe'.
-         */
-        usb_pipe_t * control_pipe;
-
-        /** generic usb device data*/
-        usb_device_t * usb_device;
+        /** Generic usb device data*/
+        usb_device_t *usb_device;
 
         /** Number of pending operations on the mutex to prevent shooting
@@ -101 +76 @@
         /** Condition variable for pending_ops_count. */
         fibril_condvar_t pending_ops_cv;
-
 };
 

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_reserved;
         /** 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

uspace/lib/usbdev/include/usb/dev/pipes.h

@@ -183 +183 @@
 int usb_pipe_write(usb_pipe_t *, void *, size_t);
 
-int usb_pipe_control_read(usb_pipe_t *, void *, size_t,
+int usb_pipe_control_read(usb_pipe_t *, const void *, size_t,
     void *, size_t, size_t *);
 int usb_pipe_control_write(usb_pipe_t *, void *, size_t,

uspace/lib/usbdev/src/pipesio.c

@@ -328 +328 @@
  */
 static int usb_pipe_control_read_no_check(usb_pipe_t *pipe,
-    void *setup_buffer, size_t setup_buffer_size,
+    const void *setup_buffer, size_t setup_buffer_size,
     void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size)
 {
@@ -411 +411 @@
  */
 int usb_pipe_control_read(usb_pipe_t *pipe,
-    void *setup_buffer, size_t setup_buffer_size,
+    const void *setup_buffer, size_t setup_buffer_size,
     void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size)
 {