Changeset b5f813c in mainline for uspace/lib/usbhost/include/usb/host/hcd.h

Timestamp:

2015-07-04T03:28:02Z (9 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

File:

• uspace/lib/usbhost/include/usb/host/hcd.h (modified) (4 diffs)

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