Changeset 41c1f7b in mainline

Timestamp:

2011-04-07T09:03:37Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

97ab321, a82889e

Parents:

9a7e5b4 (diff), 049eb87 (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:

Compile fix and OHCI legacy emulation

Location:

uspace

Files:

• drv/ohci/hc.c (modified) (1 diff)
• lib/usb/src/host/device_keeper.c (modified) (1 diff)

uspace/drv/ohci/hc.c

@@ -183 +183 @@
          * maintain reset for at least the time specified in USB spec (50 ms)*/
         async_usleep(50000);
+
+        /* turn off legacy emulation */
+        volatile uint32_t *ohci_emulation_reg =
+            (uint32_t*)((char*)instance->registers + 0x100);
+        usb_log_info("OHCI legacy register status %p: %x.\n",
+                ohci_emulation_reg, *ohci_emulation_reg);
+        *ohci_emulation_reg = 0;
+
 }
 /*----------------------------------------------------------------------------*/

uspace/lib/usb/src/host/device_keeper.c

@@ -128 +128 @@
                 /* recipient is endpoint, value is zero (ENDPOINT_STALL) */
                 if (((data[0] & 0xf) == 1) && ((data[2] | data[3]) == 0)) {
+                        link_t *current =
+                            instance->devices[target.address].endpoints.next;
                         while (current !=
                            &instance->devices[target.address].endpoints)