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

Timestamp:

2012-08-17T11:37:03Z (14 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/ohci

Files:

• hc.c (modified) (1 diff)
• main.c (modified) (1 diff)
• ohci.c (modified) (8 diffs)
• res.c (modified) (3 diffs)
• res.h (modified) (1 diff)

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

@@ -187 +187 @@
 
         ret = usb_device_manager_bind_address(&instance->generic.dev_manager,
-            instance->rh.address, hub_fun->handle);
+            instance->rh.address, ddf_fun_get_handle(hub_fun));
         if (ret != EOK)
                 usb_log_warning("Failed to bind root hub address: %s.\n",

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

@@ -59 +59 @@
                 return ret;
         }
-        usb_log_info("Controlling new OHCI device '%s'.\n", device->name);
+        usb_log_info("Controlling new OHCI device '%s'.\n", ddf_dev_get_name(device));
 
         return EOK;

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
@@ -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;
         }
 
@@ -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;
 }
@@ -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);

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

@@ -53 +53 @@
  * @return Error code.
  */
-int get_my_registers(const ddf_dev_t *dev,
+int get_my_registers(ddf_dev_t *dev,
     uintptr_t *mem_reg_address, size_t *mem_reg_size, int *irq_no)
 {
@@ -59 +59 @@
 
         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;
@@ -94 +94 @@
  * @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;

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

@@ -37 +37 @@
 #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 get_my_registers(ddf_dev_t *, uintptr_t *, size_t *, int *);
+int enable_interrupts(ddf_dev_t *);
 
 #endif