Changeset 15d0046 in mainline for uspace/drv/bus/usb/uhci/uhci.c

Timestamp:

2014-09-12T13:22:33Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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:

Merge mainline changes

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>
@@ -62 +59 @@
         hc_t hc;
         /** Internal driver's representation of UHCI root hub */
-        rh_t rh;
+        rh_t *rh;
 } uhci_t;
 
@@ -72 +69 @@
 /** 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.
- */
-static void irq_handler(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *call)
+ * @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)
 {
         assert(dev);
+        
         uhci_t *uhci = dev_to_uhci(dev);
         if (!uhci) {
@@ -84 +83 @@
                 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");
@@ -196 +195 @@
 
         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 +235 @@
         }
 
-        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 +259 @@
         }
 
-        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",