mirror/tinyusb
3
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2026-02-28 03:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename TUSB_OS_NONE, TUSB_OS_FREERTOS to OPT_OS_NONE, OPT_OS_FREERTOS

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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_ */
/** @} */