Changeset e417b96 in mainline for uspace/srv/net/nil

Timestamp:

2010-03-23T22:58:44Z (16 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

5814ef7

Parents:

76ca3f7

Message:

IPC_[SG]ET_ARG macros refactored to be more explicit and safer

Location:

uspace/srv/net/nil

Files:

• eth/eth.c (modified) (2 diffs)
• nil_messages.h (modified) (1 diff)
• nildummy/nildummy.c (modified) (2 diffs)

uspace/srv/net/nil/eth/eth.c

@@ -709 +709 @@
         measured_string_ref address;
         packet_t packet;
+        size_t addrlen;
+        size_t prefix;
+        size_t suffix;
+        size_t content;
 
 //      printf("message %d - %d\n", IPC_GET_METHOD(*call), NET_NIL_FIRST);
@@ -721 +725 @@
                         return eth_send_message(IPC_GET_DEVICE(call), packet, IPC_GET_SERVICE(call));
                 case NET_NIL_PACKET_SPACE:
-                        ERROR_PROPAGATE(eth_packet_space_message(IPC_GET_DEVICE(call), IPC_SET_ADDR(answer), IPC_SET_PREFIX(answer), IPC_SET_CONTENT(answer), IPC_SET_SUFFIX(answer)));
+                        ERROR_PROPAGATE(eth_packet_space_message(IPC_GET_DEVICE(call), &addrlen, &prefix, &content, &suffix));
+                        IPC_SET_ADDR(answer, addrlen);
+                        IPC_SET_PREFIX(answer, prefix);
+                        IPC_SET_CONTENT(answer, content);
+                        IPC_SET_SUFFIX(answer, suffix);
                         *answer_count = 4;
                         return EOK;

uspace/srv/net/nil/nil_messages.h

@@ -82 +82 @@
 /** Returns the protocol service message parameter.
  */
-#define NIL_GET_PROTO(call)             (services_t) IPC_GET_ARG2(*call)
+#define NIL_GET_PROTO(call) \
+        ({services_t service = (services_t) IPC_GET_ARG2(*call); service;})
 
 /*@}*/

uspace/srv/net/nil/nildummy/nildummy.c

@@ -316 +316 @@
         measured_string_ref address;
         packet_t packet;
+        size_t addrlen;
+        size_t prefix;
+        size_t suffix;
+        size_t content;
 
 //      printf("message %d - %d\n", IPC_GET_METHOD(*call), NET_NIL_FIRST);
@@ -328 +332 @@
                         return nildummy_send_message(IPC_GET_DEVICE(call), packet, IPC_GET_SERVICE(call));
                 case NET_NIL_PACKET_SPACE:
-                        ERROR_PROPAGATE(nildummy_packet_space_message(IPC_GET_DEVICE(call), IPC_SET_ADDR(answer), IPC_SET_PREFIX(answer), IPC_SET_CONTENT(answer), IPC_SET_SUFFIX(answer)));
+                        ERROR_PROPAGATE(nildummy_packet_space_message(IPC_GET_DEVICE(call), &addrlen, &prefix, &content, &suffix));
+                        IPC_SET_ADDR(answer, addrlen);
+                        IPC_SET_PREFIX(answer, prefix);
+                        IPC_SET_CONTENT(answer, content);
+                        IPC_SET_SUFFIX(answer, suffix);
                         *answer_count = 4;
                         return EOK;