Changeset 1866945 in mainline for uspace/drv/ohci/main.c

Timestamp:

2011-05-07T13:47:48Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

4d20ef7

Parents:

95285378 (diff), 6fb003e (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/ohci/main.c (modified) (2 diffs)

uspace/drv/ohci/main.c

@@ -75 +75 @@
                 return ret;
         }
-        device->driver_data = ohci;
+//      device->driver_data = ohci;
+        hc_register_hub(&ohci->hc, ohci->rh_fun);
 
         usb_log_info("Controlling new OHCI device `%s'.\n", device->name);
@@ -93 +94 @@
 {
         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
-        sleep(5);
         return ddf_driver_main(&ohci_driver);
 }