Changeset df40775 in mainline

Timestamp:

2011-04-04T19:38:11Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6bf9bc4

Parents:

3094804b (diff), 65369473 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Bandwidth allocator fixes

Location:

uspace

Files:

• drv/uhci-hcd/hc.c (modified) (1 diff)
• lib/usb/include/usb/host/bandwidth.h (modified) (1 diff)
• lib/usb/src/host/bandwidth.c (modified) (3 diffs)

uspace/drv/uhci-hcd/hc.c

@@ -337 +337 @@
         if (batch->transfer_type == USB_TRANSFER_INTERRUPT ||
             batch->transfer_type == USB_TRANSFER_ISOCHRONOUS) {
+                size_t bw = bandwidth_count_usb11(batch->speed,
+                    batch->transfer_type, batch->buffer_size,
+                    batch->max_packet_size);
                 int ret =
                     bandwidth_use(&instance->bandwidth, batch->target.address,
-                    batch->target.endpoint, batch->direction);
+                    batch->target.endpoint, batch->direction, bw);
                 if (ret != EOK) {
                         usb_log_warning("Failed(%d) to use reserved bw: %s.\n",

uspace/lib/usb/include/usb/host/bandwidth.h

@@ -71 +71 @@
 
 int bandwidth_use(bandwidth_t *instance, usb_address_t address,
-    usb_endpoint_t endpoint, usb_direction_t direction);
+    usb_endpoint_t endpoint, usb_direction_t direction, size_t bw);
 
 int bandwidth_free(bandwidth_t *instance, usb_address_t address,

uspace/lib/usb/src/host/bandwidth.c

@@ -66 +66 @@
         const size_t bytes =
             keys < MAX_KEYS ? keys * sizeof(unsigned long) : sizeof(transfer_t);
-        return bcmp(key, &status->transfer, bytes);
+        return bcmp(key, &status->transfer, bytes) == 0;
 }
 /*----------------------------------------------------------------------------*/
@@ -221 +221 @@
 /*----------------------------------------------------------------------------*/
 int bandwidth_use(bandwidth_t *instance, usb_address_t address,
-    usb_endpoint_t endpoint, usb_direction_t direction)
+    usb_endpoint_t endpoint, usb_direction_t direction, size_t bw)
 {
         assert(instance);
@@ -237 +237 @@
                     hash_table_get_instance(item, transfer_status_t, link);
                 assert(status);
-                if (status->used) {
-                        ret = EINPROGRESS;
+                if (status->required >= bw) {
+                        if (status->used) {
+                                ret = EINPROGRESS;
+                        }
+                        status->used = true;
+                } else {
+                        ret = ENOSPC;
                 }
-                status->used = true;
         } else {
                 ret = EINVAL;