From fa83ba32a537f566a41885730e6a79c7167f5d11 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 13 Mar 2014 13:23:33 +0700
Subject: [PATCH] fix all build error with IAR -
 host/host_freertos/host_freertos.ewp - host/host_os_none/host_os_none.ewp -
 device/device_os_none/device_os_none.eww fix IAR ending warning

---
 .../device/device_os_none/device_os_none.ewp  | 92 +++++++++----------
 .../device/device_os_none/device_os_none.eww  | 26 +++++-
 demos/host/host_freertos/host_freertos.ewp    | 65 ++++++-------
 demos/host/host_freertos/host_freertos.eww    | 18 +++-
 demos/host/host_os_none/host_os_none.ewp      | 57 ++++++------
 demos/host/host_os_none/host_os_none.eww      | 18 +++-
 demos/host/src/tusb_config.h                  |  2 +-
 vendor/freertos/freertos/Source/croutine.c    | 60 ++++++------
 .../freertos/Source/include/FreeRTOS.h        | 26 +++---
 .../freertos/Source/include/projdefs.h        | 18 ++--
 vendor/freertos/freertos/Source/list.c        | 18 ++--
 .../Source/portable/IAR/ARM_CM3/port.c        |  2 +-
 .../Source/portable/IAR/ARM_CM4F/port.c       |  2 +-
 .../freertos/Source/portable/MemMang/heap_4.c | 34 +++----
 vendor/freertos/freertos/Source/queue.c       | 18 ++--
 vendor/freertos/freertos/Source/tasks.c       |  8 +-
 vendor/freertos/freertos/Source/timers.c      | 18 ++--
 17 files changed, 265 insertions(+), 217 deletions(-)

diff --git a/demos/device/device_os_none/device_os_none.ewp b/demos/device/device_os_none/device_os_none.ewp
index cdc37c9d..28fe4126 100644
--- a/demos/device/device_os_none/device_os_none.ewp
+++ b/demos/device/device_os_none/device_os_none.ewp
@@ -297,8 +297,8 @@
         <option>
           <name>CCIncludePath2</name>
           <state>$PROJ_DIR$\..\src</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc</state>
-          <state>$PROJ_DIR$\..\..\bsp</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\inc</state>
+          <state>$PROJ_DIR$\..\..\..\boards</state>
           <state>$PROJ_DIR$\..\..\..\tinyusb</state>
         </option>
         <option>
@@ -1218,9 +1218,9 @@
         <option>
           <name>CCIncludePath2</name>
           <state>$PROJ_DIR$\..\src</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\inc</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\include</state>
-          <state>$PROJ_DIR$\..\..\bsp</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\inc</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\include</state>
+          <state>$PROJ_DIR$\..\..\..\boards</state>
           <state>$PROJ_DIR$\..\..\..\tinyusb</state>
         </option>
         <option>
@@ -2141,8 +2141,8 @@
         <option>
           <name>CCIncludePath2</name>
           <state>$PROJ_DIR$\..\src</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc</state>
-          <state>$PROJ_DIR$\..\..\bsp</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\inc</state>
+          <state>$PROJ_DIR$\..\..\..\boards</state>
           <state>$PROJ_DIR$\..\..\..\tinyusb</state>
         </option>
         <option>
@@ -3062,9 +3062,9 @@
         <option>
           <name>CCIncludePath2</name>
           <state>$PROJ_DIR$\..\src</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\inc</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib</state>
-          <state>$PROJ_DIR$\..\..\bsp</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc11uxx\CMSIS_CORE_LPC11Uxx\inc</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib</state>
+          <state>$PROJ_DIR$\..\..\..\boards</state>
           <state>$PROJ_DIR$\..\..\..\tinyusb</state>
         </option>
         <option>
@@ -3984,9 +3984,9 @@
         <option>
           <name>CCIncludePath2</name>
           <state>$PROJ_DIR$\..\src</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc13uxx\CMSISv2p10_LPC13Uxx\inc</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\inc</state>
-          <state>$PROJ_DIR$\..\..\bsp</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc13uxx\CMSIS_CORE_LPC13Uxx\inc</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\inc</state>
+          <state>$PROJ_DIR$\..\..\..\boards</state>
           <state>$PROJ_DIR$\..\..\..\tinyusb</state>
         </option>
         <option>
@@ -4644,28 +4644,28 @@
     <group>
       <name>boards</name>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\board.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\board.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\embedded_artists\ea4357\board_ea4357.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\microbuilder\board_lpc4357usb.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\microbuilder\board_lpc4357usb.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\lpcxpresso\board_lpcxpresso1347.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\lpcxpresso\board_lpcxpresso1347.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\lpcxpresso\board_lpcxpresso1769.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\ngx\board_ngx4330.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\ngx\board_ngx4330.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\embedded_artists\oem_base_board\pca9532.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\printf_retarget.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\printf_retarget.c</name>
       </file>
     </group>
     <group>
@@ -4677,19 +4677,16 @@
         <configuration>Board LPCXpresso1347</configuration>
       </excluded>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\core_cm0.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_gpio.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc11uxx\LPC11Uxx_DriverLib\lpc11uxx_uart.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc11uxx\iar\startup_lpc11xx.s</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc11uxx\startup_iar\startup_lpc11xx.s</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc11uxx\CMSISv2p00_LPC11Uxx\src\system_LPC11Uxx.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc11uxx\CMSIS_CORE_LPC11Uxx\src\system_LPC11Uxx.c</name>
       </file>
     </group>
     <group>
