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

rename TUSB_OS_NONE, TUSB_OS_FREERTOS to OPT_OS_NONE, OPT_OS_FREERTOS

This commit is contained in:
hathach 2018-04-12 12:55:53 +07:00
parent df367bac54
commit 18f97fef7e
27 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doxygen/configuration.txt
View File

@ -20,7 +20,7 @@
#define CFG_TUSB_MCU ///< Select one of the supported MCU, the value must be from \ref group_mcu
#define CFG_TUSB_OS ///< Select one of the supported RTOS, the value must be from \ref group_supported_os.
#define CFG_TUSB_OS_TASK_PRIO ///< If \ref CFG_TUSB_OS is configured to use a real RTOS (other than TUSB_OS_NONE). This determines the priority of the usb stack task.
#define CFG_TUSB_OS_TASK_PRIO ///< If \ref CFG_TUSB_OS is configured to use a real RTOS (other than OPT_OS_NONE). This determines the priority of the usb stack task.
//--------------------------------------------------------------------+
// HOST CONFIGURATION

4
examples/device/device_virtual_com/src/main.c
View File

@ -133,8 +133,8 @@ void print_greeting(void)
{
char const * const rtos_name[] =
{
[TUSB_OS_NONE] = "None",
[TUSB_OS_FREERTOS] = "FreeRTOS",
[OPT_OS_NONE] = "None",
[OPT_OS_FREERTOS] = "FreeRTOS",
};
printf("\n\

2
examples/device/device_virtual_com/src/tusb_config.h
View File

@ -68,7 +68,7 @@
//--------------------------------------------------------------------+
#define CFG_TUSB_DEBUG 2
//#define CFG_TUSB_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching
//#define CFG_TUSB_OS OPT_OS_NONE // be passed from IDE/command line for easy project switching
//#define CFG_TUSB_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching
//--------------------------------------------------------------------+

4
examples/device/nrf52840/src/main.c
View File

@ -133,8 +133,8 @@ void print_greeting(void)
{
char const * const rtos_name[] =
{
[TUSB_OS_NONE] = "None",
[TUSB_OS_FREERTOS] = "FreeRTOS",
[OPT_OS_NONE] = "None",
[OPT_OS_FREERTOS] = "FreeRTOS",
};
printf("\n--------------------------------------------------------------------\n");

2
examples/device/nrf52840/src/tusb_config.h
View File

@ -67,7 +67,7 @@
//--------------------------------------------------------------------+
#define CFG_TUSB_DEBUG 2
#define CFG_TUSB_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching
#define CFG_TUSB_OS OPT_OS_NONE // be passed from IDE/command line for easy project switching
//#define CFG_TUSB_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching
//--------------------------------------------------------------------+

4
examples/obsolete/device/src/app_os_prio.h
View File

@ -46,9 +46,9 @@
#include "tusb.h"
#if CFG_TUSB_OS == TUSB_OS_NONE
#if CFG_TUSB_OS == OPT_OS_NONE
#define LOWER_PRIO(x) 0 // does not matter
#elif CFG_TUSB_OS == TUSB_OS_FREERTOS
#elif CFG_TUSB_OS == OPT_OS_FREERTOS
#define LOWER_PRIO(x) ((x)-1) // freeRTOS lower number --> lower priority
#else
#error Priority is not configured for this RTOS

10
examples/obsolete/device/src/main.c
View File

@ -64,7 +64,7 @@ void led_blinking_init(void);
void led_blinking_task(void* param);
#if CFG_TUSB_OS == TUSB_OS_NONE
#if CFG_TUSB_OS == OPT_OS_NONE
// like a real RTOS, this function is a main loop invoking each task in application and never return
void os_none_start_scheduler(void)
{
@ -97,9 +97,9 @@ int main(void)
cdc_serial_app_init();
//------------- start OS scheduler (never return) -------------//
#if CFG_TUSB_OS == TUSB_OS_FREERTOS
#if CFG_TUSB_OS == OPT_OS_FREERTOS
vTaskStartScheduler();
#elif CFG_TUSB_OS == TUSB_OS_NONE
#elif CFG_TUSB_OS == OPT_OS_NONE
os_none_start_scheduler();
#else
#error need to start RTOS schduler
@ -180,8 +180,8 @@ void print_greeting(void)
{
char const * const rtos_name[] =
{
[TUSB_OS_NONE] = "None",
[TUSB_OS_FREERTOS] = "FreeRTOS",
[OPT_OS_NONE] = "None",
[OPT_OS_FREERTOS] = "FreeRTOS",
};
printf("\n\

2
examples/obsolete/device/src/tusb_config.h
View File

@ -68,7 +68,7 @@
//--------------------------------------------------------------------+
#define CFG_TUSB_DEBUG 2
//#define CFG_TUSB_OS TUSB_OS_NONE // be passed from IDE/command line for easy project switching
//#define CFG_TUSB_OS OPT_OS_NONE // be passed from IDE/command line for easy project switching
//#define CFG_TUSB_OS_TASK_PRIO 0 // be passed from IDE/command line for easy project switching
//--------------------------------------------------------------------+

4
examples/obsolete/host/src/app_os_prio.h
View File

@ -53,9 +53,9 @@
#include "tusb.h"
#if CFG_TUSB_OS == TUSB_OS_NONE
#if CFG_TUSB_OS == OPT_OS_NONE
#define LOWER_PRIO(x) 0 // does not matter
#elif CFG_TUSB_OS == TUSB_OS_FREERTOS
#elif CFG_TUSB_OS == OPT_OS_FREERTOS
#define LOWER_PRIO(x) ((x)-1) // freeRTOS lower number --> lower priority
#elif CFG_TUSB_OS == TUSB_OS_CMSIS_RTX
#define LOWER_PRIO(x) ((x)-1) // CMSIS-RTOS lower number --> lower priority

10
examples/obsolete/host/src/main.c
View File

@ -64,7 +64,7 @@ void print_greeting(void);
// IMPLEMENTATION
//--------------------------------------------------------------------+
#if CFG_TUSB_OS == TUSB_OS_NONE
#if CFG_TUSB_OS == OPT_OS_NONE
// like a real RTOS, this function is a main loop invoking each task in application and never return
void os_none_start_scheduler(void)
{
@ -101,9 +101,9 @@ int main(void)
cdc_serial_host_app_init();
//------------- start OS scheduler (never return) -------------//
#if CFG_TUSB_OS == TUSB_OS_FREERTOS
#if CFG_TUSB_OS == OPT_OS_FREERTOS
vTaskStartScheduler();
#elif CFG_TUSB_OS == TUSB_OS_NONE
#elif CFG_TUSB_OS == OPT_OS_NONE
os_none_start_scheduler();
#elif CFG_TUSB_OS == TUSB_OS_CMSIS_RTX
osKernelStart();
@ -121,8 +121,8 @@ void print_greeting(void)
{
char const * const rtos_name[] =
{
[TUSB_OS_NONE] = "None",
[TUSB_OS_FREERTOS] = "FreeRTOS",
[OPT_OS_NONE] = "None",
[OPT_OS_FREERTOS] = "FreeRTOS",
};
puts("\n\

2
examples/obsolete/host/src/tusb_config.h
View File

@ -68,7 +68,7 @@
//--------------------------------------------------------------------+
#define CFG_TUSB_DEBUG 2
//#define CFG_TUSB_OS TUSB_OS_NONE // defined using eclipse build
//#define CFG_TUSB_OS OPT_OS_NONE // defined using eclipse build
//#define CFG_TUSB_OS_TASK_PRIO 0 // defined using eclipse build
//--------------------------------------------------------------------+

4
hw/bsp/ea4357/board_ea4357.c
View File

@ -68,7 +68,7 @@ enum {
/*------------------------------------------------------------------*/
/* TUSB HAL MILLISECOND
*------------------------------------------------------------------*/
#if CFG_TUSB_OS == TUSB_OS_NONE
#if CFG_TUSB_OS == OPT_OS_NONE
volatile uint32_t system_ticks = 0;
@ -91,7 +91,7 @@ void board_init(void)
{
CGU_Init();
#if CFG_TUSB_OS == TUSB_OS_NONE // TODO may move to main.c
#if CFG_TUSB_OS == OPT_OS_NONE // TODO may move to main.c
SysTick_Config(CGU_GetPCLKFrequency(CGU_PERIPHERAL_M4CORE) / BOARD_TICKS_HZ); // 1 msec tick timer
#endif

2
hw/bsp/keil/board_mcb4300.c
View File

@ -74,7 +74,7 @@ void board_init(void)
{
CGU_Init();
#if CFG_TUSB_OS == TUSB_OS_NONE // TODO may move to main.c
#if CFG_TUSB_OS == OPT_OS_NONE // TODO may move to main.c
SysTick_Config(CGU_GetPCLKFrequency(CGU_PERIPHERAL_M4CORE) / BOARD_TICKS_HZ); // 1 msec tick timer
#endif

2
hw/bsp/lpcxpresso/board_lpclink2.c
View File

@ -56,7 +56,7 @@ void board_init(void)
{
CGU_Init();
#if CFG_TUSB_OS == TUSB_OS_NONE // TODO may move to main.c
#if CFG_TUSB_OS == OPT_OS_NONE // TODO may move to main.c
SysTick_Config(CGU_GetPCLKFrequency(CGU_PERIPHERAL_M4CORE) / BOARD_TICKS_HZ); // 1 msec tick timer
#endif

2
hw/bsp/lpcxpresso/board_lpcxpresso11u14.c
View File

@ -67,7 +67,7 @@ void board_init(void)
{
SystemInit();
#if CFG_TUSB_OS == TUSB_OS_NONE // TODO may move to main.c
#if CFG_TUSB_OS == OPT_OS_NONE // TODO may move to main.c
SysTick_Config(SystemCoreClock / BOARD_TICKS_HZ); // 1 msec tick timer
#endif

2
hw/bsp/lpcxpresso11u68/board_lpcxpresso11u68.c
View File

@ -58,7 +58,7 @@ void board_init(void)
{
SystemInit();
#if CFG_TUSB_OS == TUSB_OS_NONE // TODO may move to main.c
#if CFG_TUSB_OS == OPT_OS_NONE // TODO may move to main.c
SysTick_Config(SystemCoreClock / BOARD_TICKS_HZ); // 1 msec tick timer
#endif

2
hw/bsp/lpcxpresso1347/board_lpcxpresso1347.c
View File

@ -68,7 +68,7 @@ void board_init(void)
{
SystemInit();
#if CFG_TUSB_OS == TUSB_OS_NONE // TODO may move to main.c
#if CFG_TUSB_OS == OPT_OS_NONE // TODO may move to main.c
SysTick_Config(SystemCoreClock / BOARD_TICKS_HZ); // 1 msec tick timer
#endif

2
hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c
View File

@ -67,7 +67,7 @@ void board_init(void)
{
SystemInit();
#if CFG_TUSB_OS == TUSB_OS_NONE // TODO may move to main.c
#if CFG_TUSB_OS == OPT_OS_NONE // TODO may move to main.c
SysTick_Config(SystemCoreClock / BOARD_TICKS_HZ); // 1 msec tick timer
#endif

2
hw/bsp/ngx/board_ngx4330.c
View File

@ -70,7 +70,7 @@ void board_init(void)
{
CGU_Init();
#if CFG_TUSB_OS == TUSB_OS_NONE // TODO may move to main.c
#if CFG_TUSB_OS == OPT_OS_NONE // TODO may move to main.c
SysTick_Config( CGU_GetPCLKFrequency(CGU_PERIPHERAL_M4CORE)/BOARD_TICKS_HZ ); /* 1 ms Timer */
#endif

2
tests/support/tusb_config.h
View File

@ -86,7 +86,7 @@
#define CFG_TUSB_DEBUG 3
#define CFG_TUSB_OS TUSB_OS_NONE
#define CFG_TUSB_OS OPT_OS_NONE
#define CFG_TUSB_ATTR_USBRAM
#ifdef __cplusplus

2
tinyusb/common/tusb_fifo.h
View File

@ -57,7 +57,7 @@
#include "osal/osal.h"
#if CFG_TUSB_OS == TUSB_OS_NONE
#if CFG_TUSB_OS == OPT_OS_NONE
// Since all fifo read/write is done in thread mode, there should be
// no conflict except for osal queue which will be address seperatedly.
// Therefore there may be no need for mutex with internal use of fifo

2
tinyusb/osal/osal.c
View File

@ -43,7 +43,7 @@
//--------------------------------------------------------------------+
// TICK API
//--------------------------------------------------------------------+
#if CFG_TUSB_OS == TUSB_OS_FREERTOS
#if CFG_TUSB_OS == OPT_OS_FREERTOS
uint32_t tusb_hal_millis(void)
{

11
tinyusb/osal/osal.h
View File

@ -46,13 +46,6 @@
/** \addtogroup group_osal
* @{ */
/** \defgroup group_supported_os Supported RTOS
* \brief \ref CFG_TUSB_OS must be defined to one of these
* @{ */
#define TUSB_OS_NONE 1 ///< No RTOS is used
#define TUSB_OS_FREERTOS 2 ///< FreeRTOS is used
/** @} */
#include "tusb_option.h"
#include "common/tusb_common.h"
@ -64,11 +57,11 @@ enum
};
#if CFG_TUSB_OS == TUSB_OS_NONE
#if CFG_TUSB_OS == OPT_OS_NONE
#include "osal_none.h"
#else
#if CFG_TUSB_OS == TUSB_OS_FREERTOS
#if CFG_TUSB_OS == OPT_OS_FREERTOS
#include "osal_freeRTOS.h"
#else
#error CFG_TUSB_OS is not defined or OS is not supported yet

2
tinyusb/tusb.c
View File

@ -56,7 +56,7 @@ tusb_error_t tusb_init(void)
return TUSB_ERROR_NONE;
}
#if CFG_TUSB_OS == TUSB_OS_NONE
#if CFG_TUSB_OS == OPT_OS_NONE
void tusb_task(void)
{
#if MODE_HOST_SUPPORTED

4
tinyusb/tusb.h
View File

@ -102,9 +102,9 @@
*/
tusb_error_t tusb_init(void);
#if CFG_TUSB_OS == TUSB_OS_NONE
#if CFG_TUSB_OS == OPT_OS_NONE
/** \brief Run all tinyusb's internal tasks (e.g host task, device task).
* \note This function is only required when using no RTOS (\ref CFG_TUSB_OS == TUSB_OS_NONE). All the stack functions
* \note This function is only required when using no RTOS (\ref CFG_TUSB_OS == OPT_OS_NONE). All the stack functions
* & callback are invoked within this function, so it should be called periodically within the mainloop
*
@code

18
tinyusb/tusb_option.h
View File

@ -36,8 +36,8 @@
*/
/**************************************************************************/
#ifndef _TUSB_TUSB_OPTION_H_
#define _TUSB_TUSB_OPTION_H_
#ifndef _TUSB_OPTION_H_
#define _TUSB_OPTION_H_
#define TUSB_VERSION_YEAR 00
#define TUSB_VERSION_MONTH 00
@ -58,6 +58,14 @@
#define MCU_LPC43XX 7 ///< NXP LPC43xx family
/** @} */
/** \defgroup group_supported_os Supported RTOS
* \brief \ref CFG_TUSB_OS must be defined to one of these
* @{ */
#define OPT_OS_NONE 1 ///< No RTOS is used
#define OPT_OS_FREERTOS 2 ///< FreeRTOS is used
/** @} */
// Allow to use command line to change the config name/location
#ifndef CFG_TUSB_CONFIG_FILE
#define CFG_TUSB_CONFIG_FILE "tusb_config.h"
@ -122,10 +130,10 @@
#endif
#ifndef CFG_TUSB_OS
#define CFG_TUSB_OS TUSB_OS_NONE
#define CFG_TUSB_OS OPT_OS_NONE
#endif
#if (CFG_TUSB_OS != TUSB_OS_NONE) && !defined (CFG_TUSB_OS_TASK_PRIO)
#if (CFG_TUSB_OS != OPT_OS_NONE) && !defined (CFG_TUSB_OS_TASK_PRIO)
#error CFG_TUSB_OS_TASK_PRIO need to be defined (hint: use the highest if possible)
#endif
@ -192,6 +200,6 @@
//------------- CLASS -------------//
#endif // MODE_HOST_SUPPORTED
#endif /* _TUSB_TUSB_OPTION_H_ */
#endif /* _TUSB_OPTION_H_ */
/** @} */

2
vendor/fatfs/diskio.c vendored
View File

@ -63,7 +63,7 @@ static DRESULT wait_for_io_complete(uint8_t usb_addr)
while ( tuh_msc_is_busy(usb_addr) )
{
// TODO should have timeout here
#if CFG_TUSB_OS != TUSB_OS_NONE
#if CFG_TUSB_OS != OPT_OS_NONE
osal_task_delay(10);
#endif
}