Changeset 8b5690f in mainline for uspace/lib/c/include/ipc/ip.h

Timestamp:

2011-02-03T05:11:01Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba38f72c

Parents:

22027b6e (diff), 86d7bfa (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/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>
@@ -47 +45 @@
 /** 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_FIRST,
+        NET_IP_ADD_ROUTE,
+        
         /** 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
+        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
 } ip_messages;
 
@@ -68 +84 @@
 /*@{*/
 
-/** Returns the address message parameter.
- * @param[in] call The message call structure.
+/** Return the address message parameter.
+ *
+ * @param[in] call 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; \
         })
 
-/** Returns the gateway message parameter.
- * @param[in] call The message call structure.
+/** Return the gateway message parameter.
+ *
+ * @param[in] call 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; \
         })
 
-/** Sets the header length in the message answer.
- * @param[out] answer The message answer structure.
+/** Set the header length in the message answer.
+ *
+ * @param[out] answer Message answer structure.
+ *
  */
-#define IP_SET_HEADERLEN(answer, value) \
-        do { \
-                sysarg_t argument = (sysarg_t) (value); \
-                IPC_SET_ARG2(*answer, argument); \
-        } while (0)
+#define IP_SET_HEADERLEN(answer, value)  IPC_SET_ARG2(answer, (sysarg_t) (value))
 
-/** Returns the network mask message parameter.
- * @param[in] call The message call structure.
+/** Return the network mask message parameter.
+ *
+ * @param[in] call 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; \
         })
 
-/** Returns the protocol message parameter.
- * @param[in] call The message call structure.
+/** Return the protocol message parameter.
+ *
+ * @param[in] call Message call structure.
+ *
  */
-#define IP_GET_PROTOCOL(call) \
-        ({ \
-                ip_protocol_t protocol = (ip_protocol_t) IPC_GET_ARG1(*call); \
-                protocol; \
-        })
+#define IP_GET_PROTOCOL(call)  ((ip_protocol_t) IPC_GET_ARG1(call))
 
 /*@}*/