Changeset 296d22fc in mainline for uspace/lib/usbhost/src/bus.c

Timestamp:

2018-01-25T02:05:57Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

fa4b12d5

Parents:

d369b3b

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-25 02:03:48)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-25 02:05:57)

Message:

usbhub: revert the runtime binding of bus methods

It was just a dead end.

File:

• uspace/lib/usbhost/src/bus.c (modified) (10 diffs)

uspace/lib/usbhost/src/bus.c

@@ -129 +129 @@
         assert(dev);
 
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(dev->bus->ops, device_enumerate);
-        if (!ops)
+        if (!dev->bus->ops->device_enumerate)
                 return ENOTSUP;
 
@@ -138 +137 @@
         device_setup_tt(dev);
 
-        const int r = ops->device_enumerate(dev);
+        const int r = dev->bus->ops->device_enumerate(dev);
         if (r)
                 return r;
@@ -208 +207 @@
         assert(dev->fun != NULL);
 
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(dev->bus->ops, device_gone);
-        const bus_ops_t *ep_ops = BUS_OPS_LOOKUP(dev->bus->ops, endpoint_unregister);
+        const bus_ops_t *ops = dev->bus->ops;
 
         /* First, block new transfers and operations. */
@@ -241 +239 @@
 
         /* Tell the HC to release its resources. */
-        if (ops)
+        if (ops->device_gone)
                 ops->device_gone(dev);
 
         /* Check whether the driver didn't forgot EP0 */
         if (dev->endpoints[0]) {
-                if (ep_ops)
-                        ep_ops->endpoint_unregister(dev->endpoints[0]);
+                if (ops->endpoint_unregister)
+                        ops->endpoint_unregister(dev->endpoints[0]);
                 /* Release the EP0 bus reference */
                 endpoint_del_ref(dev->endpoints[0]);
@@ -271 +269 @@
 
         /* First, tell the HC driver. */
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(dev->bus->ops, device_online);
-        if (ops && (rc = ops->device_online(dev))) {
+        const bus_ops_t *ops = dev->bus->ops;
+        if (ops->device_online && (rc = ops->device_online(dev))) {
                 usb_log_warning("Host controller failed to make device '%s' online: %s",
                     ddf_fun_get_name(dev->fun), str_error(rc));
@@ -329 +327 @@
 
         /* Tell also the HC driver. */
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(dev->bus->ops, device_offline);
-        if (ops)
+        const bus_ops_t *ops = dev->bus->ops;
+        if (ops->device_offline)
                 ops->device_offline(dev);
 
@@ -365 +363 @@
         bus_t *bus = device->bus;
 
-        const bus_ops_t *register_ops = BUS_OPS_LOOKUP(bus->ops, endpoint_register);
-        if (!register_ops)
+        if (!bus->ops->endpoint_register)
                 return ENOTSUP;
 
-        const bus_ops_t *create_ops = BUS_OPS_LOOKUP(bus->ops, endpoint_create);
         endpoint_t *ep;
-        if (create_ops) {
-                ep = create_ops->endpoint_create(device, desc);
+        if (bus->ops->endpoint_create) {
+                ep = bus->ops->endpoint_create(device, desc);
                 if (!ep)
                         return ENOMEM;
@@ -410 +406 @@
                 err = EEXIST;
         } else {
-                err = register_ops->endpoint_register(ep);
+                err = bus->ops->endpoint_register(ep);
                 if (!err)
                         device->endpoints[idx] = ep;
@@ -480 +476 @@
         bus_t *bus = device->bus;
 
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, endpoint_unregister);
-        if (!ops)
+        if (!bus->ops->endpoint_unregister)
                 return ENOTSUP;
 
@@ -496 +491 @@
 
         fibril_mutex_lock(&device->guard);
-        ops->endpoint_unregister(ep);
+        bus->ops->endpoint_unregister(ep);
         device->endpoints[idx] = NULL;
         fibril_mutex_unlock(&device->guard);