Changeset 7ffdcbd in mainline

Timestamp:

2019-10-06T19:47:36Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

ae004bc

Parents:

5be6361

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-10-06 19:43:50)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-10-06 19:47:36)

Message:

Correcting IPC calls introduced with taskman

The new PHONE_INITIAL has been corrected to make use of CAP_NIL.
Removing unneeded interfaces which were introduced during the
merging

Files:

• abi/include/abi/ipc/interfaces.h (modified) (2 diffs)
• uspace/lib/c/generic/taskman.c (modified) (5 diffs)
• uspace/lib/c/include/ipc/common.h (modified) (1 diff)

abi/include/abi/ipc/interfaces.h

@@ -82 +82 @@
 typedef enum {
         INTERFACE_ANY = 0,
-        INTERFACE_LOADER =
-            FOURCC_COMPACT('l', 'o', 'a', 'd') | IFACE_EXCHANGE_SERIALIZE,
         INTERFACE_PAGER =
             FOURCC_COMPACT('p', 'a', 'g', 'e') | IFACE_EXCHANGE_ATOMIC,
@@ -190 +188 @@
         INTERFACE_TASKMAN_CB =
             FOURCC_COMPACT('t', 'a', 's', 'k') | IFACE_EXCHANGE_SERIALIZE | IFACE_MOD_CALLBACK,
-        INTERFACE_NS =
-            FOURCC_COMPACT('n', 's', ' ', ' ') | IFACE_EXCHANGE_ATOMIC,
         INTERFACE_SYSMAN =
             FOURCC_COMPACT('s', 'y', 's', 'm') | IFACE_EXCHANGE_SERIALIZE

uspace/lib/c/generic/taskman.c

@@ -69 +69 @@
         async_exchange_end(exch);
 }
-
+#include <stdio.h>
 /** Wrap PHONE_INITIAL with session and introduce to taskman
  */
@@ -101 +101 @@
         async_exch_t *exch = taskman_exchange_begin();
 
-        async_sess_t *sess = async_connect_me_to(exch, INTERFACE_NS,
+        async_sess_t *sess = async_connect_me_to(exch, INTERFACE_ANY,
             TASKMAN_CONNECT_TO_NS, 0);
         taskman_exchange_end(exch);
@@ -112 +112 @@
 {
         async_exch_t *exch = taskman_exchange_begin();
-        async_sess_t *sess = async_connect_me_to(exch, INTERFACE_LOADER,
+        async_sess_t *sess = async_connect_me_to(exch, INTERFACE_ANY,
             TASKMAN_CONNECT_TO_LOADER, 0);
         taskman_exchange_end(exch);
@@ -135 +135 @@
 {
         async_exch_t *exch = taskman_exchange_begin();
-        errno_t rc = async_connect_to_me(exch, INTERFACE_LOADER, TASKMAN_LOADER_CALLBACK, 0);
+        errno_t rc = async_connect_to_me(exch, INTERFACE_ANY, TASKMAN_LOADER_CALLBACK, 0);
         taskman_exchange_end(exch);
 
@@ -150 +150 @@
         aid_t req = async_send_0(exch, TASKMAN_I_AM_NS, NULL);
 
-        errno_t rc = async_connect_to_me(exch, INTERFACE_NS, 0, 0);
+        errno_t rc = async_connect_to_me(exch, INTERFACE_ANY, 0, 0);
         taskman_exchange_end(exch);
 
         if (rc != EOK) {
+                async_forget(req);
                 return rc;
         }

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

@@ -40 +40 @@
 
 /* Well known phone descriptors */
-#define PHONE_INITIAL  0
-
+static cap_phone_handle_t const PHONE_INITIAL = (cap_phone_handle_t) (CAP_NIL + 1);
 #define IPC_FLAG_BLOCKING   0x01