Changeset 241f1985 in mainline for uspace/lib/c/generic/taskman.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.c (modified) (6 diffs)

uspace/lib/c/generic/taskman.c

@@ -103 +103 @@
         assert(exch);
 
-        async_sess_t *sess = async_connect_me_to(EXCHANGE_ATOMIC,
-            exch, TASKMAN_CONNECT_TO_NS, 0, 0);
+        async_sess_t *sess = async_connect_me_to(exch, INTERFACE_NS,
+                TASKMAN_CONNECT_TO_NS, 0);
         async_exchange_end(exch);
 
@@ -116 +116 @@
 
         async_exch_t *exch = async_exchange_begin(session_taskman);
-        async_sess_t *sess = async_connect_me_to(EXCHANGE_SERIALIZE,
-            exch, TASKMAN_CONNECT_TO_LOADER, 0, 0);
+        async_sess_t *sess = async_connect_me_to(exch, INTERFACE_LOADER,
+            TASKMAN_CONNECT_TO_LOADER, 0);
         async_exchange_end(exch);
 
@@ -136 +136 @@
  * @return EOK on success, otherwise propagated error code
  */
-int taskman_intro_loader(void)
+errno_t taskman_intro_loader(void)
 {
         assert(session_taskman);
 
         async_exch_t *exch = async_exchange_begin(session_taskman);
-        int rc = async_connect_to_me(
-            exch, TASKMAN_LOADER_CALLBACK, 0, 0, NULL, NULL);
+        errno_t rc = async_connect_to_me(exch, INTERFACE_LOADER, TASKMAN_LOADER_CALLBACK, 0);
         async_exchange_end(exch);
 
@@ -152 +151 @@
  * @return EOK on success, otherwise propagated error code
  */
-int taskman_intro_ns(void)
+errno_t taskman_intro_ns(void)
 {
         assert(session_taskman);
@@ -159 +158 @@
         aid_t req = async_send_0(exch, TASKMAN_I_AM_NS, NULL);
 
-        int rc = async_connect_to_me(exch, 0, 0, 0, NULL, NULL);
+        errno_t rc = async_connect_to_me(exch, INTERFACE_NS, 0, 0);
         taskman_exchange_end(exch);
 
@@ -166 +165 @@
         }
 
-        sysarg_t retval;
+        errno_t retval;
         async_wait_for(req, &retval);
         return retval;