Changeset b5111c46 in mainline for uspace/drv/bus/usb/ohci/ohci.c

Timestamp:

2014-07-23T21:38:25Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ffa96c2

Parents:

87a3df7f

Message:

Convert OHCI and UHCI away from DDF_DATA_IMPLANT.

File:

• uspace/drv/bus/usb/ohci/ohci.c (modified) (3 diffs)

uspace/drv/bus/usb/ohci/ohci.c

@@ -34 +34 @@
  */
 
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <errno.h>
 #include <str_error.h>
@@ -165 +162 @@
 
         ddf_fun_set_ops(instance->hc_fun, &hc_ops);
-        ddf_fun_data_implant(instance->hc_fun, &instance->hc);
 
         instance->rh_fun = ddf_fun_create(device, fun_inner, "ohci_rh");
@@ -214 +210 @@
         }
 
-        rc = hc_init(&instance->hc, &regs, interrupts);
+        rc = hc_init(&instance->hc, instance->hc_fun, &regs, interrupts);
         if (rc != EOK) {
                 usb_log_error("Failed to init ohci_hcd: %s.\n", str_error(rc));