@@ -4701,16 +4698,16 @@
         <configuration>Board rf1ghznode</configuration>
       </excluded>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\gpio.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc13uxx\startup_iar\startup_lpc13xx.s</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc13uxx\iar\startup_lpc13xx.s</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc13uxx\CMSISv2p10_LPC13Uxx\src\system_LPC13Uxx.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc13uxx\CMSIS_CORE_LPC13Uxx\src\system_LPC13Uxx.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc13uxx\LPC13Uxx_DriverLib\src\uart.c</name>
       </file>
     </group>
     <group>
@@ -4722,25 +4719,22 @@
         <configuration>Board LPCXpresso1347</configuration>
       </excluded>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\core_cm3.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\iar\startup_LPC17xx.s</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\startup_iar\startup_LPC17xx.s</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\system_LPC17xx.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\src\system_LPC17xx.c</name>
       </file>
     </group>
     <group>
@@ -4751,29 +4745,29 @@
         <configuration>Board LPCXpresso1347</configuration>
       </excluded>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\startup_iar\startup_LPC43xx.s</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\startup_LPC43xx.s</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</name>
       </file>
     </group>
     <file>
-      <name>$PROJ_DIR$\..\..\bsp\boards\microbuilder\board_rf1ghznode.c</name>
+      <name>$PROJ_DIR$\..\..\..\boards\microbuilder\board_rf1ghznode.c</name>
     </file>
   </group>
   <group>
diff --git a/demos/device/device_os_none/device_os_none.eww b/demos/device/device_os_none/device_os_none.eww
index 3821a300..5b458323 100644
--- a/demos/device/device_os_none/device_os_none.eww
+++ b/demos/device/device_os_none/device_os_none.eww
@@ -4,7 +4,31 @@
   <project>
     <path>$WS_DIR$\device_os_none.ewp</path>
   </project>
-  <batchBuild/>
+  <batchBuild>
+    <batchDefinition>
+      <name>all</name>
+      <member>
+        <project>device_os_none</project>
+        <configuration>Board EA4357</configuration>
+      </member>
+      <member>
+        <project>device_os_none</project>
+        <configuration>Board LPCXpresso1347</configuration>
+      </member>
+      <member>
+        <project>device_os_none</project>
+        <configuration>Board LPCXpresso1769</configuration>
+      </member>
+      <member>
+        <project>device_os_none</project>
+        <configuration>Board NGX4330</configuration>
+      </member>
+      <member>
+        <project>device_os_none</project>
+        <configuration>Board rf1ghznode</configuration>
+      </member>
+    </batchDefinition>
+  </batchBuild>
 </workspace>
 
 
diff --git a/demos/host/host_freertos/host_freertos.ewp b/demos/host/host_freertos/host_freertos.ewp
index 5567156c..f451f16f 100644
--- a/demos/host/host_freertos/host_freertos.ewp
+++ b/demos/host/host_freertos/host_freertos.ewp
@@ -298,8 +298,8 @@
         <option>
           <name>CCIncludePath2</name>
           <state>$PROJ_DIR$\..\src</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc</state>
-          <state>$PROJ_DIR$\..\..\bsp</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\inc</state>
+          <state>$PROJ_DIR$\..\..\..\boards</state>
           <state>$PROJ_DIR$\..\..\..\tinyusb</state>
           <state>$PROJ_DIR$\..\..\..\vendor\fatfs</state>
           <state>$PROJ_DIR$\..\..\..\vendor\freertos</state>
@@ -1223,9 +1223,9 @@
         <option>
           <name>CCIncludePath2</name>
           <state>$PROJ_DIR$\..\src</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\inc</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\include</state>
-          <state>$PROJ_DIR$\..\..\bsp</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\inc</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\include</state>
+          <state>$PROJ_DIR$\..\..\..\boards</state>
           <state>$PROJ_DIR$\..\..\..\tinyusb</state>
           <state>$PROJ_DIR$\..\..\..\vendor\fatfs</state>
           <state>$PROJ_DIR$\..\..\..\vendor\freertos</state>
@@ -2019,7 +2019,8 @@
           <state>CORE_M4</state>
           <state>TUSB_CFG_MCU=MCU_LPC43XX</state>
           <state>BOARD=BOARD_NGX4330</state>
-          <state>TUSB_CFG_OS=TUSB_OS_NONE</state>
+          <state>TUSB_CFG_OS=TUSB_OS_FREERTOS</state>
+          <state>TUSB_CFG_OS_TASK_PRIO=configMAX_PRIORITIES-5</state>
         </option>
         <option>
           <name>CCPreprocFile</name>
@@ -2149,10 +2150,12 @@
         <option>
           <name>CCIncludePath2</name>
           <state>$PROJ_DIR$\..\src</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc</state>
-          <state>$PROJ_DIR$\..\..\bsp</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\inc</state>
+          <state>$PROJ_DIR$\..\..\..\boards</state>
           <state>$PROJ_DIR$\..\..\..\tinyusb</state>
           <state>$PROJ_DIR$\..\..\..\vendor\fatfs</state>
