Index: uspace/lib/net/include/nil_interface.h =================================================================== --- uspace/lib/net/include/nil_interface.h (revision 42a9f27abc46056863f33053b659f04aaccaa036) +++ uspace/lib/net/include/nil_interface.h (revision 404dbaecf9ad92b9da256083dcfe665a558b4f99) @@ -27,10 +27,10 @@ */ -/** @addtogroup net_nil - * @{ +/** @addtogroup libnet + * @{ */ -#ifndef __NET_NIL_INTERFACE_H__ -#define __NET_NIL_INTERFACE_H__ +#ifndef LIBNET_NIL_INTERFACE_H_ +#define LIBNET_NIL_INTERFACE_H_ #include @@ -47,6 +47,6 @@ #define nil_packet_size_req(nil_phone, device_id, packet_dimension) \ - generic_packet_size_req_remote(nil_phone, NET_NIL_PACKET_SPACE, device_id, \ - packet_dimension) + generic_packet_size_req_remote(nil_phone, NET_NIL_PACKET_SPACE, \ + device_id, packet_dimension) #define nil_get_addr_req(nil_phone, device_id, address, data) \ Index: uspace/lib/net/include/nil_local.h =================================================================== --- uspace/lib/net/include/nil_local.h (revision 42a9f27abc46056863f33053b659f04aaccaa036) +++ uspace/lib/net/include/nil_local.h (revision 404dbaecf9ad92b9da256083dcfe665a558b4f99) @@ -27,6 +27,6 @@ */ -/** @addtogroup net_nil - * @{ +/** @addtogroup libnet + * @{ */ @@ -36,6 +36,6 @@ */ -#ifndef __NET_NIL_LOCAL_H__ -#define __NET_NIL_LOCAL_H__ +#ifndef LIBNET_NIL_LOCAL_H_ +#define LIBNET_NIL_LOCAL_H_ #include @@ -45,38 +45,88 @@ * Is called by the module_start() function. * - * @param[in] net_phone The networking moduel phone. - * - * @return EOK on success. - * @return Other error codes as defined for each specific module initialize function. - * + * @param[in] net_phone The networking moduel phone. + * @return EOK on success. + * @return Other error codes as defined for each specific module + * initialize function. */ extern int nil_initialize(int); +/** Notify the network interface layer about the device state change. + * + * @param[in] nil_phone The network interface layer phone. + * @param[in] device_id The device identifier. + * @param[in] state The new device state. + * @return EOK on success. + * @return Other error codes as defined for each specific module + * device state function. + */ extern int nil_device_state_msg_local(int, device_id_t, int); + + +/** Pass the packet queue to the network interface layer. + * + * Process and redistribute the received packet queue to the registered + * upper layers. + * + * @param[in] nil_phone The network interface layer phone. + * @param[in] device_id The source device identifier. + * @param[in] packet The received packet or the received packet queue. + * @param target The target service. Ignored parameter. + * @return EOK on success. + * @return Other error codes as defined for each specific module + * received function. + */ extern int nil_received_msg_local(int, device_id_t, packet_t, services_t); /** Message processing function. * - * @param[in] name Module name. - * @param[in] callid The message identifier. - * @param[in] call The message parameters. - * @param[out] answer The message answer parameters. - * @param[out] answer_count The last parameter for the actual answer - * in the answer parameter. - * - * @return EOK on success. - * @return ENOTSUP if the message is not known. - * @return Other error codes as defined for each specific - * module message function. + * @param[in] name Module name. + * @param[in] callid The message identifier. + * @param[in] call The message parameters. + * @param[out] answer The message answer parameters. + * @param[out] answer_count The last parameter for the actual answer in the + * answer parameter. + * @return EOK on success. + * @return ENOTSUP if the message is not known. + * @return Other error codes as defined for each specific module + * message function. * * @see nil_interface.h * @see IS_NET_NIL_MESSAGE() + */ +extern int nil_message_standalone(const char *, ipc_callid_t, ipc_call_t *, + ipc_call_t *, int *); + +/** Pass the parameters to the module specific nil_message() function. * + * @param[in] name Module name. + * @param[in] callid The message identifier. + * @param[in] call The message parameters. + * @param[out] answer The message answer parameters. + * @param[out] answer_count The last parameter for the actual answer in the + * answer parameter. + * @return EOK on success. + * @return ENOTSUP if the message is not known. + * @return Other error codes as defined for each specific module + * message function. */ -extern int nil_message_standalone(const char *, ipc_callid_t, ipc_call_t *, ipc_call_t *, - int *); - extern int nil_module_message_standalone(const char *, ipc_callid_t, ipc_call_t *, ipc_call_t *, int *); + +/** Start the standalone nil layer module. + * + * Initialize the client connection serving function, initialize + * the module, register the module service and start the async + * manager, processing IPC messages in an infinite loop. + * + * @param[in] client_connection The client connection processing function. + * The module skeleton propagates its own one. + * @return EOK on success. + * @return Other error codes as defined for the pm_init() function. + * @return Other error codes as defined for the nil_initialize() + * function. + * @return Other error codes as defined for the REGISTER_ME() macro + * function. + */ extern int nil_module_start_standalone(async_client_conn_t); Index: uspace/lib/net/nil/nil_remote.c =================================================================== --- uspace/lib/net/nil/nil_remote.c (revision 42a9f27abc46056863f33053b659f04aaccaa036) +++ uspace/lib/net/nil/nil_remote.c (revision 404dbaecf9ad92b9da256083dcfe665a558b4f99) @@ -27,5 +27,5 @@ */ -/** @addtogroup net_nil +/** @addtogroup libnet * @{ */ @@ -47,12 +47,10 @@ /** Notify the network interface layer about the device state change. * - * @param[in] nil_phone The network interface layer phone. - * @param[in] device_id The device identifier. - * @param[in] state The new device state. - * - * @return EOK on success. - * @return Other error codes as defined for each specific module device - * state function. - * + * @param[in] nil_phone The network interface layer phone. + * @param[in] device_id The device identifier. + * @param[in] state The new device state. + * @return EOK on success. + * @return Other error codes as defined for each specific module + * device state function. */ int nil_device_state_msg_remote(int nil_phone, device_id_t device_id, int state) @@ -67,19 +65,17 @@ * upper layers. * - * @param[in] nil_phone The network interface layer phone. - * @param[in] device_id The source device identifier. - * @param[in] packet The received packet or the received packet queue. - * @param target The target service. Ignored parameter. - * - * @return EOK on success. - * @return Other error codes as defined for each specific module - * received function. - * + * @param[in] nil_phone The network interface layer phone. + * @param[in] device_id The source device identifier. + * @param[in] packet The received packet or the received packet queue. + * @param target The target service. Ignored parameter. + * @return EOK on success. + * @return Other error codes as defined for each specific module + * received function. */ int nil_received_msg_remote(int nil_phone, device_id_t device_id, packet_t packet, services_t target) { - return generic_received_msg_remote(nil_phone, NET_NIL_RECEIVED, device_id, - packet_get_id(packet), target, 0); + return generic_received_msg_remote(nil_phone, NET_NIL_RECEIVED, + device_id, packet_get_id(packet), target, 0); } Index: uspace/srv/net/nil/eth/eth_module.c =================================================================== --- uspace/srv/net/nil/eth/eth_module.c (revision 42a9f27abc46056863f33053b659f04aaccaa036) +++ uspace/srv/net/nil/eth/eth_module.c (revision 404dbaecf9ad92b9da256083dcfe665a558b4f99) @@ -50,12 +50,4 @@ #include "eth.h" -/** Starts the Ethernet module. - * 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. - * @param[in] client_connection The client connection processing function. The module skeleton propagates its own one. - * @returns EOK on success. - * @returns Other error codes as defined for the pm_init() function. - * @returns Other error codes as defined for the nil_initialize() function. - * @returns Other error codes as defined for the REGISTER_ME() macro function. - */ int nil_module_start_standalone(async_client_conn_t client_connection) { @@ -79,19 +71,4 @@ } -/** Pass the parameters to the module specific nil_message() function. - * - * @param[in] name Module name. - * @param[in] callid The message identifier. - * @param[in] call The message parameters. - * @param[out] answer The message answer parameters. - * @param[out] answer_count The last parameter for the actual answer - * in the answer parameter. - * - * @return EOK on success. - * @return ENOTSUP if the message is not known. - * @return Other error codes as defined for each - * specific module message function. - * - */ int nil_module_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer, int *answer_count) Index: uspace/srv/net/nil/nildummy/nildummy_module.c =================================================================== --- uspace/srv/net/nil/nildummy/nildummy_module.c (revision 42a9f27abc46056863f33053b659f04aaccaa036) +++ uspace/srv/net/nil/nildummy/nildummy_module.c (revision 404dbaecf9ad92b9da256083dcfe665a558b4f99) @@ -50,20 +50,4 @@ #include "nildummy.h" -/** Start the dummy nil module. - * - * Initialize the client connection serving function, initialize - * the module, register the module service and start the async - * manager, processing IPC messages in an infinite loop. - * - * @param[in] client_connection The client connection processing - * function. The module skeleton propagates - * its own one. - * - * @return EOK on success. - * @return Other error codes as defined for the pm_init() function. - * @return Other error codes as defined for the nil_initialize() function. - * @return Other error codes as defined for the REGISTER_ME() macro function. - * - */ int nil_module_start_standalone(async_client_conn_t client_connection) { @@ -87,19 +71,4 @@ } -/** Pass the parameters to the module specific nil_message() function. - * - * @param[in] name Module name. - * @param[in] callid The message identifier. - * @param[in] call The message parameters. - * @param[out] answer The message answer parameters. - * @param[out] answer_count The last parameter for the actual answer - * in the answer parameter. - * - * @return EOK on success. - * @return ENOTSUP if the message is not known. - * @return Other error codes as defined for each specific - * module message function. - * - */ int nil_module_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call, ipc_call_t *answer, int *answer_count)