Changes in uspace/drv/bus/usb/uhci/uhci.c [56fd7cf:795448f] in mainline

File:

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

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

@@ -33 +33 @@
  * @brief UHCI driver
  */
-
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <errno.h>
 #include <str_error.h>
@@ -64 +60 @@
 } uhci_t;
 
-static inline uhci_t *dev_to_uhci(ddf_dev_t *dev)
-{
-        return ddf_dev_data_get(dev);
-}
-
+static inline uhci_t * dev_to_uhci(const ddf_dev_t *dev)
+{
+        assert(dev);
+        return dev->driver_data;
+}
+/*----------------------------------------------------------------------------*/
 /** IRQ handling callback, forward status from call to diver structure.
  *
@@ -86 +83 @@
         hc_interrupt(&uhci->hc, status);
 }
-
+/*----------------------------------------------------------------------------*/
 /** Operations supported by the HC driver */
 static ddf_dev_ops_t hc_ops = {
         .interfaces[USBHC_DEV_IFACE] = &hcd_iface, /* see iface.h/c */
 };
-
+/*----------------------------------------------------------------------------*/
 /** Gets handle of the respective hc.
  *
@@ -100 +97 @@
 static int usb_iface_get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
 {
-        ddf_fun_t *hc_fun = dev_to_uhci(ddf_fun_get_dev(fun))->hc_fun;
+        assert(fun);
+        ddf_fun_t *hc_fun = dev_to_uhci(fun->dev)->hc_fun;
         assert(hc_fun);
 
         if (handle != NULL)
-                *handle = ddf_fun_get_handle(hc_fun);
+                *handle = hc_fun->handle;
         return EOK;
 }
-
+/*----------------------------------------------------------------------------*/
 /** USB interface implementation used by RH */
 static usb_iface_t usb_iface = {
         .get_hc_handle = usb_iface_get_hc_handle,
 };
-
+/*----------------------------------------------------------------------------*/
 /** Get root hub hw resources (I/O registers).
  *
@@ -120 +118 @@
 static hw_resource_list_t *get_resource_list(ddf_fun_t *fun)
 {
-        rh_t *rh = ddf_fun_data_get(fun);
+        assert(fun);
+        rh_t *rh = fun->driver_data;
         assert(rh);
         return &rh->resource_list;
 }
-
+/*----------------------------------------------------------------------------*/
 /** Interface to provide the root hub driver with hw info */
 static hw_res_ops_t hw_res_iface = {
@@ -130 +129 @@
         .enable_interrupt = NULL,
 };
-
+/*----------------------------------------------------------------------------*/
 /** RH function support for uhci_rhd */
 static ddf_dev_ops_t rh_ops = {
@@ -136 +135 @@
         .interfaces[HW_RES_DEV_IFACE] = &hw_res_iface
 };
-
+/*----------------------------------------------------------------------------*/
 /** Initialize hc and rh DDF structures and their respective drivers.
  *
@@ -161 +160 @@
 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); \
         } \
@@ -173 +174 @@
         int ret = (instance->hc_fun == NULL) ? ENOMEM : EOK;
         CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create UHCI HC function.\n");
-        ddf_fun_set_ops(instance->hc_fun, &hc_ops);
-        ddf_fun_data_implant(instance->hc_fun, &instance->hc.generic);
+        instance->hc_fun->ops = &hc_ops;
+        instance->hc_fun->driver_data = &instance->hc.generic;
 
         instance->rh_fun = ddf_fun_create(device, fun_inner, "uhci_rh");
         ret = (instance->rh_fun == NULL) ? ENOMEM : EOK;
         CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create UHCI RH function.\n");
-        ddf_fun_set_ops(instance->rh_fun, &rh_ops);
-        ddf_fun_data_implant(instance->rh_fun, &instance->rh);
+        instance->rh_fun->ops = &rh_ops;
+        instance->rh_fun->driver_data = &instance->rh;
 
         uintptr_t reg_base = 0;
@@ -189 +190 @@
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to get I/O addresses for %" PRIun ": %s.\n",
-            ddf_dev_get_handle(device), str_error(ret));
+            device->handle, str_error(ret));
         usb_log_debug("I/O regs at 0x%p (size %zu), IRQ %d.\n",
             (void *) reg_base, reg_size, irq);