Changeset 80cd7cd in mainline for uspace/lib/net/tl

Timestamp:

2011-01-13T20:58:24Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

87e373b

Parents:

eaef141 (diff), a613fea1 (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:

• socket_core.c (modified) (4 diffs)
• tl_common.c (modified) (1 diff)
• tl_remote.c (moved) (moved from uspace/lib/net/tl/tl_interface.c ) (2 diffs)
• tl_skel.c (added)

uspace/lib/net/tl/socket_core.c

@@ -161 +161 @@
 static int
 socket_port_add_core(socket_port_t *socket_port, socket_core_t *socket,
-    const char *key, size_t key_length)
+    const uint8_t *key, size_t key_length)
 {
         socket_core_t **socket_ref;
@@ -216 +216 @@
                 goto fail;
         
-        rc = socket_port_add_core(socket_port, socket, SOCKET_MAP_KEY_LISTENING,
-            0);
+        rc = socket_port_add_core(socket_port, socket,
+            (const uint8_t *) SOCKET_MAP_KEY_LISTENING, 0);
         if (rc != EOK)
                 goto fail;
@@ -602 +602 @@
  */
 socket_core_t *
-socket_port_find(socket_ports_t *global_sockets, int port, const char *key,
+socket_port_find(socket_ports_t *global_sockets, int port, const uint8_t *key,
     size_t key_length)
 {
@@ -680 +680 @@
 int
 socket_port_add(socket_ports_t *global_sockets, int port,
-    socket_core_t *socket, const char *key, size_t key_length)
+    socket_core_t *socket, const uint8_t *key, size_t key_length)
 {
         socket_port_t *socket_port;

uspace/lib/net/tl/tl_common.c

@@ -42 +42 @@
 #include <ip_remote.h>
 #include <ip_interface.h>
-#include <tl_interface.h>
+#include <tl_remote.h>
 
 #include <net/socket_codes.h>

uspace/lib/net/tl/tl_remote.c

@@ -31 +31 @@
  */
 
-#include <tl_interface.h>
+#include <tl_remote.h>
 #include <generic.h>
 #include <packet_client.h>
@@ -57 +57 @@
  *
  */
-int
-tl_received_msg(int tl_phone, device_id_t device_id, packet_t *packet,
+int tl_received_msg(int tl_phone, device_id_t device_id, packet_t *packet,
     services_t target, services_t error)
 {