Changeset d15809b4 in mainline for uspace/drv/usbhub/usbhub.c

Timestamp:

2011-02-14T10:14:31Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

962ce100

Parents:

0d36c20 (diff), 45c01a1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

File:

• uspace/drv/usbhub/usbhub.c (modified) (2 diffs)

uspace/drv/usbhub/usbhub.c

@@ -36 +36 @@
 #include <bool.h>
 #include <errno.h>
+#include <str_error.h>
 
 #include <usb_iface.h>
 #include <usb/usbdrv.h>
 #include <usb/descriptor.h>
+#include <usb/recognise.h>
 #include <usb/devreq.h>
 #include <usb/classes/hub.h>
@@ -317 +319 @@
         }
 
+        devman_handle_t hc_handle;
+        opResult = usb_drv_find_hc(hub->device, &hc_handle);
+        if (opResult != EOK) {
+                usb_log_error("Failed to get handle of host controller: %s.\n",
+                    str_error(opResult));
+                return;
+        }
+
         devman_handle_t child_handle;
-        opResult = usb_drv_register_child_in_devman(hc, hub->device,
-            new_device_address, &child_handle);
+        opResult = usb_device_register_child_in_devman(new_device_address,
+            hc_handle, hub->device, &child_handle);
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_ERROR, "could not start driver for new device");