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

uspace/lib/c/generic/ns.c

@@ -59 +59 @@
 }
 
-/*
- * XXX ns does not know about session_primary, so we create an extra session for
- * actual communicaton
- */
-static async_sess_t *sess_primary = NULL;
-
 errno_t service_register(service_t service, iface_t iface,
     async_port_handler_t handler, void *data)
@@ -96 +90 @@
         async_set_fallback_port_handler(handler, data);
 
-        async_sess_t *sess = get_session_primary();
-        if (sess == NULL)
-                return EIO;
-
-        async_exch_t *exch = async_exchange_begin(sess);
+        async_exch_t *exch = ns_exchange_begin();
 
         ipc_call_t answer;
@@ -106 +96 @@
         errno_t rc = async_connect_to_me(exch, INTERFACE_ANY, service, 0);
 
-        async_exchange_end(exch);
+        ns_exchange_end(exch);
 
         if (rc != EOK) {
@@ -138 +128 @@
         async_sess_args_set(sess, iface, arg3, 0);
 
-        return csess;
+        return sess;
 }
 
@@ -164 +154 @@
 errno_t ns_ping(void)
 {
-        async_exch_t *exch = ns_exchange_begin(sess);
+        async_exch_t *exch = ns_exchange_begin();
         errno_t rc = async_req_0_0(exch, NS_PING);
         ns_exchange_end(exch);