Changeset eda7a4e0 in mainline

Timestamp:

2011-10-13T11:43:23Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a14d6a7

Parents:

fb422312

Message:

usbhub: rename hub_info ⇒ hub_dev

File:

• uspace/drv/bus/usb/usbhub/usbhub.c (modified) (14 diffs)

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

@@ -69 +69 @@
 static int usb_set_first_configuration(usb_device_t *usb_device);
 static usb_hub_dev_t * usb_hub_dev_create(usb_device_t *usb_dev);
-static int usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_info);
-static void usb_hub_over_current(const usb_hub_dev_t *hub_info,
+static int usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_dev);
+static void usb_hub_over_current(const usb_hub_dev_t *hub_dev,
     usb_hub_status_t status);
-static void usb_hub_global_interrupt(const usb_hub_dev_t *hub_info);
+static void usb_hub_global_interrupt(const usb_hub_dev_t *hub_dev);
 static void usb_hub_polling_terminated_callback(usb_device_t *device,
     bool was_error, void *data);
@@ -124 +124 @@
         assert(usb_dev);
         /* Create driver soft-state structure */
-        usb_hub_dev_t *hub_info = usb_hub_dev_create(usb_dev);
-        if (hub_info == NULL) {
+        usb_hub_dev_t *hub_dev = usb_hub_dev_create(usb_dev);
+        if (hub_dev == NULL) {
                 usb_log_error("Failed to create hun driver structure.\n");
                 return ENOMEM;
@@ -133 +133 @@
         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);
+            &hub_dev->connection, hub_dev->usb_device->ddf_dev);
         if (opResult != EOK) {
                 usb_log_error("Could not initialize connection to device: %s\n",
                     str_error(opResult));
-                free(hub_info);
+                free(hub_dev);
                 return opResult;
         }
@@ -146 +146 @@
                 usb_log_error("Could not set hub configuration: %s\n",
                     str_error(opResult));
-                free(hub_info);
+                free(hub_dev);
                 return opResult;
         }
 
         /* Get port count and create attached_devices. */
-        opResult = usb_hub_process_hub_specific_info(hub_info);
+        opResult = usb_hub_process_hub_specific_info(hub_dev);
         if (opResult != EOK) {
                 usb_log_error("Could process hub specific info, %s\n",
                     str_error(opResult));
-                free(hub_info);
+                free(hub_dev);
                 return opResult;
         }
 
         usb_log_debug("Creating DDF function '" HUB_FNC_NAME "'.\n");
