Changeset f4f866c in mainline for uspace/srv/net/il/arp/arp_module.c

Timestamp:

2010-04-23T21:42:26Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (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/srv/net/il/arp/arp_module.c (modified) (3 diffs)

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

@@ -48 +48 @@
 #include <net_interface.h>
 #include <packet/packet.h>
-#include <il_standalone.h>
+#include <il_local.h>
 
 #include "arp.h"
@@ -65 +65 @@
  *  @returns Other error codes as defined for the arp_message() function.
  */
-int il_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
-        return arp_message(callid, call, answer, answer_count);
+int il_module_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+        return arp_message_standalone(callid, call, answer, answer_count);
 }
 
@@ -76 +76 @@
  *  @returns Other error codes as defined for the REGISTER_ME() macro function.
  */
-int il_module_start(async_client_conn_t client_connection){
+int il_module_start_standalone(async_client_conn_t client_connection){
         ERROR_DECLARE;
-
-        ipcarg_t phonehash;
-
+        
         async_set_client_connection(client_connection);
         arp_globals.net_phone = net_connect_module(SERVICE_NETWORKING);
         ERROR_PROPAGATE(pm_init());
-        if(ERROR_OCCURRED(arp_initialize(client_connection))
-                || ERROR_OCCURRED(REGISTER_ME(SERVICE_ARP, &phonehash))){
+        
+        ipcarg_t phonehash;
+        if (ERROR_OCCURRED(arp_initialize(client_connection))
+            || ERROR_OCCURRED(REGISTER_ME(SERVICE_ARP, &phonehash))) {
                 pm_destroy();
                 return ERROR_CODE;
         }
-
+        
         async_manager();
-
+        
         pm_destroy();
         return EOK;