Changeset 14f1db0 in mainline for uspace/srv/net/nil/eth/eth_module.c

Timestamp:

2010-04-09T12:54:57Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a1caa3c2

Parents:

24ab58b3

Message:

networking overhaul:

• separation of conserns
• removal of (almost all) overlaping symbols, libnetif is not needed anymore
• again, it is possible to build the networking in multiple architecture configurations (however, currently only the bundling netif and nil layers is supported, more to come)
• code style updates and fixes (still a huge amount of work to do)

File:

• uspace/srv/net/nil/eth/eth_module.c (modified) (3 diffs)

uspace/srv/net/nil/eth/eth_module.c

@@ -46 +46 @@
 #include <net_interface.h>
 #include <packet/packet.h>
-#include <nil_module.h>
-#include <nil_standalone.h>
+#include <nil_local.h>
 
 #include "eth.h"
@@ -59 +58 @@
  *  @returns Other error codes as defined for the REGISTER_ME() macro function.
  */
-int nil_module_start(async_client_conn_t client_connection){
+int nil_module_start_standalone(async_client_conn_t client_connection)
+{
         ERROR_DECLARE;
-
+        
+        async_set_client_connection(client_connection);
+        int net_phone = net_connect_module(SERVICE_NETWORKING);
+        ERROR_PROPAGATE(pm_init());
+        
         ipcarg_t phonehash;
-        int net_phone;
-
-        async_set_client_connection(client_connection);
-        net_phone = net_connect_module(SERVICE_NETWORKING);
-        ERROR_PROPAGATE(pm_init());
-        if(ERROR_OCCURRED(nil_initialize(net_phone))
-                || ERROR_OCCURRED(REGISTER_ME(SERVICE_ETHERNET, &phonehash))){
+        if (ERROR_OCCURRED(nil_initialize(net_phone))
+            || ERROR_OCCURRED(REGISTER_ME(SERVICE_ETHERNET, &phonehash))) {
                 pm_destroy();
                 return ERROR_CODE;
         }
-
+        
         async_manager();
-
+        
         pm_destroy();
         return EOK;
@@ -95 +94 @@
  *
  */
-int nil_module_message(const char *name, ipc_callid_t callid, ipc_call_t *call,
+int nil_module_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call,
     ipc_call_t *answer, int *answer_count)
 {
-        return nil_message(name, callid, call, answer, answer_count);
+        return nil_message_standalone(name, callid, call, answer, answer_count);
 }