portability: move cmsis APIs to subsys/portability

Move cmsis OS apis under subsystem/portability. Those are not libraries and only serve to provide a level of abstraction using the CMSIS OS APIs to existing Zephyr interfaces. Signed-off-by: Anas Nashif <[email protected]>
chrta · Apr 20, 2021 · a15f32f · a15f32f
1 parent 077447a
commit a15f32f
Show file tree

Hide file tree

Showing 30 changed files with 17 additions and 6 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -4,8 +4,6 @@ if(NOT CONFIG_EXTERNAL_LIBC)
 add_subdirectory(libc)
 add_subdirectory(posix)
 endif()
-add_subdirectory_ifdef(CONFIG_CMSIS_RTOS_V1        cmsis_rtos_v1)
-add_subdirectory_ifdef(CONFIG_CMSIS_RTOS_V2        cmsis_rtos_v2)
 add_subdirectory(gui)
 add_subdirectory(os)
 add_subdirectory(util)

diff --git a/lib/Kconfig b/lib/Kconfig
@@ -5,10 +5,6 @@ source "lib/libc/Kconfig"
 
 menu "Additional libraries"
 
-source "lib/cmsis_rtos_v1/Kconfig"
-
-source "lib/cmsis_rtos_v2/Kconfig"
-
 source "lib/gui/Kconfig"
 
 source "lib/os/Kconfig"

diff --git a/subsys/CMakeLists.txt b/subsys/CMakeLists.txt
@@ -19,6 +19,7 @@ add_subdirectory(random)
 add_subdirectory(storage)
 add_subdirectory_ifdef(CONFIG_SETTINGS             settings)
 add_subdirectory(fb)
+add_subdirectory(portability)
 add_subdirectory(power)
 add_subdirectory(stats)
 add_subdirectory(task_wdt)

diff --git a/subsys/Kconfig b/subsys/Kconfig
@@ -38,6 +38,8 @@ source "subsys/modbus/Kconfig"
 
 source "subsys/net/Kconfig"
 
+source "subsys/portability/Kconfig"
+
 source "subsys/power/Kconfig"
 
 source "subsys/shell/Kconfig"

