Changeset ff381a7 in mainline for uspace/lib/c/generic/ns.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/lib/c/generic/ns.c

@@ -40 +40 @@
 #include "private/ns.h"
 
-int service_register(sysarg_t service)
+int service_register(service_t service)
 {
         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);
         async_exchange_end(exch);
         
@@ -49 +49 @@
 }
 
-async_sess_t *service_connect(exch_mgmt_t mgmt, services_t service, sysarg_t arg2,
-    sysarg_t arg3)
+
+async_sess_t *service_connect(service_t service, iface_t iface, 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_iface(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, services_t service,
-    sysarg_t arg2, sysarg_t arg3)
+async_sess_t *service_connect_blocking(service_t service, iface_t iface,
+    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_blocking_iface(exch, iface, service, arg3);
         async_exchange_end(exch);
         
@@ -91 +89 @@
          * first argument for non-initial connections.
          */
-        async_sess_args_set(sess, arg2, arg3, 0);
+        async_sess_args_set(sess, iface, arg3, 0);
         
         return sess;
 }
 
-/** Create bidirectional connection with a service
- *
- * @param[in] service         Service.
- * @param[in] arg1            First parameter.
- * @param[in] arg2            Second parameter.
- * @param[in] arg3            Third parameter.
- * @param[in] client_receiver Message receiver.
- *
- * @return Session to the service.
- * @return Other error codes as defined by async_connect_to_me().
- *
- */
-async_sess_t *service_bind(services_t service, sysarg_t arg1, sysarg_t arg2,
-    sysarg_t arg3, async_client_conn_t client_receiver)
-{
-        /* Connect to the needed service */
-        async_sess_t *sess =
-            service_connect_blocking(EXCHANGE_SERIALIZE, service, 0, 0);
-        if (sess != NULL) {
-                /* Request callback connection */
-                async_exch_t *exch = async_exchange_begin(sess);
-                int rc = async_connect_to_me(exch, arg1, arg2, arg3,
-                    client_receiver, NULL);
-                async_exchange_end(exch);
-                
-                if (rc != EOK) {
-                        async_hangup(sess);
-                        errno = rc;
-                        return NULL;
-                }
-        }
-        
-        return sess;
-}
 
 int ns_ping(void)