Changes in uspace/lib/c/include/ipc/ip.h [64d2b10:779a47d] in mainline

File:

• uspace/lib/c/include/ipc/ip.h (modified) (3 diffs)

uspace/lib/c/include/ipc/ip.h

@@ -39 +39 @@
 #define LIBC_IP_MESSAGES_H_
 
+#include <ipc/ipc.h>
 #include <ipc/net.h>
+
 #include <net/in.h>
 #include <net/ip_codes.h>
@@ -45 +47 @@
 /** IP module messages. */
 typedef enum {
-        /** New device message.
-         * @see ip_device_req()
-         */
-        NET_IP_DEVICE = NET_IP_FIRST,
-        
         /** Adds the routing entry.
          * @see ip_add_route()
          */
-        NET_IP_ADD_ROUTE,
-        
+        NET_IP_ADD_ROUTE = NET_IP_FIRST,
         /** Gets the actual route information.
          * @see ip_get_route()
          */
         NET_IP_GET_ROUTE,
-        
         /** Processes the received error notification.
          * @see ip_received_error_msg()
          */
         NET_IP_RECEIVED_ERROR,
-        
         /** Sets the default gateway.
          * @see ip_set_default_gateway()
          */
-        NET_IP_SET_GATEWAY,
-        
-        /** Packet size message.
-         * @see ip_packet_size_req()
-         */
-        NET_IP_PACKET_SPACE,
-        
-        /** Packet send message.
-         * @see ip_send_msg()
-         */
-        NET_IP_SEND
+        NET_IP_SET_GATEWAY
 } ip_messages;
 
@@ -84 +68 @@
 /*@{*/
 
-/** Return the address message parameter.
- *
- * @param[in] call Message call structure.
- *
+/** 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.s_addr = IPC_GET_ARG3(*call); \
                 addr; \
         })
 
-/** Return the gateway message parameter.
- *
- * @param[in] call Message call structure.
- *
+/** 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.s_addr = IPC_GET_ARG2(*call); \
                 addr; \
         })
 
-/** Set the header length in the message answer.
- *
- * @param[out] answer Message answer structure.
- *
+/** Sets the header length in the message answer.
+ * @param[out] answer The message answer structure.
  */
-#define IP_SET_HEADERLEN(answer, value)  IPC_SET_ARG2(answer, (sysarg_t) (value))
+#define IP_SET_HEADERLEN(answer, value) \
+        do { \
+                ipcarg_t argument = (ipcarg_t) (value); \
+                IPC_SET_ARG2(*answer, argument); \
+        } while (0)
 
-/** Return the network mask message parameter.
- *
- * @param[in] call Message call structure.
- *
+/** 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.s_addr = IPC_GET_ARG4(*call); \
                 addr; \
         })
 
-/** Return the protocol message parameter.
- *
- * @param[in] call Message call structure.
- *
+/** Returns the protocol message parameter.
+ * @param[in] call The message call structure.
  */
-#define IP_GET_PROTOCOL(call)  ((ip_protocol_t) IPC_GET_ARG1(call))
+#define IP_GET_PROTOCOL(call) \
+        ({ \
+                ip_protocol_t protocol = (ip_protocol_t) IPC_GET_ARG1(*call); \
+                protocol; \
+        })
 
 /*@}*/