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

5 files changed, 95 insertions, 65 deletions

diff --git a/demos/host/host_freertos/host_freertos.ewp b/demos/host/host_freertos/host_freertos.ewp
index 5567156c0..f451f16fe 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>

-      </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_clkpwr.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_gpio.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_pinsel.c</name>

       </file>

       <file>

-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</name>

+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\LPC17xx_DriverLib\source\lpc17xx_uart.c</name>

       </file>

       <file>

-        <name>$PROJ_DIR$\..\..\bsp\lpc175x_6x\startup_iar\startup_LPC17xx.s</name>

+        <name>$PROJ_DIR$\..\..\..\mcu\lpc175x_6x\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 4f89508d1..88977519d 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 d13ef942a..c0515d83f 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 c9165d7c6..198332c98 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 13362054c..82e8124af 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