+          <state>$PROJ_DIR$\..\..\..\vendor\freertos</state>
+          <state>$PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\include</state>
         </option>
         <option>
           <name>CCStdIncCheck</name>
@@ -2401,7 +2404,7 @@
         </option>
         <option>
           <name>AUserIncludes</name>
-          <state></state>
+          <state>$PROJ_DIR$\..\..\..\vendor\freertos</state>
         </option>
         <option>
           <name>AExtraOptionsCheckV2</name>
@@ -2803,25 +2806,25 @@
     <group>
       <name>boards</name>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\board.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\board.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\embedded_artists\ea4357\board_ea4357.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\microbuilder\board_lpc4357usb.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\microbuilder\board_lpc4357usb.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\lpcxpresso\board_lpcxpresso1769.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\ngx\board_ngx4330.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\ngx\board_ngx4330.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\embedded_artists\oem_base_board\pca9532.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\printf_retarget.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\printf_retarget.c</name>
       </file>
     </group>
     <group>
@@ -2831,25 +2834,22 @@
         <configuration>Board NGX4330</configuration>
       </excluded>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\core_cm3.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\iar\startup_LPC17xx.s</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\startup_iar\startup_LPC17xx.s</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\system_LPC17xx.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\src\system_LPC17xx.c</name>
       </file>
     </group>
     <group>
@@ -2858,25 +2858,25 @@
         <configuration>Board LPCXpresso1769</configuration>
       </excluded>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\startup_iar\startup_LPC43xx.s</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\startup_LPC43xx.s</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</name>
       </file>
     </group>
   </group>
@@ -2898,6 +2898,7 @@
       <name>CM3</name>
       <excluded>
         <configuration>Board EA4357</configuration>
+        <configuration>Board NGX4330</configuration>
       </excluded>
       <file>
         <name>$PROJ_DIR$\..\..\..\vendor\freertos\freertos\Source\portable\IAR\ARM_CM3\port.c</name>
diff --git a/demos/host/host_freertos/host_freertos.eww b/demos/host/host_freertos/host_freertos.eww
index 4f89508d..88977519 100644
--- a/demos/host/host_freertos/host_freertos.eww
+++ b/demos/host/host_freertos/host_freertos.eww
@@ -4,7 +4,23 @@
   <project>
     <path>$WS_DIR$\host_freertos.ewp</path>
   </project>
-  <batchBuild/>
+  <batchBuild>
+    <batchDefinition>
+      <name>all</name>
+      <member>
+        <project>host_freertos</project>
+        <configuration>Board EA4357</configuration>
+      </member>
+      <member>
+        <project>host_freertos</project>
+        <configuration>Board LPCXpresso1769</configuration>
+      </member>
+      <member>
+        <project>host_freertos</project>
+        <configuration>Board NGX4330</configuration>
+      </member>
+    </batchDefinition>
+  </batchBuild>
 </workspace>
 
 
diff --git a/demos/host/host_os_none/host_os_none.ewp b/demos/host/host_os_none/host_os_none.ewp
index d13ef942..c0515d83 100644
--- a/demos/host/host_os_none/host_os_none.ewp
+++ b/demos/host/host_os_none/host_os_none.ewp
@@ -297,8 +297,8 @@
         <option>
           <name>CCIncludePath2</name>
           <state>$PROJ_DIR$\..\src</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc</state>
-          <state>$PROJ_DIR$\..\..\bsp</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\inc</state>
+          <state>$PROJ_DIR$\..\..\..\boards</state>
           <state>$PROJ_DIR$\..\..\..\tinyusb</state>
           <state>$PROJ_DIR$\..\..\..\vendor\fatfs</state>
         </option>
@@ -1219,9 +1219,9 @@
         <option>
           <name>CCIncludePath2</name>
           <state>$PROJ_DIR$\..\src</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\inc</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\include</state>
-          <state>$PROJ_DIR$\..\..\bsp</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\inc</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\include</state>
+          <state>$PROJ_DIR$\..\..\..\boards</state>
           <state>$PROJ_DIR$\..\..\..\tinyusb</state>
           <state>$PROJ_DIR$\..\..\..\vendor\fatfs</state>
         </option>
@@ -2143,8 +2143,8 @@
         <option>
           <name>CCIncludePath2</name>
           <state>$PROJ_DIR$\..\src</state>
-          <state>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\inc</state>
-          <state>$PROJ_DIR$\..\..\bsp</state>
+          <state>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\inc</state>
+          <state>$PROJ_DIR$\..\..\..\boards</state>
           <state>$PROJ_DIR$\..\..\..\tinyusb</state>
           <state>$PROJ_DIR$\..\..\..\vendor\fatfs</state>
         </option>
@@ -2797,25 +2797,25 @@
     <group>
       <name>boards</name>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\board.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\board.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\embedded_artists\ea4357\board_ea4357.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\embedded_artists\ea4357\board_ea4357.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\microbuilder\board_lpc4357usb.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\microbuilder\board_lpc4357usb.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\lpcxpresso\board_lpcxpresso1769.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\lpcxpresso\board_lpcxpresso1769.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\ngx\board_ngx4330.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\ngx\board_ngx4330.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\embedded_artists\oem_base_board\pca9532.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\embedded_artists\oem_base_board\pca9532.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\boards\printf_retarget.c</name>
