michaelh/zephyr
1
0
Fork 0
Code Releases Activity

portability: move cmsis api headers

Browse source 
Move cmsis OS api headers under include/portability. Those are not
libraries and only serve to provide a level of abstraction using the
CMSIS OS APIs to existing Zephyr interfaces.

Removed one level and put them directly under include/portability.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2021-03-26 09:34:27 -04:00
commit 3b3e858c50
11 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/zephyr.doxyfile.in
View file

@ -795,8 +795,8 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is # Note that relative paths are relative to the directory from which doxygen is
# run. # run.
EXCLUDE = @ZEPHYR_BASE@/include/cmsis_rtos_v1/cmsis_os.h \ EXCLUDE = @ZEPHYR_BASE@/include/portability/cmsis_os.h \
@ZEPHYR_BASE@/include/cmsis_rtos_v2/cmsis_os2.h \ @ZEPHYR_BASE@/include/portability/cmsis_os2.h \
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded # directories that are symbolic links (a Unix file system feature) are excluded

0
include/cmsis_rtos_v1/cmsis_os.h → include/portability/cmsis_os.h
View file

0
include/cmsis_rtos_v2/cmsis_os2.h → include/portability/cmsis_os2.h
View file

2
samples/portability/cmsis_rtos_v1/philosophers/CMakeLists.txt
View file

@ -14,5 +14,5 @@ if(DEFINED FORKS)
zephyr_compile_definitions(FORKS=${FORKS}) zephyr_compile_definitions(FORKS=${FORKS})
endif() endif()
target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/cmsis_rtos_v1) target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/portability)
target_sources(app PRIVATE src/main.c) target_sources(app PRIVATE src/main.c)

2
samples/portability/cmsis_rtos_v1/timer_synchronization/CMakeLists.txt
View file

@ -4,5 +4,5 @@ cmake_minimum_required(VERSION 3.13.1)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(cmsis_rtos_v1_synchronization) project(cmsis_rtos_v1_synchronization)
target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/cmsis_rtos_v1) target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/portability)
target_sources(app PRIVATE src/main.c) target_sources(app PRIVATE src/main.c)

2
samples/portability/cmsis_rtos_v2/philosophers/CMakeLists.txt
View file

@ -14,5 +14,5 @@ if(DEFINED FORKS)
zephyr_compile_definitions(FORKS=${FORKS}) zephyr_compile_definitions(FORKS=${FORKS})
endif() endif()
target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/cmsis_rtos_v2) target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/portability)
target_sources(app PRIVATE src/main.c) target_sources(app PRIVATE src/main.c)

2
samples/portability/cmsis_rtos_v2/timer_synchronization/CMakeLists.txt
View file

@ -4,5 +4,5 @@ cmake_minimum_required(VERSION 3.13.1)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(cmsis_synchronization) project(cmsis_synchronization)
target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/cmsis_rtos_v2) target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/portability)
target_sources(app PRIVATE src/main.c) target_sources(app PRIVATE src/main.c)

2
subsys/portability/cmsis_rtos_v1/CMakeLists.txt
View file

@ -3,7 +3,7 @@
add_library(CMSIS INTERFACE) add_library(CMSIS INTERFACE)
target_include_directories(CMSIS INTERFACE ${PROJECT_SOURCE_DIR}/include/cmsis_rtos_v1) target_include_directories(CMSIS INTERFACE ${PROJECT_SOURCE_DIR}/include/portability)
zephyr_library() zephyr_library()
zephyr_library_sources_ifdef( zephyr_library_sources_ifdef(

2
subsys/portability/cmsis_rtos_v2/CMakeLists.txt
View file

@ -3,7 +3,7 @@
add_library(CMSIS INTERFACE) add_library(CMSIS INTERFACE)
target_include_directories(CMSIS INTERFACE ${PROJECT_SOURCE_DIR}/include/cmsis_rtos_v2) target_include_directories(CMSIS INTERFACE ${PROJECT_SOURCE_DIR}/include/portability)
zephyr_library() zephyr_library()
zephyr_library_sources_ifdef( zephyr_library_sources_ifdef(

2
tests/portability/cmsis_rtos_v1/CMakeLists.txt
View file

@ -4,6 +4,6 @@ cmake_minimum_required(VERSION 3.13.1)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(cmsis_rtos_v1) project(cmsis_rtos_v1)
target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/cmsis_rtos_v1) target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/portability)
FILE(GLOB app_sources src/*.c) FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources}) target_sources(app PRIVATE ${app_sources})

2
tests/portability/cmsis_rtos_v2/CMakeLists.txt
View file

@ -4,6 +4,6 @@ cmake_minimum_required(VERSION 3.13.1)
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
project(cmsis_rtos_v2) project(cmsis_rtos_v2)
target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/cmsis_rtos_v2) target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/portability)
FILE(GLOB app_sources src/*.c) FILE(GLOB app_sources src/*.c)
target_sources(app PRIVATE ${app_sources}) target_sources(app PRIVATE ${app_sources})