Changes in uspace/drv/bus/usb/uhci/uhci.c [8820544:5b89d43b] in mainline

File:

• uspace/drv/bus/usb/uhci/uhci.c (modified) (8 diffs)

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

@@ -34 +34 @@
  */
 
+/* XXX Fix this */
+#define _DDF_DATA_IMPLANT
+
 #include <errno.h>
 #include <stdbool.h>
@@ -59 +62 @@
         hc_t hc;
         /** Internal driver's representation of UHCI root hub */
-        rh_t *rh;
+        rh_t rh;
 } uhci_t;
 
@@ -69 +72 @@
 /** IRQ handling callback, forward status from call to diver structure.
  *
+ * @param[in] dev DDF instance of the device to use.
  * @param[in] iid (Unused).
  * @param[in] call Pointer to the call from kernel.
- * @param[in] dev DDF instance of the device to use.
- *
- */
-static void irq_handler(ipc_callid_t iid, ipc_call_t *call, ddf_dev_t *dev)
+ */
+static void irq_handler(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *call)
 {
         assert(dev);
-        
         uhci_t *uhci = dev_to_uhci(dev);
         if (!uhci) {
@@ -83 +84 @@
                 return;
         }
-        
         const uint16_t status = IPC_GET_ARG1(*call);
         hc_interrupt(&uhci->hc, status);
@@ -186 +186 @@
 
         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");
@@ -195 +196 @@
 
         ddf_fun_set_ops(instance->rh_fun, &rh_ops);
-        instance->rh = ddf_fun_data_alloc(instance->rh_fun, sizeof(rh_t));
+        ddf_fun_data_implant(instance->rh_fun, &instance->rh);
 
         addr_range_t regs;
@@ -235 +236 @@
         }
 
-        rc = hc_init(&instance->hc, instance->hc_fun, &regs, interrupts);
+        rc = hc_init(&instance->hc, &regs, interrupts);
         if (rc != EOK) {
                 usb_log_error("Failed to init uhci_hcd: %s.\n", str_error(rc));
@@ -259 +260 @@
         }
 
-        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",