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

Timestamp:

2011-03-06T19:01:09Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

960bee9, c867a216

Parents:

24d5432 (diff), 8a20380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Fix toggle protocol implementation

File:

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

uspace/drv/uhci-hcd/uhci.c

@@ -167 +167 @@
         /* 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); }
+        do { async_usleep(10); }
+        while ((pio_read_16(&instance->registers->usbcmd) & UHCI_CMD_HCRESET) != 0);
 
         /* set framelist pointer */
@@ -175 +175 @@
 
         /* enable all interrupts, but resume interrupt */
-        pio_write_16(&instance->registers->usbintr,
-            UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
-
+//      pio_write_16(&instance->registers->usbintr,
+//          UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET);
+
+        uint16_t status = pio_read_16(&instance->registers->usbcmd);
+        usb_log_warning("Previous command value: %x.\n", status);
         /* Start the hc with large(64B) packet FSBR */
         pio_write_16(&instance->registers->usbcmd,