Changes in uspace/drv/uhci-hcd/hc.c [27205841:ea993d18] in mainline

File:

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

uspace/drv/uhci-hcd/hc.c

@@ -247 +247 @@
 {
         assert(instance);
-#define SETUP_TRANSFER_LIST(type, name) \
-do { \
-        int ret = transfer_list_init(&instance->transfers_##type, name); \
+#define CHECK_RET_CLEAR_RETURN(ret, message...) \
         if (ret != EOK) { \
-                usb_log_error("Failed(%d) to setup %s transfer list: %s.\n", \
-                    ret, name, str_error(ret)); \
+                usb_log_error(message); \
                 transfer_list_fini(&instance->transfers_bulk_full); \
                 transfer_list_fini(&instance->transfers_control_full); \
@@ -258 +255 @@
                 transfer_list_fini(&instance->transfers_interrupt); \
                 return ret; \
-        } \
-} while (0)
-
-        SETUP_TRANSFER_LIST(bulk_full, "BULK FULL");
-        SETUP_TRANSFER_LIST(control_full, "CONTROL FULL");
-        SETUP_TRANSFER_LIST(control_slow, "CONTROL LOW");
-        SETUP_TRANSFER_LIST(interrupt, "INTERRUPT");
-#undef SETUP_TRANSFER_LIST
-        /* Connect lists into one schedule */
+        } else (void) 0
+
+        /* initialize TODO: check errors */
+        int ret;
+        ret = transfer_list_init(&instance->transfers_bulk_full, "BULK_FULL");
+        CHECK_RET_CLEAR_RETURN(ret, "Failed to init BULK list.");
+
+        ret = transfer_list_init(
+            &instance->transfers_control_full, "CONTROL_FULL");
+        CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL FULL list.");
+
+        ret = transfer_list_init(
+            &instance->transfers_control_slow, "CONTROL_SLOW");
+        CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL SLOW list.");
+
+        ret = transfer_list_init(&instance->transfers_interrupt, "INTERRUPT");
+        CHECK_RET_CLEAR_RETURN(ret, "Failed to init INTERRUPT list.");
+
         transfer_list_set_next(&instance->transfers_control_full,
                 &instance->transfers_bulk_full);
@@ -331 +337 @@
         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 */
-        if (status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) {
+        if (status & 0x3) {
                 LIST_INITIALIZE(done);
                 transfer_list_remove_finished(
@@ -351 +358 @@
                 }
         }
-        /* Resume interrupts are not supported */
-
-        /* Bits 4 and 5 indicate hc error */
-        if (status & (UHCI_STATUS_PROCESS_ERROR | UHCI_STATUS_SYSTEM_ERROR)) {
+        /* bits 4 and 5 indicate hc error */
+        if (status & 0x18) {
                 usb_log_error("UHCI hardware failure!.\n");
                 ++instance->hw_failures;
@@ -384 +389 @@
 
         while (1) {
-                /* Readd and clear status register */
+                /* read and ack interrupts */
                 uint16_t status = pio_read_16(&instance->registers->usbsts);
-                pio_write_16(&instance->registers->usbsts, status);
+                pio_write_16(&instance->registers->usbsts, 0x1f);
                 if (status != 0)
                         usb_log_debug2("UHCI status: %x.\n", status);
                 hc_interrupt(instance, status);
-                async_usleep(UHCI_INT_EMULATOR_TIMEOUT);
+                async_usleep(UHCI_CLEANER_TIMEOUT);
         }
         return EOK;