Merge pull request #6 from spanio/clinard/deprecate-cmsis-os1

FW3: Extract os2_control_blocks from cmsis_os2.h
spanio · May 2, 2023 · 95a5a11 · 95a5a11
2 parents c14995c + 49715c8
commit 95a5a11
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/CMSIS/RTOS2/FreeRTOS/CMakeLists.txt b/CMSIS/RTOS2/FreeRTOS/CMakeLists.txt
@@ -3,8 +3,7 @@
 add_library(FW3_CMSIS_TARGET)
 target_sources(
   FW3_CMSIS_TARGET
-  PRIVATE ${FW3_CMSIS_DIR}/Source/cmsis_os1.c
-          ${FW3_CMSIS_DIR}/Source/cmsis_os2.c
+  PRIVATE ${FW3_CMSIS_DIR}/Source/cmsis_os2.c
           ${FW3_CMSIS_DIR}/Source/freertos_evr.c
           ${FW3_CMSIS_DIR}/Source/os_systick.c
           ${FW3_CMSIS_DIR}/Source/ARM/clib_arm.c)

diff --git a/CMSIS/RTOS2/FreeRTOS/Include/freertos_os2.h b/CMSIS/RTOS2/FreeRTOS/Include/freertos_os2.h
@@ -30,7 +30,7 @@
 
 #include "FreeRTOS.h"                   // ARM.FreeRTOS::RTOS:Core
 
-#include "freertos_os2_control_blocks.h"
+#include "os2_control_blocks.h"
 
 #if defined(_RTE_)
 #include "RTE_Components.h"             // Component selection

diff --git a/...TOS/Include/freertos_os2_control_blocks.h → ...OS2/FreeRTOS/Include/os2_control_blocks.h b/...TOS/Include/freertos_os2_control_blocks.h → ...OS2/FreeRTOS/Include/os2_control_blocks.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "FreeRTOS.h"
-#include "cmsis_os.h"
+#include "cmsis_os2.h"
 #include "freertos_mpool.h"
 #include "semphr.h"
 

diff --git a/CMSIS/RTOS2/FreeRTOS/Include1/cmsis_os.h b/CMSIS/RTOS2/FreeRTOS/Include1/cmsis_os.h
@@ -154,7 +154,6 @@
 #endif
 
 #include "cmsis_os2.h"
-#include "freertos_os2_control_blocks.h"
 
 #ifdef  __cplusplus
 extern "C"