Index: uspace/lib/net/Makefile =================================================================== --- uspace/lib/net/Makefile (revision 8fb5842327e6d4b92cab8c0a073d74d908805536) +++ uspace/lib/net/Makefile (revision fb9ffb0a9dac70b9ad0ca32e24e69f88f861d209) @@ -42,4 +42,5 @@ netif/netif_remote.c \ nil/nil_remote.c \ + il/il_interface.c \ il/ip_remote.c \ il/ip_client.c \ Index: uspace/lib/net/il/il_interface.c =================================================================== --- uspace/lib/net/il/il_interface.c (revision fb9ffb0a9dac70b9ad0ca32e24e69f88f861d209) +++ uspace/lib/net/il/il_interface.c (revision fb9ffb0a9dac70b9ad0ca32e24e69f88f861d209) @@ -0,0 +1,106 @@ +/* + * 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 + * Internetwork layer module interface for the underlying network interface + * layer. This interface is always called by the remote modules. + */ + +#include +#include +#include + +#include +#include + +#include +#include + +/** Notify the internetwork layer modules about the device state change. + * + * @param[in] il_phone The internetwork layer module phone used for + * (semi)remote calls. + * @param[in] device_id The device identifier. + * @param[in] state The new device state. + * @param[in] target The target internetwork module service to be + * delivered to. + * + * @return EOK on success. + * + */ +int il_device_state_msg(int il_phone, device_id_t device_id, + device_state_t state, services_t target) +{ + return generic_device_state_msg_remote(il_phone, NET_IL_DEVICE_STATE, + device_id, state, target); +} + +/** Notify the internetwork layer modules about the received packet/s. + * + * @param[in] il_phone The internetwork layer module phone used for + * (semi)remote calls. + * @param[in] device_id The device identifier. + * @param[in] packet The received packet or the received packet queue. + * @param[in] target The target internetwork module service to be + * delivered to. + * + * @return EOK on success. + * + */ +int il_received_msg(int il_phone, device_id_t device_id, packet_t packet, + services_t target) +{ + return generic_received_msg_remote(il_phone, NET_IL_RECEIVED, device_id, + packet_get_id(packet), target, 0); +} + +/** Notify the internetwork layer modules about the mtu change. + * + * @param[in] il_phone The internetwork layer module phone used for + * (semi)remote calls. + * @param[in] device_id The device identifier. + * @param[in] mtu The new mtu value. + * @param[in] target The target internetwork module service to be + * delivered to. + * + * @return EOK on success. + * + */ +int il_mtu_changed_msg(int il_phone, device_id_t device_id, size_t mtu, + services_t target) +{ + return generic_device_state_msg_remote(il_phone, NET_IL_MTU_CHANGED, + device_id, (int) mtu, target); +} + +/** @} + */ Index: uspace/lib/net/include/il_interface.h =================================================================== --- uspace/lib/net/include/il_interface.h (revision 8fb5842327e6d4b92cab8c0a073d74d908805536) +++ uspace/lib/net/include/il_interface.h (revision fb9ffb0a9dac70b9ad0ca32e24e69f88f861d209) @@ -27,25 +27,21 @@ */ -/** @addtogroup net_il - * @{ +/** @addtogroup libnet + * @{ */ /** @file - * Internetwork layer module interface for the underlying network interface layer. - * This interface is always called by the remote modules. + * Internetwork layer module interface for the underlying network interface + * layer. This interface is always called by the remote modules. */ -#ifndef __NET_IL_INTERFACE_H__ -#define __NET_IL_INTERFACE_H__ - -#include +#ifndef LIBNET_IL_INTERFACE_H_ +#define LIBNET_IL_INTERFACE_H_ #include -#include +#include #include #include - -#include /** @name Internetwork layer module interface @@ -54,60 +50,7 @@ /*@{*/ -/** Notify the internetwork layer modules about the device state change. - * - * @param[in] il_phone The internetwork layer module phone used for - * (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] state The new device state. - * @param[in] target The target internetwork module service to be - * delivered to. - * - * @return EOK on success. - * - */ -static inline int il_device_state_msg(int il_phone, device_id_t device_id, - device_state_t state, services_t target) -{ - return generic_device_state_msg_remote(il_phone, NET_IL_DEVICE_STATE, - device_id, state, target); -} - -/** Notify the internetwork layer modules about the received packet/s. - * - * @param[in] il_phone The internetwork layer module phone used for - * (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] packet The received packet or the received packet queue. - * @param[in] target The target internetwork module service to be - * delivered to. - * - * @return EOK on success. - * - */ -inline static int il_received_msg(int il_phone, device_id_t device_id, - packet_t packet, services_t target) -{ - return generic_received_msg_remote(il_phone, NET_IL_RECEIVED, device_id, - packet_get_id(packet), target, 0); -} - -/** Notify the internetwork layer modules about the mtu change. - * - * @param[in] il_phone The internetwork layer module phone used for - * (semi)remote calls. - * @param[in] device_id The device identifier. - * @param[in] mtu The new mtu value. - * @param[in] target The target internetwork module service to be - * delivered to. - * - * @return EOK on success. - * - */ -inline static int il_mtu_changed_msg(int il_phone, device_id_t device_id, - size_t mtu, services_t target) -{ - return generic_device_state_msg_remote(il_phone, NET_IL_MTU_CHANGED, - device_id, (int) mtu, target); -} +extern int il_device_state_msg(int, device_id_t, device_state_t, services_t); +extern int il_received_msg(int, device_id_t, packet_t, services_t); +extern int il_mtu_changed_msg(int, device_id_t, size_t, services_t); /*@}*/