Changeset 57c0a7e in mainline

Timestamp:

2011-03-06T18:39:51Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

a60150a

Parents:

5620bd4

Message:

Refactoring

dump setup buffer on TD initialization

Location:

uspace/drv/uhci-hcd

Files:

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

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,

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

@@ -75 +75 @@
             instance->next, instance->status, instance->device,
             instance->buffer_ptr, buffer);
+        if (pid == USB_PID_SETUP) {
+                usb_log_debug("SETUP BUFFER: %s\n",
+                        usb_debug_str_buffer(buffer, 8, 8));
+        }
 }
 /*----------------------------------------------------------------------------*/