Index: uspace/drv/bus/usb/usbdiag/device.c =================================================================== --- uspace/drv/bus/usb/usbdiag/device.c (revision ff16da5ff011339c7b70a51ff8f16b5336b3b868) +++ uspace/drv/bus/usb/usbdiag/device.c (revision b7b7898ebbb6331485b857c698ffc8e20b40797f) @@ -45,30 +45,12 @@ #define NAME "usbdiag" -#define TRANSLATE_FUNC_NAME(fun) translate_##fun -#define TRANSLATE_FUNC(fun) \ - static int TRANSLATE_FUNC_NAME(fun)(ddf_fun_t *f, int cycles, size_t size)\ - {\ - usb_diag_dev_t *dev = ddf_fun_to_usb_diag_dev(f);\ - return fun(dev, cycles, size);\ - } - -TRANSLATE_FUNC(usb_diag_stress_intr_out) -TRANSLATE_FUNC(usb_diag_stress_intr_in) -TRANSLATE_FUNC(usb_diag_stress_bulk_out) -TRANSLATE_FUNC(usb_diag_stress_bulk_in) -TRANSLATE_FUNC(usb_diag_stress_isoch_out) -TRANSLATE_FUNC(usb_diag_stress_isoch_in) - static usbdiag_iface_t diag_interface = { - .stress_intr_out = TRANSLATE_FUNC_NAME(usb_diag_stress_intr_out), - .stress_intr_in = TRANSLATE_FUNC_NAME(usb_diag_stress_intr_in), - .stress_bulk_out = TRANSLATE_FUNC_NAME(usb_diag_stress_bulk_out), - .stress_bulk_in = TRANSLATE_FUNC_NAME(usb_diag_stress_bulk_in), - .stress_isoch_out = TRANSLATE_FUNC_NAME(usb_diag_stress_isoch_out), - .stress_isoch_in = TRANSLATE_FUNC_NAME(usb_diag_stress_isoch_in) + .burst_intr_in = usbdiag_burst_test_intr_in, + .burst_intr_out = usbdiag_burst_test_intr_out, + .burst_bulk_in = usbdiag_burst_test_bulk_in, + .burst_bulk_out = usbdiag_burst_test_bulk_out, + .burst_isoch_in = usbdiag_burst_test_isoch_in, + .burst_isoch_out = usbdiag_burst_test_isoch_out }; - -#undef TRANSLATE_FUNC_NAME -#undef TRANSLATE_FUNC static ddf_dev_ops_t diag_ops = { @@ -76,5 +58,5 @@ }; -static int device_init(usb_diag_dev_t *dev) +static int device_init(usbdiag_dev_t *dev) { int rc; @@ -89,5 +71,5 @@ #define _MAP_EP(target, ep_no) do {\ - usb_endpoint_mapping_t *epm = usb_device_get_mapped_ep(dev->usb_dev, USB_DIAG_EP_##ep_no);\ + usb_endpoint_mapping_t *epm = usb_device_get_mapped_ep(dev->usb_dev, USBDIAG_EP_##ep_no);\ if (!epm || !epm->present) {\ usb_log_error("Failed to map endpoint: " #ep_no ".\n");\ @@ -115,15 +97,15 @@ } -static void device_fini(usb_diag_dev_t *dev) +static void device_fini(usbdiag_dev_t *dev) { ddf_fun_destroy(dev->fun); } -int usb_diag_dev_create(usb_device_t *dev, usb_diag_dev_t **out_diag_dev) +int usbdiag_dev_create(usb_device_t *dev, usbdiag_dev_t **out_diag_dev) { assert(dev); assert(out_diag_dev); - usb_diag_dev_t *diag_dev = usb_device_data_alloc(dev, sizeof(usb_diag_dev_t)); + usbdiag_dev_t *diag_dev = usb_device_data_alloc(dev, sizeof(usbdiag_dev_t)); if (!diag_dev) return ENOMEM; @@ -143,5 +125,5 @@ } -void usb_diag_dev_destroy(usb_diag_dev_t *dev) +void usbdiag_dev_destroy(usbdiag_dev_t *dev) { assert(dev); Index: uspace/drv/bus/usb/usbdiag/device.h =================================================================== --- uspace/drv/bus/usb/usbdiag/device.h (revision ff16da5ff011339c7b70a51ff8f16b5336b3b868) +++ uspace/drv/bus/usb/usbdiag/device.h (revision b7b7898ebbb6331485b857c698ffc8e20b40797f) @@ -34,20 +34,20 @@ */ -#ifndef USB_DIAG_DEVICE_H_ -#define USB_DIAG_DEVICE_H_ +#ifndef USBDIAG_DEVICE_H_ +#define USBDIAG_DEVICE_H_ #include -#define USB_DIAG_EP_INTR_IN 1 -#define USB_DIAG_EP_INTR_OUT 2 -#define USB_DIAG_EP_BULK_IN 3 -#define USB_DIAG_EP_BULK_OUT 4 -#define USB_DIAG_EP_ISOCH_IN 5 -#define USB_DIAG_EP_ISOCH_OUT 6 +#define USBDIAG_EP_INTR_IN 1 +#define USBDIAG_EP_INTR_OUT 2 +#define USBDIAG_EP_BULK_IN 3 +#define USBDIAG_EP_BULK_OUT 4 +#define USBDIAG_EP_ISOCH_IN 5 +#define USBDIAG_EP_ISOCH_OUT 6 /** * USB diagnostic device. */ -typedef struct usb_diag_dev { +typedef struct usbdiag_dev { usb_device_t *usb_dev; ddf_fun_t *fun; @@ -58,10 +58,10 @@ usb_pipe_t *isoch_in; usb_pipe_t *isoch_out; -} usb_diag_dev_t; +} usbdiag_dev_t; -int usb_diag_dev_create(usb_device_t *, usb_diag_dev_t **); -void usb_diag_dev_destroy(usb_diag_dev_t *); +int usbdiag_dev_create(usb_device_t *, usbdiag_dev_t **); +void usbdiag_dev_destroy(usbdiag_dev_t *); -static inline usb_diag_dev_t * usb_device_to_usb_diag_dev(usb_device_t *usb_dev) +static inline usbdiag_dev_t * usb_device_to_usbdiag_dev(usb_device_t *usb_dev) { assert(usb_dev); @@ -69,17 +69,17 @@ } -static inline usb_diag_dev_t * ddf_dev_to_usb_diag_dev(ddf_dev_t *ddf_dev) +static inline usbdiag_dev_t * ddf_dev_to_usbdiag_dev(ddf_dev_t *ddf_dev) { assert(ddf_dev); - return usb_device_to_usb_diag_dev(usb_device_get(ddf_dev)); + return usb_device_to_usbdiag_dev(usb_device_get(ddf_dev)); } -static inline usb_diag_dev_t * ddf_fun_to_usb_diag_dev(ddf_fun_t *ddf_fun) +static inline usbdiag_dev_t * ddf_fun_to_usbdiag_dev(ddf_fun_t *ddf_fun) { assert(ddf_fun); - return ddf_dev_to_usb_diag_dev(ddf_fun_get_dev(ddf_fun)); + return ddf_dev_to_usbdiag_dev(ddf_fun_get_dev(ddf_fun)); } -#endif /* USB_DIAG_USBDIAG_H_ */ +#endif /* USBDIAG_USBDIAG_H_ */ /** Index: uspace/drv/bus/usb/usbdiag/main.c =================================================================== --- uspace/drv/bus/usb/usbdiag/main.c (revision ff16da5ff011339c7b70a51ff8f16b5336b3b868) +++ uspace/drv/bus/usb/usbdiag/main.c (revision b7b7898ebbb6331485b857c698ffc8e20b40797f) @@ -41,5 +41,4 @@ #include -#include "usbdiag.h" #include "device.h" @@ -51,6 +50,6 @@ usb_log_info("Adding device '%s'", usb_device_get_name(dev)); - usb_diag_dev_t *diag_dev; - if ((rc = usb_diag_dev_create(dev, &diag_dev))) { + usbdiag_dev_t *diag_dev; + if ((rc = usbdiag_dev_create(dev, &diag_dev))) { usb_log_error("Failed create device: %s.\n", str_error(rc)); goto err; @@ -73,5 +72,5 @@ ddf_fun_unbind(diag_dev->fun); err_create: - usb_diag_dev_destroy(diag_dev); + usbdiag_dev_destroy(diag_dev); err: return rc; @@ -83,5 +82,5 @@ usb_log_info("Removing device '%s'", usb_device_get_name(dev)); - usb_diag_dev_t *diag_dev = usb_device_to_usb_diag_dev(dev); + usbdiag_dev_t *diag_dev = usb_device_to_usbdiag_dev(dev); /* TODO: Make sure nothing is going on with the device. */ @@ -92,5 +91,5 @@ } - usb_diag_dev_destroy(diag_dev); + usbdiag_dev_destroy(diag_dev); return EOK; @@ -104,5 +103,5 @@ usb_log_info("Device '%s' gone.", usb_device_get_name(dev)); - usb_diag_dev_t *diag_dev = usb_device_to_usb_diag_dev(dev); + usbdiag_dev_t *diag_dev = usb_device_to_usbdiag_dev(dev); /* TODO: Make sure nothing is going on with the device. */ @@ -110,5 +109,5 @@ /* TODO: Remove device from list */ - usb_diag_dev_destroy(diag_dev); + usbdiag_dev_destroy(diag_dev); return EOK; @@ -175,10 +174,10 @@ static const usb_endpoint_description_t *diag_endpoints[] = { - [USB_DIAG_EP_INTR_IN] = &intr_in_ep, - [USB_DIAG_EP_INTR_OUT] = &intr_out_ep, - [USB_DIAG_EP_BULK_IN] = &bulk_in_ep, - [USB_DIAG_EP_BULK_OUT] = &bulk_out_ep, - [USB_DIAG_EP_ISOCH_IN] = &isoch_in_ep, - [USB_DIAG_EP_ISOCH_OUT] = &isoch_out_ep, + [USBDIAG_EP_INTR_IN] = &intr_in_ep, + [USBDIAG_EP_INTR_OUT] = &intr_out_ep, + [USBDIAG_EP_BULK_IN] = &bulk_in_ep, + [USBDIAG_EP_BULK_OUT] = &bulk_out_ep, + [USBDIAG_EP_ISOCH_IN] = &isoch_in_ep, + [USBDIAG_EP_ISOCH_OUT] = &isoch_out_ep, NULL }; Index: uspace/drv/bus/usb/usbdiag/tests.c =================================================================== --- uspace/drv/bus/usb/usbdiag/tests.c (revision ff16da5ff011339c7b70a51ff8f16b5336b3b868) +++ uspace/drv/bus/usb/usbdiag/tests.c (revision b7b7898ebbb6331485b857c698ffc8e20b40797f) @@ -37,12 +37,54 @@ #include #include +#include "device.h" #include "tests.h" #define NAME "usbdiag" +static int burst_in_test(usb_pipe_t *pipe, int cycles, size_t size) +{ + if (!pipe) + return EBADMEM; -int usb_diag_stress_intr_out(usb_diag_dev_t *dev, int cycles, size_t size) + char *buffer = (char *) malloc(size); + if (!buffer) + return ENOMEM; + + // TODO: Are we sure that no other test is running on this endpoint? + + usb_log_info("Performing %s IN burst test.", usb_str_transfer_type(pipe->desc.transfer_type)); + int rc = EOK; + for (int i = 0; i < cycles; ++i) { + // Read device's response. + size_t remaining = size; + size_t transferred; + + while (remaining > 0) { + if ((rc = usb_pipe_read(pipe, buffer + size - remaining, remaining, &transferred))) { + usb_log_error("Read of %s IN endpoint failed with error: %s\n", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc)); + break; + } + + if (transferred > remaining) { + usb_log_error("Read of %s IN endpoint returned more data than expected.\n", usb_str_transfer_type(pipe->desc.transfer_type)); + rc = EINVAL; + break; + } + + remaining -= transferred; + } + + if (rc) + break; + } + usb_log_info("Burst test on %s IN endpoint completed.", usb_str_transfer_type(pipe->desc.transfer_type)); + + free(buffer); + return rc; +} + +static int burst_out_test(usb_pipe_t *pipe, int cycles, size_t size) { - if (!dev) + if (!pipe) return EBADMEM; @@ -55,13 +97,14 @@ // TODO: Are we sure that no other test is running on this endpoint? - usb_log_info("Performing interrupt out stress test on device %s.", ddf_fun_get_name(dev->fun)); + usb_log_info("Performing %s OUT burst test.", usb_str_transfer_type(pipe->desc.transfer_type)); int rc = EOK; for (int i = 0; i < cycles; ++i) { // Write buffer to device. - if ((rc = usb_pipe_write(dev->intr_out, buffer, size))) { - usb_log_error("Interrupt OUT write failed. %s\n", str_error(rc)); + if ((rc = usb_pipe_write(pipe, buffer, size))) { + usb_log_error("Write to %s OUT endpoint failed with error: %s\n", usb_str_transfer_type(pipe->desc.transfer_type), str_error(rc)); break; } } + usb_log_info("Burst test on %s OUT endpoint completed.", usb_str_transfer_type(pipe->desc.transfer_type)); free(buffer); @@ -69,179 +112,56 @@ } -int usb_diag_stress_intr_in(usb_diag_dev_t *dev, int cycles, size_t size) +int usbdiag_burst_test_intr_in(ddf_fun_t *fun, int cycles, size_t size) { + usbdiag_dev_t *dev = ddf_fun_to_usbdiag_dev(fun); if (!dev) return EBADMEM; - char *buffer = (char *) malloc(size); - if (!buffer) - return ENOMEM; - - // TODO: Are we sure that no other test is running on this endpoint? - - usb_log_info("Performing interrupt in stress test on device %s.", ddf_fun_get_name(dev->fun)); - int rc = EOK; - for (int i = 0; i < cycles; ++i) { - // Read device's response. - size_t remaining = size; - size_t transferred; - - while (remaining > 0) { - if ((rc = usb_pipe_read(dev->intr_in, buffer + size - remaining, remaining, &transferred))) { - usb_log_error("Interrupt IN read failed. %s\n", str_error(rc)); - break; - } - - if (transferred > remaining) { - usb_log_error("Interrupt IN read more than expected.\n"); - rc = EINVAL; - break; - } - - remaining -= transferred; - } - - if (rc) - break; - } - - free(buffer); - return rc; + return burst_in_test(dev->intr_in, cycles, size); } -int usb_diag_stress_bulk_out(usb_diag_dev_t *dev, int cycles, size_t size) +int usbdiag_burst_test_intr_out(ddf_fun_t *fun, int cycles, size_t size) { + usbdiag_dev_t *dev = ddf_fun_to_usbdiag_dev(fun); if (!dev) return EBADMEM; - char *buffer = (char *) malloc(size); - if (!buffer) - return ENOMEM; - - memset(buffer, 42, size); - - // TODO: Are we sure that no other test is running on this endpoint? - - usb_log_info("Performing bulk out stress test on device %s.", ddf_fun_get_name(dev->fun)); - int rc = EOK; - for (int i = 0; i < cycles; ++i) { - // Write buffer to device. - if ((rc = usb_pipe_write(dev->bulk_out, buffer, size))) { - usb_log_error("Bulk OUT write failed. %s\n", str_error(rc)); - break; - } - } - - free(buffer); - return rc; + return burst_out_test(dev->intr_out, cycles, size); } -int usb_diag_stress_bulk_in(usb_diag_dev_t *dev, int cycles, size_t size) +int usbdiag_burst_test_bulk_in(ddf_fun_t *fun, int cycles, size_t size) { + usbdiag_dev_t *dev = ddf_fun_to_usbdiag_dev(fun); if (!dev) return EBADMEM; - char *buffer = (char *) malloc(size); - if (!buffer) - return ENOMEM; - - // TODO: Are we sure that no other test is running on this endpoint? - - usb_log_info("Performing bulk in stress test on device %s.", ddf_fun_get_name(dev->fun)); - int rc = EOK; - for (int i = 0; i < cycles; ++i) { - // Read device's response. - size_t remaining = size; - size_t transferred; - - while (remaining > 0) { - if ((rc = usb_pipe_read(dev->bulk_in, buffer + size - remaining, remaining, &transferred))) { - usb_log_error("Bulk IN read failed. %s\n", str_error(rc)); - break; - } - - if (transferred > remaining) { - usb_log_error("Bulk IN read more than expected.\n"); - rc = EINVAL; - break; - } - - remaining -= transferred; - } - - if (rc) - break; - } - - free(buffer); - return rc; + return burst_in_test(dev->bulk_in, cycles, size); } -int usb_diag_stress_isoch_out(usb_diag_dev_t *dev, int cycles, size_t size) +int usbdiag_burst_test_bulk_out(ddf_fun_t *fun, int cycles, size_t size) { + usbdiag_dev_t *dev = ddf_fun_to_usbdiag_dev(fun); if (!dev) return EBADMEM; - char *buffer = (char *) malloc(size); - if (!buffer) - return ENOMEM; - - memset(buffer, 42, size); - - // TODO: Are we sure that no other test is running on this endpoint? - - usb_log_info("Performing isochronous out stress test on device %s.", ddf_fun_get_name(dev->fun)); - int rc = EOK; - for (int i = 0; i < cycles; ++i) { - // Write buffer to device. - if ((rc = usb_pipe_write(dev->isoch_out, buffer, size))) { - usb_log_error("Isochronous OUT write failed. %s\n", str_error(rc)); - break; - } - } - - free(buffer); - return rc; + return burst_out_test(dev->bulk_out, cycles, size); } -int usb_diag_stress_isoch_in(usb_diag_dev_t *dev, int cycles, size_t size) +int usbdiag_burst_test_isoch_in(ddf_fun_t *fun, int cycles, size_t size) { + usbdiag_dev_t *dev = ddf_fun_to_usbdiag_dev(fun); if (!dev) return EBADMEM; - char *buffer = (char *) malloc(size); - if (!buffer) - return ENOMEM; + return burst_in_test(dev->isoch_in, cycles, size); +} - // TODO: Are we sure that no other test is running on this endpoint? +int usbdiag_burst_test_isoch_out(ddf_fun_t *fun, int cycles, size_t size) +{ + usbdiag_dev_t *dev = ddf_fun_to_usbdiag_dev(fun); + if (!dev) + return EBADMEM; - usb_log_info("Performing isochronous in stress test on device %s.", ddf_fun_get_name(dev->fun)); - int rc = EOK; - for (int i = 0; i < cycles; ++i) { - // Read device's response. - size_t remaining = size; - size_t transferred; - - while (remaining > 0) { - if ((rc = usb_pipe_read(dev->isoch_in, buffer + size - remaining, remaining, &transferred))) { - usb_log_error("Isochronous IN read failed. %s\n", str_error(rc)); - break; - } - - if (transferred > remaining) { - usb_log_error("Isochronous IN read more than expected.\n"); - rc = EINVAL; - break; - } - - remaining -= transferred; - } - - if (rc) - break; - } - - free(buffer); - return rc; + return burst_out_test(dev->isoch_out, cycles, size); } Index: uspace/drv/bus/usb/usbdiag/tests.h =================================================================== --- uspace/drv/bus/usb/usbdiag/tests.h (revision ff16da5ff011339c7b70a51ff8f16b5336b3b868) +++ uspace/drv/bus/usb/usbdiag/tests.h (revision b7b7898ebbb6331485b857c698ffc8e20b40797f) @@ -34,17 +34,17 @@ */ -#ifndef USB_DIAG_TESTS_H_ -#define USB_DIAG_TESTS_H_ +#ifndef USBDIAG_TESTS_H_ +#define USBDIAG_TESTS_H_ -#include "device.h" +#include -int usb_diag_stress_intr_out(usb_diag_dev_t *, int, size_t); -int usb_diag_stress_intr_in(usb_diag_dev_t *, int, size_t); -int usb_diag_stress_bulk_out(usb_diag_dev_t *, int, size_t); -int usb_diag_stress_bulk_in(usb_diag_dev_t *, int, size_t); -int usb_diag_stress_isoch_out(usb_diag_dev_t *, int, size_t); -int usb_diag_stress_isoch_in(usb_diag_dev_t *, int, size_t); +int usbdiag_burst_test_intr_in(ddf_fun_t *, int, size_t); +int usbdiag_burst_test_intr_out(ddf_fun_t *, int, size_t); +int usbdiag_burst_test_bulk_in(ddf_fun_t *, int, size_t); +int usbdiag_burst_test_bulk_out(ddf_fun_t *, int, size_t); +int usbdiag_burst_test_isoch_in(ddf_fun_t *, int, size_t); +int usbdiag_burst_test_isoch_out(ddf_fun_t *, int, size_t); -#endif /* USB_DIAG_TESTS_H_ */ +#endif /* USBDIAG_TESTS_H_ */ /** Index: uspace/drv/bus/usb/usbdiag/usbdiag.h =================================================================== --- uspace/drv/bus/usb/usbdiag/usbdiag.h (revision ff16da5ff011339c7b70a51ff8f16b5336b3b868) +++ (revision ) @@ -1,45 +1,0 @@ -/* - * Copyright (c) 2017 Petr Manek - * 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 drvusbdiag - * @{ - */ -/** @file - * USB diagnostic device driver API. - */ - -#ifndef USB_DIAG_USBDIAG_H_ -#define USB_DIAG_USBDIAG_H_ - -// TODO: Add some API. - -#endif /* USB_DIAG_USBDIAG_H_ */ - -/** - * @} - */