Changeset 241f1985 in mainline for uspace/lib/c/generic/taskman_noasync.c

Timestamp:

2019-08-31T10:45:17Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

102f641

Parents:

f92b315

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-31 10:45:17)

Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

File:

• uspace/lib/c/generic/taskman_noasync.c (modified) (3 diffs)

uspace/lib/c/generic/taskman_noasync.c

@@ -33 +33 @@
  */
 
-#define LIBC_ASYNC_C_
-#include <ipc/ipc.h>
 #include "private/async.h"
 #include "private/taskman.h"
-#undef LIBC_ASYNC_C_
+
+#undef _LIBC_ASYNC_H_
+#include <ipc/ipc.h>
+#define _LIBC_ASYNC_H_
 
 #include <errno.h>
@@ -50 +51 @@
  * @return EOK on success, otherwise propagated error code
  */
-int taskman_intro_ns_noasync(void)
+errno_t taskman_intro_ns_noasync(void)
 {
         assert(session_taskman);
-        int phone = async_session_phone(session_taskman);
+        cap_phone_handle_t phone = async_session_phone(session_taskman);
 
-        ipc_call_async_0(phone, TASKMAN_I_AM_NS, NULL, NULL, false);
+        ipc_call_async_0(phone, TASKMAN_I_AM_NS, NULL);
 
-        ipc_call_async_3(phone, IPC_M_CONNECT_TO_ME, 0, 0, 0, NULL, NULL, false);
+        ipc_call_async_3(phone, IPC_M_CONNECT_TO_ME, 0, 0, 0, NULL);
 
         /*
@@ -67 +68 @@
 
 
-void task_retval_noasync(int retval)
+void task_retval_noasync(errno_t retval)
 {
         assert(session_taskman);
-        int phone = async_session_phone(session_taskman);
+        cap_phone_handle_t phone = async_session_phone(session_taskman);
 
         /* Just send it and don't wait for an answer. */
-        ipc_call_async_2(phone, TASKMAN_RETVAL, retval, false,
-            NULL, NULL, false);
+        ipc_call_async_2(phone, TASKMAN_RETVAL, retval, false, NULL);
 }