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

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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/ohci/ohci.c (modified) (10 diffs)

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

@@ -33 +33 @@
  * @brief OHCI driver
  */
+
+/* XXX Fix this */
+#define _DDF_DATA_IMPLANT
+
 #include <errno.h>
 #include <str_error.h>
@@ -52 +56 @@
 } ohci_t;
 
-static inline ohci_t * dev_to_ohci(ddf_dev_t *dev)
-{
-        assert(dev);
-        return dev->driver_data;
+static inline ohci_t *dev_to_ohci(ddf_dev_t *dev)
+{
+        return ddf_dev_data_get(dev);
 }
 /** IRQ handling callback, identifies device
@@ -75 +78 @@
         hc_interrupt(&ohci->hc, status);
 }
-/*----------------------------------------------------------------------------*/
+
 /** Get USB address assigned to root hub.
  *
@@ -87 +90 @@
 
         if (address != NULL) {
-                *address = dev_to_ohci(fun->dev)->hc.rh.address;
+                *address = dev_to_ohci(ddf_fun_get_dev(fun))->hc.rh.address;
         }
 
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 /** Gets handle of the respective hc (this device, hc function).
  *
@@ -103 +106 @@
 {
         assert(fun);
-        ddf_fun_t *hc_fun = dev_to_ohci(fun->dev)->hc_fun;
+        ddf_fun_t *hc_fun = dev_to_ohci(ddf_fun_get_dev(fun))->hc_fun;
         assert(hc_fun);
 
         if (handle != NULL)
-                *handle = hc_fun->handle;
+                *handle = ddf_fun_get_handle(hc_fun);
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 /** Root hub USB interface */
 static usb_iface_t usb_iface = {
@@ -116 +119 @@
         .get_my_address = rh_get_my_address,
 };
-/*----------------------------------------------------------------------------*/
+
 /** Standard USB HC options (HC interface) */
 static ddf_dev_ops_t hc_ops = {
         .interfaces[USBHC_DEV_IFACE] = &hcd_iface,
 };
-/*----------------------------------------------------------------------------*/
+
 /** Standard USB RH options (RH interface) */
 static ddf_dev_ops_t rh_ops = {
         .interfaces[USB_DEV_IFACE] = &usb_iface,
 };
-/*----------------------------------------------------------------------------*/
+
 /** Initialize hc and rh ddf structures and their respective drivers.
  *
@@ -152 +155 @@
 if (ret != EOK) { \
         if (instance->hc_fun) { \
-                instance->hc_fun->driver_data = NULL; \
                 ddf_fun_destroy(instance->hc_fun); \
         } \
         if (instance->rh_fun) { \
-                instance->rh_fun->driver_data = NULL; \
                 ddf_fun_destroy(instance->rh_fun); \
         } \
@@ -167 +168 @@
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to create OHCI HC function: %s.\n", str_error(ret));
-        instance->hc_fun->ops = &hc_ops;
-        instance->hc_fun->driver_data = &instance->hc;
+        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");
@@ -174 +175 @@
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to create OHCI RH function: %s.\n", str_error(ret));
-        instance->rh_fun->ops = &rh_ops;
+        ddf_fun_set_ops(instance->rh_fun, &rh_ops);
 
         uintptr_t reg_base = 0;
@@ -183 +184 @@
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to get register memory addresses for %" PRIun ": %s.\n",
-            device->handle, str_error(ret));
+            ddf_dev_get_handle(device), str_error(ret));
         usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",
             (void *) reg_base, reg_size, irq);