Changeset 87b4baa in mainline for uspace/srv/net/tl/udp/udp.c

Timestamp:

2010-12-17T20:16:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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/srv/net/tl/udp/udp.c (modified) (6 diffs)

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;
@@ -771 +771 @@
 
                 case NET_SOCKET_BIND:
-                        res = data_receive((void **) &addr, &addrlen);
+                        res = async_data_write_accept((void **) &addr, false,
+                            0, 0, 0, &addrlen);
                         if (res != EOK)
                                 break;
@@ -784 +785 @@
 
                 case NET_SOCKET_SENDTO:
-                        res = data_receive((void **) &addr, &addrlen);
+                        res = async_data_write_accept((void **) &addr, false,
+                            0, 0, 0, &addrlen);
                         if (res != EOK)
                                 break;
@@ -866 +868 @@
         *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 +915 @@
                  * result.
                  */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
                     (res == EHANGUP))
                         return;