Changeset 1b0b86e6 in mainline for uspace/drv/ehci-hcd/pci.c

Timestamp:

2011-03-13T22:02:44Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b7d8fd9

Parents:

67f54965 (diff), deb4ba7 (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:

Merge development/ changes

File:

• uspace/drv/ehci-hcd/pci.c (modified) (3 diffs)

uspace/drv/ehci-hcd/pci.c

@@ -247 +247 @@
 
 
-        if ((value & USBLEGSUP_BIOS_CONTROL) != 0) {
+        if ((value & USBLEGSUP_BIOS_CONTROL) == 0) {
                 usb_log_info("BIOS released control after %d usec.\n", wait);
         } else {
                 /* BIOS failed to hand over control, this should not happen. */
-                usb_log_warning( "BIOS failed to release control after"
+                usb_log_warning( "BIOS failed to release control after "
                     "%d usecs, force it.\n", wait);
                 ret = async_req_3_0(parent_phone, DEV_IFACE_ID(PCI_DEV_IFACE),
@@ -258 +258 @@
                 CHECK_RET_HANGUP_RETURN(ret,
                     "Failed(%d) to force OS EHCI control.\n", ret);
-                /* TODO: This does not seem to work on my machine */
         }
 
@@ -280 +279 @@
         usb_log_debug2("USBLEGSUP: %x.\n", value);
 
-/*
- * TURN OFF EHCI FOR NOW, REMOVE IF THE DRIVER IS IMPLEMENTED
- */
+        /*
+         * TURN OFF EHCI FOR NOW, DRIVER WILL REINITIALIZE IT
+         */
 
         /* Get size of capability registers in memory space. */