Index: uspace/lib/c/generic/ddi.c =================================================================== --- uspace/lib/c/generic/ddi.c (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/c/generic/ddi.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -96,26 +96,4 @@ } -/** Enable an interrupt. - * - * @param irq the interrupt. - * - * @return Zero on success, negative error code otherwise. - */ -int interrupt_enable(int irq) -{ - return __SYSCALL2(SYS_INTERRUPT_ENABLE, (sysarg_t) irq, 1); -} - -/** Disable an interrupt. - * - * @param irq the interrupt. - * - * @return Zero on success, negative error code otherwise. - */ -int interrupt_disable(int irq) -{ - return __SYSCALL2(SYS_INTERRUPT_ENABLE, (sysarg_t) irq, 0); -} - /** Enable PIO for specified I/O range. * Index: uspace/lib/c/generic/devman.c =================================================================== --- uspace/lib/c/generic/devman.c (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/c/generic/devman.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -79,10 +79,11 @@ } - if (flags & IPC_FLAG_BLOCKING) + if (flags & IPC_FLAG_BLOCKING) { devman_phone_client = async_connect_me_to_blocking( PHONE_NS, SERVICE_DEVMAN, DEVMAN_CLIENT, 0); - else + } else { devman_phone_client = async_connect_me_to(PHONE_NS, SERVICE_DEVMAN, DEVMAN_CLIENT, 0); + } fibril_mutex_unlock(&devman_phone_mutex); Index: uspace/lib/c/include/ddi.h =================================================================== --- uspace/lib/c/include/ddi.h (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/c/include/ddi.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -42,6 +42,4 @@ extern int iospace_enable(task_id_t, void *, unsigned long); extern int pio_enable(void *, size_t, void **); -extern int interrupt_enable(int); -extern int interrupt_disable(int); #endif Index: uspace/lib/c/include/ipc/il.h =================================================================== --- uspace/lib/c/include/ipc/il.h (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/c/include/ipc/il.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -33,5 +33,5 @@ /** @file * Internetwork layer modules messages. - * @see il_interface.h + * @see il_remote.h * @see ip_interface.h */ @@ -45,28 +45,18 @@ /** Internet layer modules messages. */ typedef enum { - /** New device message. - * @see ip_device_req() - */ - NET_IL_DEVICE = NET_IL_FIRST, /** Device state changed message. * @see il_device_state_msg() */ - NET_IL_DEVICE_STATE, + NET_IL_DEVICE_STATE = NET_IL_FIRST, + /** Device MTU changed message. * @see il_mtu_changed_msg() */ NET_IL_MTU_CHANGED, - /** Packet size message. - * @see il_packet_size_req() - */ - NET_IL_PACKET_SPACE, + /** Packet received message. * @see il_received_msg() */ - NET_IL_RECEIVED, - /** Packet send message. - * @see il_send_msg() - */ - NET_IL_SEND + NET_IL_RECEIVED } il_messages; Index: uspace/lib/c/include/ipc/ip.h =================================================================== --- uspace/lib/c/include/ipc/ip.h (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/c/include/ipc/ip.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -47,8 +47,13 @@ /** IP module messages. */ typedef enum { + /** New device message. + * @see ip_device_req() + */ + NET_IP_DEVICE = NET_IP_FIRST, + /** Adds the routing entry. * @see ip_add_route() */ - NET_IP_ADD_ROUTE = NET_IP_FIRST, + NET_IP_ADD_ROUTE, /** Gets the actual route information. @@ -65,5 +70,15 @@ * @see ip_set_default_gateway() */ - NET_IP_SET_GATEWAY + NET_IP_SET_GATEWAY, + + /** Packet size message. + * @see ip_packet_size_req() + */ + NET_IP_PACKET_SPACE, + + /** Packet send message. + * @see ip_send_msg() + */ + NET_IP_SEND } ip_messages; Index: uspace/lib/c/include/ipc/services.h =================================================================== --- uspace/lib/c/include/ipc/services.h (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/c/include/ipc/services.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -54,5 +54,5 @@ SERVICE_NETWORKING, SERVICE_LO, - SERVICE_DP8390, + SERVICE_NE2000, SERVICE_ETHERNET, SERVICE_NILDUMMY, Index: uspace/lib/net/Makefile =================================================================== --- uspace/lib/net/Makefile (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/net/Makefile (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -43,5 +43,7 @@ netif/netif_skel.c \ nil/nil_remote.c \ - il/il_interface.c \ + nil/nil_skel.c \ + il/il_remote.c \ + il/il_skel.c \ il/ip_remote.c \ il/ip_client.c \ @@ -50,6 +52,7 @@ tl/icmp_client.c \ tl/socket_core.c \ - tl/tl_interface.c \ - tl/tl_common.c + tl/tl_common.c \ + tl/tl_remote.c \ + tl/tl_skel.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/lib/net/generic/protocol_map.c =================================================================== --- uspace/lib/net/generic/protocol_map.c (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/net/generic/protocol_map.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -50,5 +50,5 @@ switch (nil) { case SERVICE_ETHERNET: - case SERVICE_DP8390: + case SERVICE_NE2000: switch (il) { case SERVICE_IP: @@ -76,5 +76,5 @@ switch (nil) { case SERVICE_ETHERNET: - case SERVICE_DP8390: + case SERVICE_NE2000: switch (protocol) { case ETH_P_IP: @@ -139,5 +139,5 @@ switch (nil) { case SERVICE_ETHERNET: - case SERVICE_DP8390: + case SERVICE_NE2000: return HW_ETHER; default: Index: uspace/lib/net/il/il_interface.c =================================================================== --- uspace/lib/net/il/il_interface.c (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ (revision ) @@ -1,106 +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 - * 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/il/il_remote.c =================================================================== --- uspace/lib/net/il/il_remote.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) +++ uspace/lib/net/il/il_remote.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -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. + */ + +#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/il/il_skel.c =================================================================== --- uspace/lib/net/il/il_skel.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) +++ uspace/lib/net/il/il_skel.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2011 Martin Decky + * 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 + * Internetworking layer module skeleton implementation. + * @see il_skel.h + */ + +#include +#include +#include +#include +#include + +/** Default thread for new connections. + * + * @param[in] iid The initial message identifier. + * @param[in] icall The initial message call structure. + * + */ +static void il_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 = il_module_message(callid, &call, &answer, + &count); + + /* + * End if told 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 internetworking 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] service Service identification. + * + * @return EOK on success. + * @return Other error codes as defined for the pm_init() function. + * @return Other error codes as defined for the il_initialize() + * function. + * @return Other error codes as defined for the REGISTER_ME() macro + * function. + * + */ +int il_module_start(int service) +{ + async_set_client_connection(il_client_connection); + int net_phone = net_connect_module(); + if (net_phone < 0) + return net_phone; + + int rc = pm_init(); + if (rc != EOK) + return rc; + + rc = il_initialize(net_phone); + if (rc != EOK) + goto out; + + sysarg_t phonehash; + rc = ipc_connect_to_me(PHONE_NS, service, 0, 0, &phonehash); + if (rc != EOK) + goto out; + + async_manager(); + +out: + pm_destroy(); + return rc; +} + +/** @} + */ Index: uspace/lib/net/il/ip_remote.c =================================================================== --- uspace/lib/net/il/ip_remote.c (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/net/il/ip_remote.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -36,5 +36,5 @@ * * @see ip_interface.h - * @see il_interface.h + * @see il_remote.h * */ @@ -121,5 +121,5 @@ services_t service) { - return generic_device_req_remote(ip_phone, NET_IL_DEVICE, device_id, 0, + return generic_device_req_remote(ip_phone, NET_IP_DEVICE, device_id, 0, service); } @@ -188,5 +188,5 @@ packet_dimension_t *packet_dimension) { - return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE, + return generic_packet_size_req_remote(ip_phone, NET_IP_PACKET_SPACE, device_id, packet_dimension); } @@ -228,5 +228,5 @@ services_t sender, services_t error) { - return generic_send_msg_remote(ip_phone, NET_IL_SEND, device_id, + return generic_send_msg_remote(ip_phone, NET_IP_SEND, device_id, packet_get_id(packet), sender, error); } Index: uspace/lib/net/include/il_interface.h =================================================================== --- uspace/lib/net/include/il_interface.h (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ (revision ) @@ -1,61 +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 - * Internetwork layer module interface for the underlying network interface - * layer. This interface is always called by the remote modules. - */ - -#ifndef LIBNET_IL_INTERFACE_H_ -#define LIBNET_IL_INTERFACE_H_ - -#include -#include - -#include -#include - -/** @name Internetwork layer module interface - * This interface is used by other modules. - */ -/*@{*/ - -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); - -/*@}*/ - -#endif - -/** @} - */ Index: uspace/lib/net/include/il_local.h =================================================================== --- uspace/lib/net/include/il_local.h (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ (revision ) @@ -1,72 +1,0 @@ -/* - * Copyright (c) 2010 Martin Decky - * 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_IL_LOCAL_H_ -#define LIBNET_IL_LOCAL_H_ - -#include -#include - -/** Processes the Internet layer module message. - * - * @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 Other error codes as defined for the arp_message() - * function. - */ -extern int il_module_message_standalone(ipc_callid_t callid, ipc_call_t *call, - ipc_call_t *answer, size_t *answer_count); - -/** Starts the Internet layer module. - * - * Initializes the client connection servicing 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. - * @return EOK on successful module termination. - * @return Other error codes as defined for the arp_initialize() - * function. - * @return Other error codes as defined for the REGISTER_ME() macro - * function. - */ -extern int il_module_start_standalone(async_client_conn_t client_connection); - -#endif - -/** @} - */ Index: uspace/lib/net/include/il_remote.h =================================================================== --- uspace/lib/net/include/il_remote.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) +++ uspace/lib/net/include/il_remote.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -0,0 +1,61 @@ +/* + * 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. + */ + +#ifndef LIBNET_IL_REMOTE_H_ +#define LIBNET_IL_REMOTE_H_ + +#include +#include + +#include +#include + +/** @name Internetwork layer module interface + * This interface is used by other modules. + */ +/*@{*/ + +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); + +/*@}*/ + +#endif + +/** @} + */ Index: uspace/lib/net/include/il_skel.h =================================================================== --- uspace/lib/net/include/il_skel.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) +++ uspace/lib/net/include/il_skel.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2010 Martin Decky + * 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_IL_SKEL_H_ +#define LIBNET_IL_SKEL_H_ + +/** @file + * Internetwork layer module skeleton. + * The skeleton has to be part of each internetwork layer module. + */ + +#include +#include +#include +#include + +#include +#include +#include + +/** Module initialization. + * + * This has to be implemented in user code. + * + * @param[in] net_phone Networking module phone. + * + * @return EOK on success. + * @return Other error codes as defined for each specific module + * initialize function. + * + */ +extern int il_initialize(int net_phone); + +/** Process the internetwork layer module message. + * + * This has to be implemented in user code. + * + * @param[in] callid Message identifier. + * @param[in] call Message parameters. + * @param[out] answer Answer. + * @param[out] count Number of arguments of the answer. + * + * @return EOK on success. + * @return Other error codes as defined for each specific module. + * + */ +extern int il_module_message(ipc_callid_t callid, ipc_call_t *call, + ipc_call_t *answer, size_t *answer_count); + +extern int il_module_start(int); + +#endif + +/** @} + */ Index: uspace/lib/net/include/nil_interface.h =================================================================== --- uspace/lib/net/include/nil_interface.h (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ (revision ) @@ -1,73 +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_NIL_INTERFACE_H_ -#define LIBNET_NIL_INTERFACE_H_ - -#include -#include - -#include -#include - -#include -#include - -#define nil_bind_service(service, device_id, me, receiver) \ - bind_service(service, device_id, me, 0, receiver) - -#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) - -#define nil_get_addr_req(nil_phone, device_id, address, data) \ - generic_get_addr_req(nil_phone, NET_NIL_ADDR, device_id, address, data) - -#define nil_get_broadcast_addr_req(nil_phone, device_id, address, data) \ - generic_get_addr_req(nil_phone, NET_NIL_BROADCAST_ADDR, device_id, \ - address, data) - -#define nil_send_msg(nil_phone, device_id, packet, sender) \ - generic_send_msg_remote(nil_phone, NET_NIL_SEND, device_id, \ - packet_get_id(packet), sender, 0) - -#define nil_device_req(nil_phone, device_id, mtu, netif_service) \ - generic_device_req_remote(nil_phone, NET_NIL_DEVICE, device_id, mtu, \ - netif_service) - -#define nil_device_state_msg nil_device_state_msg_remote -#define nil_received_msg nil_received_msg_remote - -#endif - -/** @} - */ Index: uspace/lib/net/include/nil_local.h =================================================================== --- uspace/lib/net/include/nil_local.h (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ (revision ) @@ -1,136 +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 layer modules common skeleton. - * All network interface layer modules have to implement this interface. - */ - -#ifndef LIBNET_NIL_LOCAL_H_ -#define LIBNET_NIL_LOCAL_H_ - -#include - -/** Module initialization. - * - * 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. - */ -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. - * - * @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 *, size_t *); - -/** 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_module_message_standalone(const char *, ipc_callid_t, - ipc_call_t *, ipc_call_t *, size_t *); - -/** 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); - -#endif - -/** @} - */ Index: uspace/lib/net/include/nil_remote.h =================================================================== --- uspace/lib/net/include/nil_remote.h (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/net/include/nil_remote.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -37,7 +37,30 @@ #include #include +#include -extern int nil_device_state_msg_remote(int, device_id_t, int); -extern int nil_received_msg_remote(int, device_id_t, packet_t *, services_t); +#define nil_bind_service(service, device_id, me, receiver) \ + bind_service(service, device_id, me, 0, receiver) + +#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) + +#define nil_get_addr_req(nil_phone, device_id, address, data) \ + generic_get_addr_req(nil_phone, NET_NIL_ADDR, device_id, address, data) + +#define nil_get_broadcast_addr_req(nil_phone, device_id, address, data) \ + generic_get_addr_req(nil_phone, NET_NIL_BROADCAST_ADDR, device_id, \ + address, data) + +#define nil_send_msg(nil_phone, device_id, packet, sender) \ + generic_send_msg_remote(nil_phone, NET_NIL_SEND, device_id, \ + packet_get_id(packet), sender, 0) + +#define nil_device_req(nil_phone, device_id, mtu, netif_service) \ + generic_device_req_remote(nil_phone, NET_NIL_DEVICE, device_id, mtu, \ + netif_service) + +extern int nil_device_state_msg(int, device_id_t, int); +extern int nil_received_msg(int, device_id_t, packet_t *, services_t); #endif Index: uspace/lib/net/include/nil_skel.h =================================================================== --- uspace/lib/net/include/nil_skel.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) +++ uspace/lib/net/include/nil_skel.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -0,0 +1,123 @@ +/* + * 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 layer modules common skeleton. + * All network interface layer modules have to implement this interface. + */ + +#ifndef LIBNET_NIL_SKEL_H_ +#define LIBNET_NIL_SKEL_H_ + +#include +#include +#include +#include + +#include +#include +#include + +/** Module initialization. + * + * This has to be implemented in user code. + * + * @param[in] net_phone Networking module phone. + * + * @return EOK on success. + * @return Other error codes as defined for each specific module + * initialize function. + * + */ +extern int nil_initialize(int net_phone); + +/** Notify the network interface layer about the device state change. + * + * This has to be implemented in user code. + * + * @param[in] nil_phone Network interface layer phone. + * @param[in] device_id Device identifier. + * @param[in] state 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. + * + * This has to be implemented in user code. + * + * @param[in] nil_phone Network interface layer phone. + * @param[in] device_id Source device identifier. + * @param[in] packet Received packet or the received packet queue. + * @param[in] target 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. + * + * This has to be implemented in user code. + * + * @param[in] name Module name. + * @param[in] callid Message identifier. + * @param[in] call Message parameters. + * @param[out] answer Message answer parameters. + * @param[out] count Message answer arguments. + * + * @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_NIL_MESSAGE() + * + */ +extern int nil_module_message(ipc_callid_t, ipc_call_t *, ipc_call_t *, + size_t *); + +extern int nil_module_start(int); + +#endif + +/** @} + */ Index: uspace/lib/net/include/tl_interface.h =================================================================== --- uspace/lib/net/include/tl_interface.h (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ (revision ) @@ -1,61 +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 - * Transport layer module interface for the underlying internetwork layer. - */ - -#ifndef LIBNET_TL_INTERFACE_H_ -#define LIBNET_TL_INTERFACE_H_ - -#include -#include -#include - -#include -#include -#include -#include - -/** @name Transport layer module interface - * This interface is used by other modules. - */ -/*@{*/ - -extern int tl_received_msg(int, device_id_t, packet_t *, services_t, services_t); - -/*@}*/ - -#endif - -/** @} - */ Index: uspace/lib/net/include/tl_local.h =================================================================== --- uspace/lib/net/include/tl_local.h (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ (revision ) @@ -1,72 +1,0 @@ -/* - * Copyright (c) 2010 Martin Decky - * 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_TL_LOCAL_H_ -#define LIBNET_TL_LOCAL_H_ - -#include -#include - -/** Starts the TL 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. - * @return EOK on successful module termination. - * @return Other error codes as defined for the module initialize - * function. - * @return Other error codes as defined for the REGISTER_ME() macro - * function. - */ -extern int tl_module_message_standalone(ipc_callid_t, ipc_call_t *, - ipc_call_t *, size_t *); - -/** Processes the TL module message. - * - * @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 Other error codes as defined for the module's message - * standalone function. - */ -extern int tl_module_start_standalone(async_client_conn_t); - -#endif - -/** @} - */ Index: uspace/lib/net/include/tl_remote.h =================================================================== --- uspace/lib/net/include/tl_remote.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) +++ uspace/lib/net/include/tl_remote.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -0,0 +1,62 @@ +/* + * 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 + * Transport layer module interface for the underlying internetwork layer. + */ + +#ifndef LIBNET_TL_REMOTE_H_ +#define LIBNET_TL_REMOTE_H_ + +#include +#include +#include + +#include +#include +#include +#include + +/** @name Transport layer module interface + * This interface is used by other modules. + */ +/*@{*/ + +extern int tl_received_msg(int, device_id_t, packet_t *, services_t, + services_t); + +/*@}*/ + +#endif + +/** @} + */ Index: uspace/lib/net/include/tl_skel.h =================================================================== --- uspace/lib/net/include/tl_skel.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) +++ uspace/lib/net/include/tl_skel.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2010 Martin Decky + * 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_TL_SKEL_H_ +#define LIBNET_TL_SKEL_H_ + +/** @file + * Transport layer module skeleton. + * The skeleton has to be part of each transport layer module. + */ + +#include +#include +#include +#include + +#include +#include +#include + +/** Module initialization. + * + * This has to be implemented in user code. + * + * @param[in] net_phone Networking module phone. + * + * @return EOK on success. + * @return Other error codes as defined for each specific module + * initialize function. + * + */ +extern int tl_initialize(int net_phone); + +/** Process the transport layer module message. + * + * This has to be implemented in user code. + * + * @param[in] callid Message identifier. + * @param[in] call Message parameters. + * @param[out] answer Answer. + * @param[out] count Number of arguments of the answer. + * + * @return EOK on success. + * @return Other error codes as defined for each specific module. + * + */ +extern int tl_module_message(ipc_callid_t, ipc_call_t *, + ipc_call_t *, size_t *); + +extern int tl_module_start(int); + +#endif + +/** @} + */ Index: uspace/lib/net/netif/netif_skel.c =================================================================== --- uspace/lib/net/netif/netif_skel.c (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/net/netif/netif_skel.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -33,5 +33,5 @@ /** @file * Network interface module skeleton implementation. - * @see netif.h + * @see netif_skel.h */ @@ -52,6 +52,6 @@ #include #include -#include #include +#include DEVICE_MAP_IMPLEMENT(netif_device_map, netif_device_t); @@ -130,6 +130,6 @@ if (result > NETIF_NULL) { int phone = device->nil_phone; + nil_device_state_msg(phone, device_id, result); fibril_rwlock_write_unlock(&netif_globals.lock); - nil_device_state_msg(phone, device_id, result); return EOK; } @@ -166,6 +166,6 @@ if (result > NETIF_NULL) { int phone = device->nil_phone; + nil_device_state_msg(phone, device_id, result); fibril_rwlock_write_unlock(&netif_globals.lock); - nil_device_state_msg(phone, device_id, result); return EOK; } Index: uspace/lib/net/nil/nil_remote.c =================================================================== --- uspace/lib/net/nil/nil_remote.c (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/net/nil/nil_remote.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -33,26 +33,26 @@ /** @file * Network interface layer interface implementation for remote modules. - * @see nil_interface.h + * @see nil_remote.h */ #include -#include #include #include #include #include - #include /** 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 Network interface layer phone. + * @param[in] device_id Device identifier. + * @param[in] state 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) +int nil_device_state_msg(int nil_phone, device_id_t device_id, int state) { return generic_device_state_msg_remote(nil_phone, NET_NIL_DEVICE_STATE, @@ -65,13 +65,15 @@ * 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 Network interface layer phone. + * @param[in] device_id Source device identifier. + * @param[in] packet Received packet or the received packet queue. + * @param[in] target 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, +int nil_received_msg(int nil_phone, device_id_t device_id, packet_t *packet, services_t target) { Index: uspace/lib/net/nil/nil_skel.c =================================================================== --- uspace/lib/net/nil/nil_skel.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) +++ uspace/lib/net/nil/nil_skel.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2011 Martin Decky + * 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 layer module skeleton implementation. + * @see nil_skel.h + */ + +#include +#include +#include +#include +#include + +/** Default thread for new connections. + * + * @param[in] iid The initial message identifier. + * @param[in] icall The initial message call structure. + * + */ +static void nil_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 = nil_module_message(callid, &call, &answer, + &count); + + /* + * End if told 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 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] service Service identification. + * + * @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(int service) +{ + async_set_client_connection(nil_client_connection); + int net_phone = net_connect_module(); + if (net_phone < 0) + return net_phone; + + int rc = pm_init(); + if (rc != EOK) + return rc; + + rc = nil_initialize(net_phone); + if (rc != EOK) + goto out; + + sysarg_t phonehash; + rc = ipc_connect_to_me(PHONE_NS, service, 0, 0, &phonehash); + if (rc != EOK) + goto out; + + async_manager(); + +out: + pm_destroy(); + return rc; +} + +/** @} + */ Index: uspace/lib/net/tl/tl_common.c =================================================================== --- uspace/lib/net/tl/tl_common.c (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/net/tl/tl_common.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -42,5 +42,5 @@ #include #include -#include +#include #include Index: uspace/lib/net/tl/tl_interface.c =================================================================== --- uspace/lib/net/tl/tl_interface.c (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ (revision ) @@ -1,68 +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 - * @{ - */ - -#include -#include -#include - -#include -#include - -#include -#include - -/** Notify the remote transport layer modules about the received packet/s. - * - * @param[in] tl_phone The transport layer module phone used for remote calls. - * @param[in] device_id The device identifier. - * @param[in] packet The received packet or the received packet queue. - * The packet queue is used to carry a fragmented - * datagram. The first packet contains the headers, - * the others contain only data. - * @param[in] target The target transport layer module service to be - * delivered to. - * @param[in] error The packet error reporting service. Prefixes the - * received packet. - * - * @return EOK on success. - * - */ -int -tl_received_msg(int tl_phone, device_id_t device_id, packet_t *packet, - services_t target, services_t error) -{ - return generic_received_msg_remote(tl_phone, NET_TL_RECEIVED, device_id, - packet_get_id(packet), target, error); -} - -/** @} - */ Index: uspace/lib/net/tl/tl_remote.c =================================================================== --- uspace/lib/net/tl/tl_remote.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) +++ uspace/lib/net/tl/tl_remote.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -0,0 +1,67 @@ +/* + * 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 + * @{ + */ + +#include +#include +#include + +#include +#include + +#include +#include + +/** Notify the remote transport layer modules about the received packet/s. + * + * @param[in] tl_phone The transport layer module phone used for remote calls. + * @param[in] device_id The device identifier. + * @param[in] packet The received packet or the received packet queue. + * The packet queue is used to carry a fragmented + * datagram. The first packet contains the headers, + * the others contain only data. + * @param[in] target The target transport layer module service to be + * delivered to. + * @param[in] error The packet error reporting service. Prefixes the + * received packet. + * + * @return EOK on success. + * + */ +int tl_received_msg(int tl_phone, device_id_t device_id, packet_t *packet, + services_t target, services_t error) +{ + return generic_received_msg_remote(tl_phone, NET_TL_RECEIVED, device_id, + packet_get_id(packet), target, error); +} + +/** @} + */ Index: uspace/lib/net/tl/tl_skel.c =================================================================== --- uspace/lib/net/tl/tl_skel.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) +++ uspace/lib/net/tl/tl_skel.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2011 Martin Decky + * 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 + * Transport layer module skeleton implementation. + * @see tl_skel.h + */ + +#include +#include +#include +#include +#include + +/** Default thread for new connections. + * + * @param[in] iid The initial message identifier. + * @param[in] icall The initial message call structure. + * + */ +static void tl_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 = tl_module_message(callid, &call, &answer, + &count); + + /* + * End if told 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 trasport 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] service Service identification. + * + * @return EOK on success. + * @return Other error codes as defined for the pm_init() function. + * @return Other error codes as defined for the il_initialize() + * function. + * @return Other error codes as defined for the REGISTER_ME() macro + * function. + * + */ +int tl_module_start(int service) +{ + async_set_client_connection(tl_client_connection); + int net_phone = net_connect_module(); + if (net_phone < 0) + return net_phone; + + int rc = pm_init(); + if (rc != EOK) + return rc; + + rc = tl_initialize(net_phone); + if (rc != EOK) + goto out; + + sysarg_t phonehash; + rc = ipc_connect_to_me(PHONE_NS, service, 0, 0, &phonehash); + if (rc != EOK) + goto out; + + async_manager(); + +out: + pm_destroy(); + return rc; +} + +/** @} + */ Index: uspace/lib/usb/Makefile =================================================================== --- uspace/lib/usb/Makefile (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/usb/Makefile (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -36,4 +36,5 @@ src/class.c \ src/debug.c \ + src/dp.c \ src/drvpsync.c \ src/hcdhubd.c \ Index: uspace/lib/usb/include/usb/classes/hidparser.h =================================================================== --- uspace/lib/usb/include/usb/classes/hidparser.h (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/usb/include/usb/classes/hidparser.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -38,7 +38,24 @@ #include +/** + * Description of report items + */ +typedef struct { + + uint8_t usage_min; + uint8_t usage_max; + uint8_t logical_min; + uint8_t logical_max; + uint8_t size; + uint8_t count; + uint8_t offset; + +} usb_hid_report_item_t; + + /** HID report parser structure. */ typedef struct { } usb_hid_report_parser_t; + /** HID parser callbacks for IN items. */ @@ -50,6 +67,21 @@ * @param arg Custom argument. */ - void (*keyboard)(const uint16_t *key_codes, size_t count, void *arg); + void (*keyboard)(const uint8_t *key_codes, size_t count, const uint8_t modifiers, void *arg); } usb_hid_report_in_callbacks_t; + +#define USB_HID_BOOT_KEYBOARD_NUM_LOCK 0x01 +#define USB_HID_BOOT_KEYBOARD_CAPS_LOCK 0x02 +#define USB_HID_BOOT_KEYBOARD_SCROLL_LOCK 0x04 +#define USB_HID_BOOT_KEYBOARD_COMPOSE 0x08 +#define USB_HID_BOOT_KEYBOARD_KANA 0x10 + +/* + * modifiers definitions + */ + +int usb_hid_boot_keyboard_input_report(const uint8_t *data, size_t size, + const usb_hid_report_in_callbacks_t *callbacks, void *arg); + +int usb_hid_boot_keyboard_output_report(uint8_t leds, uint8_t *data, size_t size); int usb_hid_parse_report_descriptor(usb_hid_report_parser_t *parser, @@ -60,4 +92,7 @@ const usb_hid_report_in_callbacks_t *callbacks, void *arg); + +int usb_hid_free_report_parser(usb_hid_report_parser_t *parser); + #endif /** Index: uspace/lib/usb/include/usb/dp.h =================================================================== --- uspace/lib/usb/include/usb/dp.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) +++ uspace/lib/usb/include/usb/dp.h (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * 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 libusb + * @{ + */ +/** @file + * @brief USB descriptor parser. + */ +#ifndef LIBUSB_DP_H_ +#define LIBUSB_DP_H_ + +#include +#include +#include + +typedef struct { + int child; + int parent; +} usb_dp_descriptor_nesting_t; + +typedef struct { + usb_dp_descriptor_nesting_t *nesting; +} usb_dp_parser_t; + +typedef struct { + uint8_t *data; + size_t size; + void *arg; +} usb_dp_parser_data_t; + +uint8_t *usb_dp_get_nested_descriptor(usb_dp_parser_t *, + usb_dp_parser_data_t *, uint8_t *); +uint8_t *usb_dp_get_sibling_descriptor(usb_dp_parser_t *, + usb_dp_parser_data_t *, uint8_t *, uint8_t *); + +#endif +/** + * @} + */ Index: uspace/lib/usb/src/dp.c =================================================================== --- uspace/lib/usb/src/dp.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) +++ uspace/lib/usb/src/dp.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -0,0 +1,234 @@ +/* + * Copyright (c) 2011 Vojtech Horky + * 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 libusb + * @{ + */ +/** + * @file + * @brief USB descriptor parser (implementation). + */ +#include +#include +#include +#include +#include +#include + +/** Tells whether pointer points inside descriptor data. + * + * @param data Parser data. + * @param ptr Pointer to be verified. + * @return Whether @ptr points inside data->data field. + */ +static bool is_valid_descriptor_pointer(usb_dp_parser_data_t *data, + uint8_t *ptr) +{ + if (ptr == NULL) { + return false; + } + + if (ptr < data->data) { + return false; + } + + if ((size_t)(ptr - data->data) >= data->size) { + return false; + } + + return true; +} + +/** Get next descriptor regardless of the nesting. + * + * @param data Parser data. + * @param current Pointer to current descriptor. + * @return Pointer to start of next descriptor. + * @retval NULL Invalid input or no next descriptor. + */ +static uint8_t *get_next_descriptor(usb_dp_parser_data_t *data, + uint8_t *current) +{ + assert(is_valid_descriptor_pointer(data, current)); + + uint8_t current_length = *current; + uint8_t *next = current + current_length; + + if (!is_valid_descriptor_pointer(data, next)) { + return NULL; + } + + return next; +} + +/** Get descriptor type. + * + * @see usb_descriptor_type_t + * + * @param data Parser data. + * @param start Pointer to start of the descriptor. + * @return Descriptor type. + * @retval -1 Invalid input. + */ +static int get_descriptor_type(usb_dp_parser_data_t *data, uint8_t *start) +{ + if (start == NULL) { + return -1; + } + + start++; + if (!is_valid_descriptor_pointer(data, start)) { + return -1; + } else { + return (int) (*start); + } +} + +/** Tells whether descriptors could be nested. + * + * @param parser Parser. + * @param child Child descriptor type. + * @param parent Parent descriptor type. + * @return Whether @p child could be child of @p parent. + */ +static bool is_nested_descriptor_type(usb_dp_parser_t *parser, + int child, int parent) +{ + usb_dp_descriptor_nesting_t *nesting = parser->nesting; + while ((nesting->child > 0) && (nesting->parent > 0)) { + if ((nesting->child == child) && (nesting->parent == parent)) { + return true; + } + nesting++; + } + return false; +} + +/** Tells whether descriptors could be nested. + * + * @param parser Parser. + * @param data Parser data. + * @param child Pointer to child descriptor. + * @param parent Pointer to parent descriptor. + * @return Whether @p child could be child of @p parent. + */ +static bool is_nested_descriptor(usb_dp_parser_t *parser, + usb_dp_parser_data_t *data, uint8_t *child, uint8_t *parent) +{ + return is_nested_descriptor_type(parser, + get_descriptor_type(data, child), + get_descriptor_type(data, parent)); +} + +/** Find first nested descriptor of given parent. + * + * @param parser Parser. + * @param data Parser data. + * @param parent Pointer to the beginning of parent descriptor. + * @return Pointer to the beginning of the first nested (child) descriptor. + * @retval NULL No child descriptor found. + * @retval NULL Invalid input. + */ +uint8_t *usb_dp_get_nested_descriptor(usb_dp_parser_t *parser, + usb_dp_parser_data_t *data, uint8_t *parent) +{ + if (!is_valid_descriptor_pointer(data, parent)) { + return NULL; + } + + uint8_t *next = get_next_descriptor(data, parent); + if (next == NULL) { + return NULL; + } + + if (is_nested_descriptor(parser, data, next, parent)) { + return next; + } else { + return NULL; + } +} + +/** Skip all nested descriptors. + * + * @param parser Parser. + * @param data Parser data. + * @param parent Pointer to the beginning of parent descriptor. + * @return Pointer to first non-child descriptor. + * @retval NULL No next descriptor. + * @retval NULL Invalid input. + */ +static uint8_t *skip_nested_descriptors(usb_dp_parser_t *parser, + usb_dp_parser_data_t *data, uint8_t *parent) +{ + uint8_t *child = usb_dp_get_nested_descriptor(parser, data, parent); + if (child == NULL) { + return get_next_descriptor(data, parent); + } + uint8_t *next_child = skip_nested_descriptors(parser, data, child); + while (is_nested_descriptor(parser, data, next_child, parent)) { + next_child = skip_nested_descriptors(parser, data, next_child); + } + + return next_child; +} + +/** Get sibling descriptor. + * + * @param parser Parser. + * @param data Parser data. + * @param parent Pointer to common parent descriptor. + * @param sibling Left sibling. + * @return Pointer to first right sibling of @p sibling. + * @retval NULL No sibling exist. + * @retval NULL Invalid input. + */ +uint8_t *usb_dp_get_sibling_descriptor(usb_dp_parser_t *parser, + usb_dp_parser_data_t *data, uint8_t *parent, uint8_t *sibling) +{ + if (!is_valid_descriptor_pointer(data, parent) + || !is_valid_descriptor_pointer(data, sibling)) { + return NULL; + } + + uint8_t *possible_sibling = skip_nested_descriptors(parser, data, sibling); + if (possible_sibling == NULL) { + return NULL; + } + + int parent_type = get_descriptor_type(data, parent); + int possible_sibling_type = get_descriptor_type(data, possible_sibling); + if (is_nested_descriptor_type(parser, possible_sibling_type, parent_type)) { + return possible_sibling; + } else { + return NULL; + } +} + + +/** @} + */ Index: uspace/lib/usb/src/hidparser.c =================================================================== --- uspace/lib/usb/src/hidparser.c (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/usb/src/hidparser.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -40,5 +40,4 @@ * @param parser Opaque HID report parser structure. * @param data Data describing the report. - * @param size Size of the descriptor in bytes. * @return Error code. */ @@ -55,5 +54,4 @@ * @param parser Opaque HID report parser structure. * @param data Data for the report. - * @param size Size of the data in bytes. * @param callbacks Callbacks for report actions. * @param arg Custom argument (passed through to the callbacks). @@ -66,7 +64,10 @@ int i; - // TODO: parse report + /* main parsing loop */ + while(0){ + } - uint16_t keys[6]; + + uint8_t keys[6]; for (i = 0; i < 6; ++i) { @@ -74,6 +75,17 @@ } - callbacks->keyboard(keys, 6, arg); - + callbacks->keyboard(keys, 6, 0, arg); + + return EOK; +} + +/** Free the HID report parser structure + * + * @param parser Opaque HID report parser structure + * @return Error code + */ +int usb_hid_free_report_parser(usb_hid_report_parser_t *parser) +{ + return EOK; } @@ -81,4 +93,64 @@ /** + * Parse input report. + * + * @param data Data for report + * @param size Size of report + * @param callbacks Callbacks for report actions + * @param arg Custom arguments + * + * @return Error code + */ +int usb_hid_boot_keyboard_input_report(const uint8_t *data, size_t size, + const usb_hid_report_in_callbacks_t *callbacks, void *arg) +{ + int i; + usb_hid_report_item_t item; + + /* fill item due to the boot protocol report descriptor */ + // modifier keys are in the first byte + uint8_t modifiers = data[0]; + + item.offset = 2; /* second byte is reserved */ + item.size = 8; + item.count = 6; + item.usage_min = 0; + item.usage_max = 255; + item.logical_min = 0; + item.logical_max = 255; + + if(size != 8){ + return -1; + } + + uint8_t keys[6]; + for(i=item.offset; ikeyboard(keys, 6, modifiers, arg); + return EOK; +} + +/** + * Makes output report for keyboard boot protocol + * + * @param leds + * @param output Output report data buffer + * @param size Size of the output buffer + * @return Error code + */ +int usb_hid_boot_keyboard_output_report(uint8_t leds, uint8_t *data, size_t size) +{ + if(size != 1){ + return -1; + } + + /* used only first five bits, others are only padding*/ + *data = leds; + return EOK; +} + +/** * @} */ Index: uspace/lib/usb/src/recognise.c =================================================================== --- uspace/lib/usb/src/recognise.c (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/usb/src/recognise.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -346,4 +346,6 @@ usb_address_t address, devman_handle_t *child_handle) { + static size_t device_name_index = 0; + device_t *child = NULL; char *child_name = NULL; @@ -357,7 +359,8 @@ /* - * TODO: some better child naming - */ - rc = asprintf(&child_name, "usb%p", child); + * TODO: Once the device driver framework support persistent + * naming etc., something more descriptive could be created. + */ + rc = asprintf(&child_name, "usbdev%02zu", device_name_index); if (rc < 0) { goto failure; @@ -381,4 +384,6 @@ } + device_name_index++; + return EOK; Index: uspace/lib/usb/src/usbdrvreq.c =================================================================== --- uspace/lib/usb/src/usbdrvreq.c (revision 450198656434e7e94937231839fa4d58efe9da6b) +++ uspace/lib/usb/src/usbdrvreq.c (revision b65ca41d0e710e7df94c3a5eb2c41cd2abd2a895) @@ -60,5 +60,5 @@ #define PREPARE_SETUP_PACKET(name, p_direction, p_type, p_recipient, \ p_request, p_value, p_index, p_length) \ - usb_device_request_setup_packet_t setup_packet = { \ + usb_device_request_setup_packet_t name = { \ .request_type = \ ((p_direction) == USB_DIRECTION_IN ? 128 : 0) \