Index: uspace/app/netstart/self_test.c =================================================================== --- uspace/app/netstart/self_test.c (revision 7b6f116c38d4e2688964774a9a6da33e22ee1414) +++ uspace/app/netstart/self_test.c (revision 7b6f116c38d4e2688964774a9a6da33e22ee1414) @@ -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 7b6f116c38d4e2688964774a9a6da33e22ee1414) +++ uspace/app/netstart/self_test.h (revision 7b6f116c38d4e2688964774a9a6da33e22ee1414) @@ -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/hc.c =================================================================== --- uspace/drv/ohci/hc.c (revision 5dfee5222840f1722deae4e46e1dfce8ed1787c5) +++ uspace/drv/ohci/hc.c (revision 7b6f116c38d4e2688964774a9a6da33e22ee1414) @@ -95,6 +95,5 @@ } /*----------------------------------------------------------------------------*/ -int hc_init(hc_t *instance, ddf_fun_t *fun, ddf_dev_t *dev, - uintptr_t regs, size_t reg_size, bool interrupts) +int hc_init(hc_t *instance, uintptr_t regs, size_t reg_size, bool interrupts) { assert(instance); Index: uspace/drv/ohci/hc.h =================================================================== --- uspace/drv/ohci/hc.h (revision 5dfee5222840f1722deae4e46e1dfce8ed1787c5) +++ uspace/drv/ohci/hc.h (revision 7b6f116c38d4e2688964774a9a6da33e22ee1414) @@ -77,6 +77,5 @@ int hc_register_hub(hc_t *instance, ddf_fun_t *hub_fun); -int hc_init(hc_t *instance, ddf_fun_t *fun, ddf_dev_t *dev, - uintptr_t regs, size_t reg_size, bool interrupts); +int hc_init(hc_t *instance, uintptr_t regs, size_t reg_size, bool interrupts); void hc_start_hw(hc_t *instance); Index: uspace/drv/ohci/main.c =================================================================== --- uspace/drv/ohci/main.c (revision 5dfee5222840f1722deae4e46e1dfce8ed1787c5) +++ uspace/drv/ohci/main.c (revision 7b6f116c38d4e2688964774a9a6da33e22ee1414) @@ -43,5 +43,24 @@ #define NAME "ohci" -static int ohci_add_device(ddf_dev_t *device); +/** Initializes a new ddf driver instance of OHCI hcd. + * + * @param[in] device DDF instance of the device to initialize. + * @return Error code. + */ +static int ohci_add_device(ddf_dev_t *device) +{ + usb_log_debug("ohci_add_device() called\n"); + assert(device); + + int ret = device_setup_ohci(device); + if (ret != EOK) { + usb_log_error("Failed to initialize OHCI driver: %s.\n", + str_error(ret)); + return ret; + } + usb_log_info("Controlling new OHCI device '%s'.\n", device->name); + + return EOK; +} /*----------------------------------------------------------------------------*/ static driver_ops_t ohci_driver_ops = { @@ -53,33 +72,4 @@ .driver_ops = &ohci_driver_ops }; -/*----------------------------------------------------------------------------*/ -/** Initializes a new ddf driver instance of OHCI hcd. - * - * @param[in] device DDF instance of the device to initialize. - * @return Error code. - */ -int ohci_add_device(ddf_dev_t *device) -{ - usb_log_debug("ohci_add_device() called\n"); - assert(device); - ohci_t *ohci = malloc(sizeof(ohci_t)); - if (ohci == NULL) { - usb_log_error("Failed to allocate OHCI driver.\n"); - return ENOMEM; - } - - int ret = ohci_init(ohci, device); - if (ret != EOK) { - usb_log_error("Failed to initialize OHCI driver: %s.\n", - str_error(ret)); - return ret; - } -// device->driver_data = ohci; - hc_register_hub(&ohci->hc, ohci->rh_fun); - - usb_log_info("Controlling new OHCI device `%s'.\n", device->name); - - return EOK; -} /*----------------------------------------------------------------------------*/ /** Initializes global driver structures (NONE). Index: uspace/drv/ohci/ohci.c =================================================================== --- uspace/drv/ohci/ohci.c (revision 5dfee5222840f1722deae4e46e1dfce8ed1787c5) +++ uspace/drv/ohci/ohci.c (revision 7b6f116c38d4e2688964774a9a6da33e22ee1414) @@ -44,4 +44,21 @@ #include "iface.h" #include "pci.h" +#include "hc.h" +#include "root_hub.h" + +typedef struct ohci { + ddf_fun_t *hc_fun; + ddf_fun_t *rh_fun; + + hc_t hc; + rh_t rh; +} ohci_t; + +static inline ohci_t * dev_to_ohci(ddf_dev_t *dev) +{ + assert(dev); + assert(dev->driver_data); + return dev->driver_data; +} /** IRQ handling callback, identifies device @@ -53,9 +70,7 @@ static void irq_handler(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *call) { - assert(dev); - assert(dev->driver_data); - hc_t *hc = &((ohci_t*)dev->driver_data)->hc; - uint16_t status = IPC_GET_ARG1(*call); + hc_t *hc = &dev_to_ohci(dev)->hc; assert(hc); + const uint16_t status = IPC_GET_ARG1(*call); hc_interrupt(hc, status); } @@ -71,5 +86,5 @@ { assert(fun); - usb_device_keeper_t *manager = &((ohci_t*)fun->dev->driver_data)->hc.manager; + usb_device_keeper_t *manager = &dev_to_ohci(fun->dev)->hc.manager; usb_address_t addr = usb_device_keeper_find(manager, handle); @@ -94,13 +109,14 @@ ddf_fun_t *fun, devman_handle_t *handle) { - assert(handle); - ddf_fun_t *hc_fun = ((ohci_t*)fun->dev->driver_data)->hc_fun; - assert(hc_fun != NULL); - - *handle = hc_fun->handle; + assert(fun); + ddf_fun_t *hc_fun = dev_to_ohci(fun->dev)->hc_fun; + assert(hc_fun); + + if (handle != NULL) + *handle = hc_fun->handle; return EOK; } /*----------------------------------------------------------------------------*/ -/** This iface is generic for both RH and HC. */ +/** Root hub USB interface */ static usb_iface_t usb_iface = { .get_hc_handle = usb_iface_get_hc_handle, @@ -108,8 +124,10 @@ }; /*----------------------------------------------------------------------------*/ +/** Standard USB HC options (HC interface) */ static ddf_dev_ops_t hc_ops = { .interfaces[USBHC_DEV_IFACE] = &hc_iface, /* see iface.h/c */ }; /*----------------------------------------------------------------------------*/ +/** Standard USB RH options (RH interface) */ static ddf_dev_ops_t rh_ops = { .interfaces[USB_DEV_IFACE] = &usb_iface, @@ -118,6 +136,6 @@ /** Initialize hc and rh ddf structures and their respective drivers. * + * @param[in] device DDF instance of the device to use. * @param[in] instance OHCI structure to use. - * @param[in] device DDF instance of the device to use. * * This function does all the preparatory work for hc and rh drivers: @@ -127,34 +145,55 @@ * - registers interrupt handler */ -int ohci_init(ohci_t *instance, ddf_dev_t *device) -{ - assert(instance); - instance->hc_fun = NULL; +int device_setup_ohci(ddf_dev_t *device) +{ + ohci_t *instance = malloc(sizeof(ohci_t)); + if (instance == NULL) { + usb_log_error("Failed to allocate OHCI driver.\n"); + return ENOMEM; + } + +#define CHECK_RET_DEST_FREE_RETURN(ret, message...) \ +if (ret != EOK) { \ + if (instance->hc_fun) { \ + instance->hc_fun->ops = NULL; \ + instance->hc_fun->driver_data = NULL; \ + ddf_fun_destroy(instance->hc_fun); \ + } \ + if (instance->rh_fun) { \ + instance->rh_fun->ops = NULL; \ + instance->rh_fun->driver_data = NULL; \ + ddf_fun_destroy(instance->rh_fun); \ + } \ + free(instance); \ + usb_log_error(message); \ + return ret; \ +} else (void)0 + instance->rh_fun = NULL; -#define CHECK_RET_DEST_FUN_RETURN(ret, message...) \ -if (ret != EOK) { \ - usb_log_error(message); \ - if (instance->hc_fun) \ - ddf_fun_destroy(instance->hc_fun); \ - if (instance->rh_fun) \ - ddf_fun_destroy(instance->rh_fun); \ - return ret; \ -} - - uintptr_t mem_reg_base = 0; - size_t mem_reg_size = 0; + instance->hc_fun = ddf_fun_create(device, fun_exposed, "ohci-hc"); + int ret = instance->hc_fun ? EOK : ENOMEM; + CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create OHCI HC function.\n"); + instance->hc_fun->ops = &hc_ops; + instance->hc_fun->driver_data = &instance->hc; + + instance->rh_fun = ddf_fun_create(device, fun_inner, "ohci-rh"); + ret = instance->rh_fun ? EOK : ENOMEM; + CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create OHCI RH function.\n"); + instance->rh_fun->ops = &rh_ops; + + uintptr_t reg_base = 0; + size_t reg_size = 0; int irq = 0; - int ret = - pci_get_my_registers(device, &mem_reg_base, &mem_reg_size, &irq); - CHECK_RET_DEST_FUN_RETURN(ret, + ret = pci_get_my_registers(device, ®_base, ®_size, &irq); + CHECK_RET_DEST_FREE_RETURN(ret, "Failed to get memory addresses for %" PRIun ": %s.\n", device->handle, str_error(ret)); usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n", - (void *) mem_reg_base, mem_reg_size, irq); + (void *) reg_base, reg_size, irq); bool interrupts = false; #ifdef CONFIG_USBHC_NO_INTERRUPTS - usb_log_warning("Interrupts disabled in OS config, " \ + usb_log_warning("Interrupts disabled in OS config, " "falling back to polling.\n"); #else @@ -163,5 +202,5 @@ usb_log_warning("Failed to enable interrupts: %s.\n", str_error(ret)); - usb_log_info("HW interrupts not available, " \ + usb_log_info("HW interrupts not available, " "falling back to polling.\n"); } else { @@ -171,34 +210,12 @@ #endif - instance->hc_fun = ddf_fun_create(device, fun_exposed, "ohci-hc"); - ret = (instance->hc_fun == NULL) ? ENOMEM : EOK; - CHECK_RET_DEST_FUN_RETURN(ret, - "Failed(%d) to create HC function.\n", ret); - - ret = hc_init(&instance->hc, instance->hc_fun, device, - mem_reg_base, mem_reg_size, interrupts); - CHECK_RET_DEST_FUN_RETURN(ret, "Failed(%d) to init ohci-hcd.\n", ret); - instance->hc_fun->ops = &hc_ops; - instance->hc_fun->driver_data = &instance->hc; - ret = ddf_fun_bind(instance->hc_fun); - CHECK_RET_DEST_FUN_RETURN(ret, - "Failed(%d) to bind OHCI device function: %s.\n", - ret, str_error(ret)); - ret = ddf_fun_add_to_class(instance->hc_fun, USB_HC_DDF_CLASS_NAME); - CHECK_RET_DEST_FUN_RETURN(ret, - "Failed to add OHCI to HC class: %s.\n", str_error(ret)); - -#undef CHECK_RET_HC_RETURN + ret = hc_init(&instance->hc, reg_base, reg_size, interrupts); + CHECK_RET_DEST_FREE_RETURN(ret, "Failed(%d) to init ohci-hcd.\n", ret); #define CHECK_RET_FINI_RETURN(ret, message...) \ if (ret != EOK) { \ - usb_log_error(message); \ - if (instance->hc_fun) \ - ddf_fun_destroy(instance->hc_fun); \ - if (instance->rh_fun) \ - ddf_fun_destroy(instance->rh_fun); \ hc_fini(&instance->hc); \ - return ret; \ -} + CHECK_RET_DEST_FREE_RETURN(ret, message); \ +} else (void)0 /* It does no harm if we register this on polling */ @@ -208,17 +225,20 @@ "Failed(%d) to register interrupt handler.\n", ret); - instance->rh_fun = ddf_fun_create(device, fun_inner, "ohci-rh"); - ret = (instance->rh_fun == NULL) ? ENOMEM : EOK; + ret = ddf_fun_bind(instance->hc_fun); CHECK_RET_FINI_RETURN(ret, - "Failed(%d) to create root hub function.\n", ret); - - - instance->rh_fun->ops = &rh_ops; - instance->rh_fun->driver_data = NULL; - + "Failed(%d) to bind OHCI device function: %s.\n", + ret, str_error(ret)); + + ret = ddf_fun_add_to_class(instance->hc_fun, USB_HC_DDF_CLASS_NAME); + CHECK_RET_FINI_RETURN(ret, + "Failed to add OHCI to HC class: %s.\n", str_error(ret)); + device->driver_data = instance; hc_start_hw(&instance->hc); + hc_register_hub(&instance->hc, instance->rh_fun); return EOK; + +#undef CHECK_RET_DEST_FUN_RETURN #undef CHECK_RET_FINI_RETURN } Index: uspace/drv/ohci/ohci.h =================================================================== --- uspace/drv/ohci/ohci.h (revision 5dfee5222840f1722deae4e46e1dfce8ed1787c5) +++ uspace/drv/ohci/ohci.h (revision 7b6f116c38d4e2688964774a9a6da33e22ee1414) @@ -38,16 +38,5 @@ #include -#include "hc.h" -#include "root_hub.h" - -typedef struct ohci { - ddf_fun_t *hc_fun; - ddf_fun_t *rh_fun; - - hc_t hc; - rh_t rh; -} ohci_t; - -int ohci_init(ohci_t *instance, ddf_dev_t *device); +int device_setup_ohci(ddf_dev_t *device); #endif Index: uspace/drv/ohci/pci.c =================================================================== --- uspace/drv/ohci/pci.c (revision 5dfee5222840f1722deae4e46e1dfce8ed1787c5) +++ uspace/drv/ohci/pci.c (revision 7b6f116c38d4e2688964774a9a6da33e22ee1414) @@ -58,5 +58,8 @@ uintptr_t *mem_reg_address, size_t *mem_reg_size, int *irq_no) { - assert(dev != NULL); + assert(dev); + assert(mem_reg_address); + assert(mem_reg_size); + assert(irq_no); int parent_phone = devman_parent_device_connect(dev->handle, Index: uspace/drv/ohci/root_hub.c =================================================================== --- uspace/drv/ohci/root_hub.c (revision 5dfee5222840f1722deae4e46e1dfce8ed1787c5) +++ uspace/drv/ohci/root_hub.c (revision 7b6f116c38d4e2688964774a9a6da33e22ee1414) @@ -237,5 +237,5 @@ return ENOMEM; - usb_log_info("OHCI root hub with %d ports initialized.\n", + usb_log_info("OHCI root hub with %zu ports initialized.\n", instance->port_count); Index: uspace/drv/uhci-hcd/hc.c =================================================================== --- uspace/drv/uhci-hcd/hc.c (revision 5dfee5222840f1722deae4e46e1dfce8ed1787c5) +++ uspace/drv/uhci-hcd/hc.c (revision 7b6f116c38d4e2688964774a9a6da33e22ee1414) @@ -60,5 +60,4 @@ * * @param[in] instance Memory place to initialize. - * @param[in] fun DDF function. * @param[in] regs Address of I/O control registers. * @param[in] size Size of I/O control registers. @@ -69,6 +68,5 @@ * interrupt fibrils. */ -int hc_init(hc_t *instance, ddf_fun_t *fun, - void *regs, size_t reg_size, bool interrupts) +int hc_init(hc_t *instance, void *regs, size_t reg_size, bool interrupts) { assert(reg_size >= sizeof(regs_t)); Index: uspace/drv/uhci-hcd/hc.h =================================================================== --- uspace/drv/uhci-hcd/hc.h (revision 5dfee5222840f1722deae4e46e1dfce8ed1787c5) +++ uspace/drv/uhci-hcd/hc.h (revision 7b6f116c38d4e2688964774a9a6da33e22ee1414) @@ -136,6 +136,5 @@ } hc_t; -int hc_init(hc_t *instance, ddf_fun_t *fun, - void *regs, size_t reg_size, bool interupts); +int hc_init(hc_t *instance, void *regs, size_t reg_size, bool interupts); int hc_schedule(hc_t *instance, usb_transfer_batch_t *batch); Index: uspace/drv/uhci-hcd/main.c =================================================================== --- uspace/drv/uhci-hcd/main.c (revision 5dfee5222840f1722deae4e46e1dfce8ed1787c5) +++ uspace/drv/uhci-hcd/main.c (revision 7b6f116c38d4e2688964774a9a6da33e22ee1414) @@ -64,11 +64,5 @@ assert(device); - uhci_t *uhci = malloc(sizeof(uhci_t)); - if (uhci == NULL) { - usb_log_error("Failed to allocate UHCI driver.\n"); - return ENOMEM; - } - - int ret = uhci_init(uhci, device); + int ret = device_setup_uhci(device); if (ret != EOK) { usb_log_error("Failed to initialize UHCI driver: %s.\n", @@ -76,6 +70,4 @@ return ret; } - device->driver_data = uhci; - usb_log_info("Controlling new UHCI device '%s'.\n", device->name); Index: uspace/drv/uhci-hcd/uhci.c =================================================================== --- uspace/drv/uhci-hcd/uhci.c (revision 5dfee5222840f1722deae4e46e1dfce8ed1787c5) +++ uspace/drv/uhci-hcd/uhci.c (revision 7b6f116c38d4e2688964774a9a6da33e22ee1414) @@ -44,4 +44,28 @@ #include "pci.h" +#include "hc.h" +#include "root_hub.h" + +/** Structure representing both functions of UHCI hc, USB host controller + * and USB root hub */ +typedef struct uhci { + /** Pointer to DDF represenation of UHCI host controller */ + ddf_fun_t *hc_fun; + /** Pointer to DDF represenation of UHCI root hub */ + ddf_fun_t *rh_fun; + + /** Internal driver's represenation of UHCI host controller */ + hc_t hc; + /** Internal driver's represenation of UHCI root hub */ + rh_t rh; +} uhci_t; + +static inline uhci_t * dev_to_uhci(ddf_dev_t *dev) +{ + assert(dev); + assert(dev->driver_data); + return dev->driver_data; +} +/*----------------------------------------------------------------------------*/ /** IRQ handling callback, forward status from call to diver structure. * @@ -69,8 +93,7 @@ { assert(fun); - usb_device_keeper_t *manager = - &((uhci_t*)fun->dev->driver_data)->hc.manager; - + usb_device_keeper_t *manager = &dev_to_uhci(fun->dev)->hc.manager; usb_address_t addr = usb_device_keeper_find(manager, handle); + if (addr < 0) { return addr; @@ -93,9 +116,10 @@ ddf_fun_t *fun, devman_handle_t *handle) { - assert(handle); - ddf_fun_t *hc_fun = ((uhci_t*)fun->dev->driver_data)->hc_fun; - assert(hc_fun != NULL); - - *handle = hc_fun->handle; + assert(fun); + ddf_fun_t *hc_fun = dev_to_uhci(fun->dev)->hc_fun; + assert(hc_fun); + + if (handle != NULL) + *handle = hc_fun->handle; return EOK; } @@ -126,5 +150,5 @@ static hw_res_ops_t hw_res_iface = { .get_resource_list = get_resource_list, - .enable_interrupt = NULL + .enable_interrupt = NULL, }; /*----------------------------------------------------------------------------*/ @@ -146,33 +170,55 @@ * - registers interrupt handler */ -int uhci_init(uhci_t *instance, ddf_dev_t *device) -{ - assert(instance); - instance->hc_fun = NULL; +int device_setup_uhci(ddf_dev_t *device) +{ + assert(device); + uhci_t *instance = malloc(sizeof(uhci_t)); + if (instance == NULL) { + usb_log_error("Failed to allocate OHCI driver.\n"); + return ENOMEM; + } + +#define CHECK_RET_DEST_FREE_RETURN(ret, message...) \ +if (ret != EOK) { \ + if (instance->hc_fun) \ + instance->hc_fun->ops = NULL; \ + instance->hc_fun->driver_data = NULL; \ + ddf_fun_destroy(instance->hc_fun); \ + if (instance->rh_fun) {\ + instance->rh_fun->ops = NULL; \ + instance->rh_fun->driver_data = NULL; \ + ddf_fun_destroy(instance->rh_fun); \ + } \ + free(instance); \ + usb_log_error(message); \ + return ret; \ +} else (void)0 + instance->rh_fun = NULL; -#define CHECK_RET_DEST_FUN_RETURN(ret, message...) \ -if (ret != EOK) { \ - usb_log_error(message); \ - if (instance->hc_fun) \ - ddf_fun_destroy(instance->hc_fun); \ - if (instance->rh_fun) \ - ddf_fun_destroy(instance->rh_fun); \ - return ret; \ -} - - uintptr_t io_reg_base = 0; - size_t io_reg_size = 0; + instance->hc_fun = ddf_fun_create(device, fun_exposed, "uhci-hc"); + int ret = (instance->hc_fun == NULL) ? ENOMEM : EOK; + CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create UHCI HC function.\n"); + instance->hc_fun->ops = &hc_ops; + instance->hc_fun->driver_data = &instance->hc; + + instance->rh_fun = ddf_fun_create(device, fun_inner, "uhci-rh"); + ret = (instance->rh_fun == NULL) ? ENOMEM : EOK; + CHECK_RET_DEST_FREE_RETURN(ret, "Failed to create UHCI RH function.\n"); + instance->rh_fun->ops = &rh_ops; + instance->rh_fun->driver_data = &instance->rh; + + uintptr_t reg_base = 0; + size_t reg_size = 0; int irq = 0; - int ret = - pci_get_my_registers(device, &io_reg_base, &io_reg_size, &irq); - CHECK_RET_DEST_FUN_RETURN(ret, + ret = pci_get_my_registers(device, ®_base, ®_size, &irq); + CHECK_RET_DEST_FREE_RETURN(ret, "Failed to get I/O addresses for %" PRIun ": %s.\n", device->handle, str_error(ret)); usb_log_debug("I/O regs at 0x%p (size %zu), IRQ %d.\n", - (void *) io_reg_base, io_reg_size, irq); + (void *) reg_base, reg_size, irq); ret = pci_disable_legacy(device); - CHECK_RET_DEST_FUN_RETURN(ret, + CHECK_RET_DEST_FREE_RETURN(ret, "Failed(%d) to disable legacy USB: %s.\n", ret, str_error(ret)); @@ -194,36 +240,15 @@ #endif - instance->hc_fun = ddf_fun_create(device, fun_exposed, "uhci-hc"); - ret = (instance->hc_fun == NULL) ? ENOMEM : EOK; - CHECK_RET_DEST_FUN_RETURN(ret, - "Failed(%d) to create HC function: %s.\n", ret, str_error(ret)); - - ret = hc_init(&instance->hc, instance->hc_fun, - (void*)io_reg_base, io_reg_size, interrupts); - CHECK_RET_DEST_FUN_RETURN(ret, + + ret = hc_init(&instance->hc, (void*)reg_base, reg_size, interrupts); + CHECK_RET_DEST_FREE_RETURN(ret, "Failed(%d) to init uhci-hcd: %s.\n", ret, str_error(ret)); - - instance->hc_fun->ops = &hc_ops; - instance->hc_fun->driver_data = &instance->hc; - ret = ddf_fun_bind(instance->hc_fun); - CHECK_RET_DEST_FUN_RETURN(ret, - "Failed(%d) to bind UHCI device function: %s.\n", - ret, str_error(ret)); - ret = ddf_fun_add_to_class(instance->hc_fun, USB_HC_DDF_CLASS_NAME); - CHECK_RET_DEST_FUN_RETURN(ret, - "Failed to add UHCI to HC class: %s.\n", str_error(ret)); - -#undef CHECK_RET_HC_RETURN #define CHECK_RET_FINI_RETURN(ret, message...) \ if (ret != EOK) { \ - usb_log_error(message); \ - if (instance->hc_fun) \ - ddf_fun_destroy(instance->hc_fun); \ - if (instance->rh_fun) \ - ddf_fun_destroy(instance->rh_fun); \ hc_fini(&instance->hc); \ + CHECK_RET_DEST_FREE_RETURN(ret, message); \ return ret; \ -} +} else (void)0 /* It does no harm if we register this on polling */ @@ -234,9 +259,12 @@ ret, str_error(ret)); - instance->rh_fun = ddf_fun_create(device, fun_inner, "uhci-rh"); - ret = (instance->rh_fun == NULL) ? ENOMEM : EOK; - CHECK_RET_FINI_RETURN(ret, - "Failed(%d) to create root hub function: %s.\n", + ret = ddf_fun_bind(instance->hc_fun); + CHECK_RET_FINI_RETURN(ret, + "Failed(%d) to bind UHCI device function: %s.\n", ret, str_error(ret)); + + ret = ddf_fun_add_to_class(instance->hc_fun, USB_HC_DDF_CLASS_NAME); + CHECK_RET_FINI_RETURN(ret, + "Failed to add UHCI to HC class: %s.\n", str_error(ret)); ret = rh_init(&instance->rh, instance->rh_fun, @@ -245,10 +273,9 @@ "Failed(%d) to setup UHCI root hub: %s.\n", ret, str_error(ret)); - instance->rh_fun->ops = &rh_ops; - instance->rh_fun->driver_data = &instance->rh; ret = ddf_fun_bind(instance->rh_fun); CHECK_RET_FINI_RETURN(ret, "Failed(%d) to register UHCI root hub: %s.\n", ret, str_error(ret)); + device->driver_data = instance; return EOK; #undef CHECK_RET_FINI_RETURN Index: uspace/drv/uhci-hcd/uhci.h =================================================================== --- uspace/drv/uhci-hcd/uhci.h (revision 5dfee5222840f1722deae4e46e1dfce8ed1787c5) +++ uspace/drv/uhci-hcd/uhci.h (revision 7b6f116c38d4e2688964774a9a6da33e22ee1414) @@ -38,22 +38,5 @@ #include -#include "hc.h" -#include "root_hub.h" - -/** Structure representing both functions of UHCI hc, USB host controller - * and USB root hub */ -typedef struct uhci { - /** Pointer to DDF represenation of UHCI host controller */ - ddf_fun_t *hc_fun; - /** Pointer to DDF represenation of UHCI root hub */ - ddf_fun_t *rh_fun; - - /** Internal driver's represenation of UHCI host controller */ - hc_t hc; - /** Internal driver's represenation of UHCI root hub */ - rh_t rh; -} uhci_t; - -int uhci_init(uhci_t *instance, ddf_dev_t *device); +int device_setup_uhci(ddf_dev_t *device); #endif /** Index: pace/lib/packet/include/net_byteorder.h =================================================================== --- uspace/lib/packet/include/net_byteorder.h (revision 5dfee5222840f1722deae4e46e1dfce8ed1787c5) +++ (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: pace/lib/packet/include/net_err.h =================================================================== --- uspace/lib/packet/include/net_err.h (revision 5dfee5222840f1722deae4e46e1dfce8ed1787c5) +++ (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: pace/lib/packet/include/socket_errno.h =================================================================== --- uspace/lib/packet/include/socket_errno.h (revision 5dfee5222840f1722deae4e46e1dfce8ed1787c5) +++ (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 - -/** @} - */