Changeset 5d07f54 in mainline for uspace/drv/ohci/ohci.c

Timestamp:

2011-05-07T11:42:34Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7ab7c7f6

Parents:

bba0dc20

Message:

Reset OHCI root hub even if taking control from SMM driver

postpone root hub registration

File:

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

uspace/drv/ohci/ohci.c

@@ -54 +54 @@
 {
         assert(dev);
+        assert(dev->driver_data);
         hc_t *hc = &((ohci_t*)dev->driver_data)->hc;
         uint16_t status = IPC_GET_ARG1(*call);
@@ -208 +209 @@
             "Failed(%d) to create root hub function.\n", ret);
 
-        hc_register_hub(&instance->hc, instance->rh_fun);
 
         instance->rh_fun->ops = &rh_ops;
         instance->rh_fun->driver_data = NULL;
-        ret = ddf_fun_bind(instance->rh_fun);
-        CHECK_RET_FINI_RETURN(ret,
-            "Failed(%d) to register OHCI root hub.\n", ret);
+        
+        device->driver_data = instance;
 
         hc_start_hw(&instance->hc);