Changeset d15809b4 in mainline for uspace/drv/uhci-rhd/port.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/uhci-rhd/port.c (modified) (2 diffs)

uspace/drv/uhci-rhd/port.c

@@ -33 +33 @@
  */
 #include <errno.h>
+#include <str_error.h>
 
 #include <usb/usb.h>    /* usb_address_t */
 #include <usb/usbdrv.h> /* usb_drv_*     */
 #include <usb/debug.h>
+#include <usb/recognise.h>
 
 #include "port.h"
@@ -204 +206 @@
         assert(port->attached_device == 0);
 
-        ret = usb_drv_register_child_in_devman(port->hc_phone, port->rh,
-          usb_address, &port->attached_device);
-
+        devman_handle_t hc_handle;
+        ret = usb_drv_find_hc(port->rh, &hc_handle);
+        if (ret != EOK) {
+                usb_log_error("Failed to get handle of host controller: %s.\n",
+                    str_error(ret));
+                uhci_port_set_enabled(port, false);
+                return ENOMEM;
+        }
+
+        ret = usb_device_register_child_in_devman(usb_address, hc_handle,
+            port->rh, &port->attached_device);
         if (ret != EOK) { /* something went wrong */
                 usb_log_error("Failed(%d) in usb_drv_register_child.\n", ret);