Changeset b5111c46 in mainline for uspace/drv/bus/usb/uhci/uhci.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/uhci/uhci.c (modified) (6 diffs)

uspace/drv/bus/usb/uhci/uhci.c

@@ -34 +34 @@
  */
 
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <errno.h>
 #include <stdbool.h>
@@ -62 +59 @@
         hc_t hc;
         /** Internal driver's representation of UHCI root hub */
-        rh_t rh;
+        rh_t *rh;
 } uhci_t;
 
@@ -186 +183 @@
 
         ddf_fun_set_ops(instance->hc_fun, &hc_ops);
-        ddf_fun_data_implant(instance->hc_fun, &instance->hc.generic);
 
         instance->rh_fun = ddf_fun_create(device, fun_inner, "uhci_rh");
@@ -196 +192 @@
 
         ddf_fun_set_ops(instance->rh_fun, &rh_ops);
-        ddf_fun_data_implant(instance->rh_fun, &instance->rh);
+        instance->rh = ddf_fun_data_alloc(instance->rh_fun, sizeof(rh_t));
 
         addr_range_t regs;
@@ -236 +232 @@
         }
 
-        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 uhci_hcd: %s.\n", str_error(rc));
@@ -260 +256 @@
         }
 
-        rc = rh_init(&instance->rh, instance->rh_fun, &regs, 0x10, 4);
+        rc = rh_init(instance->rh, instance->rh_fun, &regs, 0x10, 4);
         if (rc != EOK) {
                 usb_log_error("Failed to setup UHCI root hub: %s.\n",