Changes in uspace/drv/uhci-hcd/hc.c [d527a4e:1585c7e] in mainline

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 == EOK);
-
         return EOK;
 #undef CHECK_RET_DEST_CMDS_RETURN
@@ -329 +325 @@
         if (!usb_is_allowed(
             low_speed, batch->transfer_type, batch->max_packet_size)) {
-                usb_log_error("Invalid USB transfer specified %s %d %zu.\n",
-                    usb_str_speed(batch->speed), batch->transfer_type,
+                usb_log_warning(
+                    "Invalid USB transfer specified %s SPEED %d %zu.\n",
+                    low_speed ? "LOW" : "FULL" , batch->transfer_type,
                     batch->max_packet_size);
                 return ENOTSUP;
         }
-        /* 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));
-                }
-        }
+        /* TODO: check available bandwidth here */
 
         transfer_list_t *list =
@@ -351 +338 @@
         if (batch->transfer_type == USB_TRANSFER_CONTROL) {
                 usb_device_keeper_use_control(
-                    &instance->manager, batch->target);
+                    &instance->manager, batch->target.address);
         }
         transfer_list_add_batch(list, batch);
@@ -371 +358 @@
 {
         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 */
@@ -390 +376 @@
                         usb_transfer_batch_t *batch =
                             list_get_instance(item, usb_transfer_batch_t, link);
-                        switch (batch->transfer_type)
-                        {
-                        case USB_TRANSFER_CONTROL:
+                        if (batch->transfer_type == USB_TRANSFER_CONTROL) {
                                 usb_device_keeper_release_control(
-                                    &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;
+                                    &instance->manager, batch->target.address);
                         }
                         batch->next_step(batch);