summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorhathach <[email protected]>2018-04-12 12:55:53 +0700
committerhathach <[email protected]>2018-04-12 12:55:53 +0700
commit18f97fef7e35937c017f2b2ad2300a920256f66b (patch)
treeaf34770b4d075588f91b0e335f949b82283ad11c /examples
parentdf367bac54ac8926c51f2d8f11e4ca9a0abf50a8 (diff)
rename TUSB_OS_NONE, TUSB_OS_FREERTOS to OPT_OS_NONE, OPT_OS_FREERTOS
Diffstat (limited to 'examples')
-rw-r--r--examples/device/device_virtual_com/src/main.c4
-rw-r--r--examples/device/device_virtual_com/src/tusb_config.h2
-rw-r--r--examples/device/nrf52840/src/main.c4
-rw-r--r--examples/device/nrf52840/src/tusb_config.h2
-rw-r--r--examples/obsolete/device/src/app_os_prio.h4
-rw-r--r--examples/obsolete/device/src/main.c10
-rw-r--r--examples/obsolete/device/src/tusb_config.h2
-rw-r--r--examples/obsolete/host/src/app_os_prio.h4
-rw-r--r--examples/obsolete/host/src/main.c10
-rw-r--r--examples/obsolete/host/src/tusb_config.h2
10 files changed, 22 insertions, 22 deletions
diff --git a/examples/device/device_virtual_com/src/main.c b/examples/device/device_virtual_com/src/main.c
index 8d4065194..68837e134 100644
--- a/examples/device/device_virtual_com/src/main.c
+++ b/examples/device/device_virtual_com/src/main.c
@@ -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\
diff --git a/examples/device/device_virtual_com/src/tusb_config.h b/examples/device/device_virtual_com/src/tusb_config.h
index 3a730f474..b7f7b348e 100644
--- a/examples/device/device_virtual_com/src/tusb_config.h
+++ b/examples/device/device_virtual_com/src/tusb_config.h
@@ -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
//--------------------------------------------------------------------+
diff --git a/examples/device/nrf52840/src/main.c b/examples/device/nrf52840/src/main.c
index bb26f3a4e..42dfaaaa5 100644
--- a/examples/device/nrf52840/src/main.c
+++ b/examples/device/nrf52840/src/main.c
@@ -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");
diff --git a/examples/device/nrf52840/src/tusb_config.h b/examples/device/nrf52840/src/tusb_config.h
index 11d0bbdf9..6182ed9e1 100644
--- a/examples/device/nrf52840/src/tusb_config.h
+++ b/examples/device/nrf52840/src/tusb_config.h
@@ -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
//--------------------------------------------------------------------+
diff --git a/examples/obsolete/device/src/app_os_prio.h b/examples/obsolete/device/src/app_os_prio.h
index e75b942ce..024e62346 100644
--- a/examples/obsolete/device/src/app_os_prio.h
+++ b/examples/obsolete/device/src/app_os_prio.h
@@ -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
diff --git a/examples/obsolete/device/src/main.c b/examples/obsolete/device/src/main.c
index 802883ce4..5d1a4bb5f 100644
--- a/examples/obsolete/device/src/main.c
+++ b/examples/obsolete/device/src/main.c
@@ -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\
diff --git a/examples/obsolete/device/src/tusb_config.h b/examples/obsolete/device/src/tusb_config.h
index 7544fa8b4..c9e81656f 100644
--- a/examples/obsolete/device/src/tusb_config.h
+++ b/examples/obsolete/device/src/tusb_config.h
@@ -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
//--------------------------------------------------------------------+
diff --git a/examples/obsolete/host/src/app_os_prio.h b/examples/obsolete/host/src/app_os_prio.h
index 5eacd4c1e..51d72ddfa 100644
--- a/examples/obsolete/host/src/app_os_prio.h
+++ b/examples/obsolete/host/src/app_os_prio.h
@@ -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
diff --git a/examples/obsolete/host/src/main.c b/examples/obsolete/host/src/main.c
index 6f108c441..90c64f849 100644
--- a/examples/obsolete/host/src/main.c
+++ b/examples/obsolete/host/src/main.c
@@ -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\
diff --git a/examples/obsolete/host/src/tusb_config.h b/examples/obsolete/host/src/tusb_config.h
index 8a103a0aa..9a13aa25a 100644
--- a/examples/obsolete/host/src/tusb_config.h
+++ b/examples/obsolete/host/src/tusb_config.h
@@ -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
//--------------------------------------------------------------------+