diff --git a/tests/project.yml b/tests/project.yml index f4553109..84661367 100644 --- a/tests/project.yml +++ b/tests/project.yml @@ -32,8 +32,8 @@ - ../tinyusb/** - -:../demos - -:../test_old - - ../../CMSISv2p10_LPC13Uxx/** - #- ../../CMSISv2p10_LPC43xx_DriverLib/inc + #- ../../CMSISv2p10_LPC13Uxx/** + - ../../CMSISv2p10_LPC43xx_DriverLib/inc :support: - test/support @@ -45,13 +45,15 @@ :test: - *common_defines - _TEST_ - - MCU=MCU_LPC13UXX + - MCU=MCU_LPC43XX - CORE_M4 + - __CODE_RED :test_preprocess: - *common_defines - _TEST_ - - MCU=MCU_LPC13UXX + - MCU=MCU_LPC43XX - CORE_M4 + - __CODE_RED #:flags: # :test: diff --git a/tests/test/host/test_host_hid_keyboard.c b/tests/test/host/test_host_hid_keyboard.c index 436c90b4..cf5a541d 100644 --- a/tests/test/host/test_host_hid_keyboard.c +++ b/tests/test/host/test_host_hid_keyboard.c @@ -35,5 +35,15 @@ * This file is part of the tiny usb stack. */ -#define _TINY_USB_SOURCE_FILE +void setUp(void) +{ +} +void tearDown(void) +{ +} + +void test_() +{ + TEST_IGNORE(); +} diff --git a/tests/test/test_template.c b/tests/test/support/test_template.c similarity index 100% rename from tests/test/test_template.c rename to tests/test/support/test_template.c diff --git a/tests/test/support/tusb_config.h b/tests/test/support/tusb_config.h new file mode 100644 index 00000000..ae2d29b7 --- /dev/null +++ b/tests/test/support/tusb_config.h @@ -0,0 +1,91 @@ +/* + * tusb_config.h + * + * Created on: Jan 11, 2013 + * Author: hathach + */ + +/* + * Software License Agreement (BSD License) + * Copyright (c) 2012, hathach (tinyusb.net) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. 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. + * 3. 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. + * + * This file is part of the tiny usb stack. + */ + +/** \file + * \brief TBD + * + * \note TBD + */ + +/** \ingroup TBD + * \defgroup TBD + * \brief TBD + * + * @{ + */ + +#ifndef _TUSB_TUSB_CONFIG_H_ +#define _TUSB_TUSB_CONFIG_H_ + +#ifdef __cplusplus + extern "C" { +#endif + +#define TUSB_CFG_HOST + +/// Enable Device Support +//#define TUSB_CFG_DEVICE + +/// Enable CDC Support +//#define TUSB_CFG_DEVICE_CDC + +/// Enable HID Keyboard support +#define TUSB_CFG_DEVICE_HID_KEYBOARD + +/// Enable HID Mouse support +//#define TUSB_CFG_DEVICE_HID_MOUSE + +#define TUSB_CFG_DEBUG 3 + +#ifdef __CODE_RED // make use of code red's support for ram region macros + #if (MCU == MCU_LPC11UXX) || (MCU == MCU_LPC13UXX) + #define TUSB_RAM_SECTION ".data.$RAM2" + #elif (MCU == MCU_LPC43XX) + #define TUSB_RAM_SECTION ".data.$RAM3" + #endif + + #define TUSB_ATTR_RAM_SECTION __attribute__ ((section(TUSB_RAM_SECTION))) +#endif + + +#ifdef __cplusplus + } +#endif + +#endif /* _TUSB_TUSB_CONFIG_H_ */ + +/** @} */ diff --git a/tinyusb/tusb_option.h b/tinyusb/tusb_option.h index 0d321f08..2bdbd402 100644 --- a/tinyusb/tusb_option.h +++ b/tinyusb/tusb_option.h @@ -54,9 +54,7 @@ #endif /// define this symbol will make tinyusb look for external configure file -#ifndef _TEST_ // TODO allow configurable name - #include "tusb_config.h" -#endif +#include "tusb_config.h" /// 0: no debug information 3: most debug information provided #ifndef TUSB_CFG_DEBUG