Changeset 90994fa in mainline

Timestamp:

2011-10-12T20:03:36Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

162726b

Parents:

205f0766

Message:

usb: Hubs should store child functions not just handles.

Location:

uspace

Files:

• drv/bus/usb/uhcirh/port.c (modified) (7 diffs)
• drv/bus/usb/usbhub/port.c (modified) (5 diffs)
• drv/bus/usb/usbhub/port.h (modified) (1 diff)
• lib/usbdev/include/usb/dev/hub.h (modified) (2 diffs)
• lib/usbdev/src/hub.c (modified) (4 diffs)

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

@@ -100 +100 @@
         port->number = number;
         port->wait_period_usec = usec;
-        port->attached_device.handle = 0;
+        port->attached_device.fun = NULL;
         port->attached_device.address = -1;
         port->rh = rh;
@@ -169 +169 @@
 
                 /* Remove any old device */
-                if (instance->attached_device.handle) {
+                if (instance->attached_device.fun) {
                         usb_log_debug2("%s: Removing device.\n",
                             instance->id_string);
@@ -261 +261 @@
                 ret = usb_hc_new_device_wrapper(port->rh, &port->hc_connection,
                     speed, uhci_port_reset_enable, port->number, port,
-                    &port->attached_device.address,
-                    &port->attached_device.handle, NULL, NULL, NULL);
+                    &port->attached_device.address, NULL, NULL, NULL,
+                    &port->attached_device.fun);
         } while (ret != EOK && ++count < 4);
 
@@ -274 +274 @@
         usb_log_info("New device at port %u, address %d (handle %" PRIun ").\n",
             port->number, port->attached_device.address,
-            port->attached_device.handle);
+            port->attached_device.fun->handle);
         return EOK;
 }
@@ -287 +287 @@
         assert(port);
         /* There is nothing to remove. */
-        if (port->attached_device.handle == 0) {
+        if (port->attached_device.fun == NULL) {
                 usb_log_warning("%s: Removed a ghost device.\n",
                     port->id_string);
@@ -297 +297 @@
 
         /* Stop driver first */
-        int ret = devman_remove_function(port->attached_device.handle);
+        int ret = ddf_fun_unbind(port->attached_device.fun);
         if (ret != EOK) {
                 usb_log_error("%s: Failed to remove child function: %s.\n",
@@ -303 +303 @@
                 return ret;
         }
-        port->attached_device.handle = 0;
+        ddf_fun_destroy(port->attached_device.fun);
+        port->attached_device.fun = NULL;
 
         /* Driver stopped, free used address */

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

@@ -257 +257 @@
                 usb_log_debug("Removing device on port %zu.\n",
                     port->port_number);
-                const int ret =
-                    devman_remove_function(port->attached_device.handle);
+                const int ret = ddf_fun_unbind(port->attached_device.fun);
                 if (ret == EOK) {
+                        ddf_fun_destroy(port->attached_device.fun);
                         const int ret =
                             usb_hc_unregister_device(&hub->connection,
@@ -269 +269 @@
                         }
                 } else {
-                        usb_log_error("Failed to remove child function on port"
+                        usb_log_error("Failed to unbind child function on port"
                            " %zu: %s.\n", port->port_number, str_error(ret));
                 }
                 port->attached_device.address = -1;
-                port->attached_device.handle = 0;
+                port->attached_device.fun = NULL;
                 fibril_mutex_unlock(&port->mutex);
                 usb_log_info("Removed device on port %zu.\n",
@@ -418 +418 @@
 
         usb_address_t new_address;
-        devman_handle_t child_handle;
+        ddf_fun_t *child_fun;
 
         const int rc = usb_hc_new_device_wrapper(data->hub->usb_device->ddf_dev,
             &data->hub->connection, data->speed,
             enable_port_callback, (int) data->port->port_number,
-            data->port, &new_address, &child_handle,
-            NULL, NULL, NULL);
+            data->port, &new_address, NULL,
+            NULL, NULL, &child_fun);
 
         if (rc != EOK) {
@@ -433 +433 @@
 
         fibril_mutex_lock(&data->port->mutex);
-        data->port->attached_device.handle = child_handle;
+        data->port->attached_device.fun = child_fun;
         data->port->attached_device.address = new_address;
         fibril_mutex_unlock(&data->port->mutex);
@@ -440 +440 @@
             "address %d (handle %" PRIun ").\n",
             data->hub->usb_device->ddf_dev->name, data->port->port_number,
-            new_address, child_handle);
+            new_address, child_fun->handle);
 
 leave:

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

@@ -70 +70 @@
         assert(port);
         port->attached_device.address = -1;
-        port->attached_device.handle = 0;
+        port->attached_device.fun = NULL;
         port->port_number = port_number;
         port->control_pipe = control_pipe;

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

@@ -38 +38 @@
 #define LIBUSBDEV_HUB_H_
 
+#include <ddf/driver.h>
 #include <sys/types.h>
 #include <usb/hc.h>
@@ -55 +56 @@
         /** Device address. */
         usb_address_t address;
-        /** Devman handle of the device. */
-        devman_handle_t handle;
+        /** DDF function (external) of the device. */
+        ddf_fun_t *fun;
 } usb_hub_attached_device_t;
 

uspace/lib/usbdev/src/hub.c

@@ -105 +105 @@
         int rc = async_req_3_0(exch, DEV_IFACE_ID(USBHC_DEV_IFACE),
             IPC_M_USBHC_BIND_ADDRESS,
-            attached_device->address, attached_device->handle);
+            attached_device->address, attached_device->fun->handle);
         async_exchange_end(exch);
         
@@ -320 +320 @@
          */
         /* FIXME: create device_register that will get opened ctrl pipe. */
-        devman_handle_t child_handle;
+        ddf_fun_t *child_fun;
         rc = usb_device_register_child_in_devman(dev_addr, dev_conn.hc_handle,
-            parent, &child_handle,
-            dev_ops, new_dev_data, new_fun);
+            parent, NULL,
+            dev_ops, new_dev_data, &child_fun);
         if (rc != EOK) {
                 rc = ESTALL;
@@ -334 +334 @@
         usb_hub_attached_device_t new_device = {
                 .address = dev_addr,
-                .handle = child_handle
+                .fun = child_fun,
         };
         rc = usb_hc_register_device(&hc_conn, &new_device);
@@ -351 +351 @@
         }
         if (assigned_handle != NULL) {
-                *assigned_handle = child_handle;
+                *assigned_handle = child_fun->handle;
+        }
+        if (new_fun != NULL) {
+                *new_fun = child_fun;
         }