Changeset 86c2ccd in mainline for uspace/drv/uhci-hcd/uhci.c

Timestamp:

2011-02-26T01:25:28Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

eb292a0

Parents:

c3ae877

Message:

Fixes

Fixed: infinite loop in device_keeper
Fixed: assertion fail in device_keeper
Fixed: Callback on batches after releasing transfer_list mutex
Fixed: debug output in pci.c

File:

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

uspace/drv/uhci-hcd/uhci.c

@@ -285 +285 @@
                 return;
         usb_log_debug("UHCI interrupt: %X.\n", status);
-        transfer_list_check(&instance->transfers_interrupt);
-        transfer_list_check(&instance->transfers_control_slow);
-        transfer_list_check(&instance->transfers_control_full);
-        transfer_list_check(&instance->transfers_bulk_full);
+        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);
 }
 /*----------------------------------------------------------------------------*/
@@ -297 +297 @@
         assert(instance);
 
-        while(1) {
+        while (1) {
                 uint16_t status = pio_read_16(&instance->registers->usbsts);
                 usb_log_debug("UHCI status: %x.\n", status);
@@ -303 +303 @@
                 uhci_interrupt(instance, status);
                 pio_write_16(&instance->registers->usbsts, 0x1f);
-                async_usleep(UHCI_CLEANER_TIMEOUT * 1000);
+                async_usleep(UHCI_CLEANER_TIMEOUT * 5);
         }
         return EOK;