Changeset b357377 in mainline for uspace/lib/usbhost/src/usb2_bus.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:

d369b3b

Parents:

5f0b366

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-25 01:23:20)

git-committer:

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

Message:

usbhost: make bandwidth accounting a usb2_bus-thing

File:

• uspace/lib/usbhost/src/usb2_bus.c (modified) (2 diffs)

uspace/lib/usbhost/src/usb2_bus.c

@@ -219 +219 @@
         assert(ep);
 
-        bus_t *bus = ep->device->bus;
-        const bus_ops_t *ops = BUS_OPS_LOOKUP(bus->ops, endpoint_count_bw);
-        if (!ops)
-                return 0;
-
-        return ops->endpoint_count_bw(ep, ep->max_transfer_size);
+        usb2_bus_t *bus = bus_to_usb2_bus(ep->device->bus);
+
+        return bus->bw_accounting->count_bw(ep);
 }
 
@@ -269 +266 @@
  * @param available_bandwidth Size of the bandwidth pool.
  */
-void usb2_bus_init(usb2_bus_t *bus, size_t available_bandwidth)
+void usb2_bus_init(usb2_bus_t *bus, const bandwidth_accounting_t *bw_accounting)
 {
         assert(bus);
+        assert(bw_accounting);
 
         bus_init(&bus->base, sizeof(device_t));
         bus->base.ops = &usb2_bus_ops;
 
-        bus->free_bw = available_bandwidth;
+        bus->bw_accounting = bw_accounting;
+        bus->free_bw = bw_accounting->available_bandwidth;
 
         /*