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

Timestamp:

2011-02-03T05:11:01Z (13 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/netif.h (modified) (3 diffs)

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

@@ -38 +38 @@
 #define LIBC_NETIF_MESSAGES_H_
 
-#include <ipc/ipc.h>
 #include <ipc/net.h>
 
@@ -47 +46 @@
          */
         NET_NETIF_PROBE = NET_NETIF_FIRST,
+        
         /** Send packet message.
          * @see netif_send_msg()
          */
         NET_NETIF_SEND,
+        
         /** Start device message.
          * @see netif_start_req()
          */
         NET_NETIF_START,
+        
         /** Get device usage statistics message.
          * @see netif_stats_req()
          */
         NET_NETIF_STATS,
+        
         /** Stop device message.
          * @see netif_stop_req()
          */
         NET_NETIF_STOP,
+        
         /** Get device address message.
          * @see netif_get_addr_req()
@@ -73 +77 @@
 
 /** 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))
 
 /*@}*/