Changeset 2133e02 in mainline for uspace/lib/c/generic/ns.c

Timestamp:

2015-08-18T20:14:05Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1a522e5

Parents:

84dc30c

Message:

canonically reserve the first argument of IPC_M_CONNECT_ME_TO for interface type
naming service: service handle in IPC_M_CONNECT_ME_TO needs to be shifted to the second argument
service connections that use the untyped (fallback) port can only provide one additional argument now

File:

• uspace/lib/c/generic/ns.c (modified) (6 diffs)

uspace/lib/c/generic/ns.c

@@ -43 +43 @@
 {
         async_exch_t *exch = async_exchange_begin(session_ns);
-        int rc = async_connect_to_me(exch, service, 0, 0, NULL, NULL);
+        int rc = async_connect_to_me(exch, 0, service, 0, NULL, NULL);
         async_exchange_end(exch);
         
@@ -49 +49 @@
 }
 
-async_sess_t *service_connect(exch_mgmt_t mgmt, service_t service, sysarg_t arg2,
-    sysarg_t arg3)
+async_sess_t *service_connect_iface(exch_mgmt_t mgmt, sysarg_t iface,
+    service_t service, sysarg_t arg3)
 {
         async_exch_t *exch = async_exchange_begin(session_ns);
@@ -57 +57 @@
         
         async_sess_t *sess =
-            async_connect_me_to(mgmt, exch, service, arg2, arg3);
+            async_connect_me_to(mgmt, exch, iface, service, arg3);
         async_exchange_end(exch);
         
@@ -68 +68 @@
          * first argument for non-initial connections.
          */
-        async_sess_args_set(sess, arg2, arg3, 0);
+        async_sess_args_set(sess, iface, arg3, 0);
         
         return sess;
 }
 
-async_sess_t *service_connect_blocking(exch_mgmt_t mgmt, service_t service,
-    sysarg_t arg2, sysarg_t arg3)
+async_sess_t *service_connect(exch_mgmt_t mgmt, service_t service, sysarg_t arg3)
 {
         async_exch_t *exch = async_exchange_begin(session_ns);
         if (!exch)
                 return NULL;
+        
         async_sess_t *sess =
-            async_connect_me_to_blocking(mgmt, exch, service, arg2, arg3);
+            async_connect_me_to(mgmt, exch, 0, service, arg3);
         async_exchange_end(exch);
         
@@ -91 +91 @@
          * first argument for non-initial connections.
          */
-        async_sess_args_set(sess, arg2, arg3, 0);
+        async_sess_args_set(sess, 0, arg3, 0);
+        
+        return sess;
+}
+
+async_sess_t *service_connect_blocking_iface(exch_mgmt_t mgmt, sysarg_t iface,
+    service_t service, sysarg_t arg3)
+{
+        async_exch_t *exch = async_exchange_begin(session_ns);
+        if (!exch)
+                return NULL;
+        async_sess_t *sess =
+            async_connect_me_to_blocking(mgmt, exch, iface, service, arg3);
+        async_exchange_end(exch);
+        
+        if (!sess)
+                return NULL;
+        
+        /*
+         * FIXME Ugly hack to work around limitation of implementing
+         * parallel exchanges using multiple connections. Shift out
+         * first argument for non-initial connections.
+         */
+        async_sess_args_set(sess, iface, arg3, 0);
+        
+        return sess;
+}
+
+async_sess_t *service_connect_blocking(exch_mgmt_t mgmt, service_t service,
+    sysarg_t arg3)
+{
+        async_exch_t *exch = async_exchange_begin(session_ns);
+        if (!exch)
+                return NULL;
+        async_sess_t *sess =
+            async_connect_me_to_blocking(mgmt, exch, 0, service, arg3);
+        async_exchange_end(exch);
+        
+        if (!sess)
+                return NULL;
+        
+        /*
+         * FIXME Ugly hack to work around limitation of implementing
+         * parallel exchanges using multiple connections. Shift out
+         * first argument for non-initial connections.
+         */
+        async_sess_args_set(sess, 0, arg3, 0);
         
         return sess;
@@ -113 +159 @@
         /* Connect to the needed service */
         async_sess_t *sess =
-            service_connect_blocking(EXCHANGE_SERIALIZE, service, 0, 0);
+            service_connect_blocking(EXCHANGE_SERIALIZE, service, 0);
         if (sess != NULL) {
                 /* Request callback connection */