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

File:

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

uspace/drv/uhci-hcd/hc.c

@@ -223 +223 @@
         ret = instance ? EOK : ENOMEM;
         CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to get frame list page.\n");
-        usb_log_debug("Initialized frame list at %p.\n", instance->frame_list);
+        usb_log_debug("Initialized frame list.\n");
 
         /* Set all frames to point to the first queue head */
@@ -336 +336 @@
             instance->transfers[batch->speed][batch->transfer_type];
         assert(list);
-        if (batch->transfer_type == USB_TRANSFER_CONTROL) {
-                usb_device_keeper_use_control(
-                    &instance->manager, batch->target.address);
-        }
         transfer_list_add_batch(list, batch);
 
@@ -361 +357 @@
         /* Lower 2 bits are transaction error and transaction complete */
         if (status & 0x3) {
-                LIST_INITIALIZE(done);
-                transfer_list_remove_finished(
-                    &instance->transfers_interrupt, &done);
-                transfer_list_remove_finished(
-                    &instance->transfers_control_slow, &done);
-                transfer_list_remove_finished(
-                    &instance->transfers_control_full, &done);
-                transfer_list_remove_finished(
-                    &instance->transfers_bulk_full, &done);
-
-                while (!list_empty(&done)) {
-                        link_t *item = done.next;
-                        list_remove(item);
-                        usb_transfer_batch_t *batch =
-                            list_get_instance(item, usb_transfer_batch_t, link);
-                        if (batch->transfer_type == USB_TRANSFER_CONTROL) {
-                                usb_device_keeper_release_control(
-                                    &instance->manager, batch->target.address);
-                        }
-                        batch->next_step(batch);
-                }
+                transfer_list_remove_finished(&instance->transfers_interrupt);
+                transfer_list_remove_finished(&instance->transfers_control_slow);
+                transfer_list_remove_finished(&instance->transfers_control_full);
+                transfer_list_remove_finished(&instance->transfers_bulk_full);
         }
         /* bits 4 and 5 indicate hc error */