+        <name>$PROJ_DIR$\..\..\..\boards\printf_retarget.c</name>
       </file>
     </group>
     <group>
@@ -2825,25 +2825,22 @@
         <configuration>Board NGX4330</configuration>
       </excluded>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\core_cm3.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_clkpwr.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_gpio.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_pinsel.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\iar\startup_LPC17xx.s</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\startup_iar\startup_LPC17xx.s</name>
-      </file>
-      <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\CMSISv2p00_LPC17xx\src\system_LPC17xx.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\CMSIS_CORE_LPC17xx\src\system_LPC17xx.c</name>
       </file>
     </group>
     <group>
@@ -2852,25 +2849,25 @@
         <configuration>Board LPCXpresso1769</configuration>
       </excluded>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_cgu.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_gpio.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_i2c.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_scu.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\lpc43xx_uart.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\startup_iar\startup_LPC43xx.s</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\iar\startup_LPC43xx.s</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\bsp\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</name>
+        <name>$PROJ_DIR$\..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</name>
       </file>
     </group>
   </group>
diff --git a/demos/host/host_os_none/host_os_none.eww b/demos/host/host_os_none/host_os_none.eww
index c9165d7c..198332c9 100644
--- a/demos/host/host_os_none/host_os_none.eww
+++ b/demos/host/host_os_none/host_os_none.eww
@@ -4,7 +4,23 @@
   <project>
     <path>$WS_DIR$\host_os_none.ewp</path>
   </project>
-  <batchBuild/>
+  <batchBuild>
+    <batchDefinition>
+      <name>all</name>
+      <member>
+        <project>host_os_none</project>
+        <configuration>Board EA4357</configuration>
+      </member>
+      <member>
+        <project>host_os_none</project>
+        <configuration>Board LPCXpresso1769</configuration>
+      </member>
+      <member>
+        <project>host_os_none</project>
+        <configuration>Board NGX4330</configuration>
+      </member>
+    </batchDefinition>
+  </batchBuild>
 </workspace>
 
 
diff --git a/demos/host/src/tusb_config.h b/demos/host/src/tusb_config.h
index 13362054..82e8124a 100644
--- a/demos/host/src/tusb_config.h
+++ b/demos/host/src/tusb_config.h
@@ -102,7 +102,7 @@
 #elif defined __ICCARM__ // compiled with IAR
 
   #if  (TUSB_CFG_MCU == MCU_LPC43XX)
-    #define TUSB_CFG_ATTR_USBRAM _Pragma("location=\".ahb_sram1\"")
+    #define TUSB_CFG_ATTR_USBRAM _Pragma("location=\".ahb_sram2\"") // some mcu like 4330 ahb_sram1 is used for heap/stack in IAR
   #elif (TUSB_CFG_MCU == MCU_LPC175X_6X)
     #define TUSB_CFG_ATTR_USBRAM
   #endif
diff --git a/vendor/freertos/freertos/Source/croutine.c b/vendor/freertos/freertos/Source/croutine.c
index b69ced44..09880abf 100644
--- a/vendor/freertos/freertos/Source/croutine.c
+++ b/vendor/freertos/freertos/Source/croutine.c
@@ -1,7 +1,7 @@
 /*
     FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd.
 
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT 
+    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT
     http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
     ***************************************************************************
@@ -42,7 +42,7 @@
     FreeRTOS WEB site.
 
     1 tab == 4 spaces!
-    
+
     ***************************************************************************
      *                                                                       *
      *    Having a problem?  Start by reading the FAQ "My application does   *
@@ -52,17 +52,17 @@
      *                                                                       *
     ***************************************************************************
 
-    
-    http://www.FreeRTOS.org - Documentation, training, latest versions, license 
-    and contact details.  
-    
+
+    http://www.FreeRTOS.org - Documentation, training, latest versions, license
+    and contact details.
+
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool.
 
-    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell 
-    the code with commercial support, indemnification, and middleware, under 
+    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell
+    the code with commercial support, indemnification, and middleware, under
     the OpenRTOS brand: http://www.OpenRTOS.com.  High Integrity Systems also
-    provide a safety engineered and independently SIL3 certified version under 
+    provide a safety engineered and independently SIL3 certified version under
     the SafeRTOS brand: http://www.SafeRTOS.com.
 */
 
@@ -109,7 +109,7 @@ static portTickType xCoRoutineTickCount = 0, xLastTickCount = 0, xPassedTicks =
 		uxTopCoRoutineReadyPriority = pxCRCB->uxPriority;															\
 	}																												\
 	vListInsertEnd( ( xList * ) &( pxReadyCoRoutineLists[ pxCRCB->uxPriority ] ), &( pxCRCB->xGenericListItem ) );	\
-}	
+}
 
 /*
  * Utility to ready all the lists used by the scheduler.  This is called
@@ -175,10 +175,10 @@ corCRCB *pxCoRoutine;
 		in a list. */
 		listSET_LIST_ITEM_OWNER( &( pxCoRoutine->xGenericListItem ), pxCoRoutine );
 		listSET_LIST_ITEM_OWNER( &( pxCoRoutine->xEventListItem ), pxCoRoutine );
