Changeset 90994fa in mainline for uspace/lib/usbdev/src/hub.c

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.

File:

• uspace/lib/usbdev/src/hub.c (modified) (4 diffs)

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;
         }