Changeset 8e7c9fe in mainline for uspace/srv/devman/main.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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 mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/srv/devman/main.c (modified) (1 diff)

uspace/srv/devman/main.c

@@ -116 +116 @@
                 
                 fwd_h = dev->pfun->handle;
-        } else if (dev->state == DEVICE_USABLE) {
+        } else {
                 /* Connect to the specified function */
                 driver = dev->drv;
-                assert(driver != NULL);
-                
                 fwd_h = handle;
         }