-        hub_info->hub_fun = ddf_fun_create(hub_info->usb_device->ddf_dev,
+        hub_dev->hub_fun = ddf_fun_create(hub_dev->usb_device->ddf_dev,
             fun_exposed, HUB_FNC_NAME);
-        if (hub_info->hub_fun == NULL) {
+        if (hub_dev->hub_fun == NULL) {
                 usb_log_error("Failed to create hub function.\n");
-                free(hub_info);
+                free(hub_dev);
                 return ENOMEM;
         }
 
-        opResult = ddf_fun_bind(hub_info->hub_fun);
+        opResult = ddf_fun_bind(hub_dev->hub_fun);
         if (opResult != EOK) {
                 usb_log_error("Failed to bind hub function: %s.\n",
                    str_error(opResult));
-                free(hub_info);
-                ddf_fun_destroy(hub_info->hub_fun);
+                free(hub_dev);
+                ddf_fun_destroy(hub_dev->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);
+        opResult = usb_device_auto_poll(hub_dev->usb_device, 0,
+            hub_port_changes_callback, ((hub_dev->port_count + 1) / 8) + 1,
+            usb_hub_polling_terminated_callback, hub_dev);
         if (opResult != EOK) {
                 /* Function is already bound */
-                ddf_fun_unbind(hub_info->hub_fun);
-                ddf_fun_destroy(hub_info->hub_fun);
-                free(hub_info);
+                ddf_fun_unbind(hub_dev->hub_fun);
+                ddf_fun_destroy(hub_dev->hub_fun);
+                free(hub_dev);
                 usb_log_error("Failed to create polling fibril: %s.\n",
                     str_error(opResult));
                 return opResult;
         }
-        hub_info->running = true;
+        hub_dev->running = true;
         usb_log_info("Controlling hub '%s' (%zu ports).\n",
-            hub_info->usb_device->ddf_dev->name, hub_info->port_count);
+            hub_dev->usb_device->ddf_dev->name, hub_dev->port_count);
 
         return EOK;
@@ -243 +243 @@
 {
         assert(usb_dev);
-        usb_hub_dev_t *info = malloc(sizeof(usb_hub_dev_t));
-        if (!info)
+        usb_hub_dev_t *hub_dev = malloc(sizeof(usb_hub_dev_t));
+        if (!hub_dev)
             return NULL;
 
-        info->usb_device = usb_dev;
-
-        info->ports = NULL;
-        info->port_count = -1;
-        info->pending_ops_count = 0;
-        info->running = false;
-        fibril_mutex_initialize(&info->pending_ops_mutex);
-        fibril_condvar_initialize(&info->pending_ops_cv);
-        usb_dev->driver_data = info;
-
-        return info;
-}
-/*----------------------------------------------------------------------------*/
-/**
- * Load hub-specific information into hub_info structure and process if needed
+        hub_dev->usb_device = usb_dev;
+
+        hub_dev->ports = NULL;
+        hub_dev->port_count = -1;
+        hub_dev->pending_ops_count = 0;
+        hub_dev->running = false;
+        fibril_mutex_initialize(&hub_dev->pending_ops_mutex);
+        fibril_condvar_initialize(&hub_dev->pending_ops_cv);
+        usb_dev->driver_data = hub_dev;
+
+        return hub_dev;
+}
+/*----------------------------------------------------------------------------*/
+/**
+ * Load hub-specific information into hub_dev structure and process if needed
  *
  * Read port count and initialize structures holding per port information.
@@ -267 +267 @@
  * This function is hub-specific and should be run only after the hub is
  * configured using usb_set_first_configuration function.
- * @param hub_info hub representation
+ * @param hub_dev hub representation
  * @return error code
  */
-static int usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_info)
-{
-        assert(hub_info);
+static int usb_hub_process_hub_specific_info(usb_hub_dev_t *hub_dev)
+{
+        assert(hub_dev);
 
         /* Get hub descriptor. */
         usb_log_debug("Retrieving descriptor\n");
-        usb_pipe_t *control_pipe = &hub_info->usb_device->ctrl_pipe;
+        usb_pipe_t *control_pipe = &hub_dev->usb_device->ctrl_pipe;
 
         usb_hub_descriptor_header_t descriptor;
@@ -291 +291 @@
 
         usb_log_debug("Setting port count to %d.\n", descriptor.port_count);
-        hub_info->port_count = descriptor.port_count;
+        hub_dev->port_count = descriptor.port_count;
 
         // TODO: +1 hack is no longer necessary
-        hub_info->ports =
-            calloc(hub_info->port_count + 1, sizeof(usb_hub_port_t));
-        if (!hub_info->ports) {
+        hub_dev->ports =
+            calloc(hub_dev->port_count + 1, sizeof(usb_hub_port_t));
+        if (!hub_dev->ports) {
                 return ENOMEM;
         }
 
-        for (size_t port = 1; port < hub_info->port_count + 1; ++port) {
-                usb_hub_port_init(&hub_info->ports[port], port, control_pipe);
+        for (size_t port = 1; port < hub_dev->port_count + 1; ++port) {
+                usb_hub_port_init(&hub_dev->ports[port], port, control_pipe);
         }
 
@@ -311 +311 @@
                     & HUB_CHAR_POWER_PER_PORT_FLAG;
 
-                for (size_t port = 1; port <= hub_info->port_count; ++port) {
+                for (size_t port = 1; port <= hub_dev->port_count; ++port) {
                         usb_log_debug("Powering port %zu.\n", port);
                         opResult = usb_hub_port_set_feature(
-                            &hub_info->ports[port], USB_HUB_FEATURE_PORT_POWER);
+                            &hub_dev->ports[port], USB_HUB_FEATURE_PORT_POWER);
                         if (opResult != EOK) {
                                 usb_log_error("Cannot power on port %zu: %s.\n",
@@ -384 +384 @@
  *
  * This means either to power off the hub or power it on.
- * @param hub_info hub instance
+ * @param hub_dev hub instance
  * @param status hub status bitmask
  * @return error code
  */
-static void usb_hub_over_current(const usb_hub_dev_t *hub_info,
+static void usb_hub_over_current(const usb_hub_dev_t *hub_dev,
     usb_hub_status_t status)
 {
@@ -399 +399 @@
                  * ports on. */
                 size_t port;
-                for (port = 1; port <= hub_info->port_count; ++port) {
+                for (port = 1; port <= hub_dev->port_count; ++port) {
                         const int opResult = usb_hub_port_set_feature(
-                            &hub_info->ports[port], USB_HUB_FEATURE_PORT_POWER);
+                            &hub_dev->ports[port], USB_HUB_FEATURE_PORT_POWER);
                         if (opResult != EOK) {
                                 usb_log_warning(
@@ -411 +411 @@
         }
         const int opResult = usb_request_clear_feature(
-            &hub_info->usb_device->ctrl_pipe, USB_REQUEST_TYPE_CLASS,
+            &hub_dev->usb_device->ctrl_pipe, USB_REQUEST_TYPE_CLASS,
             USB_REQUEST_RECIPIENT_DEVICE,
             USB_HUB_FEATURE_C_HUB_LOCAL_POWER, 0);
@@ -425 +425 @@
  *
  * The change can be either in the over-current condition or local-power change.
- * @param hub_info hub instance
- */
-static void usb_hub_global_interrupt(const usb_hub_dev_t *hub_info)
-{
-        assert(hub_info);
-        assert(hub_info->usb_device);
+ * @param hub_dev hub instance
+ */
+static void usb_hub_global_interrupt(const usb_hub_dev_t *hub_dev)
+{
+        assert(hub_dev);
+        assert(hub_dev->usb_device);
         usb_log_debug("Global interrupt on a hub\n");
-        usb_pipe_t *control_pipe = &hub_info->usb_device->ctrl_pipe;
+        usb_pipe_t *control_pipe = &hub_dev->usb_device->ctrl_pipe;
 
         usb_hub_status_t status;
@@ -453 +453 @@
         /* Handle status changes */
         if (status & USB_HUB_STATUS_C_OVER_CURRENT) {
-                usb_hub_over_current(hub_info, status);
+                usb_hub_over_current(hub_dev, status);
         }
 
@@ -485 +485 @@
  * callback called from hub polling fibril when the fibril terminates
  *
- * Should perform a cleanup - deletes hub_info.
+ * Does not perform cleanup, just marks the hub as not running.
  * @param device usb device afected
  * @param was_error indicates that the fibril is stoped due to an error