Changeset 59ecd4a in mainline for uspace/srv/net/il/ip/ip_module.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/srv/net/il/ip/ip_module.c (modified) (3 diffs)

uspace/srv/net/il/ip/ip_module.c

@@ -40 +40 @@
 #include <async.h>
 #include <stdio.h>
-
 #include <ipc/ipc.h>
 #include <ipc/services.h>
 
-#include "../../err.h"
-#include "../../modules.h"
-
-#include "../../include/net_interface.h"
-
-#include "../../structures/packet/packet.h"
+#include <net_err.h>
+#include <net_modules.h>
+#include <net_interface.h>
+#include <packet/packet.h>
+#include <il_standalone.h>
 
 #include "ip.h"
 #include "ip_module.h"
-
-/** IP module name.
- */
-#define NAME    "IP protocol"
 
 /** IP module global data.
@@ -70 +64 @@
  *  @returns Other error codes as defined for the ip_message() function.
  */
-int module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count);
-
-/** Prints the module name.
- *  @see NAME
- */
-void module_print_name(void);
+int il_module_message(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
+        return ip_message(callid, call, answer, answer_count);
+}
 
 /** Starts the IP module.
@@ -84 +75 @@
  *  @returns Other error codes as defined for the REGISTER_ME() macro 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 ip_message(callid, call, answer, answer_count);
-}
-
-void module_print_name(void){
-        printf("%s", NAME);
-}
-
-int module_start(async_client_conn_t client_connection){
+int il_module_start(async_client_conn_t client_connection){
         ERROR_DECLARE;