-	
+
 		/* Event lists are always in priority order. */
 		listSET_LIST_ITEM_VALUE( &( pxCoRoutine->xEventListItem ), configMAX_PRIORITIES - ( portTickType ) uxPriority );
-		
+
 		/* Now the co-routine has been initialised it can be added to the ready
 		list at the correct priority. */
 		prvAddCoRoutineToReadyQueue( pxCoRoutine );
@@ -186,11 +186,11 @@ corCRCB *pxCoRoutine;
 		xReturn = pdPASS;
 	}
 	else
-	{		
+	{
 		xReturn = errCOULD_NOT_ALLOCATE_REQUIRED_MEMORY;
 	}
-	
-	return xReturn;	
+
+	return xReturn;
 }
 /*-----------------------------------------------------------*/
 
@@ -243,14 +243,14 @@ static void prvCheckPendingReadyList( void )
 
 		/* The pending ready list can be accessed by an ISR. */
 		portDISABLE_INTERRUPTS();
-		{	
-			pxUnblockedCRCB = ( corCRCB * ) listGET_OWNER_OF_HEAD_ENTRY( (&xPendingReadyCoRoutineList) );			
+		{
+			pxUnblockedCRCB = ( corCRCB * ) listGET_OWNER_OF_HEAD_ENTRY( (&xPendingReadyCoRoutineList) );
 			uxListRemove( &( pxUnblockedCRCB->xEventListItem ) );
 		}
 		portENABLE_INTERRUPTS();
 
 		uxListRemove( &( pxUnblockedCRCB->xGenericListItem ) );
-		prvAddCoRoutineToReadyQueue( pxUnblockedCRCB );	
+		prvAddCoRoutineToReadyQueue( pxUnblockedCRCB );
 	}
 }
 /*-----------------------------------------------------------*/
@@ -282,11 +282,11 @@ corCRCB *pxCRCB;
 		{
 			pxCRCB = ( corCRCB * ) listGET_OWNER_OF_HEAD_ENTRY( pxDelayedCoRoutineList );
 
-			if( xCoRoutineTickCount < listGET_LIST_ITEM_VALUE( &( pxCRCB->xGenericListItem ) ) )				
-			{			
-				/* Timeout not yet expired. */																			
-				break;																				
-			}																						
+			if( xCoRoutineTickCount < listGET_LIST_ITEM_VALUE( &( pxCRCB->xGenericListItem ) ) )
+			{
+				/* Timeout not yet expired. */
+				break;
+			}
 
 			portDISABLE_INTERRUPTS();
 			{
@@ -295,18 +295,18 @@ corCRCB *pxCRCB;
 				have been moved to the pending ready list and the following
 				line is still valid.  Also the pvContainer parameter will have
 				been set to NULL so the following lines are also valid. */
-				uxListRemove( &( pxCRCB->xGenericListItem ) );											
+				uxListRemove( &( pxCRCB->xGenericListItem ) );
 
-				/* Is the co-routine waiting on an event also? */												
-				if( pxCRCB->xEventListItem.pvContainer )													
-				{															
-					uxListRemove( &( pxCRCB->xEventListItem ) );											
+				/* Is the co-routine waiting on an event also? */
+				if( pxCRCB->xEventListItem.pvContainer )
+				{
+					uxListRemove( &( pxCRCB->xEventListItem ) );
 				}
 			}
 			portENABLE_INTERRUPTS();
 
-			prvAddCoRoutineToReadyQueue( pxCRCB );													
-		}																									
+			prvAddCoRoutineToReadyQueue( pxCRCB );
+		}
 	}
 
 	xLastTickCount = xCoRoutineTickCount;
diff --git a/vendor/freertos/freertos/Source/include/FreeRTOS.h b/vendor/freertos/freertos/Source/include/FreeRTOS.h
index f1ad0d98..e2f0138a 100644
--- a/vendor/freertos/freertos/Source/include/FreeRTOS.h
+++ b/vendor/freertos/freertos/Source/include/FreeRTOS.h
@@ -1,7 +1,7 @@
 /*
     FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd.
 
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT 
+    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT
     http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
     ***************************************************************************
@@ -42,7 +42,7 @@
     FreeRTOS WEB site.
 
     1 tab == 4 spaces!
-    
+
     ***************************************************************************
      *                                                                       *
      *    Having a problem?  Start by reading the FAQ "My application does   *
@@ -52,17 +52,17 @@
      *                                                                       *
     ***************************************************************************
 
-    
-    http://www.FreeRTOS.org - Documentation, training, latest versions, license 
-    and contact details.  
-    
+
+    http://www.FreeRTOS.org - Documentation, training, latest versions, license
+    and contact details.
+
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool.
 
-    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell 
-    the code with commercial support, indemnification, and middleware, under 
+    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell
+    the code with commercial support, indemnification, and middleware, under
     the OpenRTOS brand: http://www.OpenRTOS.com.  High Integrity Systems also
-    provide a safety engineered and independently SIL3 certified version under 
+    provide a safety engineered and independently SIL3 certified version under
     the SafeRTOS brand: http://www.SafeRTOS.com.
 */
 
