Merge remote-tracking branch 'origin/master' into HEAD

Change-Id: I9a1458b1344f89ca04cab96c3599c9cfea757929
2021-04-16 19:22:07 +08:00
parent 57f6e1f181 530b738dec
commit 49be405820
31 changed files with 318 additions and 172 deletions
--- a/targets/cortex-m3_stm32f103_simulator_keil/project/los_demo.uvproj
+++ b/targets/cortex-m3_stm32f103_simulator_keil/project/los_demo.uvproj
@@ -512,6 +512,11 @@
              <FileType>1</FileType>
              <FilePath>..\..\..\utils\los_error.c</FilePath>
            </File>
+            <File>
+              <FileName>los_hook.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\utils\los_hook.c</FilePath>
+            </File>
            <File>
              <FileName>los_context.c</FileName>
              <FileType>1</FileType>