Changes in uspace/srv/net/nil/eth/eth_module.c [849ed54:14f1db0] in mainline

File:

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

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

@@ -46 +46 @@
 #include <net_interface.h>
 #include <packet/packet.h>
-#include <nil_standalone.h>
+#include <nil_local.h>
 
 #include "eth.h"
@@ -58 +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;
 }
 
-/** Passes the parameters to the module specific nil_message() function.
- *  @param[in] callid The message identifier.
- *  @param[in] call The message parameters.
- *  @param[out] answer The message answer parameters.
- *  @param[out] answer_count The last parameter for the actual answer in the answer parameter.
- *  @returns EOK on success.
- *  @returns ENOTSUP if the message is not known.
- *  @returns Other error codes as defined for each specific module message function.
+/** Pass the parameters to the module specific nil_message() function.
+ *
+ * @param[in]  name         Module name.
+ * @param[in]  callid       The message identifier.
+ * @param[in]  call         The message parameters.
+ * @param[out] answer       The message answer parameters.
+ * @param[out] answer_count The last parameter for the actual answer
+ *                          in the answer parameter.
+ *
+ * @return EOK on success.
+ * @return ENOTSUP if the message is not known.
+ * @return Other error codes as defined for each
+ *         specific module message function.
+ *
  */
-int nil_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
-        return nil_message(callid, call, answer, answer_count);
+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_standalone(name, callid, call, answer, answer_count);
 }