Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 41c1f7b in mainline


Ignore:
Timestamp:
2011-04-07T09:03:37Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial
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:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/ohci/hc.c

    r9a7e5b4 r41c1f7b  
    183183         * maintain reset for at least the time specified in USB spec (50 ms)*/
    184184        async_usleep(50000);
     185
     186        /* turn off legacy emulation */
     187        volatile uint32_t *ohci_emulation_reg =
     188            (uint32_t*)((char*)instance->registers + 0x100);
     189        usb_log_info("OHCI legacy register status %p: %x.\n",
     190                ohci_emulation_reg, *ohci_emulation_reg);
     191        *ohci_emulation_reg = 0;
     192
    185193}
    186194/*----------------------------------------------------------------------------*/
  • uspace/lib/usb/src/host/device_keeper.c

    r9a7e5b4 r41c1f7b  
    128128                /* recipient is endpoint, value is zero (ENDPOINT_STALL) */
    129129                if (((data[0] & 0xf) == 1) && ((data[2] | data[3]) == 0)) {
     130                        link_t *current =
     131                            instance->devices[target.address].endpoints.next;
    130132                        while (current !=
    131133                           &instance->devices[target.address].endpoints)
Note: See TracChangeset for help on using the changeset viewer.