Index: uspace/lib/net/Makefile =================================================================== --- uspace/lib/net/Makefile (revision 61bfc370dac47cccde963c4beaae3f6a0a364c54) +++ uspace/lib/net/Makefile (revision 774e6d1abebc631f873d85e623bf7aa61b0aecea) @@ -40,6 +40,6 @@ generic/protocol_map.c \ adt/module_map.c \ - netif/netif_local.c \ netif/netif_remote.c \ + netif/netif_skel.c \ nil/nil_remote.c \ il/il_interface.c \ Index: uspace/lib/net/il/ip_remote.c =================================================================== --- uspace/lib/net/il/ip_remote.c (revision 61bfc370dac47cccde963c4beaae3f6a0a364c54) +++ uspace/lib/net/il/ip_remote.c (revision 774e6d1abebc631f873d85e623bf7aa61b0aecea) @@ -170,5 +170,5 @@ free(*header); else - *device_id = IPC_GET_DEVICE(&answer); + *device_id = IPC_GET_DEVICE(answer); return (int) result; Index: uspace/lib/net/include/il_local.h =================================================================== --- uspace/lib/net/include/il_local.h (revision 61bfc370dac47cccde963c4beaae3f6a0a364c54) +++ uspace/lib/net/include/il_local.h (revision 774e6d1abebc631f873d85e623bf7aa61b0aecea) @@ -49,5 +49,5 @@ */ extern int il_module_message_standalone(ipc_callid_t callid, ipc_call_t *call, - ipc_call_t *answer, int *answer_count); + ipc_call_t *answer, size_t *answer_count); /** Starts the Internet layer module. Index: uspace/lib/net/include/netif_interface.h =================================================================== --- uspace/lib/net/include/netif_interface.h (revision 61bfc370dac47cccde963c4beaae3f6a0a364c54) +++ (revision ) @@ -1,52 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libnet - * @{ - */ - -#ifndef LIBNET_NETIF_INTERFACE_H_ -#define LIBNET_NETIF_INTERFACE_H_ - -#include -#include - -#define netif_module_message netif_module_message_standalone -#define netif_module_start netif_module_start_standalone -#define netif_get_addr_req netif_get_addr_req_remote -#define netif_probe_req netif_probe_req_remote -#define netif_send_msg netif_send_msg_remote -#define netif_start_req netif_start_req_remote -#define netif_stop_req netif_stop_req_remote -#define netif_stats_req netif_stats_req_remote -#define netif_bind_service netif_bind_service_remote - -#endif - -/** @} - */ Index: uspace/lib/net/include/netif_local.h =================================================================== --- uspace/lib/net/include/netif_local.h (revision 61bfc370dac47cccde963c4beaae3f6a0a364c54) +++ (revision ) @@ -1,220 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libnet - * @{ - */ - -/** @file - * Network interface module skeleton. - * The skeleton has to be part of each network interface module. - */ - -#ifndef NET_NETIF_LOCAL_H_ -#define NET_NETIF_LOCAL_H_ - -#include -#include -#include -#include - -#include -#include -#include - -/** Network interface device specific data. */ -typedef struct { - device_id_t device_id; /**< Device identifier. */ - int nil_phone; /**< Receiving network interface layer phone. */ - device_state_t state; /**< Actual device state. */ - void *specific; /**< Driver specific data. */ -} netif_device_t; - -/** Device map. - * - * Maps device identifiers to the network interface device specific data. - * @see device.h - * - */ -DEVICE_MAP_DECLARE(netif_device_map, netif_device_t); - -/** Network interface module skeleton global data. */ -typedef struct { - int net_phone; /**< Networking module phone. */ - netif_device_map_t device_map; /**< Device map. */ - fibril_rwlock_t lock; /**< Safety lock. */ -} netif_globals_t; - -extern netif_globals_t netif_globals; - -/** Initialize the specific module. - * - * This function has to be implemented in user code. - */ -extern int netif_initialize(void); - -/** Probe the existence of the device. - * - * This has to be implemented in user code. - * - * @param[in] device_id The device identifier. - * @param[in] irq The device interrupt number. - * @param[in] io The device input/output address. - * - * @return EOK on success. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the specific module - * message implementation. - */ -extern int netif_probe_message(device_id_t device_id, int irq, uintptr_t io); - -/** Send the packet queue. - * - * This has to be implemented in user code. - * - * @param[in] device_id The device identifier. - * @param[in] packet The packet queue. - * @param[in] sender The sending module service. - * - * @return EOK on success. - * @return EFORWARD if the device is not active (in the - * NETIF_ACTIVE state). - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the specific module - * message implementation. - */ -extern int netif_send_message(device_id_t device_id, packet_t *packet, - services_t sender); - -/** Start the device. - * - * This has to be implemented in user code. - * - * @param[in] device The device structure. - * - * @return EOK on success. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the specific module - * message implementation. - */ -extern int netif_start_message(netif_device_t *device); - -/** Stop the device. - * - * This has to be implemented in user code. - * - * @param[in] device The device structure. - * - * @return EOK on success. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the specific module - * message implementation. - */ -extern int netif_stop_message(netif_device_t *device); - -/** Return the device local hardware address. - * - * This has to be implemented in user code. - * - * @param[in] device_id The device identifier. - * @param[out] address The device local hardware address. - * - * @return EOK on success. - * @return EBADMEM if the address parameter is NULL. - * @return ENOENT if there no such device. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the specific module - * message implementation. - */ -extern int netif_get_addr_message(device_id_t device_id, - measured_string_t *address); - -/** Process the netif driver specific message. - * - * This function is called for uncommon messages received by the netif - * skeleton. This has to be implemented in user code. - * - * @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 the specific module - * message implementation. - */ -extern int netif_specific_message(ipc_callid_t callid, ipc_call_t *call, - ipc_call_t *answer, int *answer_count); - -/** Return the device usage statistics. - * - * This has to be implemented in user code. - * - * @param[in] device_id The device identifier. - * @param[out] stats The device usage statistics. - * - * @return EOK on success. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the specific module - * message implementation. - */ -extern int netif_get_device_stats(device_id_t device_id, - device_stats_t *stats); - -extern int netif_get_addr_req_local(int, device_id_t, measured_string_t **, - uint8_t **); -extern int netif_probe_req_local(int, device_id_t, int, int); -extern int netif_send_msg_local(int, device_id_t, packet_t *, services_t); -extern int netif_start_req_local(int, device_id_t); -extern int netif_stop_req_local(int, device_id_t); -extern int netif_stats_req_local(int, device_id_t, device_stats_t *); -extern int netif_bind_service_local(services_t, device_id_t, services_t, - async_client_conn_t); - -extern int find_device(device_id_t, netif_device_t **); -extern void null_device_stats(device_stats_t *); -extern void netif_pq_release(packet_id_t); -extern packet_t *netif_packet_get_1(size_t); -extern int netif_init_module(async_client_conn_t); - -extern int netif_module_message_standalone(const char *, ipc_callid_t, - ipc_call_t *, ipc_call_t *, int *); -extern int netif_module_start_standalone(async_client_conn_t); - -#endif - -/** @} - */ Index: uspace/lib/net/include/netif_remote.h =================================================================== --- uspace/lib/net/include/netif_remote.h (revision 61bfc370dac47cccde963c4beaae3f6a0a364c54) +++ uspace/lib/net/include/netif_remote.h (revision 774e6d1abebc631f873d85e623bf7aa61b0aecea) @@ -41,12 +41,12 @@ #include -extern int netif_get_addr_req_remote(int, device_id_t, measured_string_t **, +extern int netif_get_addr_req(int, device_id_t, measured_string_t **, uint8_t **); -extern int netif_probe_req_remote(int, device_id_t, int, int); -extern int netif_send_msg_remote(int, device_id_t, packet_t *, services_t); -extern int netif_start_req_remote(int, device_id_t); -extern int netif_stop_req_remote(int, device_id_t); -extern int netif_stats_req_remote(int, device_id_t, device_stats_t *); -extern int netif_bind_service_remote(services_t, device_id_t, services_t, +extern int netif_probe_req(int, device_id_t, int, void *); +extern int netif_send_msg(int, device_id_t, packet_t *, services_t); +extern int netif_start_req(int, device_id_t); +extern int netif_stop_req(int, device_id_t); +extern int netif_stats_req(int, device_id_t, device_stats_t *); +extern int netif_bind_service(services_t, device_id_t, services_t, async_client_conn_t); Index: uspace/lib/net/include/netif_skel.h =================================================================== --- uspace/lib/net/include/netif_skel.h (revision 774e6d1abebc631f873d85e623bf7aa61b0aecea) +++ uspace/lib/net/include/netif_skel.h (revision 774e6d1abebc631f873d85e623bf7aa61b0aecea) @@ -0,0 +1,215 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libnet + * @{ + */ + +/** @file + * Network interface module skeleton. + * The skeleton has to be part of each network interface module. + */ + +#ifndef NET_NETIF_SKEL_H_ +#define NET_NETIF_SKEL_H_ + +#include +#include +#include +#include + +#include +#include +#include + +/** Network interface device specific data. */ +typedef struct { + device_id_t device_id; /**< Device identifier. */ + int nil_phone; /**< Receiving network interface layer phone. */ + device_state_t state; /**< Actual device state. */ + void *specific; /**< Driver specific data. */ +} netif_device_t; + +/** Device map. + * + * Maps device identifiers to the network interface device specific data. + * @see device.h + * + */ +DEVICE_MAP_DECLARE(netif_device_map, netif_device_t); + +/** Network interface module skeleton global data. */ +typedef struct { + int net_phone; /**< Networking module phone. */ + netif_device_map_t device_map; /**< Device map. */ + fibril_rwlock_t lock; /**< Safety lock. */ +} netif_globals_t; + +extern netif_globals_t netif_globals; + +/** Initialize the specific module. + * + * This function has to be implemented in user code. + * + */ +extern int netif_initialize(void); + +/** Probe the existence of the device. + * + * This has to be implemented in user code. + * + * @param[in] device_id Device identifier. + * @param[in] irq Device interrupt number. + * @param[in] io Device input/output address. + * + * @return EOK on success. + * @return Other error codes as defined for the find_device() + * function. + * @return Other error codes as defined for the specific module + * message implementation. + * + */ +extern int netif_probe_message(device_id_t device_id, int irq, void *io); + +/** Send the packet queue. + * + * This has to be implemented in user code. + * + * @param[in] device_id Device identifier. + * @param[in] packet Packet queue. + * @param[in] sender Sending module service. + * + * @return EOK on success. + * @return EFORWARD if the device is not active (in the + * NETIF_ACTIVE state). + * @return Other error codes as defined for the find_device() + * function. + * @return Other error codes as defined for the specific module + * message implementation. + * + */ +extern int netif_send_message(device_id_t device_id, packet_t *packet, + services_t sender); + +/** Start the device. + * + * This has to be implemented in user code. + * + * @param[in] device Device structure. + * + * @return New network interface state (non-negative values). + * @return Other error codes as defined for the find_device() + * function. + * @return Other error codes as defined for the specific module + * message implementation. + + * + */ +extern int netif_start_message(netif_device_t *device); + +/** Stop the device. + * + * This has to be implemented in user code. + * + * @param[in] device Device structure. + * + * @return EOK on success. + * @return Other error codes as defined for the find_device() + * function. + * @return Other error codes as defined for the specific module + * message implementation. + * + */ +extern int netif_stop_message(netif_device_t *device); + +/** Return the device local hardware address. + * + * This has to be implemented in user code. + * + * @param[in] device_id Device identifier. + * @param[out] address Device local hardware address. + * + * @return EOK on success. + * @return EBADMEM if the address parameter is NULL. + * @return ENOENT if there no such device. + * @return Other error codes as defined for the find_device() + * function. + * @return Other error codes as defined for the specific module + * message implementation. + * + */ +extern int netif_get_addr_message(device_id_t device_id, + measured_string_t *address); + +/** Process the netif driver specific message. + * + * This function is called for uncommon messages received by the netif + * skeleton. This has to be implemented in user code. + * + * @param[in] callid Message identifier. + * @param[in] call Message. + * @param[out] answer Answer. + * @param[out] count Number of answer arguments. + * + * @return EOK on success. + * @return ENOTSUP if the message is not known. + * @return Other error codes as defined for the specific module + * message implementation. + * + */ +extern int netif_specific_message(ipc_callid_t callid, ipc_call_t *call, + ipc_call_t *answer, size_t *count); + +/** Return the device usage statistics. + * + * This has to be implemented in user code. + * + * @param[in] device_id Device identifier. + * @param[out] stats Device usage statistics. + * + * @return EOK on success. + * @return Other error codes as defined for the find_device() + * function. + * @return Other error codes as defined for the specific module + * message implementation. + * + */ +extern int netif_get_device_stats(device_id_t device_id, + device_stats_t *stats); + +extern int find_device(device_id_t, netif_device_t **); +extern void null_device_stats(device_stats_t *); +extern void netif_pq_release(packet_id_t); +extern packet_t *netif_packet_get_1(size_t); + +extern int netif_module_start(void); + +#endif + +/** @} + */ Index: uspace/lib/net/include/nil_local.h =================================================================== --- uspace/lib/net/include/nil_local.h (revision 61bfc370dac47cccde963c4beaae3f6a0a364c54) +++ uspace/lib/net/include/nil_local.h (revision 774e6d1abebc631f873d85e623bf7aa61b0aecea) @@ -96,5 +96,5 @@ */ extern int nil_message_standalone(const char *, ipc_callid_t, ipc_call_t *, - ipc_call_t *, int *); + ipc_call_t *, size_t *); /** Pass the parameters to the module specific nil_message() function. @@ -112,5 +112,5 @@ */ extern int nil_module_message_standalone(const char *, ipc_callid_t, - ipc_call_t *, ipc_call_t *, int *); + ipc_call_t *, ipc_call_t *, size_t *); /** Start the standalone nil layer module. Index: uspace/lib/net/include/tl_local.h =================================================================== --- uspace/lib/net/include/tl_local.h (revision 61bfc370dac47cccde963c4beaae3f6a0a364c54) +++ uspace/lib/net/include/tl_local.h (revision 774e6d1abebc631f873d85e623bf7aa61b0aecea) @@ -52,6 +52,5 @@ */ extern int tl_module_message_standalone(ipc_callid_t, ipc_call_t *, - ipc_call_t *, int *); - + ipc_call_t *, size_t *); /** Processes the TL module message. Index: uspace/lib/net/netif/netif_local.c =================================================================== --- uspace/lib/net/netif/netif_local.c (revision 61bfc370dac47cccde963c4beaae3f6a0a364c54) +++ (revision ) @@ -1,458 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup libnet - * @{ - */ - -/** @file - * Network interface module skeleton implementation. - * @see netif.h - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -DEVICE_MAP_IMPLEMENT(netif_device_map, netif_device_t); - -/** Network interface global data. */ -netif_globals_t netif_globals; - -/** Probe the existence of the device. - * - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @param[in] irq The device interrupt number. - * @param[in] io The device input/output address. - * @return EOK on success. - * @return Other error codes as defined for the - * netif_probe_message(). - */ -int -netif_probe_req_local(int netif_phone, device_id_t device_id, int irq, int io) -{ - fibril_rwlock_write_lock(&netif_globals.lock); - int result = netif_probe_message(device_id, irq, io); - fibril_rwlock_write_unlock(&netif_globals.lock); - - return result; -} - -/** Send the packet queue. - * - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @param[in] packet The packet queue. - * @param[in] sender The sending module service. - * @return EOK on success. - * @return Other error codes as defined for the generic_send_msg() - * function. - */ -int netif_send_msg_local(int netif_phone, device_id_t device_id, - packet_t *packet, services_t sender) -{ - fibril_rwlock_write_lock(&netif_globals.lock); - int result = netif_send_message(device_id, packet, sender); - fibril_rwlock_write_unlock(&netif_globals.lock); - - return result; -} - -/** Start the device. - * - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @return EOK on success. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the - * netif_start_message() function. - */ -int netif_start_req_local(int netif_phone, device_id_t device_id) -{ - int rc; - - fibril_rwlock_write_lock(&netif_globals.lock); - - netif_device_t *device; - rc = find_device(device_id, &device); - if (rc != EOK) { - fibril_rwlock_write_unlock(&netif_globals.lock); - return rc; - } - - int result = netif_start_message(device); - if (result > NETIF_NULL) { - int phone = device->nil_phone; - fibril_rwlock_write_unlock(&netif_globals.lock); - nil_device_state_msg(phone, device_id, result); - return EOK; - } - - fibril_rwlock_write_unlock(&netif_globals.lock); - - return result; -} - -/** Stop the device. - * - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @return EOK on success. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the - * netif_stop_message() function. - */ -int netif_stop_req_local(int netif_phone, device_id_t device_id) -{ - int rc; - - fibril_rwlock_write_lock(&netif_globals.lock); - - netif_device_t *device; - rc = find_device(device_id, &device); - if (rc != EOK) { - fibril_rwlock_write_unlock(&netif_globals.lock); - return rc; - } - - int result = netif_stop_message(device); - if (result > NETIF_NULL) { - int phone = device->nil_phone; - fibril_rwlock_write_unlock(&netif_globals.lock); - nil_device_state_msg(phone, device_id, result); - return EOK; - } - - fibril_rwlock_write_unlock(&netif_globals.lock); - - return result; -} - -/** Return the device usage statistics. - * - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @param[out] stats The device usage statistics. - * @return EOK on success. - */ -int netif_stats_req_local(int netif_phone, device_id_t device_id, - device_stats_t *stats) -{ - fibril_rwlock_read_lock(&netif_globals.lock); - int res = netif_get_device_stats(device_id, stats); - fibril_rwlock_read_unlock(&netif_globals.lock); - - return res; -} - -/** Return the device local hardware address. - * - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @param[out] address The device local hardware address. - * @param[out] data The address data. - * @return EOK on success. - * @return EBADMEM if the address parameter is NULL. - * @return ENOENT if there no such device. - * @return Other error codes as defined for the - * netif_get_addr_message() function. - */ -int netif_get_addr_req_local(int netif_phone, device_id_t device_id, - measured_string_t **address, uint8_t **data) -{ - int rc; - - if (!address || !data) - return EBADMEM; - - fibril_rwlock_read_lock(&netif_globals.lock); - - measured_string_t translation; - rc = netif_get_addr_message(device_id, &translation); - if (rc == EOK) { - *address = measured_string_copy(&translation); - rc = (*address) ? EOK : ENOMEM; - } - - fibril_rwlock_read_unlock(&netif_globals.lock); - - *data = (**address).value; - - return rc; -} - -/** Find the device specific data. - * - * @param[in] device_id The device identifier. - * @param[out] device The device specific data. - * @return EOK on success. - * @return ENOENT if device is not found. - * @return EPERM if the device is not initialized. - */ -int find_device(device_id_t device_id, netif_device_t **device) -{ - if (!device) - return EBADMEM; - - *device = netif_device_map_find(&netif_globals.device_map, device_id); - if (*device == NULL) - return ENOENT; - - if ((*device)->state == NETIF_NULL) - return EPERM; - - return EOK; -} - -/** Clear the usage statistics. - * - * @param[in] stats The usage statistics. - */ -void null_device_stats(device_stats_t *stats) -{ - bzero(stats, sizeof(device_stats_t)); -} - -/** Initialize the netif module. - * - * @param[in] client_connection The client connection functio to be registered. - * @return EOK on success. - * @return Other error codes as defined for each specific module - * message function. - */ -int netif_init_module(async_client_conn_t client_connection) -{ - int rc; - - async_set_client_connection(client_connection); - - netif_globals.net_phone = connect_to_service(SERVICE_NETWORKING); - netif_device_map_initialize(&netif_globals.device_map); - - rc = pm_init(); - if (rc != EOK) - return rc; - - fibril_rwlock_initialize(&netif_globals.lock); - - rc = netif_initialize(); - if (rc != EOK) { - pm_destroy(); - return rc; - } - - return EOK; -} - -/** Release the given packet. - * - * Prepared for future optimization. - * - * @param[in] packet_id The packet identifier. - */ -void netif_pq_release(packet_id_t packet_id) -{ - pq_release_remote(netif_globals.net_phone, packet_id); -} - -/** Allocate new packet to handle the given content size. - * - * @param[in] content The minimum content size. - * @return The allocated packet. - * @return NULL if there is an error. - * - */ -packet_t *netif_packet_get_1(size_t content) -{ - return packet_get_1_remote(netif_globals.net_phone, content); -} - -/** Register the device notification receiver, the network interface layer - * module. - * - * @param[in] name Module name. - * @param[in] device_id The device identifier. - * @param[in] phone The network interface layer module phone. - * @return EOK on success. - * @return ENOENT if there is no such device. - * @return ELIMIT if there is another module registered. - */ -static int register_message(const char *name, device_id_t device_id, int phone) -{ - netif_device_t *device; - int rc; - - rc = find_device(device_id, &device); - if (rc != EOK) - return rc; - - if (device->nil_phone > 0) - return ELIMIT; - - device->nil_phone = phone; - printf("%s: Receiver of device %d registered (phone: %d)\n", - name, device->device_id, device->nil_phone); - return EOK; -} - -/** Process the netif module messages. - * - * @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 IS_NET_NETIF_MESSAGE() - * - */ -int netif_module_message_standalone(const char *name, ipc_callid_t callid, - ipc_call_t *call, ipc_call_t *answer, int *answer_count) -{ - size_t length; - device_stats_t stats; - packet_t *packet; - measured_string_t address; - int rc; - - *answer_count = 0; - switch (IPC_GET_IMETHOD(*call)) { - case IPC_M_PHONE_HUNGUP: - return EOK; - - case NET_NETIF_PROBE: - return netif_probe_req_local(0, IPC_GET_DEVICE(call), - NETIF_GET_IRQ(call), NETIF_GET_IO(call)); - - case IPC_M_CONNECT_TO_ME: - fibril_rwlock_write_lock(&netif_globals.lock); - rc = register_message(name, IPC_GET_DEVICE(call), - IPC_GET_PHONE(call)); - fibril_rwlock_write_unlock(&netif_globals.lock); - return rc; - - case NET_NETIF_SEND: - rc = packet_translate_remote(netif_globals.net_phone, &packet, - IPC_GET_PACKET(call)); - if (rc != EOK) - return rc; - return netif_send_msg_local(0, IPC_GET_DEVICE(call), packet, - IPC_GET_SENDER(call)); - - case NET_NETIF_START: - return netif_start_req_local(0, IPC_GET_DEVICE(call)); - - case NET_NETIF_STATS: - fibril_rwlock_read_lock(&netif_globals.lock); - - rc = async_data_read_receive(&callid, &length); - if (rc != EOK) { - fibril_rwlock_read_unlock(&netif_globals.lock); - return rc; - } - if (length < sizeof(device_stats_t)) { - fibril_rwlock_read_unlock(&netif_globals.lock); - return EOVERFLOW; - } - - rc = netif_get_device_stats(IPC_GET_DEVICE(call), &stats); - if (rc == EOK) { - rc = async_data_read_finalize(callid, &stats, - sizeof(device_stats_t)); - } - - fibril_rwlock_read_unlock(&netif_globals.lock); - return rc; - - case NET_NETIF_STOP: - return netif_stop_req_local(0, IPC_GET_DEVICE(call)); - - case NET_NETIF_GET_ADDR: - fibril_rwlock_read_lock(&netif_globals.lock); - rc = netif_get_addr_message(IPC_GET_DEVICE(call), &address); - if (rc == EOK) - rc = measured_strings_reply(&address, 1); - fibril_rwlock_read_unlock(&netif_globals.lock); - return rc; - } - - return netif_specific_message(callid, call, answer, answer_count); -} - -/** Start the network interface module. - * - * Initialize the client connection serving function, initialize the module, - * registers 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 each specific module - * message function. - */ -int netif_module_start_standalone(async_client_conn_t client_connection) -{ - int rc; - - rc = netif_init_module(client_connection); - if (rc != EOK) - return rc; - - async_manager(); - - pm_destroy(); - return EOK; -} - -/** @} - */ Index: uspace/lib/net/netif/netif_remote.c =================================================================== --- uspace/lib/net/netif/netif_remote.c (revision 61bfc370dac47cccde963c4beaae3f6a0a364c54) +++ uspace/lib/net/netif/netif_remote.c (revision 774e6d1abebc631f873d85e623bf7aa61b0aecea) @@ -27,5 +27,5 @@ */ -/** @addtogroup libnet +/** @addtogroup libnet * @{ */ @@ -49,15 +49,17 @@ /** Return the device local hardware address. * - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @param[out] address The device local hardware address. - * @param[out] data The address data. - * @return EOK on success. - * @return EBADMEM if the address parameter is NULL. - * @return ENOENT if there no such device. - * @return Other error codes as defined for the - * netif_get_addr_message() function. + * @param[in] netif_phone Network interface phone. + * @param[in] device_id Device identifier. + * @param[out] address Device local hardware address. + * @param[out] data Address data. + * + * @return EOK on success. + * @return EBADMEM if the address parameter is NULL. + * @return ENOENT if there no such device. + * @return Other error codes as defined for the + * netif_get_addr_message() function. + * */ -int netif_get_addr_req_remote(int netif_phone, device_id_t device_id, +int netif_get_addr_req(int netif_phone, device_id_t device_id, measured_string_t **address, uint8_t **data) { @@ -68,30 +70,33 @@ /** Probe the existence of the device. * - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @param[in] irq The device interrupt number. - * @param[in] io The device input/output address. - * @return EOK on success. - * @return Other error codes as defined for the - * netif_probe_message(). + * @param[in] netif_phone Network interface phone. + * @param[in] device_id Device identifier. + * @param[in] irq Device interrupt number. + * @param[in] io Device input/output address. + * + * @return EOK on success. + * @return Other error codes as defined for the + * netif_probe_message(). + * */ -int -netif_probe_req_remote(int netif_phone, device_id_t device_id, int irq, int io) +int netif_probe_req(int netif_phone, device_id_t device_id, int irq, void *io) { - return async_req_3_0(netif_phone, NET_NETIF_PROBE, device_id, irq, io); + return async_req_3_0(netif_phone, NET_NETIF_PROBE, device_id, irq, + (sysarg_t) io); } /** Send the packet queue. * - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @param[in] packet The packet queue. - * @param[in] sender The sending module service. - * @return EOK on success. - * @return Other error codes as defined for the generic_send_msg() - * function. + * @param[in] netif_phone Network interface phone. + * @param[in] device_id Device identifier. + * @param[in] packet Packet queue. + * @param[in] sender Sending module service. + * + * @return EOK on success. + * @return Other error codes as defined for the generic_send_msg() + * function. + * */ -int -netif_send_msg_remote(int netif_phone, device_id_t device_id, packet_t *packet, +int netif_send_msg(int netif_phone, device_id_t device_id, packet_t *packet, services_t sender) { @@ -102,13 +107,15 @@ /** Start the device. * - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @return EOK on success. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the - * netif_start_message() function. + * @param[in] netif_phone Network interface phone. + * @param[in] device_id Device identifier. + * + * @return EOK on success. + * @return Other error codes as defined for the find_device() + * function. + * @return Other error codes as defined for the + * netif_start_message() function. + * */ -int netif_start_req_remote(int netif_phone, device_id_t device_id) +int netif_start_req(int netif_phone, device_id_t device_id) { return async_req_1_0(netif_phone, NET_NETIF_START, device_id); @@ -117,13 +124,15 @@ /** Stop the device. * - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @return EOK on success. - * @return Other error codes as defined for the find_device() - * function. - * @return Other error codes as defined for the - * netif_stop_message() function. + * @param[in] netif_phone Network interface phone. + * @param[in] device_id Device identifier. + * + * @return EOK on success. + * @return Other error codes as defined for the find_device() + * function. + * @return Other error codes as defined for the + * netif_stop_message() function. + * */ -int netif_stop_req_remote(int netif_phone, device_id_t device_id) +int netif_stop_req(int netif_phone, device_id_t device_id) { return async_req_1_0(netif_phone, NET_NETIF_STOP, device_id); @@ -132,10 +141,12 @@ /** Return the device usage statistics. * - * @param[in] netif_phone The network interface phone. - * @param[in] device_id The device identifier. - * @param[out] stats The device usage statistics. + * @param[in] netif_phone Network interface phone. + * @param[in] device_id Device identifier. + * @param[out] stats Device usage statistics. + * * @return EOK on success. + * */ -int netif_stats_req_remote(int netif_phone, device_id_t device_id, +int netif_stats_req(int netif_phone, device_id_t device_id, device_stats_t *stats) { @@ -153,6 +164,8 @@ } -/** Create bidirectional connection with the network interface module and - * registers the message receiver. +/** Create bidirectional connection with the network interface module + * + * Create bidirectional connection with the network interface module and + * register the message receiver. * * @param[in] service The network interface module service. @@ -161,11 +174,11 @@ * @param[in] receiver The message receiver. * - * @return The phone of the needed service. - * @return EOK on success. - * @return Other error codes as defined for the bind_service() - * function. + * @return The phone of the needed service. + * @return EOK on success. + * @return Other error codes as defined for the bind_service() + * function. + * */ -int -netif_bind_service_remote(services_t service, device_id_t device_id, +int netif_bind_service(services_t service, device_id_t device_id, services_t me, async_client_conn_t receiver) { Index: uspace/lib/net/netif/netif_skel.c =================================================================== --- uspace/lib/net/netif/netif_skel.c (revision 774e6d1abebc631f873d85e623bf7aa61b0aecea) +++ uspace/lib/net/netif/netif_skel.c (revision 774e6d1abebc631f873d85e623bf7aa61b0aecea) @@ -0,0 +1,434 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup libnet + * @{ + */ + +/** @file + * Network interface module skeleton implementation. + * @see netif.h + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +DEVICE_MAP_IMPLEMENT(netif_device_map, netif_device_t); + +/** Network interface global data. */ +netif_globals_t netif_globals; + +/** Probe the existence of the device. + * + * @param[in] netif_phone Network interface phone. + * @param[in] device_id Device identifier. + * @param[in] irq Device interrupt number. + * @param[in] io Device input/output address. + * + * @return EOK on success. + * @return Other error codes as defined for the + * netif_probe_message(). + * + */ +static int netif_probe_req_local(int netif_phone, device_id_t device_id, + int irq, void *io) +{ + fibril_rwlock_write_lock(&netif_globals.lock); + int result = netif_probe_message(device_id, irq, io); + fibril_rwlock_write_unlock(&netif_globals.lock); + + return result; +} + +/** Send the packet queue. + * + * @param[in] netif_phone Network interface phone. + * @param[in] device_id Device identifier. + * @param[in] packet Packet queue. + * @param[in] sender Sending module service. + * + * @return EOK on success. + * @return Other error codes as defined for the generic_send_msg() + * function. + * + */ +static int netif_send_msg_local(int netif_phone, device_id_t device_id, + packet_t *packet, services_t sender) +{ + fibril_rwlock_write_lock(&netif_globals.lock); + int result = netif_send_message(device_id, packet, sender); + fibril_rwlock_write_unlock(&netif_globals.lock); + + return result; +} + +/** Start the device. + * + * @param[in] netif_phone Network interface phone. + * @param[in] device_id Device identifier. + * + * @return EOK on success. + * @return Other error codes as defined for the find_device() + * function. + * @return Other error codes as defined for the + * netif_start_message() function. + * + */ +static int netif_start_req_local(int netif_phone, device_id_t device_id) +{ + fibril_rwlock_write_lock(&netif_globals.lock); + + netif_device_t *device; + int rc = find_device(device_id, &device); + if (rc != EOK) { + fibril_rwlock_write_unlock(&netif_globals.lock); + return rc; + } + + int result = netif_start_message(device); + if (result > NETIF_NULL) { + int phone = device->nil_phone; + fibril_rwlock_write_unlock(&netif_globals.lock); + nil_device_state_msg(phone, device_id, result); + return EOK; + } + + fibril_rwlock_write_unlock(&netif_globals.lock); + + return result; +} + +/** Stop the device. + * + * @param[in] netif_phone Network interface phone. + * @param[in] device_id Device identifier. + * + * @return EOK on success. + * @return Other error codes as defined for the find_device() + * function. + * @return Other error codes as defined for the + * netif_stop_message() function. + * + */ +static int netif_stop_req_local(int netif_phone, device_id_t device_id) +{ + fibril_rwlock_write_lock(&netif_globals.lock); + + netif_device_t *device; + int rc = find_device(device_id, &device); + if (rc != EOK) { + fibril_rwlock_write_unlock(&netif_globals.lock); + return rc; + } + + int result = netif_stop_message(device); + if (result > NETIF_NULL) { + int phone = device->nil_phone; + fibril_rwlock_write_unlock(&netif_globals.lock); + nil_device_state_msg(phone, device_id, result); + return EOK; + } + + fibril_rwlock_write_unlock(&netif_globals.lock); + + return result; +} + +/** Find the device specific data. + * + * @param[in] device_id Device identifier. + * @param[out] device Device specific data. + * + * @return EOK on success. + * @return ENOENT if device is not found. + * @return EPERM if the device is not initialized. + * + */ +int find_device(device_id_t device_id, netif_device_t **device) +{ + if (!device) + return EBADMEM; + + *device = netif_device_map_find(&netif_globals.device_map, device_id); + if (*device == NULL) + return ENOENT; + + if ((*device)->state == NETIF_NULL) + return EPERM; + + return EOK; +} + +/** Clear the usage statistics. + * + * @param[in] stats The usage statistics. + * + */ +void null_device_stats(device_stats_t *stats) +{ + bzero(stats, sizeof(device_stats_t)); +} + +/** Release the given packet. + * + * Prepared for future optimization. + * + * @param[in] packet_id The packet identifier. + * + */ +void netif_pq_release(packet_id_t packet_id) +{ + pq_release_remote(netif_globals.net_phone, packet_id); +} + +/** Allocate new packet to handle the given content size. + * + * @param[in] content Minimum content size. + * + * @return The allocated packet. + * @return NULL on error. + * + */ +packet_t *netif_packet_get_1(size_t content) +{ + return packet_get_1_remote(netif_globals.net_phone, content); +} + +/** Register the device notification receiver, + * + * Register a network interface layer module as the device + * notification receiver. + * + * @param[in] device_id Device identifier. + * @param[in] phone Network interface layer module phone. + * + * @return EOK on success. + * @return ENOENT if there is no such device. + * @return ELIMIT if there is another module registered. + * + */ +static int register_message(device_id_t device_id, int phone) +{ + netif_device_t *device; + int rc = find_device(device_id, &device); + if (rc != EOK) + return rc; + + if (device->nil_phone >= 0) + return ELIMIT; + + device->nil_phone = phone; + return EOK; +} + +/** Process the netif module messages. + * + * @param[in] callid Mmessage identifier. + * @param[in] call Message. + * @param[out] answer Answer. + * @param[out] count Number of arguments of the answer. + * + * @return EOK on success. + * @return ENOTSUP if the message is unknown. + * @return Other error codes as defined for each specific module + * message function. + * + * @see IS_NET_NETIF_MESSAGE() + * + */ +static int netif_module_message(ipc_callid_t callid, ipc_call_t *call, + ipc_call_t *answer, size_t *count) +{ + size_t length; + device_stats_t stats; + packet_t *packet; + measured_string_t address; + int rc; + + *count = 0; + + switch (IPC_GET_IMETHOD(*call)) { + case IPC_M_PHONE_HUNGUP: + return EOK; + + case NET_NETIF_PROBE: + return netif_probe_req_local(0, IPC_GET_DEVICE(*call), + NETIF_GET_IRQ(*call), NETIF_GET_IO(*call)); + + case IPC_M_CONNECT_TO_ME: + fibril_rwlock_write_lock(&netif_globals.lock); + + rc = register_message(IPC_GET_DEVICE(*call), IPC_GET_PHONE(*call)); + + fibril_rwlock_write_unlock(&netif_globals.lock); + return rc; + + case NET_NETIF_SEND: + rc = packet_translate_remote(netif_globals.net_phone, &packet, + IPC_GET_PACKET(*call)); + if (rc != EOK) + return rc; + + return netif_send_msg_local(0, IPC_GET_DEVICE(*call), packet, + IPC_GET_SENDER(*call)); + + case NET_NETIF_START: + return netif_start_req_local(0, IPC_GET_DEVICE(*call)); + + case NET_NETIF_STATS: + fibril_rwlock_read_lock(&netif_globals.lock); + + rc = async_data_read_receive(&callid, &length); + if (rc != EOK) { + fibril_rwlock_read_unlock(&netif_globals.lock); + return rc; + } + + if (length < sizeof(device_stats_t)) { + fibril_rwlock_read_unlock(&netif_globals.lock); + return EOVERFLOW; + } + + rc = netif_get_device_stats(IPC_GET_DEVICE(*call), &stats); + if (rc == EOK) { + rc = async_data_read_finalize(callid, &stats, + sizeof(device_stats_t)); + } + + fibril_rwlock_read_unlock(&netif_globals.lock); + return rc; + + case NET_NETIF_STOP: + return netif_stop_req_local(0, IPC_GET_DEVICE(*call)); + + case NET_NETIF_GET_ADDR: + fibril_rwlock_read_lock(&netif_globals.lock); + + rc = netif_get_addr_message(IPC_GET_DEVICE(*call), &address); + if (rc == EOK) + rc = measured_strings_reply(&address, 1); + + fibril_rwlock_read_unlock(&netif_globals.lock); + return rc; + } + + return netif_specific_message(callid, call, answer, count); +} + +/** Default fibril for new module connections. + * + * @param[in] iid Initial message identifier. + * @param[in] icall Initial message call structure. + * + */ +static void netif_client_connection(ipc_callid_t iid, ipc_call_t *icall) +{ + /* + * Accept the connection by answering + * the initial IPC_M_CONNECT_ME_TO call. + */ + ipc_answer_0(iid, EOK); + + while (true) { + ipc_call_t answer; + size_t count; + + /* Clear the answer structure */ + refresh_answer(&answer, &count); + + /* Fetch the next message */ + ipc_call_t call; + ipc_callid_t callid = async_get_call(&call); + + /* Process the message */ + int res = netif_module_message(callid, &call, &answer, &count); + + /* End if said to either by the message or the processing result */ + if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) || + (res == EHANGUP)) + return; + + /* Answer the message */ + answer_call(callid, res, &answer, count); + } +} + +/** Start the network interface module. + * + * Initialize the client connection serving function, initialize the module, + * registers the module service and start the async manager, processing IPC + * messages in an infinite loop. + * + * @return EOK on success. + * @return Other error codes as defined for each specific module + * message function. + * + */ +int netif_module_start(void) +{ + async_set_client_connection(netif_client_connection); + + netif_globals.net_phone = connect_to_service(SERVICE_NETWORKING); + netif_device_map_initialize(&netif_globals.device_map); + + int rc = pm_init(); + if (rc != EOK) + return rc; + + fibril_rwlock_initialize(&netif_globals.lock); + + rc = netif_initialize(); + if (rc != EOK) { + pm_destroy(); + return rc; + } + + async_manager(); + + pm_destroy(); + return EOK; +} + +/** @} + */