Changeset 87b4baa in mainline for uspace/lib/c/include/ipc/net.h

Timestamp:

2010-12-17T20:16:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (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/net.h (modified) (18 diffs)

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

@@ -192 +192 @@
  */
 #define IS_NET_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_FIRST, NET_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_FIRST, NET_LAST)
 
 /** Returns a value indicating whether the IPC call is an ARP message.
@@ -198 +198 @@
  */
 #define IS_NET_ARP_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_ARP_FIRST, NET_ARP_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_ARP_FIRST, NET_ARP_LAST)
 
 /** Returns a value indicating whether the IPC call is an Ethernet message.
@@ -204 +204 @@
  */
 #define IS_NET_ETH_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_ETH_FIRST, NET_ETH_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_ETH_FIRST, NET_ETH_LAST)
 
 /** Returns a value indicating whether the IPC call is an ICMP message.
@@ -210 +210 @@
  */
 #define IS_NET_ICMP_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_ICMP_FIRST, NET_ICMP_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_ICMP_FIRST, NET_ICMP_LAST)
 
 /** Returns a value indicating whether the IPC call is an inter-network layer
@@ -217 +217 @@
  */
 #define IS_NET_IL_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_IL_FIRST, NET_IL_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_IL_FIRST, NET_IL_LAST)
 
 /** Returns a value indicating whether the IPC call is an IP message.
@@ -223 +223 @@
  */
 #define IS_NET_IP_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_IP_FIRST, NET_IP_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_IP_FIRST, NET_IP_LAST)
 
 /** Returns a value indicating whether the IPC call is a generic networking
@@ -230 +230 @@
  */
 #define IS_NET_NET_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_NET_FIRST, NET_NET_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_NET_FIRST, NET_NET_LAST)
 
 /** Returns a value indicating whether the IPC call is a network interface layer
@@ -237 +237 @@
  */
 #define IS_NET_NIL_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_NIL_FIRST, NET_NIL_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_NIL_FIRST, NET_NIL_LAST)
 
 /** Returns a value indicating whether the IPC call is a packet manaagement
@@ -244 +244 @@
  */
 #define IS_NET_PACKET_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_PACKET_FIRST, NET_PACKET_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_PACKET_FIRST, NET_PACKET_LAST)
 
 /** Returns a value indicating whether the IPC call is a socket message.
@@ -250 +250 @@
  */
 #define IS_NET_SOCKET_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_SOCKET_FIRST, NET_SOCKET_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_SOCKET_FIRST, NET_SOCKET_LAST)
 
 /** Returns a value indicating whether the IPC call is a TCP message.
@@ -256 +256 @@
  */
 #define IS_NET_TCP_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_TCP_FIRST, NET_TCP_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_TCP_FIRST, NET_TCP_LAST)
 
 /** Returns a value indicating whether the IPC call is a transport layer message.
@@ -262 +262 @@
  */
 #define IS_NET_TL_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_TL_FIRST, NET_TL_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_TL_FIRST, NET_TL_LAST)
 
 /** Returns a value indicating whether the IPC call is a UDP message.
@@ -268 +268 @@
  */
 #define IS_NET_UDP_MESSAGE(call) \
-        IS_IN_INTERVAL(IPC_GET_METHOD(*call), NET_UDP_FIRST, NET_UDP_LAST)
+        IS_IN_INTERVAL(IPC_GET_IMETHOD(*call), NET_UDP_FIRST, NET_UDP_LAST)
 
 /*@}*/
@@ -370 +370 @@
 #define IPC_SET_DEVICE(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG1(*answer, argument); \
         } while (0)
@@ -379 +379 @@
 #define IPC_SET_ADDR(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG1(*answer, argument); \
         } while (0)
@@ -388 +388 @@
 #define IPC_SET_PREFIX(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG2(*answer, argument); \
         } while (0)
@@ -397 +397 @@
 #define IPC_SET_CONTENT(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG3(*answer, argument); \
         } while (0)
@@ -406 +406 @@
 #define IPC_SET_SUFFIX(answer, value) \
         do { \
-                ipcarg_t argument = (ipcarg_t) (value); \
+                sysarg_t argument = (sysarg_t) (value); \
                 IPC_SET_ARG4(*answer, argument); \
         } while (0)