Changeset 973ef9fc in mainline for uspace/lib/net/il/ip_remote.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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/net/il/ip_remote.c (modified) (7 diffs)

uspace/lib/net/il/ip_remote.c

@@ -67 +67 @@
 {
         return (int) async_req_4_0(ip_phone, NET_IP_ADD_ROUTE,
-            (ipcarg_t) device_id, (ipcarg_t) gateway.s_addr,
-            (ipcarg_t) address.s_addr, (ipcarg_t) netmask.s_addr);
+            (sysarg_t) device_id, (sysarg_t) gateway.s_addr,
+            (sysarg_t) address.s_addr, (sysarg_t) netmask.s_addr);
 }
 
@@ -86 +86 @@
     async_client_conn_t receiver)
 {
-        return (int) bind_service(service, (ipcarg_t) protocol, me, service,
+        return (int) bind_service(service, (sysarg_t) protocol, me, service,
             receiver);
 }
@@ -151 +151 @@
         ipc_call_t answer;
         aid_t message_id = async_send_1(ip_phone, NET_IP_GET_ROUTE,
-            (ipcarg_t) protocol, &answer);
+            (sysarg_t) protocol, &answer);
         
         if ((async_data_write_start(ip_phone, destination, addrlen) == EOK) &&
@@ -164 +164 @@
         }
         
-        ipcarg_t result;
+        sysarg_t result;
         async_wait_for(message_id, &result);
         
@@ -204 +204 @@
  */
 int ip_received_error_msg_remote(int ip_phone, device_id_t device_id,
-    packet_t packet, services_t target, services_t error)
+    packet_t *packet, services_t target, services_t error)
 {
         return generic_received_msg_remote(ip_phone, NET_IP_RECEIVED_ERROR,
@@ -225 +225 @@
  *                      function.
  */
-int ip_send_msg_remote(int ip_phone, device_id_t device_id, packet_t packet,
+int ip_send_msg_remote(int ip_phone, device_id_t device_id, packet_t *packet,
     services_t sender, services_t error)
 {
@@ -244 +244 @@
 {
         return (int) async_req_2_0(ip_phone, NET_IP_SET_GATEWAY,
-            (ipcarg_t) device_id, (ipcarg_t) gateway.s_addr);
+            (sysarg_t) device_id, (sysarg_t) gateway.s_addr);
 }