Changeset f4f866c in mainline for uspace/srv/net/il/ip/ip_module.c
- Timestamp:
- 2010-04-23T21:42:26Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 6c39a907
- Parents:
- 38aaacc2 (diff), 80badbe (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/il/ip/ip_module.c
r38aaacc2 rf4f866c 47 47 #include <net_interface.h> 48 48 #include <packet/packet.h> 49 #include <il_ standalone.h>49 #include <il_local.h> 50 50 51 51 #include "ip.h" … … 54 54 /** IP module global data. 55 55 */ 56 extern ip_globals_t 56 extern ip_globals_t ip_globals; 57 57 58 58 /** Processes the IP message. … … 64 64 * @returns Other error codes as defined for the ip_message() function. 65 65 */ 66 int il_module_message (ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){67 return ip_message (callid, call, answer, answer_count);66 int il_module_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){ 67 return ip_message_standalone(callid, call, answer, answer_count); 68 68 } 69 69 … … 75 75 * @returns Other error codes as defined for the REGISTER_ME() macro function. 76 76 */ 77 int il_module_start (async_client_conn_t client_connection){77 int il_module_start_standalone(async_client_conn_t client_connection){ 78 78 ERROR_DECLARE; 79 80 ipcarg_t phonehash; 81 79 82 80 async_set_client_connection(client_connection); 83 81 ip_globals.net_phone = net_connect_module(SERVICE_NETWORKING); 84 82 ERROR_PROPAGATE(pm_init()); 85 if(ERROR_OCCURRED(ip_initialize(client_connection)) 86 || ERROR_OCCURRED(REGISTER_ME(SERVICE_IP, &phonehash))){ 83 84 ipcarg_t phonehash; 85 if (ERROR_OCCURRED(ip_initialize(client_connection)) 86 || ERROR_OCCURRED(REGISTER_ME(SERVICE_IP, &phonehash))) { 87 87 pm_destroy(); 88 88 return ERROR_CODE; 89 89 } 90 90 91 91 async_manager(); 92 92 93 93 pm_destroy(); 94 94 return EOK;
Note:
See TracChangeset
for help on using the changeset viewer.