Changeset b5f813c in mainline for uspace/lib

Timestamp:

2015-07-04T03:28:02Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

55346870

Parents:

2dbfe44

Message:

libusbhost,ehci,ohci,uhci,vhc: Pass ops structure instead of function pointers to intialization

Location:

uspace/lib/usbhost

Files:

• include/usb/host/ddf_helpers.h (modified) (1 diff)
• include/usb/host/hcd.h (modified) (4 diffs)
• src/ddf_helpers.c (modified) (4 diffs)
• src/hcd.c (modified) (6 diffs)

uspace/lib/usbhost/include/usb/host/ddf_helpers.h

@@ -51 +51 @@
 
 typedef struct {
-        hc_driver_t ops;
+        hcd_ops_t ops;
         claim_t claim;
         usb_speed_t hc_speed;

uspace/lib/usbhost/include/usb/host/hcd.h

@@ -55 +55 @@
 
 typedef struct {
-        /** Device specific driver data. */
-        void *data;
         /** Transfer scheduling, implement in device driver. */
         schedule_hook_t schedule;
@@ -67 +65 @@
         /** Periodic polling hook */
         status_hook_t status_hook;
-} hc_driver_t;
+} hcd_ops_t;
 
 /** Generic host controller driver structure. */
@@ -74 +72 @@
         usb_bus_t bus;
 
-        /** Driver implementation */
-        hc_driver_t driver;
-
         /** Interrupt replacement fibril */
         fid_t polling_fibril;
+
+        /** Driver implementation */
+        hcd_ops_t ops;
+        /** Device specific driver data. */
+        void * driver_data;
 };
 
@@ -85 +85 @@
 
 static inline void hcd_set_implementation(hcd_t *hcd, void *data,
-    schedule_hook_t schedule, ep_add_hook_t add_hook, ep_remove_hook_t rem_hook,
-    interrupt_hook_t irq_hook, status_hook_t status_hook)
+    const hcd_ops_t *ops)
 {
         assert(hcd);
-        hcd->driver.data = data;
-        hcd->driver.schedule = schedule;
-        hcd->driver.ep_add_hook = add_hook;
-        hcd->driver.ep_remove_hook = rem_hook;
-        hcd->driver.irq_hook = irq_hook;
-        hcd->driver.status_hook = status_hook;
+        if (ops) {
+                hcd->driver_data = data;
+                hcd->ops = *ops;
+        } else {
+                memset(&hcd->ops, 0, sizeof(hcd->ops));
+        }
+}
+
+static inline void * hcd_get_driver_data(hcd_t *hcd)
+{
+        assert(hcd);
+        return hcd->driver_data;
 }
 

uspace/lib/usbhost/src/ddf_helpers.c

@@ -690 +690 @@
 }
 
+//TODO: Move this to generic ddf?
 int hcd_ddf_get_registers(ddf_dev_t *device, hw_res_list_parsed_t *hw_res)
 {
@@ -779 +780 @@
         assert(dev);
         hcd_t *hcd = dev_to_hcd(dev);
-        if (!hcd || !hcd->driver.irq_hook) {
+        if (!hcd || !hcd->ops.irq_hook) {
                 usb_log_error("Interrupt on not yet initialized device.\n");
                 return;
         }
         const uint32_t status = IPC_GET_ARG1(*call);
-        hcd->driver.irq_hook(hcd, status);
+        hcd->ops.irq_hook(hcd, status);
 }
 
@@ -791 +792 @@
         hcd_t *hcd = arg;
         assert(hcd);
-        if (!hcd->driver.status_hook || !hcd->driver.irq_hook)
+        if (!hcd->ops.status_hook || !hcd->ops.irq_hook)
                 return ENOTSUP;
         uint32_t status = 0;
-        while (hcd->driver.status_hook(hcd, &status) == EOK) {
-                hcd->driver.irq_hook(hcd, status);
+        while (hcd->ops.status_hook(hcd, &status) == EOK) {
+                hcd->ops.irq_hook(hcd, status);
                 status = 0;
                 /* We should wait 1 frame - 1ms here, but this polling is a
@@ -885 +886 @@
 
         /* Need working irq replacement to setup root hub */
-        if ((irq < 0) && hcd->driver.status_hook) {
+        if ((irq < 0) && hcd->ops.status_hook) {
                 hcd->polling_fibril = fibril_create(interrupt_polling, hcd);
                 if (hcd->polling_fibril == 0) {

uspace/lib/usbhost/src/hcd.c

@@ -54 +54 @@
         assert(ep);
         assert(hcd);
-        if (hcd->driver.ep_add_hook)
-                return hcd->driver.ep_add_hook(hcd, ep);
+        if (hcd->ops.ep_add_hook)
+                return hcd->ops.ep_add_hook(hcd, ep);
         return EOK;
 }
@@ -68 +68 @@
         assert(ep);
         assert(hcd);
-        if (hcd->driver.ep_remove_hook)
-                hcd->driver.ep_remove_hook(hcd, ep);
+        if (hcd->ops.ep_remove_hook)
+                hcd->ops.ep_remove_hook(hcd, ep);
 }
 
@@ -99 +99 @@
         usb_bus_init(&hcd->bus, bandwidth, bw_count, max_speed);
 
-        hcd->driver.data = NULL;
-        hcd->driver.schedule = NULL;
-        hcd->driver.ep_add_hook = NULL;
-        hcd->driver.ep_remove_hook = NULL;
+        hcd_set_implementation(hcd, NULL, NULL);
 }
 
@@ -127 +124 @@
         assert(hcd);
         usb_address_t address = 0;
-        return usb_bus_request_address(
-            &hcd->bus, &address, true, speed);
+        return usb_bus_request_address(&hcd->bus, &address, true, speed);
 }
 
@@ -209 +205 @@
                 return ENOSPC;
         }
-        if (!hcd->driver.schedule) {
+        if (!hcd->ops.schedule) {
                 usb_log_error("HCD does not implement scheduler.\n");
                 return ENOTSUP;
@@ -241 +237 @@
         }
 
-        const int ret = hcd->driver.schedule(hcd, batch);
+        const int ret = hcd->ops.schedule(hcd, batch);
         if (ret != EOK)
                 usb_transfer_batch_destroy(batch);