Changeset 56fd7cf in mainline for uspace/drv/bus/usb/uhci

Timestamp:

2012-08-17T11:37:03Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1d5a540

Parents:

be2a38ad

Message:

Make ddf_dev_t and ddf_fun_t opaque. This further tighthens the DDF interface.

Location:

uspace/drv/bus/usb/uhci

Files:

• main.c (modified) (1 diff)
• res.c (modified) (4 diffs)
• res.h (modified) (1 diff)
• uhci.c (modified) (7 diffs)

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

@@ -70 +70 @@
         } else {
                 usb_log_info("Controlling new UHCI device '%s'.\n",
-                    device->name);
+                    ddf_dev_get_name(device));
         }
 

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

@@ -51 +51 @@
  * @return Error code.
  */
-int get_my_registers(const ddf_dev_t *dev,
+int get_my_registers(ddf_dev_t *dev,
     uintptr_t *io_reg_address, size_t *io_reg_size, int *irq_no)
 {
@@ -57 +57 @@
 
         async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE, dev->handle,
-            IPC_FLAG_BLOCKING);
+            devman_parent_device_connect(EXCHANGE_SERIALIZE,
+            ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
         if (!parent_sess)
                 return ENOMEM;
@@ -92 +92 @@
  * @return Error code.
  */
-int enable_interrupts(const ddf_dev_t *device)
+int enable_interrupts(ddf_dev_t *device)
 {
         async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE, device->handle,
-            IPC_FLAG_BLOCKING);
+            devman_parent_device_connect(EXCHANGE_SERIALIZE,
+            ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
         if (!parent_sess)
                 return ENOMEM;
@@ -111 +111 @@
  * @return Error code.
  */
-int disable_legacy(const ddf_dev_t *device)
+int disable_legacy(ddf_dev_t *device)
 {
         assert(device);
 
         async_sess_t *parent_sess = devman_parent_device_connect(
-            EXCHANGE_SERIALIZE, device->handle, IPC_FLAG_BLOCKING);
+            EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
         if (!parent_sess)
                 return ENOMEM;

uspace/drv/bus/usb/uhci/res.h

@@ -38 +38 @@
 #include <ddf/driver.h>
 
-int get_my_registers(const ddf_dev_t *, uintptr_t *, size_t *, int *);
-int enable_interrupts(const ddf_dev_t *);
-int disable_legacy(const ddf_dev_t *);
+int get_my_registers(ddf_dev_t *, uintptr_t *, size_t *, int *);
+int enable_interrupts(ddf_dev_t *);
+int disable_legacy(ddf_dev_t *);
 
 #endif

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>
@@ -60 +64 @@
 } uhci_t;
 
-static inline uhci_t * dev_to_uhci(const ddf_dev_t *dev)
-{
-        assert(dev);
-        return dev->driver_data;
+static inline uhci_t *dev_to_uhci(ddf_dev_t *dev)
+{
+        return ddf_dev_data_get(dev);
 }
 
@@ -97 +100 @@
 static int usb_iface_get_hc_handle(ddf_fun_t *fun, devman_handle_t *handle)
 {
-        assert(fun);
-        ddf_fun_t *hc_fun = dev_to_uhci(fun->dev)->hc_fun;
+        ddf_fun_t *hc_fun = dev_to_uhci(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;
 }
@@ -118 +120 @@
 static hw_resource_list_t *get_resource_list(ddf_fun_t *fun)
 {
-        assert(fun);
-        rh_t *rh = fun->driver_data;
+        rh_t *rh = ddf_fun_data_get(fun);
         assert(rh);
         return &rh->resource_list;
@@ -160 +161 @@
 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); \
         } \
@@ -174 +173 @@
         int ret = (instance->hc_fun == NULL) ? ENOMEM : EOK;
         CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create UHCI HC function.\n");
-        instance->hc_fun->ops = &hc_ops;
-        instance->hc_fun->driver_data = &instance->hc.generic;
+        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");
         ret = (instance->rh_fun == NULL) ? ENOMEM : EOK;
         CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create UHCI RH function.\n");
-        instance->rh_fun->ops = &rh_ops;
-        instance->rh_fun->driver_data = &instance->rh;
+        ddf_fun_set_ops(instance->rh_fun, &rh_ops);
+        ddf_fun_data_implant(instance->rh_fun, &instance->rh);
 
         uintptr_t reg_base = 0;
@@ -190 +189 @@
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to get I/O addresses for %" PRIun ": %s.\n",
-            device->handle, str_error(ret));
+            ddf_dev_get_handle(device), str_error(ret));
         usb_log_debug("I/O regs at 0x%p (size %zu), IRQ %d.\n",
             (void *) reg_base, reg_size, irq);