From 23e852a41afa5e59bed0ea47b49e37f2583c366e Mon Sep 17 00:00:00 2001
From: supowang <supowang@tencent.com>
Date: Mon, 28 Oct 2019 17:36:42 +0800
Subject: [PATCH] fix iar compile error for kernel change

---
 .../hello_world/ALIENTEK_Aploo_STM32F767.ewp  | 35 +++++++++++++------
 .../IAR/hello_world/NUCLEO_STM32F401RE.ewp    | 35 +++++++++++++------
 .../IAR/hello_world/TencentOS_tiny.ewp        | 33 +++++++++++++----
 3 files changed, 77 insertions(+), 26 deletions(-)

diff --git a/board/ALIENTEK_Apollo_STM32F767/IAR/hello_world/ALIENTEK_Aploo_STM32F767.ewp b/board/ALIENTEK_Apollo_STM32F767/IAR/hello_world/ALIENTEK_Aploo_STM32F767.ewp
index 265e60f4..e472463a 100644
--- a/board/ALIENTEK_Apollo_STM32F767/IAR/hello_world/ALIENTEK_Aploo_STM32F767.ewp
+++ b/board/ALIENTEK_Apollo_STM32F767/IAR/hello_world/ALIENTEK_Aploo_STM32F767.ewp
@@ -1172,14 +1172,29 @@
         </group>
         <group>
             <name>kernel</name>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_binary_heap.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_char_fifo.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_completion.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_countdownlatch.c</name>
+            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_event.c</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_fifo.c</name>
+                <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_global.c</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_global.c</name>
+                <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_mail_queue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_message_queue.c</name>
             </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_mmblk.c</name>
@@ -1187,9 +1202,6 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_mmheap.c</name>
             </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_msg.c</name>
-            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_mutex.c</name>
             </file>
@@ -1197,10 +1209,16 @@
                 <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_pend.c</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\kernel\pm\tos_pm.c</name>
+                <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_priority_mail_queue.c</name>
             </file>
             <file>
-                <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_queue.c</name>
+                <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_priority_message_queue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_priority_queue.c</name>
+            </file>
+            <file>
+                <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_ring_queue.c</name>
             </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_robin.c</name>
@@ -1220,9 +1238,6 @@
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_tick.c</name>
             </file>
-            <file>
-                <name>$PROJ_DIR$\..\..\..\..\kernel\pm\tos_tickless.c</name>
-            </file>
             <file>
                 <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_time.c</name>
             </file>
diff --git a/board/NUCLEO_STM32F401RE/IAR/hello_world/NUCLEO_STM32F401RE.ewp b/board/NUCLEO_STM32F401RE/IAR/hello_world/NUCLEO_STM32F401RE.ewp
index 77c9f988..df6bc6fc 100644
--- a/board/NUCLEO_STM32F401RE/IAR/hello_world/NUCLEO_STM32F401RE.ewp
+++ b/board/NUCLEO_STM32F401RE/IAR/hello_world/NUCLEO_STM32F401RE.ewp
@@ -66,7 +66,7 @@
                 </option>
                 <option>
                     <name>OGLastSavedByProductVersion</name>
-                    <state>8.32.2.19370</state>
+                    <state>8.32.1.18618</state>
                 </option>
                 <option>
                     <name>GeneralEnableMisra</name>
@@ -116,7 +116,7 @@
                 </option>
                 <option>
                     <name>GBECoreSlave</name>
-                    <version>27</version>
+                    <version>26</version>
                     <state>39</state>
                 </option>
                 <option>
@@ -133,7 +133,7 @@
                 </option>
                 <option>
                     <name>CoreVariant</name>
-                    <version>27</version>
+                    <version>26</version>
                     <state>39</state>
                 </option>
                 <option>
@@ -156,7 +156,7 @@
                 </option>
                 <option>
                     <name>GFPUCoreSlave2</name>
-                    <version>27</version>
+                    <version>26</version>
                     <state>39</state>
                 </option>
                 <option>
@@ -1164,6 +1164,12 @@
     </group>
     <group>
         <name>tos/kernel</name>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_binary_heap.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_char_fifo.c</name>
+        </file>
         <file>
             <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_completion.c</name>
         </file>
@@ -1174,10 +1180,13 @@
             <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_event.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_fifo.c</name>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_global.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_global.c</name>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_mail_queue.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_message_queue.c</name>
         </file>
         <file>
             <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_mmblk.c</name>
@@ -1185,9 +1194,6 @@
         <file>
             <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_mmheap.c</name>
         </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_msg.c</name>
-        </file>
         <file>
             <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_mutex.c</name>
         </file>
@@ -1195,7 +1201,16 @@
             <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_pend.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_queue.c</name>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_priority_mail_queue.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_priority_message_queue.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_priority_queue.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_ring_queue.c</name>
         </file>
         <file>
             <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_robin.c</name>
diff --git a/board/NUCLEO_STM32L073RZ/IAR/hello_world/TencentOS_tiny.ewp b/board/NUCLEO_STM32L073RZ/IAR/hello_world/TencentOS_tiny.ewp
index b4e1ce63..bf1b0e59 100644
--- a/board/NUCLEO_STM32L073RZ/IAR/hello_world/TencentOS_tiny.ewp
+++ b/board/NUCLEO_STM32L073RZ/IAR/hello_world/TencentOS_tiny.ewp
@@ -1167,14 +1167,29 @@
     </group>
     <group>
         <name>tos/kernel</name>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_binary_heap.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_char_fifo.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_completion.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_countdownlatch.c</name>
+        </file>
         <file>
             <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_event.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_fifo.c</name>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_global.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_global.c</name>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_mail_queue.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_message_queue.c</name>
         </file>
         <file>
             <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_mmblk.c</name>
@@ -1182,9 +1197,6 @@
         <file>
             <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_mmheap.c</name>
         </file>
-        <file>
-            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_msg.c</name>
-        </file>
         <file>
             <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_mutex.c</name>
         </file>
@@ -1192,7 +1204,16 @@
             <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_pend.c</name>
         </file>
         <file>
-            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_queue.c</name>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_priority_mail_queue.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_priority_message_queue.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_priority_queue.c</name>
+        </file>
+        <file>
+            <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_ring_queue.c</name>
         </file>
         <file>
             <name>$PROJ_DIR$\..\..\..\..\kernel\core\tos_robin.c</name>