Changeset 7bdcc45 in mainline for uspace/srv/net/tl/udp

Timestamp:

2010-12-16T16:38:49Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/srv/net/tl/udp

Files:

• udp.c (modified) (4 diffs)
• udp_module.c (modified) (1 diff)

uspace/srv/net/tl/udp/udp.c

@@ -393 +393 @@
         fibril_rwlock_write_unlock(&udp_globals.lock);
         async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
-            (ipcarg_t) socket->socket_id, packet_dimension->content, 0, 0,
-            (ipcarg_t) fragments);
+            (sysarg_t) socket->socket_id, packet_dimension->content, 0, 0,
+            (sysarg_t) fragments);
 
         return EOK;
@@ -742 +742 @@
 
                 /* Process the call */
-                switch (IPC_GET_METHOD(call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
                         keep_on_going = false;
@@ -866 +866 @@
         *answer_count = 0;
 
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case NET_TL_RECEIVED:
                 rc = packet_translate_remote(udp_globals.net_phone, &packet,
@@ -913 +913 @@
                  * result.
                  */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
                     (res == EHANGUP))
                         return;

uspace/srv/net/tl/udp/udp_module.c

@@ -59 +59 @@
 int tl_module_start_standalone(async_client_conn_t client_connection)
 {
-        ipcarg_t phonehash;
+        sysarg_t phonehash;
         int rc;