Changeset 296d22fc in mainline for uspace/lib/usbhost/src/usb_transfer_batch.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/usb_transfer_batch.c (modified) (4 diffs)

uspace/lib/usbhost/src/usb_transfer_batch.c

@@ -54 +54 @@
 
         bus_t *bus = endpoint_get_bus(ep);
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, batch_create);
 
-        if (!ops) {
+        if (!bus->ops->batch_create) {
                 usb_transfer_batch_t *batch = calloc(1, sizeof(usb_transfer_batch_t));
                 if (!batch)
@@ -64 +63 @@
         }
 
-        return ops->batch_create(ep);
+        return bus->ops->batch_create(ep);
 }
 
@@ -87 +86 @@
 
         bus_t *bus = endpoint_get_bus(batch->ep);
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, batch_destroy);
+        endpoint_t *ep = batch->ep;
 
-        /* Batch reference */
-        endpoint_del_ref(batch->ep);
-
-        if (ops) {
+        if (bus->ops) {
                 usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " destroying.",
                     batch, USB_TRANSFER_BATCH_ARGS(*batch));
-                ops->batch_destroy(batch);
+                bus->ops->batch_destroy(batch);
         }
         else {
@@ -102 +98 @@
                 free(batch);
         }
+
+        /* Batch reference */
+        endpoint_del_ref(ep);
 }