kingkevin
/
espressif_tinyusb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move STRING & XSTRING & STATIC_ASSERT to compiler.h 

disable test for a class of cdc host
temporarily disable test for test_osal_none.c
change include in some core files
remove osal.h from common.h
This commit is contained in:
hathach 2014-04-17 22:57:11 +07:00
parent 69c46b2f9a
commit 06bb9ad7a7
20 changed files with 89 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demos/device/src/tusb_config.h
View File

@ -57,7 +57,7 @@
//------------- CLASS -------------//
#define TUSB_CFG_DEVICE_HID_KEYBOARD 1
#define TUSB_CFG_DEVICE_HID_MOUSE 1
#define TUSB_CFG_DEVICE_HID_MOUSE 0
#define TUSB_CFG_DEVICE_HID_GENERIC 0 // not supported yet
#define TUSB_CFG_DEVICE_MSC 1
#define TUSB_CFG_DEVICE_CDC 1
@ -65,10 +65,10 @@
//--------------------------------------------------------------------+
// COMMON CONFIGURATION
//--------------------------------------------------------------------+
#define TUSB_CFG_DEBUG 3
#define TUSB_CFG_DEBUG 2
//#define TUSB_CFG_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching
//#define TUSB_CFG_OS_TASK_PRIO // be passed from IDE/command line for easy project switching
//#define TUSB_CFG_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching
#define TUSB_CFG_TICKS_HZ 1000
//--------------------------------------------------------------------+

18
demos/host/host_os_none/host_os_none.uvopt
View File

@ -613,7 +613,7 @@
<Focus>0</Focus>
<ColumnNumber>9</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>87</TopLine>
<TopLine>88</TopLine>
<CurrentLine>90</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\src\main.c</PathWithFileName>
@ -645,7 +645,7 @@
<Focus>0</Focus>
<ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>115</TopLine>
<TopLine>116</TopLine>
<CurrentLine>117</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\src\keyboard_host_app.c</PathWithFileName>
@ -659,10 +659,10 @@
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
<ColumnNumber>9</ColumnNumber>
<ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>125</TopLine>
<CurrentLine>135</CurrentLine>
<TopLine>132</TopLine>
<CurrentLine>133</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\src\mouse_host_app.c</PathWithFileName>
<FilenameWithoutPath>mouse_host_app.c</FilenameWithoutPath>
@ -677,7 +677,7 @@
<Focus>0</Focus>
<ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>149</TopLine>
<TopLine>150</TopLine>
<CurrentLine>159</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\src\msc_host_app.c</PathWithFileName>
@ -781,7 +781,7 @@
<Focus>0</Focus>
<ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>352</TopLine>
<TopLine>353</TopLine>
<CurrentLine>354</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\tinyusb\host\usbh.c</PathWithFileName>
@ -857,7 +857,7 @@
<GroupNumber>2</GroupNumber>
<FileNumber>16</FileNumber>
<FileType>1</FileType>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<Focus>0</Focus>
<ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
@ -1349,7 +1349,7 @@
<Focus>0</Focus>
<ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg>
<TopLine>146</TopLine>
<TopLine>147</TopLine>
<CurrentLine>151</CurrentLine>
<bDave2>0</bDave2>
<PathWithFileName>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</PathWithFileName>

4
demos/host/src/tusb_config.h
View File

@ -65,10 +65,10 @@
//--------------------------------------------------------------------+
// COMMON CONFIGURATION
//--------------------------------------------------------------------+
#define TUSB_CFG_DEBUG 3
#define TUSB_CFG_DEBUG 2
//#define TUSB_CFG_OS TUSB_OS_NONE // defined using eclipse build
//#define TUSB_CFG_OS_TASK_PRIO // defined using eclipse build
//#define TUSB_CFG_OS_TASK_PRIO 0 // defined using eclipse build
#define TUSB_CFG_TICKS_HZ 1000

3
tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c
View File

@ -50,7 +50,10 @@
#include "descriptor_cdc.h"
#include "cdc_host.h"
#if TUSB_CFG_HOST_CDC_RNDIS // TODO enable
#include "cdc_rndis_host.h"
#endif
static uint8_t dev_addr;
static uint16_t length;

9
tests/lpc18xx_43xx/test/host/cdc/test_cdc_rndis_host.c
View File

