Changeset 89c57b6 in mainline for uspace/lib/c/include/ipc/arp.h

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/arp.h (moved) (moved from uspace/lib/net/include/arp_messages.h ) (1 diff)

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>
 
-#include <net_messages.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.
+/** Return the protocol service message parameter.
+ *
+ * @param[in] call Message call structure.
+ *
  */
-#define ARP_GET_NETIF(call) \
-        ({services_t service = (services_t) IPC_GET_ARG2(*call); service;})
+#define ARP_GET_NETIF(call) ((services_t) IPC_GET_ARG2(call))
 
 /*@}*/