Changeset 60ab6c3 in mainline for uspace/srv/net/il/arp/arp_remote.c

Timestamp:

2010-03-10T05:46:54Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5782081

Parents:

71b00dcc (diff), b48ebd19 (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 from lp:~lukasmejdrech/helenos/network.

File:

• uspace/srv/net/il/arp/arp_remote.c (modified) (3 diffs)

uspace/srv/net/il/arp/arp_remote.c

@@ -52 +52 @@
 #include "arp_messages.h"
 
-int arp_device_req(int arp_phone, device_id_t device_id, services_t protocol, services_t netif, measured_string_ref address){
-        aid_t message_id;
-        ipcarg_t result;
-
-        message_id = async_send_3(arp_phone, NET_ARP_DEVICE, (ipcarg_t) device_id, protocol, netif, NULL);
-        measured_strings_send(arp_phone, address, 1);
-        async_wait_for(message_id, &result);
-        return (int) result;
+int arp_connect_module(services_t service){
+        if(service != SERVICE_ARP){
+                return EINVAL;
+        }
+        return connect_to_service(SERVICE_ARP);
 }
 
-int arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address, measured_string_ref * translation, char ** data){
-        return generic_translate_req(arp_phone, NET_ARP_TRANSLATE, device_id, protocol, address, 1, translation, data);
-}
-
-int arp_clear_device_req(int arp_phone, device_id_t device_id){
-        return (int) async_req_1_0(arp_phone, NET_ARP_CLEAR_DEVICE, (ipcarg_t) device_id);
+int arp_clean_cache_req(int arp_phone){
+        return (int) async_req_0_0(arp_phone, NET_ARP_CLEAN_CACHE);
 }
 
@@ -80 +73 @@
 }
 
-int arp_clean_cache_req(int arp_phone){
-        return (int) async_req_0_0(arp_phone, NET_ARP_CLEAN_CACHE);
+int arp_clear_device_req(int arp_phone, device_id_t device_id){
+        return (int) async_req_1_0(arp_phone, NET_ARP_CLEAR_DEVICE, (ipcarg_t) device_id);
 }
 
-int arp_connect_module(services_t service){
-        if(service != SERVICE_ARP){
-                return EINVAL;
-        }
-        return connect_to_service(SERVICE_ARP);
+int arp_device_req(int arp_phone, device_id_t device_id, services_t protocol, services_t netif, measured_string_ref address){
+        aid_t message_id;
+        ipcarg_t result;
+
+        message_id = async_send_3(arp_phone, NET_ARP_DEVICE, (ipcarg_t) device_id, protocol, netif, NULL);
+        measured_strings_send(arp_phone, address, 1);
+        async_wait_for(message_id, &result);
+        return (int) result;
 }
 
@@ -95 +91 @@
 }
 
+int arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address, measured_string_ref * translation, char ** data){
+        return generic_translate_req(arp_phone, NET_ARP_TRANSLATE, device_id, protocol, address, 1, translation, data);
+}
+
 /** @}
  */