Changeset 4687a26c in mainline for uspace/srv/net/il/ip/ip_module.c


Ignore:
Timestamp:
2010-11-02T18:29:01Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade
Children:
4f35b9ff
Parents:
76e1121f (diff), 28f4adb (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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/il/ip/ip_module.c

    r76e1121f r4687a26c  
    3232
    3333/** @file
    34  *  IP standalone module implementation.
    35  *  Contains skeleton module functions mapping.
    36  *  The functions are used by the module skeleton as module specific entry points.
    37  *  @see module.c
     34 * IP standalone module implementation.
     35 * Contains skeleton module functions mapping.
     36 * The functions are used by the module skeleton as module specific entry
     37 * points.
     38 *
     39 * @see module.c
    3840 */
    3941
     
    4244#include <ipc/ipc.h>
    4345#include <ipc/services.h>
     46#include <err.h>
    4447
    45 #include <net_err.h>
    46 #include <net_modules.h>
     48#include <net/modules.h>
    4749#include <net_interface.h>
    48 #include <packet/packet.h>
     50#include <net/packet.h>
    4951#include <il_local.h>
    5052
     
    5254#include "ip_module.h"
    5355
    54 /** IP module global data.
    55  */
     56/** IP module global data. */
    5657extern ip_globals_t ip_globals;
    5758
    58 /** Processes the IP message.
    59  *  @param[in] callid The message identifier.
    60  *  @param[in] call The message parameters.
    61  *  @param[out] answer The message answer parameters.
    62  *  @param[out] answer_count The last parameter for the actual answer in the answer parameter.
    63  *  @returns EOK on success.
    64  *  @returns Other error codes as defined for the ip_message() function.
    65  */
    66 int il_module_message_standalone(ipc_callid_t callid, ipc_call_t * call, ipc_call_t * answer, int * answer_count){
     59int
     60il_module_message_standalone(ipc_callid_t callid, ipc_call_t *call,
     61    ipc_call_t *answer, int *answer_count)
     62{
    6763        return ip_message_standalone(callid, call, answer, answer_count);
    6864}
    6965
    70 /** Starts the IP module.
    71  *  Initializes the client connection serving function, initializes the module, registers the module service and starts the async manager, processing IPC messages in an infinite loop.
    72  *  @param[in] client_connection The client connection processing function. The module skeleton propagates its own one.
    73  *  @returns EOK on successful module termination.
    74  *  @returns Other error codes as defined for the ip_initialize() function.
    75  *  @returns Other error codes as defined for the REGISTER_ME() macro function.
    76  */
    77 int il_module_start_standalone(async_client_conn_t client_connection){
     66int il_module_start_standalone(async_client_conn_t client_connection)
     67{
    7868        ERROR_DECLARE;
    7969       
    8070        async_set_client_connection(client_connection);
    81         ip_globals.net_phone = net_connect_module(SERVICE_NETWORKING);
     71        ip_globals.net_phone = net_connect_module();
    8272        ERROR_PROPAGATE(pm_init());
    8373       
    8474        ipcarg_t phonehash;
    85         if (ERROR_OCCURRED(ip_initialize(client_connection))
    86             || ERROR_OCCURRED(REGISTER_ME(SERVICE_IP, &phonehash))) {
     75        if (ERROR_OCCURRED(ip_initialize(client_connection)) ||
     76            ERROR_OCCURRED(REGISTER_ME(SERVICE_IP, &phonehash))) {
    8777                pm_destroy();
    8878                return ERROR_CODE;
Note: See TracChangeset for help on using the changeset viewer.