Changeset 26e7d6d in mainline for uspace/lib/net/il/il_skel.c

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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/il/il_skel.c (modified) (3 diffs)

uspace/lib/net/il/il_skel.c

@@ -38 +38 @@
 #include <bool.h>
 #include <errno.h>
+#include <ns.h>
 #include <il_skel.h>
 #include <net_interface.h>
 #include <net/modules.h>
-
-// FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
 
 /** Default thread for new connections.
@@ -99 +97 @@
  * @return Other error codes as defined for the il_initialize()
  *         function.
- * @return Other error codes as defined for the REGISTER_ME() macro
- *         function.
  *
  */
-int il_module_start(int service)
+int il_module_start(sysarg_t service)
 {
         async_set_client_connection(il_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();
@@ -114 +110 @@
                 return rc;
         
-        rc = il_initialize(net_phone);
+        rc = il_initialize(sess);
         if (rc != EOK)
                 goto out;
         
-        rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL);
+        rc = service_register(service);
         if (rc != EOK)
                 goto out;