Changeset 9348862 in mainline

Timestamp:

2013-09-21T00:43:24Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

4cf5b8e0

Parents:

3f03199

Message:

usb: Move HC driver implementation functions to a separate structure.

Location:

uspace

Files:

• drv/bus/usb/ohci/hc.c (modified) (1 diff)
• drv/bus/usb/ohci/ohci.c (modified) (2 diffs)
• drv/bus/usb/ohci/ohci_endpoint.c (modified) (2 diffs)
• drv/bus/usb/uhci/hc.c (modified) (1 diff)
• drv/bus/usb/uhci/uhci.c (modified) (1 diff)
• drv/bus/usb/vhc/transfer.c (modified) (1 diff)
• lib/usbhost/include/usb/host/hcd.h (modified) (3 diffs)
• lib/usbhost/src/hcd.c (modified) (5 diffs)

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

@@ -296 +296 @@
 {
         assert(hcd);
-        hc_t *instance = hcd->private_data;
+        hc_t *instance = hcd->driver.data;
         assert(instance);
 

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

@@ -58 +58 @@
         assert(dev);
         hcd_t *hcd = dev_to_hcd(dev);
-        if (!hcd || !hcd->private_data) {
+        if (!hcd || !hcd->driver.data) {
                 usb_log_warning("Interrupt on device that is not ready.\n");
                 return;
@@ -64 +64 @@
 
         const uint16_t status = IPC_GET_ARG1(*call);
-        hc_interrupt(hcd->private_data, status);
+        hc_interrupt(hcd->driver.data, status);
 }
 

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

@@ -90 +90 @@
         endpoint_set_hc_data(
             ep, ohci_ep, ohci_ep_toggle_get, ohci_ep_toggle_set);
-        hc_enqueue_endpoint(hcd->private_data, ep);
+        hc_enqueue_endpoint(hcd->driver.data, ep);
         return EOK;
 }
@@ -104 +104 @@
         assert(ep);
         ohci_endpoint_t *instance = ohci_endpoint_get(ep);
-        hc_dequeue_endpoint(hcd->private_data, ep);
+        hc_dequeue_endpoint(hcd->driver.data, ep);
         if (instance) {
                 free32(instance->ed);

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

@@ -444 +444 @@
 {
         assert(hcd);
-        hc_t *instance = hcd->private_data;
+        hc_t *instance = hcd->driver.data;
         assert(instance);
         assert(batch);

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

@@ -57 +57 @@
         assert(dev);
         hcd_t *hcd = dev_to_hcd(dev);
-        if (!hcd || !hcd->private_data) {
+        if (!hcd || !hcd->driver.data) {
                 usb_log_error("Interrupt on not yet initialized device.\n");
                 return;
         }
         const uint16_t status = IPC_GET_ARG1(*call);
-        hc_interrupt(hcd->private_data, status);
+        hc_interrupt(hcd->driver.data, status);
 }
 

uspace/drv/bus/usb/vhc/transfer.c

@@ -167 +167 @@
         assert(hcd);
         assert(batch);
-        vhc_data_t *vhc = hcd->private_data;
+        vhc_data_t *vhc = hcd->driver.data;
         assert(vhc);
 

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

@@ -50 +50 @@
 typedef void (*ep_remove_hook_t)(hcd_t *, endpoint_t *);
 
-/** Generic host controller driver structure. */
-struct hcd {
-        /** Endpoint manager. */
-        usb_endpoint_manager_t ep_manager;
-
+typedef struct {
         /** Device specific driver data. */
-        void *private_data;
+        void *data;
         /** Transfer scheduling, implement in device driver. */
         schedule_hook_t schedule;
@@ -63 +59 @@
         /** Hook called upon removing of an endpoint. */
         ep_remove_hook_t ep_remove_hook;
+} hc_driver_t;
+
+/** Generic host controller driver structure. */
+struct hcd {
+        /** Endpoint manager. */
+        usb_endpoint_manager_t ep_manager;
+
+        /** Driver implementation */
+        hc_driver_t driver;
 };
 
@@ -72 +77 @@
 {
         assert(hcd);
-        hcd->private_data = data;
-        hcd->schedule = schedule;
-        hcd->ep_add_hook = add_hook;
-        hcd->ep_remove_hook = rem_hook;
+        hcd->driver.data = data;
+        hcd->driver.schedule = schedule;
+        hcd->driver.ep_add_hook = add_hook;
+        hcd->driver.ep_remove_hook = rem_hook;
 }
 

uspace/lib/usbhost/src/hcd.c

@@ -52 +52 @@
         assert(ep);
         assert(hcd);
-        if (hcd->ep_add_hook)
-                return hcd->ep_add_hook(hcd, ep);
+        if (hcd->driver.ep_add_hook)
+                return hcd->driver.ep_add_hook(hcd, ep);
         return EOK;
 }
@@ -66 +66 @@
         assert(ep);
         assert(hcd);
-        if (hcd->ep_remove_hook)
-                hcd->ep_remove_hook(hcd, ep);
+        if (hcd->driver.ep_remove_hook)
+                hcd->driver.ep_remove_hook(hcd, ep);
 }
 
@@ -97 +97 @@
         usb_endpoint_manager_init(&hcd->ep_manager, bandwidth, bw_count, max_speed);
 
-        hcd->private_data = NULL;
-        hcd->schedule = NULL;
-        hcd->ep_add_hook = NULL;
-        hcd->ep_remove_hook = NULL;
+        hcd->driver.data = NULL;
+        hcd->driver.schedule = NULL;
+        hcd->driver.ep_add_hook = NULL;
+        hcd->driver.ep_remove_hook = NULL;
 }
 
@@ -207 +207 @@
                 return ENOSPC;
         }
-        if (!hcd->schedule) {
+        if (!hcd->driver.schedule) {
                 usb_log_error("HCD does not implement scheduler.\n");
                 return ENOTSUP;
@@ -239 +239 @@
         }
 
-        const int ret = hcd->schedule(hcd, batch);
+        const int ret = hcd->driver.schedule(hcd, batch);
         if (ret != EOK)
                 usb_transfer_batch_destroy(batch);