Changeset cc5908e in mainline for uspace/drv/ohci/ohci.c

Timestamp:

2011-05-07T14:28:51Z (14 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

252cf2a, 68b614e

Parents:

bd2394b (diff), 7205209 (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:

Development changes merged

File:

• uspace/drv/ohci/ohci.c (modified) (4 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);
@@ -152 +153 @@
         usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",
             (void *) mem_reg_base, mem_reg_size, irq);
-
-        ret = pci_disable_legacy(device);
-        CHECK_RET_DEST_FUN_RETURN(ret,
-            "Failed(%d) to disable legacy USB: %s.\n", ret, str_error(ret));
 
         bool interrupts = false;
@@ -188 +185 @@
             "Failed(%d) to bind OHCI device function: %s.\n",
             ret, str_error(ret));
+        ret = ddf_fun_add_to_class(instance->hc_fun, USB_HC_DDF_CLASS_NAME);
+        CHECK_RET_DEST_FUN_RETURN(ret,
+            "Failed to add OHCI to HC class: %s.\n", str_error(ret));
+
 #undef CHECK_RET_HC_RETURN
 
@@ -212 +213 @@
             "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);
         return EOK;
 #undef CHECK_RET_FINI_RETURN