Changeset 5f0b366 in mainline for uspace/lib/usbhost/src/usb2_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:

b357377

Parents:

e8277c0

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-24 19:34:07)

git-committer:

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

Message:

usbhost: prepare bandwidth accounting privatization to usb2_bus

The endpoint does not account the bandwidth by default. The next step is
moving the count_bw callback to the usb2 bus.

File:

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

uspace/lib/usbhost/src/usb2_bus.c

@@ -210 +210 @@
 
 /**
+ * Call the bus operation to count bandwidth.
+ *
+ * @param ep Endpoint on which the transfer will take place.
+ * @param size The payload size.
+ */
+static ssize_t endpoint_count_bw(endpoint_t *ep)
+{
+        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);
+}
+
+/**
  * Register an endpoint to the bus. Reserves bandwidth.
  */
@@ -218 +236 @@
         assert(ep);
 
+        size_t bw = endpoint_count_bw(ep);
+
         /* Check for available bandwidth */
-        if (ep->bandwidth > bus->free_bw)
+        if (bw > bus->free_bw)
                 return ENOSPC;
 
-        bus->free_bw -= ep->bandwidth;
+        bus->free_bw -= bw;
 
         return EOK;
@@ -235 +255 @@
         assert(ep);
 
-        bus->free_bw += ep->bandwidth;
+        bus->free_bw += endpoint_count_bw(ep);
 }