diff --git a/subsys/portability/CMakeLists.txt b/subsys/portability/CMakeLists.txt
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0
+
+add_subdirectory_ifdef(CONFIG_CMSIS_RTOS_V1        cmsis_rtos_v1)
+add_subdirectory_ifdef(CONFIG_CMSIS_RTOS_V2        cmsis_rtos_v2)
diff --git a/subsys/portability/Kconfig b/subsys/portability/Kconfig
@@ -0,0 +1,10 @@
+# Copyright (c) 2021 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+menu "Portability"
+
+source "subsys/portability/cmsis_rtos_v1/Kconfig"
+
+source "subsys/portability/cmsis_rtos_v2/Kconfig"
+
+endmenu
diff --git a/lib/cmsis_rtos_v1/CMakeLists.txt → .../portability/cmsis_rtos_v1/CMakeLists.txt b/lib/cmsis_rtos_v1/CMakeLists.txt → .../portability/cmsis_rtos_v1/CMakeLists.txt
diff --git a/lib/cmsis_rtos_v1/Kconfig → subsys/portability/cmsis_rtos_v1/Kconfig b/lib/cmsis_rtos_v1/Kconfig → subsys/portability/cmsis_rtos_v1/Kconfig
diff --git a/lib/cmsis_rtos_v1/cmsis_kernel.c → .../portability/cmsis_rtos_v1/cmsis_kernel.c b/lib/cmsis_rtos_v1/cmsis_kernel.c → .../portability/cmsis_rtos_v1/cmsis_kernel.c
diff --git a/lib/cmsis_rtos_v1/cmsis_mailq.c → ...s/portability/cmsis_rtos_v1/cmsis_mailq.c b/lib/cmsis_rtos_v1/cmsis_mailq.c → ...s/portability/cmsis_rtos_v1/cmsis_mailq.c
diff --git a/lib/cmsis_rtos_v1/cmsis_mempool.c → ...portability/cmsis_rtos_v1/cmsis_mempool.c b/lib/cmsis_rtos_v1/cmsis_mempool.c → ...portability/cmsis_rtos_v1/cmsis_mempool.c
diff --git a/lib/cmsis_rtos_v1/cmsis_msgq.c → ...ys/portability/cmsis_rtos_v1/cmsis_msgq.c b/lib/cmsis_rtos_v1/cmsis_msgq.c → ...ys/portability/cmsis_rtos_v1/cmsis_msgq.c
diff --git a/lib/cmsis_rtos_v1/cmsis_mutex.c → ...s/portability/cmsis_rtos_v1/cmsis_mutex.c b/lib/cmsis_rtos_v1/cmsis_mutex.c → ...s/portability/cmsis_rtos_v1/cmsis_mutex.c
diff --git a/lib/cmsis_rtos_v1/cmsis_semaphore.c → ...rtability/cmsis_rtos_v1/cmsis_semaphore.c b/lib/cmsis_rtos_v1/cmsis_semaphore.c → ...rtability/cmsis_rtos_v1/cmsis_semaphore.c
diff --git a/lib/cmsis_rtos_v1/cmsis_signal.c → .../portability/cmsis_rtos_v1/cmsis_signal.c b/lib/cmsis_rtos_v1/cmsis_signal.c → .../portability/cmsis_rtos_v1/cmsis_signal.c
diff --git a/lib/cmsis_rtos_v1/cmsis_thread.c → .../portability/cmsis_rtos_v1/cmsis_thread.c b/lib/cmsis_rtos_v1/cmsis_thread.c → .../portability/cmsis_rtos_v1/cmsis_thread.c
diff --git a/lib/cmsis_rtos_v1/cmsis_timer.c → ...s/portability/cmsis_rtos_v1/cmsis_timer.c b/lib/cmsis_rtos_v1/cmsis_timer.c → ...s/portability/cmsis_rtos_v1/cmsis_timer.c
diff --git a/lib/cmsis_rtos_v1/cmsis_wait.c → ...ys/portability/cmsis_rtos_v1/cmsis_wait.c b/lib/cmsis_rtos_v1/cmsis_wait.c → ...ys/portability/cmsis_rtos_v1/cmsis_wait.c
diff --git a/lib/cmsis_rtos_v2/CMakeLists.txt → .../portability/cmsis_rtos_v2/CMakeLists.txt b/lib/cmsis_rtos_v2/CMakeLists.txt → .../portability/cmsis_rtos_v2/CMakeLists.txt
diff --git a/lib/cmsis_rtos_v2/Kconfig → subsys/portability/cmsis_rtos_v2/Kconfig b/lib/cmsis_rtos_v2/Kconfig → subsys/portability/cmsis_rtos_v2/Kconfig
diff --git a/lib/cmsis_rtos_v2/event_flags.c → ...s/portability/cmsis_rtos_v2/event_flags.c b/lib/cmsis_rtos_v2/event_flags.c → ...s/portability/cmsis_rtos_v2/event_flags.c
diff --git a/lib/cmsis_rtos_v2/kernel.c → subsys/portability/cmsis_rtos_v2/kernel.c b/lib/cmsis_rtos_v2/kernel.c → subsys/portability/cmsis_rtos_v2/kernel.c
diff --git a/lib/cmsis_rtos_v2/mempool.c → subsys/portability/cmsis_rtos_v2/mempool.c b/lib/cmsis_rtos_v2/mempool.c → subsys/portability/cmsis_rtos_v2/mempool.c
diff --git a/lib/cmsis_rtos_v2/msgq.c → subsys/portability/cmsis_rtos_v2/msgq.c b/lib/cmsis_rtos_v2/msgq.c → subsys/portability/cmsis_rtos_v2/msgq.c
diff --git a/lib/cmsis_rtos_v2/mutex.c → subsys/portability/cmsis_rtos_v2/mutex.c b/lib/cmsis_rtos_v2/mutex.c → subsys/portability/cmsis_rtos_v2/mutex.c
diff --git a/lib/cmsis_rtos_v2/semaphore.c → subsys/portability/cmsis_rtos_v2/semaphore.c b/lib/cmsis_rtos_v2/semaphore.c → subsys/portability/cmsis_rtos_v2/semaphore.c
diff --git a/lib/cmsis_rtos_v2/thread.c → subsys/portability/cmsis_rtos_v2/thread.c b/lib/cmsis_rtos_v2/thread.c → subsys/portability/cmsis_rtos_v2/thread.c
diff --git a/lib/cmsis_rtos_v2/thread_flags.c → .../portability/cmsis_rtos_v2/thread_flags.c b/lib/cmsis_rtos_v2/thread_flags.c → .../portability/cmsis_rtos_v2/thread_flags.c
diff --git a/lib/cmsis_rtos_v2/timer.c → subsys/portability/cmsis_rtos_v2/timer.c b/lib/cmsis_rtos_v2/timer.c → subsys/portability/cmsis_rtos_v2/timer.c
diff --git a/lib/cmsis_rtos_v2/wrapper.h → subsys/portability/cmsis_rtos_v2/wrapper.h b/lib/cmsis_rtos_v2/wrapper.h → subsys/portability/cmsis_rtos_v2/wrapper.h