@@ -129,11 +129,11 @@ typedef portBASE_TYPE (*pdTASK_HOOK_CODE)( void * );
 	#error Missing definition:  INCLUDE_uxTaskPriorityGet should be defined in FreeRTOSConfig.h as either 1 or 0.  See the Configuration section of the FreeRTOS API documentation for details.
 #endif
 
-#ifndef INCLUDE_vTaskDelete		
+#ifndef INCLUDE_vTaskDelete
 	#error Missing definition:  INCLUDE_vTaskDelete		 should be defined in FreeRTOSConfig.h as either 1 or 0.  See the Configuration section of the FreeRTOS API documentation for details.
 #endif
 
-#ifndef INCLUDE_vTaskSuspend	
+#ifndef INCLUDE_vTaskSuspend
 	#error Missing definition:  INCLUDE_vTaskSuspend	 should be defined in FreeRTOSConfig.h as either 1 or 0.  See the Configuration section of the FreeRTOS API documentation for details.
 #endif
 
@@ -316,7 +316,7 @@ typedef portBASE_TYPE (*pdTASK_HOOK_CODE)( void * );
 
 #ifndef traceTASK_PRIORITY_DISINHERIT
 	/* Called when a task releases a mutex, the holding of which had resulted in
-	the task inheriting the priority of a higher priority task.  
+	the task inheriting the priority of a higher priority task.
 	pxTCBOfMutexHolder is a pointer to the TCB of the task that is releasing the
 	mutex.  uxOriginalPriority is the task's configured (base) priority. */
 	#define traceTASK_PRIORITY_DISINHERIT( pxTCBOfMutexHolder, uxOriginalPriority )
@@ -348,7 +348,7 @@ typedef portBASE_TYPE (*pdTASK_HOOK_CODE)( void * );
 	#define traceMOVED_TASK_TO_READY_STATE( pxTCB )
 #endif
 
-#ifndef traceQUEUE_CREATE	
+#ifndef traceQUEUE_CREATE
 	#define traceQUEUE_CREATE( pxNewQueue )
 #endif
 
diff --git a/vendor/freertos/freertos/Source/include/projdefs.h b/vendor/freertos/freertos/Source/include/projdefs.h
index 57c70d4e..6f2c1815 100644
--- a/vendor/freertos/freertos/Source/include/projdefs.h
+++ b/vendor/freertos/freertos/Source/include/projdefs.h
@@ -1,7 +1,7 @@
 /*
     FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd.
 
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT 
+    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT
     http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
     ***************************************************************************
@@ -42,7 +42,7 @@
     FreeRTOS WEB site.
 
     1 tab == 4 spaces!
-    
+
     ***************************************************************************
      *                                                                       *
      *    Having a problem?  Start by reading the FAQ "My application does   *
@@ -52,17 +52,17 @@
      *                                                                       *
     ***************************************************************************
 
-    
-    http://www.FreeRTOS.org - Documentation, training, latest versions, license 
-    and contact details.  
-    
+
+    http://www.FreeRTOS.org - Documentation, training, latest versions, license
+    and contact details.
+
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool.
 
-    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell 
-    the code with commercial support, indemnification, and middleware, under 
+    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell
+    the code with commercial support, indemnification, and middleware, under
     the OpenRTOS brand: http://www.OpenRTOS.com.  High Integrity Systems also
-    provide a safety engineered and independently SIL3 certified version under 
+    provide a safety engineered and independently SIL3 certified version under
     the SafeRTOS brand: http://www.SafeRTOS.com.
 */
 
diff --git a/vendor/freertos/freertos/Source/list.c b/vendor/freertos/freertos/Source/list.c
index 052193f8..0e0dd9d6 100644
--- a/vendor/freertos/freertos/Source/list.c
+++ b/vendor/freertos/freertos/Source/list.c
@@ -1,7 +1,7 @@
 /*
     FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd.
 
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT 
+    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT
     http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
     ***************************************************************************
@@ -42,7 +42,7 @@
     FreeRTOS WEB site.
 
     1 tab == 4 spaces!
-    
+
     ***************************************************************************
      *                                                                       *
      *    Having a problem?  Start by reading the FAQ "My application does   *
@@ -52,17 +52,17 @@
      *                                                                       *
     ***************************************************************************
 
-    
-    http://www.FreeRTOS.org - Documentation, training, latest versions, license 
-    and contact details.  
-    
+
+    http://www.FreeRTOS.org - Documentation, training, latest versions, license
+    and contact details.
+
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool.
 
-    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell 
-    the code with commercial support, indemnification, and middleware, under 
+    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell
+    the code with commercial support, indemnification, and middleware, under
     the OpenRTOS brand: http://www.OpenRTOS.com.  High Integrity Systems also
-    provide a safety engineered and independently SIL3 certified version under 
+    provide a safety engineered and independently SIL3 certified version under
     the SafeRTOS brand: http://www.SafeRTOS.com.
 */
 
