Changeset b5f813c in mainline for uspace/lib/usbhost/src/hcd.c

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/src/hcd.c (modified) (6 diffs)

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