Changes in uspace/lib/net/nil/nil_skel.c [6b82009:ffa2c8ef] in mainline

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>
@@ -49 +48 @@
  *
  */
-static void nil_client_connection(ipc_callid_t iid, ipc_call_t *icall,
-    void *arg)
+static void nil_client_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
         /*
@@ -77 +75 @@
                  * result.
                  */
-                if ((!IPC_GET_IMETHOD(call)) || (res == EHANGUP))
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                    (res == EHANGUP))
                         return;
                 
@@ -97 +96 @@
  * @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(sysarg_t service)
+int nil_module_start(int service)
 {
         async_set_client_connection(nil_client_connection);
-        async_sess_t *sess = net_connect_module();
-        if (!sess)
-                return ENOENT;
+        int net_phone = net_connect_module();
+        if (net_phone < 0)
+                return net_phone;
         
         int rc = pm_init();
@@ -110 +111 @@
                 return rc;
         
-        rc = nil_initialize(sess);
+        rc = nil_initialize(net_phone);
         if (rc != EOK)
                 goto out;
         
-        rc = service_register(service);
+        rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
         if (rc != EOK)
                 goto out;