Changeset 6a44ee4 in mainline for uspace/lib/net/nil/nil_skel.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/net/nil/nil_skel.c (modified) (5 diffs)

uspace/lib/net/nil/nil_skel.c

@@ -38 +38 @@
 #include <bool.h>
 #include <errno.h>
+#include <ns.h>
 #include <nil_skel.h>
 #include <net_interface.h>
@@ -48 +49 @@
  *
  */
-static void nil_client_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void nil_client_connection(ipc_callid_t iid, ipc_call_t *icall,
+    void *arg)
 {
         /*
@@ -75 +77 @@
                  * result.
                  */
-                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
-                    (res == EHANGUP))
+                if ((!IPC_GET_IMETHOD(call)) || (res == EHANGUP))
                         return;
                 
@@ -96 +97 @@
  * @return Other error codes as defined for the nil_initialize()
  *         function.
- * @return Other error codes as defined for the REGISTER_ME() macro
- *         function.
  *
  */
-int nil_module_start(int service)
+int nil_module_start(sysarg_t service)
 {
         async_set_client_connection(nil_client_connection);
-        int net_phone = net_connect_module();
-        if (net_phone < 0)
-                return net_phone;
+        async_sess_t *sess = net_connect_module();
+        if (!sess)
+                return ENOENT;
         
         int rc = pm_init();
@@ -111 +110 @@
                 return rc;
         
-        rc = nil_initialize(net_phone);
+        rc = nil_initialize(sess);
         if (rc != EOK)
                 goto out;
         
-        rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
+        rc = service_register(service);
         if (rc != EOK)
                 goto out;