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

Timestamp:

2018-01-25T02:05:57Z (6 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/hcd.c (modified) (3 diffs)

uspace/lib/usbhost/src/hcd.c

@@ -100 +100 @@
         hc_device_t *hcd = dev_to_hcd(dev);
 
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(hcd->bus->ops, interrupt);
-        assert(ops);
-
         const uint32_t status = IPC_GET_ARG1(*call);
-        ops->interrupt(hcd->bus, status);
+        hcd->bus->ops->interrupt(hcd->bus, status);
 }
 
@@ -115 +112 @@
         assert(bus);
 
-        const bus_ops_t *interrupt_ops = BUS_OPS_LOOKUP(bus->ops, interrupt);
-        const bus_ops_t *status_ops = BUS_OPS_LOOKUP(bus->ops, status);
-        if (!interrupt_ops || !status_ops)
+        if (!bus->ops->interrupt || !bus->ops->status)
                 return ENOTSUP;
 
         uint32_t status = 0;
-        while (status_ops->status(bus, &status) == EOK) {
-                interrupt_ops->interrupt(bus, status);
+        while (bus->ops->status(bus, &status) == EOK) {
+                bus->ops->interrupt(bus, status);
                 status = 0;
                 /* We should wait 1 frame - 1ms here, but this polling is a
@@ -265 +260 @@
         }
 
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(hcd->bus->ops, status);
+        const bus_ops_t *ops = hcd->bus->ops;
 
         /* Need working irq replacement to setup root hub */
-        if (hcd->irq_cap < 0 && ops) {
+        if (hcd->irq_cap < 0 && ops->status) {
                 hcd->polling_fibril = fibril_create(interrupt_polling, hcd->bus);
                 if (!hcd->polling_fibril) {