@ -36,6 +36,14 @@
*/
/**************************************************************************/
void setUp(void)
{
}
void tearDown(void)
{
}
#if 0 // TODO enable
#include "stdlib.h"
#include "unity.h"
#include "tusb_option.h"
@ -305,3 +313,4 @@ void test_rndis_initialization_sequence_ok(void)
TEST_ASSERT_EQUAL(msg_init_cmplt.max_xfer_size, p_rndis->max_xfer_size);
TEST_ASSERT_EQUAL_HEX8_ARRAY("CAFEBB", p_rndis->mac_address, 6);
}
#endif

2
tests/lpc18xx_43xx/test/host/usbh/test_enum_task.c
View File

@ -321,6 +321,6 @@ void test_enum_set_configure(void)
usbh_enumeration_task(NULL);
TEST_ASSERT_EQUAL(TUSB_CLASS_FLAG_HID | TUSB_CLASS_FLAG_MSC | TUSB_CLASS_FLAG_CDC,
TEST_ASSERT_EQUAL( BIT_(TUSB_CLASS_HID) | BIT_(TUSB_CLASS_MSC) | BIT_(TUSB_CLASS_CDC),
usbh_devices[1].flag_supported_class); // TODO change later
}

4
tests/lpc18xx_43xx/test/host/usbh/test_usbh.c
View File

@ -161,7 +161,7 @@ void test_usbh_hcd_rhport_unplugged_isr(void)
usbh_devices[dev_addr].core_id = 0;
usbh_devices[dev_addr].hub_addr = 0;
usbh_devices[dev_addr].hub_port = 0;
usbh_devices[dev_addr].flag_supported_class = TUSB_CLASS_FLAG_HID;
usbh_devices[dev_addr].flag_supported_class = BIT_(TUSB_CLASS_HID);
hidh_close_Expect(dev_addr);
hcd_pipe_control_close_ExpectAndReturn(dev_addr, TUSB_ERROR_NONE);
@ -180,7 +180,7 @@ void test_usbh_device_unplugged_multple_class(void)
usbh_devices[dev_addr].core_id = 0;
usbh_devices[dev_addr].hub_addr = 0;
usbh_devices[dev_addr].hub_port = 0;
usbh_devices[dev_addr].flag_supported_class = TUSB_CLASS_FLAG_HID | TUSB_CLASS_FLAG_MSC | TUSB_CLASS_FLAG_CDC;
usbh_devices[dev_addr].flag_supported_class = BIT_(TUSB_CLASS_HID) | BIT_(TUSB_CLASS_MSC) | BIT_(TUSB_CLASS_CDC);
cdch_close_Expect(dev_addr);
hidh_close_Expect(dev_addr);

11
tests/lpc18xx_43xx/test/test_osal_none.c
View File

@ -40,6 +40,16 @@
#undef TUSB_CFG_OS
#endif
void setUp(void)
{
}
void tearDown(void)
{
}
#if 0 // TODO enable
#include "unity.h"
#include "tusb_errors.h"
#include "osal_none.h"
@ -432,3 +442,4 @@ void test_task_flow_control_assert_status_hanlder(void)
TEST_ASSERT_EQUAL(0, statements[3]);
TEST_ASSERT_EQUAL(1, statements[5]);
}
#endif

3
tests/support/tusb_config.h
View File

@ -58,9 +58,10 @@
#define TUSB_CFG_HOST_HUB 1
#define TUSB_CFG_HOST_HID_KEYBOARD 1
#define TUSB_CFG_HOST_HID_MOUSE 1
#define TUSB_CFG_HOST_HID_GENERIC 0
#define TUSB_CFG_HOST_MSC 1
#define TUSB_CFG_HOST_CDC 1
#define TUSB_CFG_HOST_CDC_RNDIS 1
#define TUSB_CFG_HOST_CDC_RNDIS 0
// Test support
#define TEST_CONTROLLER_HOST_START_INDEX \

18
tinyusb/common/assertion.h
View File

@ -50,25 +50,13 @@ extern "C"
#endif
#include "tusb_option.h"
#include "primitive_types.h"
#include "compiler/compiler.h"
#include "hal/hal.h" // TODO find a way to break hal dependency
#define VOID_RETURN
//--------------------------------------------------------------------+
// Compile-time Assert
//--------------------------------------------------------------------+
#ifdef __ICCARM__
#define STATIC_ASSERT static_assert
#else
#if defined __COUNTER__ && __COUNTER__ != __COUNTER__
#define _ASSERT_COUNTER __COUNTER__
#else
#define _ASSERT_COUNTER __LINE__
#endif
#define STATIC_ASSERT(const_expr, message) enum { XSTRING_CONCAT_(static_assert_, _ASSERT_COUNTER) = 1/(!!(const_expr)) }
#endif
//#if ( defined CFG_PRINTF_UART || defined CFG_PRINTF_USBCDC || defined CFG_PRINTF_DEBUG )
#if TUSB_CFG_DEBUG
#define _PRINTF(...) printf(__VA_ARGS__)

