Changeset 3aae4e8 in mainline for uspace/lib/net/netif/netif_nil_bundle.c

Timestamp:

2010-04-04T22:07:05Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

23de644

Parents:

9f10660f (diff), 73060801 (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/lib/net/netif/netif_nil_bundle.c (moved) (moved from uspace/srv/net/netif/netif_nil_bundle.c ) (3 diffs)

uspace/lib/net/netif/netif_nil_bundle.c

@@ -37 +37 @@
 
 #include <async.h>
-
 #include <ipc/ipc.h>
 
-#include "../messages.h"
-
-#include "../structures/packet/packet.h"
-
-#include "../nil/nil_module.h"
-
-#include "netif.h"
-
-/** Network interface module global data.
- */
-extern netif_globals_t netif_globals;
+#include <net_messages.h>
+#include <packet/packet.h>
+#include <nil_module.h>
+#include <netif_nil_bundle.h>
+#include <netif.h>
 
 /** Distributes the messages between the module parts.
@@ -61 +54 @@
  *  @returns Other error codes as defined for each specific module message function.
  */
-int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
+int netif_nil_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+        if(IS_NET_NIL_MESSAGE(call) || (IPC_GET_METHOD(*call) == IPC_M_CONNECT_TO_ME)){
+                return nil_message(callid, call, answer, answer_count);
+        }else{
+                return netif_message(callid, call, answer, answer_count);
+        }
+}
 
 /** Starts the bundle network interface module.
@@ -69 +68 @@
  *  @returns Other error codes as defined for each specific module message function.
  */
-int module_start(async_client_conn_t client_connection);
-
-int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
-        if(IS_NET_NIL_MESSAGE(call) || (IPC_GET_METHOD(*call) == IPC_M_CONNECT_TO_ME)){
-                return nil_message(callid, call, answer, answer_count);
-        }else{
-                return netif_message(callid, call, answer, answer_count);
-        }
-}
-
-int module_start(async_client_conn_t client_connection){
+int netif_nil_module_start(async_client_conn_t client_connection){
         ERROR_DECLARE;