Changeset eb292a0 in mainline

Timestamp:

2011-02-26T02:08:50Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0063838

Parents:

86c2ccd

Message:

Reset whole hc during initialization

Increase debug level of hw interrupt messages
use better error values for transfer_descriptor

Location:

uspace/drv/uhci-hcd

Files:

• uhci.c (modified) (3 diffs)
• uhci_struct/transfer_descriptor.c (modified) (1 diff)

uspace/drv/uhci-hcd/uhci.c

@@ -153 +153 @@
 void uhci_init_hw(uhci_t *instance)
 {
-        /* reset hc, who knows what touched it before us */
+        /* reset everything, who knows what touched it before us */
         pio_write_16(&instance->registers->usbcmd, UHCI_CMD_GLOBAL_RESET);
         async_usleep(10000); /* 10ms according to USB spec */
         pio_write_16(&instance->registers->usbcmd, 0);
+
+        /* reset hc, all states and counters */
+        pio_write_16(&instance->registers->usbcmd, UHCI_CMD_HCRESET);
+        while ((pio_read_16(&instance->registers->usbcmd) & UHCI_CMD_HCRESET) != 0)
+                { async_usleep(10); }
 
         /* set framelist pointer */
@@ -284 +289 @@
         if ((status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) == 0)
                 return;
-        usb_log_debug("UHCI interrupt: %X.\n", status);
+        usb_log_debug2("UHCI interrupt: %X.\n", status);
         transfer_list_remove_finished(&instance->transfers_interrupt);
         transfer_list_remove_finished(&instance->transfers_control_slow);
@@ -299 +304 @@
         while (1) {
                 uint16_t status = pio_read_16(&instance->registers->usbsts);
-                usb_log_debug("UHCI status: %x.\n", status);
+                usb_log_debug2("UHCI status: %x.\n", status);
                 status |= 1;
                 uhci_interrupt(instance, status);

uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c

@@ -77 +77 @@
 
         if ((instance->status & TD_STATUS_ERROR_STALLED) != 0)
-                return EIO;
+                return ESTALL;
 
         if ((instance->status & TD_STATUS_ERROR_CRC) != 0)
-                return EAGAIN;
+                return EBADCHECKSUM;
 
         if ((instance->status & TD_STATUS_ERROR_BUFFER) != 0)