Changeset 6b82009 in mainline for uspace/lib/net/nil

Timestamp:

2011-06-22T20:41:41Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ef09a7a

Parents:

55091847

Message:

networking stack: convert to the new async framework

Location:

uspace/lib/net/nil

Files:

• nil_remote.c (modified) (4 diffs)
• nil_skel.c (modified) (3 diffs)

uspace/lib/net/nil/nil_remote.c

@@ -45 +45 @@
 /** Notify the network interface layer about the device state change.
  *
- * @param[in] nil_phone Network interface layer phone.
+ * @param[in] sess      Network interface layer session.
  * @param[in] device_id Device identifier.
  * @param[in] state     New device state.
@@ -54 +54 @@
  *
  */
-int nil_device_state_msg(int nil_phone, device_id_t device_id, int state)
+int nil_device_state_msg(async_sess_t *sess, device_id_t device_id,
+    sysarg_t state)
 {
-        return generic_device_state_msg_remote(nil_phone, NET_NIL_DEVICE_STATE,
+        return generic_device_state_msg_remote(sess, NET_NIL_DEVICE_STATE,
             device_id, state, 0);
 }
@@ -65 +66 @@
  * upper layers.
  *
- * @param[in] nil_phone Network interface layer phone.
+ * @param[in] sess      Network interface layer session.
  * @param[in] device_id Source device identifier.
  * @param[in] packet    Received packet or the received packet queue.
@@ -75 +76 @@
  *
  */
-int nil_received_msg(int nil_phone, device_id_t device_id,
+int nil_received_msg(async_sess_t *sess, device_id_t device_id,
     packet_t *packet, services_t target)
 {
-        return generic_received_msg_remote(nil_phone, NET_NIL_RECEIVED,
+        return generic_received_msg_remote(sess, NET_NIL_RECEIVED,
             device_id, packet_get_id(packet), target, 0);
 }

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>
 #include <net/modules.h>
-#include <async_obsolete.h>
-
-// FIXME: remove this header
-#include <kernel/ipc/ipc_methods.h>
 
 /** Default thread for new connections.
@@ -100 +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();
@@ -115 +110 @@
                 return rc;
         
-        rc = nil_initialize(net_phone);
+        rc = nil_initialize(sess);
         if (rc != EOK)
                 goto out;
         
-        rc = async_obsolete_connect_to_me(PHONE_NS, service, 0, 0, NULL, NULL);
+        rc = service_register(service);
         if (rc != EOK)
                 goto out;