Changeset 59ecd4a in mainline for uspace/lib/net/netif/netif_standalone.c

Timestamp:

2010-04-04T21:41:47Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5db9084

Parents:

36a75a2 (diff), ee7e82a9 (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_standalone.c (moved) (moved from uspace/srv/net/netif/netif_standalone.c ) (3 diffs)

uspace/lib/net/netif/netif_standalone.c

@@ -36 +36 @@
 
 #include <async.h>
-
 #include <ipc/ipc.h>
 
-#include "netif.h"
+#include <netif.h>
+#include <netif_standalone.h>
 
 /** Delegates the messages to the netif_message() function.
@@ -50 +50 @@
  *  @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_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+        return netif_message(callid, call, answer, answer_count);
+}
 
 /** Starts the network interface module.
@@ -58 +60 @@
  *  @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){
-        return netif_message(callid, call, answer, answer_count);
-}
-
-int module_start(async_client_conn_t client_connection){
+int netif_module_start(async_client_conn_t client_connection){
         ERROR_DECLARE;