Changeset f87ec535 in mainline

Timestamp:

2010-10-15T18:48:08Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

522253c1

Parents:

c89eefb

Message:

Move ARP module messages definitions to standard library.

Location:

uspace

Files:

• lib/c/include/ipc/arp.h (moved) (moved from uspace/lib/net/include/arp_messages.h ) (1 diff)
• lib/net/il/arp_remote.c (modified) (2 diffs)
• srv/net/il/arp/arp.c (modified) (2 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup arp
- *  @{
+/** @addtogroup libc
+ * @{
  */
 
 /** @file
- *  ARP module messages.
- *  @see arp_interface.h
+ * ARP module messages.
+ * @see arp_interface.h
  */
 
-#ifndef __NET_ARP_MESSAGES__
-#define __NET_ARP_MESSAGES__
+#ifndef LIBC_ARP_MESSAGES_
+#define LIBC_ARP_MESSAGES_
 
 #include <ipc/ipc.h>
 #include <ipc/net.h>
 
-/** ARP module messages.
- */
-typedef enum{
+/** ARP module messages. */
+typedef enum {
         /** Clean cache message.
-         *  @see arp_clean_cache()
+         * @see arp_clean_cache()
          */
         NET_ARP_CLEAN_CACHE = NET_ARP_FIRST,
         /** Clear address cache message.
-         *  @see arp_clear_address_msg()
+         * @see arp_clear_address_msg()
          */
         NET_ARP_CLEAR_ADDRESS,
         /** Clear device cache message.
-         *  @see arp_clear_device_req()
+         * @see arp_clear_device_req()
          */
         NET_ARP_CLEAR_DEVICE,
         /** New device message.
-         *  @see arp_device_req()
+         * @see arp_device_req()
          */
         NET_ARP_DEVICE,
         /** Address translation message.
-         *  @see arp_translate_req()
+         * @see arp_translate_req()
          */
         NET_ARP_TRANSLATE
 } arp_messages;
 
-/** @name ARP specific message parameters definitions
- */
+/** @name ARP specific message parameters definitions */
 /*@{*/
 
 /** Returns the protocol service message parameter.
- *  @param[in] call The message call structure.
+ * @param[in] call The message call structure.
  */
 #define ARP_GET_NETIF(call) \
-        ({services_t service = (services_t) IPC_GET_ARG2(*call); service;})
+        ({ \
+                services_t service = (services_t) IPC_GET_ARG2(*call); \
+                service; \
+        })
 
 /*@}*/

uspace/lib/net/il/arp_remote.c

@@ -37 +37 @@
 
 #include <arp_interface.h>
-#include <arp_messages.h>
 #include <generic.h>
 
@@ -44 +43 @@
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/arp.h>
 
 #include <net/modules.h>

uspace/srv/net/il/arp/arp.c

@@ -46 +46 @@
 #include <ipc/services.h>
 #include <ipc/net.h>
+#include <ipc/arp.h>
 #include <byteorder.h>
 #include <err.h>
@@ -61 +62 @@
 #include <il_interface.h>
 #include <il_local.h>
-#include <arp_messages.h>
 
 #include "arp.h"