15
tinyusb/common/common.h
View File

@ -47,14 +47,6 @@
extern "C" {
#endif
//--------------------------------------------------------------------+
// MACROS
//--------------------------------------------------------------------+
#define STRING_(x) #x // stringify without expand
#define XSTRING_(x) STRING_(x) // expand then stringify
#define STRING_CONCAT_(a, b) a##b // concat without expand
#define XSTRING_CONCAT_(a, b) STRING_CONCAT_(a, b) // expand then concat
//--------------------------------------------------------------------+
// INCLUDES
//--------------------------------------------------------------------+
@ -79,16 +71,9 @@
#include "std_descriptors.h"
#include "std_request.h"
#include "osal/osal.h"
//--------------------------------------------------------------------+
// MACROS
//--------------------------------------------------------------------+
#define STRING_(x) #x ///< stringify without expand
#define XSTRING_(x) STRING_(x) ///< expand then stringify
#define STRING_CONCAT_(a, b) a##b ///< concat without expand
#define XSTRING_CONCAT_(a, b) STRING_CONCAT_(a, b) ///< expand then concat
#define MAX_OF(a, b) ( (a) > (b) ? (a) : (b) )
#define MIN_OF(a, b) ( (a) < (b) ? (a) : (b) )

20
tinyusb/common/compiler/compiler.h
View File

@ -44,6 +44,26 @@
#ifndef _TUSB_COMPILER_H_
#define _TUSB_COMPILER_H_
#define STRING_(x) #x ///< stringify without expand
#define XSTRING_(x) STRING_(x) ///< expand then stringify
#define STRING_CONCAT_(a, b) a##b ///< concat without expand
#define XSTRING_CONCAT_(a, b) STRING_CONCAT_(a, b) ///< expand then concat
//--------------------------------------------------------------------+
// Compile-time Assert
//--------------------------------------------------------------------+
#ifdef __ICCARM__
#define STATIC_ASSERT static_assert
#else
#if defined __COUNTER__ && __COUNTER__ != __COUNTER__
#define _ASSERT_COUNTER __COUNTER__
#else
#define _ASSERT_COUNTER __LINE__
#endif
#define STATIC_ASSERT(const_expr, message) enum { XSTRING_CONCAT_(static_assert_, _ASSERT_COUNTER) = 1/(!!(const_expr)) }
#endif
#ifndef _TEST_
// TODO move some to tusb_option.h
#define STATIC_ static

25
tinyusb/common/compiler/compiler_gcc.h
View File

@ -36,14 +36,9 @@
*/
/**************************************************************************/
/** \file
* \brief GCC Header
*/
/** \ingroup Group_Compiler
* \defgroup Group_GCC GNU GCC
* @{
*/
* @{ */
#ifndef _TUSB_COMPILER_GCC_H_
#define _TUSB_COMPILER_GCC_H_
@ -63,10 +58,8 @@
/// If this attribute is used on a function declaration and a call to such a function is not eliminated through dead code elimination or other optimizations, a warning that includes message is diagnosed. This is useful for compile-time checking
#define ATTR_WARNING(Message) __attribute__ ((warning(Message)))
/**
* \defgroup Group_VariableAttr Variable Attributes
* @{
*/
/** \defgroup Group_VariableAttr Variable Attributes
* @{ */
/// This attribute specifies a minimum alignment for the variable or structure field, measured in bytes
#define ATTR_ALIGNED(Bytes) __attribute__ ((aligned(Bytes)))
@ -79,10 +72,8 @@
#define ATTR_PACKED_STRUCT(x) x __attribute__ ((packed))
/** @} */
/**
* \defgroup Group_FuncAttr Function Attributes
* @{
*/
/** \defgroup Group_FuncAttr Function Attributes
* @{ */
#ifndef ATTR_ALWAYS_INLINE
/// Generally, functions are not inlined unless optimization is specified. For functions declared inline, this attribute inlines the function even if no optimization level is specified
@ -125,10 +116,8 @@
/** @} */
/**
* \defgroup Group_BuiltinFunc Built-in Functions
* @{
*/
/** \defgroup Group_BuiltinFunc Built-in Functions
* @{ */
// TODO mcu specific
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

4
tinyusb/common/std_descriptors.h
View File

@ -49,6 +49,10 @@
extern "C" {
#endif
#include "tusb_option.h"
#include "primitive_types.h"
#include "compiler/compiler.h"
//--------------------------------------------------------------------+
// STANDARD DESCRIPTORS
//--------------------------------------------------------------------+

4
tinyusb/common/std_request.h
View File

@ -46,6 +46,10 @@
extern "C" {
#endif
#include "tusb_option.h"
#include "primitive_types.h"
#include "compiler/compiler.h"
typedef ATTR_PACKED_STRUCT(struct){
union {
ATTR_PACKED_STRUCT(struct) {

1
tinyusb/device/usbd.h
View File

@ -50,6 +50,7 @@
// INCLUDE
//--------------------------------------------------------------------+
#include "common/common.h"
#include "osal/osal.h"
#include "dcd.h"
//--------------------------------------------------------------------+

4
tinyusb/host/ehci/ehci.h
View File

@ -40,13 +40,13 @@
* @{
* \defgroup EHCI
* \brief EHCI driver. All documents sources mentioned here (eg section 3.5) is referring to EHCI Specs unless state otherwise
* @{
*/
* @{ */
#ifndef _TUSB_EHCI_H_
#define _TUSB_EHCI_H_
#include "common/common.h"
#include "../hcd.h"
/* Abbreviation
* HC: Host Controller

2
tinyusb/host/usbh_hcd.h
View File

@ -50,10 +50,10 @@
// INCLUDE
//--------------------------------------------------------------------+
#include "common/common.h"
#include "osal/osal.h"
#ifdef _TEST_
#include "hcd.h"
#include "osal.h"
#endif
//--------------------------------------------------------------------+

8
tinyusb/osal/osal.h
View File

@ -75,8 +75,8 @@
#define OSAL_TASK_LOOP_END }
//------------- Sub Task -------------//
#define OSAL_SUBTASK_BEGIN // TODO refractor move
#define OSAL_SUBTASK_END return TUSB_ERROR_NONE;
#define OSAL_SUBTASK_BEGIN
#define OSAL_SUBTASK_END return TUSB_ERROR_NONE;
#define SUBTASK_EXIT(error) return error;
#define OSAL_SUBTASK_INVOKED_AND_WAIT(subtask, status) status = subtask
@ -111,10 +111,8 @@ typedef uint32_t osal_task_t;
tusb_error_t osal_task_create(osal_task_t *task);
#define OSAL_TASK_DEF(code, stack_depth, prio) osal_task_t variable
#define OSAL_TASK_REF(name) (&name)
#define OSAL_TASK_FUNCTION(task_name) void task_name
#define OSAL_TASK_FUNCTION(task_func, p_para) void task_func(void * p_para)
void osal_task_delay(uint32_t msec);

6
tinyusb/osal/osal_freeRTOS.h
View File

@ -133,8 +133,7 @@ static inline void osal_semaphore_reset(osal_semaphore_handle_t const sem_hdl)
#define OSAL_MUTEX_DEF OSAL_SEM_DEF
typedef xSemaphoreHandle osal_mutex_handle_t;
#define osal_mutex_create(x) \
xSemaphoreCreateMutex()
#define osal_mutex_create(x) xSemaphoreCreateMutex()
static inline tusb_error_t osal_mutex_release(osal_mutex_handle_t const mutex_hdl) ATTR_ALWAYS_INLINE;
static inline tusb_error_t osal_mutex_release(osal_mutex_handle_t const mutex_hdl)
@ -172,8 +171,7 @@ typedef xQueueHandle osal_queue_handle_t;
#define OSAL_QUEUE_REF(name) (&name)
#define osal_queue_create(p_queue) \
xQueueCreate((p_queue)->depth, (p_queue)->item_size)
#define osal_queue_create(p_queue) xQueueCreate((p_queue)->depth, (p_queue)->item_size)
static inline void osal_queue_receive (osal_queue_handle_t const queue_hdl, void *p_data, uint32_t msec, tusb_error_t *p_error) ATTR_ALWAYS_INLINE;
static inline void osal_queue_receive (osal_queue_handle_t const queue_hdl, void *p_data, uint32_t msec, tusb_error_t *p_error)