Index: uspace/app/netstart/self_test.c =================================================================== --- uspace/app/netstart/self_test.c (revision 72cd53d4a534c31423276f4e863f774083b559ee) +++ uspace/app/netstart/self_test.c (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -0,0 +1,334 @@ +/* + * 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: uspace/app/netstart/self_test.h =================================================================== --- uspace/app/netstart/self_test.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) +++ uspace/app/netstart/self_test.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -0,0 +1,41 @@ +/* + * 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: uspace/drv/ohci/batch.h =================================================================== --- uspace/drv/ohci/batch.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/ohci/batch.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -26,12 +26,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup drvusbuhcihc +/** @addtogroup drvusbohci * @{ */ /** @file - * @brief UHCI driver USB transaction structure + * @brief OHCI driver USB transaction structure */ -#ifndef DRV_UHCI_BATCH_H -#define DRV_UHCI_BATCH_H +#ifndef DRV_OHCI_BATCH_H +#define DRV_OHCI_BATCH_H #include Index: uspace/drv/ohci/endpoint_list.h =================================================================== --- uspace/drv/ohci/endpoint_list.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/ohci/endpoint_list.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -41,6 +41,5 @@ #include "utils/malloc32.h" -typedef struct endpoint_list -{ +typedef struct endpoint_list { fibril_mutex_t guard; ed_t *list_head; Index: uspace/drv/ohci/iface.h =================================================================== --- uspace/drv/ohci/iface.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/ohci/iface.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -26,5 +26,4 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - /** @addtogroup drvusbohci * @{ Index: uspace/drv/ohci/ohci.h =================================================================== --- uspace/drv/ohci/ohci.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/ohci/ohci.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -26,5 +26,4 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - /** @addtogroup drvusbohci * @{ Index: uspace/drv/ohci/ohci_regs.h =================================================================== --- uspace/drv/ohci/ohci_regs.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/ohci/ohci_regs.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -26,5 +26,4 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - /** @addtogroup drvusbohcihc * @{ Index: uspace/drv/ohci/pci.h =================================================================== --- uspace/drv/ohci/pci.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/ohci/pci.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -26,5 +26,4 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - /** @addtogroup drvusbohci * @{ Index: uspace/drv/ohci/root_hub.c =================================================================== --- uspace/drv/ohci/root_hub.c (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/ohci/root_hub.c (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -41,4 +41,6 @@ #include "usb/classes/classes.h" #include "usb/devdrv.h" +#include "ohci_regs.h" + #include #include @@ -109,6 +111,6 @@ */ static const uint32_t hub_clear_feature_valid_mask = - (1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER) | -(1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT); + RHS_OCIC_FLAG | + RHS_CLEAR_PORT_POWER; /** @@ -116,5 +118,6 @@ */ static const uint32_t hub_clear_feature_by_writing_one_mask = - 1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER; + RHS_CLEAR_PORT_POWER; + // 1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER; /** @@ -122,6 +125,8 @@ */ static const uint32_t hub_set_feature_valid_mask = - (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT) | -(1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER); + RHS_LPSC_FLAG | + RHS_OCIC_FLAG; + //(1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT) | + //(1 << USB_HUB_FEATURE_C_HUB_LOCAL_POWER); /** @@ -129,5 +134,6 @@ */ static const uint32_t hub_set_feature_direct_mask = - (1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT); + RHS_SET_PORT_POWER; + //(1 << USB_HUB_FEATURE_C_HUB_OVER_CURRENT); /** @@ -135,8 +141,8 @@ */ static const uint32_t port_set_feature_valid_mask = - (1 << USB_HUB_FEATURE_PORT_ENABLE) | -(1 << USB_HUB_FEATURE_PORT_SUSPEND) | -(1 << USB_HUB_FEATURE_PORT_RESET) | -(1 << USB_HUB_FEATURE_PORT_POWER); + RHPS_SET_PORT_ENABLE | + RHPS_SET_PORT_SUSPEND | + RHPS_SET_PORT_RESET | + RHPS_SET_PORT_POWER; /** @@ -144,26 +150,39 @@ */ static const uint32_t port_clear_feature_valid_mask = + RHPS_CCS_FLAG | + RHPS_SET_PORT_SUSPEND | + RHPS_POCI_FLAG | + RHPS_SET_PORT_POWER | + RHPS_CSC_FLAG | + RHPS_PESC_FLAG | + RHPS_PSSC_FLAG | + RHPS_OCIC_FLAG | + RHPS_PRSC_FLAG; + +/* + (1 << USB_HUB_FEATURE_PORT_CONNECTION) | -(1 << USB_HUB_FEATURE_PORT_SUSPEND) | -(1 << USB_HUB_FEATURE_PORT_OVER_CURRENT) | -(1 << USB_HUB_FEATURE_PORT_POWER) | -(1 << USB_HUB_FEATURE_C_PORT_CONNECTION) | -(1 << USB_HUB_FEATURE_C_PORT_ENABLE) | -(1 << USB_HUB_FEATURE_C_PORT_SUSPEND) | -(1 << USB_HUB_FEATURE_C_PORT_OVER_CURRENT) | -(1 << USB_HUB_FEATURE_C_PORT_RESET); + (1 << USB_HUB_FEATURE_PORT_SUSPEND) | + (1 << USB_HUB_FEATURE_PORT_OVER_CURRENT) | + (1 << USB_HUB_FEATURE_PORT_POWER) | + (1 << USB_HUB_FEATURE_C_PORT_CONNECTION) | + (1 << USB_HUB_FEATURE_C_PORT_ENABLE) | + (1 << USB_HUB_FEATURE_C_PORT_SUSPEND) | + (1 << USB_HUB_FEATURE_C_PORT_OVER_CURRENT) | + (1 << USB_HUB_FEATURE_C_PORT_RESET); + */ //note that USB_HUB_FEATURE_PORT_POWER bit is translated into -//USB_HUB_FEATURE_PORT_LOW_SPEED +//USB_HUB_FEATURE_PORT_LOW_SPEED for port set feature request /** * bitmask with port status changes */ -static const uint32_t port_status_change_mask = - (1 << USB_HUB_FEATURE_C_PORT_CONNECTION) | -(1 << USB_HUB_FEATURE_C_PORT_ENABLE) | -(1 << USB_HUB_FEATURE_C_PORT_OVER_CURRENT) | -(1 << USB_HUB_FEATURE_C_PORT_RESET) | -(1 << USB_HUB_FEATURE_C_PORT_SUSPEND); - +static const uint32_t port_status_change_mask = RHPS_CHANGE_WC_MASK; +/* (1 << USB_HUB_FEATURE_C_PORT_CONNECTION) | + (1 << USB_HUB_FEATURE_C_PORT_ENABLE) | + (1 << USB_HUB_FEATURE_C_PORT_OVER_CURRENT) | + (1 << USB_HUB_FEATURE_C_PORT_RESET) | + (1 << USB_HUB_FEATURE_C_PORT_SUSPEND); +*/ static int create_serialized_hub_descriptor(rh_t *instance); Index: uspace/drv/ohci/root_hub.h =================================================================== --- uspace/drv/ohci/root_hub.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/ohci/root_hub.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -26,5 +26,4 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - /** @addtogroup drvusbohci * @{ Index: uspace/drv/ohci/utils/malloc32.h =================================================================== --- uspace/drv/ohci/utils/malloc32.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/ohci/utils/malloc32.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -26,12 +26,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup usb +/** @addtogroup drvusbohci * @{ */ /** @file - * @brief UHCI driver + * @brief OHCI driver */ -#ifndef DRV_UHCI_TRANSLATOR_H -#define DRV_UHCI_TRANSLATOR_H +#ifndef DRV_OHCI_UTILS_MALLOC32_H +#define DRV_OHCI_UTILS_MALLOC32_H #include @@ -40,6 +40,4 @@ #include #include - -#define UHCI_REQUIRED_PAGE_SIZE 4096 /** Get physical address translation @@ -61,5 +59,5 @@ * * @param[in] size Size of the required memory space - * @return Address of the alligned and big enough memory place, NULL on failure. + * @return Address of the aligned and big enough memory place, NULL on failure. */ static inline void * malloc32(size_t size) @@ -72,23 +70,4 @@ static inline void free32(void *addr) { if (addr) free(addr); } -/*----------------------------------------------------------------------------*/ -/** Create 4KB page mapping - * - * @return Address of the mapped page, NULL on failure. - */ -static inline void * get_page(void) -{ - void * free_address = as_get_mappable_page(UHCI_REQUIRED_PAGE_SIZE); - assert(free_address); - if (free_address == 0) - return NULL; - void* ret = - as_area_create(free_address, UHCI_REQUIRED_PAGE_SIZE, - AS_AREA_READ | AS_AREA_WRITE); - if (ret != free_address) - return NULL; - return ret; -} - #endif /** Index: uspace/drv/uhci-hcd/batch.c =================================================================== --- uspace/drv/uhci-hcd/batch.c (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/uhci-hcd/batch.c (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -70,5 +70,5 @@ * @param[in] ep Communication target * @param[in] buffer Data source/destination. - * @param[in] size Size of the buffer. + * @param[in] buffer_size Size of the buffer. * @param[in] setup_buffer Setup data source (if not NULL) * @param[in] setup_size Size of setup_buffer (should be always 8) Index: uspace/drv/uhci-hcd/hc.c =================================================================== --- uspace/drv/uhci-hcd/hc.c (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/uhci-hcd/hc.c (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -61,5 +61,6 @@ * @param[in] instance Memory place to initialize. * @param[in] regs Address of I/O control registers. - * @param[in] size Size of I/O control registers. + * @param[in] reg_size Size of I/O control registers. + * @param[in] interrupts True if hw interrupts should be used. * @return Error code. * @note Should be called only once on any structure. Index: uspace/drv/uhci-hcd/hc.h =================================================================== --- uspace/drv/uhci-hcd/hc.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/uhci-hcd/hc.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -33,6 +33,6 @@ * @brief UHCI host controller driver structure */ -#ifndef DRV_UHCI_UHCI_HC_H -#define DRV_UHCI_UHCI_HC_H +#ifndef DRV_UHCI_HC_H +#define DRV_UHCI_HC_H #include Index: uspace/drv/uhci-hcd/hw_struct/link_pointer.h =================================================================== --- uspace/drv/uhci-hcd/hw_struct/link_pointer.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/uhci-hcd/hw_struct/link_pointer.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -32,6 +32,6 @@ * @brief UHCI driver */ -#ifndef DRV_UHCI_LINK_POINTER_H -#define DRV_UHCI_LINK_POINTER_H +#ifndef DRV_UHCI_HW_STRUCT_LINK_POINTER_H +#define DRV_UHCI_HW_STRUCT_LINK_POINTER_H /* UHCI link pointer, used by many data structures */ Index: uspace/drv/uhci-hcd/hw_struct/queue_head.h =================================================================== --- uspace/drv/uhci-hcd/hw_struct/queue_head.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/uhci-hcd/hw_struct/queue_head.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -26,5 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup drv usbuhcihc +/** @addtogroup drvusbuhcihc * @{ */ @@ -32,6 +32,6 @@ * @brief UHCI driver */ -#ifndef DRV_UHCI_QH_H -#define DRV_UHCI_QH_H +#ifndef DRV_UHCI_HW_STRUCT_QH_H +#define DRV_UHCI_HW_STRUCT_QH_H #include @@ -65,5 +65,5 @@ * * @param[in] instance qh_t structure to use. - * @param[in] pa Physical address of the next queue head. + * @param[in] next Address of the next queue. * * Adds proper flag. If the pointer is NULL, sets next to terminal NULL. @@ -81,6 +81,6 @@ /** Set queue head element pointer * - * @param[in] instance qh_t structure to initialize. - * @param[in] pa Physical address of the TD structure. + * @param[in] instance qh_t structure to use. + * @param[in] td Transfer descriptor to set as the first element. * * Adds proper flag. If the pointer is NULL, sets element to terminal NULL. Index: uspace/drv/uhci-hcd/hw_struct/transfer_descriptor.h =================================================================== --- uspace/drv/uhci-hcd/hw_struct/transfer_descriptor.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/uhci-hcd/hw_struct/transfer_descriptor.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -32,6 +32,6 @@ * @brief UHCI driver */ -#ifndef DRV_UHCI_TRANSFER_DESCRIPTOR_H -#define DRV_UHCI_TRANSFER_DESCRIPTOR_H +#ifndef DRV_UHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H +#define DRV_UHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H #include Index: uspace/drv/uhci-hcd/root_hub.h =================================================================== --- uspace/drv/uhci-hcd/root_hub.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/uhci-hcd/root_hub.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -33,6 +33,6 @@ * @brief UHCI driver */ -#ifndef DRV_UHCI_UHCI_RH_H -#define DRV_UHCI_UHCI_RH_H +#ifndef DRV_UHCI_RH_H +#define DRV_UHCI_RH_H #include Index: uspace/drv/uhci-hcd/uhci.c =================================================================== --- uspace/drv/uhci-hcd/uhci.c (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/uhci-hcd/uhci.c (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -161,5 +161,4 @@ /** Initialize hc and rh DDF structures and their respective drivers. * - * @param[in] instance UHCI structure to use. * @param[in] device DDF instance of the device to use. * @@ -167,5 +166,5 @@ * - gets device's hw resources * - disables UHCI legacy support (PCI config space) - * - asks for interrupt + * - attempts to enable interrupts * - registers interrupt handler */ Index: uspace/drv/uhci-hcd/utils/malloc32.h =================================================================== --- uspace/drv/uhci-hcd/utils/malloc32.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/uhci-hcd/utils/malloc32.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -26,5 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup usb +/** @addtogroup drvusbuhci * @{ */ @@ -32,6 +32,6 @@ * @brief UHCI driver */ -#ifndef DRV_UHCI_TRANSLATOR_H -#define DRV_UHCI_TRANSLATOR_H +#ifndef DRV_UHCI_UTILS_MALLOC32_H +#define DRV_UHCI_UTILS_MALLOC32_H #include Index: uspace/drv/uhci-hcd/utils/slab.c =================================================================== --- uspace/drv/uhci-hcd/utils/slab.c (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/uhci-hcd/utils/slab.c (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -26,5 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup usb +/** @addtogroup drvusbuhcihc * @{ */ Index: uspace/drv/uhci-hcd/utils/slab.h =================================================================== --- uspace/drv/uhci-hcd/utils/slab.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/uhci-hcd/utils/slab.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -26,5 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/** @addtogroup usb +/** @addtogroup drvusbuhcihc * @{ */ @@ -32,6 +32,6 @@ * @brief UHCI driver */ -#ifndef DRV_UHCI_SLAB_H -#define DRV_UHCI_SLAB_H +#ifndef DRV_UHCI_UTILS_SLAB_H +#define DRV_UHCI_UTILS_SLAB_H #include Index: uspace/drv/uhci-rhd/port.c =================================================================== --- uspace/drv/uhci-rhd/port.c (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/uhci-rhd/port.c (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -36,4 +36,5 @@ #include #include +#include #include /* usb_address_t */ @@ -65,5 +66,5 @@ * * @param[in] port Structure to use. - * @param[in] value New register value. + * @param[in] val New register value. * @return Error code. (Always EOK) */ @@ -77,5 +78,5 @@ * * @param[in] port Memory structure to use. - * @param[in] addr Address of I/O register. + * @param[in] address Address of I/O register. * @param[in] number Port number. * @param[in] usec Polling interval. @@ -224,9 +225,6 @@ uhci_port_write_status(port, port_status); while (uhci_port_read_status(port) & STATUS_IN_RESET); - // TODO: find a better way to waste time (it should be less than - // 10ms, if we reschedule it takes too much time (random - // interrupts can be solved by multiple attempts). - usb_log_debug2("%s: Reset Signal stop.\n", port->id_string); - } + } + udelay(10); /* Enable the port. */ uhci_port_set_enabled(port, true); Index: uspace/drv/usbhub/usbhub.c =================================================================== --- uspace/drv/usbhub/usbhub.c (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/drv/usbhub/usbhub.c (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -71,4 +71,7 @@ static void usb_hub_process_global_interrupt(usb_hub_info_t * hub_info); + +static void usb_hub_polling_terminted_callback(usb_device_t * device, + bool was_error, void * data); @@ -351,5 +354,5 @@ rc = usb_device_auto_poll(hub_info->usb_device, 0, hub_port_changes_callback, ((hub_info->port_count + 1) / 8) + 1, - NULL, hub_info); + usb_hub_polling_terminted_callback, hub_info); if (rc != EOK) { usb_log_error("Failed to create polling fibril: %s.\n", @@ -489,4 +492,23 @@ /** + * callback called from hub polling fibril when the fibril terminates + * + * Should perform a cleanup - deletes hub_info. + * @param device usb device afected + * @param was_error indicates that the fibril is stoped due to an error + * @param data pointer to usb_hub_info_t structure + */ +static void usb_hub_polling_terminted_callback(usb_device_t * device, + bool was_error, void * data){ + usb_hub_info_t * hub_info = data; + if(!hub_info) return; + free(hub_info->ports); + free(hub_info); +} + + + + +/** * @} */ Index: uspace/lib/c/generic/time.c =================================================================== --- uspace/lib/c/generic/time.c (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/lib/c/generic/time.c (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -207,4 +207,10 @@ } +void udelay(useconds_t time) +{ + (void) __SYSCALL1(SYS_THREAD_UDELAY, (sysarg_t) time); +} + + /** Wait unconditionally for specified number of seconds * Index: uspace/lib/c/include/sys/time.h =================================================================== --- uspace/lib/c/include/sys/time.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ uspace/lib/c/include/sys/time.h (revision 72cd53d4a534c31423276f4e863f774083b559ee) @@ -62,4 +62,6 @@ extern int gettimeofday(struct timeval *tv, struct timezone *tz); +extern void udelay(useconds_t); + #endif Index: uspace/lib/packet/include/net_byteorder.h =================================================================== --- uspace/lib/packet/include/net_byteorder.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ (revision ) @@ -1,71 +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 - * Host - network byte order manipulation functions. - */ - -#ifndef __NET_BYTEORDER_H__ -#define __NET_BYTEORDER_H__ - -#include -#include - - -/** Converts the given short number (16 bit) from the host byte order to the network byte order (big endian). - * @param[in] number The number in the host byte order to be converted. - * @returns The number in the network byte order. - */ -#define htons(number) host2uint16_t_be(number) - -/** Converts the given long number (32 bit) from the host byte order to the network byte order (big endian). - * @param[in] number The number in the host byte order to be converted. - * @returns The number in the network byte order. - */ -#define htonl(number) host2uint32_t_be(number) - -/** Converts the given short number (16 bit) from the network byte order (big endian) to the host byte order. - * @param[in] number The number in the network byte order to be converted. - * @returns The number in the host byte order. - */ -#define ntohs(number) uint16_t_be2host(number) - -/** Converts the given long number (32 bit) from the network byte order (big endian) to the host byte order. - * @param[in] number The number in the network byte order to be converted. - * @returns The number in the host byte order. - */ -#define ntohl(number) uint32_t_be2host(number) - -#endif - -/** @} - */ Index: uspace/lib/packet/include/net_err.h =================================================================== --- uspace/lib/packet/include/net_err.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ (revision ) @@ -1,99 +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 - * Common error processing codes and routines. - */ - -#ifndef __NET_ERR_H__ -#define __NET_ERR_H__ - -#include - -#ifdef CONFIG_DEBUG - #include - #include -#endif - -/** An actual stored error code. - * - */ -#define ERROR_CODE error_check_return_value - -/** An error processing routines declaration. - * - * This has to be declared in the block where the error processing - * is desired. - * - */ -#define ERROR_DECLARE int ERROR_CODE - -/** Store the value as an error code and checks if an error occurred. - * - * @param[in] value The value to be checked. May be a function call. - * @return False if the value indicates success (EOK). - * @return True otherwise. - * - */ -#ifdef CONFIG_DEBUG - -#define ERROR_OCCURRED(value) \ - (((ERROR_CODE = (value)) != EOK) \ - && ({ \ - fprintf(stderr, "libsocket error at %s:%d (%s)\n", \ - __FILE__, __LINE__, str_error(ERROR_CODE)); \ - 1; \ - })) - -#else - -#define ERROR_OCCURRED(value) ((ERROR_CODE = (value)) != EOK) - -#endif - -/** Error propagation - * - * Check if an error occurred and immediately exit the actual - * function returning the error code. - * - * @param[in] value The value to be checked. May be a function call. - * - */ - -#define ERROR_PROPAGATE(value) \ - if (ERROR_OCCURRED(value)) \ - return ERROR_CODE - -#endif - -/** @} - */ Index: uspace/lib/packet/include/socket_errno.h =================================================================== --- uspace/lib/packet/include/socket_errno.h (revision e913cc9c6e7552261395e73e6ab3a2d0931f4c82) +++ (revision ) @@ -1,136 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup net - * @{ - */ - -/** @file - * Socket error codes. - * Based on BSD. - */ - -#ifndef __NET_SOCKET_ERR_H__ -#define __NET_SOCKET_ERR_H__ - -#include - -/** @name Socket error codes definitions - */ -/*@{*/ - -////#define EINTR (-10004) -////#define EBADF (-10009) -//#define EACCES (-10013) -//#define EFAULT (-10014) -////#define EINVAL (-10022) -////#define EMFILE (-10024) -//#define EWOULDBLOCK (-10035) - -/** An API function is called while another blocking function is in progress. - */ -#define EINPROGRESS (-10036) - -//#define EALREADY (-10037) - -/** The socket identifier is not valid. - */ -#define ENOTSOCK (-10038) - -/** The destination address required. - */ -#define EDESTADDRREQ (-10039) - -//#define EMSGSIZE (-10040) -//#define EPROTOTYPE (-10041) -//#define ENOPROTOOPT (-10042) - -/** Protocol is not supported. - */ -#define EPROTONOSUPPORT (-10043) - -/** Socket type is not supported. - */ -#define ESOCKTNOSUPPORT (-10044) - -//#define EOPNOTSUPP (-10045) - -/** Protocol family is not supported. - */ -#define EPFNOSUPPORT (-10046) - -/** Address family is not supported. - */ -#define EAFNOSUPPORT (-10047) - -/** Address is already in use. - */ -#define EADDRINUSE (-10048) - -//#define EADDRNOTAVAIL (-10049) -/* May be reported at any time if the implementation detects an underlying failure. - */ -//#define ENETDOWN (-10050) -//#define ENETUNREACH (-10051) -//#define ENETRESET (-10052) -//#define ECONNABORTED (-10053) -//#define ECONNRESET (-10054) -//#define ENOBUFS (-10055) -//#define EISCONN (-10056) - -/** The socket is not connected or bound. - */ -#define ENOTCONN (-10057) - -//#define ESHUTDOWN (-10058) -//#define ETOOMANYREFS (-10059) -//#define ETIMEDOUT (-10060) -//#define ECONNREFUSED (-10061) -//#define ELOOP (-10062) -////#define ENAMETOOLONG (-10063) -//#define EHOSTDOWN (-10064) -//#define EHOSTUNREACH (-10065) -//#define HOST_NOT_FOUND (-11001) - -/** The requested operation was not performed. - * Try again later. - */ -#define TRY_AGAIN (-11002) - -//#define NO_RECOVERY (-11003) - -/** No data. - */ -#define NO_DATA (-11004) - -/*@}*/ - -#endif - -/** @} - */