Index: pace/app/netstart/self_test.c =================================================================== --- uspace/app/netstart/self_test.c (revision a613fea187afab7543e6d2423ab0b3b2bb44df2b) +++ (revision ) @@ -1,334 +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 net - * @{ - */ - -/** @file - * Networking self-tests implementation. - * - */ - -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "self_test.h" - -/** Test the statement, compare the result and evaluate. - * - * @param[in] statement The statement to test. - * @param[in] result The expected result. - * - */ -#define TEST(statement, result) \ - do { \ - printf("\n\t%s == %s", #statement, #result); \ - if ((statement) != (result)) { \ - printf("\tfailed\n"); \ - fprintf(stderr, "\nNetwork self-test failed\n"); \ - return EINVAL; \ - } else \ - printf("\tOK"); \ - } while (0) - -#define XMALLOC(var, type) \ - do { \ - (var) = (type *) malloc(sizeof(type)); \ - if ((var) == NULL) { \ - fprintf(stderr, "\nMemory allocation error\n"); \ - return ENOMEM; \ - } \ - } while (0) - -GENERIC_CHAR_MAP_DECLARE(int_char_map, int); -GENERIC_CHAR_MAP_IMPLEMENT(int_char_map, int); - -GENERIC_FIELD_DECLARE(int_field, int); -GENERIC_FIELD_IMPLEMENT(int_field, int); - -INT_MAP_DECLARE(int_map, int); -INT_MAP_IMPLEMENT(int_map, int); - -/** Self-test start function. - * - * Run all self-tests. - * - * @returns EOK on success. - * @returns The first error occurred. - * - */ -int self_test(void) -{ - printf("Running networking self-tests\n"); - - printf("\nChar map test"); - char_map_t cm; - - TEST(char_map_update(&cm, "ucho", 0, 3), EINVAL); - TEST(char_map_initialize(&cm), EOK); - TEST(char_map_exclude(&cm, "bla", 0), CHAR_MAP_NULL); - TEST(char_map_find(&cm, "bla", 0), CHAR_MAP_NULL); - TEST(char_map_add(&cm, "bla", 0, 1), EOK); - TEST(char_map_find(&cm, "bla", 0), 1); - TEST(char_map_add(&cm, "bla", 0, 10), EEXISTS); - TEST(char_map_update(&cm, "bla", 0, 2), EOK); - TEST(char_map_find(&cm, "bla", 0), 2); - TEST(char_map_update(&cm, "ucho", 0, 2), EOK); - TEST(char_map_exclude(&cm, "bla", 0), 2); - TEST(char_map_exclude(&cm, "bla", 0), CHAR_MAP_NULL); - TEST(char_map_find(&cm, "ucho", 0), 2); - TEST(char_map_update(&cm, "ucho", 0, 3), EOK); - TEST(char_map_find(&cm, "ucho", 0), 3); - TEST(char_map_add(&cm, "blabla", 0, 5), EOK); - TEST(char_map_find(&cm, "blabla", 0), 5); - TEST(char_map_add(&cm, "bla", 0, 6), EOK); - TEST(char_map_find(&cm, "bla", 0), 6); - TEST(char_map_exclude(&cm, "bla", 0), 6); - TEST(char_map_find(&cm, "bla", 0), CHAR_MAP_NULL); - TEST(char_map_find(&cm, "blabla", 0), 5); - TEST(char_map_add(&cm, "auto", 0, 7), EOK); - TEST(char_map_find(&cm, "auto", 0), 7); - TEST(char_map_add(&cm, "kara", 0, 8), EOK); - TEST(char_map_find(&cm, "kara", 0), 8); - TEST(char_map_add(&cm, "nic", 0, 9), EOK); - TEST(char_map_find(&cm, "nic", 0), 9); - TEST(char_map_find(&cm, "blabla", 0), 5); - TEST(char_map_add(&cm, "micnicnic", 5, 9), EOK); - TEST(char_map_find(&cm, "micni", 0), 9); - TEST(char_map_find(&cm, "micnicn", 5), 9); - TEST(char_map_add(&cm, "\x10\x0\x2\x2", 4, 15), EOK); - TEST(char_map_find(&cm, "\x10\x0\x2\x2", 4), 15); - - TEST((char_map_destroy(&cm), EOK), EOK); - TEST(char_map_update(&cm, "ucho", 0, 3), EINVAL); - - printf("\nCRC computation test"); - uint32_t value; - - TEST(value = ~compute_crc32(~0, "123456789", 8 * 9), 0xcbf43926); - TEST(value = ~compute_crc32(~0, "1", 8), 0x83dcefb7); - TEST(value = ~compute_crc32(~0, "12", 8 * 2), 0x4f5344cd); - TEST(value = ~compute_crc32(~0, "123", 8 * 3), 0x884863d2); - TEST(value = ~compute_crc32(~0, "1234", 8 * 4), 0x9be3e0a3); - TEST(value = ~compute_crc32(~0, "12345678", 8 * 8), 0x9ae0daaf); - TEST(value = ~compute_crc32(~0, "ahoj pane", 8 * 9), 0x5fc3d706); - - printf("\nDynamic fifo test"); - dyn_fifo_t fifo; - - TEST(dyn_fifo_push(&fifo, 1, 0), EINVAL); - TEST(dyn_fifo_initialize(&fifo, 1), EOK); - TEST(dyn_fifo_push(&fifo, 1, 0), EOK); - TEST(dyn_fifo_pop(&fifo), 1); - TEST(dyn_fifo_pop(&fifo), ENOENT); - TEST(dyn_fifo_push(&fifo, 2, 1), EOK); - TEST(dyn_fifo_push(&fifo, 3, 1), ENOMEM); - TEST(dyn_fifo_push(&fifo, 3, 0), EOK); - TEST(dyn_fifo_pop(&fifo), 2); - TEST(dyn_fifo_pop(&fifo), 3); - TEST(dyn_fifo_push(&fifo, 4, 2), EOK); - TEST(dyn_fifo_push(&fifo, 5, 2), EOK); - TEST(dyn_fifo_push(&fifo, 6, 2), ENOMEM); - TEST(dyn_fifo_push(&fifo, 6, 5), EOK); - TEST(dyn_fifo_push(&fifo, 7, 5), EOK); - TEST(dyn_fifo_pop(&fifo), 4); - TEST(dyn_fifo_pop(&fifo), 5); - TEST(dyn_fifo_push(&fifo, 8, 5), EOK); - TEST(dyn_fifo_push(&fifo, 9, 5), EOK); - TEST(dyn_fifo_push(&fifo, 10, 6), EOK); - TEST(dyn_fifo_push(&fifo, 11, 6), EOK); - TEST(dyn_fifo_pop(&fifo), 6); - TEST(dyn_fifo_pop(&fifo), 7); - TEST(dyn_fifo_push(&fifo, 12, 6), EOK); - TEST(dyn_fifo_push(&fifo, 13, 6), EOK); - TEST(dyn_fifo_push(&fifo, 14, 6), ENOMEM); - TEST(dyn_fifo_push(&fifo, 14, 8), EOK); - TEST(dyn_fifo_pop(&fifo), 8); - TEST(dyn_fifo_pop(&fifo), 9); - TEST(dyn_fifo_pop(&fifo), 10); - TEST(dyn_fifo_pop(&fifo), 11); - TEST(dyn_fifo_pop(&fifo), 12); - TEST(dyn_fifo_pop(&fifo), 13); - TEST(dyn_fifo_pop(&fifo), 14); - TEST(dyn_fifo_destroy(&fifo), EOK); - TEST(dyn_fifo_push(&fifo, 1, 0), EINVAL); - - printf("\nGeneric char map test"); - - int *x; - int *y; - int *z; - int *u; - int *v; - int *w; - - XMALLOC(x, int); - XMALLOC(y, int); - XMALLOC(z, int); - XMALLOC(u, int); - XMALLOC(v, int); - XMALLOC(w, int); - - int_char_map_t icm; - icm.magic = 0; - - TEST(int_char_map_add(&icm, "ucho", 0, z), EINVAL); - TEST(int_char_map_initialize(&icm), EOK); - TEST((int_char_map_exclude(&icm, "bla", 0), EOK), EOK); - TEST(int_char_map_find(&icm, "bla", 0), NULL); - TEST(int_char_map_add(&icm, "bla", 0, x), EOK); - TEST(int_char_map_find(&icm, "bla", 0), x); - TEST(int_char_map_add(&icm, "bla", 0, y), EEXISTS); - TEST((int_char_map_exclude(&icm, "bla", 0), EOK), EOK); - TEST((int_char_map_exclude(&icm, "bla", 0), EOK), EOK); - TEST(int_char_map_add(&icm, "blabla", 0, v), EOK); - TEST(int_char_map_find(&icm, "blabla", 0), v); - TEST(int_char_map_add(&icm, "bla", 0, w), EOK); - TEST(int_char_map_find(&icm, "bla", 0), w); - TEST((int_char_map_exclude(&icm, "bla", 0), EOK), EOK); - TEST(int_char_map_find(&icm, "bla", 0), NULL); - TEST(int_char_map_find(&icm, "blabla", 0), v); - TEST(int_char_map_add(&icm, "auto", 0, u), EOK); - TEST(int_char_map_find(&icm, "auto", 0), u); - TEST((int_char_map_destroy(&icm), EOK), EOK); - TEST(int_char_map_add(&icm, "ucho", 0, z), EINVAL); - - printf("\nGeneric field test"); - - XMALLOC(x, int); - XMALLOC(y, int); - XMALLOC(z, int); - XMALLOC(u, int); - XMALLOC(v, int); - XMALLOC(w, int); - - int_field_t gf; - gf.magic = 0; - - TEST(int_field_add(&gf, x), EINVAL); - TEST(int_field_count(&gf), -1); - TEST(int_field_initialize(&gf), EOK); - TEST(int_field_count(&gf), 0); - TEST(int_field_get_index(&gf, 1), NULL); - TEST(int_field_add(&gf, x), 0); - TEST(int_field_get_index(&gf, 0), x); - TEST((int_field_exclude_index(&gf, 0), EOK), EOK); - TEST(int_field_get_index(&gf, 0), NULL); - TEST(int_field_add(&gf, y), 1); - TEST(int_field_get_index(&gf, 1), y); - TEST(int_field_add(&gf, z), 2); - TEST(int_field_get_index(&gf, 2), z); - TEST(int_field_get_index(&gf, 1), y); - TEST(int_field_count(&gf), 3); - TEST(int_field_add(&gf, u), 3); - TEST(int_field_get_index(&gf, 3), u); - TEST(int_field_add(&gf, v), 4); - TEST(int_field_get_index(&gf, 4), v); - TEST(int_field_add(&gf, w), 5); - TEST(int_field_get_index(&gf, 5), w); - TEST(int_field_count(&gf), 6); - TEST((int_field_exclude_index(&gf, 1), EOK), EOK); - TEST(int_field_get_index(&gf, 1), NULL); - TEST(int_field_get_index(&gf, 3), u); - TEST((int_field_exclude_index(&gf, 7), EOK), EOK); - TEST(int_field_get_index(&gf, 3), u); - TEST(int_field_get_index(&gf, 5), w); - TEST((int_field_exclude_index(&gf, 4), EOK), EOK); - TEST(int_field_get_index(&gf, 4), NULL); - TEST((int_field_destroy(&gf), EOK), EOK); - TEST(int_field_count(&gf), -1); - - printf("\nInt map test"); - - XMALLOC(x, int); - XMALLOC(y, int); - XMALLOC(z, int); - XMALLOC(u, int); - XMALLOC(v, int); - XMALLOC(w, int); - - int_map_t im; - im.magic = 0; - - TEST(int_map_add(&im, 1, x), EINVAL); - TEST(int_map_count(&im), -1); - TEST(int_map_initialize(&im), EOK); - TEST(int_map_count(&im), 0); - TEST(int_map_find(&im, 1), NULL); - TEST(int_map_add(&im, 1, x), 0); - TEST(int_map_find(&im, 1), x); - TEST((int_map_exclude(&im, 1), EOK), EOK); - TEST(int_map_find(&im, 1), NULL); - TEST(int_map_add(&im, 1, y), 1); - TEST(int_map_find(&im, 1), y); - TEST(int_map_add(&im, 4, z), 2); - TEST(int_map_get_index(&im, 2), z); - TEST(int_map_find(&im, 4), z); - TEST(int_map_find(&im, 1), y); - TEST(int_map_count(&im), 3); - TEST(int_map_add(&im, 2, u), 3); - TEST(int_map_find(&im, 2), u); - TEST(int_map_add(&im, 3, v), 4); - TEST(int_map_find(&im, 3), v); - TEST(int_map_get_index(&im, 4), v); - TEST(int_map_add(&im, 6, w), 5); - TEST(int_map_find(&im, 6), w); - TEST(int_map_count(&im), 6); - TEST((int_map_exclude(&im, 1), EOK), EOK); - TEST(int_map_find(&im, 1), NULL); - TEST(int_map_find(&im, 2), u); - TEST((int_map_exclude(&im, 7), EOK), EOK); - TEST(int_map_find(&im, 2), u); - TEST(int_map_find(&im, 6), w); - TEST((int_map_exclude_index(&im, 4), EOK), EOK); - TEST(int_map_get_index(&im, 4), NULL); - TEST(int_map_find(&im, 3), NULL); - TEST((int_map_destroy(&im), EOK), EOK); - TEST(int_map_count(&im), -1); - - printf("\nMeasured strings test"); - - measured_string_ref string = - measured_string_create_bulk("I am a measured string!", 0); - printf("\n%x, %s at %x of %d\n", string, string->value, string->value, - string->length); - - return EOK; -} - -/** @} - */ Index: pace/app/netstart/self_test.h =================================================================== --- uspace/app/netstart/self_test.h (revision a613fea187afab7543e6d2423ab0b3b2bb44df2b) +++ (revision ) @@ -1,41 +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 net - * @{ - */ - -#ifndef __SELF_TEST_H__ -#define __SELF_TEST_H__ - -extern int self_test(void); - -#endif - -/** @} - */ Index: pace/lib/packet/include/netdb.h =================================================================== --- uspace/lib/packet/include/netdb.h (revision a613fea187afab7543e6d2423ab0b3b2bb44df2b) +++ (revision ) @@ -1,109 +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 netdb - * @{ - */ - -/** @file - * Structures and interfaces according to the BSD netdb.h file. - */ - -#ifndef __NET_NETDB_H__ -#define __NET_NETDB_H__ - -#include - -/** Structure returned by network data base library. - * All addresses are supplied in host order, and returned in network order (suitable for use in system calls). - */ -struct hostent { - /** Official host name. - */ - char * h_name; - /** Alias list. - */ - char ** h_aliases; - /** Host address type. - */ - int h_addrtype; - /** Address length. - */ - int h_length; - /** List of addresses from name server. - */ - char ** h_addr_list; - /** Address, for backward compatiblity. - */ -#define h_addr h_addr_list[0] -}; - -/** @name Host entry address types definitions. - */ -/*@{*/ - -/** Authoritative Answer Host not found address type. - */ -#define HOST_NOT_FOUND 1 - -/** Non-Authoritive Host not found, or SERVERFAIL address type. - */ -#define TRY_AGAIN 2 - -/** Non recoverable errors, FORMERR, REFUSED, NOTIMP address type. - */ -#define NO_RECOVERY 3 - -/** Valid name, no data record of requested type address type. - */ -#define NO_DATA 4 - -/** No address, look for MX record address type. - */ -#define NO_ADDRESS NO_DATA - -/*@}*/ - -/** Returns host entry by the host address. - * @param[in] address The host address. - * @param[in] len The address length. - * @param[in] type The address type. - * @returns Host entry information. - */ -//struct hostent * gethostbyaddr(const void * address, int len, int type); - -/** Returns host entry by the host name. - * @param[in] name The host name. - * @returns Host entry information. - */ -//struct hostent * gethostbyname(const char * name); - -#endif - -/** @} - */ Index: pace/lib/packet/include/tcp_codes.h =================================================================== --- uspace/lib/packet/include/tcp_codes.h (revision a613fea187afab7543e6d2423ab0b3b2bb44df2b) +++ (revision ) @@ -1,88 +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 tcp - * @{ - */ - -/** @file - * TCP options definitions. - */ - -#ifndef __NET_TCP_CODES_H__ -#define __NET_TCP_CODES_H__ - -/** End of list TCP option. - */ -#define TCPOPT_END_OF_LIST 0x0 - -/** No operation TCP option. - */ -#define TCPOPT_NO_OPERATION 0x1 - -/** Maximum segment size TCP option. - */ -#define TCPOPT_MAX_SEGMENT_SIZE 0x2 - -/** Maximum segment size TCP option length. - */ -#define TCPOPT_MAX_SEGMENT_SIZE_LENGTH 4 - -/** Window scale TCP option. - */ -#define TCPOPT_WINDOW_SCALE 0x3 - -/** Window scale TCP option length. - */ -#define TCPOPT_WINDOW_SCALE_LENGTH 3 - -/** Selective acknowledgement permitted TCP option. - */ -#define TCPOPT_SACK_PERMITTED 0x4 - -/** Selective acknowledgement permitted TCP option length. - */ -#define TCPOPT_SACK_PERMITTED_LENGTH 2 - -/** Selective acknowledgement TCP option. - * Has variable length. - */ -#define TCPOPT_SACK 0x5 - -/** Timestamp TCP option. - */ -#define TCPOPT_TIMESTAMP 0x8 - -/** Timestamp TCP option length. - */ -#define TCPOPT_TIMESTAMP_LENGTH 10 - -#endif - -/** @} - */ Index: uspace/srv/hw/netif/ne2000/dp8390_drv.h =================================================================== --- uspace/srv/hw/netif/ne2000/dp8390_drv.h (revision 80cd7cd8fc474af5c0b25cc271767995ccb863bf) +++ uspace/srv/hw/netif/ne2000/dp8390_drv.h (revision 80cd7cd8fc474af5c0b25cc271767995ccb863bf) @@ -0,0 +1,84 @@ +/* + * 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 dp8390 + * @{ + */ + +/** @file + * DP8390 network interface driver interface. + */ + +#ifndef __NET_NETIF_DP8390_DRIVER_H__ +#define __NET_NETIF_DP8390_DRIVER_H__ + +#include "dp8390.h" + +/** Initializes and/or starts the network interface. + * @param[in,out] dep The network interface structure. + * @param[in] mode The state mode. + * @returns EOK on success. + * @returns EXDEV if the network interface is disabled. + */ +int do_init(dpeth_t *dep, int mode); + +/** Stops the network interface. + * @param[in,out] dep The network interface structure. + */ +void do_stop(dpeth_t *dep); + +/** Processes the interrupt. + * @param[in,out] dep The network interface structure. + * @param[in] isr The interrupt status register. + */ +void dp_check_ints(dpeth_t *dep, int isr); + +/** Probes and initializes the network interface. + * @param[in,out] dep The network interface structure. + * @returns EOK on success. + * @returns EXDEV if the network interface was not recognized. + */ +int do_probe(dpeth_t * dep); + +/** Sends a packet. + * @param[in,out] dep The network interface structure. + * @param[in] packet The packet t be sent. + * @param[in] from_int The value indicating whether the sending is initialized from the interrupt handler. + * @returns + */ +int do_pwrite(dpeth_t * dep, packet_t *packet, int from_int); + +/** Prints out network interface information. + * @param[in] dep The network interface structure. + */ +void dp8390_dump(dpeth_t * dep); + +#endif + +/** @} + */ Index: uspace/srv/hw/netif/ne2000/dp8390_port.h =================================================================== --- uspace/srv/hw/netif/ne2000/dp8390_port.h (revision 80cd7cd8fc474af5c0b25cc271767995ccb863bf) +++ uspace/srv/hw/netif/ne2000/dp8390_port.h (revision 80cd7cd8fc474af5c0b25cc271767995ccb863bf) @@ -0,0 +1,274 @@ +/* + * 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 dp8390 + * @{ + */ + +/** @file + * DP8390 network interface types and structures ports. + */ + +#ifndef __NET_NETIF_DP8390_PORT_H__ +#define __NET_NETIF_DP8390_PORT_H__ + +#include +#include +#include +#include +#include + +/** Macro for difining functions. + * @param[in] function The function type and name definition. + * @param[in] params The function parameters definition. + */ +#define _PROTOTYPE(function, params) function params + +/** Success error code. + */ +#define OK EOK + +/** Type definition of the unsigned byte. + */ +typedef uint8_t u8_t; + +/** Type definition of the unsigned short. + */ +typedef uint16_t u16_t; + +/** Compares two memory blocks. + * @param[in] first The first memory block. + * @param[in] second The second memory block. + * @param[in] size The blocks size in bytes. + * @returns 0 if equeal. + * @returns -1 if the first is greater than the second. + * @returns 1 if the second is greater than the first. + */ +#define memcmp(first, second, size) bcmp((char *) (first), (char *) (second), (size)) + +/** Reads 1 byte. + * @param[in] port The address to be read. + * @returns The read value. + */ +#define inb(port) pio_read_8((ioport8_t *) (port)) + +/** Reads 1 word (2 bytes). + * @param[in] port The address to be read. + * @returns The read value. + */ +#define inw(port) pio_read_16((ioport16_t *) (port)) + +/** Writes 1 byte. + * @param[in] port The address to be written. + * @param[in] value The value to be written. + */ +#define outb(port, value) pio_write_8((ioport8_t *) (port), (value)) + +/** Writes 1 word (2 bytes). + * @param[in] port The address to be written. + * @param[in] value The value to be written. + */ +#define outw(port, value) pio_write_16((ioport16_t *) (port), (value)) + +/** Prints out the driver critical error. + * Does not call the system panic(). + */ +#define panic(...) printf("%s%s%d", __VA_ARGS__) + +/** Copies a memory block. + * @param proc The source process. Ignored parameter. + * @param src_s Ignored parameter. + * @param[in] src The source address. + * @param me The current proces. Ignored parameter. + * @param dst_s Ignored parameter. + * @param[in] dst The destination address. + * @param[in] bytes The block size in bytes. + * @returns EOK. + */ +#define sys_vircopy(proc, src_s, src, me, dst_s, dst, bytes) ({memcpy((void *)(dst), (void *)(src), (bytes)); EOK;}) + +/** Reads a memory block byte by byte. + * @param[in] port The address to be written. + * @param proc The source process. Ignored parameter. + * @param[in] dst The destination address. + * @param[in] bytes The block size in bytes. + */ +#define do_vir_insb(port, proc, dst, bytes) insb((port), (void *)(dst), (bytes)) + +/** Reads a memory block word by word (2 bytes). + * @param[in] port The address to be written. + * @param proc The source process. Ignored parameter. + * @param[in] dst The destination address. + * @param[in] bytes The block size in bytes. + */ +#define do_vir_insw(port, proc, dst, bytes) insw((port), (void *)(dst), (bytes)) + +/** Writes a memory block byte by byte. + * @param[in] port The address to be written. + * @param proc The source process. Ignored parameter. + * @param[in] src The source address. + * @param[in] bytes The block size in bytes. + */ +#define do_vir_outsb(port, proc, src, bytes) outsb((port), (void *)(src), (bytes)) + +/** Writes a memory block word by word (2 bytes). + * @param[in] port The address to be written. + * @param proc The source process. Ignored parameter. + * @param[in] src The source address. + * @param[in] bytes The block size in bytes. + */ +#define do_vir_outsw(port, proc, src, bytes) outsw((port), (void *)(src), (bytes)) + +/* com.h */ +/* Bits in 'DL_MODE' field of DL requests. */ +# define DL_NOMODE 0x0 +# define DL_PROMISC_REQ 0x2 +# define DL_MULTI_REQ 0x4 +# define DL_BROAD_REQ 0x8 + +/* const.h */ +/** True value. + */ +#define TRUE 1 /* used for turning integers into Booleans */ + +/** False value. + */ +#define FALSE 0 /* used for turning integers into Booleans */ + +/** No number value. + */ +#define NO_NUM 0x8000 /* used as numerical argument to panic() */ + +/* devio.h */ +//typedef u16_t port_t; +/** Type definition of a port. + */ +typedef long port_t; + +/* dl_eth.h */ +/** Ethernet statistics. + */ +typedef struct eth_stat +{ + /** Number of receive errors. + */ + unsigned long ets_recvErr; + /** Number of send error. + */ + unsigned long ets_sendErr; + /** Number of buffer overwrite warnings. + */ + unsigned long ets_OVW; + /** Number of crc errors of read. + */ + unsigned long ets_CRCerr; + /** Number of frames not alligned (number of bits % 8 != 0). + */ + unsigned long ets_frameAll; + /** Number of packets missed due to slow processing. + */ + unsigned long ets_missedP; + /** Number of packets received. + */ + unsigned long ets_packetR; + /** Number of packets transmitted. + */ + unsigned long ets_packetT; + /** Number of transmission defered (Tx was busy). + */ + unsigned long ets_transDef; + /** Number of collissions. + */ + unsigned long ets_collision; + /** Number of Tx aborted due to excess collisions. + */ + unsigned long ets_transAb; + /** Number of carrier sense lost. + */ + unsigned long ets_carrSense; + /** Number of FIFO underruns (processor too busy). + */ + unsigned long ets_fifoUnder; + /** Number of FIFO overruns (processor too busy). + */ + unsigned long ets_fifoOver; + /** Number of times unable to transmit collision sig. + */ + unsigned long ets_CDheartbeat; + /** Number of times out of window collision. + */ + unsigned long ets_OWC; +} eth_stat_t; + +/* errno.h */ +/** Generic error. + */ +#define EGENERIC EINVAL + +/* ether.h */ +/** Minimum Ethernet packet size in bytes. + */ +#define ETH_MIN_PACK_SIZE 60 + +/** Maximum Ethernet packet size in bytes. + */ +#define ETH_MAX_PACK_SIZE_TAGGED 1518 + +/** Ethernet address type definition. + */ +typedef struct ether_addr +{ + /** Address data. + */ + u8_t ea_addr[6]; +} ether_addr_t; + +/* type.h */ +/** Type definition of the physical addresses and lengths in bytes. + */ +typedef unsigned long phys_bytes; + +/** Type definition of the virtual addresses and lengths in bytes. + */ +typedef unsigned long vir_bytes; + +/** Type definition of the input/output vector. + */ +typedef struct { + /** Address of an I/O buffer. + */ + vir_bytes iov_addr; + /** Sizeof an I/O buffer. + */ + vir_bytes iov_size; +} iovec_t; + +#endif + +/** @} + */ Index: uspace/srv/hw/netif/ne2000/local.h =================================================================== --- uspace/srv/hw/netif/ne2000/local.h (revision 80cd7cd8fc474af5c0b25cc271767995ccb863bf) +++ uspace/srv/hw/netif/ne2000/local.h (revision 80cd7cd8fc474af5c0b25cc271767995ccb863bf) @@ -0,0 +1,99 @@ +/* + * Copyright (c) 1987,1997, 2006, Vrije Universiteit, Amsterdam, The Netherlands All rights reserved. Redistribution and use of the MINIX 3 operating system 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. + * * Neither the name of the Vrije Universiteit nor the names of the software authors or contributors may be used to endorse or promote products derived from this software without specific prior written permission. + * * Any deviations from these conditions require written permission from the copyright holder in advance + * + * + * Disclaimer + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS, AUTHORS, AND CONTRIBUTORS ``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 COPYRIGHT HOLDER OR ANY AUTHORS OR CONTRIBUTORS 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. + * + * Changes: + * 2009 ported to HelenOS, Lukas Mejdrech + */ + +/** @addtogroup dp8390 + * @{ + */ + +/** @file + * Network interface probe functions. + */ + +#ifndef __NET_NETIF_DP8390_CONFIG_H__ +#define __NET_NETIF_DP8390_CONFIG_H__ + +#include "dp8390_port.h" + +/* +local.h +*/ + +/** WDETH switch. + */ +#define ENABLE_WDETH 0 + +/** NE2000 switch. + */ +#define ENABLE_NE2000 1 + +/** 3C503 switch. + */ +#define ENABLE_3C503 0 + +/** PCI support switch. + */ +#define ENABLE_PCI 0 + +struct dpeth; + +/* 3c503.c */ +/* * Probes a 3C503 network interface. + * @param[in] dep The network interface structure. + * @returns 1 if the NE2000 network interface is present. + * @returns 0 otherwise. + */ +//_PROTOTYPE(int el2_probe, (struct dpeth*dep) ); + +/* ne2000.c */ +/** Probes a NE2000 or NE1000 network interface. + * @param[in] dep The network interface structure. + * @returns 1 if the NE2000 network interface is present. + * @returns 0 otherwise. + */ +int ne_probe(struct dpeth * dep); +//_PROTOTYPE(int ne_probe, (struct dpeth *dep) ); +//_PROTOTYPE(void ne_init, (struct dpeth *dep) ); + +/* rtl8029.c */ +/* * Probes a RTL8029 network interface. + * @param[in] dep The network interface structure. + * @returns 1 if the NE2000 network interface is present. + * @returns 0 otherwise. + */ +//_PROTOTYPE(int rtl_probe, (struct dpeth *dep) ); + +/* wdeth.c */ +/* * Probes a WDETH network interface. + * @param[in] dep The network interface structure. + * @returns 1 if the NE2000 network interface is present. + * @returns 0 otherwise. + */ +//_PROTOTYPE(int wdeth_probe, (struct dpeth*dep) ); + +#endif + +/** @} + */ Index: uspace/srv/hw/netif/ne2000/ne2000.h =================================================================== --- uspace/srv/hw/netif/ne2000/ne2000.h (revision 80cd7cd8fc474af5c0b25cc271767995ccb863bf) +++ uspace/srv/hw/netif/ne2000/ne2000.h (revision 80cd7cd8fc474af5c0b25cc271767995ccb863bf) @@ -0,0 +1,111 @@ +/* + * Copyright (c) 1987,1997, 2006, Vrije Universiteit, Amsterdam, The Netherlands All rights reserved. Redistribution and use of the MINIX 3 operating system 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. + * * Neither the name of the Vrije Universiteit nor the names of the software authors or contributors may be used to endorse or promote products derived from this software without specific prior written permission. + * * Any deviations from these conditions require written permission from the copyright holder in advance + * + * + * Disclaimer + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS, AUTHORS, AND CONTRIBUTORS ``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 COPYRIGHT HOLDER OR ANY AUTHORS OR CONTRIBUTORS 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. + * + * Changes: + * 2009 ported to HelenOS, Lukas Mejdrech + */ + +/* +ne2000.h + +Created: March 15, 1994 by Philip Homburg +*/ + +/** @addtogroup ne2k + * @{ + */ + +/** @file + * NE1000 and NE2000 network interface definitions. + */ + +#ifndef __NET_NETIF_NE2000_H__ +#define __NET_NETIF_NE2000_H__ + +#include + +#include "dp8390_port.h" + +/** DP8390 register offset. + */ +#define NE_DP8390 0x00 + +/** Data register. + */ +#define NE_DATA 0x10 + +/** Reset register. + */ +#define NE_RESET 0x1F + +/** NE1000 data start. + */ +#define NE1000_START 0x2000 + +/** NE1000 data size. + */ +#define NE1000_SIZE 0x2000 + +/** NE2000 data start. + */ +#define NE2000_START 0x4000 + +/** NE2000 data size. + */ +#define NE2000_SIZE 0x4000 + +/** Reads 1 byte register. + * @param[in] dep The network interface structure. + * @param[in] reg The register offset. + * @returns The read value. + */ +#define inb_ne(dep, reg) (inb(dep->de_base_port+reg)) + +/** Writes 1 byte register. + * @param[in] dep The network interface structure. + * @param[in] reg The register offset. + * @param[in] data The value to be written. + */ +#define outb_ne(dep, reg, data) (outb(dep->de_base_port+reg, data)) + +/** Reads 1 word (2 bytes) register. + * @param[in] dep The network interface structure. + * @param[in] reg The register offset. + * @returns The read value. + */ +#define inw_ne(dep, reg) (inw(dep->de_base_port+reg)) + +/** Writes 1 word (2 bytes) register. + * @param[in] dep The network interface structure. + * @param[in] reg The register offset. + * @param[in] data The value to be written. + */ +#define outw_ne(dep, reg, data) (outw(dep->de_base_port+reg, data)) + +#endif /* __NET_NETIF_NE2000_H__ */ + +/* + * $PchId: ne2000.h,v 1.4 2004/08/03 12:03:20 philip Exp $ + */ + +/** @} + */