Changeset cf2af94 in mainline for uspace/lib/net/il/arp_remote.c

Timestamp:

2011-02-09T11:46:47Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cb15135a

Parents:

a49c4002 (diff), 0b37882 (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

Local modifications:

• change pipefs and ext2 to build again (use async_* calls instead of ipc_*)

File:

• uspace/lib/net/il/arp_remote.c (modified) (5 diffs)

uspace/lib/net/il/arp_remote.c ¶

@@ -41 +41 @@
 #include <async.h>
 #include <errno.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <ipc/arp.h>
@@ -86 +85 @@
 {
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
 
         message_id = async_send_2(arp_phone, NET_ARP_CLEAR_ADDRESS,
-            (ipcarg_t) device_id, protocol, NULL);
+            (sysarg_t) device_id, protocol, NULL);
         measured_strings_send(arp_phone, address, 1);
         async_wait_for(message_id, &result);
@@ -106 +105 @@
 {
         return (int) async_req_1_0(arp_phone, NET_ARP_CLEAR_DEVICE,
-            (ipcarg_t) device_id);
+            (sysarg_t) device_id);
 }
 
@@ -136 +135 @@
 {
         aid_t message_id;
-        ipcarg_t result;
+        sysarg_t result;
 
         message_id = async_send_3(arp_phone, NET_ARP_DEVICE,
-            (ipcarg_t) device_id, protocol, netif, NULL);
+            (sysarg_t) device_id, protocol, netif, NULL);
         measured_strings_send(arp_phone, address, 1);
         async_wait_for(message_id, &result);
@@ -165 +164 @@
 int
 arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol,
-    measured_string_t *address, measured_string_t **translation, char **data)
+    measured_string_t *address, measured_string_t **translation, uint8_t **data)
 {
         return generic_translate_req(arp_phone, NET_ARP_TRANSLATE, device_id,