diff --git a/demos/device/device_cmsis_rtx/.cproject b/demos/device/device_cmsis_rtx/.cproject
index 1a3bafde0..c3b2ebd2b 100644
--- a/demos/device/device_cmsis_rtx/.cproject
+++ b/demos/device/device_cmsis_rtx/.cproject
@@ -72,10 +72,15 @@
-
-
+
+
+
@@ -165,8 +170,12 @@
-
-
+
+
@@ -556,9 +565,15 @@
-
-
+
+
+
+
@@ -584,10 +599,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<TargetConfig>
<Properties property_0="" property_2="LPC18x7_43x7_2x512_BootA.cfx" property_3="NXP" property_4="LPC4357" property_count="5" version="70002"/>
-<infoList vendor="NXP">
-<info chip="LPC4357" flash_driver="LPC18x7_43x7_2x512_BootA.cfx" match_id="0x0" name="LPC4357" stub="crt_emu_lpc18_43_nxp">
-<chip>
-<name>LPC4357</name>
+<infoList vendor="NXP"><info chip="LPC4357" flash_driver="LPC18x7_43x7_2x512_BootA.cfx" match_id="0x0" name="LPC4357" stub="crt_emu_lpc18_43_nxp"><chip><name>LPC4357</name>
<family>LPC43xx</family>
<vendor>NXP (formerly Philips)</vendor>
<reset board="None" core="Real" sys="Real"/>
@@ -662,8 +674,7 @@
<peripheralInstance derived_from="SPI" determined="infoFile" id="SPI" location="0x40100000"/>
<peripheralInstance derived_from="SGPIO" determined="infoFile" id="SGPIO" location="0x40101000"/>
</chip>
-<processor>
-<name gcc_name="cortex-m4">Cortex-M4</name>
+<processor><name gcc_name="cortex-m4">Cortex-M4</name>
<family>Cortex-M</family>
</processor>
<link href="nxp_lpc43xx_peripheral.xme" show="embed" type="simple"/>
diff --git a/demos/device/device_freertos/.cproject b/demos/device/device_freertos/.cproject
index 368f3f740..80c56e764 100644
--- a/demos/device/device_freertos/.cproject
+++ b/demos/device/device_freertos/.cproject
@@ -1,23 +1,25 @@
-
+
+
+
-
+
+
+
-
-
@@ -93,24 +95,25 @@
+
-
+
+
+
-
-
@@ -170,6 +173,8 @@
+
+
@@ -186,24 +191,25 @@
+
-
+
+
+
-
-
@@ -285,24 +291,25 @@
+
-
+
+
+
-
-
@@ -379,24 +386,25 @@
+
-
+
+
+
-
-
@@ -476,24 +484,25 @@
+
-
+
+
+
-
-
@@ -569,6 +578,7 @@
+
diff --git a/demos/device/device_os_none/.cproject b/demos/device/device_os_none/.cproject
index 2fc57e138..8419b93f0 100644
--- a/demos/device/device_os_none/.cproject
+++ b/demos/device/device_os_none/.cproject
@@ -560,10 +560,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<TargetConfig>
<Properties property_0="" property_2="LPC18x7_43x7_2x512_BootA.cfx" property_3="NXP" property_4="LPC4357" property_count="5" version="70002"/>
-<infoList vendor="NXP">
-<info chip="LPC4357" flash_driver="LPC18x7_43x7_2x512_BootA.cfx" match_id="0x0" name="LPC4357" stub="crt_emu_lpc18_43_nxp">
-<chip>
-<name>LPC4357</name>
+<infoList vendor="NXP"><info chip="LPC4357" flash_driver="LPC18x7_43x7_2x512_BootA.cfx" match_id="0x0" name="LPC4357" stub="crt_emu_lpc18_43_nxp"><chip><name>LPC4357</name>
<family>LPC43xx</family>
<vendor>NXP (formerly Philips)</vendor>
<reset board="None" core="Real" sys="Real"/>
@@ -638,8 +635,7 @@
<peripheralInstance derived_from="SPI" determined="infoFile" id="SPI" location="0x40100000"/>
<peripheralInstance derived_from="SGPIO" determined="infoFile" id="SGPIO" location="0x40101000"/>
</chip>
-<processor>
-<name gcc_name="cortex-m4">Cortex-M4</name>
+<processor><name gcc_name="cortex-m4">Cortex-M4</name>
<family>Cortex-M</family>
</processor>
<link href="nxp_lpc43xx_peripheral.xme" show="embed" type="simple"/>
diff --git a/demos/device/device_os_none/device_os_none.uvopt b/demos/device/device_os_none/device_os_none.uvopt
index ff7a886e5..a69876262 100644
--- a/demos/device/device_os_none/device_os_none.uvopt
+++ b/demos/device/device_os_none/device_os_none.uvopt
@@ -73,7 +73,7 @@
10
- 1
+ 08
@@ -248,7 +248,7 @@
10
- 0
+ 18
@@ -956,7 +956,7 @@
030
- 74
+ 75760..\src\main.c
@@ -1004,7 +1004,7 @@
010
- 106
+ 1051120..\src\keyboard_device_app.c
@@ -1168,7 +1168,7 @@
2141
- 1
+ 0000
@@ -2012,7 +2012,7 @@
0540
- 157
+ 1591600..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s
diff --git a/demos/device/src/cdc_device_app.c b/demos/device/src/cdc_device_app.c
index 3f23d51cd..d305732d9 100644
--- a/demos/device/src/cdc_device_app.c
+++ b/demos/device/src/cdc_device_app.c
@@ -46,7 +46,7 @@
//--------------------------------------------------------------------+
// INCLUDE
//--------------------------------------------------------------------+
-enum { CDCD_APP_BUFFER_SIZE = 64 };
+enum { SERIAL_BUFFER_SIZE = 64 };
//--------------------------------------------------------------------+
// MACRO CONSTANT TYPEDEF
@@ -59,10 +59,10 @@ static osal_semaphore_handle_t sem_hdl;
//--------------------------------------------------------------------+
// INTERNAL OBJECT & FUNCTION DECLARATION
//--------------------------------------------------------------------+
-TUSB_CFG_ATTR_USBRAM static uint8_t serial_rx_buffer[CDCD_APP_BUFFER_SIZE];
-TUSB_CFG_ATTR_USBRAM static uint8_t serial_tx_buffer[CDCD_APP_BUFFER_SIZE];
+TUSB_CFG_ATTR_USBRAM static uint8_t serial_rx_buffer[SERIAL_BUFFER_SIZE];
+TUSB_CFG_ATTR_USBRAM static uint8_t serial_tx_buffer[SERIAL_BUFFER_SIZE];
-FIFO_DEF(fifo_serial, CDCD_APP_BUFFER_SIZE, uint8_t, true);
+FIFO_DEF(fifo_serial, SERIAL_BUFFER_SIZE, uint8_t, true);
//--------------------------------------------------------------------+
// tinyusb callbacks
@@ -71,7 +71,7 @@ void tusbd_cdc_mounted_cb(uint8_t coreid)
{
osal_semaphore_reset(sem_hdl);
- tusbd_cdc_receive(coreid, serial_rx_buffer, CDCD_APP_BUFFER_SIZE, true);
+ tusbd_cdc_receive(coreid, serial_rx_buffer, SERIAL_BUFFER_SIZE, true);
}
void tusbd_cdc_unmounted_cb(uint8_t coreid)
@@ -95,7 +95,7 @@ void tusbd_cdc_xfer_cb(uint8_t coreid, tusb_event_t event, cdc_pipeid_t pipe_id,
break;
case TUSB_EVENT_XFER_ERROR:
- tusbd_cdc_receive(0, serial_rx_buffer, CDCD_APP_BUFFER_SIZE, true); // ignore, queue transfer again
+ tusbd_cdc_receive(0, serial_rx_buffer, SERIAL_BUFFER_SIZE, true); // ignore, queue transfer again
break;
case TUSB_EVENT_XFER_STALLED:
@@ -149,7 +149,7 @@ OSAL_TASK_FUNCTION( cdcd_serial_app_task , p_task_para)
}
// getting more data from host
- tusbd_cdc_receive(0, serial_rx_buffer, CDCD_APP_BUFFER_SIZE, true);
+ tusbd_cdc_receive(0, serial_rx_buffer, SERIAL_BUFFER_SIZE, true);
}
OSAL_TASK_LOOP_END
diff --git a/demos/host/host_cmsis_rtx/.cproject b/demos/host/host_cmsis_rtx/.cproject
index 2b26918f4..ee2dd750c 100644
--- a/demos/host/host_cmsis_rtx/.cproject
+++ b/demos/host/host_cmsis_rtx/.cproject
@@ -414,10 +414,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<TargetConfig>
<Properties property_0="" property_2="LPC18x7_43x7_2x512_BootA.cfx" property_3="NXP" property_4="LPC4357" property_count="5" version="70002"/>
-<infoList vendor="NXP">
-<info chip="LPC4357" flash_driver="LPC18x7_43x7_2x512_BootA.cfx" match_id="0x0" name="LPC4357" stub="crt_emu_lpc18_43_nxp">
-<chip>
-<name>LPC4357</name>
+<infoList vendor="NXP"><info chip="LPC4357" flash_driver="LPC18x7_43x7_2x512_BootA.cfx" match_id="0x0" name="LPC4357" stub="crt_emu_lpc18_43_nxp"><chip><name>LPC4357</name>
<family>LPC43xx</family>
<vendor>NXP (formerly Philips)</vendor>
<reset board="None" core="Real" sys="Real"/>
@@ -492,8 +489,7 @@
<peripheralInstance derived_from="SPI" determined="infoFile" id="SPI" location="0x40100000"/>
<peripheralInstance derived_from="SGPIO" determined="infoFile" id="SGPIO" location="0x40101000"/>
</chip>
-<processor>
-<name gcc_name="cortex-m4">Cortex-M4</name>
+<processor><name gcc_name="cortex-m4">Cortex-M4</name>
<family>Cortex-M</family>
</processor>
<link href="nxp_lpc43xx_peripheral.xme" show="embed" type="simple"/>
diff --git a/demos/host/host_freertos/.cproject b/demos/host/host_freertos/.cproject
index bcbcf85da..2591b50db 100644
--- a/demos/host/host_freertos/.cproject
+++ b/demos/host/host_freertos/.cproject
@@ -1,23 +1,25 @@
-
+
+
+
-
+
+
+
-
-
@@ -97,24 +99,25 @@
+
-
+
+
+
-
-
@@ -194,6 +197,7 @@
+
@@ -361,42 +365,43 @@
-
+
+
+
-
-
+
-
+
+
+
-
-
@@ -476,6 +481,7 @@
+
@@ -485,10 +491,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<TargetConfig>
<Properties property_0="" property_2="LPC18x7_43x7_2x512_BootA.cfx" property_3="NXP" property_4="LPC4357" property_count="5" version="70002"/>
-<infoList vendor="NXP">
-<info chip="LPC4357" flash_driver="LPC18x7_43x7_2x512_BootA.cfx" match_id="0x0" name="LPC4357" stub="crt_emu_lpc18_43_nxp">
-<chip>
-<name>LPC4357</name>
+<infoList vendor="NXP"><info chip="LPC4357" flash_driver="LPC18x7_43x7_2x512_BootA.cfx" match_id="0x0" name="LPC4357" stub="crt_emu_lpc18_43_nxp"><chip><name>LPC4357</name>
<family>LPC43xx</family>
<vendor>NXP (formerly Philips)</vendor>
<reset board="None" core="Real" sys="Real"/>
@@ -563,8 +566,7 @@
<peripheralInstance derived_from="SPI" determined="infoFile" id="SPI" location="0x40100000"/>
<peripheralInstance derived_from="SGPIO" determined="infoFile" id="SGPIO" location="0x40101000"/>
</chip>
-<processor>
-<name gcc_name="cortex-m4">Cortex-M4</name>
+<processor><name gcc_name="cortex-m4">Cortex-M4</name>
<family>Cortex-M</family>
</processor>
<link href="nxp_lpc43xx_peripheral.xme" show="embed" type="simple"/>
diff --git a/demos/host/host_os_none/.cproject b/demos/host/host_os_none/.cproject
index 2363404e3..a3f8f00f4 100644
--- a/demos/host/host_os_none/.cproject
+++ b/demos/host/host_os_none/.cproject
@@ -379,10 +379,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<TargetConfig>
<Properties property_0="" property_2="LPC18x7_43x7_2x512_BootA.cfx" property_3="NXP" property_4="LPC4357" property_count="5" version="70002"/>
-<infoList vendor="NXP">
-<info chip="LPC4357" flash_driver="LPC18x7_43x7_2x512_BootA.cfx" match_id="0x0" name="LPC4357" stub="crt_emu_lpc18_43_nxp">
-<chip>
-<name>LPC4357</name>
+<infoList vendor="NXP"><info chip="LPC4357" flash_driver="LPC18x7_43x7_2x512_BootA.cfx" match_id="0x0" name="LPC4357" stub="crt_emu_lpc18_43_nxp"><chip><name>LPC4357</name>
<family>LPC43xx</family>
<vendor>NXP (formerly Philips)</vendor>
<reset board="None" core="Real" sys="Real"/>
@@ -457,8 +454,7 @@
<peripheralInstance derived_from="SPI" determined="infoFile" id="SPI" location="0x40100000"/>
<peripheralInstance derived_from="SGPIO" determined="infoFile" id="SGPIO" location="0x40101000"/>
</chip>
-<processor>
-<name gcc_name="cortex-m4">Cortex-M4</name>
+<processor><name gcc_name="cortex-m4">Cortex-M4</name>
<family>Cortex-M</family>
</processor>
<link href="nxp_lpc43xx_peripheral.xme" show="embed" type="simple"/>
diff --git a/demos/host/readme.md b/demos/host/readme.md
index d632248a3..1b6dd8302 100644
--- a/demos/host/readme.md
+++ b/demos/host/readme.md
@@ -86,7 +86,9 @@ CDC has several subclass, currently tinyusb only supports the popular *Abstract
### Serial
-A virtual serial of CDC-ACM is supported, the host demo will echo back any thing it received from the device. So if you use the tinyusb device stack with CDC enabled to test with, you should modify it a bit to constantly send somethings (otherwise 2 demos will wait for each other).
+A virtual serial of CDC-ACM is supported such as those built with tinyusb device stack. The host demo literally does 2 things
+- Echo back any thing it received from the device to the terminal
+- Receive data from terminal and send it to device.
Notes: FTDI is a vendor-specific class, which is not currently supported.
diff --git a/demos/host/src/cdc_serial_host_app.c b/demos/host/src/cdc_serial_host_app.c
index eb000f65d..81aeedfad 100644
--- a/demos/host/src/cdc_serial_host_app.c
+++ b/demos/host/src/cdc_serial_host_app.c
@@ -51,8 +51,9 @@ OSAL_SEM_DEF(serial_semaphore);
static osal_semaphore_handle_t sem_hdl;
-TUSB_CFG_ATTR_USBRAM static uint8_t serial_in_buffer[32];
-TUSB_CFG_ATTR_USBRAM static uint8_t serial_out_buffer[32];
+enum { SERIAL_BUFFER_SIZE = 64 };
+TUSB_CFG_ATTR_USBRAM static uint8_t serial_in_buffer[SERIAL_BUFFER_SIZE];
+TUSB_CFG_ATTR_USBRAM static uint8_t serial_out_buffer[SERIAL_BUFFER_SIZE];
static uint8_t received_bytes; // set by transfer complete callback
@@ -68,7 +69,7 @@ void tusbh_cdc_mounted_cb(uint8_t dev_addr)
received_bytes = 0;
osal_semaphore_reset(sem_hdl);
- tusbh_cdc_receive(dev_addr, serial_in_buffer, sizeof(serial_in_buffer), true); // schedule first transfer
+ tusbh_cdc_receive(dev_addr, serial_in_buffer, SERIAL_BUFFER_SIZE, true); // schedule first transfer
}
void tusbh_cdc_unmounted_cb(uint8_t dev_addr)
@@ -93,6 +94,7 @@ void tusbh_cdc_xfer_isr(uint8_t dev_addr, tusb_event_t event, cdc_pipeid_t pipe_
case TUSB_EVENT_XFER_ERROR:
received_bytes = 0; // ignore
+ tusbh_cdc_receive(dev_addr, serial_in_buffer, SERIAL_BUFFER_SIZE, true); // waiting for next data
break;
case TUSB_EVENT_XFER_STALLED:
@@ -133,12 +135,12 @@ OSAL_TASK_FUNCTION( cdc_serial_host_app_task, p_task_para)
{
int ch_tx = getchar();
if ( ch_tx > 0 )
- { // USB is much faster than serial, here we assume usb is always complete. There could be some characters missing
+ { // USB is much faster than serial, here we assume usb is always complete. There could be some characters missing though
serial_out_buffer[0] = (uint8_t) ch_tx;
if ( !tusbh_cdc_is_busy(dev_addr, CDC_PIPE_DATA_OUT) )
{
- tusbh_cdc_send(dev_addr, serial_out_buffer, 1, false); // no need for interrupt on serial out pipe
+ tusbh_cdc_send(dev_addr, serial_out_buffer, 1, false); // no need for callback on serial out pipe
}
}
break; // demo app only communicate with the first CDC-capable device
@@ -157,7 +159,7 @@ OSAL_TASK_FUNCTION( cdc_serial_host_app_task, p_task_para)
{
if ( tusbh_cdc_serial_is_mounted(dev_addr) )
{
- tusbh_cdc_receive(dev_addr, serial_in_buffer, sizeof(serial_in_buffer), true);
+ tusbh_cdc_receive(dev_addr, serial_in_buffer, SERIAL_BUFFER_SIZE, true);
break; // demo app only communicate with the first CDC-capable device
}
diff --git a/demos/host/src/keyboard_host_app.c b/demos/host/src/keyboard_host_app.c
index 3903e581c..600569737 100644
--- a/demos/host/src/keyboard_host_app.c
+++ b/demos/host/src/keyboard_host_app.c
@@ -117,11 +117,11 @@ OSAL_TASK_FUNCTION( keyboard_host_app_task, p_task_para)
{
(void) p_task_para;
+ OSAL_TASK_LOOP_BEGIN
+
hid_keyboard_report_t kbd_report;
tusb_error_t error;
- OSAL_TASK_LOOP_BEGIN
-
osal_queue_receive(queue_kbd_hdl, &kbd_report, OSAL_TIMEOUT_WAIT_FOREVER, &error);
(void) error; // suppress compiler warning
diff --git a/demos/host/src/mouse_host_app.c b/demos/host/src/mouse_host_app.c
index 5b809d70c..510a77625 100644
--- a/demos/host/src/mouse_host_app.c
+++ b/demos/host/src/mouse_host_app.c
@@ -118,13 +118,13 @@ OSAL_TASK_FUNCTION( mouse_host_app_task, p_task_para)
{
(void) p_task_para;
+ OSAL_TASK_LOOP_BEGIN
+
tusb_error_t error;
hid_mouse_report_t mouse_report;
- OSAL_TASK_LOOP_BEGIN
-
osal_queue_receive(queue_mouse_hdl, &mouse_report, OSAL_TIMEOUT_WAIT_FOREVER, &error);
- (void) error; // supporess compiler's warninig
+ (void) error; // suppress compiler's warnings
process_mouse_report(&mouse_report);
@@ -138,29 +138,29 @@ void cursor_movement(int8_t x, int8_t y, int8_t wheel)
{
//------------- X -------------//
if ( x < 0)
- { // move left
- printf(ANSI_CURSOR_BACKWARD(%d), (-x));
+ {
+ printf(ANSI_CURSOR_BACKWARD(%d), (-x)); // move left
}else if ( x > 0)
- { // move right
- printf(ANSI_CURSOR_FORWARD(%d), x);
+ {
+ printf(ANSI_CURSOR_FORWARD(%d), x); // move right
}else { }
//------------- Y -------------//
if ( y < 0)
- { // move up
- printf(ANSI_CURSOR_UP(%d), (-y));
+ {
+ printf(ANSI_CURSOR_UP(%d), (-y)); // move up
}else if ( y > 0)
- { // move down
- printf(ANSI_CURSOR_DOWN(%d), y);
+ {
+ printf(ANSI_CURSOR_DOWN(%d), y); // move down
}else { }
//------------- wheel -------------//
if (wheel < 0)
- { // scroll up
- printf(ANSI_SCROLL_UP(%d), (-wheel));
+ {
+ printf(ANSI_SCROLL_UP(%d), (-wheel)); // scroll up
}else if (wheel > 0)
- { // scroll down
- printf(ANSI_SCROLL_DOWN(%d), wheel);
+ {
+ printf(ANSI_SCROLL_DOWN(%d), wheel); // scroll down
}else { }
}
diff --git a/tinyusb/common/assertion.h b/tinyusb/common/assertion.h
index 3832c00c4..dd2fbdc67 100644
--- a/tinyusb/common/assertion.h
+++ b/tinyusb/common/assertion.h
@@ -68,9 +68,9 @@ extern "C"
// Assert Helper
//--------------------------------------------------------------------+
#ifndef _TEST_
- #define ASSERT_MESSAGE(format, ...) _PRINTF("Assert at %s: %s: %d: " format "\n", __BASE_FILE__, __func__ , __LINE__, __VA_ARGS__)
+ #define _ASSERT_MESSAGE(format, ...) _PRINTF("Assert at %s: %s: %d: " format "\n", __BASE_FILE__, __func__ , __LINE__, __VA_ARGS__)
#else // TODO remove this
- #define ASSERT_MESSAGE(format, ...) _PRINTF("%d:note: Assert " format "\n", __LINE__, __VA_ARGS__)
+ #define _ASSERT_MESSAGE(format, ...) _PRINTF("%d:note: Assert " format "\n", __LINE__, __VA_ARGS__)
#endif
#ifndef _TEST_ASSERT_
@@ -84,7 +84,7 @@ extern "C"
setup_statement;\
if (!(condition)) {\
hal_debugger_breakpoint();\
- ASSERT_MESSAGE(format, __VA_ARGS__);\
+ _ASSERT_MESSAGE(format, __VA_ARGS__);\
error_handler(error, handler_para);\
}\
}while(0)
@@ -108,6 +108,8 @@ extern "C"
#define ASSERT(...) ASSERT_TRUE(__VA_ARGS__)
#define ASSERT_TRUE(condition , error) ASSERT_DEFINE( , (condition), error, "%s", "evaluated to false")
#define ASSERT_FALSE(condition , error) ASSERT_DEFINE( ,!(condition), error, "%s", "evaluated to true")
+#define ASSERT_FAILED(error) ASSERT_DEFINE( , false, error, "%s", "FAILED")
+#define ASSERT_FAILED_MSG(error, msg) ASSERT_DEFINE( , false, error, "FAILED: %s", msg)
//--------------------------------------------------------------------+
// Pointer Assert
diff --git a/tinyusb/device/dcd_lpc43xx.c b/tinyusb/device/dcd_lpc43xx.c
index 60d8e2fc7..46fb62fc0 100644
--- a/tinyusb/device/dcd_lpc43xx.c
+++ b/tinyusb/device/dcd_lpc43xx.c
@@ -524,7 +524,7 @@ void xfer_complete_isr(uint8_t coreid, uint32_t reg_complete)
//------------- Free QTD and shift array list -------------//
p_qtd->used = 0; // free QTD
- memmove(p_qhd->list_qtd_idx, p_qhd->list_qtd_idx+1, DCD_QTD_PER_QHD_MAX-1);
+ memmove( (void*) p_qhd->list_qtd_idx, (void*) (p_qhd->list_qtd_idx+1), DCD_QTD_PER_QHD_MAX-1);
p_qhd->list_qtd_idx[DCD_QTD_PER_QHD_MAX-1]=0;
if (p_qtd->int_on_complete)
diff --git a/tinyusb/osal/osal_freeRTOS.h b/tinyusb/osal/osal_freeRTOS.h
index 934b9bbad..26e7743be 100644
--- a/tinyusb/osal/osal_freeRTOS.h
+++ b/tinyusb/osal/osal_freeRTOS.h
@@ -100,6 +100,7 @@ static inline void osal_task_delay(uint32_t msec)
// Semaphore API
//--------------------------------------------------------------------+
#define OSAL_SEM_DEF(name)
+#define OSAL_SEM_REF(name)
typedef xSemaphoreHandle osal_semaphore_handle_t;
// create FreeRTOS binary semaphore with zero as init value TODO: omit semaphore take from vSemaphoreCreateBinary API, should double checks this
@@ -129,6 +130,7 @@ static inline void osal_semaphore_reset(osal_semaphore_handle_t const sem_hdl)
// MUTEX API (priority inheritance)
//--------------------------------------------------------------------+
#define OSAL_MUTEX_DEF OSAL_SEM_DEF
+#define OSAL_MUTEX_REF OSAL_SEM_REF
typedef xSemaphoreHandle osal_mutex_handle_t;
#define osal_mutex_create(x) xSemaphoreCreateMutex()
diff --git a/vendor/freertos/FreeRTOSConfig.h b/vendor/freertos/FreeRTOSConfig.h
index 0e17e801a..c4188dc26 100644
--- a/vendor/freertos/FreeRTOSConfig.h
+++ b/vendor/freertos/FreeRTOSConfig.h
@@ -3,17 +3,115 @@
#include "hal/hal.h"
+#ifndef __IASMARM__ // IAR assblemer portarm.s need to include this file but cannot understand
+
+//#include "LPC43xx.h"
+//#include "core_cm4.h"
+//#include "lpc43xx_cgu.h"
+#include "hal/hal.h"
+
+#endif
+
+/*-----------------------------------------------------------
+ * See http://www.freertos.org/a00110.html.
+ *----------------------------------------------------------*/
+
#if __CORTEX_M == 4
- #include "FreeRTOSConfig_cm4f.h"
#elif __CORTEX_M == 3
- #include "FreeRTOSConfig_cm3.h"
#elif __CORTEX_M == 0
- #include "FreeRTOSConfig_cm0.h"
#else
#error "not yet supported MCU"
#endif
+#define configUSE_PREEMPTION 1
+#define configCPU_CLOCK_HZ ( SystemCoreClock )
+//#define configCPU_CLOCK_HZ ( CGU_GetPCLKFrequency(CGU_PERIPHERAL_M4CORE))
+#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
+#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 8 )
+#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 128 )
+#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 16*1024 ) )
+#define configMAX_TASK_NAME_LEN 32
+#define configUSE_16_BIT_TICKS 0
+#define configIDLE_SHOULD_YIELD 1
+#define configUSE_MUTEXES 1
+#define configUSE_RECURSIVE_MUTEXES 0
+#define configUSE_COUNTING_SEMAPHORES 0
+#define configQUEUE_REGISTRY_SIZE 10 // used to name queue/semaphore with debugger
+
+/* Hook function related definitions. */
+#define configUSE_IDLE_HOOK 1
+#define configUSE_TICK_HOOK 0
+#define configUSE_MALLOC_FAILED_HOOK 1
+#define configCHECK_FOR_STACK_OVERFLOW 2
+
+/* Run time and task stats gathering related definitions. */
+#define configGENERATE_RUN_TIME_STATS 0
+#define configUSE_TRACE_FACILITY 1 // legacy trace
+#define configUSE_STATS_FORMATTING_FUNCTIONS 0
+
+/* Co-routine definitions. */
+#define configUSE_CO_ROUTINES 0
+#define configMAX_CO_ROUTINE_PRIORITIES 2
+
+/* Software timer related definitions. */
+#define configUSE_TIMERS 0
+#define configTIMER_TASK_PRIORITY ( configMAX_PRIORITIES - 3 )
+#define configTIMER_QUEUE_LENGTH 10
+#define configTIMER_TASK_STACK_DEPTH configMINIMAL_STACK_SIZE
+
+/* Optional functions - most linkers will remove unused functions anyway. */
+#define INCLUDE_vTaskPrioritySet 0
+#define INCLUDE_uxTaskPriorityGet 0
+#define INCLUDE_vTaskDelete 0
+#define INCLUDE_vTaskSuspend 1 // required for queue, semaphore, mutex to be blocked indefinitely with portMAX_DELAY
+#define INCLUDE_xResumeFromISR 0
+#define INCLUDE_vTaskDelayUntil 1
+#define INCLUDE_vTaskDelay 1
+#define INCLUDE_xTaskGetSchedulerState 0
+#define INCLUDE_xTaskGetCurrentTaskHandle 0
+#define INCLUDE_uxTaskGetStackHighWaterMark 0
+#define INCLUDE_xTaskGetIdleTaskHandle 0
+#define INCLUDE_xTimerGetTimerDaemonTaskHandle 0
+#define INCLUDE_pcTaskGetTaskName 0
+#define INCLUDE_eTaskGetState 0
+#define INCLUDE_xEventGroupSetBitFromISR 0
+#define INCLUDE_xTimerPendFunctionCall 0
+
+/* Define to trap errors during development. */
+#define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); hal_debugger_breakpoint(); }
+
+/* FreeRTOS hooks to NVIC vectors */
+#define xPortPendSVHandler PendSV_Handler
+#define xPortSysTickHandler SysTick_Handler
+#define vPortSVCHandler SVC_Handler
+
+/* Interrupt nesting behaviour configuration. */
+/* Cortex-M specific definitions. */
+#ifdef __NVIC_PRIO_BITS
+ #define configPRIO_BITS __NVIC_PRIO_BITS
+#else
+ #define configPRIO_BITS 5 /* 32 priority levels */
+#endif
+
+/* The lowest interrupt priority that can be used in a call to a "set priority"
+function. */
+#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY 0x1f
+
+/* The highest interrupt priority that can be used by any interrupt service
+routine that makes calls to interrupt safe FreeRTOS API functions. DO NOT CALL
+INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A HIGHER
+PRIORITY THAN THIS! (higher priorities are lower numeric values. */
+#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY 5
+
+/* Interrupt priorities used by the kernel port layer itself. These are generic
+to all Cortex-M ports, and do not rely on any particular library functions. */
+#define configKERNEL_INTERRUPT_PRIORITY ( configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
+
+/* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!!
+See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
+#define configMAX_SYSCALL_INTERRUPT_PRIORITY ( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
+
#endif /* __FREERTOS_CONFIG__H */
diff --git a/vendor/freertos/FreeRTOSConfig_cm0.h b/vendor/freertos/FreeRTOSConfig_cm0.h
deleted file mode 100644
index 6df1c1756..000000000
--- a/vendor/freertos/FreeRTOSConfig_cm0.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- FreeRTOS V7.1.0 - Copyright (C) 2011 Real Time Engineers Ltd.
-
-
- ***************************************************************************
- * *
- * FreeRTOS tutorial books are available in pdf and paperback. *
- * Complete, revised, and edited pdf reference manuals are also *
- * available. *
- * *
- * Purchasing FreeRTOS documentation will not only help you, by *
- * ensuring you get running as quickly as possible and with an *
- * in-depth knowledge of how to use FreeRTOS, it will also help *
- * the FreeRTOS project to continue with its mission of providing *
- * professional grade, cross platform, de facto standard solutions *
- * for microcontrollers - completely free of charge! *
- * *
- * >>> See http://www.FreeRTOS.org/Documentation for details. <<< *
- * *
- * Thank you for using FreeRTOS, and thank you for your support! *
- * *
- ***************************************************************************
-
-
- This file is part of the FreeRTOS distribution.
-
- FreeRTOS is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License (version 2) as published by the
- Free Software Foundation AND MODIFIED BY the FreeRTOS exception.
- >>>NOTE<<< The modification to the GPL is included to allow you to
- distribute a combined work that includes FreeRTOS without being obliged to
- provide the source code for proprietary components outside of the FreeRTOS
- kernel. FreeRTOS is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details. You should have received a copy of the GNU General Public
- License and the FreeRTOS license exception along with FreeRTOS; if not it
- can be viewed here: http://www.freertos.org/a00114.html and also obtained
- by writing to Richard Barry, contact details for whom are available on the
- FreeRTOS WEB site.
-
- 1 tab == 4 spaces!
-
- http://www.FreeRTOS.org - Documentation, latest information, license and
- contact details.
-
- http://www.SafeRTOS.com - A version that is certified for use in safety
- critical systems.
-
- http://www.OpenRTOS.com - Commercial support, development, porting,
- licensing and training services.
-*/
-
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-#ifndef __IASMARM__
-/* For SystemCoreClock */
-#include "board.h"
-#endif
-
-/*-----------------------------------------------------------
- * Application specific definitions.
- *
- * These definitions should be adjusted for your particular hardware and
- * application requirements.
- *
- * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
- *
- * See http://www.freertos.org/a00110.html.
- *----------------------------------------------------------*/
-
-#define configUSE_PREEMPTION 1
-#define configUSE_IDLE_HOOK 1
-#define configUSE_TICK_HOOK 0
-#define configCPU_CLOCK_HZ ( SystemCoreClock )
-#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
-#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 8 )
-#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 128 )
-#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 0 ) )
-#define configMAX_TASK_NAME_LEN ( 10 )
-#define configUSE_TRACE_FACILITY 1
-#define configUSE_16_BIT_TICKS 0
-#define configIDLE_SHOULD_YIELD 1
-#define configUSE_MUTEXES 1
-#define configQUEUE_REGISTRY_SIZE 8
-#define configCHECK_FOR_STACK_OVERFLOW 2
-#define configUSE_RECURSIVE_MUTEXES 1
-#define configUSE_MALLOC_FAILED_HOOK 1
-#define configUSE_APPLICATION_TASK_TAG 0
-#define configUSE_COUNTING_SEMAPHORES 1
-#define configGENERATE_RUN_TIME_STATS 0
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES 0
-#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
-
-/* Software timer definitions. This example uses I2C to write to the LEDs. As
-this takes a finite time, and because a timer callback writes to an LED, the
-priority of the timer task is kept to a minimum to ensure it does not disrupt
-test tasks that check their own execution times. */
-#define configUSE_TIMERS 0
-#define configTIMER_TASK_PRIORITY ( 0 )
-#define configTIMER_QUEUE_LENGTH 5
-#define configTIMER_TASK_STACK_DEPTH ( configMINIMAL_STACK_SIZE * 2 )
-
-/* Set the following definitions to 1 to include the API function, or zero
-to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet 1
-#define INCLUDE_uxTaskPriorityGet 1
-#define INCLUDE_vTaskDelete 1
-#define INCLUDE_vTaskCleanUpResources 1
-#define INCLUDE_vTaskSuspend 1
-#define INCLUDE_vTaskDelayUntil 1
-#define INCLUDE_vTaskDelay 1
-#define INCLUDE_xTaskGetCurrentTaskHandle 1
-
-/* Cortex-M specific definitions. */
-#ifdef __NVIC_PRIO_BITS
- /* __BVIC_PRIO_BITS will be specified when CMSIS is being used. */
- #define configPRIO_BITS __NVIC_PRIO_BITS
-#else
- #define configPRIO_BITS 5 /* 32 priority levels */
-#endif
-
-/* The lowest interrupt priority that can be used in a call to a "set priority"
-function. */
-#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY 0x1f
-
-/* The highest interrupt priority that can be used by any interrupt service
-routine that makes calls to interrupt safe FreeRTOS API functions. DO NOT CALL
-INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A HIGHER
-PRIORITY THAN THIS! (higher priorities are lower numeric values. */
-#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY 5
-
-/* Interrupt priorities used by the kernel port layer itself. These are generic
-to all Cortex-M ports, and do not rely on any particular library functions. */
-#define configKERNEL_INTERRUPT_PRIORITY ( configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY ( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
-
-/* Normal assert() semantics without relying on the provision of an assert.h
-header file. */
-#define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); hal_debugger_breakpoint(); }
-
-#define configUSE_CUSTOM_TICK 1
-
-#define vPortSVCHandler SVC_Handler
-#define xPortPendSVHandler PendSV_Handler
-#define xPortSysTickHandler RIT_IRQHandler
-
-#endif /* FREERTOS_CONFIG_H */
-
diff --git a/vendor/freertos/FreeRTOSConfig_cm3.h b/vendor/freertos/FreeRTOSConfig_cm3.h
deleted file mode 100644
index 4a79fd0ae..000000000
--- a/vendor/freertos/FreeRTOSConfig_cm3.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd.
-
-
- ***************************************************************************
- * *
- * FreeRTOS tutorial books are available in pdf and paperback. *
- * Complete, revised, and edited pdf reference manuals are also *
- * available. *
- * *
- * Purchasing FreeRTOS documentation will not only help you, by *
- * ensuring you get running as quickly as possible and with an *
- * in-depth knowledge of how to use FreeRTOS, it will also help *
- * the FreeRTOS project to continue with its mission of providing *
- * professional grade, cross platform, de facto standard solutions *
- * for microcontrollers - completely free of charge! *
- * *
- * >>> See http://www.FreeRTOS.org/Documentation for details. <<< *
- * *
- * Thank you for using FreeRTOS, and thank you for your support! *
- * *
- ***************************************************************************
-
-
- This file is part of the FreeRTOS distribution.
-
- FreeRTOS is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License (version 2) as published by the
- Free Software Foundation AND MODIFIED BY the FreeRTOS exception.
- >>>NOTE<<< The modification to the GPL is included to allow you to
- distribute a combined work that includes FreeRTOS without being obliged to
- provide the source code for proprietary components outside of the FreeRTOS
- kernel. FreeRTOS is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details. You should have received a copy of the GNU General Public
- License and the FreeRTOS license exception along with FreeRTOS; if not it
- can be viewed here: http://www.freertos.org/a00114.html and also obtained
- by writing to Richard Barry, contact details for whom are available on the
- FreeRTOS WEB site.
-
- 1 tab == 4 spaces!
-
- http://www.FreeRTOS.org - Documentation, latest information, license and
- contact details.
-
- http://www.SafeRTOS.com - A version that is certified for use in safety
- critical systems.
-
- http://www.OpenRTOS.com - Commercial support, development, porting,
- licensing and training services.
-*/
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-#ifndef __IASMARM__ // IAR assblemer portarm.s need to include this file but cannot understand
-
-#include
-extern uint32_t SystemCoreClock;
-
-#endif
-
-/*-----------------------------------------------------------
- * Application specific definitions.
- *
- * These definitions should be adjusted for your particular hardware and
- * application requirements.
- *
- * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
- * http://www.freertos.org/a00110.html
- *----------------------------------------------------------*/
-
-#define configUSE_PREEMPTION 1
-#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 7 )
-#define configCPU_CLOCK_HZ ( SystemCoreClock )
-#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
-#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 90 )
-#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 16 * 1024 ) )
-#define configMAX_TASK_NAME_LEN ( 32 )
-#define configIDLE_SHOULD_YIELD 0
-#define configQUEUE_REGISTRY_SIZE 10
-#define configUSE_TRACE_FACILITY 1
-#define configUSE_16_BIT_TICKS 0
-#define configUSE_MUTEXES 1
-#define configUSE_CO_ROUTINES 0
-#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
-#define configUSE_COUNTING_SEMAPHORES 1
-#define configUSE_ALTERNATIVE_API 0
-#define configUSE_RECURSIVE_MUTEXES 1
-
-/* Hook function related definitions. */
-#define configUSE_TICK_HOOK 0
-#define configUSE_IDLE_HOOK 0
-#define configUSE_MALLOC_FAILED_HOOK 1
-#define configCHECK_FOR_STACK_OVERFLOW 2
-
-
-/* Software timer related definitions. */
-#define configUSE_TIMERS 0
-#define configTIMER_TASK_PRIORITY ( configMAX_PRIORITIES - 3 )
-#define configTIMER_QUEUE_LENGTH 10
-#define configTIMER_TASK_STACK_DEPTH configMINIMAL_STACK_SIZE
-
-/* Run time stats gathering definitions. */
-//void vMainConfigureTimerForRunTimeStats( void );
-//uint32_t ulMainGetRunTimeCounterValue( void );
-//#define configGENERATE_RUN_TIME_STATS 1
-//#define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() vMainConfigureTimerForRunTimeStats()
-//#define portGET_RUN_TIME_COUNTER_VALUE() ulMainGetRunTimeCounterValue()
-
-
-/* Set the following definitions to 1 to include the API function, or zero
-to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet 1
-#define INCLUDE_uxTaskPriorityGet 1
-#define INCLUDE_vTaskDelete 1
-#define INCLUDE_vTaskCleanUpResources 0
-#define INCLUDE_vTaskSuspend 1
-#define INCLUDE_vTaskDelayUntil 1
-#define INCLUDE_vTaskDelay 1
-#define INCLUDE_uxTaskGetStackHighWaterMark 1
-#define INCLUDE_xTimerGetTimerTaskHandle 0
-#define INCLUDE_xTaskGetIdleTaskHandle 0
-#define INCLUDE_xQueueGetMutexHolder 1
-
-#ifdef DEBUG
- #define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); for( ;; ); }
-#endif
-
-
-/* Use the system definition, if there is one */
-#ifdef __NVIC_PRIO_BITS
- #define configPRIO_BITS __NVIC_PRIO_BITS
-#else
- #define configPRIO_BITS 5 /* 32 priority levels */
-#endif
-
-/* The maximum priority an interrupt that uses an interrupt safe FreeRTOS API
-function can have. Note that lower priority have numerically higher values. */
-#define configMAX_LIBRARY_INTERRUPT_PRIORITY ( 5 )
-
-/* The minimum possible interrupt priority. */
-#define configMIN_LIBRARY_INTERRUPT_PRIORITY ( 31 )
-
-/* The lowest priority. */
-#define configKERNEL_INTERRUPT_PRIORITY ( configMIN_LIBRARY_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
-
-/* Priority 5, or 248 as only the top five bits are implemented. */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY ( configMAX_LIBRARY_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
-
-/* Definitions that map the FreeRTOS port interrupt handlers to their CMSIS
-standard names. */
-#define xPortPendSVHandler PendSV_Handler
-#define xPortSysTickHandler SysTick_Handler
-#define vPortSVCHandler SVC_Handler
-
-#endif /* FREERTOS_CONFIG_H */
diff --git a/vendor/freertos/FreeRTOSConfig_cm4f.h b/vendor/freertos/FreeRTOSConfig_cm4f.h
deleted file mode 100644
index 69ad2342f..000000000
--- a/vendor/freertos/FreeRTOSConfig_cm4f.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- FreeRTOS V7.1.0 - Copyright (C) 2011 Real Time Engineers Ltd.
-
-
- ***************************************************************************
- * *
- * FreeRTOS tutorial books are available in pdf and paperback. *
- * Complete, revised, and edited pdf reference manuals are also *
- * available. *
- * *
- * Purchasing FreeRTOS documentation will not only help you, by *
- * ensuring you get running as quickly as possible and with an *
- * in-depth knowledge of how to use FreeRTOS, it will also help *
- * the FreeRTOS project to continue with its mission of providing *
- * professional grade, cross platform, de facto standard solutions *
- * for microcontrollers - completely free of charge! *
- * *
- * >>> See http://www.FreeRTOS.org/Documentation for details. <<< *
- * *
- * Thank you for using FreeRTOS, and thank you for your support! *
- * *
- ***************************************************************************
-
-
- This file is part of the FreeRTOS distribution.
-
- FreeRTOS is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License (version 2) as published by the
- Free Software Foundation AND MODIFIED BY the FreeRTOS exception.
- >>>NOTE<<< The modification to the GPL is included to allow you to
- distribute a combined work that includes FreeRTOS without being obliged to
- provide the source code for proprietary components outside of the FreeRTOS
- kernel. FreeRTOS is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details. You should have received a copy of the GNU General Public
- License and the FreeRTOS license exception along with FreeRTOS; if not it
- can be viewed here: http://www.freertos.org/a00114.html and also obtained
- by writing to Richard Barry, contact details for whom are available on the
- FreeRTOS WEB site.
-
- 1 tab == 4 spaces!
-
- http://www.FreeRTOS.org - Documentation, latest information, license and
- contact details.
-
- http://www.SafeRTOS.com - A version that is certified for use in safety
- critical systems.
-
- http://www.OpenRTOS.com - Commercial support, development, porting,
- licensing and training services.
-*/
-
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-#ifndef __IASMARM__ // IAR assblemer portarm.s need to include this file but cannot understand
-
-#include "LPC43xx.h"
-#include "core_cm4.h"
-#include "lpc43xx_cgu.h"
-#include "hal/hal.h"
-
-#endif
-
-/*-----------------------------------------------------------
- * Application specific definitions.
- *
- * These definitions should be adjusted for your particular hardware and
- * application requirements.
- *
- * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
- *
- * See http://www.freertos.org/a00110.html.
- *----------------------------------------------------------*/
-
-#define configUSE_PREEMPTION 1
-#define configUSE_IDLE_HOOK 1
-#define configUSE_TICK_HOOK 0
-//#define configCPU_CLOCK_HZ ( SystemCoreClock )
-#define configCPU_CLOCK_HZ ( CGU_GetPCLKFrequency(CGU_PERIPHERAL_M4CORE))
-#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
-#define configMAX_PRIORITIES ( ( unsigned portBASE_TYPE ) 8 )
-#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 128 )
-#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 16*1024 ) )
-#define configMAX_TASK_NAME_LEN ( 32 )
-#define configUSE_TRACE_FACILITY 1
-#define configUSE_16_BIT_TICKS 0
-#define configIDLE_SHOULD_YIELD 1
-#define configUSE_MUTEXES 1
-#define configQUEUE_REGISTRY_SIZE 8
-#define configCHECK_FOR_STACK_OVERFLOW 2
-#define configUSE_RECURSIVE_MUTEXES 1
-#define configUSE_MALLOC_FAILED_HOOK 1
-#define configUSE_APPLICATION_TASK_TAG 0
-#define configUSE_COUNTING_SEMAPHORES 1
-#define configGENERATE_RUN_TIME_STATS 0
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES 0
-#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
-
-/* Software timer definitions. This example uses I2C to write to the LEDs. As
-this takes a finite time, and because a timer callback writes to an LED, the
-priority of the timer task is kept to a minimum to ensure it does not disrupt
-test tasks that check their own execution times. */
-#define configUSE_TIMERS 0
-#define configTIMER_TASK_PRIORITY ( 0 )
-#define configTIMER_QUEUE_LENGTH 5
-#define configTIMER_TASK_STACK_DEPTH ( configMINIMAL_STACK_SIZE * 2 )
-
-/* Set the following definitions to 1 to include the API function, or zero
-to exclude the API function. */
-#define INCLUDE_vTaskPrioritySet 1
-#define INCLUDE_uxTaskPriorityGet 1
-#define INCLUDE_vTaskDelete 1
-#define INCLUDE_vTaskCleanUpResources 1
-#define INCLUDE_vTaskSuspend 1
-#define INCLUDE_vTaskDelayUntil 1
-#define INCLUDE_vTaskDelay 1
-#define INCLUDE_xTaskGetCurrentTaskHandle 1
-
-/* Cortex-M specific definitions. */
-#ifdef __NVIC_PRIO_BITS
- #define configPRIO_BITS __NVIC_PRIO_BITS
-#else
- #define configPRIO_BITS 5 /* 32 priority levels */
-#endif
-
-/* The lowest interrupt priority that can be used in a call to a "set priority"
-function. */
-#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY 0x1f
-
-/* The highest interrupt priority that can be used by any interrupt service
-routine that makes calls to interrupt safe FreeRTOS API functions. DO NOT CALL
-INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A HIGHER
-PRIORITY THAN THIS! (higher priorities are lower numeric values. */
-#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY 5
-
-/* Interrupt priorities used by the kernel port layer itself. These are generic
-to all Cortex-M ports, and do not rely on any particular library functions. */
-#define configKERNEL_INTERRUPT_PRIORITY ( configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
-/* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!!
-See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY ( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
-
-/* Normal assert() semantics without relying on the provision of an assert.h
-header file. */
-#define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); hal_debugger_breakpoint(); }
-
-/* FreeRTOS hooks to NVIC vectors */
-#define xPortPendSVHandler PendSV_Handler
-#define xPortSysTickHandler SysTick_Handler
-#define vPortSVCHandler SVC_Handler
-
-#endif /* FREERTOS_CONFIG_H */
-
diff --git a/vendor/freertos/README.txt b/vendor/freertos/README.txt
deleted file mode 100644
index 95adda92f..000000000
--- a/vendor/freertos/README.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-
-This includes un-modified version 7.3.0 of the core FreeRTOS files, with the
-demos removed from the source tree to save space.
-
-The original files can be downloaded at:
-http://www.freertos.org
-
-Information on FreeRTOS licensing is located in the freertos/license.txt file
-or go to the website.
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-The following files have been modified to add support for a custom tick. This is
-needed for the dual-core M0 FreeRTOS tick function (no sysTick on the LPC4350 M0
-core).
-software\freertos\freertos\Source\portable\GCC\ARM_CM0\port.c
-software\freertos\freertos\Source\portable\IAR\ARM_CM0\port.c
-software\freertos\freertos\Source\portable\RVDS\ARM_CM0\port_m0.c
-software\freertos\freertos\Source\portable\RVDS\ARM_CM0\portmacro.h
\ No newline at end of file
diff --git a/vendor/freertos/freertos/Source/include/portable.h b/vendor/freertos/freertos/Source/include/portable.h
index 0c9a52530..235cab0da 100644
--- a/vendor/freertos/freertos/Source/include/portable.h
+++ b/vendor/freertos/freertos/Source/include/portable.h
@@ -78,20 +78,26 @@
#define PORTMACRO_PATH "../portable/RVDS/ARM_CM4F/portmacro.h"
#elif __CORTEX_M == 3
#define PORTMACRO_PATH "../portable/RVDS/ARM_CM3/portmacro.h"
+ #elif __CORTEX_M == 0
+ #define PORTMACRO_PATH "../portable/RVDS/ARM_CM0/portmacro.h"
#endif
#elif defined __GNUC__
- #if __CORTEX_M == 4 // TODO M0 M4
+ #if __CORTEX_M == 4
#define PORTMACRO_PATH "../portable/GCC/ARM_CM4F/portmacro.h"
#elif __CORTEX_M == 3
#define PORTMACRO_PATH "../portable/GCC/ARM_CM3/portmacro.h"
+ #elif __CORTEX_M == 0
+ #define PORTMACRO_PATH "../portable/GCC/ARM_CM0/portmacro.h"
#endif
#elif defined __ICCARM__
- #if __CORTEX_M == 4 // TODO M0 M4
+ #if __CORTEX_M == 4
#define PORTMACRO_PATH "../portable/IAR/ARM_CM4F/portmacro.h"
#elif __CORTEX_M == 3
#define PORTMACRO_PATH "../portable/IAR/ARM_CM3/portmacro.h"
+ #elif __CORTEX_M == 0
+ #define PORTMACRO_PATH "../portable/IAR/ARM_CM0/portmacro.h"
#endif
#endif
diff --git a/vendor/freertos/freertos_hook.c b/vendor/freertos/freertos_hook.c
new file mode 100644
index 000000000..0800ca0df
--- /dev/null
+++ b/vendor/freertos/freertos_hook.c
@@ -0,0 +1,79 @@
+/**************************************************************************/
+/*!
+ @file freertos_hook.c
+ @author hathach (tinyusb.org)
+
+ @section LICENSE
+
+ Software License Agreement (BSD License)
+
+ Copyright (c) 2014, hathach (tinyusb.org)
+ 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. Neither the name of the copyright holders nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''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 COPYRIGHT HOLDER 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 tinyusb stack.
+*/
+/**************************************************************************/
+
+//--------------------------------------------------------------------+
+// INCLUDE
+//--------------------------------------------------------------------+
+#include "FreeRTOS.h"
+#include "task.h"
+#include "common/common.h"
+
+//#include "board.h"
+//--------------------------------------------------------------------+
+// MACRO CONSTANT TYPEDEF
+//--------------------------------------------------------------------+
+
+//--------------------------------------------------------------------+
+// INTERNAL OBJECT & FUNCTION DECLARATION
+//--------------------------------------------------------------------+
+
+//--------------------------------------------------------------------+
+// IMPLEMENTATION
+//--------------------------------------------------------------------+
+void vApplicationMallocFailedHook(void)
+{
+ taskDISABLE_INTERRUPTS();
+ ASSERT_FAILED_MSG(VOID_RETURN, "freeRTOS run out of heap memory");
+}
+
+void vApplicationIdleHook(void)
+{
+ // no freeRTOS blocking API should be called here
+ __WFI(); // sleep until next interrupt
+}
+
+void vApplicationStackOverflowHook(xTaskHandle pxTask, signed char *pcTaskName)
+{
+ (void) pxTask;
+
+ taskDISABLE_INTERRUPTS();
+ ASSERT_FAILED_MSG(VOID_RETURN, pcTaskName);
+}
+
+// executes from within an ISR
+void vApplicationTickHook(void) {}
diff --git a/vendor/freertos/freertoslpc/FreeRTOSCommonHooks.c b/vendor/freertos/freertoslpc/FreeRTOSCommonHooks.c
deleted file mode 100644
index b8eed9aa6..000000000
--- a/vendor/freertos/freertoslpc/FreeRTOSCommonHooks.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * @brief Common FreeRTOS functions shared among platforms
- *
- * @note
- * Copyright(C) NXP Semiconductors, 2012
- * All rights reserved.
- *
- * @par
- * Software that is described herein is for illustrative purposes only
- * which provides customers with programming information regarding the
- * LPC products. This software is supplied "AS IS" without any warranties of
- * any kind, and NXP Semiconductors and its licensor disclaim any and
- * all warranties, express or implied, including all implied warranties of
- * merchantability, fitness for a particular purpose and non-infringement of
- * intellectual property rights. NXP Semiconductors assumes no responsibility
- * or liability for the use of the software, conveys no license or rights under any
- * patent, copyright, mask work right, or any other intellectual property rights in
- * or to any products. NXP Semiconductors reserves the right to make changes
- * in the software without notification. NXP Semiconductors also makes no
- * representation or warranty that such application will be suitable for the
- * specified use without further testing or modification.
- *
- * @par
- * Permission to use, copy, modify, and distribute this software and its
- * documentation is hereby granted, under NXP Semiconductors' and its
- * licensor's relevant copyrights in the software, without fee, provided that it
- * is used in conjunction with NXP Semiconductors microcontrollers. This
- * copyright, permission, and disclaimer notice must appear in all copies of
- * this code.
- */
-
-#include "FreeRTOS.h"
-#include "task.h"
-#include "FreeRTOSCommonHooks.h"
-
-#include "board.h"
-
-/*****************************************************************************
- * Private types/enumerations/variables
- ****************************************************************************/
-
-/*****************************************************************************
- * Public types/enumerations/variables
- ****************************************************************************/
-
-/*****************************************************************************
- * Private functions
- ****************************************************************************/
-
-/*****************************************************************************
- * Public functions
- ****************************************************************************/
-// FIXME ethernet
-#if 0
-void msDelay(uint32_t ms)
-{
- portTickType xDelayTime;
-
- xDelayTime = xTaskGetTickCount();
- vTaskDelayUntil( &xDelayTime, ms );
-}
-#endif
-
-/* Delay for the specified number of milliSeconds */
-void FreeRTOSDelay(uint32_t ms)
-{
- portTickType xDelayTime;
-
- xDelayTime = xTaskGetTickCount();
- vTaskDelayUntil(&xDelayTime, ms);
-}
-
-/* FreeRTOS malloc fail hook */
-void vApplicationMallocFailedHook(void)
-{
- PRINTF("DIE:ERROR:FreeRTOS: Malloc Failure!\r\n");
- taskDISABLE_INTERRUPTS();
- for (;; ) {}
-}
-
-/* FreeRTOS application idle hook */
-void vApplicationIdleHook(void)
-{
- /* Best to sleep here until next systick */
- __WFI();
-}
-
-/* FreeRTOS stack overflow hook */
-void vApplicationStackOverflowHook(xTaskHandle pxTask, signed char *pcTaskName)
-{
- (void) pxTask;
- (void) pcTaskName;
-
- PRINTF("DIE:ERROR:FreeRTOS: Stack overflow in task %s\r\n", pcTaskName);
- /* Run time stack overflow checking is performed if
- configCHECK_FOR_STACK_OVERFLOW is defined to 1 or 2. This hook
- function is called if a stack overflow is detected. */
- taskDISABLE_INTERRUPTS();
- for (;; ) {}
-}
-
-/* FreeRTOS application tick hook */
-void vApplicationTickHook(void)
-{}
diff --git a/vendor/freertos/freertoslpc/FreeRTOSCommonHooks.h b/vendor/freertos/freertoslpc/FreeRTOSCommonHooks.h
deleted file mode 100644
index 3136682cc..000000000
--- a/vendor/freertos/freertoslpc/FreeRTOSCommonHooks.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * @brief Common FreeRTOS functions shared among platforms
- *
- * @note
- * Copyright(C) NXP Semiconductors, 2012
- * All rights reserved.
- *
- * @par
- * Software that is described herein is for illustrative purposes only
- * which provides customers with programming information regarding the
- * LPC products. This software is supplied "AS IS" without any warranties of
- * any kind, and NXP Semiconductors and its licensor disclaim any and
- * all warranties, express or implied, including all implied warranties of
- * merchantability, fitness for a particular purpose and non-infringement of
- * intellectual property rights. NXP Semiconductors assumes no responsibility
- * or liability for the use of the software, conveys no license or rights under any
- * patent, copyright, mask work right, or any other intellectual property rights in
- * or to any products. NXP Semiconductors reserves the right to make changes
- * in the software without notification. NXP Semiconductors also makes no
- * representation or warranty that such application will be suitable for the
- * specified use without further testing or modification.
- *
- * @par
- * Permission to use, copy, modify, and distribute this software and its
- * documentation is hereby granted, under NXP Semiconductors' and its
- * licensor's relevant copyrights in the software, without fee, provided that it
- * is used in conjunction with NXP Semiconductors microcontrollers. This
- * copyright, permission, and disclaimer notice must appear in all copies of
- * this code.
- */
-
-#ifndef __FREERTOSCOMMONHOOKS_H_
-#define __FREERTOSCOMMONHOOKS_H_
-
-/** @ingroup FreeRTOS_COMMON
- * @{
- */
-
-/**
- * @brief Delay for the specified number of milliSeconds
- * @param ms : Delay in milliSeconds
- * @return Nothing
- * @note Delays the specified number of milliSeoconds using a task delay
- */
-void FreeRTOSDelay(uint32_t ms);
-
-/**
- * @brief FreeRTOS malloc fail hook
- * @return Nothing
- * @note This function is alled when a malloc fails to allocate data.
- */
-void vApplicationMallocFailedHook(void);
-
-/**
- * @brief FreeRTOS application idle hook
- * @return Nothing
- * @note Calls ARM Wait for Interrupt function to idle core
- */
-void vApplicationIdleHook(void);
-
-/**
- * @brief FreeRTOS stack overflow hook
- * @param pxTask : Task handle that overflowed stack
- * @param pcTaskName : Task name that overflowed stack
- * @return Nothing
- * @note This function is alled when a stack overflow occurs.
- */
-void vApplicationStackOverflowHook(xTaskHandle pxTask, signed char *pcTaskName);
-
-/**
- * @brief FreeRTOS application tick hook
- * @return Nothing
- * @note This just returns to the caller.
- */
-void vApplicationTickHook(void);
-
-/**
- * @}
- */
-
-#endif /* __FREERTOSCOMMONHOOKS_H_ */
diff --git a/vendor/freertos/freertoslpc/FreeRTOS_lpc43xx_m0_Tick.c_bck b/vendor/freertos/freertoslpc/FreeRTOS_lpc43xx_m0_Tick.c_bck
deleted file mode 100644
index 0bfeaeb42..000000000
--- a/vendor/freertos/freertoslpc/FreeRTOS_lpc43xx_m0_Tick.c_bck
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * @brief FreeRTOS LPC43xx M0 core tick function using RITimer
- *
- * @note
- * Copyright(C) NXP Semiconductors, 2012
- * All rights reserved.
- *
- * @par
- * Software that is described herein is for illustrative purposes only
- * which provides customers with programming information regarding the
- * LPC products. This software is supplied "AS IS" without any warranties of
- * any kind, and NXP Semiconductors and its licensor disclaim any and
- * all warranties, express or implied, including all implied warranties of
- * merchantability, fitness for a particular purpose and non-infringement of
- * intellectual property rights. NXP Semiconductors assumes no responsibility
- * or liability for the use of the software, conveys no license or rights under any
- * patent, copyright, mask work right, or any other intellectual property rights in
- * or to any products. NXP Semiconductors reserves the right to make changes
- * in the software without notification. NXP Semiconductors also makes no
- * representation or warranty that such application will be suitable for the
- * specified use without further testing or modification.
- *
- * @par
- * Permission to use, copy, modify, and distribute this software and its
- * documentation is hereby granted, under NXP Semiconductors' and its
- * licensor's relevant copyrights in the software, without fee, provided that it
- * is used in conjunction with NXP Semiconductors microcontrollers. This
- * copyright, permission, and disclaimer notice must appear in all copies of
- * this code.
- */
-
-#include "chip.h"
-#include "FreeRTOS.h"
-
-/** @defgroup FreeRTOS_43XX_M0_TICK LPC43xx M0 core tick function using RITimer
- * @ingroup RTOS_FreeRTOS
- * @note This driver adds support for the RITimer for the FreeRTOS tick on the LPC43xx.
- * The M0 core in LPC43XX series of controllers does not have internal systick timer,
- * so the RITIMER is used to generate the RTOS ticks.
- * @{
- */
-
- #if (defined(CHIP_LPC43XX) && defined(CORE_M0) && (configUSE_CUSTOM_TICK == 1))
-
- /*****************************************************************************
- * Private types/enumerations/variables
- ****************************************************************************/
-
-#define portNVIC_PENDSVSET 0x10000000
-#define portNVIC_INT_CTRL ((volatile unsigned long *) 0xe000ed04)
-#define portMIN_INTERRUPT_PRIORITY (255UL)
-#define portNVIC_SYSTICK_PRI portMIN_INTERRUPT_PRIORITY
-
-#define RITENCLR (1 << 1)
-#define RITINT (1 << 0)
-
-/* Timer reload value for next tick */
-static uint32_t reload_val;
-
-/*****************************************************************************
- * Public types/enumerations/variables
- ****************************************************************************/
-
-/* FreeRTOS tick update function */
-extern void vTaskIncrementTick(void);
-
-/*****************************************************************************
- * Private functions
- ****************************************************************************/
-
-/*****************************************************************************
- * Public functions
- ****************************************************************************/
-
-/**
- * @brief Tick interrupt handler routine
- * @return Nothing
- * @note This function handles the tick interrupts that are generated by RITIMER.
- */
-void xPortSysTickHandler(void)
-{
- unsigned long ulDummy;
-
- /* TODO: check if WWDT interrupt and redirect */
- Chip_RIT_ClearInt(LPC_RITIMER);
- Chip_RIT_SetCOMPVAL(LPC_RITIMER, Chip_RIT_GetCounter(LPC_RITIMER) + reload_val);/* Reload value */
-
-#if configUSE_PREEMPTION == 1
- /* If using preemption, also force a context switch. */
- *(portNVIC_INT_CTRL) = portNVIC_PENDSVSET;
-#endif
-
- ulDummy = portSET_INTERRUPT_MASK_FROM_ISR();
- {
- vTaskIncrementTick();
- }
- portCLEAR_INTERRUPT_MASK_FROM_ISR(ulDummy);
-}
-
-/**
- * @brief Initialize tick interrupts
- * @return Nothing
- * @note This function initializes the tick interrupts, and must
- * be called before starting the freeRTOS scheduler.
- */
-void prvSetupTimerInterrupt(void)
-{
- /* Clear any pending interrupt */
- Chip_RIT_ClearInt(LPC_RITIMER);
-
- /* Calculate reload value */
- reload_val = (configCPU_CLOCK_HZ / configTICK_RATE_HZ);
- Chip_RIT_SetCOMPVAL(LPC_RITIMER, Chip_RIT_GetCounter(LPC_RITIMER) + reload_val);/* Start tick */
-
- /* Set the priority and enable the interrupt */
- NVIC_SetPriority((IRQn_Type) RITIMER_IRQn, portNVIC_SYSTICK_PRI);
- NVIC_EnableIRQ((IRQn_Type) RITIMER_IRQn);
-}
-
-#endif
-
-/**
- * @}
- */