Changeset 7715994 in mainline for uspace/srv/net/il/ip/ip_messages.h

Timestamp:

2010-03-13T12:17:02Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6ba20a6b

Parents:

d0febca (diff), 2070570 (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/il/ip/ip_messages.h (modified) (2 diffs)

uspace/srv/net/il/ip/ip_messages.h

@@ -51 +51 @@
          */
         NET_IP_ADD_ROUTE = NET_IP_FIRST,
-        /** Sets the default gateway.
-         *  @see ip_set_default_gateway()
+        /** Gets the actual route information.
+         *  @see ip_get_route()
          */
-        NET_IP_SET_GATEWAY,
+        NET_IP_GET_ROUTE,
         /** Processes the received error notification.
          *  @see ip_received_error_msg()
          */
         NET_IP_RECEIVED_ERROR,
-        /** Gets the actual route information.
-         *  @see ip_get_route()
+        /** Sets the default gateway.
+         *  @see ip_set_default_gateway()
          */
-        NET_IP_GET_ROUTE
+        NET_IP_SET_GATEWAY
 } ip_messages;
 
@@ -69 +69 @@
 /*@{*/
 
+/** Returns the address message parameter.
+ *  @param[in] call The message call structure.
+ */
+#define IP_GET_ADDRESS(call)            ({in_addr_t addr; addr.s_addr = IPC_GET_ARG3(*call); addr;})
+
 /** Returns the gateway message parameter.
  *  @param[in] call The message call structure.
  */
-#define IP_GET_GATEWAY( call )          ({ in_addr_t addr; addr.s_addr = IPC_GET_ARG2( * call ); addr; })
+#define IP_GET_GATEWAY(call)            ({in_addr_t addr; addr.s_addr = IPC_GET_ARG2(*call); addr;})
 
-/** Returns the address message parameter.
- *  @param[in] call The message call structure.
+/** Sets the header length in the message answer.
+ *  @param[out] answer The message answer structure.
  */
-#define IP_GET_ADDRESS( call )          ({ in_addr_t addr; addr.s_addr = IPC_GET_ARG3( * call ); addr; })
+#define IP_SET_HEADERLEN(answer)        ((size_t *) &IPC_GET_ARG2(*answer))
 
 /** Returns the network mask message parameter.
  *  @param[in] call The message call structure.
  */
-#define IP_GET_NETMASK( call )          ({ in_addr_t addr; addr.s_addr = IPC_GET_ARG4( * call ); addr; })
+#define IP_GET_NETMASK(call)            ({in_addr_t addr; addr.s_addr = IPC_GET_ARG4(*call); addr;})
 
 /** Returns the protocol message parameter.
  *  @param[in] call The message call structure.
  */
-#define IP_GET_PROTOCOL( call )         (( ip_protocol_t ) IPC_GET_ARG1( * call ))
-
-/** Sets the header length in the message answer.
- *  @param[out] answer The message answer structure.
- */
-#define IP_SET_HEADERLEN( answer )      (( size_t * ) & IPC_GET_ARG2( * answer ))
+#define IP_GET_PROTOCOL(call)           ((ip_protocol_t) IPC_GET_ARG1(*call))
 
 /*@}*/