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

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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.

File:

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

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

@@ -130 +130 @@
         DEVMAN_CLIENT,
         DEVMAN_CONNECT_TO_DEVICE,
-        DEVMAN_CONNECT_FROM_DEVMAP,
+        DEVMAN_CONNECT_FROM_LOC,
         DEVMAN_CONNECT_TO_PARENTS_DEVICE
 } devman_interface_t;
@@ -138 +138 @@
         DEVMAN_ADD_FUNCTION,
         DEVMAN_ADD_MATCH_ID,
-        DEVMAN_ADD_DEVICE_TO_CLASS
-
+        DEVMAN_ADD_DEVICE_TO_CATEGORY,
+        DEVMAN_DRV_FUN_ONLINE,
+        DEVMAN_DRV_FUN_OFFLINE,
+        DEVMAN_REMOVE_FUNCTION
 } driver_to_devman_t;
 
 typedef enum {
-        DRIVER_ADD_DEVICE = IPC_FIRST_USER_METHOD
-
+        DRIVER_DEV_ADD = IPC_FIRST_USER_METHOD,
+        DRIVER_DEV_REMOVE,
+        DRIVER_DEV_GONE,
+        DRIVER_FUN_ONLINE,
+        DRIVER_FUN_OFFLINE,
 } devman_to_driver_t;
 
 typedef enum {
         DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD,
-        DEVMAN_DEVICE_GET_HANDLE_BY_CLASS,
-        DEVMAN_DEVICE_GET_DEVICE_PATH
+        DEVMAN_DEV_GET_FUNCTIONS,
+        DEVMAN_FUN_GET_CHILD,
+        DEVMAN_FUN_GET_NAME,
+        DEVMAN_FUN_ONLINE,
+        DEVMAN_FUN_OFFLINE,
+        DEVMAN_FUN_GET_PATH,
+        DEVMAN_FUN_SID_TO_HANDLE
 } client_to_devman_t;