Changeset 50ba203 in mainline for uspace/drv/vhc/hub.c

Timestamp:

2011-02-20T15:46:48Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6bb83c7

Parents:

d81ef61c (diff), 0c00dac (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 with usb/development

File:

• uspace/drv/vhc/hub.c (modified) (2 diffs)

uspace/drv/vhc/hub.c

@@ -41 +41 @@
 #include <driver.h>
 #include <usb/usbdrv.h>
+#include <usb/recognise.h>
 
 #include "hub.h"
@@ -93 +94 @@
 
         devman_handle_t hub_handle;
-        usb_drv_register_child_in_devman(hc, hc_dev, hub_address, &hub_handle);
+        usb_device_register_child_in_devman(hub_address, hc_dev->handle,
+            hc_dev, &hub_handle);
+        //usb_drv_register_child_in_devman(hc, hc_dev, hub_address, &hub_handle);
         usb_drv_bind_address(hc, hub_address, hub_handle);