Index: uspace/app/netstart/self_test.c =================================================================== --- uspace/app/netstart/self_test.c (revision 0c00dacd83fc1cfa624210f93e4f84f4064deed6) +++ uspace/app/netstart/self_test.c (revision 0c00dacd83fc1cfa624210f93e4f84f4064deed6) @@ -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 0c00dacd83fc1cfa624210f93e4f84f4064deed6) +++ uspace/app/netstart/self_test.h (revision 0c00dacd83fc1cfa624210f93e4f84f4064deed6) @@ -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/uhci-hcd/iface.c =================================================================== --- uspace/drv/uhci-hcd/iface.c (revision 6427cf67e61dac03ff95a479691282c98e8bd5f3) +++ uspace/drv/uhci-hcd/iface.c (revision 0c00dacd83fc1cfa624210f93e4f84f4064deed6) @@ -104,8 +104,8 @@ /*----------------------------------------------------------------------------*/ static int interrupt_out(device_t *dev, usb_target_t target, - void *data, size_t size, - usbhc_iface_transfer_out_callback_t callback, void *arg) -{ - size_t max_packet_size = 8; + size_t max_packet_size, + void *data, size_t size, + usbhc_iface_transfer_out_callback_t callback, void *arg) +{ dev_speed_t speed = FULL_SPEED; @@ -119,8 +119,8 @@ /*----------------------------------------------------------------------------*/ static int interrupt_in(device_t *dev, usb_target_t target, - void *data, size_t size, - usbhc_iface_transfer_in_callback_t callback, void *arg) -{ - size_t max_packet_size = 4; + size_t max_packet_size, + void *data, size_t size, + usbhc_iface_transfer_in_callback_t callback, void *arg) +{ dev_speed_t speed = FULL_SPEED; @@ -134,8 +134,8 @@ /*----------------------------------------------------------------------------*/ static int control_write(device_t *dev, usb_target_t target, + size_t max_packet_size, void *setup_data, size_t setup_size, void *data, size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg) { - size_t max_packet_size = 8; dev_speed_t speed = FULL_SPEED; @@ -150,8 +150,8 @@ /*----------------------------------------------------------------------------*/ static int control_read(device_t *dev, usb_target_t target, + size_t max_packet_size, void *setup_data, size_t setup_size, void *data, size_t size, usbhc_iface_transfer_in_callback_t callback, void *arg) { - size_t max_packet_size = 8; dev_speed_t speed = FULL_SPEED; @@ -166,6 +166,37 @@ /*----------------------------------------------------------------------------*/ static int control_write_setup(device_t *dev, usb_target_t target, - void *data, size_t size, - usbhc_iface_transfer_out_callback_t callback, void *arg) + size_t max_packet_size, + void *data, size_t size, + usbhc_iface_transfer_out_callback_t callback, void *arg) +{ + dev_speed_t speed = FULL_SPEED; + + usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); + batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, + max_packet_size, speed, NULL, 0, data, size, NULL, callback, arg); + if (!batch) + return ENOMEM; + batch_control_setup_old(batch); + return EOK; +} +/*----------------------------------------------------------------------------*/ +static int control_write_data(device_t *dev, usb_target_t target, + size_t max_packet_size, + void *data, size_t size, + usbhc_iface_transfer_out_callback_t callback, void *arg) +{ + dev_speed_t speed = FULL_SPEED; + + usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); + batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, + max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg); + if (!batch) + return ENOMEM; + batch_control_write_data_old(batch); + return EOK; +} +/*----------------------------------------------------------------------------*/ +static int control_write_status(device_t *dev, usb_target_t target, + usbhc_iface_transfer_in_callback_t callback, void *arg) { size_t max_packet_size = 8; @@ -174,4 +205,20 @@ usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, + max_packet_size, speed, NULL, 0, NULL, 0, callback, NULL, arg); + if (!batch) + return ENOMEM; + batch_control_write_status_old(batch); + return EOK; +} +/*----------------------------------------------------------------------------*/ +static int control_read_setup(device_t *dev, usb_target_t target, + size_t max_packet_size, + void *data, size_t size, + usbhc_iface_transfer_out_callback_t callback, void *arg) +{ + dev_speed_t speed = FULL_SPEED; + + usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); + batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, max_packet_size, speed, NULL, 0, data, size, NULL, callback, arg); if (!batch) @@ -181,56 +228,9 @@ } /*----------------------------------------------------------------------------*/ -static int control_write_data(device_t *dev, usb_target_t target, - void *data, size_t size, - usbhc_iface_transfer_out_callback_t callback, void *arg) -{ - size_t max_packet_size = 8; - dev_speed_t speed = FULL_SPEED; - - usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); - batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, - max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg); - if (!batch) - return ENOMEM; - batch_control_write_data_old(batch); - return EOK; -} -/*----------------------------------------------------------------------------*/ -static int control_write_status(device_t *dev, usb_target_t target, - usbhc_iface_transfer_in_callback_t callback, void *arg) -{ - size_t max_packet_size = 8; - dev_speed_t speed = FULL_SPEED; - - usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); - batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, - max_packet_size, speed, NULL, 0, NULL, 0, callback, NULL, arg); - if (!batch) - return ENOMEM; - batch_control_write_status_old(batch); - return EOK; -} -/*----------------------------------------------------------------------------*/ -static int control_read_setup(device_t *dev, usb_target_t target, - void *data, size_t size, - usbhc_iface_transfer_out_callback_t callback, void *arg) -{ - size_t max_packet_size = 8; - dev_speed_t speed = FULL_SPEED; - - usb_log_warning("Using deprecated API %s.\n", __FUNCTION__); - batch_t *batch = batch_get(dev, target, USB_TRANSFER_CONTROL, - max_packet_size, speed, NULL, 0, data, size, NULL, callback, arg); - if (!batch) - return ENOMEM; - batch_control_setup_old(batch); - return EOK; -} -/*----------------------------------------------------------------------------*/ static int control_read_data(device_t *dev, usb_target_t target, - void *data, size_t size, - usbhc_iface_transfer_in_callback_t callback, void *arg) -{ - size_t max_packet_size = 8; + size_t max_packet_size, + void *data, size_t size, + usbhc_iface_transfer_in_callback_t callback, void *arg) +{ dev_speed_t speed = FULL_SPEED; Index: uspace/drv/vhc/connhost.c =================================================================== --- uspace/drv/vhc/connhost.c (revision 6427cf67e61dac03ff95a479691282c98e8bd5f3) +++ uspace/drv/vhc/connhost.c (revision 0c00dacd83fc1cfa624210f93e4f84f4064deed6) @@ -276,4 +276,5 @@ static int interrupt_out(device_t *dev, usb_target_t target, + size_t max_packet_size, void *data, size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg) @@ -285,4 +286,5 @@ static int interrupt_in(device_t *dev, usb_target_t target, + size_t max_packet_size, void *data, size_t size, usbhc_iface_transfer_in_callback_t callback, void *arg) @@ -294,4 +296,5 @@ static int control_write_setup(device_t *dev, usb_target_t target, + size_t max_packet_size, void *data, size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg) @@ -303,4 +306,5 @@ static int control_write_data(device_t *dev, usb_target_t target, + size_t max_packet_size, void *data, size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg) @@ -320,4 +324,5 @@ static int control_write(device_t *dev, usb_target_t target, + size_t max_packet_size, void *setup_packet, size_t setup_packet_size, void *data, size_t data_size, @@ -337,4 +342,5 @@ static int control_read_setup(device_t *dev, usb_target_t target, + size_t max_packet_size, void *data, size_t size, usbhc_iface_transfer_out_callback_t callback, void *arg) @@ -346,4 +352,5 @@ static int control_read_data(device_t *dev, usb_target_t target, + size_t max_packet_size, void *data, size_t size, usbhc_iface_transfer_in_callback_t callback, void *arg) @@ -363,4 +370,5 @@ static int control_read(device_t *dev, usb_target_t target, + size_t max_packet_size, void *setup_packet, size_t setup_packet_size, void *data, size_t data_size, Index: uspace/lib/drv/generic/remote_usbhc.c =================================================================== --- uspace/lib/drv/generic/remote_usbhc.c (revision 6427cf67e61dac03ff95a479691282c98e8bd5f3) +++ uspace/lib/drv/generic/remote_usbhc.c (revision 0c00dacd83fc1cfa624210f93e4f84f4064deed6) @@ -40,4 +40,6 @@ #define USB_MAX_PAYLOAD_SIZE 1020 +#define HACK_MAX_PACKET_SIZE 8 +#define HACK_MAX_PACKET_SIZE_INTERRUPT_IN 4 static void remote_usbhc_get_address(device_t *, void *, ipc_callid_t, ipc_call_t *); @@ -326,5 +328,6 @@ trans->size = len; - int rc = transfer_func(device, target, buffer, len, + int rc = transfer_func(device, target, HACK_MAX_PACKET_SIZE, + buffer, len, callback_out, trans); @@ -372,5 +375,6 @@ trans->size = len; - int rc = transfer_func(device, target, trans->buffer, len, + int rc = transfer_func(device, target, HACK_MAX_PACKET_SIZE_INTERRUPT_IN, + trans->buffer, len, callback_in, trans); @@ -580,5 +584,5 @@ trans->size = data_buffer_len; - rc = usb_iface->control_write(device, target, + rc = usb_iface->control_write(device, target, HACK_MAX_PACKET_SIZE, setup_packet, setup_packet_len, data_buffer, data_buffer_len, @@ -644,5 +648,5 @@ } - rc = usb_iface->control_read(device, target, + rc = usb_iface->control_read(device, target, HACK_MAX_PACKET_SIZE, setup_packet, setup_packet_len, trans->buffer, trans->size, Index: uspace/lib/drv/include/usbhc_iface.h =================================================================== --- uspace/lib/drv/include/usbhc_iface.h (revision 6427cf67e61dac03ff95a479691282c98e8bd5f3) +++ uspace/lib/drv/include/usbhc_iface.h (revision 0c00dacd83fc1cfa624210f93e4f84f4064deed6) @@ -216,13 +216,13 @@ /** Out transfer processing function prototype. */ -typedef int (*usbhc_iface_transfer_out_t)(device_t *, usb_target_t, +typedef int (*usbhc_iface_transfer_out_t)(device_t *, usb_target_t, size_t, void *, size_t, usbhc_iface_transfer_out_callback_t, void *); -/** Setup transfer processing function prototype. */ +/** Setup transfer processing function prototype. @deprecated */ typedef usbhc_iface_transfer_out_t usbhc_iface_transfer_setup_t; /** In transfer processing function prototype. */ -typedef int (*usbhc_iface_transfer_in_t)(device_t *, usb_target_t, +typedef int (*usbhc_iface_transfer_in_t)(device_t *, usb_target_t, size_t, void *, size_t, usbhc_iface_transfer_in_callback_t, void *); @@ -252,8 +252,10 @@ int (*control_write)(device_t *, usb_target_t, + size_t, void *, size_t, void *, size_t, usbhc_iface_transfer_out_callback_t, void *); int (*control_read)(device_t *, usb_target_t, + size_t, void *, size_t, void *, size_t, usbhc_iface_transfer_in_callback_t, void *); Index: pace/lib/packet/include/net_byteorder.h =================================================================== --- uspace/lib/packet/include/net_byteorder.h (revision 6427cf67e61dac03ff95a479691282c98e8bd5f3) +++ (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 6427cf67e61dac03ff95a479691282c98e8bd5f3) +++ (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 6427cf67e61dac03ff95a479691282c98e8bd5f3) +++ (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 - -/** @} - */ Index: uspace/lib/usbvirt/Makefile =================================================================== --- uspace/lib/usbvirt/Makefile (revision 6427cf67e61dac03ff95a479691282c98e8bd5f3) +++ uspace/lib/usbvirt/Makefile (revision 0c00dacd83fc1cfa624210f93e4f84f4064deed6) @@ -30,5 +30,4 @@ LIBRARY = libusbvirt -LIBS = $(LIBUSB_PREFIX)/libusb.a EXTRA_CFLAGS = -I$(LIBUSB_PREFIX)/include -Iinclude