Changeset d1e196f7 in mainline for uspace/lib/c/include/ipc

Timestamp:

2011-08-21T12:04:27Z (15 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

8a6ba94

Parents:

1877128 (diff), a6480d5 (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/ipc

Files:

• common.h (modified) (2 diffs)
• devman.h (modified) (1 diff)
• ipc.h (modified) (1 diff)

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

@@ -39 +39 @@
 #include <abi/ipc/ipc.h>
 #include <atomic.h>
+#include <task.h>
 
 #define IPC_FLAG_BLOCKING  0x01
@@ -44 +45 @@
 typedef struct {
         sysarg_t args[IPC_CALL_LEN];
-        sysarg_t in_task_hash;
+        task_id_t in_task_id;
         sysarg_t in_phone_hash;
 } ipc_call_t;

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;

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

@@ -254 +254 @@
     sysarg_t, sysarg_t, void *, ipc_async_callback_t, bool);
 
-extern int ipc_connect_to_me(int, sysarg_t, sysarg_t, sysarg_t, sysarg_t *,
+extern int ipc_connect_to_me(int, sysarg_t, sysarg_t, sysarg_t, task_id_t *,
     sysarg_t *);
 extern int ipc_connect_me(int);