Changeset 779a47d in mainline

Timestamp:

2010-10-15T19:04:29Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

3a5d892f

Parents:

522253c1

Message:

Move IP module messages definitions to standard library.

Location:

uspace

Files:

• lib/c/include/ipc/ip.h (moved) (moved from uspace/lib/net/include/ip_messages.h ) (2 diffs)
• lib/net/il/ip_remote.c (modified) (2 diffs)
• srv/net/il/ip/ip.c (modified) (2 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup ip
- *  @{
+/** @addtogroup libc
+ * @{
  */
 
 /** @file
- *  IP module messages.
- *  @see ip_interface.h
+ * IP module messages.
+ * @see ip_interface.h
  */
 
-#ifndef __NET_IP_MESSAGES_H__
-#define __NET_IP_MESSAGES_H__
+#ifndef LIBC_IP_MESSAGES_H_
+#define LIBC_IP_MESSAGES_H_
 
 #include <ipc/ipc.h>
@@ -45 +45 @@
 #include <net/ip_codes.h>
 
-/** IP module messages.
- */
-typedef enum{
+/** IP module messages. */
+typedef enum {
         /** Adds the routing entry.
-         *  @see ip_add_route()
+         * @see ip_add_route()
          */
         NET_IP_ADD_ROUTE = NET_IP_FIRST,
         /** Gets the actual route information.
-         *  @see ip_get_route()
+         * @see ip_get_route()
          */
         NET_IP_GET_ROUTE,
         /** Processes the received error notification.
-         *  @see ip_received_error_msg()
+         * @see ip_received_error_msg()
          */
         NET_IP_RECEIVED_ERROR,
         /** Sets the default gateway.
-         *  @see ip_set_default_gateway()
+         * @see ip_set_default_gateway()
          */
         NET_IP_SET_GATEWAY
 } ip_messages;
 
-/** @name IP specific message parameters definitions
- */
+/** @name IP specific message parameters definitions */
 /*@{*/
 
 /** Returns the address message parameter.
- *  @param[in] call The message call structure.
+ * @param[in] call The message call structure.
  */
 #define IP_GET_ADDRESS(call) \
-        ({in_addr_t addr; addr.s_addr = IPC_GET_ARG3(*call); addr;})
+        ({ \
+                in_addr_t addr; \
+                addr.s_addr = IPC_GET_ARG3(*call); \
+                addr; \
+        })
 
 /** Returns the gateway message parameter.
- *  @param[in] call The message call structure.
+ * @param[in] call The message call structure.
  */
 #define IP_GET_GATEWAY(call) \
-        ({in_addr_t addr; addr.s_addr = IPC_GET_ARG2(*call); addr;})
+        ({ \
+                in_addr_t addr; \
+                addr.s_addr = IPC_GET_ARG2(*call); \
+                addr; \
+        })
 
 /** Sets the header length in the message answer.
- *  @param[out] answer The message answer structure.
+ * @param[out] answer The message answer structure.
  */
 #define IP_SET_HEADERLEN(answer, value) \
-        {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG2(*answer, argument);}
+        do { \
+                ipcarg_t argument = (ipcarg_t) (value); \
+                IPC_SET_ARG2(*answer, argument); \
+        } while (0)
 
 /** Returns the network mask message parameter.
- *  @param[in] call The message call structure.
+ * @param[in] call The message call structure.
  */
 #define IP_GET_NETMASK(call) \
-        ({in_addr_t addr; addr.s_addr = IPC_GET_ARG4(*call); addr;})
+        ({ \
+                in_addr_t addr; \
+                addr.s_addr = IPC_GET_ARG4(*call); \
+                addr; \
+        })
 
 /** Returns the protocol message parameter.
- *  @param[in] call The message call structure.
+ * @param[in] call The message call structure.
  */
 #define IP_GET_PROTOCOL(call) \
-        ({ip_protocol_t protocol = (ip_protocol_t) IPC_GET_ARG1(*call); protocol;})
+        ({ \
+                ip_protocol_t protocol = (ip_protocol_t) IPC_GET_ARG1(*call); \
+                protocol; \
+        })
 
 /*@}*/

uspace/lib/net/il/ip_remote.c

@@ -42 +42 @@
 #include <ip_remote.h>
 #include <ip_interface.h>
-#include <ip_messages.h>
 #include <packet_client.h>
 #include <generic.h>
@@ -48 +47 @@
 #include <ipc/services.h>
 #include <ipc/il.h>
+#include <ipc/ip.h>
 
 #include <net/modules.h>

uspace/srv/net/il/ip/ip.c

@@ -46 +46 @@
 #include <ipc/net.h>
 #include <ipc/il.h>
+#include <ipc/ip.h>
 #include <sys/types.h>
 #include <byteorder.h>
@@ -78 +79 @@
 #include "ip.h"
 #include "ip_header.h"
-#include "ip_messages.h"
 #include "ip_module.h"