diff --git a/vendor/freertos/freertos/Source/portable/IAR/ARM_CM3/port.c b/vendor/freertos/freertos/Source/portable/IAR/ARM_CM3/port.c
index e8f9d2dd..24c9fdee 100644
--- a/vendor/freertos/freertos/Source/portable/IAR/ARM_CM3/port.c
+++ b/vendor/freertos/freertos/Source/portable/IAR/ARM_CM3/port.c
@@ -373,7 +373,7 @@ void xPortSysTickHandler( void )
  */
 __weak void vPortSetupTimerInterrupt( void )
 {
-	/* Calculate the constants required to configure the tick interrupt. */		
+	/* Calculate the constants required to configure the tick interrupt. */
 	#if configUSE_TICKLESS_IDLE == 1
 	{
 		ulTimerReloadValueForOneTick = ( configSYSTICK_CLOCK_HZ / configTICK_RATE_HZ ) - 1UL;
diff --git a/vendor/freertos/freertos/Source/portable/IAR/ARM_CM4F/port.c b/vendor/freertos/freertos/Source/portable/IAR/ARM_CM4F/port.c
index 7bdec694..12827021 100644
--- a/vendor/freertos/freertos/Source/portable/IAR/ARM_CM4F/port.c
+++ b/vendor/freertos/freertos/Source/portable/IAR/ARM_CM4F/port.c
@@ -398,7 +398,7 @@ void xPortSysTickHandler( void )
  */
 __weak void vPortSetupTimerInterrupt( void )
 {
-	/* Calculate the constants required to configure the tick interrupt. */		
+	/* Calculate the constants required to configure the tick interrupt. */
 	#if configUSE_TICKLESS_IDLE == 1
 	{
 		ulTimerReloadValueForOneTick = ( configSYSTICK_CLOCK_HZ / configTICK_RATE_HZ ) - 1UL;
diff --git a/vendor/freertos/freertos/Source/portable/MemMang/heap_4.c b/vendor/freertos/freertos/Source/portable/MemMang/heap_4.c
index 6b78ed2f..eb2cb7cf 100644
--- a/vendor/freertos/freertos/Source/portable/MemMang/heap_4.c
+++ b/vendor/freertos/freertos/Source/portable/MemMang/heap_4.c
@@ -1,7 +1,7 @@
 /*
     FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd.
 
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT 
+    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT
     http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
     ***************************************************************************
@@ -42,7 +42,7 @@
     FreeRTOS WEB site.
 
     1 tab == 4 spaces!
-    
+
     ***************************************************************************
      *                                                                       *
      *    Having a problem?  Start by reading the FAQ "My application does   *
@@ -52,26 +52,26 @@
      *                                                                       *
     ***************************************************************************
 
-    
-    http://www.FreeRTOS.org - Documentation, training, latest versions, license 
-    and contact details.  
-    
+
+    http://www.FreeRTOS.org - Documentation, training, latest versions, license
+    and contact details.
+
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool.
 
-    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell 
-    the code with commercial support, indemnification, and middleware, under 
+    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell
+    the code with commercial support, indemnification, and middleware, under
     the OpenRTOS brand: http://www.OpenRTOS.com.  High Integrity Systems also
-    provide a safety engineered and independently SIL3 certified version under 
+    provide a safety engineered and independently SIL3 certified version under
     the SafeRTOS brand: http://www.SafeRTOS.com.
 */
 
 /*
- * A sample implementation of pvPortMalloc() and vPortFree() that combines 
- * (coalescences) adjacent memory blocks as they are freed, and in so doing 
+ * A sample implementation of pvPortMalloc() and vPortFree() that combines
+ * (coalescences) adjacent memory blocks as they are freed, and in so doing
  * limits memory fragmentation.
  *
- * See heap_1.c, heap_2.c and heap_3.c for alternative implementations, and the 
+ * See heap_1.c, heap_2.c and heap_3.c for alternative implementations, and the
  * memory management pages of http://www.FreeRTOS.org for more information.
  */
 #include <stdlib.h>
@@ -112,7 +112,7 @@ typedef struct A_BLOCK_LINK
 /*-----------------------------------------------------------*/
 
 /*
- * Inserts a block of memory that is being freed into the correct position in 
+ * Inserts a block of memory that is being freed into the correct position in
  * the list of free memory blocks.  The block being freed will be merged with
  * the block in front it and/or the block behind it if the memory blocks are
  * adjacent to each other.
@@ -165,7 +165,7 @@ void *pvReturn = NULL;
 		{
 			xWantedSize += heapSTRUCT_SIZE;
 
-			/* Ensure that blocks are always aligned to the required number of 
+			/* Ensure that blocks are always aligned to the required number of
 			bytes. */
 			if( xWantedSize & portBYTE_ALIGNMENT_MASK )
 			{
@@ -253,7 +253,7 @@ xBlockLink *pxLink;
 		{
 			/* Add this block to the list of free blocks. */
 			xFreeBytesRemaining += pxLink->xBlockSize;
-			prvInsertBlockIntoFreeList( ( ( xBlockLink * ) pxLink ) );			
+			prvInsertBlockIntoFreeList( ( ( xBlockLink * ) pxLink ) );
 		}
 		xTaskResumeAll();
 	}
@@ -318,7 +318,7 @@ unsigned char *puc;
 	}
 
 	/* Do the block being inserted, and the block it is being inserted after
-	make a contiguous block of memory? */	
+	make a contiguous block of memory? */
 	puc = ( unsigned char * ) pxIterator;
 	if( ( puc + pxIterator->xBlockSize ) == ( unsigned char * ) pxBlockToInsert )
 	{
@@ -344,7 +344,7 @@ unsigned char *puc;
 	}
 	else
 	{
-		pxBlockToInsert->pxNextFreeBlock = pxIterator->pxNextFreeBlock;		
+		pxBlockToInsert->pxNextFreeBlock = pxIterator->pxNextFreeBlock;
 	}
 
 	/* If the block being inserted plugged a gab, so was merged with the block
diff --git a/vendor/freertos/freertos/Source/queue.c b/vendor/freertos/freertos/Source/queue.c
index e39c0950..fbc6187e 100644
--- a/vendor/freertos/freertos/Source/queue.c
+++ b/vendor/freertos/freertos/Source/queue.c
@@ -1,7 +1,7 @@
 /*
     FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd.
 
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT 
+    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT
     http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
     ***************************************************************************
@@ -42,7 +42,7 @@
     FreeRTOS WEB site.
 
     1 tab == 4 spaces!
-    
+
     ***************************************************************************
      *                                                                       *
      *    Having a problem?  Start by reading the FAQ "My application does   *
@@ -52,17 +52,17 @@
      *                                                                       *
     ***************************************************************************
 
-    
-    http://www.FreeRTOS.org - Documentation, training, latest versions, license 
-    and contact details.  
-    
+
+    http://www.FreeRTOS.org - Documentation, training, latest versions, license
+    and contact details.
+
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool.
 
-    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell 
-    the code with commercial support, indemnification, and middleware, under 
+    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell
+    the code with commercial support, indemnification, and middleware, under
     the OpenRTOS brand: http://www.OpenRTOS.com.  High Integrity Systems also
-    provide a safety engineered and independently SIL3 certified version under 
+    provide a safety engineered and independently SIL3 certified version under
     the SafeRTOS brand: http://www.SafeRTOS.com.
 */
 
diff --git a/vendor/freertos/freertos/Source/tasks.c b/vendor/freertos/freertos/Source/tasks.c
index 25b68bdd..8b894de3 100644
--- a/vendor/freertos/freertos/Source/tasks.c
+++ b/vendor/freertos/freertos/Source/tasks.c
@@ -1324,7 +1324,7 @@ void vTaskSuspendAll( void )
 	portTickType prvGetExpectedIdleTime( void )
 	{
 	portTickType xReturn;
-	
+
 		if( pxCurrentTCB->uxPriority > tskIDLE_PRIORITY )
 		{
 			xReturn = 0;
@@ -1340,7 +1340,7 @@ void vTaskSuspendAll( void )
 		{
 			xReturn = xNextTaskUnblockTime - xTickCount;
 		}
-	
+
 		return xReturn;
 	}
 
@@ -1637,7 +1637,7 @@ unsigned portBASE_TYPE uxTaskGetNumberOfTasks( void )
 /*----------------------------------------------------------*/
 
 /* This conditional compilation should use inequality to 0, not equality to 1.
-This is to ensure vTaskStepTick() is available when user defined low power mode	
+This is to ensure vTaskStepTick() is available when user defined low power mode
 implementations require configUSE_TICKLESS_IDLE to be set to a value other than
 1. */
 #if ( configUSE_TICKLESS_IDLE != 0 )
@@ -1943,7 +1943,7 @@ portTickType xTimeToWake;
 		/* Calculate the time at which the task should be woken if the event does
 		not occur.  This may overflow but this doesn't matter. */
 		xTimeToWake = xTickCount + xTicksToWait;
-		
+
 		traceTASK_DELAY_UNTIL();
 		prvAddCurrentTaskToDelayedList( xTimeToWake );
 	}
diff --git a/vendor/freertos/freertos/Source/timers.c b/vendor/freertos/freertos/Source/timers.c
index bb829f71..bac46de2 100644
--- a/vendor/freertos/freertos/Source/timers.c
+++ b/vendor/freertos/freertos/Source/timers.c
@@ -1,7 +1,7 @@
 /*
     FreeRTOS V7.3.0 - Copyright (C) 2012 Real Time Engineers Ltd.
 
-    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT 
+    FEATURES AND PORTS ARE ADDED TO FREERTOS ALL THE TIME.  PLEASE VISIT
     http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
 
     ***************************************************************************
@@ -42,7 +42,7 @@
     FreeRTOS WEB site.
 
     1 tab == 4 spaces!
-    
+
     ***************************************************************************
      *                                                                       *
      *    Having a problem?  Start by reading the FAQ "My application does   *
@@ -52,17 +52,17 @@
      *                                                                       *
     ***************************************************************************
 
-    
-    http://www.FreeRTOS.org - Documentation, training, latest versions, license 
-    and contact details.  
-    
+
+    http://www.FreeRTOS.org - Documentation, training, latest versions, license
+    and contact details.
+
     http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,
     including FreeRTOS+Trace - an indispensable productivity tool.
 
-    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell 
-    the code with commercial support, indemnification, and middleware, under 
+    Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell
+    the code with commercial support, indemnification, and middleware, under
     the OpenRTOS brand: http://www.OpenRTOS.com.  High Integrity Systems also
-    provide a safety engineered and independently SIL3 certified version under 
+    provide a safety engineered and independently SIL3 certified version under
     the SafeRTOS brand: http://www.SafeRTOS.com.
 */