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

Timestamp:

2011-06-01T08:43:42Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8d6c1f1

Parents:

9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually

File:

• uspace/lib/net/il/ip_remote.c (modified) (13 diffs)

uspace/lib/net/il/ip_remote.c

@@ -36 +36 @@
  *
  * @see ip_interface.h
- * @see il_interface.h
+ * @see il_remote.h
  *
  */
@@ -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);
 }
 
@@ -78 +78 @@
  * @param[in] me        The requesting module service.
  * @param[in] receiver  The message receiver. Used for remote connection.
- * @returns             The phone of the needed service.
- * @returns             EOK on success.
- * @returns             Other error codes as defined for the bind_service()
+ * @return              The phone of the needed service.
+ * @return              EOK on success.
+ * @return              Other error codes as defined for the bind_service()
  *                      function.
  */
@@ -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);
 }
@@ -93 +93 @@
  *
  * @param service       The IP module service. Ignored parameter.
- * @returns             The IP module phone on success.
+ * @return              The IP module phone on success.
  */
 int ip_connect_module(services_t service)
@@ -121 +121 @@
     services_t service)
 {
-        return generic_device_req_remote(ip_phone, NET_IL_DEVICE, device_id, 0,
+        return generic_device_req_remote(ip_phone, NET_IP_DEVICE, device_id, 0,
             service);
 }
@@ -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);
         
@@ -170 +170 @@
                 free(*header);
         else
-                *device_id = IPC_GET_DEVICE(&answer);
+                *device_id = IPC_GET_DEVICE(answer);
         
         return (int) result;
@@ -186 +186 @@
  */
 int ip_packet_size_req_remote(int ip_phone, device_id_t device_id,
-    packet_dimension_ref packet_dimension)
-{
-        return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE,
+    packet_dimension_t *packet_dimension)
+{
+        return generic_packet_size_req_remote(ip_phone, NET_IP_PACKET_SPACE,
             device_id, packet_dimension);
 }
@@ -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)
 {
-        return generic_send_msg_remote(ip_phone, NET_IL_SEND, device_id,
+        return generic_send_msg_remote(ip_phone, NET_IP_SEND, device_id,
             packet_get_id(packet), sender, 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);
 }