From 34c60cdca30a2106a3bf578b45c9cc4b049310ed Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Thu, 20 Mar 2014 13:32:50 +0700
Subject: [PATCH] fix cmsis rtx warning IAR host cmsis rtx work with lpc1769

---
 demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp  | 56 +++++++++++--------
 .../host/host_cmsis_rtx/host_cmsis_rtx.uvopt  | 22 ++++----
 tinyusb/osal/osal_cmsis_rtx.h                 |  2 +-
 3 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp b/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp
index 5211b06c..c2aa460b 100644
--- a/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp
+++ b/demos/host/host_cmsis_rtx/host_cmsis_rtx.ewp
@@ -1091,7 +1091,8 @@
           <name>CCDefines</name>
           <state>TUSB_CFG_MCU=MCU_LPC175X_6X</state>
           <state>BOARD=BOARD_LPCXPRESSO1769</state>
-          <state>TUSB_CFG_OS=TUSB_OS_NONE</state>
+          <state>TUSB_CFG_OS=TUSB_OS_CMSIS_RTX</state>
+          <state>TUSB_CFG_OS_TASK_PRIO=osPriorityRealtime</state>
         </option>
         <option>
           <name>CCPreprocFile</name>
@@ -1226,6 +1227,7 @@
           <state>$PROJ_DIR$\..\..\..\boards</state>
           <state>$PROJ_DIR$\..\..\..\tinyusb</state>
           <state>$PROJ_DIR$\..\..\..\vendor\fatfs</state>
+          <state>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\INC</state>
         </option>
         <option>
           <name>CCStdIncCheck</name>
@@ -2818,6 +2820,37 @@
       <name>$PROJ_DIR$\..\..\..\boards\printf_retarget.c</name>
     </file>
   </group>
+  <group>
+    <name>cmsis-rtx</name>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\LIB\IAR\RTX_CM3.a</name>
+      <excluded>
+        <configuration>Board EA4357</configuration>
+        <configuration>Board NGX4330</configuration>
+      </excluded>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\LIB\IAR\RTX_CM4.a</name>
+      <excluded>
+        <configuration>Board LPCXpresso1769</configuration>
+      </excluded>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\RTX_Conf_CM.c</name>
+    </file>
+  </group>
+  <group>
+    <name>fatfs</name>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\vendor\fatfs\ccsbcs.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\vendor\fatfs\diskio.c</name>
+    </file>
+    <file>
+      <name>$PROJ_DIR$\..\..\..\vendor\fatfs\ff.c</name>
+    </file>
+  </group>
   <group>
     <name>mcu</name>
     <group>
@@ -2873,27 +2906,6 @@
       </file>
     </group>
   </group>
-  <group>
-    <name>cmsis-rtx</name>
-    <file>
-      <name>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\LIB\IAR\RTX_CM4.a</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\RTX_Conf_CM.c</name>
-    </file>
-  </group>
-  <group>
-    <name>fatfs</name>
-    <file>
-      <name>$PROJ_DIR$\..\..\..\vendor\fatfs\ccsbcs.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\..\vendor\fatfs\diskio.c</name>
-    </file>
-    <file>
-      <name>$PROJ_DIR$\..\..\..\vendor\fatfs\ff.c</name>
-    </file>
-  </group>
   <group>
     <name>tinyusb</name>
     <group>
diff --git a/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt b/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt
index f8803e67..1f5510cb 100644
--- a/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt
+++ b/demos/host/host_cmsis_rtx/host_cmsis_rtx.uvopt
@@ -599,7 +599,7 @@
         <aSer4>1</aSer4>
         <StkLoc>0</StkLoc>
         <TrcWin>0</TrcWin>
-        <newCpu>1</newCpu>
+        <newCpu>0</newCpu>
         <uProt>0</uProt>
       </DebugFlag>
       <Tracepoint>
@@ -632,10 +632,10 @@
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <Focus>0</Focus>
-      <ColumnNumber>20</ColumnNumber>
+      <ColumnNumber>64</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>2</TopLine>
-      <CurrentLine>3</CurrentLine>
+      <TopLine>57</TopLine>
+      <CurrentLine>64</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\src\main.c</PathWithFileName>
       <FilenameWithoutPath>main.c</FilenameWithoutPath>
@@ -666,7 +666,7 @@
       <Focus>0</Focus>
       <ColumnNumber>48</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>101</TopLine>
+      <TopLine>103</TopLine>
       <CurrentLine>107</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\src\keyboard_app.c</PathWithFileName>
@@ -714,7 +714,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>141</TopLine>
+      <TopLine>143</TopLine>
       <CurrentLine>145</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\src\msc_app.c</PathWithFileName>
@@ -986,7 +986,7 @@
       <Focus>0</Focus>
       <ColumnNumber>17</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>368</TopLine>
+      <TopLine>370</TopLine>
       <CurrentLine>373</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\tinyusb\host\usbh.c</PathWithFileName>
@@ -1346,7 +1346,7 @@
       <Focus>0</Focus>
       <ColumnNumber>0</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>212</TopLine>
+      <TopLine>214</TopLine>
       <CurrentLine>218</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\vendor\cmsis_rtos_rtx\RTX_Conf_CM.c</PathWithFileName>
@@ -1522,7 +1522,7 @@
       <Focus>0</Focus>
       <ColumnNumber>68</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>115</TopLine>
+      <TopLine>117</TopLine>
       <CurrentLine>120</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</PathWithFileName>
@@ -1554,7 +1554,7 @@
       <Focus>0</Focus>
       <ColumnNumber>25</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>161</TopLine>
+      <TopLine>163</TopLine>
       <CurrentLine>166</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</PathWithFileName>
@@ -1658,7 +1658,7 @@
       <Focus>0</Focus>
       <ColumnNumber>22</ColumnNumber>
       <tvExpOptDlg>0</tvExpOptDlg>
-      <TopLine>123</TopLine>
+      <TopLine>125</TopLine>
       <CurrentLine>128</CurrentLine>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</PathWithFileName>
diff --git a/tinyusb/osal/osal_cmsis_rtx.h b/tinyusb/osal/osal_cmsis_rtx.h
index cdeef61c..0495df06 100644
--- a/tinyusb/osal/osal_cmsis_rtx.h
+++ b/tinyusb/osal/osal_cmsis_rtx.h
@@ -64,7 +64,7 @@
 typedef osThreadDef_t osal_task_t;
 
 #define OSAL_TASK_DEF(task_code, task_stack_depth, task_prio) \
-  osThreadDef(task_code, task_prio, 1, task_stack_depth*4) // stack depth is in bytes
+  osThreadDef(task_code, (osPriority) task_prio, 1, task_stack_depth*4) // stack depth is in bytes
 
 #define OSAL_TASK_REF(task_name)    osThread(task_name)