Changeset 16f9782 in mainline for uspace/lib/c/include

Timestamp:

2011-08-19T16:46:22Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ab34cc9

Parents:

633bcc6 (diff), 45059d6b (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.

Location:

uspace/lib/c/include

Files:

• devman.h (modified) (1 diff)
• ipc/devman.h (modified) (1 diff)

uspace/lib/c/include/devman.h

@@ -56 +56 @@
     unsigned int);
 
-extern int devman_device_get_handle(const char *, devman_handle_t *,
+extern int devman_fun_get_handle(const char *, devman_handle_t *,
     unsigned int);
-extern int devman_get_device_path(devman_handle_t, char *, size_t);
+extern int devman_fun_get_child(devman_handle_t, devman_handle_t *);
+extern int devman_dev_get_functions(devman_handle_t, devman_handle_t **,
+    size_t *);
+extern int devman_fun_get_name(devman_handle_t, char *, size_t);
+extern int devman_fun_get_path(devman_handle_t, char *, size_t);
 
 extern int devman_add_device_to_category(devman_handle_t, const char *);

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

@@ -149 +149 @@
 typedef enum {
         DEVMAN_DEVICE_GET_HANDLE = IPC_FIRST_USER_METHOD,
-        DEVMAN_DEVICE_GET_DEVICE_PATH,
+        DEVMAN_DEV_GET_FUNCTIONS,
+        DEVMAN_FUN_GET_CHILD,
+        DEVMAN_FUN_GET_NAME,
+        DEVMAN_FUN_GET_PATH,
         DEVMAN_FUN_SID_TO_HANDLE
 } client_to_devman_t;