Changeset c4fb95d3 in mainline for uspace/lib/net/tl

Timestamp:

2011-02-18T20:04:56Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d011038

Parents:

87e373b (diff), 8b1ea2d4 (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.

Location:

uspace/lib/net/tl

Files:

• icmp_remote.c (modified) (2 diffs)
• tl_common.c (modified) (2 diffs)
• tl_skel.c (modified) (3 diffs)

uspace/lib/net/tl/icmp_remote.c

@@ -33 +33 @@
 /** @file
  * ICMP interface implementation for remote modules.
- * @see icmp_interface.h
+ * @see icmp_remote.h
  */
 
-#include <icmp_interface.h>
+#include <icmp_remote.h>
 #include <net/modules.h>
 #include <packet_client.h>
@@ -42 +42 @@
 #include <async.h>
 #include <errno.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/icmp.h>

uspace/lib/net/tl/tl_common.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libnet 
+/** @addtogroup libnet
  * @{
  */
@@ -39 +39 @@
 #include <packet_client.h>
 #include <packet_remote.h>
-#include <icmp_interface.h>
+#include <icmp_remote.h>
 #include <ip_remote.h>
 #include <ip_interface.h>

uspace/lib/net/tl/tl_skel.c

@@ -54 +54 @@
          * the initial IPC_M_CONNECT_ME_TO call.
          */
-        ipc_answer_0(iid, EOK);
+        async_answer_0(iid, EOK);
+        
+        /* Per-connection initialization */
+        tl_connection();
         
         while (true) {
@@ -68 +71 @@
                 
                 /* Process the message */
-                int res = tl_module_message(callid, &call, &answer,
-                    &count);
+                int res = tl_message(callid, &call, &answer, &count);
                 
                 /*
@@ -115 +117 @@
                 goto out;
         
-        sysarg_t phonehash;
-        rc = ipc_connect_to_me(PHONE_NS, service, 0, 0, &phonehash);
+        rc = async_connect_to_me(PHONE_NS, service, 0, 0, NULL);
         if (rc != EOK)
                 goto out;