Changeset 4f66cc7b in mainline for uspace/drv/ehci-hcd/pci.c


Ignore:
Timestamp:
2011-03-17T12:45:23Z (13 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade
Children:
4fec9ee, 6e3b9a58
Parents:
45dd8bf (diff), 039c66c (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:

Merged development changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/ehci-hcd/pci.c

    r45dd8bf r4f66cc7b  
    247247
    248248
    249         if ((value & USBLEGSUP_BIOS_CONTROL) != 0) {
     249        if ((value & USBLEGSUP_BIOS_CONTROL) == 0) {
    250250                usb_log_info("BIOS released control after %d usec.\n", wait);
    251251        } else {
    252252                /* BIOS failed to hand over control, this should not happen. */
    253                 usb_log_warning( "BIOS failed to release control after"
     253                usb_log_warning( "BIOS failed to release control after "
    254254                    "%d usecs, force it.\n", wait);
    255255                ret = async_req_3_0(parent_phone, DEV_IFACE_ID(PCI_DEV_IFACE),
     
    258258                CHECK_RET_HANGUP_RETURN(ret,
    259259                    "Failed(%d) to force OS EHCI control.\n", ret);
    260                 /* TODO: This does not seem to work on my machine */
    261260        }
    262261
     
    280279        usb_log_debug2("USBLEGSUP: %x.\n", value);
    281280
    282 /*
    283  * TURN OFF EHCI FOR NOW, REMOVE IF THE DRIVER IS IMPLEMENTED
    284  */
     281        /*
     282         * TURN OFF EHCI FOR NOW, DRIVER WILL REINITIALIZE IT
     283        */
    285284
    286285        /* Get size of capability registers in memory space. */
Note: See TracChangeset for help on using the changeset viewer.