Changeset 89c57b6 in mainline for uspace/lib/c/include/ipc/netif.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/netif.h (moved) (moved from uspace/lib/net/include/netif_messages.h ) (2 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup netif
+/** @addtogroup libc
  * @{
  */
@@ -35 +35 @@
  */
 
-#ifndef __NET_NETIF_MESSAGES_H__
-#define __NET_NETIF_MESSAGES_H__
+#ifndef LIBC_NETIF_MESSAGES_H_
+#define LIBC_NETIF_MESSAGES_H_
 
-#include <ipc/ipc.h>
+#include <ipc/net.h>
 
-#include <net_messages.h>
-
-/** Network interface common module messages.
- */
+/** Network interface common module messages. */
 typedef enum {
         /** Probe device message.
-         *  @see netif_probe_req()
+         * @see netif_probe_req()
          */
         NET_NETIF_PROBE = NET_NETIF_FIRST,
+        
         /** Send packet message.
-         *  @see netif_send_msg()
+         * @see netif_send_msg()
          */
         NET_NETIF_SEND,
+        
         /** Start device message.
-         *  @see netif_start_req()
+         * @see netif_start_req()
          */
         NET_NETIF_START,
+        
         /** Get device usage statistics message.
-         *  @see netif_stats_req()
+         * @see netif_stats_req()
          */
         NET_NETIF_STATS,
+        
         /** Stop device message.
-         *  @see netif_stop_req()
+         * @see netif_stop_req()
          */
         NET_NETIF_STOP,
+        
         /** Get device address message.
-         *  @see netif_get_addr_req()
+         * @see netif_get_addr_req()
          */
         NET_NETIF_GET_ADDR,
 } netif_messages;
 
-/** @name Network interface specific message parameters definitions
- */
+/** @name Network interface specific message parameters definitions */
 /*@{*/
 
 /** Return the interrupt number message parameter.
- * @param[in] call The message call structure.
+ *
+ * @param[in] call Mmessage call structure.
+ *
  */
-#define NETIF_GET_IRQ(call) \
-        ({int irq = (int) IPC_GET_ARG2(*call); irq;})
+#define NETIF_GET_IRQ(call) ((int) IPC_GET_ARG2(call))
 
 /** Return the input/output address message parameter.
- * @param[in] call The message call structure.
+ *
+ * @param[in] call Message call structure.
+ *
  */
-#define NETIF_GET_IO(call) \
-        ({int io = (int) IPC_GET_ARG3(*call); io;})
+#define NETIF_GET_IO(call) ((void *) IPC_GET_ARG3(call))
 
 /*@}*/