Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision c6533a794620411b83c209fe9e2c6bb24cedc08c) +++ uspace/lib/c/Makefile (revision c8916d15d0b9a3ebcb74f63bfddee2a2188663df) @@ -108,5 +108,4 @@ generic/adt/hash_set.c \ generic/adt/dynamic_fifo.c \ - generic/adt/measured_strings.c \ generic/adt/char_map.c \ generic/adt/prodcons.c \ Index: uspace/lib/c/generic/adt/measured_strings.c =================================================================== --- uspace/lib/c/generic/adt/measured_strings.c (revision c6533a794620411b83c209fe9e2c6bb24cedc08c) +++ (revision ) @@ -1,421 +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 libc - * @{ - */ - -/** @file - * Character string with measured length implementation. - * @see measured_strings.h - */ - -#include -#include -#include -#include -#include -#include - -/** Creates a new measured string bundled with a copy of the given string - * itself as one memory block. - * - * If the measured string is being freed, whole memory block is freed. - * The measured string should be used only as a constant. - * - * @param[in] string The initial character string to be stored. - * @param[in] length The length of the given string without the terminating - * zero ('\0') character. If the length is zero, the actual - * length is computed. The given length is used and - * appended with the terminating zero ('\0') character - * otherwise. - * @return The new bundled character string with measured length. - * @return NULL if there is not enough memory left. - */ -measured_string_t * -measured_string_create_bulk(const uint8_t *string, size_t length) -{ - measured_string_t *new; - - if (length == 0) { - while (string[length]) - length++; - } - new = (measured_string_t *) malloc(sizeof(measured_string_t) + - (sizeof(uint8_t) * (length + 1))); - if (!new) - return NULL; - - new->length = length; - new->value = ((uint8_t *) new) + sizeof(measured_string_t); - /* Append terminating zero explicitly - to be safe */ - memcpy(new->value, string, new->length); - new->value[new->length] = '\0'; - - return new; -} - -/** Copies the given measured string with separated header and data parts. - * - * @param[in] source The source measured string to be copied. - * @return The copy of the given measured string. - * @return NULL if the source parameter is NULL. - * @return NULL if there is not enough memory left. - */ -measured_string_t *measured_string_copy(measured_string_t *source) -{ - measured_string_t *new; - - if (!source) - return NULL; - - new = (measured_string_t *) malloc(sizeof(measured_string_t)); - if (new) { - new->value = (uint8_t *) malloc(source->length + 1); - if (new->value) { - new->length = source->length; - memcpy(new->value, source->value, new->length); - new->value[new->length] = '\0'; - return new; - } - free(new); - } - - return NULL; -} - -/** Receives a measured strings array from a calling module. - * - * Creates the array and the data memory blocks. - * This method should be used only while processing IPC messages as the array - * size has to be negotiated in advance. - * - * @param[out] strings The received measured strings array. - * @param[out] data The measured strings data. This memory block stores the - * actual character strings. - * @param[in] count The size of the measured strings array. - * @return EOK on success. - * @return EINVAL if the strings or data parameter is NULL. - * @return EINVAL if the count parameter is zero (0). - * @return EINVAL if the sent array differs in size. - * @return EINVAL if there is inconsistency in sent measured - * strings' lengths (should not occur). - * @return ENOMEM if there is not enough memory left. - * @return Other error codes as defined for the - * async_data_write_finalize() function. - */ -int -measured_strings_receive(measured_string_t **strings, uint8_t **data, - size_t count) -{ - size_t *lengths; - size_t index; - size_t length; - uint8_t *next; - ipc_callid_t callid; - int rc; - - if ((!strings) || (!data) || (count <= 0)) - return EINVAL; - - lengths = (size_t *) malloc(sizeof(size_t) * (count + 1)); - if (!lengths) - return ENOMEM; - - if ((!async_data_write_receive(&callid, &length)) || - (length != sizeof(size_t) * (count + 1))) { - free(lengths); - return EINVAL; - } - rc = async_data_write_finalize(callid, lengths, length); - if (rc != EOK) { - free(lengths); - return rc; - } - - *data = malloc(lengths[count]); - if (!*data) { - free(lengths); - return ENOMEM; - } - (*data)[lengths[count] - 1] = '\0'; - - *strings = (measured_string_t *) malloc(sizeof(measured_string_t) * - count); - if (!*strings) { - free(lengths); - free(*data); - return ENOMEM; - } - - next = *data; - for (index = 0; index < count; index++) { - (*strings)[index].length = lengths[index]; - if (lengths[index] > 0) { - if (!async_data_write_receive(&callid, &length) || - (length != lengths[index])) { - free(*data); - free(*strings); - free(lengths); - return EINVAL; - } - rc = async_data_write_finalize(callid, next, - lengths[index]); - if (rc != EOK) { - free(*data); - free(*strings); - free(lengths); - return rc; - } - (*strings)[index].value = next; - next += lengths[index]; - *next++ = '\0'; - } else { - (*strings)[index].value = NULL; - } - } - - free(lengths); - return EOK; -} - -/** Computes the lengths of the measured strings in the given array. - * - * @param[in] strings The measured strings array to be processed. - * @param[in] count The measured strings array size. - * @return The computed sizes array. - * @return NULL if there is not enough memory left. - */ -static size_t *prepare_lengths(const measured_string_t *strings, size_t count) -{ - size_t *lengths; - size_t index; - size_t length; - - lengths = (size_t *) malloc(sizeof(size_t) * (count + 1)); - if (!lengths) - return NULL; - - length = 0; - for (index = 0; index < count; index++) { - lengths[index] = strings[index].length; - length += lengths[index] + 1; - } - lengths[count] = length; - return lengths; -} - -/** Replies the given measured strings array to a calling module. - * - * This method should be used only while processing IPC messages as the array - * size has to be negotiated in advance. - * - * @param[in] strings The measured strings array to be transferred. - * @param[in] count The measured strings array size. - * @return EOK on success. - * @return EINVAL if the strings parameter is NULL. - * @return EINVAL if the count parameter is zero (0). - * @return EINVAL if the calling module does not accept the given - * array size. - * @return EINVAL if there is inconsistency in sent measured - * strings' lengths (should not occur). - * @return Other error codes as defined for the - * async_data_read_finalize() function. - */ -int measured_strings_reply(const measured_string_t *strings, size_t count) -{ - size_t *lengths; - size_t index; - size_t length; - ipc_callid_t callid; - int rc; - - if ((!strings) || (count <= 0)) - return EINVAL; - - lengths = prepare_lengths(strings, count); - if (!lengths) - return ENOMEM; - - if (!async_data_read_receive(&callid, &length) || - (length != sizeof(size_t) * (count + 1))) { - free(lengths); - return EINVAL; - } - rc = async_data_read_finalize(callid, lengths, length); - if (rc != EOK) { - free(lengths); - return rc; - } - free(lengths); - - for (index = 0; index < count; index++) { - if (strings[index].length > 0) { - if (!async_data_read_receive(&callid, &length) || - (length != strings[index].length)) { - return EINVAL; - } - rc = async_data_read_finalize(callid, - strings[index].value, strings[index].length); - if (rc != EOK) - return rc; - } - } - - return EOK; -} - -/** Receives a measured strings array from another module. - * - * Creates the array and the data memory blocks. - * This method should be used only following other IPC messages as the array - * size has to be negotiated in advance. - * - * @param[in] exch Exchange. - * @param[out] strings The returned measured strings array. - * @param[out] data The measured strings data. This memory block stores the - * actual character strings. - * @param[in] count The size of the measured strings array. - * @return EOK on success. - * @return EINVAL if the strings or data parameter is NULL. - * @return EINVAL if the exch or count parameter is invalid. - * @return EINVAL if the sent array differs in size. - * @return ENOMEM if there is not enough memory left. - * @return Other error codes as defined for the - * async_data_read_start() function. - */ -int measured_strings_return(async_exch_t *exch, measured_string_t **strings, - uint8_t **data, size_t count) -{ - size_t *lengths; - size_t index; - uint8_t *next; - int rc; - - if ((exch == NULL) || (!strings) || (!data) || (count <= 0)) - return EINVAL; - - lengths = (size_t *) malloc(sizeof(size_t) * (count + 1)); - if (!lengths) - return ENOMEM; - - rc = async_data_read_start(exch, lengths, - sizeof(size_t) * (count + 1)); - if (rc != EOK) { - free(lengths); - return rc; - } - - *data = malloc(lengths[count]); - if (!*data) { - free(lengths); - return ENOMEM; - } - - *strings = (measured_string_t *) malloc(sizeof(measured_string_t) * - count); - if (!*strings) { - free(lengths); - free(*data); - return ENOMEM; - } - - next = *data; - for (index = 0; index < count; index++) { - (*strings)[index].length = lengths[index]; - if (lengths[index] > 0) { - rc = async_data_read_start(exch, next, lengths[index]); - if (rc != EOK) { - free(lengths); - free(data); - free(strings); - return rc; - } - (*strings)[index].value = next; - next += lengths[index]; - *next++ = '\0'; - } else { - (*strings)[index].value = NULL; - } - } - - free(lengths); - return EOK; -} - -/** Sends the given measured strings array to another module. - * - * This method should be used only following other IPC messages as the array - * size has to be negotiated in advance. - * - * @param[in] exch Exchange. - * @param[in] strings The measured strings array to be transferred. - * @param[in] count The measured strings array size. - * @return EOK on success. - * @return EINVAL if the strings parameter is NULL. - * @return EINVAL if the exch or count parameter is invalid. - * @return Other error codes as defined for the - * async_data_write_start() function. - */ -int measured_strings_send(async_exch_t *exch, const measured_string_t *strings, - size_t count) -{ - size_t *lengths; - size_t index; - int rc; - - if ((exch == NULL) || (!strings) || (count <= 0)) - return EINVAL; - - lengths = prepare_lengths(strings, count); - if (!lengths) - return ENOMEM; - - rc = async_data_write_start(exch, lengths, - sizeof(size_t) * (count + 1)); - if (rc != EOK) { - free(lengths); - return rc; - } - - free(lengths); - - for (index = 0; index < count; index++) { - if (strings[index].length > 0) { - rc = async_data_write_start(exch, strings[index].value, - strings[index].length); - if (rc != EOK) - return rc; - } - } - - return EOK; -} - -/** @} - */ Index: uspace/lib/c/include/adt/measured_strings.h =================================================================== --- uspace/lib/c/include/adt/measured_strings.h (revision c6533a794620411b83c209fe9e2c6bb24cedc08c) +++ (revision ) @@ -1,76 +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 libc - * @{ - */ - -/** @file - * Character string with measured length. - * The structure has been designed for serialization of character strings - * between modules. - */ - -#ifndef LIBC_MEASURED_STRINGS_H_ -#define LIBC_MEASURED_STRINGS_H_ - -#include -#include - -/** Type definition of the character string with measured length. - * @see measured_string - */ -typedef struct measured_string measured_string_t; - -/** Character string with measured length. - * - * This structure has been designed for serialization of character strings - * between modules. - */ -struct measured_string { - /** Character string data. */ - uint8_t *value; - /** Character string length. */ - size_t length; -}; - -extern measured_string_t *measured_string_create_bulk(const uint8_t *, size_t); -extern measured_string_t *measured_string_copy(measured_string_t *); - -extern int measured_strings_receive(measured_string_t **, uint8_t **, size_t); -extern int measured_strings_reply(const measured_string_t *, size_t); - -extern int measured_strings_return(async_exch_t *, measured_string_t **, - uint8_t **, size_t); -extern int measured_strings_send(async_exch_t *, const measured_string_t *, - size_t); - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/arp.h =================================================================== --- uspace/lib/c/include/ipc/arp.h (revision c6533a794620411b83c209fe9e2c6bb24cedc08c) +++ (revision ) @@ -1,82 +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 libc - * @{ - */ - -/** @file - * ARP module messages. - * @see arp_interface.h - */ - -#ifndef LIBC_ARP_MESSAGES_ -#define LIBC_ARP_MESSAGES_ - -#include - -/** ARP module messages. */ -typedef enum { - /** Clean cache message. - * @see arp_clean_cache() - */ - NET_ARP_CLEAN_CACHE = NET_ARP_FIRST, - /** Clear address cache message. - * @see arp_clear_address_msg() - */ - NET_ARP_CLEAR_ADDRESS, - /** Clear device cache message. - * @see arp_clear_device_req() - */ - NET_ARP_CLEAR_DEVICE, - /** New device message. - * @see arp_device_req() - */ - NET_ARP_DEVICE, - /** Address translation message. - * @see arp_translate_req() - */ - NET_ARP_TRANSLATE -} arp_messages; - -/** @name ARP specific message parameters definitions */ -/*@{*/ - -/** Return the protocol service message parameter. - * - * @param[in] call Message call structure. - * - */ -#define ARP_GET_NETIF(call) ((services_t) IPC_GET_ARG2(call)) - -/*@}*/ - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/icmp.h =================================================================== --- uspace/lib/c/include/ipc/icmp.h (revision c6533a794620411b83c209fe9e2c6bb24cedc08c) +++ (revision ) @@ -1,139 +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 libc - * @{ - */ - -/** @file - * ICMP module messages. - * @see icmp_remote.h - */ - -#ifndef LIBC_ICMP_MESSAGES_ -#define LIBC_ICMP_MESSAGES_ - -#include -#include -#include -#include - -/** ICMP module messages. */ -typedef enum { - /** Send echo request. @see icmp_echo() */ - NET_ICMP_ECHO = NET_ICMP_FIRST, - - /** - * Send destination unreachable error message. - * @see icmp_destination_unreachable_msg() - */ - NET_ICMP_DEST_UNREACH, - - /** - * Send source quench error message. - * @see icmp_source_quench_msg() - */ - NET_ICMP_SOURCE_QUENCH, - - /** - * Send time exceeded error message. - * @see icmp_time_exceeded_msg() - */ - NET_ICMP_TIME_EXCEEDED, - - /** - * Send parameter problem error message. - * @see icmp_parameter_problem_msg() - */ - NET_ICMP_PARAMETERPROB -} icmp_messages_t; - -/** @name ICMP specific message parameters definitions */ -/*@{*/ - -/** Return the ICMP code message parameter. - * - * @param[in] call Message call structure. - * - */ -#define ICMP_GET_CODE(call) ((icmp_code_t) IPC_GET_ARG1(call)) - -/** Return the ICMP link MTU message parameter. - * - * @param[in] call Message call structure. - * - */ -#define ICMP_GET_MTU(call) ((icmp_param_t) IPC_GET_ARG3(call)) - -/** Return the pointer message parameter. - * - * @param[in] call Message call structure. - * - */ -#define ICMP_GET_POINTER(call) ((icmp_param_t) IPC_GET_ARG3(call)) - -/** Return the size message parameter. - * - * @param[in] call Message call structure. - * - */ -#define ICMP_GET_SIZE(call) ((size_t) IPC_GET_ARG1(call)) - -/** Return the timeout message parameter. - * - * @param[in] call Message call structure. - * - */ -#define ICMP_GET_TIMEOUT(call) ((suseconds_t) IPC_GET_ARG2(call)) - -/** Return the time to live message parameter. - * - * @param[in] call Message call structure. - * - */ -#define ICMP_GET_TTL(call) ((ip_ttl_t) IPC_GET_ARG3(call)) - -/** Return the type of service message parameter. - * - * @param[in] call Message call structure. - * - */ -#define ICMP_GET_TOS(call) ((ip_tos_t) IPC_GET_ARG4(call)) - -/** Return the dont fragment message parameter. - * - * @param[in] call Message call structure. - */ -#define ICMP_GET_DONT_FRAGMENT(call) ((int) IPC_GET_ARG5(call)) - -/*@}*/ - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/il.h =================================================================== --- uspace/lib/c/include/ipc/il.h (revision c6533a794620411b83c209fe9e2c6bb24cedc08c) +++ (revision ) @@ -1,90 +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 libc - * @{ - */ - -/** @file - * Internetwork layer modules messages. - * @see il_remote.h - * @see ip_interface.h - */ - -#ifndef LIBC_IL_MESSAGES_H_ -#define LIBC_IL_MESSAGES_H_ - -#include - -/** Internet layer modules messages. */ -typedef enum { - /** Device state changed message. - * @see il_device_state_msg() - */ - NET_IL_DEVICE_STATE = NET_IL_FIRST, - - /** Device MTU changed message. - * @see il_mtu_changed_msg() - */ - NET_IL_MTU_CHANGED, - - /** - * Device address changed message - * @see il_addr_changed_msg() - */ - NET_IL_ADDR_CHANGED, - - /** Packet received message. - * @see il_received_msg() - */ - NET_IL_RECEIVED -} il_messages; - -/** @name Internetwork layer specific message parameters definitions */ -/*@{*/ - -/** Return the protocol number message parameter. - * - * @param[in] call Message call structure. - * - */ -#define IL_GET_PROTO(call) ((int) IPC_GET_ARG1(call)) - -/** Return the registering service message parameter. - * - * @param[in] call Message call structure. - * - */ -#define IL_GET_SERVICE(call) ((services_t) IPC_GET_ARG2(call)) - -/*@}*/ - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/ip.h =================================================================== --- uspace/lib/c/include/ipc/ip.h (revision c6533a794620411b83c209fe9e2c6bb24cedc08c) +++ (revision ) @@ -1,141 +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 libc - * @{ - */ - -/** @file - * IP module messages. - * @see ip_interface.h - */ - -#ifndef LIBC_IP_MESSAGES_H_ -#define LIBC_IP_MESSAGES_H_ - -#include -#include -#include - -/** 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, - - /** Gets the actual route information. - * @see ip_get_route() - */ - NET_IP_GET_ROUTE, - - /** Processes the received error notification. - * @see ip_received_error_msg() - */ - NET_IP_RECEIVED_ERROR, - - /** Sets the default gateway. - * @see ip_set_default_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; - -/** @name IP specific message parameters definitions */ -/*@{*/ - -/** Return the address message parameter. - * - * @param[in] call Message call structure. - * - */ -#define IP_GET_ADDRESS(call) \ - ({ \ - in_addr_t addr; \ - addr.s_addr = IPC_GET_ARG3(call); \ - addr; \ - }) - -/** Return the gateway message parameter. - * - * @param[in] call Message call structure. - * - */ -#define IP_GET_GATEWAY(call) \ - ({ \ - in_addr_t addr; \ - addr.s_addr = IPC_GET_ARG2(call); \ - addr; \ - }) - -/** Set the header length in the message answer. - * - * @param[out] answer Message answer structure. - * - */ -#define IP_SET_HEADERLEN(answer, value) IPC_SET_ARG2(answer, (sysarg_t) (value)) - -/** Return the network mask message parameter. - * - * @param[in] call Message call structure. - * - */ -#define IP_GET_NETMASK(call) \ - ({ \ - in_addr_t addr; \ - addr.s_addr = IPC_GET_ARG4(call); \ - addr; \ - }) - -/** Return the protocol message parameter. - * - * @param[in] call Message call structure. - * - */ -#define IP_GET_PROTOCOL(call) ((ip_protocol_t) IPC_GET_ARG1(call)) - -/*@}*/ - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/net.h =================================================================== --- uspace/lib/c/include/ipc/net.h (revision c6533a794620411b83c209fe9e2c6bb24cedc08c) +++ (revision ) @@ -1,388 +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 libcipc - * @{ - */ - -/** @file - * Networking common message definitions. - */ - -#ifndef LIBC_NET_MESSAGES_H_ -#define LIBC_NET_MESSAGES_H_ - -#include -#include - -/** Return a value indicating whether the value is in the interval. - * - * @param[in] item Value to be checked. - * @param[in] first_inclusive First value in the interval inclusive. - * @param[in] last_exclusive First value after the interval. - * - */ -#define IS_IN_INTERVAL(item, first_inclusive, last_exclusive) \ - (((item) >= (first_inclusive)) && ((item) < (last_exclusive))) - -/** @name Networking message counts */ -/*@{*/ - -#define NET_ARP_COUNT 5 /**< Number of ARP messages. */ -#define NET_ETH_COUNT 0 /**< Number of Ethernet messages. */ -#define NET_ICMP_COUNT 6 /**< Number of ICMP messages. */ -#define NET_IL_COUNT 6 /**< Number of inter-network messages. */ -#define NET_IP_COUNT 4 /**< Number of IP messages. */ -#define NET_NET_COUNT 3 /**< Number of general networking messages. */ -#define NET_NETIF_COUNT 6 /**< Number of network interface driver messages. */ -#define NET_NIL_COUNT 7 /**< Number of network interface layer messages. */ -#define NET_PACKET_COUNT 5 /**< Number of packet management system messages. */ -#define NET_SOCKET_COUNT 14 /**< Number of socket messages. */ -#define NET_TCP_COUNT 0 /**< Number of TCP messages. */ -#define NET_TL_COUNT 1 /**< Number of transport layer messages. */ -#define NET_UDP_COUNT 0 /**< Number of UDP messages. */ - -/*@}*/ - -/** @name Networking message intervals - */ -/*@{*/ - - -/** First networking message. */ -#define NET_FIRST 2000 - -/** First network interface layer message. */ -#define NET_NETIF_FIRST NET_FIRST - -/** Last network interface layer message. */ -#define NET_NETIF_LAST (NET_NETIF_FIRST + NET_NETIF_COUNT) - -/** First general networking message. */ -#define NET_NET_FIRST (NET_NETIF_LAST + 0) - -/** Last general networking message. */ -#define NET_NET_LAST (NET_NET_FIRST + NET_NET_COUNT) - -/** First network interface layer message. */ -#define NET_NIL_FIRST (NET_NET_LAST + 0) - -/** Last network interface layer message. */ -#define NET_NIL_LAST (NET_NIL_FIRST + NET_NIL_COUNT) - -/** First Ethernet message. */ -#define NET_ETH_FIRST (NET_NIL_LAST + 0) - -/** Last Ethernet message. */ -#define NET_ETH_LAST (NET_ETH_FIRST + NET_ETH_COUNT) - -/** First inter-network message. */ -#define NET_IL_FIRST (NET_ETH_LAST + 0) - -/** Last inter-network message. */ -#define NET_IL_LAST (NET_IL_FIRST + NET_IL_COUNT) - -/** First IP message. */ -#define NET_IP_FIRST (NET_IL_LAST + 0) - -/** Last IP message. */ -#define NET_IP_LAST (NET_IP_FIRST + NET_IP_COUNT) - -/** First ARP message. */ -#define NET_ARP_FIRST (NET_IP_LAST + 0) - -/** Last ARP message. */ -#define NET_ARP_LAST (NET_ARP_FIRST + NET_ARP_COUNT) - -/** First ICMP message. */ -#define NET_ICMP_FIRST (NET_ARP_LAST + 0) - -/** Last ICMP message. */ -#define NET_ICMP_LAST (NET_ICMP_FIRST + NET_ICMP_COUNT) - -/** First ICMP message. */ -#define NET_TL_FIRST (NET_ICMP_LAST + 0) - -/** Last ICMP message. */ -#define NET_TL_LAST (NET_TL_FIRST + NET_TL_COUNT) - -/** First UDP message. */ -#define NET_UDP_FIRST (NET_TL_LAST + 0) - -/** Last UDP message. */ -#define NET_UDP_LAST (NET_UDP_FIRST + NET_UDP_COUNT) - -/** First TCP message. */ -#define NET_TCP_FIRST (NET_UDP_LAST + 0) - -/** Last TCP message. */ -#define NET_TCP_LAST (NET_TCP_FIRST + NET_TCP_COUNT) - -/** First socket message. */ -#define NET_SOCKET_FIRST (NET_TCP_LAST + 0) - -/** Last socket message. */ -#define NET_SOCKET_LAST (NET_SOCKET_FIRST + NET_SOCKET_COUNT) - -/** First packet management system message. */ -#define NET_PACKET_FIRST (NET_SOCKET_LAST + 0) - -/** Last packet management system message. */ -#define NET_PACKET_LAST (NET_PACKET_FIRST + NET_PACKET_COUNT) - -/** Last networking message. */ -#define NET_LAST NET_PACKET_LAST - -/** Number of networking messages. */ -#define NET_COUNT (NET_LAST - NET_FIRST) - -/** Check if the IPC call is a generic networking message. - * - * @param[in] call IPC call to be checked. - * - */ -#define IS_NET_MESSAGE(call) \ - IS_IN_INTERVAL(IPC_GET_IMETHOD(call), NET_FIRST, NET_LAST) - -/** Check if the IPC call is an ARP message. - * - * @param[in] call IPC call to be checked. - * - */ -#define IS_NET_ARP_MESSAGE(call) \ - IS_IN_INTERVAL(IPC_GET_IMETHOD(call), NET_ARP_FIRST, NET_ARP_LAST) - -/** Check if the IPC call is an Ethernet message. - * - * @param[in] call IPC call to be checked. - * - */ -#define IS_NET_ETH_MESSAGE(call) \ - IS_IN_INTERVAL(IPC_GET_IMETHOD(call), NET_ETH_FIRST, NET_ETH_LAST) - -/** Check if the IPC call is an ICMP message. - * - * @param[in] call IPC call to be checked. - * - */ -#define IS_NET_ICMP_MESSAGE(call) \ - IS_IN_INTERVAL(IPC_GET_IMETHOD(call), NET_ICMP_FIRST, NET_ICMP_LAST) - -/** Check if the IPC call is an inter-network layer message. - * - * @param[in] call IPC call to be checked. - * - */ -#define IS_NET_IL_MESSAGE(call) \ - IS_IN_INTERVAL(IPC_GET_IMETHOD(call), NET_IL_FIRST, NET_IL_LAST) - -/** Check if the IPC call is an IP message. - * - * @param[in] call IPC call to be checked. - * - */ -#define IS_NET_IP_MESSAGE(call) \ - IS_IN_INTERVAL(IPC_GET_IMETHOD(call), NET_IP_FIRST, NET_IP_LAST) - -/** Check if the IPC call is a generic networking message. - * - * @param[in] call IPC call to be checked. - * - */ -#define IS_NET_NET_MESSAGE(call) \ - IS_IN_INTERVAL(IPC_GET_IMETHOD(call), NET_NET_FIRST, NET_NET_LAST) - -/** Check if the IPC call is a network interface layer message. - * - * @param[in] call IPC call to be checked. - * - */ -#define IS_NET_NIL_MESSAGE(call) \ - IS_IN_INTERVAL(IPC_GET_IMETHOD(call), NET_NIL_FIRST, NET_NIL_LAST) - -/** Check if the IPC call is a packet manaagement system message. - * - * @param[in] call IPC call to be checked. - * - */ -#define IS_NET_PACKET_MESSAGE(call) \ - IS_IN_INTERVAL(IPC_GET_IMETHOD(call), NET_PACKET_FIRST, NET_PACKET_LAST) - -/** Check if the IPC call is a socket message. - * - * @param[in] call IPC call to be checked. - * - */ -#define IS_NET_SOCKET_MESSAGE(call) \ - IS_IN_INTERVAL(IPC_GET_IMETHOD(call), NET_SOCKET_FIRST, NET_SOCKET_LAST) - -/** Check if the IPC call is a TCP message. - * - * @param[in] call IPC call to be checked. - * - */ -#define IS_NET_TCP_MESSAGE(call) \ - IS_IN_INTERVAL(IPC_GET_IMETHOD(call), NET_TCP_FIRST, NET_TCP_LAST) - -/** Check if the IPC call is a transport layer message. - * - * @param[in] call IPC call to be checked. - * - */ -#define IS_NET_TL_MESSAGE(call) \ - IS_IN_INTERVAL(IPC_GET_IMETHOD(call), NET_TL_FIRST, NET_TL_LAST) - -/** Check if the IPC call is a UDP message. - * - * @param[in] call IPC call to be checked. - * - */ -#define IS_NET_UDP_MESSAGE(call) \ - IS_IN_INTERVAL(IPC_GET_IMETHOD(call), NET_UDP_FIRST, NET_UDP_LAST) - -/*@}*/ - -/** @name Networking specific message arguments definitions */ -/*@{*/ - -/** Return the device identifier message argument. - * - * @param[in] call Message call structure. - * - */ -#define IPC_GET_DEVICE(call) ((nic_device_id_t) IPC_GET_ARG1(call)) - -/** Return the packet identifier message argument. - * - * @param[in] call Message call structure. - * - */ -#define IPC_GET_PACKET(call) ((packet_id_t) IPC_GET_ARG2(call)) - -/** Return the count message argument. - * - * @param[in] call Message call structure. - * - */ -#define IPC_GET_COUNT(call) ((size_t) IPC_GET_ARG2(call)) - -/** Return the device state message argument. - * - * @param[in] call Message call structure. - * - */ -#define IPC_GET_STATE(call) ((nic_device_state_t) IPC_GET_ARG2(call)) - -/** Return the device handle argument - * - * @param[in] call Message call structure - * - */ -#define IPC_GET_DEVICE_HANDLE(call) ((service_id_t) IPC_GET_ARG2(call)) - -/** Return the device driver service message argument. - * - * @param[in] call Message call structure. - * - */ -#define IPC_GET_SERVICE(call) ((services_t) IPC_GET_ARG3(call)) - -/** Return the target service message argument. - * - * @param[in] call Message call structure. - * - */ -#define IPC_GET_TARGET(call) ((services_t) IPC_GET_ARG3(call)) - -/** Return the sender service message argument. - * - * @param[in] call Message call structure. - * - */ -#define IPC_GET_SENDER(call) ((services_t) IPC_GET_ARG3(call)) - -/** Return the maximum transmission unit message argument. - * - * @param[in] call Message call structure. - * - */ -#define IPC_GET_MTU(call) ((size_t) IPC_GET_ARG3(call)) - -/** Return the error service message argument. - & - * @param[in] call Message call structure. - * - */ -#define IPC_GET_ERROR(call) ((services_t) IPC_GET_ARG4(call)) - -/** Set the device identifier in the message answer. - * - * @param[out] answer Message answer structure. - * @param[in] value Value to set. - * - */ -#define IPC_SET_DEVICE(answer, value) IPC_SET_ARG1(answer, (sysarg_t) (value)) - -/** Set the minimum address length in the message answer. - * - * @param[out] answer Message answer structure. - * @param[in] value Value to set. - * - */ -#define IPC_SET_ADDR(answer, value) IPC_SET_ARG1(answer, (sysarg_t) (value)) - -/** Set the minimum prefix size in the message answer. - * - * @param[out] answer Message answer structure. - * @param[in] value Value to set. - * - */ -#define IPC_SET_PREFIX(answer, value) IPC_SET_ARG2(answer, (sysarg_t) (value)) - -/** Set the maximum content size in the message answer. - * - * @param[out] answer Message answer structure. - * @param[in] value Value to set. - * - */ -#define IPC_SET_CONTENT(answer, value) IPC_SET_ARG3(answer, (sysarg_t) (value)) - -/** Set the minimum suffix size in the message answer. - * - * @param[out] answer Message answer structure. - * @param[in] value Value to set. - * - */ -#define IPC_SET_SUFFIX(answer, value) IPC_SET_ARG4(answer, (sysarg_t) (value)) - -/*@}*/ - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/net_net.h =================================================================== --- uspace/lib/c/include/ipc/net_net.h (revision c6533a794620411b83c209fe9e2c6bb24cedc08c) +++ (revision ) @@ -1,62 +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 libc - * @{ - */ - -/** @file - * Networking subsystem central module messages. - * @see net_interface.h - */ - -#ifndef LIBC_NET_NET_MESSAGES_H_ -#define LIBC_NET_NET_MESSAGES_H_ - -#include - -/** Networking subsystem central module messages. */ -typedef enum { - /** Return general configuration - * @see net_get_conf_req() - */ - NET_NET_GET_CONF = NET_FIRST, - /** Return device specific configuration - * @see net_get_device_conf_req() - */ - NET_NET_GET_DEVICE_CONF, - /** Return number of mastered devices */ - NET_NET_GET_DEVICES_COUNT, - /** Return names and device IDs of all devices */ - NET_NET_GET_DEVICES -} net_messages; - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/netif.h =================================================================== --- uspace/lib/c/include/ipc/netif.h (revision c6533a794620411b83c209fe9e2c6bb24cedc08c) +++ (revision ) @@ -1,97 +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 libc - * @{ - */ - -/** @file - * Network interface common module messages. - */ - -#ifndef LIBC_NETIF_MESSAGES_H_ -#define LIBC_NETIF_MESSAGES_H_ - -#include - -/** Network interface common module messages. */ -typedef enum { - /** Probe device message. - * @see netif_probe_req() - */ - NET_NETIF_PROBE = NET_NETIF_FIRST, - - /** Send packet message. - * @see netif_send_msg() - */ - NET_NETIF_SEND, - - /** Start device message. - * @see netif_start_req() - */ - NET_NETIF_START, - - /** Get device usage statistics message. - * @see netif_stats_req() - */ - NET_NETIF_STATS, - - /** Stop device message. - * @see netif_stop_req() - */ - NET_NETIF_STOP, - - /** Get device address message. - * @see netif_get_addr_req() - */ - NET_NETIF_GET_ADDR, -} netif_messages; - -/** @name Network interface specific message parameters definitions */ -/*@{*/ - -/** Return the interrupt number message parameter. - * - * @param[in] call Mmessage call structure. - * - */ -#define NETIF_GET_IRQ(call) ((int) IPC_GET_ARG2(call)) - -/** Return the input/output address message parameter. - * - * @param[in] call Message call structure. - * - */ -#define NETIF_GET_IO(call) ((void *) IPC_GET_ARG3(call)) - -/*@}*/ - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/nil.h =================================================================== --- uspace/lib/c/include/ipc/nil.h (revision c6533a794620411b83c209fe9e2c6bb24cedc08c) +++ (revision ) @@ -1,77 +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 libc - * @{ - */ - -/** @file - * Network interface layer module messages. - */ - -#ifndef LIBC_NIL_MESSAGES_H_ -#define LIBC_NIL_MESSAGES_H_ - -#include - -/** Network interface layer module messages. */ -typedef enum { - /** New device or update MTU message. - * @see nil_device_req() - */ - NET_NIL_DEVICE = NET_NIL_FIRST, - /** Send packet queue message. - * @see nil_send_msg() - */ - NET_NIL_SEND, - /** Packet size message. - * @see nil_packet_size_req() - */ - NET_NIL_PACKET_SPACE, - /** Device local hardware address message. - * @see nil_get_addr() - */ - NET_NIL_ADDR, - /** Device broadcast hardware address message. - * @see nil_get_broadcast_addr() - */ - NET_NIL_BROADCAST_ADDR -} nil_messages; - -/** @name Network interface layer specific message parameters definitions */ -/*@{*/ - -/** Return the protocol service message parameter. */ -#define NIL_GET_PROTO(call) ((services_t) IPC_GET_ARG2(call)) - -/*@}*/ - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/packet.h =================================================================== --- uspace/lib/c/include/ipc/packet.h (revision c6533a794620411b83c209fe9e2c6bb24cedc08c) +++ (revision ) @@ -1,92 +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 libc - * @{ - */ - -/** @file - * Packet server module messages. - */ - -#ifndef LIBC_PACKET_MESSAGES_ -#define LIBC_PACKET_MESSAGES_ - -#include - -/** Packet server module messages. */ -typedef enum { - /** Create packet message with specified content length. - * @see packet_get_1() - */ - NET_PACKET_CREATE_1 = NET_PACKET_FIRST, - - /** - * Create packet message with specified address length, prefix, content - * and suffix. - * @see packet_get_4() - */ - NET_PACKET_CREATE_4, - - /** Get packet message. - * @see packet_return() */ - NET_PACKET_GET, - - /** Get packet size message. - * @see packet_translate() - */ - NET_PACKET_GET_SIZE, - - /** Release packet message. - * @see pq_release() - */ - NET_PACKET_RELEASE -} packet_messages; - -/** Return the protocol service message parameter. */ -#define ARP_GET_PROTO(call) ((services_t) IPC_GET_ARG2(call)) - -/** Return the packet identifier message parameter. */ -#define IPC_GET_ID(call) ((packet_id_t) IPC_GET_ARG1(call)) - -/** Return the maximal content length message parameter. */ -#define IPC_GET_CONTENT(call) ((size_t) IPC_GET_ARG1(call)) - -/** Return the maximal address length message parameter. */ -#define IPC_GET_ADDR_LEN(call) ((size_t) IPC_GET_ARG2(call)) - -/** Return the maximal prefix length message parameter. */ -#define IPC_GET_PREFIX(call) ((size_t) IPC_GET_ARG3(call)) - -/** Return the maximal suffix length message parameter. */ -#define IPC_GET_SUFFIX(call) ((size_t) IPC_GET_ARG4(call)) - -#endif - -/** @} - */ Index: uspace/lib/c/include/ipc/services.h =================================================================== --- uspace/lib/c/include/ipc/services.h (revision c6533a794620411b83c209fe9e2c6bb24cedc08c) +++ uspace/lib/c/include/ipc/services.h (revision c8916d15d0b9a3ebcb74f63bfddee2a2188663df) @@ -48,10 +48,4 @@ SERVICE_IRC = FOURCC('i', 'r', 'c', ' '), SERVICE_CLIPBOARD = FOURCC('c', 'l', 'i', 'p'), - SERVICE_NETWORKING = FOURCC('n', 'e', 't', ' '), - SERVICE_ETHERNET = FOURCC('e', 't', 'h', ' '), - SERVICE_NILDUMMY = FOURCC('n', 'i', 'l', 'd'), - SERVICE_IP = FOURCC('i', 'p', 'v', '4'), - SERVICE_ARP = FOURCC('a', 'r', 'p', ' '), - SERVICE_ICMP = FOURCC('i', 'c', 'm', 'p'), SERVICE_UDP = FOURCC('u', 'd', 'p', ' '), SERVICE_TCP = FOURCC('t', 'c', 'p', ' ') Index: uspace/lib/c/include/ipc/socket.h =================================================================== --- uspace/lib/c/include/ipc/socket.h (revision c6533a794620411b83c209fe9e2c6bb24cedc08c) +++ uspace/lib/c/include/ipc/socket.h (revision c8916d15d0b9a3ebcb74f63bfddee2a2188663df) @@ -38,10 +38,8 @@ #define LIBC_SOCKET_MESSAGES_H_ -#include - /** Socket client messages. */ typedef enum { /** Creates a new socket. @see socket() */ - NET_SOCKET = NET_SOCKET_FIRST, + NET_SOCKET = IPC_FIRST_USER_METHOD, /** Binds the socket. @see bind() */ NET_SOCKET_BIND, Index: uspace/lib/c/include/ipc/tl.h =================================================================== --- uspace/lib/c/include/ipc/tl.h (revision c6533a794620411b83c209fe9e2c6bb24cedc08c) +++ (revision ) @@ -1,54 +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 libc - * @{ - */ - -/** @file - * Transport layer modules messages. - * @see tl_interface.h - */ - -#ifndef LIBC_TL_MESSAGES_H_ -#define LIBC_TL_MESSAGES_H_ - -#include - -/** Transport layer modules messages. */ -typedef enum { - /** Packet received message. - * @see tl_received_msg() - */ - NET_TL_RECEIVED = NET_TL_FIRST -} tl_messages; - -#endif - -/** @} - */