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

Timestamp:

2017-10-23T18:51:34Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

327f147

Parents:

31cca4f3 (diff), 367db39a (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 (again) to fix build

Perhaps it wasn't so good idea to start merging mainline in these unstable times

File:

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

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

@@ -156 +156 @@
         DRIVER_FUN_ONLINE,
         DRIVER_FUN_OFFLINE,
+        DRIVER_STOP
 } devman_to_driver_t;
 
@@ -176 +177 @@
         DEVMAN_DRIVER_GET_NAME,
         DEVMAN_DRIVER_GET_STATE,
-        DEVMAN_DRIVER_LOAD
+        DEVMAN_DRIVER_LOAD,
+        DEVMAN_DRIVER_UNLOAD
 } client_to_devman_t;