Changeset 6843a9c in mainline for uspace/lib/c/include/ipc/devman.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/lib/c/include/ipc/devman.h (modified) (2 diffs)

uspace/lib/c/include/ipc/devman.h

@@ -146 +146 @@
 typedef enum {
         DRIVER_DEV_ADD = IPC_FIRST_USER_METHOD,
-        DRIVER_DEV_ADDED,
         DRIVER_DEV_REMOVE,
         DRIVER_DEV_GONE,
@@ -158 +157 @@
         DEVMAN_FUN_GET_CHILD,
         DEVMAN_FUN_GET_NAME,
+        DEVMAN_FUN_GET_DRIVER_NAME,
         DEVMAN_FUN_ONLINE,
         DEVMAN_FUN_OFFLINE,