Changeset 5542b83 in mainline for uspace/drv/uhci-hcd/hc.c

Timestamp:

2011-04-02T15:47:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

322a8066, d8987b1

Parents:

969585f (diff), 0053fa38 (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:

Add USB bandwidth control mechanism

Use per endpoint control transfer mutex
Bandwidth control issues warnings, drivers(libusb pipe init?) need to use it first.

File:

• uspace/drv/uhci-hcd/hc.c (modified) (5 diffs)

uspace/drv/uhci-hcd/hc.c

@@ -239 +239 @@
         usb_log_debug("Initialized device manager.\n");
 
+        ret = bandwidth_init(&instance->bandwidth, BANDWIDTH_AVAILABLE_USB11,
+            bandwidth_count_usb11);
+        assert(ret == true);
+
         return EOK;
 #undef CHECK_RET_DEST_CMDS_RETURN
@@ -325 +329 @@
         if (!usb_is_allowed(
             low_speed, batch->transfer_type, batch->max_packet_size)) {
-                usb_log_warning(
-                    "Invalid USB transfer specified %s SPEED %d %zu.\n",
-                    low_speed ? "LOW" : "FULL" , batch->transfer_type,
+                usb_log_error("Invalid USB transfer specified %s %d %zu.\n",
+                    usb_str_speed(batch->speed), batch->transfer_type,
                     batch->max_packet_size);
                 return ENOTSUP;
         }
-        /* TODO: check available bandwidth here */
+        /* Check available bandwidth */
+        if (batch->transfer_type == USB_TRANSFER_INTERRUPT ||
+            batch->transfer_type == USB_TRANSFER_ISOCHRONOUS) {
+                int ret =
+                    bandwidth_use(&instance->bandwidth, batch->target.address,
+                    batch->target.endpoint, batch->direction);
+                if (ret != EOK) {
+                        usb_log_warning("Failed(%d) to use reserved bw: %s.\n",
+                            ret, str_error(ret));
+                }
+        }
 
         transfer_list_t *list =
@@ -338 +351 @@
         if (batch->transfer_type == USB_TRANSFER_CONTROL) {
                 usb_device_keeper_use_control(
-                    &instance->manager, batch->target.address);
+                    &instance->manager, batch->target);
         }
         transfer_list_add_batch(list, batch);
@@ -358 +371 @@
 {
         assert(instance);
+//      status |= 1; //Uncomment to work around qemu hang
         /* TODO: Resume interrupts are not supported */
         /* Lower 2 bits are transaction error and transaction complete */
@@ -376 +390 @@
                         usb_transfer_batch_t *batch =
                             list_get_instance(item, usb_transfer_batch_t, link);
-                        if (batch->transfer_type == USB_TRANSFER_CONTROL) {
+                        switch (batch->transfer_type)
+                        {
+                        case USB_TRANSFER_CONTROL:
                                 usb_device_keeper_release_control(
-                                    &instance->manager, batch->target.address);
+                                    &instance->manager, batch->target);
+                                break;
+                        case USB_TRANSFER_INTERRUPT:
+                        case USB_TRANSFER_ISOCHRONOUS: {
+                                int ret = bandwidth_free(&instance->bandwidth,
+                                    batch->target.address,
+                                    batch->target.endpoint,
+                                    batch->direction);
+                                if (ret != EOK)
+                                        usb_log_warning("Failed(%d) to free "
+                                            "reserved bw: %s.\n", ret,
+                                            str_error(ret));
+                                }
+                        default:
+                                break;
                         }
                         batch->next_step(batch);