build: namespace the generated headers with `zephyr/`
Namespaced the generated headers with `zephyr` to prevent
potential conflict with other headers.
Introduce a temporary Kconfig `LEGACY_GENERATED_INCLUDE_PATH`
that is enabled by default. This allows the developers to
continue the use of the old include paths for the time being
until it is deprecated and eventually removed. The Kconfig will
generate a build-time warning message, similar to the
`CONFIG_TIMER_RANDOM_GENERATOR`.
Updated the includes path of in-tree sources accordingly.
Most of the changes here are scripted, check the PR for more
info.
Signed-off-by: Yong Cong Sin <ycsin@meta.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e9fc72..7cb3ed7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,6 +109,15 @@
# flags that come with zephyr_interface.
zephyr_library_named(zephyr)
+if(CONFIG_LEGACY_GENERATED_INCLUDE_PATH)
+ zephyr_include_directories(${PROJECT_BINARY_DIR}/include/generated/zephyr)
+ message(WARNING "
+ Warning: CONFIG_LEGACY_GENERATED_INCLUDE_PATH is currently enabled by default
+ so that user applications can continue to use the legacy include paths for the
+ generated headers. This Kconfig will be deprecated and eventually removed in
+ the future releases.")
+endif()
+
zephyr_include_directories(
include
${PROJECT_BINARY_DIR}/include/generated
@@ -541,9 +550,9 @@
endif()
add_custom_command(
- OUTPUT ${PROJECT_BINARY_DIR}/include/generated/version.h
+ OUTPUT ${PROJECT_BINARY_DIR}/include/generated/zephyr/version.h
COMMAND ${CMAKE_COMMAND} -DZEPHYR_BASE=${ZEPHYR_BASE}
- -DOUT_FILE=${PROJECT_BINARY_DIR}/include/generated/version.h
+ -DOUT_FILE=${PROJECT_BINARY_DIR}/include/generated/zephyr/version.h
-DVERSION_TYPE=KERNEL
-DVERSION_FILE=${ZEPHYR_BASE}/VERSION
-DKERNEL_VERSION_CUSTOMIZATION="$<TARGET_PROPERTY:version_h,KERNEL_VERSION_CUSTOMIZATION>"
@@ -552,13 +561,13 @@
DEPENDS ${ZEPHYR_BASE}/VERSION ${git_dependency}
COMMAND_EXPAND_LISTS
)
-add_custom_target(version_h DEPENDS ${PROJECT_BINARY_DIR}/include/generated/version.h)
+add_custom_target(version_h DEPENDS ${PROJECT_BINARY_DIR}/include/generated/zephyr/version.h)
if(EXISTS ${APPLICATION_SOURCE_DIR}/VERSION)
add_custom_command(
- OUTPUT ${PROJECT_BINARY_DIR}/include/generated/app_version.h
+ OUTPUT ${PROJECT_BINARY_DIR}/include/generated/zephyr/app_version.h
COMMAND ${CMAKE_COMMAND} -DZEPHYR_BASE=${ZEPHYR_BASE}
- -DOUT_FILE=${PROJECT_BINARY_DIR}/include/generated/app_version.h
+ -DOUT_FILE=${PROJECT_BINARY_DIR}/include/generated/zephyr/app_version.h
-DVERSION_TYPE=APP
-DVERSION_FILE=${APPLICATION_SOURCE_DIR}/VERSION
-DAPP_VERSION_CUSTOMIZATION="$<TARGET_PROPERTY:app_version_h,APP_VERSION_CUSTOMIZATION>"
@@ -567,7 +576,9 @@
DEPENDS ${APPLICATION_SOURCE_DIR}/VERSION ${git_dependency}
COMMAND_EXPAND_LISTS
)
- add_custom_target(app_version_h DEPENDS ${PROJECT_BINARY_DIR}/include/generated/app_version.h)
+ add_custom_target(
+ app_version_h
+ DEPENDS ${PROJECT_BINARY_DIR}/include/generated/zephyr/app_version.h)
add_dependencies(zephyr_interface app_version_h)
endif()
@@ -622,8 +633,8 @@
get_property(LIBC_LINK_LIBRARIES TARGET zephyr_interface PROPERTY LIBC_LINK_LIBRARIES)
zephyr_link_libraries(${LIBC_LINK_LIBRARIES})
-set(syscall_list_h ${CMAKE_CURRENT_BINARY_DIR}/include/generated/syscall_list.h)
-set(edk_syscall_list_h ${CMAKE_CURRENT_BINARY_DIR}/edk/include/generated/syscall_list.h)
+set(syscall_list_h ${CMAKE_CURRENT_BINARY_DIR}/include/generated/zephyr/syscall_list.h)
+set(edk_syscall_list_h ${CMAKE_CURRENT_BINARY_DIR}/edk/include/generated/zephyr/syscall_list.h)
set(syscalls_json ${CMAKE_CURRENT_BINARY_DIR}/misc/generated/syscalls.json)
set(struct_tags_json ${CMAKE_CURRENT_BINARY_DIR}/misc/generated/struct_tags.json)
@@ -761,7 +772,7 @@
set_property(TARGET ${SYSCALL_LIST_H_TARGET}
APPEND PROPERTY
ADDITIONAL_CLEAN_FILES
- ${CMAKE_CURRENT_BINARY_DIR}/include/generated/syscalls
+ ${CMAKE_CURRENT_BINARY_DIR}/include/generated/zephyr/syscalls
)
add_custom_target(${PARSE_SYSCALLS_TARGET}
@@ -781,19 +792,30 @@
set(SYSCALL_SPLIT_TIMEOUT_ARG --split-type k_timeout_t --split-type k_ticks_t)
endif()
+# percepio/TraceRecorder/kernelports/Zephyr/scripts/tz_parse_syscalls.py hardcodes the path
+# to the `syscall_list.h`, make a copy of the generated file so that percepio is able to build
+if(CONFIG_LEGACY_GENERATED_INCLUDE_PATH)
+ set(LEGACY_SYSCALL_LIST_H_ARGS
+ ${CMAKE_COMMAND} -E copy
+ ${syscall_list_h}
+ ${CMAKE_CURRENT_BINARY_DIR}/include/generated/syscall_list.h)
+endif()
+
add_custom_command(OUTPUT include/generated/syscall_dispatch.c ${syscall_list_h}
- # Also, some files are written to include/generated/syscalls/
+ # Also, some files are written to include/generated/zephyr/syscalls/
COMMAND
${PYTHON_EXECUTABLE}
${ZEPHYR_BASE}/scripts/build/gen_syscalls.py
--json-file ${syscalls_json} # Read this file
- --base-output include/generated/syscalls # Write to this dir
+ --base-output include/generated/zephyr/syscalls # Write to this dir
--syscall-dispatch include/generated/syscall_dispatch.c # Write this file
--syscall-export-llext include/generated/syscall_export_llext.c
--syscall-list ${syscall_list_h}
$<$<BOOL:${CONFIG_USERSPACE}>:--gen-mrsh-files>
${SYSCALL_LONG_REGISTERS_ARG}
${SYSCALL_SPLIT_TIMEOUT_ARG}
+ COMMAND
+ ${LEGACY_SYSCALL_LIST_H_ARGS}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${PARSE_SYSCALLS_TARGET}
)
@@ -801,7 +823,7 @@
# This is passed into all calls to the gen_kobject_list.py script.
set(gen_kobject_list_include_args --include-subsystem-list ${struct_tags_json})
-set(DRV_VALIDATION ${PROJECT_BINARY_DIR}/include/generated/driver-validation.h)
+set(DRV_VALIDATION ${PROJECT_BINARY_DIR}/include/generated/zephyr/driver-validation.h)
add_custom_command(
OUTPUT ${DRV_VALIDATION}
COMMAND
@@ -834,7 +856,7 @@
set(OFFSETS_LIB offsets)
set(OFFSETS_C_PATH ${ARCH_DIR}/${ARCH}/core/offsets/offsets.c)
-set(OFFSETS_H_PATH ${PROJECT_BINARY_DIR}/include/generated/offsets.h)
+set(OFFSETS_H_PATH ${PROJECT_BINARY_DIR}/include/generated/zephyr/offsets.h)
add_library( ${OFFSETS_LIB} OBJECT ${OFFSETS_C_PATH})
target_include_directories(${OFFSETS_LIB} PRIVATE
@@ -1197,7 +1219,7 @@
PUBLIC $<TARGET_PROPERTY:zephyr_interface,INTERFACE_SYSTEM_INCLUDE_DIRECTORIES>
)
- set(KOBJECT_LINKER_HEADER_DATA "${PROJECT_BINARY_DIR}/include/generated/linker-kobject-prebuilt-data.h")
+ set(KOBJECT_LINKER_HEADER_DATA "${PROJECT_BINARY_DIR}/include/generated/zephyr/linker-kobject-prebuilt-data.h")
add_custom_command(
OUTPUT ${KOBJECT_LINKER_HEADER_DATA}
@@ -1205,7 +1227,7 @@
${PYTHON_EXECUTABLE}
${ZEPHYR_BASE}/scripts/build/gen_kobject_placeholders.py
--object $<TARGET_OBJECTS:kobj_prebuilt_hash_output_lib>
- --outdir ${PROJECT_BINARY_DIR}/include/generated
+ --outdir ${PROJECT_BINARY_DIR}/include/generated/zephyr
--datapct ${CONFIG_KOBJECT_DATA_AREA_RESERVE_EXTRA_PERCENT}
--rodata ${CONFIG_KOBJECT_RODATA_AREA_EXTRA_BYTES}
$<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:--verbose>
@@ -1962,7 +1984,7 @@
${ZEPHYR_BASE}/scripts/logging/dictionary/database_gen.py
${KERNEL_ELF_NAME}
${LOG_DICT_DB_NAME_ARG}=${LOG_DICT_DB_NAME}
- --build-header ${PROJECT_BINARY_DIR}/include/generated/version.h
+ --build-header ${PROJECT_BINARY_DIR}/include/generated/zephyr/version.h
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
COMMENT "Generating logging dictionary database: ${LOG_DICT_DB_NAME}"
DEPENDS ${logical_target_for_zephyr_elf}
@@ -2093,12 +2115,12 @@
OUTPUT ${llext_edk_file}
# Regenerate syscalls in case CONFIG_LLEXT_EDK_USERSPACE_ONLY
COMMAND ${CMAKE_COMMAND}
- -E make_directory edk/include/generated
+ -E make_directory edk/include/generated/zephyr
COMMAND
${PYTHON_EXECUTABLE}
${ZEPHYR_BASE}/scripts/build/gen_syscalls.py
--json-file ${syscalls_json} # Read this file
- --base-output edk/include/generated/syscalls # Write to this dir
+ --base-output edk/include/generated/zephyr/syscalls # Write to this dir
--syscall-dispatch edk/include/generated/syscall_dispatch.c # Write this file
--syscall-list ${edk_syscall_list_h}
$<$<BOOL:${CONFIG_LLEXT_EDK_USERSPACE_ONLY}>:--userspace-only>
diff --git a/Kconfig.zephyr b/Kconfig.zephyr
index e44cd32..01b5f44 100644
--- a/Kconfig.zephyr
+++ b/Kconfig.zephyr
@@ -1048,3 +1048,20 @@
endchoice
endmenu
+
+menu "Compatibility"
+
+config LEGACY_GENERATED_INCLUDE_PATH
+ bool "Legacy include path for generated headers"
+ default y
+ help
+ Allow applications and libraries to use the Zephyr legacy include
+ path for the generated headers which does not use the `zephyr/` prefix.
+
+ From now on, i.e., the preferred way to include the `version.h` header is to
+ use <zephyr/version.h>, this Kconfig is currently enabled by default so that
+ user applications won't immediately fail to compile.
+
+ This Kconfig will be deprecated and eventually removed in the future releases.
+
+endmenu
diff --git a/arch/arc/include/offsets_short_arch.h b/arch/arc/include/offsets_short_arch.h
index 5bf2c23..f461112 100644
--- a/arch/arc/include/offsets_short_arch.h
+++ b/arch/arc/include/offsets_short_arch.h
@@ -7,7 +7,7 @@
#ifndef ZEPHYR_ARCH_ARC_INCLUDE_OFFSETS_SHORT_ARCH_H_
#define ZEPHYR_ARCH_ARC_INCLUDE_OFFSETS_SHORT_ARCH_H_
-#include <offsets.h>
+#include <zephyr/offsets.h>
/* kernel */
diff --git a/arch/arm/include/offsets_short_arch.h b/arch/arm/include/offsets_short_arch.h
index 4ceb1fc..ea6af4d 100644
--- a/arch/arm/include/offsets_short_arch.h
+++ b/arch/arm/include/offsets_short_arch.h
@@ -7,7 +7,7 @@
#ifndef ZEPHYR_ARCH_ARM_INCLUDE_OFFSETS_SHORT_ARCH_H_
#define ZEPHYR_ARCH_ARM_INCLUDE_OFFSETS_SHORT_ARCH_H_
-#include <offsets.h>
+#include <zephyr/offsets.h>
/* kernel */
diff --git a/arch/arm64/core/reset.S b/arch/arm64/core/reset.S
index 5e406be..a01139a 100644
--- a/arch/arm64/core/reset.S
+++ b/arch/arm64/core/reset.S
@@ -7,7 +7,7 @@
#include <zephyr/toolchain.h>
#include <zephyr/linker/sections.h>
#include <zephyr/arch/cpu.h>
-#include <offsets.h>
+#include <zephyr/offsets.h>
#include "boot.h"
#include "macro_priv.inc"
diff --git a/arch/arm64/core/vector_table.S b/arch/arm64/core/vector_table.S
index 1a1b649..499dbd2 100644
--- a/arch/arm64/core/vector_table.S
+++ b/arch/arm64/core/vector_table.S
@@ -10,7 +10,7 @@
#include <zephyr/toolchain.h>
#include <zephyr/linker/sections.h>
-#include <offsets.h>
+#include <zephyr/offsets.h>
#include <zephyr/arch/cpu.h>
#include <zephyr/arch/arm64/tpidrro_el0.h>
#include <offsets_short.h>
diff --git a/arch/arm64/include/offsets_short_arch.h b/arch/arm64/include/offsets_short_arch.h
index abd93bb..11dd5f6 100644
--- a/arch/arm64/include/offsets_short_arch.h
+++ b/arch/arm64/include/offsets_short_arch.h
@@ -7,7 +7,7 @@
#ifndef ZEPHYR_ARCH_ARM64_INCLUDE_OFFSETS_SHORT_ARCH_H_
#define ZEPHYR_ARCH_ARM64_INCLUDE_OFFSETS_SHORT_ARCH_H_
-#include <offsets.h>
+#include <zephyr/offsets.h>
#define _thread_offset_to_exception_depth \
(___thread_t_arch_OFFSET + ___thread_arch_t_exception_depth_OFFSET)
diff --git a/arch/mips/include/offsets_short_arch.h b/arch/mips/include/offsets_short_arch.h
index bd64dee..8440f0f 100644
--- a/arch/mips/include/offsets_short_arch.h
+++ b/arch/mips/include/offsets_short_arch.h
@@ -9,7 +9,7 @@
#ifndef ZEPHYR_ARCH_MIPS_INCLUDE_OFFSETS_SHORT_ARCH_H_
#define ZEPHYR_ARCH_MIPS_INCLUDE_OFFSETS_SHORT_ARCH_H_
-#include <offsets.h>
+#include <zephyr/offsets.h>
#define _thread_offset_to_sp \
(___thread_t_callee_saved_OFFSET + ___callee_saved_t_sp_OFFSET)
diff --git a/arch/nios2/include/offsets_short_arch.h b/arch/nios2/include/offsets_short_arch.h
index b3f6097..3b961e1 100644
--- a/arch/nios2/include/offsets_short_arch.h
+++ b/arch/nios2/include/offsets_short_arch.h
@@ -7,7 +7,7 @@
#ifndef ZEPHYR_ARCH_NIOS2_INCLUDE_OFFSETS_SHORT_ARCH_H_
#define ZEPHYR_ARCH_NIOS2_INCLUDE_OFFSETS_SHORT_ARCH_H_
-#include <offsets.h>
+#include <zephyr/offsets.h>
/* kernel */
diff --git a/arch/posix/include/offsets_short_arch.h b/arch/posix/include/offsets_short_arch.h
index b33414b..5281d68 100644
--- a/arch/posix/include/offsets_short_arch.h
+++ b/arch/posix/include/offsets_short_arch.h
@@ -7,7 +7,7 @@
#ifndef ZEPHYR_ARCH_POSIX_INCLUDE_OFFSETS_SHORT_ARCH_H_
#define ZEPHYR_ARCH_POSIX_INCLUDE_OFFSETS_SHORT_ARCH_H_
-#include <offsets.h>
+#include <zephyr/offsets.h>
/* kernel */
diff --git a/arch/riscv/core/fatal.c b/arch/riscv/core/fatal.c
index 2624edb..b8736f3 100644
--- a/arch/riscv/core/fatal.c
+++ b/arch/riscv/core/fatal.c
@@ -263,6 +263,6 @@
z_impl_user_fault(reason);
}
-#include <syscalls/user_fault_mrsh.c>
+#include <zephyr/syscalls/user_fault_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/arch/riscv/core/fpu.S b/arch/riscv/core/fpu.S
index 2708d11..981bd57 100644
--- a/arch/riscv/core/fpu.S
+++ b/arch/riscv/core/fpu.S
@@ -7,7 +7,7 @@
#include <zephyr/toolchain.h>
#include <zephyr/linker/sections.h>
-#include <offsets.h>
+#include <zephyr/offsets.h>
#ifdef CONFIG_CPU_HAS_FPU_DOUBLE_PRECISION
#define LOAD fld
diff --git a/arch/riscv/core/reset.S b/arch/riscv/core/reset.S
index e9424e7..89c488f 100644
--- a/arch/riscv/core/reset.S
+++ b/arch/riscv/core/reset.S
@@ -8,7 +8,7 @@
#include <zephyr/toolchain.h>
#include <zephyr/linker/sections.h>
#include <zephyr/arch/cpu.h>
-#include <offsets.h>
+#include <zephyr/offsets.h>
#include "asm_macros.inc"
/* exports */
diff --git a/arch/riscv/include/offsets_short_arch.h b/arch/riscv/include/offsets_short_arch.h
index 3d3a878..27c01a7 100644
--- a/arch/riscv/include/offsets_short_arch.h
+++ b/arch/riscv/include/offsets_short_arch.h
@@ -7,7 +7,7 @@
#ifndef ZEPHYR_ARCH_RISCV_INCLUDE_OFFSETS_SHORT_ARCH_H_
#define ZEPHYR_ARCH_RISCV_INCLUDE_OFFSETS_SHORT_ARCH_H_
-#include <offsets.h>
+#include <zephyr/offsets.h>
#define _thread_offset_to_sp \
(___thread_t_callee_saved_OFFSET + ___callee_saved_t_sp_OFFSET)
diff --git a/arch/sparc/include/offsets_short_arch.h b/arch/sparc/include/offsets_short_arch.h
index c53f2b3..0f9272f 100644
--- a/arch/sparc/include/offsets_short_arch.h
+++ b/arch/sparc/include/offsets_short_arch.h
@@ -7,7 +7,7 @@
#ifndef ZEPHYR_ARCH_SPARC_INCLUDE_OFFSETS_SHORT_ARCH_H_
#define ZEPHYR_ARCH_SPARC_INCLUDE_OFFSETS_SHORT_ARCH_H_
-#include <offsets.h>
+#include <zephyr/offsets.h>
#define _thread_offset_to_y \
(___thread_t_callee_saved_OFFSET + ___callee_saved_t_y_OFFSET)
diff --git a/arch/x86/include/ia32/offsets_short_arch.h b/arch/x86/include/ia32/offsets_short_arch.h
index 2033a55..cb5cdb2 100644
--- a/arch/x86/include/ia32/offsets_short_arch.h
+++ b/arch/x86/include/ia32/offsets_short_arch.h
@@ -7,7 +7,7 @@
#ifndef ZEPHYR_ARCH_X86_INCLUDE_IA32_OFFSETS_SHORT_ARCH_H_
#define ZEPHYR_ARCH_X86_INCLUDE_IA32_OFFSETS_SHORT_ARCH_H_
-#include <offsets.h>
+#include <zephyr/offsets.h>
/* kernel */
diff --git a/arch/x86/include/intel64/offsets_short_arch.h b/arch/x86/include/intel64/offsets_short_arch.h
index 4252ac6..1ffabc8 100644
--- a/arch/x86/include/intel64/offsets_short_arch.h
+++ b/arch/x86/include/intel64/offsets_short_arch.h
@@ -6,7 +6,7 @@
#ifndef ZEPHYR_ARCH_X86_INCLUDE_INTEL64_OFFSETS_SHORT_ARCH_H_
#define ZEPHYR_ARCH_X86_INCLUDE_INTEL64_OFFSETS_SHORT_ARCH_H_
-#include <offsets.h>
+#include <zephyr/offsets.h>
#define _thread_offset_to_rsp \
(___thread_t_callee_saved_OFFSET + ___callee_saved_t_rsp_OFFSET)
diff --git a/arch/xtensa/core/CMakeLists.txt b/arch/xtensa/core/CMakeLists.txt
index 4c2ce81..56ca107 100644
--- a/arch/xtensa/core/CMakeLists.txt
+++ b/arch/xtensa/core/CMakeLists.txt
@@ -48,7 +48,7 @@
# are the official places where we find core-isa.h. (Also that we
# undefine __XCC_ because that compiler actually trips an error trying
# to build this file to protect against mismatched versions.)
-set(CORE_ISA_DM ${CMAKE_BINARY_DIR}/zephyr/include/generated/core-isa-dM.h)
+set(CORE_ISA_DM ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/core-isa-dM.h)
set(CORE_ISA_IN ${CMAKE_BINARY_DIR}/zephyr/include/generated/core-isa-dM.c)
file(WRITE ${CORE_ISA_IN} "#include <xtensa/config/core-isa.h>\n")
add_custom_command(OUTPUT ${CORE_ISA_DM}
@@ -73,7 +73,7 @@
endif()
# Generates a list of device-specific scratch register choices
-set(ZSR_H ${CMAKE_BINARY_DIR}/zephyr/include/generated/zsr.h)
+set(ZSR_H ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/zsr.h)
add_custom_command(OUTPUT ${ZSR_H} DEPENDS ${CORE_ISA_DM}
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gen_zsr.py
$<$<BOOL:${CONFIG_XTENSA_MMU}>:--mmu>
diff --git a/arch/xtensa/core/coredump.c b/arch/xtensa/core/coredump.c
index a2eec62..7f010eb 100644
--- a/arch/xtensa/core/coredump.c
+++ b/arch/xtensa/core/coredump.c
@@ -7,7 +7,7 @@
#include <string.h>
#include <zephyr/debug/coredump.h>
#include <xtensa_asm2_context.h>
-#include <offsets.h>
+#include <zephyr/offsets.h>
#define ARCH_HDR_VER 1
#define XTENSA_BLOCK_HDR_VER 2
diff --git a/arch/xtensa/core/debug_helpers_asm.S b/arch/xtensa/core/debug_helpers_asm.S
index 3dacc1a..6ed5ced 100644
--- a/arch/xtensa/core/debug_helpers_asm.S
+++ b/arch/xtensa/core/debug_helpers_asm.S
@@ -10,7 +10,7 @@
#include <xtensa/hal.h>
#include <xtensa_asm2_context.h>
-#include <offsets.h>
+#include <zephyr/offsets.h>
.section .iram1, "ax"
.align 4
diff --git a/arch/xtensa/core/fatal.c b/arch/xtensa/core/fatal.c
index 6ec5549..0d5da1c 100644
--- a/arch/xtensa/core/fatal.c
+++ b/arch/xtensa/core/fatal.c
@@ -154,6 +154,6 @@
z_impl_xtensa_user_fault(reason);
}
-#include <syscalls/xtensa_user_fault_mrsh.c>
+#include <zephyr/syscalls/xtensa_user_fault_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/arch/xtensa/core/irq_offload.c b/arch/xtensa/core/irq_offload.c
index ad35ef4..c142bfc 100644
--- a/arch/xtensa/core/irq_offload.c
+++ b/arch/xtensa/core/irq_offload.c
@@ -5,7 +5,7 @@
#include <zephyr/kernel.h>
#include <zephyr/irq_offload.h>
-#include <zsr.h>
+#include <zephyr/zsr.h>
#include <zephyr/irq.h>
static struct {
diff --git a/arch/xtensa/core/userspace.S b/arch/xtensa/core/userspace.S
index 1578e3b..507ae17 100644
--- a/arch/xtensa/core/userspace.S
+++ b/arch/xtensa/core/userspace.S
@@ -5,10 +5,10 @@
*/
#include <xtensa_asm2_s.h>
-#include <offsets.h>
+#include <zephyr/offsets.h>
#include <offsets_short.h>
#include <zephyr/syscall.h>
-#include <zsr.h>
+#include <zephyr/zsr.h>
#include <xtensa/config/core-isa.h>
diff --git a/arch/xtensa/core/vector_handlers.c b/arch/xtensa/core/vector_handlers.c
index f0b0a91..dd3c0c0 100644
--- a/arch/xtensa/core/vector_handlers.c
+++ b/arch/xtensa/core/vector_handlers.c
@@ -12,8 +12,8 @@
#include <kswap.h>
#include <zephyr/toolchain.h>
#include <zephyr/logging/log.h>
-#include <offsets.h>
-#include <zsr.h>
+#include <zephyr/offsets.h>
+#include <zephyr/zsr.h>
#include <zephyr/arch/common/exc_handle.h>
#ifdef CONFIG_XTENSA_GEN_HANDLERS
diff --git a/arch/xtensa/core/window_vectors.S b/arch/xtensa/core/window_vectors.S
index 90eba49..6c4e8c4 100644
--- a/arch/xtensa/core/window_vectors.S
+++ b/arch/xtensa/core/window_vectors.S
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <xtensa/coreasm.h>
-#include <zsr.h>
+#include <zephyr/zsr.h>
/* WINDOW OVERFLOW AND UNDERFLOW EXCEPTION VECTORS AND ALLOCA EXCEPTION
* HANDLER
diff --git a/arch/xtensa/core/xtensa_asm2_util.S b/arch/xtensa/core/xtensa_asm2_util.S
index dad8f19..58ca9b4 100644
--- a/arch/xtensa/core/xtensa_asm2_util.S
+++ b/arch/xtensa/core/xtensa_asm2_util.S
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <xtensa_asm2_s.h>
-#include <offsets.h>
-#include <zsr.h>
+#include <zephyr/offsets.h>
+#include <zephyr/zsr.h>
#if defined(CONFIG_SIMULATOR_XTENSA) || defined(XT_SIMULATOR)
#include <xtensa/simcall.h>
diff --git a/arch/xtensa/core/xtensa_hifi.S b/arch/xtensa/core/xtensa_hifi.S
index 3c311ac..dff714c 100644
--- a/arch/xtensa/core/xtensa_hifi.S
+++ b/arch/xtensa/core/xtensa_hifi.S
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#include <offsets.h>
+#include <zephyr/offsets.h>
#include <xtensa/config/tie.h>
#include <xtensa/config/tie-asm.h>
diff --git a/arch/xtensa/include/kernel_arch_func.h b/arch/xtensa/include/kernel_arch_func.h
index 48599f0..29a8982 100644
--- a/arch/xtensa/include/kernel_arch_func.h
+++ b/arch/xtensa/include/kernel_arch_func.h
@@ -14,7 +14,7 @@
#include <kernel_internal.h>
#include <string.h>
#include <zephyr/cache.h>
-#include <zsr.h>
+#include <zephyr/zsr.h>
#ifdef __cplusplus
extern "C" {
diff --git a/arch/xtensa/include/xtensa_asm2_s.h b/arch/xtensa/include/xtensa_asm2_s.h
index dddf7bb..0af8c4c 100644
--- a/arch/xtensa/include/xtensa_asm2_s.h
+++ b/arch/xtensa/include/xtensa_asm2_s.h
@@ -7,10 +7,10 @@
#ifndef ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_S_H
#define ZEPHYR_ARCH_XTENSA_INCLUDE_XTENSA_ASM2_S_H
-#include <zsr.h>
+#include <zephyr/zsr.h>
#include "xtensa_asm2_context.h"
-#include <offsets.h>
+#include <zephyr/offsets.h>
/* Assembler header! This file contains macros designed to be included
* only by the assembler.
diff --git a/boards/qemu/x86/qemu_x86_tiny.ld b/boards/qemu/x86/qemu_x86_tiny.ld
index 623a11f..3b3ecde 100644
--- a/boards/qemu/x86/qemu_x86_tiny.ld
+++ b/boards/qemu/x86/qemu_x86_tiny.ld
@@ -6,7 +6,7 @@
*/
#include <zephyr/devicetree.h>
-#include <offsets.h>
+#include <zephyr/offsets.h>
#include <zephyr/linker/linker-defs.h>
#include <zephyr/linker/linker-tool.h>
#include <zephyr/sys/util.h>
diff --git a/cmake/ide/eclipse_cdt4_generator_amendment.cmake b/cmake/ide/eclipse_cdt4_generator_amendment.cmake
index 1bad729..5fd32a2 100644
--- a/cmake/ide/eclipse_cdt4_generator_amendment.cmake
+++ b/cmake/ide/eclipse_cdt4_generator_amendment.cmake
@@ -9,7 +9,7 @@
#
# Solution:
# The amendment function generates a macro header file
-# ${CMAKE_BINARY_DIR}/zephyr/include/generated/cmake_intdef.h
+# ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/cmake_intdef.h
# based on INTERFACE_COMPILE_DEFINITIONS and appends the
# defines from the file to
# CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS.
@@ -88,7 +88,7 @@
message(" ${_work_mode}")
endif(${_param_defs} EQUAL 1)
-set(OUTPUT_FILE ${CMAKE_BINARY_DIR}/zephyr/include/generated/cmake_intdef.h)
+set(OUTPUT_FILE ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/cmake_intdef.h)
file(WRITE ${OUTPUT_FILE} "/* Generated by eclipse_cd4_generator_amendment.cmake */\n")
file(APPEND ${OUTPUT_FILE} "/* The header contains the defines collected from the */\n")
file(APPEND ${OUTPUT_FILE} "/* INTERFACE_COMPILE_DEFINITIONS target property */\n")
@@ -104,7 +104,7 @@
message(" -------------------------------------------------------------------------")
message(" Add the following two command line parameters:")
message("")
- message(" -imacros ${CMAKE_BINARY_DIR}/zephyr/include/generated/cmake_intdef.h")
+ message(" -imacros ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/cmake_intdef.h")
message(" -imacros ${AUTOCONF_H}")
message("")
message(" to 'CDT cross GCC Built-in Compiler Settings' provider command definition")
@@ -125,7 +125,7 @@
file(APPEND ${OUTPUT_FILE} "\t\t\t<provider-reference id=\"org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider\" ref=\"shared-provider\"/>\n")
file(APPEND ${OUTPUT_FILE} "\t\t\t<provider-reference id=\"org.eclipse.cdt.core.PathEntryScannerInfoLanguageSettingsProvider\" ref=\"shared-provider\"/>\n")
if (${_work_mode} STREQUAL "C and CXX includes, defines in .settings with project defines - [EXPERIMENTAL]")
- file(APPEND ${OUTPUT_FILE} "\t\t\t<provider class=\"org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector\" console=\"false\" id=\"org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector\" keep-relative-paths=\"false\" name=\"Zephyr autoconf and SDK Compiler Settings\" parameter=\"${CROSS_COMPILE}\${COMMAND} \${FLAGS} -imacros ${CMAKE_BINARY_DIR}/zephyr/include/generated/cmake_intdef.h -imacros ${AUTOCONF_H} -E -P -v -dD "\${INPUTS}"\" store-entries-with-project=\"true\">\n")
+ file(APPEND ${OUTPUT_FILE} "\t\t\t<provider class=\"org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector\" console=\"false\" id=\"org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector\" keep-relative-paths=\"false\" name=\"Zephyr autoconf and SDK Compiler Settings\" parameter=\"${CROSS_COMPILE}\${COMMAND} \${FLAGS} -imacros ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/cmake_intdef.h -imacros ${AUTOCONF_H} -E -P -v -dD "\${INPUTS}"\" store-entries-with-project=\"true\">\n")
else ()
file(APPEND ${OUTPUT_FILE} "\t\t\t<provider class=\"org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector\" console=\"false\" id=\"org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector\" keep-relative-paths=\"false\" name=\"Zephyr autoconf and SDK Compiler Settings\" parameter=\"${CROSS_COMPILE}\${COMMAND} \${FLAGS} -E -P -v -dD "\${INPUTS}"\" store-entries-with-project=\"true\">\n")
endif ()
@@ -167,7 +167,7 @@
endif()
- file(STRINGS ${CMAKE_BINARY_DIR}/zephyr/include/generated/cmake_intdef.h _int_comp_def)
+ file(STRINGS ${CMAKE_BINARY_DIR}/zephyr/include/generated/zephyr/cmake_intdef.h _int_comp_def)
set (_resultDefines "${CMAKE_EXTRA_GENERATOR_C_SYSTEM_DEFINED_MACROS}")
foreach( d ${_int_comp_def} )
string(REGEX MATCH "^#define +([A-Za-z_][A-Za-z0-9_]*) *(.*) *$" _dummy "${d}")
diff --git a/cmake/kobj.cmake b/cmake/kobj.cmake
index dc69350..22fa36a 100644
--- a/cmake/kobj.cmake
+++ b/cmake/kobj.cmake
@@ -2,9 +2,9 @@
function(gen_kobj gen_dir_out)
if (PROJECT_BINARY_DIR)
- set(gen_dir ${PROJECT_BINARY_DIR}/include/generated)
+ set(gen_dir ${PROJECT_BINARY_DIR}/include/generated/zephyr)
else ()
- set(gen_dir ${CMAKE_BINARY_DIR}/include/generated)
+ set(gen_dir ${CMAKE_BINARY_DIR}/include/generated/zephyr)
endif ()
set(KOBJ_TYPES ${gen_dir}/kobj-types-enum.h)
@@ -30,6 +30,7 @@
)
add_custom_target(${KOBJ_TYPES_H_TARGET} DEPENDS ${KOBJ_TYPES} ${KOBJ_OTYPE})
+ cmake_path(GET gen_dir PARENT_PATH gen_dir)
set(${gen_dir_out} ${gen_dir} PARENT_SCOPE)
endfunction ()
diff --git a/cmake/modules/generated_file_directories.cmake b/cmake/modules/generated_file_directories.cmake
index 9b18e17..9865296 100644
--- a/cmake/modules/generated_file_directories.cmake
+++ b/cmake/modules/generated_file_directories.cmake
@@ -7,7 +7,7 @@
#
# Outcome:
# - BINARY_DIR_INCLUDE is set to ${PROJECT_BINARY_DIR}/include
-# - BINARY_DIR_INCLUDE_GENERATED is set to ${BINARY_DIR_INCLUDE}/generated
+# - BINARY_DIR_INCLUDE_GENERATED is set to ${BINARY_DIR_INCLUDE}/generated/zephyr
# - BINARY_DIR_INCLUDE_GENERATED is a directory
#
# Required variables:
@@ -20,5 +20,5 @@
# None
set(BINARY_DIR_INCLUDE ${PROJECT_BINARY_DIR}/include)
-set(BINARY_DIR_INCLUDE_GENERATED ${BINARY_DIR_INCLUDE}/generated)
+set(BINARY_DIR_INCLUDE_GENERATED ${BINARY_DIR_INCLUDE}/generated/zephyr)
file(MAKE_DIRECTORY ${BINARY_DIR_INCLUDE_GENERATED})
diff --git a/cmake/modules/kconfig.cmake b/cmake/modules/kconfig.cmake
index 01fbdf7..4606f71 100644
--- a/cmake/modules/kconfig.cmake
+++ b/cmake/modules/kconfig.cmake
@@ -5,7 +5,8 @@
include(extensions)
include(python)
-# autoconf.h is generated by Kconfig and placed in <build>/zephyr/include/generated/autoconf.h.
+# autoconf.h is generated by Kconfig and placed in
+# <build>/zephyr/include/generated/autoconf.h.
# A project may request a custom location by setting AUTOCONF_H explicitly before
# calling 'find_package(Zephyr)' or loading this module.
set_ifndef(AUTOCONF_H ${PROJECT_BINARY_DIR}/include/generated/autoconf.h)
diff --git a/cmake/modules/unittest.cmake b/cmake/modules/unittest.cmake
index 8923589..de5b0f3 100644
--- a/cmake/modules/unittest.cmake
+++ b/cmake/modules/unittest.cmake
@@ -59,7 +59,7 @@
gen_kobj(KOBJ_GEN_DIR)
# Generates empty header files to build
-set(INCL_GENERATED_DIR ${APPLICATION_BINARY_DIR}/zephyr/include/generated)
+set(INCL_GENERATED_DIR ${APPLICATION_BINARY_DIR}/zephyr/include/generated/zephyr)
set(INCL_GENERATED_SYSCALL_DIR ${INCL_GENERATED_DIR}/syscalls)
list(APPEND INCL_GENERATED_HEADERS
${INCL_GENERATED_DIR}/devicetree_generated.h
diff --git a/doc/build/cmake/index.rst b/doc/build/cmake/index.rst
index 534c3ff..ee9bde7 100644
--- a/doc/build/cmake/index.rst
+++ b/doc/build/cmake/index.rst
@@ -88,7 +88,7 @@
The preprocessed devicetree sources are parsed by
:zephyr_file:`gen_defines.py <scripts/dts/gen_defines.py>` to generate a
- :file:`build/zephyr/include/generated/devicetree_generated.h` header with
+ :file:`build/zephyr/include/generated/zephyr/devicetree_generated.h` header with
preprocessor macros.
Source code should access preprocessor macros generated from devicetree by
diff --git a/doc/build/dts/howtos.rst b/doc/build/dts/howtos.rst
index c6ee5a8..8875e9c 100644
--- a/doc/build/dts/howtos.rst
+++ b/doc/build/dts/howtos.rst
@@ -42,7 +42,7 @@
-- Found BOARD.dts: .../zephyr/boards/arm/qemu_cortex_m3/qemu_cortex_m3.dts
-- Generated zephyr.dts: .../zephyr/build/zephyr/zephyr.dts
- -- Generated devicetree_generated.h: .../zephyr/build/zephyr/include/generated/devicetree_generated.h
+ -- Generated devicetree_generated.h: .../zephyr/build/zephyr/include/generated/zephyr/devicetree_generated.h
The :file:`zephyr.dts` file is the final devicetree in DTS format.
diff --git a/doc/build/dts/intro-input-output.rst b/doc/build/dts/intro-input-output.rst
index 698012d..d069ae4 100644
--- a/doc/build/dts/intro-input-output.rst
+++ b/doc/build/dts/intro-input-output.rst
@@ -129,7 +129,7 @@
input to :file:`gen_defines.py` and used to create :file:`zephyr.dts` and
:file:`devicetree_generated.h`.
-:file:`<build>/zephyr/include/generated/devicetree_generated.h`
+:file:`<build>/zephyr/include/generated/zephyr/devicetree_generated.h`
The generated macros and additional comments describing the devicetree.
Included by ``devicetree.h``.
diff --git a/doc/build/dts/troubleshooting.rst b/doc/build/dts/troubleshooting.rst
index 54169b3..71521a3 100644
--- a/doc/build/dts/troubleshooting.rst
+++ b/doc/build/dts/troubleshooting.rst
@@ -66,7 +66,7 @@
To find the devicetree node you need to check, use the number ``<N>`` from the
linker error. Look for this number in the list of nodes at the top of
-:file:`<build>/zephyr/include/generated/devicetree_generated.h`. For example, if
+:file:`<build>/zephyr/include/generated/zephyr/devicetree_generated.h`. For example, if
``<N>`` is 15, and your :file:`devicetree_generated.h` file looks like this,
the node you are interested in is ``/soc/i2c@deadbeef``:
diff --git a/doc/build/dts/zephyr_dt_inputs_outputs.svg b/doc/build/dts/zephyr_dt_inputs_outputs.svg
index 833353a..3aace1d 100644
--- a/doc/build/dts/zephyr_dt_inputs_outputs.svg
+++ b/doc/build/dts/zephyr_dt_inputs_outputs.svg
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Do not edit this file with editors other than diagrams.net -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="767px" height="621px" viewBox="-0.5 -0.5 767 621" content="<mxfile host="app.diagrams.net" modified="2021-12-06T21:34:27.988Z" agent="5.0 (X11)" etag="manTlOi7tAwRe91FAV24" version="15.9.1" type="device"><diagram id="ifV251i82MMQPW7umc0k" name="Page-1">7VtZc9s2EP41mrYP0fCW9GhJlusZN3Zrd5o8ZSASIpFQBAOCOvLri4unKJHy6HBa68FDLAEuiP12sfuB7pmT5eaOgDj4A3sw7Bmat+mZ055hjPQB+8sFWylwDE0KfII8KdILwTP6AZUw65YiDyaVjhTjkKK4KnRxFEGXVmSAELyudlvgsKo1Bj7cETy7INyV/oM8Gkjp0NYK+e8Q+UGmWdfUnSXIOitBEgAPr0si87ZnTgjGVF4tNxMY8rXL1kWOm+25m0+MwIh2GYCn35Ezf3l8eaCP+uARoj+/Tj6op6xAmKoXVpOl22wFoMcWRDUxoQH2cQTC20I6JjiNPMjVaKxV9HnAOGZCnQm/Qkq3yrogpZiJAroM1d3dV1HzSnBKXHhg/mq6FBAf0kPvOZId+cuUNKiVuoN4CSnZsg4EhoCiVdX6QIHIz/sV68wu1FIfsexGw7I7IXuBsYdW7NLnl7P7h9sveh+vIAnBNuvA9JX6NAzr9/ud+woVUV3FnNSH1B9Ug0hCCf6W+4deNS7Dfcz7LTc+jxD9RYjXbgAI7S9T5scfPOymS2H48TpAFD7HQJh8zXrL4dJtOLZAiPyIXYdwwfsvUBhOcIiJmIbp2XDoWXyMmE/pjiZ+h5DGVoDCzUFoqLuGZsshKqLplnLwdREf9Mzpg1JsGGpnQpPZBU1TuEIuUwch66oMziZy09XoOKaIOzUbPX15FqGUsBjHL1DIIvSuRmZNN1DKWGznerNeqKQLLLmZhXj8ePPXNBdJNHs0KeMZ1Wd5KbCCKMIU8DX4YpSQSKR9xyGYw/AJJ4j3KBAaYxRRSG5XDG+J0qG2KjAXM9LqGD8BRPVBO0QvilCrC0LvI4EQbY4B8XjKgAhbJky2e+LZS6Ag9T3FAgkggUWLPyCHfL9RnRumPLcwtGc8aQInxx5qxp4Afc+YdI60Sx5eNSR1cqegASSZ8/TfwdwdzGY3LDvnwrJ9jQyJLR/ZfuLj+3bW/KweJxrTTaW1bVv/1szKuVpmpYY+cbQVMLCy4JTFNLtmYDlTNapm43warze70xTC2veuXY9VTtmS9pRsP5fgeZiX/LrwsN0I8CayogYvbUyKzuamg6u46QbRT6Xrz4XHslbho7yxLTWeIEHstSEpO7F0d9N2Kg7f10yzxelFq/7I10eCYddIYFwmEpi2XoVaPW3ZEwluCBGbcNZNbGfJAT1GDdJ6rcDemZdxqD+7kDM4aVgadsmsxvcfp/cf71gxuQUMq+eoJDMVUUXFz1pJTu3b4fTiMdNw7G5B82x5+qgLmiqV5BxFHor8ciXZihWWM1KAeLZPUlE68lqykq//khz1MJ6PvufQR+TQTUi7KNAyevenJR6zza51V8yW9Y0wj7p+jXUuly9WLlD5jH7hfKaz6XTnbZmuE2tcic6JS1DMcxwNRU0MR35/JkqV2SGirSWKshdAcQLbyxmQxPKgZoE2HFNt5UwWWF0YCeufIh6aRrWYNEe75cqoIR6OzhYPmzjcs+5Taj+qb1PZ9vWKfUrydfIxa5jQ05jK0fbU/dfif/SOZCZbvSX0EKCC7ktpnNK9fjhPUeix2fyAcbAlexyRZTga5yljAmOCXZgkImvKH40XOcPIMrImNR0Zi0bCE0Sck80ODvYWBjXMMiPTGlArGXWEI1hLv5WohlMOGOSC8EaJl8jzwn3RprpfnTqZcswaIo2GtN1ugKSunw2TdhdM3sEIEoZHTwEpgMArSGjBZgt8dsy821Gc090zv1A9O3ic01lre5rfMFS7cbnf8M0/gPy0QFshkLtANE/i0sgkBlGz55QOFoKqA5XmUhv+XonIUG1WKxF7cOWjKb2R2C2go2XLWRwtqUykdNR0yL/2lrJvk/qYsZ/j7ATqU1MfTjsM9KF9SRxchzAuCiPn6kRvdpTzZpheS9uTpp+Y6bVGNT1tTO9gdKj/eZhefXhlgB518JidhGj9wdDplU9DBszTjj0P2YvpdvrFvAxUbYs5rFVBhZWdB2RPkQ54thNKvRN7K5Mz8VkNKyReT5qe/RhTpC0MsmwLrZUG8g5wv/kC3gdqifJ+doJdy7Lba9H8W5uLFKNGE496wObv9j7K3rV9wdIb7K012Lv+bcLp7N3hg913nkjmDt2OOM7nmrt0LSuIxQeUS8h2LV4leGWytii9d73zeKbo7wQuUq4sO1ubp76PIp/fewJJIvSz3b6BJvKou4cEQoJiEjyWJJUTCsIQev0dEP4fiB9LG/Q7Uj+2fS6Udfr49wgT/1p86Mtr2K9pQnMQQUIwr2dna0Aifur723/xcKD+pVnebjuWz4VHWJk1i38BkZlg8X805u2/</diagram></mxfile>"><defs/><g><path d="M 311 150 L 429.63 150" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 434.88 150 L 427.88 153.5 L 429.63 150 L 427.88 146.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 204.64 116.64 C 204.64 112.97 207.69 110 211.45 110 L 304.18 110 C 307.95 110 311 112.97 311 116.64 L 311 169.72 C 294 162.72 274.81 162.72 257.82 169.72 C 240.82 176.73 221.63 176.73 204.64 169.72 Z" fill="#d5e8d4" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 197.82 123.27 C 197.82 121.51 198.54 119.82 199.82 118.58 C 201.09 117.33 202.83 116.64 204.64 116.64 L 297.36 116.64 C 299.17 116.64 300.91 117.33 302.18 118.58 C 303.46 119.82 304.18 121.51 304.18 123.27 L 304.18 176.36 C 287.19 169.35 268 169.35 251 176.36 C 234 183.36 214.81 183.36 197.82 176.36 Z" fill="#d5e8d4" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 191 129.91 C 191 126.24 194.05 123.27 197.82 123.27 L 290.55 123.27 C 294.31 123.27 297.36 126.24 297.36 129.91 L 297.36 182.99 C 280.37 175.99 261.18 175.99 244.18 182.99 C 227.19 190 208 190 191 182.99 Z" fill="#d5e8d4" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 118px; height: 1px; padding-top: 150px; margin-left: 193px;"><div style="box-sizing: border-box; font-size: 0px; text-align: left;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div>FILE_1.overlay</div><div>...</div><div>FILE_n.overlay<br /></div></div></div></div></foreignObject><text x="193" y="154" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">FILE_1.overlay...</text></switch></g><rect x="161" y="110" width="20" height="80" fill="none" stroke="none" pointer-events="all"/><path d="M 181 110 L 171 110 L 171 190 L 181 190" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 161 150 L 171 150" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 150px; margin-left: 159px;"><div style="box-sizing: border-box; font-size: 0px; text-align: right;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;"><div>Devicetree overlays:<br /></div>optional DTS format files<div>which override <i><BOARD>.dts.</i><br /></div></div></div></div></foreignObject><text x="159" y="154" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">Devi...</text></switch></g><rect x="161" y="0" width="20" height="60" fill="none" stroke="none" pointer-events="all"/><path d="M 181 0 L 171 0 L 171 60 L 181 60" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 161 30 L 171 30" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 30px; margin-left: 159px;"><div style="box-sizing: border-box; font-size: 0px; text-align: right;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;"><div>In board directory.</div>The "base" devicetree.<div>Includes SoC <i>.dtsi</i> file,</div><div>may include other files.<br /></div></div></div></div></foreignObject><text x="159" y="34" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">In...</text></switch></g><path d="M 311 30 L 506 30 L 506 113.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 506 118.88 L 502.5 111.88 L 506 113.63 L 509.5 111.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 191 0 L 311 0 L 311 51 Q 281 34.8 251 51 Q 221 67.2 191 51 L 191 9 Z" fill="#d5e8d4" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 21px; margin-left: 192px;"><div style="box-sizing: border-box; font-size: 0px; text-align: center;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><BOARD>.dts</div></div></div></foreignObject><text x="251" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle"><BOARD>.dts</text></switch></g><path d="M 311 275 L 311 280 L 338 280 L 338.04 356.6" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 338.04 361.85 L 334.54 354.85 L 338.04 356.6 L 341.54 354.85 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 204.64 241.64 C 204.64 237.97 207.69 235 211.45 235 L 304.18 235 C 307.95 235 311 237.97 311 241.64 L 311 294.72 C 294 287.72 274.81 287.72 257.82 294.72 C 240.82 301.73 221.63 301.73 204.64 294.72 Z" fill="#d5e8d4" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 197.82 248.27 C 197.82 246.51 198.54 244.82 199.82 243.58 C 201.09 242.33 202.83 241.64 204.64 241.64 L 297.36 241.64 C 299.17 241.64 300.91 242.33 302.18 243.58 C 303.46 244.82 304.18 246.51 304.18 248.27 L 304.18 301.36 C 287.19 294.35 268 294.35 251 301.36 C 234 308.36 214.81 308.36 197.82 301.36 Z" fill="#d5e8d4" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 191 254.91 C 191 251.24 194.05 248.27 197.82 248.27 L 290.55 248.27 C 294.31 248.27 297.36 251.24 297.36 254.91 L 297.36 307.99 C 280.37 300.99 261.18 300.99 244.18 307.99 C 227.19 315 208 315 191 307.99 Z" fill="#d5e8d4" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 118px; height: 1px; padding-top: 275px; margin-left: 193px;"><div style="box-sizing: border-box; font-size: 0px; text-align: left;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div>BINDING_1.yaml</div><div>...</div><div>BINDING_n.yaml<br /></div></div></div></div></foreignObject><text x="193" y="279" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">BINDING_1.yaml...</text></switch></g><rect x="161" y="235" width="20" height="80" fill="none" stroke="none" pointer-events="all"/><path d="M 181 235 L 171 235 L 171 315 L 181 315" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 161 275 L 171 275" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 275px; margin-left: 159px;"><div style="box-sizing: border-box; font-size: 0px; text-align: right;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;"><div>Devicetree bindings:</div><div>contain rules for devicetree's</div><div>contents.<br /></div></div></div></div></foreignObject><text x="159" y="279" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">Devi...</text></switch></g><path d="M 396 405 L 469.63 405" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 474.88 405 L 467.88 408.5 L 469.63 405 L 467.88 401.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 351 450 L 351 495 L 351.07 534.67" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 351.08 539.92 L 347.57 532.93 L 351.07 534.67 L 354.57 532.92 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><ellipse cx="351" cy="405" rx="45" ry="45" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 405px; margin-left: 307px;"><div style="box-sizing: border-box; font-size: 0px; text-align: center;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div>Devicetree scripts in <i>scripts/dts/</i></div></div></div></div></foreignObject><text x="351" y="409" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Devicetree scri...</text></switch></g><rect x="586" y="120" width="20" height="60" fill="none" stroke="none" transform="rotate(180,596,150)" pointer-events="all"/><path d="M 606 120 L 596 120 L 596 180 L 606 180" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(180,596,150)" pointer-events="all"/><path d="M 586 150 L 596 150" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(180,596,150)" pointer-events="all"/><rect x="616" y="95" width="150" height="110" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 148px; height: 1px; padding-top: 150px; margin-left: 618px;"><div style="box-sizing: border-box; font-size: 0px; text-align: left;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div>Intermediate output in <i>build/zephyr/</i>. C preprocessor output of including <i><BOARD>.dts</i> and overlays.</div></div></div></div></foreignObject><text x="618" y="154" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">Intermediate output in bu...</text></switch></g><rect x="221" y="540" width="20" height="80" fill="none" stroke="none" pointer-events="all"/><path d="M 241 540 L 231 540 L 231 620 L 241 620" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 221 580 L 231 580" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 580px; margin-left: 219px;"><div style="box-sizing: border-box; font-size: 0px; text-align: right;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;"><div>Generated C header files, in</div><div><i>build/zephyr/include/generated/.</i></div><div><br /></div><div> Access these via <span><devicetree.h></span></div></div></div></div></foreignObject><text x="219" y="584" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">Gene...</text></switch></g><path d="M 272.02 546.64 C 272.02 544.88 273.13 543.19 275.1 541.94 C 277.07 540.7 279.75 540 282.53 540 L 425.49 540 C 428.28 540 430.95 540.7 432.92 541.94 C 434.89 543.19 436 544.88 436 546.64 L 436 599.72 C 409.8 592.72 380.21 592.72 354.01 599.72 C 327.81 606.73 298.23 606.73 272.02 599.72 Z" fill="#ffff66" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 261.51 553.27 C 261.51 549.61 266.22 546.64 272.02 546.64 L 414.98 546.64 C 420.78 546.64 425.49 549.61 425.49 553.27 L 425.49 606.36 C 399.29 599.35 369.7 599.35 343.5 606.36 C 317.3 613.36 287.71 613.36 261.51 606.36 Z" fill="#ffff66" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 251 559.91 C 251 558.15 252.11 556.46 254.08 555.21 C 256.05 553.97 258.72 553.27 261.51 553.27 L 404.47 553.27 C 407.25 553.27 409.93 553.97 411.9 555.21 C 413.87 556.46 414.98 558.15 414.98 559.91 L 414.98 612.99 C 388.77 605.99 359.19 605.99 332.99 612.99 C 306.79 620 277.2 620 251 612.99 Z" fill="#ffff66" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 183px; height: 1px; padding-top: 580px; margin-left: 253px;"><div style="box-sizing: border-box; font-size: 0px; text-align: left;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div align="center">Generated C headers</div></div></div></div></foreignObject><text x="253" y="584" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">Generated C headers</text></switch></g><path d="M 476 180 L 476 280 L 365 280 L 365.04 356.6" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 365.04 361.85 L 361.54 354.85 L 365.04 356.6 L 368.54 354.85 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 526.04 422 L 526.01 443.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 526 448.88 L 522.51 441.88 L 526.01 443.63 L 529.51 441.89 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 436 120 L 576 120 L 576 171 Q 541 154.8 506 171 Q 471 187.2 436 171 L 436 129 Z" fill="#ffff66" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 138px; height: 1px; padding-top: 141px; margin-left: 437px;"><div style="box-sizing: border-box; font-size: 0px; text-align: center;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div>zephyr.dts.pre<br /></div></div></div></div></foreignObject><text x="506" y="145" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">zephyr.dts.pre
</text></switch></g><path d="M 476 380 L 576 380 L 576 422.5 Q 551 409 526 422.5 Q 501 436 476 422.5 L 476 387.5 Z" fill="#ffff66" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 398px; margin-left: 477px;"><div style="box-sizing: border-box; font-size: 0px; text-align: center;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div>zephyr.dts<br /></div></div></div></div></foreignObject><text x="526" y="401" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">zephyr.dts
</text></switch></g><rect x="586" y="375" width="20" height="60" fill="none" stroke="none" transform="rotate(180,596,405)" pointer-events="all"/><path d="M 606 375 L 596 375 L 596 435 L 606 435" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(180,596,405)" pointer-events="all"/><path d="M 586 405 L 596 405" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(180,596,405)" pointer-events="all"/><rect x="616" y="377.5" width="150" height="55" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 148px; height: 1px; padding-top: 405px; margin-left: 618px;"><div style="box-sizing: border-box; font-size: 0px; text-align: left;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Final merged devicetree in<br /><i>build/zephyr/</i>. Useful for debugging. Passed to <i>dtc</i> if it is installed.</div></div></div></foreignObject><text x="618" y="409" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">Final merged devicetree i...</text></switch></g><ellipse cx="526" cy="510" rx="60" ry="60" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 510px; margin-left: 467px;"><div style="box-sizing: border-box; font-size: 0px; text-align: center;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div><i>dtc</i> (optional, just for errors/warnings)</div></div></div></div></foreignObject><text x="526" y="514" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">dtc (optional, just...</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="767px" height="621px" viewBox="-0.5 -0.5 767 621" content="<mxfile host="app.diagrams.net" modified="2021-12-06T21:34:27.988Z" agent="5.0 (X11)" etag="manTlOi7tAwRe91FAV24" version="15.9.1" type="device"><diagram id="ifV251i82MMQPW7umc0k" name="Page-1">7VtZc9s2EP41mrYP0fCW9GhJlusZN3Zrd5o8ZSASIpFQBAOCOvLri4unKJHy6HBa68FDLAEuiP12sfuB7pmT5eaOgDj4A3sw7Bmat+mZ055hjPQB+8sFWylwDE0KfII8KdILwTP6AZUw65YiDyaVjhTjkKK4KnRxFEGXVmSAELyudlvgsKo1Bj7cETy7INyV/oM8Gkjp0NYK+e8Q+UGmWdfUnSXIOitBEgAPr0si87ZnTgjGVF4tNxMY8rXL1kWOm+25m0+MwIh2GYCn35Ezf3l8eaCP+uARoj+/Tj6op6xAmKoXVpOl22wFoMcWRDUxoQH2cQTC20I6JjiNPMjVaKxV9HnAOGZCnQm/Qkq3yrogpZiJAroM1d3dV1HzSnBKXHhg/mq6FBAf0kPvOZId+cuUNKiVuoN4CSnZsg4EhoCiVdX6QIHIz/sV68wu1FIfsexGw7I7IXuBsYdW7NLnl7P7h9sveh+vIAnBNuvA9JX6NAzr9/ud+woVUV3FnNSH1B9Ug0hCCf6W+4deNS7Dfcz7LTc+jxD9RYjXbgAI7S9T5scfPOymS2H48TpAFD7HQJh8zXrL4dJtOLZAiPyIXYdwwfsvUBhOcIiJmIbp2XDoWXyMmE/pjiZ+h5DGVoDCzUFoqLuGZsshKqLplnLwdREf9Mzpg1JsGGpnQpPZBU1TuEIuUwch66oMziZy09XoOKaIOzUbPX15FqGUsBjHL1DIIvSuRmZNN1DKWGznerNeqKQLLLmZhXj8ePPXNBdJNHs0KeMZ1Wd5KbCCKMIU8DX4YpSQSKR9xyGYw/AJJ4j3KBAaYxRRSG5XDG+J0qG2KjAXM9LqGD8BRPVBO0QvilCrC0LvI4EQbY4B8XjKgAhbJky2e+LZS6Ag9T3FAgkggUWLPyCHfL9RnRumPLcwtGc8aQInxx5qxp4Afc+YdI60Sx5eNSR1cqegASSZ8/TfwdwdzGY3LDvnwrJ9jQyJLR/ZfuLj+3bW/KweJxrTTaW1bVv/1szKuVpmpYY+cbQVMLCy4JTFNLtmYDlTNapm43warze70xTC2veuXY9VTtmS9pRsP5fgeZiX/LrwsN0I8CayogYvbUyKzuamg6u46QbRT6Xrz4XHslbho7yxLTWeIEHstSEpO7F0d9N2Kg7f10yzxelFq/7I10eCYddIYFwmEpi2XoVaPW3ZEwluCBGbcNZNbGfJAT1GDdJ6rcDemZdxqD+7kDM4aVgadsmsxvcfp/cf71gxuQUMq+eoJDMVUUXFz1pJTu3b4fTiMdNw7G5B82x5+qgLmiqV5BxFHor8ciXZihWWM1KAeLZPUlE68lqykq//khz1MJ6PvufQR+TQTUi7KNAyevenJR6zza51V8yW9Y0wj7p+jXUuly9WLlD5jH7hfKaz6XTnbZmuE2tcic6JS1DMcxwNRU0MR35/JkqV2SGirSWKshdAcQLbyxmQxPKgZoE2HFNt5UwWWF0YCeufIh6aRrWYNEe75cqoIR6OzhYPmzjcs+5Taj+qb1PZ9vWKfUrydfIxa5jQ05jK0fbU/dfif/SOZCZbvSX0EKCC7ktpnNK9fjhPUeix2fyAcbAlexyRZTga5yljAmOCXZgkImvKH40XOcPIMrImNR0Zi0bCE0Sck80ODvYWBjXMMiPTGlArGXWEI1hLv5WohlMOGOSC8EaJl8jzwn3RprpfnTqZcswaIo2GtN1ugKSunw2TdhdM3sEIEoZHTwEpgMArSGjBZgt8dsy821Gc090zv1A9O3ic01lre5rfMFS7cbnf8M0/gPy0QFshkLtANE/i0sgkBlGz55QOFoKqA5XmUhv+XonIUG1WKxF7cOWjKb2R2C2go2XLWRwtqUykdNR0yL/2lrJvk/qYsZ/j7ATqU1MfTjsM9KF9SRxchzAuCiPn6kRvdpTzZpheS9uTpp+Y6bVGNT1tTO9gdKj/eZhefXhlgB518JidhGj9wdDplU9DBszTjj0P2YvpdvrFvAxUbYs5rFVBhZWdB2RPkQ54thNKvRN7K5Mz8VkNKyReT5qe/RhTpC0MsmwLrZUG8g5wv/kC3gdqifJ+doJdy7Lba9H8W5uLFKNGE496wObv9j7K3rV9wdIb7K012Lv+bcLp7N3hg913nkjmDt2OOM7nmrt0LSuIxQeUS8h2LV4leGWytii9d73zeKbo7wQuUq4sO1ubp76PIp/fewJJIvSz3b6BJvKou4cEQoJiEjyWJJUTCsIQev0dEP4fiB9LG/Q7Uj+2fS6Udfr49wgT/1p86Mtr2K9pQnMQQUIwr2dna0Aifur723/xcKD+pVnebjuWz4VHWJk1i38BkZlg8X805u2/</diagram></mxfile>"><defs/><g><path d="M 311 150 L 429.63 150" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 434.88 150 L 427.88 153.5 L 429.63 150 L 427.88 146.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 204.64 116.64 C 204.64 112.97 207.69 110 211.45 110 L 304.18 110 C 307.95 110 311 112.97 311 116.64 L 311 169.72 C 294 162.72 274.81 162.72 257.82 169.72 C 240.82 176.73 221.63 176.73 204.64 169.72 Z" fill="#d5e8d4" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 197.82 123.27 C 197.82 121.51 198.54 119.82 199.82 118.58 C 201.09 117.33 202.83 116.64 204.64 116.64 L 297.36 116.64 C 299.17 116.64 300.91 117.33 302.18 118.58 C 303.46 119.82 304.18 121.51 304.18 123.27 L 304.18 176.36 C 287.19 169.35 268 169.35 251 176.36 C 234 183.36 214.81 183.36 197.82 176.36 Z" fill="#d5e8d4" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 191 129.91 C 191 126.24 194.05 123.27 197.82 123.27 L 290.55 123.27 C 294.31 123.27 297.36 126.24 297.36 129.91 L 297.36 182.99 C 280.37 175.99 261.18 175.99 244.18 182.99 C 227.19 190 208 190 191 182.99 Z" fill="#d5e8d4" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 118px; height: 1px; padding-top: 150px; margin-left: 193px;"><div style="box-sizing: border-box; font-size: 0px; text-align: left;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div>FILE_1.overlay</div><div>...</div><div>FILE_n.overlay<br /></div></div></div></div></foreignObject><text x="193" y="154" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">FILE_1.overlay...</text></switch></g><rect x="161" y="110" width="20" height="80" fill="none" stroke="none" pointer-events="all"/><path d="M 181 110 L 171 110 L 171 190 L 181 190" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 161 150 L 171 150" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 150px; margin-left: 159px;"><div style="box-sizing: border-box; font-size: 0px; text-align: right;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;"><div>Devicetree overlays:<br /></div>optional DTS format files<div>which override <i><BOARD>.dts.</i><br /></div></div></div></div></foreignObject><text x="159" y="154" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">Devi...</text></switch></g><rect x="161" y="0" width="20" height="60" fill="none" stroke="none" pointer-events="all"/><path d="M 181 0 L 171 0 L 171 60 L 181 60" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 161 30 L 171 30" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 30px; margin-left: 159px;"><div style="box-sizing: border-box; font-size: 0px; text-align: right;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;"><div>In board directory.</div>The "base" devicetree.<div>Includes SoC <i>.dtsi</i> file,</div><div>may include other files.<br /></div></div></div></div></foreignObject><text x="159" y="34" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">In...</text></switch></g><path d="M 311 30 L 506 30 L 506 113.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 506 118.88 L 502.5 111.88 L 506 113.63 L 509.5 111.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 191 0 L 311 0 L 311 51 Q 281 34.8 251 51 Q 221 67.2 191 51 L 191 9 Z" fill="#d5e8d4" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 21px; margin-left: 192px;"><div style="box-sizing: border-box; font-size: 0px; text-align: center;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><BOARD>.dts</div></div></div></foreignObject><text x="251" y="25" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle"><BOARD>.dts</text></switch></g><path d="M 311 275 L 311 280 L 338 280 L 338.04 356.6" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 338.04 361.85 L 334.54 354.85 L 338.04 356.6 L 341.54 354.85 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 204.64 241.64 C 204.64 237.97 207.69 235 211.45 235 L 304.18 235 C 307.95 235 311 237.97 311 241.64 L 311 294.72 C 294 287.72 274.81 287.72 257.82 294.72 C 240.82 301.73 221.63 301.73 204.64 294.72 Z" fill="#d5e8d4" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 197.82 248.27 C 197.82 246.51 198.54 244.82 199.82 243.58 C 201.09 242.33 202.83 241.64 204.64 241.64 L 297.36 241.64 C 299.17 241.64 300.91 242.33 302.18 243.58 C 303.46 244.82 304.18 246.51 304.18 248.27 L 304.18 301.36 C 287.19 294.35 268 294.35 251 301.36 C 234 308.36 214.81 308.36 197.82 301.36 Z" fill="#d5e8d4" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 191 254.91 C 191 251.24 194.05 248.27 197.82 248.27 L 290.55 248.27 C 294.31 248.27 297.36 251.24 297.36 254.91 L 297.36 307.99 C 280.37 300.99 261.18 300.99 244.18 307.99 C 227.19 315 208 315 191 307.99 Z" fill="#d5e8d4" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 118px; height: 1px; padding-top: 275px; margin-left: 193px;"><div style="box-sizing: border-box; font-size: 0px; text-align: left;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div>BINDING_1.yaml</div><div>...</div><div>BINDING_n.yaml<br /></div></div></div></div></foreignObject><text x="193" y="279" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">BINDING_1.yaml...</text></switch></g><rect x="161" y="235" width="20" height="80" fill="none" stroke="none" pointer-events="all"/><path d="M 181 235 L 171 235 L 171 315 L 181 315" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 161 275 L 171 275" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 275px; margin-left: 159px;"><div style="box-sizing: border-box; font-size: 0px; text-align: right;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;"><div>Devicetree bindings:</div><div>contain rules for devicetree's</div><div>contents.<br /></div></div></div></div></foreignObject><text x="159" y="279" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">Devi...</text></switch></g><path d="M 396 405 L 469.63 405" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 474.88 405 L 467.88 408.5 L 469.63 405 L 467.88 401.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 351 450 L 351 495 L 351.07 534.67" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 351.08 539.92 L 347.57 532.93 L 351.07 534.67 L 354.57 532.92 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><ellipse cx="351" cy="405" rx="45" ry="45" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 405px; margin-left: 307px;"><div style="box-sizing: border-box; font-size: 0px; text-align: center;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div>Devicetree scripts in <i>scripts/dts/</i></div></div></div></div></foreignObject><text x="351" y="409" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Devicetree scri...</text></switch></g><rect x="586" y="120" width="20" height="60" fill="none" stroke="none" transform="rotate(180,596,150)" pointer-events="all"/><path d="M 606 120 L 596 120 L 596 180 L 606 180" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(180,596,150)" pointer-events="all"/><path d="M 586 150 L 596 150" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(180,596,150)" pointer-events="all"/><rect x="616" y="95" width="150" height="110" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 148px; height: 1px; padding-top: 150px; margin-left: 618px;"><div style="box-sizing: border-box; font-size: 0px; text-align: left;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div>Intermediate output in <i>build/zephyr/</i>. C preprocessor output of including <i><BOARD>.dts</i> and overlays.</div></div></div></div></foreignObject><text x="618" y="154" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">Intermediate output in bu...</text></switch></g><rect x="221" y="540" width="20" height="80" fill="none" stroke="none" pointer-events="all"/><path d="M 241 540 L 231 540 L 231 620 L 241 620" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 221 580 L 231 580" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-end; width: 1px; height: 1px; padding-top: 580px; margin-left: 219px;"><div style="box-sizing: border-box; font-size: 0px; text-align: right;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;"><div>Generated C header files, in</div><div><i>build/zephyr/include/generated/zephyr/.</i></div><div><br /></div><div> Access these via <span><devicetree.h></span></div></div></div></div></foreignObject><text x="219" y="584" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="end">Gene...</text></switch></g><path d="M 272.02 546.64 C 272.02 544.88 273.13 543.19 275.1 541.94 C 277.07 540.7 279.75 540 282.53 540 L 425.49 540 C 428.28 540 430.95 540.7 432.92 541.94 C 434.89 543.19 436 544.88 436 546.64 L 436 599.72 C 409.8 592.72 380.21 592.72 354.01 599.72 C 327.81 606.73 298.23 606.73 272.02 599.72 Z" fill="#ffff66" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 261.51 553.27 C 261.51 549.61 266.22 546.64 272.02 546.64 L 414.98 546.64 C 420.78 546.64 425.49 549.61 425.49 553.27 L 425.49 606.36 C 399.29 599.35 369.7 599.35 343.5 606.36 C 317.3 613.36 287.71 613.36 261.51 606.36 Z" fill="#ffff66" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><path d="M 251 559.91 C 251 558.15 252.11 556.46 254.08 555.21 C 256.05 553.97 258.72 553.27 261.51 553.27 L 404.47 553.27 C 407.25 553.27 409.93 553.97 411.9 555.21 C 413.87 556.46 414.98 558.15 414.98 559.91 L 414.98 612.99 C 388.77 605.99 359.19 605.99 332.99 612.99 C 306.79 620 277.2 620 251 612.99 Z" fill="#ffff66" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 183px; height: 1px; padding-top: 580px; margin-left: 253px;"><div style="box-sizing: border-box; font-size: 0px; text-align: left;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div align="center">Generated C headers</div></div></div></div></foreignObject><text x="253" y="584" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">Generated C headers</text></switch></g><path d="M 476 180 L 476 280 L 365 280 L 365.04 356.6" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 365.04 361.85 L 361.54 354.85 L 365.04 356.6 L 368.54 354.85 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 526.04 422 L 526.01 443.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 526 448.88 L 522.51 441.88 L 526.01 443.63 L 529.51 441.89 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 436 120 L 576 120 L 576 171 Q 541 154.8 506 171 Q 471 187.2 436 171 L 436 129 Z" fill="#ffff66" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 138px; height: 1px; padding-top: 141px; margin-left: 437px;"><div style="box-sizing: border-box; font-size: 0px; text-align: center;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div>zephyr.dts.pre<br /></div></div></div></div></foreignObject><text x="506" y="145" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">zephyr.dts.pre
</text></switch></g><path d="M 476 380 L 576 380 L 576 422.5 Q 551 409 526 422.5 Q 501 436 476 422.5 L 476 387.5 Z" fill="#ffff66" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 98px; height: 1px; padding-top: 398px; margin-left: 477px;"><div style="box-sizing: border-box; font-size: 0px; text-align: center;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div>zephyr.dts<br /></div></div></div></div></foreignObject><text x="526" y="401" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">zephyr.dts
</text></switch></g><rect x="586" y="375" width="20" height="60" fill="none" stroke="none" transform="rotate(180,596,405)" pointer-events="all"/><path d="M 606 375 L 596 375 L 596 435 L 606 435" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(180,596,405)" pointer-events="all"/><path d="M 586 405 L 596 405" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" transform="rotate(180,596,405)" pointer-events="all"/><rect x="616" y="377.5" width="150" height="55" fill="none" stroke="none" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 148px; height: 1px; padding-top: 405px; margin-left: 618px;"><div style="box-sizing: border-box; font-size: 0px; text-align: left;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Final merged devicetree in<br /><i>build/zephyr/</i>. Useful for debugging. Passed to <i>dtc</i> if it is installed.</div></div></div></foreignObject><text x="618" y="409" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px">Final merged devicetree i...</text></switch></g><ellipse cx="526" cy="510" rx="60" ry="60" fill="rgb(255, 255, 255)" stroke="rgb(0, 0, 0)" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 510px; margin-left: 467px;"><div style="box-sizing: border-box; font-size: 0px; text-align: center;" data-drawio-colors="color: rgb(0, 0, 0); "><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;"><div><i>dtc</i> (optional, just for errors/warnings)</div></div></div></div></foreignObject><text x="526" y="514" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">dtc (optional, just...</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
diff --git a/doc/kernel/drivers/index.rst b/doc/kernel/drivers/index.rst
index fcc2e66..96574e0 100644
--- a/doc/kernel/drivers/index.rst
+++ b/doc/kernel/drivers/index.rst
@@ -203,7 +203,7 @@
__syscall int specific_from_user(const struct device *dev, int bar);
/* Only needed when extensions include syscalls */
- #include <syscalls/specific.h>
+ #include <zephyr/syscalls/specific.h>
A driver implementing extensions to the subsystem will define the real
implementation of both the subsystem API and the specific APIs:
@@ -243,7 +243,7 @@
return z_impl_specific_do_that(dev, bar)
}
- #include <syscalls/specific_from_user_mrsh.c>
+ #include <zephyr/syscalls/specific_from_user_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/doc/kernel/usermode/syscalls.rst b/doc/kernel/usermode/syscalls.rst
index 8b35ce8..1490a75 100644
--- a/doc/kernel/usermode/syscalls.rst
+++ b/doc/kernel/usermode/syscalls.rst
@@ -87,7 +87,7 @@
.. code-block:: c
- #include <syscalls/sensor.h>
+ #include <zephyr/syscalls/sensor.h>
C prototype functions must be declared in one of the directories
listed in the CMake variable ``SYSCALL_INCLUDE_DIRS``. This list
@@ -143,7 +143,7 @@
the project out directory under ``include/generated/``:
* The system call is added to the enumerated type of system call IDs,
- which is expressed in ``include/generated/syscall_list.h``. It is the name
+ which is expressed in ``include/generated/zephyr/syscall_list.h``. It is the name
of the API in uppercase, prefixed with ``K_SYSCALL_``.
* An entry for the system call is created in the dispatch table
@@ -172,7 +172,7 @@
example of :c:func:`k_sem_init()`, this API is declared in
``include/kernel.h``. At the bottom of ``include/kernel.h`` is::
- #include <syscalls/kernel.h>
+ #include <zephyr/syscalls/kernel.h>
Inside this header is the body of :c:func:`k_sem_init()`::
@@ -362,7 +362,7 @@
K_OOPS(K_SYSCALL_OBJ(sem, K_OBJ_SEM));
return z_impl_k_sem_take(sem, timeout);
}
- #include <syscalls/k_sem_take_mrsh.c>
+ #include <zephyr/syscalls/k_sem_take_mrsh.c>
Verification Memory Access Policies
diff --git a/doc/services/retention/blinfo.rst b/doc/services/retention/blinfo.rst
index 6f34b0f..6d18b1d 100644
--- a/doc/services/retention/blinfo.rst
+++ b/doc/services/retention/blinfo.rst
@@ -122,7 +122,7 @@
#include <bootutil/boot_status.h>
#include <bootutil/image.h>
- #include <mcuboot_version.h>
+ #include <zephyr/mcuboot_version.h>
#include <zephyr/settings/settings.h>
API Reference
diff --git a/drivers/adc/adc_handlers.c b/drivers/adc/adc_handlers.c
index 2b00c2d..c2f0fd4 100644
--- a/drivers/adc/adc_handlers.c
+++ b/drivers/adc/adc_handlers.c
@@ -21,7 +21,7 @@
return z_impl_adc_channel_setup((const struct device *)dev,
&channel_cfg);
}
-#include <syscalls/adc_channel_setup_mrsh.c>
+#include <zephyr/syscalls/adc_channel_setup_mrsh.c>
static bool copy_sequence(struct adc_sequence *dst,
struct adc_sequence_options *options,
@@ -66,7 +66,7 @@
return z_impl_adc_read((const struct device *)dev, &sequence);
}
-#include <syscalls/adc_read_mrsh.c>
+#include <zephyr/syscalls/adc_read_mrsh.c>
#ifdef CONFIG_ADC_ASYNC
static inline int z_vrfy_adc_read_async(const struct device *dev,
@@ -89,5 +89,5 @@
return z_impl_adc_read_async((const struct device *)dev, &sequence,
(struct k_poll_signal *)async);
}
-#include <syscalls/adc_read_async_mrsh.c>
+#include <zephyr/syscalls/adc_read_async_mrsh.c>
#endif /* CONFIG_ADC_ASYNC */
diff --git a/drivers/auxdisplay/auxdisplay_handlers.c b/drivers/auxdisplay/auxdisplay_handlers.c
index 5c88e7a..45b2230 100644
--- a/drivers/auxdisplay/auxdisplay_handlers.c
+++ b/drivers/auxdisplay/auxdisplay_handlers.c
@@ -12,21 +12,21 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_display_on(dev);
}
-#include <syscalls/auxdisplay_display_on_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_display_on_mrsh.c>
static inline int z_vrfy_auxdisplay_display_off(const struct device *dev)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_display_off(dev);
}
-#include <syscalls/auxdisplay_display_off_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_display_off_mrsh.c>
static inline int z_vrfy_auxdisplay_cursor_set_enabled(const struct device *dev, bool enabled)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_cursor_set_enabled(dev, enabled);
}
-#include <syscalls/auxdisplay_cursor_set_enabled_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_cursor_set_enabled_mrsh.c>
static inline int z_vrfy_auxdisplay_position_blinking_set_enabled(const struct device *dev,
bool enabled)
@@ -34,7 +34,7 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_position_blinking_set_enabled(dev, enabled);
}
-#include <syscalls/auxdisplay_position_blinking_set_enabled_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_position_blinking_set_enabled_mrsh.c>
static inline int z_vrfy_auxdisplay_cursor_shift_set(const struct device *dev, uint8_t direction,
bool display_shift)
@@ -42,7 +42,7 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_cursor_shift_set(dev, direction, display_shift);
}
-#include <syscalls/auxdisplay_cursor_shift_set_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_cursor_shift_set_mrsh.c>
static inline int z_vrfy_auxdisplay_cursor_position_set(const struct device *dev,
enum auxdisplay_position type,
@@ -51,7 +51,7 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_cursor_position_set(dev, type, x, y);
}
-#include <syscalls/auxdisplay_cursor_position_set_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_cursor_position_set_mrsh.c>
static inline int z_vrfy_auxdisplay_cursor_position_get(const struct device *dev, int16_t *x,
int16_t *y)
@@ -59,7 +59,7 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_cursor_position_get(dev, x, y);
}
-#include <syscalls/auxdisplay_cursor_position_get_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_cursor_position_get_mrsh.c>
static inline int z_vrfy_auxdisplay_display_position_set(const struct device *dev,
enum auxdisplay_position type,
@@ -68,7 +68,7 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_display_position_set(dev, type, x, y);
}
-#include <syscalls/auxdisplay_display_position_set_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_display_position_set_mrsh.c>
static inline int z_vrfy_auxdisplay_display_position_get(const struct device *dev, int16_t *x,
int16_t *y)
@@ -76,7 +76,7 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_display_position_get(dev, x, y);
}
-#include <syscalls/auxdisplay_display_position_get_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_display_position_get_mrsh.c>
static inline int z_vrfy_auxdisplay_capabilities_get(const struct device *dev,
struct auxdisplay_capabilities *capabilities)
@@ -84,14 +84,14 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_capabilities_get(dev, capabilities);
}
-#include <syscalls/auxdisplay_capabilities_get_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_capabilities_get_mrsh.c>
static inline int z_vrfy_auxdisplay_clear(const struct device *dev)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_clear(dev);
}
-#include <syscalls/auxdisplay_clear_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_clear_mrsh.c>
static inline int z_vrfy_auxdisplay_brightness_get(const struct device *dev,
uint8_t *brightness)
@@ -99,7 +99,7 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_brightness_get(dev, brightness);
}
-#include <syscalls/auxdisplay_brightness_get_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_brightness_get_mrsh.c>
static inline int z_vrfy_auxdisplay_brightness_set(const struct device *dev,
uint8_t brightness)
@@ -107,7 +107,7 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_brightness_set(dev, brightness);
}
-#include <syscalls/auxdisplay_brightness_set_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_brightness_set_mrsh.c>
static inline int z_vrfy_auxdisplay_backlight_get(const struct device *dev,
uint8_t *backlight)
@@ -115,7 +115,7 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_backlight_get(dev, backlight);
}
-#include <syscalls/auxdisplay_backlight_get_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_backlight_get_mrsh.c>
static inline int z_vrfy_auxdisplay_backlight_set(const struct device *dev,
uint8_t backlight)
@@ -123,14 +123,14 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_backlight_set(dev, backlight);
}
-#include <syscalls/auxdisplay_backlight_set_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_backlight_set_mrsh.c>
static inline int z_vrfy_auxdisplay_is_busy(const struct device *dev)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_is_busy(dev);
}
-#include <syscalls/auxdisplay_is_busy_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_is_busy_mrsh.c>
static inline int z_vrfy_auxdisplay_custom_character_set(const struct device *dev,
struct auxdisplay_character *character)
@@ -138,7 +138,7 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_custom_character_set(dev, character);
}
-#include <syscalls/auxdisplay_custom_character_set_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_custom_character_set_mrsh.c>
static inline int z_vrfy_auxdisplay_write(const struct device *dev, const uint8_t *data,
uint16_t len)
@@ -146,7 +146,7 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_write(dev, data, len);
}
-#include <syscalls/auxdisplay_write_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_write_mrsh.c>
static inline int z_vrfy_auxdisplay_custom_command(const struct device *dev,
struct auxdisplay_custom_data *data)
@@ -154,4 +154,4 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_AUXDISPLAY));
return z_impl_auxdisplay_custom_command(dev, data);
}
-#include <syscalls/auxdisplay_custom_command_mrsh.c>
+#include <zephyr/syscalls/auxdisplay_custom_command_mrsh.c>
diff --git a/drivers/bbram/bbram_handlers.c b/drivers/bbram/bbram_handlers.c
index 14e4abe2..2fc2695 100644
--- a/drivers/bbram/bbram_handlers.c
+++ b/drivers/bbram/bbram_handlers.c
@@ -12,21 +12,21 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_BBRAM));
return z_impl_bbram_check_invalid(dev);
}
-#include <syscalls/bbram_check_invalid_mrsh.c>
+#include <zephyr/syscalls/bbram_check_invalid_mrsh.c>
static inline int z_vrfy_bbram_check_standby_power(const struct device *dev)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_BBRAM));
return z_impl_bbram_check_standby_power(dev);
}
-#include <syscalls/bbram_check_standby_power_mrsh.c>
+#include <zephyr/syscalls/bbram_check_standby_power_mrsh.c>
static inline int z_vrfy_bbram_check_power(const struct device *dev)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_BBRAM));
return z_impl_bbram_check_power(dev);
}
-#include <syscalls/bbram_check_power_mrsh.c>
+#include <zephyr/syscalls/bbram_check_power_mrsh.c>
static inline int z_vrfy_bbram_get_size(const struct device *dev, size_t *size)
{
@@ -34,7 +34,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(size, sizeof(size_t)));
return z_impl_bbram_get_size(dev, size);
}
-#include <syscalls/bbram_get_size_mrsh.c>
+#include <zephyr/syscalls/bbram_get_size_mrsh.c>
static inline int z_vrfy_bbram_read(const struct device *dev, size_t offset,
size_t size, uint8_t *data)
@@ -43,7 +43,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(data, size));
return z_impl_bbram_read(dev, offset, size, data);
}
-#include <syscalls/bbram_read_mrsh.c>
+#include <zephyr/syscalls/bbram_read_mrsh.c>
static inline int z_vrfy_bbram_write(const struct device *dev, size_t offset,
size_t size, const uint8_t *data)
@@ -52,4 +52,4 @@
K_OOPS(K_SYSCALL_MEMORY_READ(data, size));
return z_impl_bbram_write(dev, offset, size, data);
}
-#include <syscalls/bbram_write_mrsh.c>
+#include <zephyr/syscalls/bbram_write_mrsh.c>
diff --git a/drivers/cache/cache_handlers.c b/drivers/cache/cache_handlers.c
index 2005124..692ec13 100644
--- a/drivers/cache/cache_handlers.c
+++ b/drivers/cache/cache_handlers.c
@@ -13,7 +13,7 @@
return z_impl_sys_cache_data_flush_range(addr, size);
}
-#include <syscalls/sys_cache_data_flush_range_mrsh.c>
+#include <zephyr/syscalls/sys_cache_data_flush_range_mrsh.c>
static inline int z_vrfy_sys_cache_data_invd_range(void *addr, size_t size)
{
@@ -21,7 +21,7 @@
return z_impl_sys_cache_data_invd_range(addr, size);
}
-#include <syscalls/sys_cache_data_invd_range_mrsh.c>
+#include <zephyr/syscalls/sys_cache_data_invd_range_mrsh.c>
static inline int z_vrfy_sys_cache_data_flush_and_invd_range(void *addr, size_t size)
{
@@ -29,4 +29,4 @@
return z_impl_sys_cache_data_flush_and_invd_range(addr, size);
}
-#include <syscalls/sys_cache_data_flush_and_invd_range_mrsh.c>
+#include <zephyr/syscalls/sys_cache_data_flush_and_invd_range_mrsh.c>
diff --git a/drivers/can/can_handlers.c b/drivers/can/can_handlers.c
index b762b80..c67ce01 100644
--- a/drivers/can/can_handlers.c
+++ b/drivers/can/can_handlers.c
@@ -21,7 +21,7 @@
return err;
}
-#include <syscalls/can_calc_timing_mrsh.c>
+#include <zephyr/syscalls/can_calc_timing_mrsh.c>
static inline int z_vrfy_can_set_timing(const struct device *dev,
const struct can_timing *timing)
@@ -33,7 +33,7 @@
return z_impl_can_set_timing(dev, &timing_copy);
}
-#include <syscalls/can_set_timing_mrsh.c>
+#include <zephyr/syscalls/can_set_timing_mrsh.c>
static inline int z_vrfy_can_get_core_clock(const struct device *dev,
uint32_t *rate)
@@ -43,7 +43,7 @@
return z_impl_can_get_core_clock(dev, rate);
}
-#include <syscalls/can_get_core_clock_mrsh.c>
+#include <zephyr/syscalls/can_get_core_clock_mrsh.c>
static inline uint32_t z_vrfy_can_get_bitrate_min(const struct device *dev)
{
@@ -51,7 +51,7 @@
return z_impl_can_get_bitrate_min(dev);
}
-#include <syscalls/can_get_bitrate_min_mrsh.c>
+#include <zephyr/syscalls/can_get_bitrate_min_mrsh.c>
static inline uint32_t z_vrfy_can_get_bitrate_max(const struct device *dev)
{
@@ -59,7 +59,7 @@
return z_impl_can_get_bitrate_max(dev);
}
-#include <syscalls/can_get_bitrate_max_mrsh.c>
+#include <zephyr/syscalls/can_get_bitrate_max_mrsh.c>
static inline const struct can_timing *z_vrfy_can_get_timing_min(const struct device *dev)
{
@@ -67,7 +67,7 @@
return z_impl_can_get_timing_min(dev);
}
-#include <syscalls/can_get_timing_min_mrsh.c>
+#include <zephyr/syscalls/can_get_timing_min_mrsh.c>
static inline const struct can_timing *z_vrfy_can_get_timing_max(const struct device *dev)
{
@@ -75,7 +75,7 @@
return z_impl_can_get_timing_max(dev);
}
-#include <syscalls/can_get_timing_max_mrsh.c>
+#include <zephyr/syscalls/can_get_timing_max_mrsh.c>
#ifdef CONFIG_CAN_FD_MODE
@@ -93,7 +93,7 @@
return err;
}
-#include <syscalls/can_calc_timing_data_mrsh.c>
+#include <zephyr/syscalls/can_calc_timing_data_mrsh.c>
static inline const struct can_timing *z_vrfy_can_get_timing_data_min(const struct device *dev)
{
@@ -101,7 +101,7 @@
return z_impl_can_get_timing_data_min(dev);
}
-#include <syscalls/can_get_timing_data_min_mrsh.c>
+#include <zephyr/syscalls/can_get_timing_data_min_mrsh.c>
static inline const struct can_timing *z_vrfy_can_get_timing_data_max(const struct device *dev)
{
@@ -109,7 +109,7 @@
return z_impl_can_get_timing_data_max(dev);
}
-#include <syscalls/can_get_timing_data_max_mrsh.c>
+#include <zephyr/syscalls/can_get_timing_data_max_mrsh.c>
static inline int z_vrfy_can_set_timing_data(const struct device *dev,
const struct can_timing *timing_data)
@@ -121,7 +121,7 @@
return z_impl_can_set_timing_data(dev, &timing_data_copy);
}
-#include <syscalls/can_set_timing_data_mrsh.c>
+#include <zephyr/syscalls/can_set_timing_data_mrsh.c>
static inline int z_vrfy_can_set_bitrate_data(const struct device *dev,
uint32_t bitrate_data)
@@ -130,7 +130,7 @@
return z_impl_can_set_bitrate_data(dev, bitrate_data);
}
-#include <syscalls/can_set_bitrate_data_mrsh.c>
+#include <zephyr/syscalls/can_set_bitrate_data_mrsh.c>
#endif /* CONFIG_CAN_FD_MODE */
@@ -141,7 +141,7 @@
return z_impl_can_get_max_filters(dev, ide);
}
-#include <syscalls/can_get_max_filters_mrsh.c>
+#include <zephyr/syscalls/can_get_max_filters_mrsh.c>
static inline int z_vrfy_can_get_capabilities(const struct device *dev, can_mode_t *cap)
{
@@ -150,7 +150,7 @@
return z_impl_can_get_capabilities(dev, cap);
}
-#include <syscalls/can_get_capabilities_mrsh.c>
+#include <zephyr/syscalls/can_get_capabilities_mrsh.c>
static inline const struct device *z_vrfy_can_get_transceiver(const struct device *dev)
{
@@ -158,7 +158,7 @@
return z_impl_can_get_transceiver(dev);
}
-#include <syscalls/can_get_transceiver_mrsh.c>
+#include <zephyr/syscalls/can_get_transceiver_mrsh.c>
static inline int z_vrfy_can_start(const struct device *dev)
{
@@ -166,7 +166,7 @@
return z_impl_can_start(dev);
}
-#include <syscalls/can_start_mrsh.c>
+#include <zephyr/syscalls/can_start_mrsh.c>
static inline int z_vrfy_can_stop(const struct device *dev)
{
@@ -174,7 +174,7 @@
return z_impl_can_stop(dev);
}
-#include <syscalls/can_stop_mrsh.c>
+#include <zephyr/syscalls/can_stop_mrsh.c>
static inline int z_vrfy_can_set_mode(const struct device *dev, can_mode_t mode)
{
@@ -182,7 +182,7 @@
return z_impl_can_set_mode(dev, mode);
}
-#include <syscalls/can_set_mode_mrsh.c>
+#include <zephyr/syscalls/can_set_mode_mrsh.c>
static inline can_mode_t z_vrfy_can_get_mode(const struct device *dev)
{
@@ -190,7 +190,7 @@
return z_impl_can_get_mode(dev);
}
-#include <syscalls/can_get_mode_mrsh.c>
+#include <zephyr/syscalls/can_get_mode_mrsh.c>
static inline int z_vrfy_can_set_bitrate(const struct device *dev, uint32_t bitrate)
{
@@ -198,7 +198,7 @@
return z_impl_can_set_bitrate(dev, bitrate);
}
-#include <syscalls/can_set_bitrate_mrsh.c>
+#include <zephyr/syscalls/can_set_bitrate_mrsh.c>
static inline int z_vrfy_can_send(const struct device *dev,
const struct can_frame *frame,
@@ -214,7 +214,7 @@
return z_impl_can_send(dev, &frame_copy, timeout, callback, user_data);
}
-#include <syscalls/can_send_mrsh.c>
+#include <zephyr/syscalls/can_send_mrsh.c>
static inline int z_vrfy_can_add_rx_filter_msgq(const struct device *dev,
struct k_msgq *msgq,
@@ -228,7 +228,7 @@
return z_impl_can_add_rx_filter_msgq(dev, msgq, &filter_copy);
}
-#include <syscalls/can_add_rx_filter_msgq_mrsh.c>
+#include <zephyr/syscalls/can_add_rx_filter_msgq_mrsh.c>
static inline void z_vrfy_can_remove_rx_filter(const struct device *dev, int filter_id)
{
@@ -236,7 +236,7 @@
z_impl_can_remove_rx_filter(dev, filter_id);
}
-#include <syscalls/can_remove_rx_filter_mrsh.c>
+#include <zephyr/syscalls/can_remove_rx_filter_mrsh.c>
static inline int z_vrfy_can_get_state(const struct device *dev, enum can_state *state,
struct can_bus_err_cnt *err_cnt)
@@ -253,7 +253,7 @@
return z_impl_can_get_state(dev, state, err_cnt);
}
-#include <syscalls/can_get_state_mrsh.c>
+#include <zephyr/syscalls/can_get_state_mrsh.c>
#ifdef CONFIG_CAN_MANUAL_RECOVERY_MODE
static inline int z_vrfy_can_recover(const struct device *dev, k_timeout_t timeout)
@@ -263,7 +263,7 @@
return z_impl_can_recover(dev, timeout);
}
-#include <syscalls/can_recover_mrsh.c>
+#include <zephyr/syscalls/can_recover_mrsh.c>
#endif /* CONFIG_CAN_MANUAL_RECOVERY_MODE */
#ifdef CONFIG_CAN_STATS
@@ -274,7 +274,7 @@
return z_impl_can_stats_get_bit_errors(dev);
}
-#include <syscalls/can_stats_get_bit_errors_mrsh.c>
+#include <zephyr/syscalls/can_stats_get_bit_errors_mrsh.c>
static inline uint32_t z_vrfy_can_stats_get_bit0_errors(const struct device *dev)
{
@@ -282,7 +282,7 @@
return z_impl_can_stats_get_bit0_errors(dev);
}
-#include <syscalls/can_stats_get_bit0_errors_mrsh.c>
+#include <zephyr/syscalls/can_stats_get_bit0_errors_mrsh.c>
static inline uint32_t z_vrfy_can_stats_get_bit1_errors(const struct device *dev)
{
@@ -290,7 +290,7 @@
return z_impl_can_stats_get_bit1_errors(dev);
}
-#include <syscalls/can_stats_get_bit1_errors_mrsh.c>
+#include <zephyr/syscalls/can_stats_get_bit1_errors_mrsh.c>
static inline uint32_t z_vrfy_can_stats_get_stuff_errors(const struct device *dev)
{
@@ -298,7 +298,7 @@
return z_impl_can_stats_get_stuff_errors(dev);
}
-#include <syscalls/can_stats_get_stuff_errors_mrsh.c>
+#include <zephyr/syscalls/can_stats_get_stuff_errors_mrsh.c>
static inline uint32_t z_vrfy_can_stats_get_crc_errors(const struct device *dev)
{
@@ -306,7 +306,7 @@
return z_impl_can_stats_get_crc_errors(dev);
}
-#include <syscalls/can_stats_get_crc_errors_mrsh.c>
+#include <zephyr/syscalls/can_stats_get_crc_errors_mrsh.c>
static inline uint32_t z_vrfy_can_stats_get_form_errors(const struct device *dev)
{
@@ -314,7 +314,7 @@
return z_impl_can_stats_get_form_errors(dev);
}
-#include <syscalls/can_stats_get_form_errors_mrsh.c>
+#include <zephyr/syscalls/can_stats_get_form_errors_mrsh.c>
static inline uint32_t z_vrfy_can_stats_get_ack_errors(const struct device *dev)
{
@@ -322,7 +322,7 @@
return z_impl_can_stats_get_ack_errors(dev);
}
-#include <syscalls/can_stats_get_ack_errors_mrsh.c>
+#include <zephyr/syscalls/can_stats_get_ack_errors_mrsh.c>
static inline uint32_t z_vrfy_can_stats_get_rx_overruns(const struct device *dev)
{
@@ -330,6 +330,6 @@
return z_impl_can_stats_get_rx_overruns(dev);
}
-#include <syscalls/can_stats_get_rx_overruns_mrsh.c>
+#include <zephyr/syscalls/can_stats_get_rx_overruns_mrsh.c>
#endif /* CONFIG_CAN_STATS */
diff --git a/drivers/charger/charger_handlers.c b/drivers/charger/charger_handlers.c
index 4fdf6ca..44042b3 100644
--- a/drivers/charger/charger_handlers.c
+++ b/drivers/charger/charger_handlers.c
@@ -21,7 +21,7 @@
return ret;
}
-#include <syscalls/charger_get_prop_mrsh.c>
+#include <zephyr/syscalls/charger_get_prop_mrsh.c>
static inline int z_vrfy_charger_set_prop(const struct device *dev, const charger_prop_t prop,
const union charger_propval *val)
@@ -35,7 +35,7 @@
return z_impl_charger_set_prop(dev, prop, &k_val);
}
-#include <syscalls/charger_set_prop_mrsh.c>
+#include <zephyr/syscalls/charger_set_prop_mrsh.c>
static inline int z_vrfy_charger_charge_enable(const struct device *dev, const bool enable)
{
@@ -44,4 +44,4 @@
return z_impl_charger_charge_enable(dev, enable);
}
-#include <syscalls/charger_charge_enable_mrsh.c>
+#include <zephyr/syscalls/charger_charge_enable_mrsh.c>
diff --git a/drivers/console/uart_mux.c b/drivers/console/uart_mux.c
index 8ade93e..f42b1c3 100644
--- a/drivers/console/uart_mux.c
+++ b/drivers/console/uart_mux.c
@@ -739,7 +739,7 @@
{
return z_impl_uart_mux_find(dlci_address);
}
-#include <syscalls/uart_mux_find_mrsh.c>
+#include <zephyr/syscalls/uart_mux_find_mrsh.c>
#endif /* CONFIG_USERSPACE */
const struct device *z_impl_uart_mux_find(int dlci_address)
diff --git a/drivers/counter/counter_handlers.c b/drivers/counter/counter_handlers.c
index 15cd0cb..df2a205 100644
--- a/drivers/counter/counter_handlers.c
+++ b/drivers/counter/counter_handlers.c
@@ -21,30 +21,30 @@
COUNTER_HANDLER(stop)
COUNTER_HANDLER(start)
-#include <syscalls/counter_get_pending_int_mrsh.c>
-#include <syscalls/counter_stop_mrsh.c>
-#include <syscalls/counter_start_mrsh.c>
+#include <zephyr/syscalls/counter_get_pending_int_mrsh.c>
+#include <zephyr/syscalls/counter_stop_mrsh.c>
+#include <zephyr/syscalls/counter_start_mrsh.c>
static inline bool z_vrfy_counter_is_counting_up(const struct device *dev)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_COUNTER));
return z_impl_counter_is_counting_up((const struct device *)dev);
}
-#include <syscalls/counter_is_counting_up_mrsh.c>
+#include <zephyr/syscalls/counter_is_counting_up_mrsh.c>
static inline uint8_t z_vrfy_counter_get_num_of_channels(const struct device *dev)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_COUNTER));
return z_impl_counter_get_num_of_channels((const struct device *)dev);
}
-#include <syscalls/counter_get_num_of_channels_mrsh.c>
+#include <zephyr/syscalls/counter_get_num_of_channels_mrsh.c>
static inline uint32_t z_vrfy_counter_get_frequency(const struct device *dev)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_COUNTER));
return z_impl_counter_get_frequency((const struct device *)dev);
}
-#include <syscalls/counter_get_frequency_mrsh.c>
+#include <zephyr/syscalls/counter_get_frequency_mrsh.c>
static inline uint32_t z_vrfy_counter_us_to_ticks(const struct device *dev,
uint64_t us)
@@ -53,7 +53,7 @@
return z_impl_counter_us_to_ticks((const struct device *)dev,
(uint64_t)us);
}
-#include <syscalls/counter_us_to_ticks_mrsh.c>
+#include <zephyr/syscalls/counter_us_to_ticks_mrsh.c>
static inline uint64_t z_vrfy_counter_ticks_to_us(const struct device *dev,
uint32_t ticks)
@@ -62,7 +62,7 @@
return z_impl_counter_ticks_to_us((const struct device *)dev,
(uint32_t)ticks);
}
-#include <syscalls/counter_ticks_to_us_mrsh.c>
+#include <zephyr/syscalls/counter_ticks_to_us_mrsh.c>
static inline int z_vrfy_counter_get_value(const struct device *dev,
uint32_t *ticks)
@@ -80,7 +80,7 @@
return z_impl_counter_get_value_64((const struct device *)dev, ticks);
}
-#include <syscalls/counter_get_value_mrsh.c>
+#include <zephyr/syscalls/counter_get_value_mrsh.c>
static inline int z_vrfy_counter_set_channel_alarm(const struct device *dev,
uint8_t chan_id,
@@ -97,7 +97,7 @@
(const struct counter_alarm_cfg *)&cfg_copy);
}
-#include <syscalls/counter_set_channel_alarm_mrsh.c>
+#include <zephyr/syscalls/counter_set_channel_alarm_mrsh.c>
static inline int z_vrfy_counter_cancel_channel_alarm(const struct device *dev,
uint8_t chan_id)
@@ -106,7 +106,7 @@
return z_impl_counter_cancel_channel_alarm((const struct device *)dev,
(uint8_t)chan_id);
}
-#include <syscalls/counter_cancel_channel_alarm_mrsh.c>
+#include <zephyr/syscalls/counter_cancel_channel_alarm_mrsh.c>
static inline int z_vrfy_counter_set_top_value(const struct device *dev,
const struct counter_top_cfg
@@ -122,21 +122,21 @@
(const struct counter_top_cfg *)
&cfg_copy);
}
-#include <syscalls/counter_set_top_value_mrsh.c>
+#include <zephyr/syscalls/counter_set_top_value_mrsh.c>
static inline uint32_t z_vrfy_counter_get_top_value(const struct device *dev)
{
K_OOPS(K_SYSCALL_DRIVER_COUNTER(dev, get_top_value));
return z_impl_counter_get_top_value((const struct device *)dev);
}
-#include <syscalls/counter_get_top_value_mrsh.c>
+#include <zephyr/syscalls/counter_get_top_value_mrsh.c>
static inline uint32_t z_vrfy_counter_get_max_top_value(const struct device *dev)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_COUNTER));
return z_impl_counter_get_max_top_value((const struct device *)dev);
}
-#include <syscalls/counter_get_max_top_value_mrsh.c>
+#include <zephyr/syscalls/counter_get_max_top_value_mrsh.c>
static inline uint32_t z_vrfy_counter_get_guard_period(const struct device *dev,
uint32_t flags)
@@ -145,7 +145,7 @@
return z_impl_counter_get_guard_period((const struct device *)dev,
flags);
}
-#include <syscalls/counter_get_guard_period_mrsh.c>
+#include <zephyr/syscalls/counter_get_guard_period_mrsh.c>
static inline int z_vrfy_counter_set_guard_period(const struct device *dev,
uint32_t ticks, uint32_t flags)
@@ -155,4 +155,4 @@
ticks,
flags);
}
-#include <syscalls/counter_set_guard_period_mrsh.c>
+#include <zephyr/syscalls/counter_set_guard_period_mrsh.c>
diff --git a/drivers/counter/maxim_ds3231.c b/drivers/counter/maxim_ds3231.c
index c6b8e08..146be21 100644
--- a/drivers/counter/maxim_ds3231.c
+++ b/drivers/counter/maxim_ds3231.c
@@ -1321,7 +1321,7 @@
return rv;
}
-#include <syscalls/maxim_ds3231_get_syncpoint_mrsh.c>
+#include <zephyr/syscalls/maxim_ds3231_get_syncpoint_mrsh.c>
int z_vrfy_maxim_ds3231_req_syncpoint(const struct device *dev,
struct k_poll_signal *sig)
@@ -1334,6 +1334,6 @@
return z_impl_maxim_ds3231_req_syncpoint(dev, sig);
}
-#include <syscalls/maxim_ds3231_req_syncpoint_mrsh.c>
+#include <zephyr/syscalls/maxim_ds3231_req_syncpoint_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/drivers/dac/dac_handlers.c b/drivers/dac/dac_handlers.c
index bd9ee0b..36557ad 100644
--- a/drivers/dac/dac_handlers.c
+++ b/drivers/dac/dac_handlers.c
@@ -21,7 +21,7 @@
return z_impl_dac_channel_setup((const struct device *)dev,
&channel_cfg);
}
-#include <syscalls/dac_channel_setup_mrsh.c>
+#include <zephyr/syscalls/dac_channel_setup_mrsh.c>
static inline int z_vrfy_dac_write_value(const struct device *dev,
uint8_t channel, uint32_t value)
@@ -31,4 +31,4 @@
return z_impl_dac_write_value((const struct device *)dev, channel,
value);
}
-#include <syscalls/dac_write_value_mrsh.c>
+#include <zephyr/syscalls/dac_write_value_mrsh.c>
diff --git a/drivers/dma/dma_handlers.c b/drivers/dma/dma_handlers.c
index d84c151..9ebce36 100644
--- a/drivers/dma/dma_handlers.c
+++ b/drivers/dma/dma_handlers.c
@@ -16,11 +16,11 @@
K_OOPS(K_SYSCALL_DRIVER_DMA(dev, start));
return z_impl_dma_start((const struct device *)dev, channel);
}
-#include <syscalls/dma_start_mrsh.c>
+#include <zephyr/syscalls/dma_start_mrsh.c>
static inline int z_vrfy_dma_stop(const struct device *dev, uint32_t channel)
{
K_OOPS(K_SYSCALL_DRIVER_DMA(dev, stop));
return z_impl_dma_stop((const struct device *)dev, channel);
}
-#include <syscalls/dma_stop_mrsh.c>
+#include <zephyr/syscalls/dma_stop_mrsh.c>
diff --git a/drivers/eeprom/eeprom_handlers.c b/drivers/eeprom/eeprom_handlers.c
index 9b1406a..94a3d4f 100644
--- a/drivers/eeprom/eeprom_handlers.c
+++ b/drivers/eeprom/eeprom_handlers.c
@@ -16,7 +16,7 @@
(void *)data,
len);
}
-#include <syscalls/eeprom_read_mrsh.c>
+#include <zephyr/syscalls/eeprom_read_mrsh.c>
static inline int z_vrfy_eeprom_write(const struct device *dev, off_t offset,
const void *data, size_t len)
@@ -26,11 +26,11 @@
return z_impl_eeprom_write((const struct device *)dev, offset,
(const void *)data, len);
}
-#include <syscalls/eeprom_write_mrsh.c>
+#include <zephyr/syscalls/eeprom_write_mrsh.c>
static inline size_t z_vrfy_eeprom_get_size(const struct device *dev)
{
K_OOPS(K_SYSCALL_DRIVER_EEPROM(dev, size));
return z_impl_eeprom_get_size((const struct device *)dev);
}
-#include <syscalls/eeprom_get_size_mrsh.c>
+#include <zephyr/syscalls/eeprom_get_size_mrsh.c>
diff --git a/drivers/entropy/entropy_handlers.c b/drivers/entropy/entropy_handlers.c
index 76b7df3..643aa77 100644
--- a/drivers/entropy/entropy_handlers.c
+++ b/drivers/entropy/entropy_handlers.c
@@ -17,4 +17,4 @@
(uint8_t *)buffer,
len);
}
-#include <syscalls/entropy_get_entropy_mrsh.c>
+#include <zephyr/syscalls/entropy_get_entropy_mrsh.c>
diff --git a/drivers/espi/espi_handlers.c b/drivers/espi/espi_handlers.c
index c215838..703300a 100644
--- a/drivers/espi/espi_handlers.c
+++ b/drivers/espi/espi_handlers.c
@@ -19,7 +19,7 @@
return z_impl_espi_config(dev, &cfg_copy);
}
-#include <syscalls/espi_config_mrsh.c>
+#include <zephyr/syscalls/espi_config_mrsh.c>
static inline bool z_vrfy_espi_get_channel_status(const struct device *dev,
enum espi_channel ch)
@@ -28,7 +28,7 @@
return z_impl_espi_get_channel_status(dev, ch);
}
-#include <syscalls/espi_get_channel_status_mrsh.c>
+#include <zephyr/syscalls/espi_get_channel_status_mrsh.c>
static inline int z_vrfy_espi_read_lpc_request(const struct device *dev,
enum lpc_peripheral_opcode op,
@@ -44,7 +44,7 @@
return ret;
}
-#include <syscalls/espi_read_lpc_request_mrsh.c>
+#include <zephyr/syscalls/espi_read_lpc_request_mrsh.c>
static inline int z_vrfy_espi_write_lpc_request(const struct device *dev,
enum lpc_peripheral_opcode op,
@@ -57,7 +57,7 @@
return z_impl_espi_write_lpc_request(dev, op, &data_copy);
}
-#include <syscalls/espi_write_lpc_request_mrsh.c>
+#include <zephyr/syscalls/espi_write_lpc_request_mrsh.c>
static inline int z_vrfy_espi_send_vwire(const struct device *dev,
enum espi_vwire_signal signal,
@@ -67,7 +67,7 @@
return z_impl_espi_send_vwire(dev, signal, level);
}
-#include <syscalls/espi_send_vwire_mrsh.c>
+#include <zephyr/syscalls/espi_send_vwire_mrsh.c>
static inline int z_vrfy_espi_receive_vwire(const struct device *dev,
enum espi_vwire_signal signal,
@@ -83,7 +83,7 @@
return ret;
}
-#include <syscalls/espi_receive_vwire_mrsh.c>
+#include <zephyr/syscalls/espi_receive_vwire_mrsh.c>
static inline int z_vrfy_espi_read_request(const struct device *dev,
struct espi_request_packet *req)
@@ -103,7 +103,7 @@
return ret;
}
-#include <syscalls/espi_read_request_mrsh.c>
+#include <zephyr/syscalls/espi_read_request_mrsh.c>
static inline int z_vrfy_espi_write_request(const struct device *dev,
struct espi_request_packet *req)
@@ -120,7 +120,7 @@
return ret;
}
-#include <syscalls/espi_write_request_mrsh.c>
+#include <zephyr/syscalls/espi_write_request_mrsh.c>
static inline int z_vrfy_espi_send_oob(const struct device *dev,
struct espi_oob_packet *pckt)
@@ -137,7 +137,7 @@
return ret;
}
-#include <syscalls/espi_send_oob_mrsh.c>
+#include <zephyr/syscalls/espi_send_oob_mrsh.c>
static inline int z_vrfy_espi_receive_oob(const struct device *dev,
struct espi_oob_packet *pckt)
@@ -156,7 +156,7 @@
return ret;
}
-#include <syscalls/espi_receive_oob_mrsh.c>
+#include <zephyr/syscalls/espi_receive_oob_mrsh.c>
static inline int z_vrfy_espi_read_flash(const struct device *dev,
struct espi_flash_packet *pckt)
@@ -175,7 +175,7 @@
return ret;
}
-#include <syscalls/espi_read_flash_mrsh.c>
+#include <zephyr/syscalls/espi_read_flash_mrsh.c>
static inline int z_vrfy_espi_write_flash(const struct device *dev,
struct espi_flash_packet *pckt)
@@ -192,7 +192,7 @@
return ret;
}
-#include <syscalls/espi_write_flash_mrsh.c>
+#include <zephyr/syscalls/espi_write_flash_mrsh.c>
static inline int z_vrfy_espi_flash_erase(const struct device *dev,
struct espi_flash_packet *pckt)
@@ -209,4 +209,4 @@
return ret;
}
-#include <syscalls/espi_flash_erase_mrsh.c>
+#include <zephyr/syscalls/espi_flash_erase_mrsh.c>
diff --git a/drivers/flash/flash_handlers.c b/drivers/flash/flash_handlers.c
index 8c047ad..6e47b10 100644
--- a/drivers/flash/flash_handlers.c
+++ b/drivers/flash/flash_handlers.c
@@ -16,7 +16,7 @@
(void *)data,
len);
}
-#include <syscalls/flash_read_mrsh.c>
+#include <zephyr/syscalls/flash_read_mrsh.c>
static inline int z_vrfy_flash_write(const struct device *dev, off_t offset,
const void *data, size_t len)
@@ -26,7 +26,7 @@
return z_impl_flash_write((const struct device *)dev, offset,
(const void *)data, len);
}
-#include <syscalls/flash_write_mrsh.c>
+#include <zephyr/syscalls/flash_write_mrsh.c>
static inline int z_vrfy_flash_erase(const struct device *dev, off_t offset,
size_t size)
@@ -34,21 +34,21 @@
K_OOPS(K_SYSCALL_DRIVER_FLASH(dev, erase));
return z_impl_flash_erase((const struct device *)dev, offset, size);
}
-#include <syscalls/flash_erase_mrsh.c>
+#include <zephyr/syscalls/flash_erase_mrsh.c>
static inline size_t z_vrfy_flash_get_write_block_size(const struct device *dev)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_FLASH));
return z_impl_flash_get_write_block_size(dev);
}
-#include <syscalls/flash_get_write_block_size_mrsh.c>
+#include <zephyr/syscalls/flash_get_write_block_size_mrsh.c>
static inline const struct flash_parameters *z_vrfy_flash_get_parameters(const struct device *dev)
{
K_OOPS(K_SYSCALL_DRIVER_FLASH(dev, get_parameters));
return z_impl_flash_get_parameters(dev);
}
-#include <syscalls/flash_get_parameters_mrsh.c>
+#include <zephyr/syscalls/flash_get_parameters_mrsh.c>
#ifdef CONFIG_FLASH_PAGE_LAYOUT
static inline int z_vrfy_flash_get_page_info_by_offs(const struct device *dev,
@@ -61,7 +61,7 @@
offs,
(struct flash_pages_info *)info);
}
-#include <syscalls/flash_get_page_info_by_offs_mrsh.c>
+#include <zephyr/syscalls/flash_get_page_info_by_offs_mrsh.c>
static inline int z_vrfy_flash_get_page_info_by_idx(const struct device *dev,
uint32_t idx,
@@ -73,14 +73,14 @@
idx,
(struct flash_pages_info *)info);
}
-#include <syscalls/flash_get_page_info_by_idx_mrsh.c>
+#include <zephyr/syscalls/flash_get_page_info_by_idx_mrsh.c>
static inline size_t z_vrfy_flash_get_page_count(const struct device *dev)
{
K_OOPS(K_SYSCALL_DRIVER_FLASH(dev, page_layout));
return z_impl_flash_get_page_count((const struct device *)dev);
}
-#include <syscalls/flash_get_page_count_mrsh.c>
+#include <zephyr/syscalls/flash_get_page_count_mrsh.c>
#endif /* CONFIG_FLASH_PAGE_LAYOUT */
@@ -94,7 +94,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(data, len));
return z_impl_flash_sfdp_read(dev, offset, data, len);
}
-#include <syscalls/flash_sfdp_read_mrsh.c>
+#include <zephyr/syscalls/flash_sfdp_read_mrsh.c>
static inline int z_vrfy_flash_read_jedec_id(const struct device *dev,
uint8_t *id)
@@ -103,7 +103,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(id, 3));
return z_impl_flash_read_jedec_id(dev, id);
}
-#include <syscalls/flash_read_jedec_id_mrsh.c>
+#include <zephyr/syscalls/flash_read_jedec_id_mrsh.c>
#endif /* CONFIG_FLASH_JESD216_API */
@@ -122,6 +122,6 @@
return z_impl_flash_ex_op(dev, code, in, out);
}
-#include <syscalls/flash_ex_op_mrsh.c>
+#include <zephyr/syscalls/flash_ex_op_mrsh.c>
#endif /* CONFIG_FLASH_EX_OP_ENABLED */
diff --git a/drivers/flash/flash_simulator.c b/drivers/flash/flash_simulator.c
index 12cd860..effd53c 100644
--- a/drivers/flash/flash_simulator.c
+++ b/drivers/flash/flash_simulator.c
@@ -491,6 +491,6 @@
return z_impl_flash_simulator_get_memory(dev, mock_size);
}
-#include <syscalls/flash_simulator_get_memory_mrsh.c>
+#include <zephyr/syscalls/flash_simulator_get_memory_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/drivers/flash/nrf_qspi_nor.c b/drivers/flash/nrf_qspi_nor.c
index b3a6fbb..81ccf12 100644
--- a/drivers/flash/nrf_qspi_nor.c
+++ b/drivers/flash/nrf_qspi_nor.c
@@ -1366,7 +1366,7 @@
z_impl_nrf_qspi_nor_xip_enable(dev, enable);
}
-#include <syscalls/nrf_qspi_nor_xip_enable_mrsh.c>
+#include <zephyr/syscalls/nrf_qspi_nor_xip_enable_mrsh.c>
#endif /* CONFIG_USERSPACE */
static struct qspi_nor_data qspi_nor_dev_data = {
diff --git a/drivers/fpga/fpga_shell.c b/drivers/fpga/fpga_shell.c
index af1a28e..4afeba4 100644
--- a/drivers/fpga/fpga_shell.c
+++ b/drivers/fpga/fpga_shell.c
@@ -6,7 +6,7 @@
#include <zephyr/sys/printk.h>
#include <zephyr/shell/shell.h>
-#include <version.h>
+#include <zephyr/version.h>
#include <stdlib.h>
#include <zephyr/drivers/fpga.h>
diff --git a/drivers/fuel_gauge/emul_fuel_gauge_syscall_handlers.c b/drivers/fuel_gauge/emul_fuel_gauge_syscall_handlers.c
index 2382fca..538d93f 100644
--- a/drivers/fuel_gauge/emul_fuel_gauge_syscall_handlers.c
+++ b/drivers/fuel_gauge/emul_fuel_gauge_syscall_handlers.c
@@ -14,7 +14,7 @@
return z_impl_emul_fuel_gauge_is_battery_cutoff(target, cutoff);
}
-#include <syscalls/emul_fuel_gauge_is_battery_cutoff_mrsh.c>
+#include <zephyr/syscalls/emul_fuel_gauge_is_battery_cutoff_mrsh.c>
static inline int z_vrfy_emul_fuel_gauge_set_battery_charging(const struct emul *target,
uint32_t uV, int uA)
@@ -22,4 +22,4 @@
return z_impl_emul_fuel_gauge_set_battery_charging(target, uV, uA);
}
-#include <syscalls/emul_fuel_gauge_set_battery_charging_mrsh.c>
+#include <zephyr/syscalls/emul_fuel_gauge_set_battery_charging_mrsh.c>
diff --git a/drivers/fuel_gauge/fuel_gauge_syscall_handlers.c b/drivers/fuel_gauge/fuel_gauge_syscall_handlers.c
index 312564c..75b93d3 100644
--- a/drivers/fuel_gauge/fuel_gauge_syscall_handlers.c
+++ b/drivers/fuel_gauge/fuel_gauge_syscall_handlers.c
@@ -24,7 +24,7 @@
return ret;
}
-#include <syscalls/fuel_gauge_get_prop_mrsh.c>
+#include <zephyr/syscalls/fuel_gauge_get_prop_mrsh.c>
static inline int z_vrfy_fuel_gauge_get_props(const struct device *dev, fuel_gauge_prop_t *props,
union fuel_gauge_prop_val *vals, size_t len)
@@ -44,7 +44,7 @@
return ret;
}
-#include <syscalls/fuel_gauge_get_props_mrsh.c>
+#include <zephyr/syscalls/fuel_gauge_get_props_mrsh.c>
static inline int z_vrfy_fuel_gauge_set_prop(const struct device *dev, fuel_gauge_prop_t prop,
union fuel_gauge_prop_val val)
@@ -56,7 +56,7 @@
return ret;
}
-#include <syscalls/fuel_gauge_set_prop_mrsh.c>
+#include <zephyr/syscalls/fuel_gauge_set_prop_mrsh.c>
static inline int z_vrfy_fuel_gauge_set_props(const struct device *dev, fuel_gauge_prop_t *props,
union fuel_gauge_prop_val *vals, size_t len)
@@ -77,7 +77,7 @@
return ret;
}
-#include <syscalls/fuel_gauge_set_props_mrsh.c>
+#include <zephyr/syscalls/fuel_gauge_set_props_mrsh.c>
static inline int z_vrfy_fuel_gauge_get_buffer_prop(const struct device *dev,
fuel_gauge_prop_t prop, void *dst,
@@ -92,7 +92,7 @@
return ret;
}
-#include <syscalls/fuel_gauge_get_buffer_prop_mrsh.c>
+#include <zephyr/syscalls/fuel_gauge_get_buffer_prop_mrsh.c>
static inline int z_vrfy_fuel_gauge_battery_cutoff(const struct device *dev)
{
@@ -101,4 +101,4 @@
return z_impl_fuel_gauge_battery_cutoff(dev);
}
-#include <syscalls/fuel_gauge_battery_cutoff_mrsh.c>
+#include <zephyr/syscalls/fuel_gauge_battery_cutoff_mrsh.c>
diff --git a/drivers/gpio/gpio_handlers.c b/drivers/gpio/gpio_handlers.c
index 99fbc6f..405b54a 100644
--- a/drivers/gpio/gpio_handlers.c
+++ b/drivers/gpio/gpio_handlers.c
@@ -16,7 +16,7 @@
pin,
flags);
}
-#include <syscalls/gpio_pin_configure_mrsh.c>
+#include <zephyr/syscalls/gpio_pin_configure_mrsh.c>
#ifdef CONFIG_GPIO_GET_CONFIG
static inline int z_vrfy_gpio_pin_get_config(const struct device *port,
@@ -28,7 +28,7 @@
return z_impl_gpio_pin_get_config(port, pin, flags);
}
-#include <syscalls/gpio_pin_get_config_mrsh.c>
+#include <zephyr/syscalls/gpio_pin_get_config_mrsh.c>
#endif
static inline int z_vrfy_gpio_port_get_raw(const struct device *port,
@@ -39,7 +39,7 @@
return z_impl_gpio_port_get_raw((const struct device *)port,
(gpio_port_value_t *)value);
}
-#include <syscalls/gpio_port_get_raw_mrsh.c>
+#include <zephyr/syscalls/gpio_port_get_raw_mrsh.c>
static inline int z_vrfy_gpio_port_set_masked_raw(const struct device *port,
gpio_port_pins_t mask,
@@ -50,7 +50,7 @@
mask,
value);
}
-#include <syscalls/gpio_port_set_masked_raw_mrsh.c>
+#include <zephyr/syscalls/gpio_port_set_masked_raw_mrsh.c>
static inline int z_vrfy_gpio_port_set_bits_raw(const struct device *port,
gpio_port_pins_t pins)
@@ -59,7 +59,7 @@
return z_impl_gpio_port_set_bits_raw((const struct device *)port,
pins);
}
-#include <syscalls/gpio_port_set_bits_raw_mrsh.c>
+#include <zephyr/syscalls/gpio_port_set_bits_raw_mrsh.c>
static inline int z_vrfy_gpio_port_clear_bits_raw(const struct device *port,
gpio_port_pins_t pins)
@@ -68,7 +68,7 @@
return z_impl_gpio_port_clear_bits_raw((const struct device *)port,
pins);
}
-#include <syscalls/gpio_port_clear_bits_raw_mrsh.c>
+#include <zephyr/syscalls/gpio_port_clear_bits_raw_mrsh.c>
static inline int z_vrfy_gpio_port_toggle_bits(const struct device *port,
gpio_port_pins_t pins)
@@ -76,7 +76,7 @@
K_OOPS(K_SYSCALL_DRIVER_GPIO(port, port_toggle_bits));
return z_impl_gpio_port_toggle_bits((const struct device *)port, pins);
}
-#include <syscalls/gpio_port_toggle_bits_mrsh.c>
+#include <zephyr/syscalls/gpio_port_toggle_bits_mrsh.c>
static inline int z_vrfy_gpio_pin_interrupt_configure(const struct device *port,
gpio_pin_t pin,
@@ -87,7 +87,7 @@
pin,
flags);
}
-#include <syscalls/gpio_pin_interrupt_configure_mrsh.c>
+#include <zephyr/syscalls/gpio_pin_interrupt_configure_mrsh.c>
static inline int z_vrfy_gpio_get_pending_int(const struct device *dev)
{
@@ -95,7 +95,7 @@
return z_impl_gpio_get_pending_int((const struct device *)dev);
}
-#include <syscalls/gpio_get_pending_int_mrsh.c>
+#include <zephyr/syscalls/gpio_get_pending_int_mrsh.c>
#ifdef CONFIG_GPIO_GET_DIRECTION
static inline int z_vrfy_gpio_port_get_direction(const struct device *dev, gpio_port_pins_t map,
@@ -114,5 +114,5 @@
return z_impl_gpio_port_get_direction(dev, map, inputs, outputs);
}
-#include <syscalls/gpio_port_get_direction_mrsh.c>
+#include <zephyr/syscalls/gpio_port_get_direction_mrsh.c>
#endif /* CONFIG_GPIO_GET_DIRECTION */
diff --git a/drivers/hwinfo/hwinfo_handlers.c b/drivers/hwinfo/hwinfo_handlers.c
index a1eb9e2..fc39241 100644
--- a/drivers/hwinfo/hwinfo_handlers.c
+++ b/drivers/hwinfo/hwinfo_handlers.c
@@ -13,7 +13,7 @@
return z_impl_hwinfo_get_device_id((uint8_t *)buffer, (size_t)length);
}
-#include <syscalls/hwinfo_get_device_id_mrsh.c>
+#include <zephyr/syscalls/hwinfo_get_device_id_mrsh.c>
ssize_t z_vrfy_hwinfo_get_device_eui64(uint8_t *buffer)
{
@@ -21,7 +21,7 @@
return z_impl_hwinfo_get_device_eui64((uint8_t *)buffer);
}
-#include <syscalls/hwinfo_get_device_eui64_mrsh.c>
+#include <zephyr/syscalls/hwinfo_get_device_eui64_mrsh.c>
int z_vrfy_hwinfo_get_reset_cause(uint32_t *cause)
{
@@ -33,14 +33,14 @@
return ret;
}
-#include <syscalls/hwinfo_get_reset_cause_mrsh.c>
+#include <zephyr/syscalls/hwinfo_get_reset_cause_mrsh.c>
int z_vrfy_hwinfo_clear_reset_cause(void)
{
return z_impl_hwinfo_clear_reset_cause();
}
-#include <syscalls/hwinfo_clear_reset_cause_mrsh.c>
+#include <zephyr/syscalls/hwinfo_clear_reset_cause_mrsh.c>
int z_vrfy_hwinfo_get_supported_reset_cause(uint32_t *supported)
{
@@ -52,4 +52,4 @@
return ret;
}
-#include <syscalls/hwinfo_get_supported_reset_cause_mrsh.c>
+#include <zephyr/syscalls/hwinfo_get_supported_reset_cause_mrsh.c>
diff --git a/drivers/hwspinlock/hwspinlock_handlers.c b/drivers/hwspinlock/hwspinlock_handlers.c
index 7064293..dbb1a94 100644
--- a/drivers/hwspinlock/hwspinlock_handlers.c
+++ b/drivers/hwspinlock/hwspinlock_handlers.c
@@ -13,7 +13,7 @@
return z_impl_hwspinlock_trylock(dev, id);
}
-#include <syscalls/hwspinlock_trylock_mrsh.c>
+#include <zephyr/syscalls/hwspinlock_trylock_mrsh.c>
static inline void z_vrfy_hwspinlock_lock(const struct device *dev, uint32_t id)
{
@@ -21,7 +21,7 @@
z_impl_hwspinlock_lock(dev, id);
}
-#include <syscalls/hwspinlock_lock_mrsh.c>
+#include <zephyr/syscalls/hwspinlock_lock_mrsh.c>
static inline void z_vrfy_hwspinlock_unlock(const struct device *dev, uint32_t id)
{
@@ -29,7 +29,7 @@
z_impl_hwspinlock_unlock(dev, id);
}
-#include <syscalls/hwspinlock_unlock_mrsh.c>
+#include <zephyr/syscalls/hwspinlock_unlock_mrsh.c>
static inline uint32_t z_vrfy_hwspinlock_get_max_id(const struct device *dev)
{
@@ -37,4 +37,4 @@
return z_impl_hwspinlock_get_max_id(dev);
}
-#include <syscalls/hwspinlock_get_max_id_mrsh.c>
+#include <zephyr/syscalls/hwspinlock_get_max_id_mrsh.c>
diff --git a/drivers/i2c/i2c_handlers.c b/drivers/i2c/i2c_handlers.c
index 20ec2a6..e5b87bc 100644
--- a/drivers/i2c/i2c_handlers.c
+++ b/drivers/i2c/i2c_handlers.c
@@ -14,7 +14,7 @@
K_OOPS(K_SYSCALL_DRIVER_I2C(dev, configure));
return z_impl_i2c_configure((const struct device *)dev, dev_config);
}
-#include <syscalls/i2c_configure_mrsh.c>
+#include <zephyr/syscalls/i2c_configure_mrsh.c>
static inline int z_vrfy_i2c_get_config(const struct device *dev,
uint32_t *dev_config)
@@ -24,7 +24,7 @@
return z_impl_i2c_get_config(dev, dev_config);
}
-#include <syscalls/i2c_get_config_mrsh.c>
+#include <zephyr/syscalls/i2c_get_config_mrsh.c>
static uint32_t copy_msgs_and_transfer(const struct device *dev,
const struct i2c_msg *msgs,
@@ -69,25 +69,25 @@
(struct i2c_msg *)msgs,
(uint8_t)num_msgs, (uint16_t)addr);
}
-#include <syscalls/i2c_transfer_mrsh.c>
+#include <zephyr/syscalls/i2c_transfer_mrsh.c>
static inline int z_vrfy_i2c_target_driver_register(const struct device *dev)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_I2C));
return z_impl_i2c_target_driver_register(dev);
}
-#include <syscalls/i2c_target_driver_register_mrsh.c>
+#include <zephyr/syscalls/i2c_target_driver_register_mrsh.c>
static inline int z_vrfy_i2c_target_driver_unregister(const struct device *dev)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_I2C));
return z_impl_i2c_target_driver_unregister(dev);
}
-#include <syscalls/i2c_target_driver_unregister_mrsh.c>
+#include <zephyr/syscalls/i2c_target_driver_unregister_mrsh.c>
static inline int z_vrfy_i2c_recover_bus(const struct device *dev)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_I2C));
return z_impl_i2c_recover_bus(dev);
}
-#include <syscalls/i2c_recover_bus_mrsh.c>
+#include <zephyr/syscalls/i2c_recover_bus_mrsh.c>
diff --git a/drivers/i2s/i2s_handlers.c b/drivers/i2s/i2s_handlers.c
index 0ef1f6e..3f1c31a 100644
--- a/drivers/i2s/i2s_handlers.c
+++ b/drivers/i2s/i2s_handlers.c
@@ -41,7 +41,7 @@
out:
return ret;
}
-#include <syscalls/i2s_configure_mrsh.c>
+#include <zephyr/syscalls/i2s_configure_mrsh.c>
static inline int z_vrfy_i2s_buf_read(const struct device *dev,
void *buf, size_t *size)
@@ -74,7 +74,7 @@
return ret;
}
-#include <syscalls/i2s_buf_read_mrsh.c>
+#include <zephyr/syscalls/i2s_buf_read_mrsh.c>
static inline int z_vrfy_i2s_buf_write(const struct device *dev,
void *buf, size_t size)
@@ -111,7 +111,7 @@
return ret;
}
-#include <syscalls/i2s_buf_write_mrsh.c>
+#include <zephyr/syscalls/i2s_buf_write_mrsh.c>
static inline int z_vrfy_i2s_trigger(const struct device *dev,
enum i2s_dir dir,
@@ -121,4 +121,4 @@
return z_impl_i2s_trigger((const struct device *)dev, dir, cmd);
}
-#include <syscalls/i2s_trigger_mrsh.c>
+#include <zephyr/syscalls/i2s_trigger_mrsh.c>
diff --git a/drivers/i3c/i3c_handlers.c b/drivers/i3c/i3c_handlers.c
index a5d2189..99708eb 100644
--- a/drivers/i3c/i3c_handlers.c
+++ b/drivers/i3c/i3c_handlers.c
@@ -35,7 +35,7 @@
return z_impl_i3c_do_ccc(dev, payload);
}
-#include <syscalls/i3c_do_ccc_mrsh.c>
+#include <zephyr/syscalls/i3c_do_ccc_mrsh.c>
static uint32_t copy_i3c_msgs_and_transfer(struct i3c_device_desc *target,
const struct i3c_msg *msgs,
@@ -79,4 +79,4 @@
(struct i3c_msg *)msgs,
(uint8_t)num_msgs);
}
-#include <syscalls/i3c_transfer_mrsh.c>
+#include <zephyr/syscalls/i3c_transfer_mrsh.c>
diff --git a/drivers/ipm/ipm_handlers.c b/drivers/ipm/ipm_handlers.c
index 259644a..f049a09 100644
--- a/drivers/ipm/ipm_handlers.c
+++ b/drivers/ipm/ipm_handlers.c
@@ -16,25 +16,25 @@
return z_impl_ipm_send((const struct device *)dev, wait, id,
(const void *)data, size);
}
-#include <syscalls/ipm_send_mrsh.c>
+#include <zephyr/syscalls/ipm_send_mrsh.c>
static inline int z_vrfy_ipm_max_data_size_get(const struct device *dev)
{
K_OOPS(K_SYSCALL_DRIVER_IPM(dev, max_data_size_get));
return z_impl_ipm_max_data_size_get((const struct device *)dev);
}
-#include <syscalls/ipm_max_data_size_get_mrsh.c>
+#include <zephyr/syscalls/ipm_max_data_size_get_mrsh.c>
static inline uint32_t z_vrfy_ipm_max_id_val_get(const struct device *dev)
{
K_OOPS(K_SYSCALL_DRIVER_IPM(dev, max_id_val_get));
return z_impl_ipm_max_id_val_get((const struct device *)dev);
}
-#include <syscalls/ipm_max_id_val_get_mrsh.c>
+#include <zephyr/syscalls/ipm_max_id_val_get_mrsh.c>
static inline int z_vrfy_ipm_set_enabled(const struct device *dev, int enable)
{
K_OOPS(K_SYSCALL_DRIVER_IPM(dev, set_enabled));
return z_impl_ipm_set_enabled((const struct device *)dev, enable);
}
-#include <syscalls/ipm_set_enabled_mrsh.c>
+#include <zephyr/syscalls/ipm_set_enabled_mrsh.c>
diff --git a/drivers/kscan/kscan_handlers.c b/drivers/kscan/kscan_handlers.c
index 9880968..81c97c1 100644
--- a/drivers/kscan/kscan_handlers.c
+++ b/drivers/kscan/kscan_handlers.c
@@ -15,7 +15,7 @@
"callback cannot be set from user mode"));
return z_impl_kscan_config((const struct device *)dev, callback_isr);
}
-#include <syscalls/kscan_config_mrsh.c>
+#include <zephyr/syscalls/kscan_config_mrsh.c>
static inline int z_vrfy_kscan_disable_callback(const struct device *dev)
{
@@ -23,7 +23,7 @@
return z_impl_kscan_disable_callback((const struct device *)dev);
}
-#include <syscalls/kscan_disable_callback_mrsh.c>
+#include <zephyr/syscalls/kscan_disable_callback_mrsh.c>
static int z_vrfy_kscan_enable_callback(const struct device *dev)
{
@@ -31,4 +31,4 @@
return z_impl_kscan_enable_callback((const struct device *)dev);
}
-#include <syscalls/kscan_enable_callback_mrsh.c>
+#include <zephyr/syscalls/kscan_enable_callback_mrsh.c>
diff --git a/drivers/led/led_handlers.c b/drivers/led/led_handlers.c
index a089846..5fde5e5 100644
--- a/drivers/led/led_handlers.c
+++ b/drivers/led/led_handlers.c
@@ -14,7 +14,7 @@
return z_impl_led_blink((const struct device *)dev, led, delay_on,
delay_off);
}
-#include <syscalls/led_blink_mrsh.c>
+#include <zephyr/syscalls/led_blink_mrsh.c>
static inline int z_vrfy_led_get_info(const struct device *dev, uint32_t led,
const struct led_info **info)
@@ -23,7 +23,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(info, sizeof(*info)));
return z_impl_led_get_info(dev, led, info);
}
-#include <syscalls/led_get_info_mrsh.c>
+#include <zephyr/syscalls/led_get_info_mrsh.c>
static inline int z_vrfy_led_set_brightness(const struct device *dev,
uint32_t led,
@@ -33,7 +33,7 @@
return z_impl_led_set_brightness((const struct device *)dev, led,
value);
}
-#include <syscalls/led_set_brightness_mrsh.c>
+#include <zephyr/syscalls/led_set_brightness_mrsh.c>
static inline int
z_vrfy_led_write_channels(const struct device *dev, uint32_t start_channel,
@@ -43,7 +43,7 @@
K_OOPS(K_SYSCALL_MEMORY_READ(buf, num_channels));
return z_impl_led_write_channels(dev, start_channel, num_channels, buf);
}
-#include <syscalls/led_write_channels_mrsh.c>
+#include <zephyr/syscalls/led_write_channels_mrsh.c>
static inline int z_vrfy_led_set_channel(const struct device *dev,
uint32_t channel, uint8_t value)
@@ -51,7 +51,7 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_LED));
return z_impl_led_set_channel(dev, channel, value);
}
-#include <syscalls/led_set_channel_mrsh.c>
+#include <zephyr/syscalls/led_set_channel_mrsh.c>
static inline int z_vrfy_led_set_color(const struct device *dev, uint32_t led,
uint8_t num_colors, const uint8_t *color)
@@ -60,18 +60,18 @@
K_OOPS(K_SYSCALL_MEMORY_READ(color, num_colors));
return z_impl_led_set_color(dev, led, num_colors, color);
}
-#include <syscalls/led_set_color_mrsh.c>
+#include <zephyr/syscalls/led_set_color_mrsh.c>
static inline int z_vrfy_led_on(const struct device *dev, uint32_t led)
{
K_OOPS(K_SYSCALL_DRIVER_LED(dev, on));
return z_impl_led_on((const struct device *)dev, led);
}
-#include <syscalls/led_on_mrsh.c>
+#include <zephyr/syscalls/led_on_mrsh.c>
static inline int z_vrfy_led_off(const struct device *dev, uint32_t led)
{
K_OOPS(K_SYSCALL_DRIVER_LED(dev, off));
return z_impl_led_off((const struct device *)dev, led);
}
-#include <syscalls/led_off_mrsh.c>
+#include <zephyr/syscalls/led_off_mrsh.c>
diff --git a/drivers/mbox/mbox_handlers.c b/drivers/mbox/mbox_handlers.c
index 2340ab0..aca4fb9 100644
--- a/drivers/mbox/mbox_handlers.c
+++ b/drivers/mbox/mbox_handlers.c
@@ -17,7 +17,7 @@
return z_impl_mbox_send(dev, channel_id, msg);
}
-#include <syscalls/mbox_send_mrsh.c>
+#include <zephyr/syscalls/mbox_send_mrsh.c>
static inline int z_vrfy_mbox_mtu_get(const struct device *dev)
{
@@ -25,7 +25,7 @@
return z_impl_mbox_mtu_get(dev);
}
-#include <syscalls/mbox_mtu_get_mrsh.c>
+#include <zephyr/syscalls/mbox_mtu_get_mrsh.c>
static inline uint32_t z_vrfy_mbox_max_channels_get(const struct device *dev)
{
@@ -33,7 +33,7 @@
return z_impl_mbox_max_channels_get(dev);
}
-#include <syscalls/mbox_max_channels_get_mrsh.c>
+#include <zephyr/syscalls/mbox_max_channels_get_mrsh.c>
static inline int z_vrfy_mbox_set_enabled(const struct device *dev,
mbox_channel_id_t channel_id,
@@ -43,4 +43,4 @@
return z_impl_mbox_set_enabled(dev, channel_id, enabled);
}
-#include <syscalls/mbox_set_enabled_mrsh.c>
+#include <zephyr/syscalls/mbox_set_enabled_mrsh.c>
diff --git a/drivers/misc/devmux/devmux.c b/drivers/misc/devmux/devmux.c
index 653236f..675b635 100644
--- a/drivers/misc/devmux/devmux.c
+++ b/drivers/misc/devmux/devmux.c
@@ -94,7 +94,7 @@
{
return z_impl_devmux_select_get(dev);
}
-#include <syscalls/devmux_select_get_mrsh.c>
+#include <zephyr/syscalls/devmux_select_get_mrsh.c>
#endif
int z_impl_devmux_select_set(struct device *dev, size_t index)
@@ -124,7 +124,7 @@
{
return z_impl_devmux_select_set(dev, index);
}
-#include <syscalls/devmux_select_set_mrsh.c>
+#include <zephyr/syscalls/devmux_select_set_mrsh.c>
#endif
static int devmux_init(struct device *const dev)
diff --git a/drivers/misc/timeaware_gpio/timeaware_gpio_handlers.c b/drivers/misc/timeaware_gpio/timeaware_gpio_handlers.c
index 1904db4..0745db6 100644
--- a/drivers/misc/timeaware_gpio/timeaware_gpio_handlers.c
+++ b/drivers/misc/timeaware_gpio/timeaware_gpio_handlers.c
@@ -12,7 +12,7 @@
K_OOPS(Z_SYSCALL_MEMORY_WRITE(current_time, sizeof(uint64_t)));
return z_impl_tgpio_port_get_time((const struct device *)port, (uint64_t *)current_time);
}
-#include <syscalls/tgpio_port_get_time_mrsh.c>
+#include <zephyr/syscalls/tgpio_port_get_time_mrsh.c>
static inline int z_vrfy_tgpio_port_get_cycles_per_second(const struct device *port,
uint32_t *cycles)
@@ -22,7 +22,7 @@
return z_impl_tgpio_port_get_cycles_per_second((const struct device *)port,
(uint32_t *)cycles);
}
-#include <syscalls/tgpio_port_get_cycles_per_second_mrsh.c>
+#include <zephyr/syscalls/tgpio_port_get_cycles_per_second_mrsh.c>
static inline int z_vrfy_tgpio_pin_periodic_output(const struct device *port, uint32_t pin,
uint64_t start_time, uint64_t repeat_interval,
@@ -32,14 +32,14 @@
return z_impl_tgpio_pin_periodic_output((const struct device *)port, pin, start_time,
repeat_interval, periodic_enable);
}
-#include <syscalls/tgpio_pin_periodic_output_mrsh.c>
+#include <zephyr/syscalls/tgpio_pin_periodic_output_mrsh.c>
static inline int z_vrfy_tgpio_pin_disable(const struct device *port, uint32_t pin)
{
K_OOPS(Z_SYSCALL_DRIVER_TGPIO(port, pin_disable));
return z_impl_tgpio_pin_disable((const struct device *)port, pin);
}
-#include <syscalls/tgpio_pin_disable_mrsh.c>
+#include <zephyr/syscalls/tgpio_pin_disable_mrsh.c>
static inline int z_vrfy_tgpio_pin_config_ext_timestamp(const struct device *port, uint32_t pin,
uint32_t event_polarity)
@@ -48,7 +48,7 @@
return z_impl_tgpio_pin_config_ext_timestamp((const struct device *)port, pin,
event_polarity);
}
-#include <syscalls/tgpio_pin_config_ext_timestamp_mrsh.c>
+#include <zephyr/syscalls/tgpio_pin_config_ext_timestamp_mrsh.c>
static inline int z_vrfy_tgpio_pin_read_ts_ec(const struct device *port, uint32_t pin,
uint64_t *timestamp, uint64_t *event_count)
@@ -57,4 +57,4 @@
return z_impl_tgpio_pin_read_ts_ec((const struct device *)port, pin, (uint64_t *)timestamp,
(uint64_t *)event_count);
}
-#include <syscalls/tgpio_pin_read_ts_ec_mrsh.c>
+#include <zephyr/syscalls/tgpio_pin_read_ts_ec_mrsh.c>
diff --git a/drivers/peci/peci_handlers.c b/drivers/peci/peci_handlers.c
index 64947a8..c0f532a 100644
--- a/drivers/peci/peci_handlers.c
+++ b/drivers/peci/peci_handlers.c
@@ -15,7 +15,7 @@
return z_impl_peci_config(dev, bitrate);
}
-#include <syscalls/peci_config_mrsh.c>
+#include <zephyr/syscalls/peci_config_mrsh.c>
static inline int z_vrfy_peci_enable(const struct device *dev)
{
@@ -23,7 +23,7 @@
return z_impl_peci_enable(dev);
}
-#include <syscalls/peci_enable_mrsh.c>
+#include <zephyr/syscalls/peci_enable_mrsh.c>
static inline int z_vrfy_peci_disable(const struct device *dev)
{
@@ -31,7 +31,7 @@
return z_impl_peci_disable(dev);
}
-#include <syscalls/peci_disable_mrsh.c>
+#include <zephyr/syscalls/peci_disable_mrsh.c>
static inline int z_vrfy_peci_transfer(const struct device *dev,
struct peci_msg *msg)
@@ -43,4 +43,4 @@
return z_impl_peci_transfer(dev, &msg_copy);
}
-#include <syscalls/peci_transfer_mrsh.c>
+#include <zephyr/syscalls/peci_transfer_mrsh.c>
diff --git a/drivers/ps2/ps2_handlers.c b/drivers/ps2/ps2_handlers.c
index 91835e8..db93d93 100644
--- a/drivers/ps2/ps2_handlers.c
+++ b/drivers/ps2/ps2_handlers.c
@@ -15,14 +15,14 @@
"callback not be set from user mode"));
return z_impl_ps2_config(dev, callback_isr);
}
-#include <syscalls/ps2_config_mrsh.c>
+#include <zephyr/syscalls/ps2_config_mrsh.c>
static inline int z_vrfy_ps2_write(const struct device *dev, uint8_t value)
{
K_OOPS(K_SYSCALL_DRIVER_PS2(dev, write));
return z_impl_ps2_write(dev, value);
}
-#include <syscalls/ps2_write_mrsh.c>
+#include <zephyr/syscalls/ps2_write_mrsh.c>
static inline int z_vrfy_ps2_read(const struct device *dev, uint8_t *value)
{
@@ -30,18 +30,18 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(value, sizeof(uint8_t)));
return z_impl_ps2_read(dev, value);
}
-#include <syscalls/ps2_read_mrsh.c>
+#include <zephyr/syscalls/ps2_read_mrsh.c>
static inline int z_vrfy_ps2_enable_callback(const struct device *dev)
{
K_OOPS(K_SYSCALL_DRIVER_PS2(dev, enable_callback));
return z_impl_ps2_enable_callback(dev);
}
-#include <syscalls/ps2_enable_callback_mrsh.c>
+#include <zephyr/syscalls/ps2_enable_callback_mrsh.c>
static inline int z_vrfy_ps2_disable_callback(const struct device *dev)
{
K_OOPS(K_SYSCALL_DRIVER_PS2(dev, disable_callback));
return z_impl_ps2_disable_callback(dev);
}
-#include <syscalls/ps2_disable_callback_mrsh.c>
+#include <zephyr/syscalls/ps2_disable_callback_mrsh.c>
diff --git a/drivers/ptp_clock/ptp_clock.c b/drivers/ptp_clock/ptp_clock.c
index 0ac0e5c..d0db19c 100644
--- a/drivers/ptp_clock/ptp_clock.c
+++ b/drivers/ptp_clock/ptp_clock.c
@@ -28,5 +28,5 @@
return ret;
}
-#include <syscalls/ptp_clock_get_mrsh.c>
+#include <zephyr/syscalls/ptp_clock_get_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/drivers/pwm/pwm_handlers.c b/drivers/pwm/pwm_handlers.c
index 3ffaaa6..5c342a8 100644
--- a/drivers/pwm/pwm_handlers.c
+++ b/drivers/pwm/pwm_handlers.c
@@ -16,7 +16,7 @@
return z_impl_pwm_set_cycles((const struct device *)dev, channel,
period, pulse, flags);
}
-#include <syscalls/pwm_set_cycles_mrsh.c>
+#include <zephyr/syscalls/pwm_set_cycles_mrsh.c>
static inline int z_vrfy_pwm_get_cycles_per_sec(const struct device *dev,
uint32_t channel,
@@ -27,7 +27,7 @@
return z_impl_pwm_get_cycles_per_sec((const struct device *)dev,
channel, (uint64_t *)cycles);
}
-#include <syscalls/pwm_get_cycles_per_sec_mrsh.c>
+#include <zephyr/syscalls/pwm_get_cycles_per_sec_mrsh.c>
#ifdef CONFIG_PWM_CAPTURE
@@ -37,7 +37,7 @@
K_OOPS(K_SYSCALL_DRIVER_PWM(dev, enable_capture));
return z_impl_pwm_enable_capture((const struct device *)dev, channel);
}
-#include <syscalls/pwm_enable_capture_mrsh.c>
+#include <zephyr/syscalls/pwm_enable_capture_mrsh.c>
static inline int z_vrfy_pwm_disable_capture(const struct device *dev,
uint32_t channel)
@@ -45,7 +45,7 @@
K_OOPS(K_SYSCALL_DRIVER_PWM(dev, disable_capture));
return z_impl_pwm_disable_capture((const struct device *)dev, channel);
}
-#include <syscalls/pwm_disable_capture_mrsh.c>
+#include <zephyr/syscalls/pwm_disable_capture_mrsh.c>
static inline int z_vrfy_pwm_capture_cycles(const struct device *dev,
uint32_t channel, pwm_flags_t flags,
@@ -75,6 +75,6 @@
return err;
}
-#include <syscalls/pwm_capture_cycles_mrsh.c>
+#include <zephyr/syscalls/pwm_capture_cycles_mrsh.c>
#endif /* CONFIG_PWM_CAPTURE */
diff --git a/drivers/retained_mem/retained_mem_handlers.c b/drivers/retained_mem/retained_mem_handlers.c
index d344e37..1d00358 100644
--- a/drivers/retained_mem/retained_mem_handlers.c
+++ b/drivers/retained_mem/retained_mem_handlers.c
@@ -12,7 +12,7 @@
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_RETAINED_MEM));
return z_impl_retained_mem_size(dev);
}
-#include <syscalls/retained_mem_size_mrsh.c>
+#include <zephyr/syscalls/retained_mem_size_mrsh.c>
static inline int z_vrfy_retained_mem_read(const struct device *dev, off_t offset,
uint8_t *buffer, size_t size)
@@ -21,7 +21,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(buffer, size));
return z_impl_retained_mem_read(dev, offset, buffer, size);
}
-#include <syscalls/retained_mem_read_mrsh.c>
+#include <zephyr/syscalls/retained_mem_read_mrsh.c>
static inline int z_vrfy_retained_mem_write(const struct device *dev, off_t offset,
const uint8_t *buffer, size_t size)
@@ -30,11 +30,11 @@
K_OOPS(K_SYSCALL_MEMORY_READ(buffer, size));
return z_impl_retained_mem_write(dev, offset, buffer, size);
}
-#include <syscalls/retained_mem_write_mrsh.c>
+#include <zephyr/syscalls/retained_mem_write_mrsh.c>
static inline int z_vrfy_retained_mem_clear(const struct device *dev)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_RETAINED_MEM));
return z_impl_retained_mem_clear(dev);
}
-#include <syscalls/retained_mem_clear_mrsh.c>
+#include <zephyr/syscalls/retained_mem_clear_mrsh.c>
diff --git a/drivers/rtc/rtc_handlers.c b/drivers/rtc/rtc_handlers.c
index 33bb907..499171d 100644
--- a/drivers/rtc/rtc_handlers.c
+++ b/drivers/rtc/rtc_handlers.c
@@ -13,7 +13,7 @@
K_OOPS(K_SYSCALL_MEMORY_READ(timeptr, sizeof(struct rtc_time)));
return z_impl_rtc_set_time(dev, timeptr);
}
-#include <syscalls/rtc_set_time_mrsh.c>
+#include <zephyr/syscalls/rtc_set_time_mrsh.c>
static inline int z_vrfy_rtc_get_time(const struct device *dev, struct rtc_time *timeptr)
{
@@ -21,7 +21,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(timeptr, sizeof(struct rtc_time)));
return z_impl_rtc_get_time(dev, timeptr);
}
-#include <syscalls/rtc_get_time_mrsh.c>
+#include <zephyr/syscalls/rtc_get_time_mrsh.c>
#ifdef CONFIG_RTC_ALARM
static inline int z_vrfy_rtc_alarm_get_supported_fields(const struct device *dev, uint16_t id,
@@ -31,7 +31,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(mask, sizeof(uint16_t)));
return z_impl_rtc_alarm_get_supported_fields(dev, id, mask);
}
-#include <syscalls/rtc_alarm_get_supported_fields_mrsh.c>
+#include <zephyr/syscalls/rtc_alarm_get_supported_fields_mrsh.c>
static inline int z_vrfy_rtc_alarm_set_time(const struct device *dev, uint16_t id, uint16_t mask,
const struct rtc_time *timeptr)
@@ -40,7 +40,7 @@
K_OOPS(K_SYSCALL_MEMORY_READ(timeptr, sizeof(struct rtc_time)));
return z_impl_rtc_alarm_set_time(dev, id, mask, timeptr);
}
-#include <syscalls/rtc_alarm_set_time_mrsh.c>
+#include <zephyr/syscalls/rtc_alarm_set_time_mrsh.c>
static inline int z_vrfy_rtc_alarm_get_time(const struct device *dev, uint16_t id, uint16_t *mask,
struct rtc_time *timeptr)
@@ -50,14 +50,14 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(timeptr, sizeof(struct rtc_time)));
return z_impl_rtc_alarm_get_time(dev, id, mask, timeptr);
}
-#include <syscalls/rtc_alarm_get_time_mrsh.c>
+#include <zephyr/syscalls/rtc_alarm_get_time_mrsh.c>
static inline int z_vrfy_rtc_alarm_is_pending(const struct device *dev, uint16_t id)
{
K_OOPS(K_SYSCALL_DRIVER_RTC(dev, alarm_is_pending));
return z_impl_rtc_alarm_is_pending(dev, id);
}
-#include <syscalls/rtc_alarm_is_pending_mrsh.c>
+#include <zephyr/syscalls/rtc_alarm_is_pending_mrsh.c>
#endif /* CONFIG_RTC_ALARM */
#ifdef CONFIG_RTC_CALIBRATION
@@ -67,7 +67,7 @@
return z_impl_rtc_set_calibration(dev, calibration);
}
-#include <syscalls/rtc_set_calibration_mrsh.c>
+#include <zephyr/syscalls/rtc_set_calibration_mrsh.c>
static inline int z_vrfy_rtc_get_calibration(const struct device *dev, int32_t *calibration)
{
@@ -75,5 +75,5 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(calibration, sizeof(int32_t)));
return z_impl_rtc_get_calibration(dev, calibration);
}
-#include <syscalls/rtc_get_calibration_mrsh.c>
+#include <zephyr/syscalls/rtc_get_calibration_mrsh.c>
#endif /* CONFIG_RTC_CALIBRATION */
diff --git a/drivers/sensor/sensor_handlers.c b/drivers/sensor/sensor_handlers.c
index 4643646..ea82e20 100644
--- a/drivers/sensor/sensor_handlers.c
+++ b/drivers/sensor/sensor_handlers.c
@@ -17,7 +17,7 @@
return z_impl_sensor_attr_set((const struct device *)dev, chan, attr,
(const struct sensor_value *)val);
}
-#include <syscalls/sensor_attr_set_mrsh.c>
+#include <zephyr/syscalls/sensor_attr_set_mrsh.c>
static inline int z_vrfy_sensor_attr_get(const struct device *dev,
enum sensor_channel chan,
@@ -29,14 +29,14 @@
return z_impl_sensor_attr_get((const struct device *)dev, chan, attr,
(struct sensor_value *)val);
}
-#include <syscalls/sensor_attr_get_mrsh.c>
+#include <zephyr/syscalls/sensor_attr_get_mrsh.c>
static inline int z_vrfy_sensor_sample_fetch(const struct device *dev)
{
K_OOPS(K_SYSCALL_DRIVER_SENSOR(dev, sample_fetch));
return z_impl_sensor_sample_fetch((const struct device *)dev);
}
-#include <syscalls/sensor_sample_fetch_mrsh.c>
+#include <zephyr/syscalls/sensor_sample_fetch_mrsh.c>
static inline int z_vrfy_sensor_sample_fetch_chan(const struct device *dev,
enum sensor_channel type)
@@ -45,7 +45,7 @@
return z_impl_sensor_sample_fetch_chan((const struct device *)dev,
type);
}
-#include <syscalls/sensor_sample_fetch_chan_mrsh.c>
+#include <zephyr/syscalls/sensor_sample_fetch_chan_mrsh.c>
static inline int z_vrfy_sensor_channel_get(const struct device *dev,
enum sensor_channel chan,
@@ -56,7 +56,7 @@
return z_impl_sensor_channel_get((const struct device *)dev, chan,
(struct sensor_value *)val);
}
-#include <syscalls/sensor_channel_get_mrsh.c>
+#include <zephyr/syscalls/sensor_channel_get_mrsh.c>
#ifdef CONFIG_SENSOR_ASYNC_API
static inline int z_vrfy_sensor_get_decoder(const struct device *dev,
@@ -66,7 +66,7 @@
K_OOPS(K_SYSCALL_MEMORY_READ(decoder, sizeof(struct sensor_decoder_api)));
return z_impl_sensor_get_decoder(dev, decoder);
}
-#include <syscalls/sensor_get_decoder_mrsh.c>
+#include <zephyr/syscalls/sensor_get_decoder_mrsh.c>
static inline int z_vrfy_sensor_reconfigure_read_iodev(struct rtio_iodev *iodev,
const struct device *sensor,
@@ -78,5 +78,5 @@
K_OOPS(K_SYSCALL_MEMORY_READ(channels, sizeof(enum sensor_channel) * num_channels));
return z_impl_sensor_reconfigure_read_iodev(iodev, sensor, channels, num_channels);
}
-#include <syscalls/sensor_reconfigure_read_iodev_mrsh.c>
+#include <zephyr/syscalls/sensor_reconfigure_read_iodev_mrsh.c>
#endif
diff --git a/drivers/serial/uart_handlers.c b/drivers/serial/uart_handlers.c
index 954592a..24707bd 100644
--- a/drivers/serial/uart_handlers.c
+++ b/drivers/serial/uart_handlers.c
@@ -22,7 +22,7 @@
}
UART_SIMPLE(err_check)
-#include <syscalls/uart_err_check_mrsh.c>
+#include <zephyr/syscalls/uart_err_check_mrsh.c>
static inline int z_vrfy_uart_poll_in(const struct device *dev,
unsigned char *p_char)
@@ -31,7 +31,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(p_char, sizeof(unsigned char)));
return z_impl_uart_poll_in(dev, p_char);
}
-#include <syscalls/uart_poll_in_mrsh.c>
+#include <zephyr/syscalls/uart_poll_in_mrsh.c>
static inline int z_vrfy_uart_poll_in_u16(const struct device *dev,
uint16_t *p_u16)
@@ -40,7 +40,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(p_u16, sizeof(uint16_t)));
return z_impl_uart_poll_in_u16(dev, p_u16);
}
-#include <syscalls/uart_poll_in_u16_mrsh.c>
+#include <zephyr/syscalls/uart_poll_in_u16_mrsh.c>
static inline void z_vrfy_uart_poll_out(const struct device *dev,
unsigned char out_char)
@@ -48,7 +48,7 @@
K_OOPS(K_SYSCALL_DRIVER_UART(dev, poll_out));
z_impl_uart_poll_out((const struct device *)dev, out_char);
}
-#include <syscalls/uart_poll_out_mrsh.c>
+#include <zephyr/syscalls/uart_poll_out_mrsh.c>
static inline void z_vrfy_uart_poll_out_u16(const struct device *dev,
uint16_t out_u16)
@@ -56,7 +56,7 @@
K_OOPS(K_SYSCALL_DRIVER_UART(dev, poll_out));
z_impl_uart_poll_out_u16((const struct device *)dev, out_u16);
}
-#include <syscalls/uart_poll_out_u16_mrsh.c>
+#include <zephyr/syscalls/uart_poll_out_u16_mrsh.c>
#ifdef CONFIG_UART_USE_RUNTIME_CONFIGURE
static inline int z_vrfy_uart_config_get(const struct device *dev,
@@ -67,7 +67,7 @@
return z_impl_uart_config_get(dev, cfg);
}
-#include <syscalls/uart_config_get_mrsh.c>
+#include <zephyr/syscalls/uart_config_get_mrsh.c>
static inline int z_vrfy_uart_configure(const struct device *dev,
const struct uart_config *cfg)
@@ -77,7 +77,7 @@
return z_impl_uart_configure(dev, cfg);
}
-#include <syscalls/uart_configure_mrsh.c>
+#include <zephyr/syscalls/uart_configure_mrsh.c>
#endif
#ifdef CONFIG_UART_ASYNC_API
@@ -94,7 +94,7 @@
K_OOPS(K_SYSCALL_MEMORY_READ(buf, len));
return z_impl_uart_tx(dev, buf, len, timeout);
}
-#include <syscalls/uart_tx_mrsh.c>
+#include <zephyr/syscalls/uart_tx_mrsh.c>
#ifdef CONFIG_UART_WIDE_DATA
static inline int z_vrfy_uart_tx_u16(const struct device *dev,
@@ -105,11 +105,11 @@
K_OOPS(K_SYSCALL_MEMORY_ARRAY_READ(buf, len, sizeof(uint16_t)));
return z_impl_uart_tx_u16(dev, buf, len, timeout);
}
-#include <syscalls/uart_tx_u16_mrsh.c>
+#include <zephyr/syscalls/uart_tx_u16_mrsh.c>
#endif
UART_SIMPLE(tx_abort);
-#include <syscalls/uart_tx_abort_mrsh.c>
+#include <zephyr/syscalls/uart_tx_abort_mrsh.c>
static inline int z_vrfy_uart_rx_enable(const struct device *dev,
uint8_t *buf,
@@ -119,7 +119,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(buf, len));
return z_impl_uart_rx_enable(dev, buf, len, timeout);
}
-#include <syscalls/uart_rx_enable_mrsh.c>
+#include <zephyr/syscalls/uart_rx_enable_mrsh.c>
#ifdef CONFIG_UART_WIDE_DATA
static inline int z_vrfy_uart_rx_enable_u16(const struct device *dev,
@@ -130,11 +130,11 @@
K_OOPS(K_SYSCALL_MEMORY_ARRAY_WRITE(buf, len, sizeof(uint16_t)));
return z_impl_uart_rx_enable_u16(dev, buf, len, timeout);
}
-#include <syscalls/uart_rx_enable_u16_mrsh.c>
+#include <zephyr/syscalls/uart_rx_enable_u16_mrsh.c>
#endif
UART_SIMPLE(rx_disable);
-#include <syscalls/uart_rx_disable_mrsh.c>
+#include <zephyr/syscalls/uart_rx_disable_mrsh.c>
#endif /* CONFIG_UART_ASYNC_API */
#ifdef CONFIG_UART_INTERRUPT_DRIVEN
@@ -146,14 +146,14 @@
UART_SIMPLE_VOID(irq_err_disable)
UART_SIMPLE(irq_is_pending)
UART_SIMPLE(irq_update)
-#include <syscalls/uart_irq_tx_enable_mrsh.c>
-#include <syscalls/uart_irq_tx_disable_mrsh.c>
-#include <syscalls/uart_irq_rx_enable_mrsh.c>
-#include <syscalls/uart_irq_rx_disable_mrsh.c>
-#include <syscalls/uart_irq_err_enable_mrsh.c>
-#include <syscalls/uart_irq_err_disable_mrsh.c>
-#include <syscalls/uart_irq_is_pending_mrsh.c>
-#include <syscalls/uart_irq_update_mrsh.c>
+#include <zephyr/syscalls/uart_irq_tx_enable_mrsh.c>
+#include <zephyr/syscalls/uart_irq_tx_disable_mrsh.c>
+#include <zephyr/syscalls/uart_irq_rx_enable_mrsh.c>
+#include <zephyr/syscalls/uart_irq_rx_disable_mrsh.c>
+#include <zephyr/syscalls/uart_irq_err_enable_mrsh.c>
+#include <zephyr/syscalls/uart_irq_err_disable_mrsh.c>
+#include <zephyr/syscalls/uart_irq_is_pending_mrsh.c>
+#include <zephyr/syscalls/uart_irq_update_mrsh.c>
#endif /* CONFIG_UART_INTERRUPT_DRIVEN */
#ifdef CONFIG_UART_LINE_CTRL
@@ -164,7 +164,7 @@
return z_impl_uart_line_ctrl_set((const struct device *)dev, ctrl,
val);
}
-#include <syscalls/uart_line_ctrl_set_mrsh.c>
+#include <zephyr/syscalls/uart_line_ctrl_set_mrsh.c>
static inline int z_vrfy_uart_line_ctrl_get(const struct device *dev,
uint32_t ctrl, uint32_t *val)
@@ -174,7 +174,7 @@
return z_impl_uart_line_ctrl_get((const struct device *)dev, ctrl,
(uint32_t *)val);
}
-#include <syscalls/uart_line_ctrl_get_mrsh.c>
+#include <zephyr/syscalls/uart_line_ctrl_get_mrsh.c>
#endif /* CONFIG_UART_LINE_CTRL */
#ifdef CONFIG_UART_DRV_CMD
@@ -184,5 +184,5 @@
K_OOPS(K_SYSCALL_DRIVER_UART(dev, drv_cmd));
return z_impl_uart_drv_cmd((const struct device *)dev, cmd, p);
}
-#include <syscalls/uart_drv_cmd_mrsh.c>
+#include <zephyr/syscalls/uart_drv_cmd_mrsh.c>
#endif /* CONFIG_UART_DRV_CMD */
diff --git a/drivers/smbus/smbus_handlers.c b/drivers/smbus/smbus_handlers.c
index b9c45e7..77169fc 100644
--- a/drivers/smbus/smbus_handlers.c
+++ b/drivers/smbus/smbus_handlers.c
@@ -15,7 +15,7 @@
return z_impl_smbus_configure(dev, dev_config);
}
-#include <syscalls/smbus_configure_mrsh.c>
+#include <zephyr/syscalls/smbus_configure_mrsh.c>
static inline int z_vrfy_smbus_get_config(const struct device *dev,
uint32_t *dev_config)
@@ -25,7 +25,7 @@
return z_impl_smbus_get_config(dev, dev_config);
}
-#include <syscalls/smbus_get_config_mrsh.c>
+#include <zephyr/syscalls/smbus_get_config_mrsh.c>
static inline int z_vrfy_smbus_quick(const struct device *dev, uint16_t addr,
enum smbus_direction rw)
@@ -34,7 +34,7 @@
return z_impl_smbus_quick(dev, addr, rw);
}
-#include <syscalls/smbus_quick_mrsh.c>
+#include <zephyr/syscalls/smbus_quick_mrsh.c>
static inline int z_vrfy_smbus_byte_write(const struct device *dev,
uint16_t addr, uint8_t byte)
@@ -43,7 +43,7 @@
return z_impl_smbus_byte_write(dev, addr, byte);
}
-#include <syscalls/smbus_byte_write_mrsh.c>
+#include <zephyr/syscalls/smbus_byte_write_mrsh.c>
static inline int z_vrfy_smbus_byte_read(const struct device *dev,
uint16_t addr, uint8_t *byte)
@@ -53,7 +53,7 @@
return z_impl_smbus_byte_read(dev, addr, byte);
}
-#include <syscalls/smbus_byte_read_mrsh.c>
+#include <zephyr/syscalls/smbus_byte_read_mrsh.c>
static inline int z_vrfy_smbus_byte_data_write(const struct device *dev,
uint16_t addr, uint8_t cmd,
@@ -63,7 +63,7 @@
return z_impl_smbus_byte_data_write(dev, addr, cmd, byte);
}
-#include <syscalls/smbus_byte_data_write_mrsh.c>
+#include <zephyr/syscalls/smbus_byte_data_write_mrsh.c>
static inline int z_vrfy_smbus_byte_data_read(const struct device *dev,
uint16_t addr, uint8_t cmd,
@@ -74,7 +74,7 @@
return z_impl_smbus_byte_data_read(dev, addr, cmd, byte);
}
-#include <syscalls/smbus_byte_data_read_mrsh.c>
+#include <zephyr/syscalls/smbus_byte_data_read_mrsh.c>
static inline int z_vrfy_smbus_word_data_write(const struct device *dev,
uint16_t addr, uint8_t cmd,
@@ -84,7 +84,7 @@
return z_impl_smbus_word_data_write(dev, addr, cmd, word);
}
-#include <syscalls/smbus_word_data_write_mrsh.c>
+#include <zephyr/syscalls/smbus_word_data_write_mrsh.c>
static inline int z_vrfy_smbus_word_data_read(const struct device *dev,
uint16_t addr, uint8_t cmd,
@@ -95,7 +95,7 @@
return z_impl_smbus_word_data_read(dev, addr, cmd, word);
}
-#include <syscalls/smbus_word_data_read_mrsh.c>
+#include <zephyr/syscalls/smbus_word_data_read_mrsh.c>
static inline int z_vrfy_smbus_pcall(const struct device *dev,
uint16_t addr, uint8_t cmd,
@@ -106,7 +106,7 @@
return z_impl_smbus_pcall(dev, addr, cmd, send_word, recv_word);
}
-#include <syscalls/smbus_pcall_mrsh.c>
+#include <zephyr/syscalls/smbus_pcall_mrsh.c>
static inline int z_vrfy_smbus_block_write(const struct device *dev,
uint16_t addr, uint8_t cmd,
@@ -117,7 +117,7 @@
return z_impl_smbus_block_write(dev, addr, cmd, count, buf);
}
-#include <syscalls/smbus_block_write_mrsh.c>
+#include <zephyr/syscalls/smbus_block_write_mrsh.c>
static inline int z_vrfy_smbus_block_read(const struct device *dev,
uint16_t addr, uint8_t cmd,
@@ -128,7 +128,7 @@
return z_impl_smbus_block_read(dev, addr, cmd, count, buf);
}
-#include <syscalls/smbus_block_read_mrsh.c>
+#include <zephyr/syscalls/smbus_block_read_mrsh.c>
static inline int z_vrfy_smbus_block_pcall(const struct device *dev,
uint16_t addr, uint8_t cmd,
@@ -142,7 +142,7 @@
return z_impl_smbus_block_pcall(dev, addr, cmd, snd_count, snd_buf,
rcv_count, rcv_buf);
}
-#include <syscalls/smbus_block_pcall_mrsh.c>
+#include <zephyr/syscalls/smbus_block_pcall_mrsh.c>
static inline int z_vrfy_smbus_smbalert_remove_cb(const struct device *dev,
struct smbus_callback *cb)
@@ -151,7 +151,7 @@
return z_impl_smbus_smbalert_remove_cb(dev, cb);
}
-#include <syscalls/smbus_smbalert_remove_cb_mrsh.c>
+#include <zephyr/syscalls/smbus_smbalert_remove_cb_mrsh.c>
static inline int z_vrfy_smbus_host_notify_remove_cb(const struct device *dev,
struct smbus_callback *cb)
@@ -160,4 +160,4 @@
return z_impl_smbus_host_notify_remove_cb(dev, cb);
}
-#include <syscalls/smbus_host_notify_remove_cb_mrsh.c>
+#include <zephyr/syscalls/smbus_host_notify_remove_cb_mrsh.c>
diff --git a/drivers/spi/spi_handlers.c b/drivers/spi/spi_handlers.c
index 68b362b..7d010a1 100644
--- a/drivers/spi/spi_handlers.c
+++ b/drivers/spi/spi_handlers.c
@@ -114,7 +114,7 @@
&tx_bufs_copy,
&rx_bufs_copy);
}
-#include <syscalls/spi_transceive_mrsh.c>
+#include <zephyr/syscalls/spi_transceive_mrsh.c>
static inline int z_vrfy_spi_release(const struct device *dev,
const struct spi_config *config)
@@ -123,4 +123,4 @@
K_OOPS(K_SYSCALL_DRIVER_SPI(dev, release));
return z_impl_spi_release((const struct device *)dev, config);
}
-#include <syscalls/spi_release_mrsh.c>
+#include <zephyr/syscalls/spi_release_mrsh.c>
diff --git a/drivers/virtualization/virt_ivshmem_handlers.c b/drivers/virtualization/virt_ivshmem_handlers.c
index 821ab16..4f22a4d 100644
--- a/drivers/virtualization/virt_ivshmem_handlers.c
+++ b/drivers/virtualization/virt_ivshmem_handlers.c
@@ -16,7 +16,7 @@
return z_impl_ivshmem_get_mem(dev, memmap);
}
-#include <syscalls/ivshmem_get_mem_mrsh.c>
+#include <zephyr/syscalls/ivshmem_get_mem_mrsh.c>
static inline uint32_t z_vrfy_ivshmem_get_id(const struct device *dev)
{
@@ -24,7 +24,7 @@
return z_impl_ivshmem_get_id(dev);
}
-#include <syscalls/ivshmem_get_id_mrsh.c>
+#include <zephyr/syscalls/ivshmem_get_id_mrsh.c>
static inline uint16_t z_vrfy_ivshmem_get_vectors(const struct device *dev)
{
@@ -32,7 +32,7 @@
return z_impl_ivshmem_get_vectors(dev);
}
-#include <syscalls/ivshmem_get_vectors_mrsh.c>
+#include <zephyr/syscalls/ivshmem_get_vectors_mrsh.c>
static inline int z_vrfy_ivshmem_int_peer(const struct device *dev,
uint32_t peer_id, uint16_t vector)
@@ -41,7 +41,7 @@
return z_impl_ivshmem_int_peer(dev, peer_id, vector);
}
-#include <syscalls/ivshmem_int_peer_mrsh.c>
+#include <zephyr/syscalls/ivshmem_int_peer_mrsh.c>
static inline int z_vrfy_ivshmem_register_handler(const struct device *dev,
struct k_poll_signal *signal,
@@ -52,7 +52,7 @@
return z_impl_ivshmem_register_handler(dev, signal, vector);
}
-#include <syscalls/ivshmem_register_handler_mrsh.c>
+#include <zephyr/syscalls/ivshmem_register_handler_mrsh.c>
#ifdef CONFIG_IVSHMEM_V2
@@ -64,7 +64,7 @@
return z_impl_ivshmem_get_rw_mem_section(dev, memmap);
}
-#include <syscalls/ivshmem_get_rw_mem_section_mrsh.c>
+#include <zephyr/syscalls/ivshmem_get_rw_mem_section_mrsh.c>
static inline size_t z_vrfy_ivshmem_get_output_mem_section(const struct device *dev,
uint32_t peer_id,
@@ -75,7 +75,7 @@
return z_impl_ivshmem_get_output_mem_section(dev, peer_id, memmap);
}
-#include <syscalls/ivshmem_get_output_mem_section_mrsh.c>
+#include <zephyr/syscalls/ivshmem_get_output_mem_section_mrsh.c>
static inline uint32_t z_vrfy_ivshmem_get_state(const struct device *dev,
uint32_t peer_id)
@@ -84,7 +84,7 @@
return z_impl_ivshmem_get_state(dev, peer_id);
}
-#include <syscalls/ivshmem_get_state_mrsh.c>
+#include <zephyr/syscalls/ivshmem_get_state_mrsh.c>
static inline int z_vrfy_ivshmem_set_state(const struct device *dev,
uint32_t state)
@@ -93,7 +93,7 @@
return z_impl_ivshmem_set_state(dev, state);
}
-#include <syscalls/ivshmem_set_state_mrsh.c>
+#include <zephyr/syscalls/ivshmem_set_state_mrsh.c>
static inline uint32_t z_vrfy_ivshmem_get_max_peers(const struct device *dev)
{
@@ -101,7 +101,7 @@
return z_impl_ivshmem_get_max_peers(dev);
}
-#include <syscalls/ivshmem_get_max_peers_mrsh.c>
+#include <zephyr/syscalls/ivshmem_get_max_peers_mrsh.c>
static inline uint16_t z_vrfy_ivshmem_get_protocol(const struct device *dev)
{
@@ -109,7 +109,7 @@
return z_impl_ivshmem_get_protocol(dev);
}
-#include <syscalls/ivshmem_get_protocol_mrsh.c>
+#include <zephyr/syscalls/ivshmem_get_protocol_mrsh.c>
static inline int z_vrfy_ivshmem_enable_interrupts(const struct device *dev,
bool enable)
@@ -118,6 +118,6 @@
return z_impl_ivshmem_enable_interrupts(dev, enable);
}
-#include <syscalls/ivshmem_enable_interrupts_mrsh.c>
+#include <zephyr/syscalls/ivshmem_enable_interrupts_mrsh.c>
#endif /* CONFIG_IVSHMEM_V2 */
diff --git a/drivers/w1/w1_handlers.c b/drivers/w1/w1_handlers.c
index f229970..db2fb4e 100644
--- a/drivers/w1/w1_handlers.c
+++ b/drivers/w1/w1_handlers.c
@@ -13,7 +13,7 @@
return z_impl_w1_reset_bus((const struct device *)dev);
}
-#include <syscalls/w1_reset_bus_mrsh.c>
+#include <zephyr/syscalls/w1_reset_bus_mrsh.c>
static inline int z_vrfy_w1_read_bit(const struct device *dev)
{
@@ -21,7 +21,7 @@
return z_impl_w1_read_bit((const struct device *)dev);
}
-#include <syscalls/w1_read_bit_mrsh.c>
+#include <zephyr/syscalls/w1_read_bit_mrsh.c>
static inline int z_vrfy_w1_write_bit(const struct device *dev, bool bit)
{
@@ -29,7 +29,7 @@
return z_impl_w1_write_bit((const struct device *)dev, bit);
}
-#include <syscalls/w1_write_bit_mrsh.c>
+#include <zephyr/syscalls/w1_write_bit_mrsh.c>
static inline int z_vrfy_w1_read_byte(const struct device *dev)
{
@@ -37,7 +37,7 @@
return z_impl_w1_read_byte((const struct device *)dev);
}
-#include <syscalls/w1_read_byte_mrsh.c>
+#include <zephyr/syscalls/w1_read_byte_mrsh.c>
static inline int z_vrfy_w1_write_byte(const struct device *dev, uint8_t byte)
{
@@ -45,7 +45,7 @@
return z_impl_w1_write_byte((const struct device *)dev, (uint8_t)byte);
}
-#include <syscalls/w1_write_byte_mrsh.c>
+#include <zephyr/syscalls/w1_write_byte_mrsh.c>
static inline int z_vrfy_w1_read_block(const struct device *dev,
uint8_t *buffer, size_t len)
@@ -56,7 +56,7 @@
return z_impl_w1_read_block((const struct device *)dev,
(uint8_t *)buffer, (size_t)len);
}
-#include <syscalls/w1_read_block_mrsh.c>
+#include <zephyr/syscalls/w1_read_block_mrsh.c>
static inline int z_vrfy_w1_write_block(const struct device *dev,
const uint8_t *buffer, size_t len)
@@ -67,7 +67,7 @@
return z_impl_w1_write_block((const struct device *)dev,
(const uint8_t *)buffer, (size_t)len);
}
-#include <syscalls/w1_write_block_mrsh.c>
+#include <zephyr/syscalls/w1_write_block_mrsh.c>
static inline int z_vrfy_w1_change_bus_lock(const struct device *dev, bool lock)
{
@@ -75,7 +75,7 @@
return z_impl_w1_change_bus_lock((const struct device *)dev, lock);
}
-#include <syscalls/w1_change_bus_lock_mrsh.c>
+#include <zephyr/syscalls/w1_change_bus_lock_mrsh.c>
static inline int z_vrfy_w1_configure(const struct device *dev,
enum w1_settings_type type, uint32_t value)
@@ -84,7 +84,7 @@
return z_impl_w1_configure(dev, type, value);
}
-#include <syscalls/w1_configure_mrsh.c>
+#include <zephyr/syscalls/w1_configure_mrsh.c>
static inline size_t z_vrfy_w1_get_slave_count(const struct device *dev)
{
@@ -92,7 +92,7 @@
return z_impl_w1_get_slave_count((const struct device *)dev);
}
-#include <syscalls/w1_get_slave_count_mrsh.c>
+#include <zephyr/syscalls/w1_get_slave_count_mrsh.c>
#if CONFIG_W1_NET
static inline int z_vrfy_w1_search_bus(const struct device *dev,
@@ -112,5 +112,5 @@
(void *)user_data);
}
-#include <syscalls/w1_search_bus_mrsh.c>
+#include <zephyr/syscalls/w1_search_bus_mrsh.c>
#endif /* CONFIG_W1_NET */
diff --git a/drivers/watchdog/wdt_handlers.c b/drivers/watchdog/wdt_handlers.c
index 2ac872f..727b512 100644
--- a/drivers/watchdog/wdt_handlers.c
+++ b/drivers/watchdog/wdt_handlers.c
@@ -13,7 +13,7 @@
return z_impl_wdt_setup(dev, options);
}
-#include <syscalls/wdt_setup_mrsh.c>
+#include <zephyr/syscalls/wdt_setup_mrsh.c>
static inline int z_vrfy_wdt_disable(const struct device *dev)
{
@@ -21,7 +21,7 @@
return z_impl_wdt_disable(dev);
}
-#include <syscalls/wdt_disable_mrsh.c>
+#include <zephyr/syscalls/wdt_disable_mrsh.c>
static inline int z_vrfy_wdt_feed(const struct device *dev, int channel_id)
{
@@ -29,4 +29,4 @@
return z_impl_wdt_feed(dev, channel_id);
}
-#include <syscalls/wdt_feed_mrsh.c>
+#include <zephyr/syscalls/wdt_feed_mrsh.c>
diff --git a/include/zephyr/arch/riscv/error.h b/include/zephyr/arch/riscv/error.h
index a7c3e02..208eafa 100644
--- a/include/zephyr/arch/riscv/error.h
+++ b/include/zephyr/arch/riscv/error.h
@@ -42,7 +42,7 @@
__syscall void user_fault(unsigned int reason);
-#include <syscalls/error.h>
+#include <zephyr/syscalls/error.h>
#ifdef __cplusplus
}
diff --git a/include/zephyr/arch/x86/ia32/linker.ld b/include/zephyr/arch/x86/ia32/linker.ld
index 0d1e671..69ff541 100644
--- a/include/zephyr/arch/x86/ia32/linker.ld
+++ b/include/zephyr/arch/x86/ia32/linker.ld
@@ -38,7 +38,7 @@
*/
#include <zephyr/linker/linker-defs.h>
-#include <offsets.h>
+#include <zephyr/offsets.h>
#include <zephyr/sys/util.h>
#include <zephyr/kernel/mm.h>
diff --git a/include/zephyr/arch/xtensa/arch.h b/include/zephyr/arch/xtensa/arch.h
index b563887..41072c5 100644
--- a/include/zephyr/arch/xtensa/arch.h
+++ b/include/zephyr/arch/xtensa/arch.h
@@ -114,7 +114,7 @@
__syscall void xtensa_user_fault(unsigned int reason);
-#include <syscalls/arch.h>
+#include <zephyr/syscalls/arch.h>
/* internal routine documented in C file, needed by IRQ_CONNECT() macro */
void z_irq_priority_set(uint32_t irq, uint32_t prio, uint32_t flags);
diff --git a/include/zephyr/arch/xtensa/arch_inlines.h b/include/zephyr/arch/xtensa/arch_inlines.h
index 4e7b520..e8ceb3c 100644
--- a/include/zephyr/arch/xtensa/arch_inlines.h
+++ b/include/zephyr/arch/xtensa/arch_inlines.h
@@ -11,7 +11,7 @@
#ifndef _ASMLANGUAGE
#include <zephyr/kernel_structs.h>
-#include <zsr.h>
+#include <zephyr/zsr.h>
/**
* @brief Read a special register.
diff --git a/include/zephyr/cache.h b/include/zephyr/cache.h
index f5547f6..9dbadb8 100644
--- a/include/zephyr/cache.h
+++ b/include/zephyr/cache.h
@@ -550,7 +550,7 @@
}
#endif
-#include <syscalls/cache.h>
+#include <zephyr/syscalls/cache.h>
#ifdef __cplusplus
}
#endif
diff --git a/include/zephyr/device.h b/include/zephyr/device.h
index d2f2244..ddc69c1 100644
--- a/include/zephyr/device.h
+++ b/include/zephyr/device.h
@@ -96,7 +96,7 @@
* size.
*
* The ordinal used in this name can be mapped to the path by
- * examining zephyr/include/generated/devicetree_generated.h.
+ * examining zephyr/include/generated/zephyr/devicetree_generated.h.
*/
#define Z_DEVICE_DT_DEV_ID(node_id) _CONCAT(dts_ord_, DT_DEP_ORD(node_id))
@@ -1085,6 +1085,6 @@
}
#endif
-#include <syscalls/device.h>
+#include <zephyr/syscalls/device.h>
#endif /* ZEPHYR_INCLUDE_DEVICE_H_ */
diff --git a/include/zephyr/devicetree.h b/include/zephyr/devicetree.h
index eb28dea..c1c9022 100644
--- a/include/zephyr/devicetree.h
+++ b/include/zephyr/devicetree.h
@@ -16,7 +16,7 @@
#ifndef DEVICETREE_H
#define DEVICETREE_H
-#include <devicetree_generated.h>
+#include <zephyr/devicetree_generated.h>
#include <zephyr/irq_multilevel.h>
#if !defined(_LINKER) && !defined(_ASMLANGUAGE)
diff --git a/include/zephyr/drivers/adc.h b/include/zephyr/drivers/adc.h
index 18357cb..46e016e 100644
--- a/include/zephyr/drivers/adc.h
+++ b/include/zephyr/drivers/adc.h
@@ -984,6 +984,6 @@
}
#endif
-#include <syscalls/adc.h>
+#include <zephyr/syscalls/adc.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_ADC_H_ */
diff --git a/include/zephyr/drivers/auxdisplay.h b/include/zephyr/drivers/auxdisplay.h
index de106f5..a56c9b7 100644
--- a/include/zephyr/drivers/auxdisplay.h
+++ b/include/zephyr/drivers/auxdisplay.h
@@ -815,6 +815,6 @@
* @}
*/
-#include <syscalls/auxdisplay.h>
+#include <zephyr/syscalls/auxdisplay.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_AUXDISPLAY_H_ */
diff --git a/include/zephyr/drivers/bbram.h b/include/zephyr/drivers/bbram.h
index 599a358..30df6a5 100644
--- a/include/zephyr/drivers/bbram.h
+++ b/include/zephyr/drivers/bbram.h
@@ -261,6 +261,6 @@
* @}
*/
-#include <syscalls/bbram.h>
+#include <zephyr/syscalls/bbram.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_BBRAM_H */
diff --git a/include/zephyr/drivers/can.h b/include/zephyr/drivers/can.h
index 3b0e323..bf3af29 100644
--- a/include/zephyr/drivers/can.h
+++ b/include/zephyr/drivers/can.h
@@ -1800,6 +1800,6 @@
}
#endif
-#include <syscalls/can.h>
+#include <zephyr/syscalls/can.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_CAN_H_ */
diff --git a/include/zephyr/drivers/charger.h b/include/zephyr/drivers/charger.h
index 457eec9..6c5ebae 100644
--- a/include/zephyr/drivers/charger.h
+++ b/include/zephyr/drivers/charger.h
@@ -405,6 +405,6 @@
}
#endif /* __cplusplus */
-#include <syscalls/charger.h>
+#include <zephyr/syscalls/charger.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_CHARGER_H_ */
diff --git a/include/zephyr/drivers/console/uart_mux.h b/include/zephyr/drivers/console/uart_mux.h
index 56b7f80..911372c 100644
--- a/include/zephyr/drivers/console/uart_mux.h
+++ b/include/zephyr/drivers/console/uart_mux.h
@@ -151,7 +151,7 @@
}
#endif
-#include <syscalls/uart_mux.h>
+#include <zephyr/syscalls/uart_mux.h>
/**
* @}
diff --git a/include/zephyr/drivers/counter.h b/include/zephyr/drivers/counter.h
index b21af71..0e14ade 100644
--- a/include/zephyr/drivers/counter.h
+++ b/include/zephyr/drivers/counter.h
@@ -678,6 +678,6 @@
* @}
*/
-#include <syscalls/counter.h>
+#include <zephyr/syscalls/counter.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_COUNTER_H_ */
diff --git a/include/zephyr/drivers/dac.h b/include/zephyr/drivers/dac.h
index 57f61cc..8e38432 100644
--- a/include/zephyr/drivers/dac.h
+++ b/include/zephyr/drivers/dac.h
@@ -131,6 +131,6 @@
}
#endif
-#include <syscalls/dac.h>
+#include <zephyr/syscalls/dac.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_DAC_H_ */
diff --git a/include/zephyr/drivers/dma.h b/include/zephyr/drivers/dma.h
index 36a5916..1338b9b 100644
--- a/include/zephyr/drivers/dma.h
+++ b/include/zephyr/drivers/dma.h
@@ -788,6 +788,6 @@
}
#endif
-#include <syscalls/dma.h>
+#include <zephyr/syscalls/dma.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_DMA_H_ */
diff --git a/include/zephyr/drivers/eeprom.h b/include/zephyr/drivers/eeprom.h
index 2ab4d1f..ff5b21c 100644
--- a/include/zephyr/drivers/eeprom.h
+++ b/include/zephyr/drivers/eeprom.h
@@ -139,6 +139,6 @@
* @}
*/
-#include <syscalls/eeprom.h>
+#include <zephyr/syscalls/eeprom.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_EEPROM_H_ */
diff --git a/include/zephyr/drivers/emul_fuel_gauge.h b/include/zephyr/drivers/emul_fuel_gauge.h
index 5abd7ec..e86c45a 100644
--- a/include/zephyr/drivers/emul_fuel_gauge.h
+++ b/include/zephyr/drivers/emul_fuel_gauge.h
@@ -93,7 +93,7 @@
}
#endif
-#include <syscalls/emul_fuel_gauge.h>
+#include <zephyr/syscalls/emul_fuel_gauge.h>
/**
* @}
diff --git a/include/zephyr/drivers/entropy.h b/include/zephyr/drivers/entropy.h
index dcb0c2d..de2d0f2 100644
--- a/include/zephyr/drivers/entropy.h
+++ b/include/zephyr/drivers/entropy.h
@@ -127,6 +127,6 @@
* @}
*/
-#include <syscalls/entropy.h>
+#include <zephyr/syscalls/entropy.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_ENTROPY_H_ */
diff --git a/include/zephyr/drivers/espi.h b/include/zephyr/drivers/espi.h
index d2e64d9..05e5cda 100644
--- a/include/zephyr/drivers/espi.h
+++ b/include/zephyr/drivers/espi.h
@@ -1022,5 +1022,5 @@
/**
* @}
*/
-#include <syscalls/espi.h>
+#include <zephyr/syscalls/espi.h>
#endif /* ZEPHYR_INCLUDE_ESPI_H_ */
diff --git a/include/zephyr/drivers/espi_saf.h b/include/zephyr/drivers/espi_saf.h
index 31fc23c..d9a25a8 100644
--- a/include/zephyr/drivers/espi_saf.h
+++ b/include/zephyr/drivers/espi_saf.h
@@ -557,5 +557,5 @@
/**
* @}
*/
-#include <syscalls/espi_saf.h>
+#include <zephyr/syscalls/espi_saf.h>
#endif /* ZEPHYR_INCLUDE_ESPI_SAF_H_ */
diff --git a/include/zephyr/drivers/flash.h b/include/zephyr/drivers/flash.h
index d26e521..beb8838 100644
--- a/include/zephyr/drivers/flash.h
+++ b/include/zephyr/drivers/flash.h
@@ -513,6 +513,6 @@
* @}
*/
-#include <syscalls/flash.h>
+#include <zephyr/syscalls/flash.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_FLASH_H_ */
diff --git a/include/zephyr/drivers/flash/flash_simulator.h b/include/zephyr/drivers/flash/flash_simulator.h
index 0f7e3c5..e1a201b 100644
--- a/include/zephyr/drivers/flash/flash_simulator.h
+++ b/include/zephyr/drivers/flash/flash_simulator.h
@@ -34,6 +34,6 @@
}
#endif
-#include <syscalls/flash_simulator.h>
+#include <zephyr/syscalls/flash_simulator.h>
#endif /* __ZEPHYR_INCLUDE_DRIVERS__FLASH_SIMULATOR_H__ */
diff --git a/include/zephyr/drivers/flash/nrf_qspi_nor.h b/include/zephyr/drivers/flash/nrf_qspi_nor.h
index 2c3767a..87db5c7 100644
--- a/include/zephyr/drivers/flash/nrf_qspi_nor.h
+++ b/include/zephyr/drivers/flash/nrf_qspi_nor.h
@@ -35,6 +35,6 @@
}
#endif
-#include <syscalls/nrf_qspi_nor.h>
+#include <zephyr/syscalls/nrf_qspi_nor.h>
#endif /* __ZEPHYR_INCLUDE_DRIVERS_FLASH_NRF_QSPI_NOR_H__ */
diff --git a/include/zephyr/drivers/fuel_gauge.h b/include/zephyr/drivers/fuel_gauge.h
index f4274ea..305e97b 100644
--- a/include/zephyr/drivers/fuel_gauge.h
+++ b/include/zephyr/drivers/fuel_gauge.h
@@ -416,6 +416,6 @@
}
#endif /* __cplusplus */
-#include <syscalls/fuel_gauge.h>
+#include <zephyr/syscalls/fuel_gauge.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_BATTERY_H_ */
diff --git a/include/zephyr/drivers/gnss.h b/include/zephyr/drivers/gnss.h
index 2c716a4..2777691 100644
--- a/include/zephyr/drivers/gnss.h
+++ b/include/zephyr/drivers/gnss.h
@@ -493,6 +493,6 @@
}
#endif
-#include <syscalls/gnss.h>
+#include <zephyr/syscalls/gnss.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_GNSS_H_ */
diff --git a/include/zephyr/drivers/gpio.h b/include/zephyr/drivers/gpio.h
index 1c5cd6e..30c8454 100644
--- a/include/zephyr/drivers/gpio.h
+++ b/include/zephyr/drivers/gpio.h
@@ -1828,6 +1828,6 @@
}
#endif
-#include <syscalls/gpio.h>
+#include <zephyr/syscalls/gpio.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_GPIO_H_ */
diff --git a/include/zephyr/drivers/hwinfo.h b/include/zephyr/drivers/hwinfo.h
index 4683562..5a53292 100644
--- a/include/zephyr/drivers/hwinfo.h
+++ b/include/zephyr/drivers/hwinfo.h
@@ -171,6 +171,6 @@
}
#endif
-#include <syscalls/hwinfo.h>
+#include <zephyr/syscalls/hwinfo.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_HWINFO_H_ */
diff --git a/include/zephyr/drivers/hwspinlock.h b/include/zephyr/drivers/hwspinlock.h
index 9f9fd99..c6e5b48 100644
--- a/include/zephyr/drivers/hwspinlock.h
+++ b/include/zephyr/drivers/hwspinlock.h
@@ -154,6 +154,6 @@
/** @} */
-#include <syscalls/hwspinlock.h>
+#include <zephyr/syscalls/hwspinlock.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_HWSPINLOCK_H_ */
diff --git a/include/zephyr/drivers/i2c.h b/include/zephyr/drivers/i2c.h
index 04b7d02..240d613 100644
--- a/include/zephyr/drivers/i2c.h
+++ b/include/zephyr/drivers/i2c.h
@@ -1634,6 +1634,6 @@
* @}
*/
-#include <syscalls/i2c.h>
+#include <zephyr/syscalls/i2c.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_I2C_H_ */
diff --git a/include/zephyr/drivers/i2s.h b/include/zephyr/drivers/i2s.h
index 9877446..0889a29 100644
--- a/include/zephyr/drivers/i2s.h
+++ b/include/zephyr/drivers/i2s.h
@@ -544,6 +544,6 @@
}
#endif
-#include <syscalls/i2s.h>
+#include <zephyr/syscalls/i2s.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_I2S_H_ */
diff --git a/include/zephyr/drivers/i3c.h b/include/zephyr/drivers/i3c.h
index 5b93bdb..14604cb 100644
--- a/include/zephyr/drivers/i3c.h
+++ b/include/zephyr/drivers/i3c.h
@@ -2132,6 +2132,6 @@
* @}
*/
-#include <syscalls/i3c.h>
+#include <zephyr/syscalls/i3c.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_I3C_H_ */
diff --git a/include/zephyr/drivers/ipm.h b/include/zephyr/drivers/ipm.h
index 1d8ee20..fe30092 100644
--- a/include/zephyr/drivers/ipm.h
+++ b/include/zephyr/drivers/ipm.h
@@ -270,6 +270,6 @@
* @}
*/
-#include <syscalls/ipm.h>
+#include <zephyr/syscalls/ipm.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_IPM_H_ */
diff --git a/include/zephyr/drivers/kscan.h b/include/zephyr/drivers/kscan.h
index 0c878df..96c7b93 100644
--- a/include/zephyr/drivers/kscan.h
+++ b/include/zephyr/drivers/kscan.h
@@ -139,6 +139,6 @@
* @}
*/
-#include <syscalls/kscan.h>
+#include <zephyr/syscalls/kscan.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_KB_SCAN_H_ */
diff --git a/include/zephyr/drivers/led.h b/include/zephyr/drivers/led.h
index f63a779..6de5c36 100644
--- a/include/zephyr/drivers/led.h
+++ b/include/zephyr/drivers/led.h
@@ -338,6 +338,6 @@
}
#endif
-#include <syscalls/led.h>
+#include <zephyr/syscalls/led.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_LED_H_ */
diff --git a/include/zephyr/drivers/mbox.h b/include/zephyr/drivers/mbox.h
index f0ca633..3f8ffc6 100644
--- a/include/zephyr/drivers/mbox.h
+++ b/include/zephyr/drivers/mbox.h
@@ -486,6 +486,6 @@
}
#endif
-#include <syscalls/mbox.h>
+#include <zephyr/syscalls/mbox.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_MBOX_H_ */
diff --git a/include/zephyr/drivers/mdio.h b/include/zephyr/drivers/mdio.h
index fe165bc..bed1b7f 100644
--- a/include/zephyr/drivers/mdio.h
+++ b/include/zephyr/drivers/mdio.h
@@ -237,6 +237,6 @@
* @}
*/
-#include <syscalls/mdio.h>
+#include <zephyr/syscalls/mdio.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_MDIO_H_ */
diff --git a/include/zephyr/drivers/misc/devmux/devmux.h b/include/zephyr/drivers/misc/devmux/devmux.h
index 1772d71..8b01d63 100644
--- a/include/zephyr/drivers/misc/devmux/devmux.h
+++ b/include/zephyr/drivers/misc/devmux/devmux.h
@@ -85,6 +85,6 @@
}
#endif
-#include <syscalls/devmux.h>
+#include <zephyr/syscalls/devmux.h>
#endif /* INCLUDE_ZEPHYR_DRIVERS_MISC_DEVMUX_H_ */
diff --git a/include/zephyr/drivers/misc/timeaware_gpio/timeaware_gpio.h b/include/zephyr/drivers/misc/timeaware_gpio/timeaware_gpio.h
index 2c805d9..ec6fd8c 100644
--- a/include/zephyr/drivers/misc/timeaware_gpio/timeaware_gpio.h
+++ b/include/zephyr/drivers/misc/timeaware_gpio/timeaware_gpio.h
@@ -190,6 +190,6 @@
}
#endif
-#include <syscalls/timeaware_gpio.h>
+#include <zephyr/syscalls/timeaware_gpio.h>
#endif /* ZEPHYR_DRIVERS_MISC_TIMEAWARE_GPIO_TIMEAWARE_GPIO */
diff --git a/include/zephyr/drivers/peci.h b/include/zephyr/drivers/peci.h
index 0397031..ebc1107 100644
--- a/include/zephyr/drivers/peci.h
+++ b/include/zephyr/drivers/peci.h
@@ -348,6 +348,6 @@
* @}
*/
-#include <syscalls/peci.h>
+#include <zephyr/syscalls/peci.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_PECI_H_ */
diff --git a/include/zephyr/drivers/ps2.h b/include/zephyr/drivers/ps2.h
index 80351c4..6060ba6 100644
--- a/include/zephyr/drivers/ps2.h
+++ b/include/zephyr/drivers/ps2.h
@@ -172,6 +172,6 @@
* @}
*/
-#include <syscalls/ps2.h>
+#include <zephyr/syscalls/ps2.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_PS2_H_ */
diff --git a/include/zephyr/drivers/ptp_clock.h b/include/zephyr/drivers/ptp_clock.h
index fb6cc8f..176c7be 100644
--- a/include/zephyr/drivers/ptp_clock.h
+++ b/include/zephyr/drivers/ptp_clock.h
@@ -101,6 +101,6 @@
}
#endif
-#include <syscalls/ptp_clock.h>
+#include <zephyr/syscalls/ptp_clock.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_PTP_CLOCK_H_ */
diff --git a/include/zephyr/drivers/pwm.h b/include/zephyr/drivers/pwm.h
index b8a4cbd..4f21f41 100644
--- a/include/zephyr/drivers/pwm.h
+++ b/include/zephyr/drivers/pwm.h
@@ -948,6 +948,6 @@
* @}
*/
-#include <syscalls/pwm.h>
+#include <zephyr/syscalls/pwm.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_PWM_H_ */
diff --git a/include/zephyr/drivers/reset.h b/include/zephyr/drivers/reset.h
index c892b53..0bf2031 100644
--- a/include/zephyr/drivers/reset.h
+++ b/include/zephyr/drivers/reset.h
@@ -384,6 +384,6 @@
}
#endif
-#include <syscalls/reset.h>
+#include <zephyr/syscalls/reset.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_RESET_H_ */
diff --git a/include/zephyr/drivers/retained_mem.h b/include/zephyr/drivers/retained_mem.h
index 7f7003c..a7efafb 100644
--- a/include/zephyr/drivers/retained_mem.h
+++ b/include/zephyr/drivers/retained_mem.h
@@ -192,6 +192,6 @@
}
#endif
-#include <syscalls/retained_mem.h>
+#include <zephyr/syscalls/retained_mem.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_RETAINED_MEM_ */
diff --git a/include/zephyr/drivers/rtc.h b/include/zephyr/drivers/rtc.h
index ac5d5c0..493bbf1 100644
--- a/include/zephyr/drivers/rtc.h
+++ b/include/zephyr/drivers/rtc.h
@@ -539,6 +539,6 @@
}
#endif
-#include <syscalls/rtc.h>
+#include <zephyr/syscalls/rtc.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_RTC_H_ */
diff --git a/include/zephyr/drivers/rtc/maxim_ds3231.h b/include/zephyr/drivers/rtc/maxim_ds3231.h
index 2e8b9fe..1dd6be9 100644
--- a/include/zephyr/drivers/rtc/maxim_ds3231.h
+++ b/include/zephyr/drivers/rtc/maxim_ds3231.h
@@ -596,6 +596,6 @@
#endif
/* @todo this should be syscalls/drivers/rtc/maxim_ds3231.h */
-#include <syscalls/maxim_ds3231.h>
+#include <zephyr/syscalls/maxim_ds3231.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_RTC_DS3231_H_ */
diff --git a/include/zephyr/drivers/sdhc.h b/include/zephyr/drivers/sdhc.h
index 7934d05..98f651c 100644
--- a/include/zephyr/drivers/sdhc.h
+++ b/include/zephyr/drivers/sdhc.h
@@ -519,5 +519,5 @@
}
#endif
-#include <syscalls/sdhc.h>
+#include <zephyr/syscalls/sdhc.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_SDHC_H_ */
diff --git a/include/zephyr/drivers/sensor.h b/include/zephyr/drivers/sensor.h
index b227fd7..e74c5aa 100644
--- a/include/zephyr/drivers/sensor.h
+++ b/include/zephyr/drivers/sensor.h
@@ -1487,6 +1487,6 @@
}
#endif
-#include <syscalls/sensor.h>
+#include <zephyr/syscalls/sensor.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_SENSOR_H_ */
diff --git a/include/zephyr/drivers/sip_svc/sip_svc_driver.h b/include/zephyr/drivers/sip_svc/sip_svc_driver.h
index 2904986..07b8f7f 100644
--- a/include/zephyr/drivers/sip_svc/sip_svc_driver.h
+++ b/include/zephyr/drivers/sip_svc/sip_svc_driver.h
@@ -349,6 +349,6 @@
}
-#include <syscalls/sip_svc_driver.h>
+#include <zephyr/syscalls/sip_svc_driver.h>
#endif /* ZEPHYR_INCLUDE_SIP_SVC_DRIVER_H_ */
diff --git a/include/zephyr/drivers/smbus.h b/include/zephyr/drivers/smbus.h
index da4a5c3..f0642d6 100644
--- a/include/zephyr/drivers/smbus.h
+++ b/include/zephyr/drivers/smbus.h
@@ -1092,6 +1092,6 @@
* @}
*/
-#include <syscalls/smbus.h>
+#include <zephyr/syscalls/smbus.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_SMBUS_H_ */
diff --git a/include/zephyr/drivers/spi.h b/include/zephyr/drivers/spi.h
index be4e983..a24a63a 100644
--- a/include/zephyr/drivers/spi.h
+++ b/include/zephyr/drivers/spi.h
@@ -1307,6 +1307,6 @@
* @}
*/
-#include <syscalls/spi.h>
+#include <zephyr/syscalls/spi.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_SPI_H_ */
diff --git a/include/zephyr/drivers/syscon.h b/include/zephyr/drivers/syscon.h
index a8c5750..6794b48 100644
--- a/include/zephyr/drivers/syscon.h
+++ b/include/zephyr/drivers/syscon.h
@@ -160,6 +160,6 @@
}
#endif
-#include <syscalls/syscon.h>
+#include <zephyr/syscalls/syscon.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_SYSCON_H_ */
diff --git a/include/zephyr/drivers/uart.h b/include/zephyr/drivers/uart.h
index 8db89e2..845949e 100644
--- a/include/zephyr/drivers/uart.h
+++ b/include/zephyr/drivers/uart.h
@@ -1671,6 +1671,6 @@
* @}
*/
-#include <syscalls/uart.h>
+#include <zephyr/syscalls/uart.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_UART_H_ */
diff --git a/include/zephyr/drivers/usb/usb_bc12.h b/include/zephyr/drivers/usb/usb_bc12.h
index 57f4755..7915391 100644
--- a/include/zephyr/drivers/usb/usb_bc12.h
+++ b/include/zephyr/drivers/usb/usb_bc12.h
@@ -184,6 +184,6 @@
* @}
*/
-#include <syscalls/usb_bc12.h>
+#include <zephyr/syscalls/usb_bc12.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_USB_USB_BC12_H_ */
diff --git a/include/zephyr/drivers/virtualization/ivshmem.h b/include/zephyr/drivers/virtualization/ivshmem.h
index 20bd1e4..b0662d0 100644
--- a/include/zephyr/drivers/virtualization/ivshmem.h
+++ b/include/zephyr/drivers/virtualization/ivshmem.h
@@ -340,6 +340,6 @@
* @}
*/
-#include <syscalls/ivshmem.h>
+#include <zephyr/syscalls/ivshmem.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_VIRTUALIZATION_IVSHMEM_H_ */
diff --git a/include/zephyr/drivers/w1.h b/include/zephyr/drivers/w1.h
index ed691f6..a8301cd 100644
--- a/include/zephyr/drivers/w1.h
+++ b/include/zephyr/drivers/w1.h
@@ -720,6 +720,6 @@
/**
* @}
*/
-#include <syscalls/w1.h>
+#include <zephyr/syscalls/w1.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_W1_H_ */
diff --git a/include/zephyr/drivers/watchdog.h b/include/zephyr/drivers/watchdog.h
index 5c53d10..fdeb9ef 100644
--- a/include/zephyr/drivers/watchdog.h
+++ b/include/zephyr/drivers/watchdog.h
@@ -253,6 +253,6 @@
/** @} */
-#include <syscalls/watchdog.h>
+#include <zephyr/syscalls/watchdog.h>
#endif /* ZEPHYR_INCLUDE_DRIVERS_WATCHDOG_H_ */
diff --git a/include/zephyr/internal/syscall_handler.h b/include/zephyr/internal/syscall_handler.h
index 091a606..62f1061 100644
--- a/include/zephyr/internal/syscall_handler.h
+++ b/include/zephyr/internal/syscall_handler.h
@@ -647,7 +647,7 @@
#define K_SYSCALL_OBJ_NEVER_INIT(ptr, type) \
K_SYSCALL_IS_OBJ(ptr, type, _OBJ_INIT_FALSE)
-#include <driver-validation.h>
+#include <zephyr/driver-validation.h>
#endif /* _ASMLANGUAGE */
diff --git a/include/zephyr/kernel.h b/include/zephyr/kernel.h
index 06bbfa1..f4b2cbe 100644
--- a/include/zephyr/kernel.h
+++ b/include/zephyr/kernel.h
@@ -6153,7 +6153,7 @@
#endif
#include <zephyr/tracing/tracing.h>
-#include <syscalls/kernel.h>
+#include <zephyr/syscalls/kernel.h>
#endif /* !_ASMLANGUAGE */
diff --git a/include/zephyr/kernel/mm/demand_paging.h b/include/zephyr/kernel/mm/demand_paging.h
index 343c104..f88f5c2 100644
--- a/include/zephyr/kernel/mm/demand_paging.h
+++ b/include/zephyr/kernel/mm/demand_paging.h
@@ -203,7 +203,7 @@
__syscall void k_mem_paging_histogram_backing_store_page_out_get(
struct k_mem_paging_histogram_t *hist);
-#include <syscalls/demand_paging.h>
+#include <zephyr/syscalls/demand_paging.h>
/** @} */
diff --git a/include/zephyr/linker/kobject-data.ld b/include/zephyr/linker/kobject-data.ld
index 26720db..573680b 100644
--- a/include/zephyr/linker/kobject-data.ld
+++ b/include/zephyr/linker/kobject-data.ld
@@ -30,7 +30,7 @@
*/
#if defined(LINKER_ZEPHYR_PREBUILT)
-#include <linker-kobject-prebuilt-data.h>
+#include <zephyr/linker-kobject-prebuilt-data.h>
#ifdef CONFIG_DYNAMIC_OBJECTS
/* This is produced by gperf. Put a place holder here
@@ -45,7 +45,7 @@
#endif /* LINKER_ZEPHYR_PREBUILT */
#if defined(LINKER_ZEPHYR_FINAL)
-#include <linker-kobject-prebuilt-data.h>
+#include <zephyr/linker-kobject-prebuilt-data.h>
#ifdef KOBJECT_DATA_ALIGN
. = ALIGN(KOBJECT_DATA_ALIGN);
diff --git a/include/zephyr/linker/kobject-priv-stacks.ld b/include/zephyr/linker/kobject-priv-stacks.ld
index 0da2876..53bd508 100644
--- a/include/zephyr/linker/kobject-priv-stacks.ld
+++ b/include/zephyr/linker/kobject-priv-stacks.ld
@@ -20,7 +20,7 @@
*/
#if defined(LINKER_ZEPHYR_PREBUILT)
-#include <linker-kobject-prebuilt-priv-stacks.h>
+#include <zephyr/linker-kobject-prebuilt-priv-stacks.h>
#ifdef KOBJECT_PRIV_STACKS_ALIGN
. = ALIGN(KOBJECT_PRIV_STACKS_ALIGN);
. = . + KOBJECT_PRIV_STACKS_SZ;
@@ -28,7 +28,7 @@
#endif /* LINKER_ZEPHYR_PREBUILT */
#if defined(LINKER_ZEPHYR_FINAL)
-#include <linker-kobject-prebuilt-priv-stacks.h>
+#include <zephyr/linker-kobject-prebuilt-priv-stacks.h>
#ifdef KOBJECT_PRIV_STACKS_ALIGN
. = ALIGN(KOBJECT_PRIV_STACKS_ALIGN);
#endif
diff --git a/include/zephyr/linker/kobject-rom.ld b/include/zephyr/linker/kobject-rom.ld
index 02c31e8..1bb6ee1 100644
--- a/include/zephyr/linker/kobject-rom.ld
+++ b/include/zephyr/linker/kobject-rom.ld
@@ -16,7 +16,7 @@
*/
#if defined(LINKER_ZEPHYR_PREBUILT)
-#include <linker-kobject-prebuilt-rodata.h>
+#include <zephyr/linker-kobject-prebuilt-rodata.h>
#ifdef KOBJECT_RODATA_ALIGN
. = ALIGN(KOBJECT_RODATA_ALIGN);
@@ -29,7 +29,7 @@
#endif /* LINKER_ZEPHYR_PREBUILT */
#if defined(LINKER_ZEPHYR_FINAL)
-#include <linker-kobject-prebuilt-rodata.h>
+#include <zephyr/linker-kobject-prebuilt-rodata.h>
#ifdef KOBJECT_RODATA_ALIGN
. = ALIGN(KOBJECT_RODATA_ALIGN);
diff --git a/include/zephyr/linker/linker-defs.h b/include/zephyr/linker/linker-defs.h
index ec37a37..8a1db6d 100644
--- a/include/zephyr/linker/linker-defs.h
+++ b/include/zephyr/linker/linker-defs.h
@@ -23,7 +23,7 @@
#include <zephyr/toolchain/common.h>
#include <zephyr/linker/sections.h>
#include <zephyr/sys/util.h>
-#include <offsets.h>
+#include <zephyr/offsets.h>
/* We need to dummy out DT_NODE_HAS_STATUS when building the unittests.
* Including devicetree.h would require generating dummy header files
diff --git a/include/zephyr/logging/log_ctrl.h b/include/zephyr/logging/log_ctrl.h
index eb8cb56..26d0958 100644
--- a/include/zephyr/logging/log_ctrl.h
+++ b/include/zephyr/logging/log_ctrl.h
@@ -301,7 +301,7 @@
#define LOG_PROCESS() false
#endif
-#include <syscalls/log_ctrl.h>
+#include <zephyr/syscalls/log_ctrl.h>
/**
* @}
diff --git a/include/zephyr/logging/log_msg.h b/include/zephyr/logging/log_msg.h
index 2f6b3a0..ed491c9 100644
--- a/include/zephyr/logging/log_msg.h
+++ b/include/zephyr/logging/log_msg.h
@@ -857,7 +857,7 @@
* @}
*/
-#include <syscalls/log_msg.h>
+#include <zephyr/syscalls/log_msg.h>
#ifdef __cplusplus
}
diff --git a/include/zephyr/mgmt/updatehub.h b/include/zephyr/mgmt/updatehub.h
index 57e4b82..c37ba42 100644
--- a/include/zephyr/mgmt/updatehub.h
+++ b/include/zephyr/mgmt/updatehub.h
@@ -98,5 +98,5 @@
* @}
*/
-#include <syscalls/updatehub.h>
+#include <zephyr/syscalls/updatehub.h>
#endif /* ZEPHYR_INCLUDE_MGMT_UPDATEHUB_H_ */
diff --git a/include/zephyr/net/ethernet.h b/include/zephyr/net/ethernet.h
index f0d1b1b..6376a36 100644
--- a/include/zephyr/net/ethernet.h
+++ b/include/zephyr/net/ethernet.h
@@ -1334,6 +1334,6 @@
}
#endif
-#include <syscalls/ethernet.h>
+#include <zephyr/syscalls/ethernet.h>
#endif /* ZEPHYR_INCLUDE_NET_ETHERNET_H_ */
diff --git a/include/zephyr/net/net_if.h b/include/zephyr/net/net_if.h
index b1a2ca8..0b69dde 100644
--- a/include/zephyr/net/net_if.h
+++ b/include/zephyr/net/net_if.h
@@ -3358,7 +3358,7 @@
}
#endif
-#include <syscalls/net_if.h>
+#include <zephyr/syscalls/net_if.h>
/**
* @}
diff --git a/include/zephyr/net/net_ip.h b/include/zephyr/net/net_ip.h
index 4764ba9..2e02744 100644
--- a/include/zephyr/net/net_ip.h
+++ b/include/zephyr/net/net_ip.h
@@ -1805,7 +1805,7 @@
}
#endif
-#include <syscalls/net_ip.h>
+#include <zephyr/syscalls/net_ip.h>
/**
* @}
diff --git a/include/zephyr/net/socket.h b/include/zephyr/net/socket.h
index 1ec1a9a..d8983e0 100644
--- a/include/zephyr/net/socket.h
+++ b/include/zephyr/net/socket.h
@@ -1378,7 +1378,7 @@
}
#endif
-#include <syscalls/socket.h>
+#include <zephyr/syscalls/socket.h>
/**
* @}
diff --git a/include/zephyr/net/socket_select.h b/include/zephyr/net/socket_select.h
index 89a59ae..23034d3 100644
--- a/include/zephyr/net/socket_select.h
+++ b/include/zephyr/net/socket_select.h
@@ -153,7 +153,7 @@
}
#endif
-#include <syscalls/socket_select.h>
+#include <zephyr/syscalls/socket_select.h>
/**
* @}
diff --git a/include/zephyr/net/socket_service.h b/include/zephyr/net/socket_service.h
index b1037bf..c5060eb 100644
--- a/include/zephyr/net/socket_service.h
+++ b/include/zephyr/net/socket_service.h
@@ -241,7 +241,7 @@
}
#endif
-#include <syscalls/socket_service.h>
+#include <zephyr/syscalls/socket_service.h>
/**
* @}
diff --git a/include/zephyr/random/random.h b/include/zephyr/random/random.h
index bb7f502..293b8d0 100644
--- a/include/zephyr/random/random.h
+++ b/include/zephyr/random/random.h
@@ -147,5 +147,5 @@
* @}
*/
-#include <syscalls/random.h>
+#include <zephyr/syscalls/random.h>
#endif /* ZEPHYR_INCLUDE_RANDOM_RANDOM_H_ */
diff --git a/include/zephyr/rtio/rtio.h b/include/zephyr/rtio/rtio.h
index f5bb6fc..75ab879 100644
--- a/include/zephyr/rtio/rtio.h
+++ b/include/zephyr/rtio/rtio.h
@@ -1485,6 +1485,6 @@
}
#endif
-#include <syscalls/rtio.h>
+#include <zephyr/syscalls/rtio.h>
#endif /* ZEPHYR_INCLUDE_RTIO_RTIO_H_ */
diff --git a/include/zephyr/sys/atomic_c.h b/include/zephyr/sys/atomic_c.h
index f1e23ca..df36036 100644
--- a/include/zephyr/sys/atomic_c.h
+++ b/include/zephyr/sys/atomic_c.h
@@ -85,7 +85,7 @@
#define _REMOVE_DISABLE_SYSCALL_TRACING
#endif
-#include <syscalls/atomic_c.h>
+#include <zephyr/syscalls/atomic_c.h>
#ifdef _REMOVE_DISABLE_SYSCALL_TRACING
#undef DISABLE_SYSCALL_TRACING
diff --git a/include/zephyr/sys/errno_private.h b/include/zephyr/sys/errno_private.h
index 60df962..5adba7b 100644
--- a/include/zephyr/sys/errno_private.h
+++ b/include/zephyr/sys/errno_private.h
@@ -50,7 +50,7 @@
#endif
#if !defined(CONFIG_ERRNO_IN_TLS) && !defined(CONFIG_LIBC_ERRNO)
-#include <syscalls/errno_private.h>
+#include <zephyr/syscalls/errno_private.h>
#endif /* CONFIG_ERRNO_IN_TLS */
#endif /* ZEPHYR_INCLUDE_SYS_ERRNO_PRIVATE_H_ */
diff --git a/include/zephyr/sys/kobject.h b/include/zephyr/sys/kobject.h
index 50577ac..9fe9b5a 100644
--- a/include/zephyr/sys/kobject.h
+++ b/include/zephyr/sys/kobject.h
@@ -36,7 +36,7 @@
* generated during build by gen_kobject_list.py. It includes
* basic kernel objects (e.g. pipes and mutexes) and driver types.
*/
-#include <kobj-types-enum.h>
+#include <zephyr/kobj-types-enum.h>
/** @endcond
*/
@@ -283,7 +283,7 @@
/** @} */
-#include <syscalls/kobject.h>
+#include <zephyr/syscalls/kobject.h>
#ifdef __cplusplus
}
#endif
diff --git a/include/zephyr/sys/libc-hooks.h b/include/zephyr/sys/libc-hooks.h
index e00efc6..b9c38bb 100644
--- a/include/zephyr/sys/libc-hooks.h
+++ b/include/zephyr/sys/libc-hooks.h
@@ -109,7 +109,7 @@
#endif
#endif /* CONFIG_USERSPACE */
-#include <syscalls/libc-hooks.h>
+#include <zephyr/syscalls/libc-hooks.h>
/* C library memory partitions */
#define Z_LIBC_DATA K_APP_DMEM(z_libc_partition)
diff --git a/include/zephyr/sys/mutex.h b/include/zephyr/sys/mutex.h
index 1a7968e..e34cc90 100644
--- a/include/zephyr/sys/mutex.h
+++ b/include/zephyr/sys/mutex.h
@@ -128,7 +128,7 @@
return z_sys_mutex_kernel_unlock(mutex);
}
-#include <syscalls/mutex.h>
+#include <zephyr/syscalls/mutex.h>
#else
#include <zephyr/kernel.h>
diff --git a/include/zephyr/sys/time_units.h b/include/zephyr/sys/time_units.h
index e088099..f4deb93 100644
--- a/include/zephyr/sys/time_units.h
+++ b/include/zephyr/sys/time_units.h
@@ -2070,7 +2070,7 @@
z_tmcvt_64(t, Z_HZ_ticks, Z_HZ_cyc, Z_CCYC, true, false)
#if defined(CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME)
-#include <syscalls/time_units.h>
+#include <zephyr/syscalls/time_units.h>
#endif
#undef TIME_CONSTEXPR
diff --git a/include/zephyr/syscall.h b/include/zephyr/syscall.h
index 73a3a64..35cb365 100644
--- a/include/zephyr/syscall.h
+++ b/include/zephyr/syscall.h
@@ -8,7 +8,7 @@
#ifndef ZEPHYR_INCLUDE_SYSCALL_H_
#define ZEPHYR_INCLUDE_SYSCALL_H_
-#include <syscall_list.h>
+#include <zephyr/syscall_list.h>
#include <zephyr/arch/syscall.h>
#include <stdbool.h>
diff --git a/include/zephyr/usb/usb_ch9.h b/include/zephyr/usb/usb_ch9.h
index 8fe33f4..dccc744 100644
--- a/include/zephyr/usb/usb_ch9.h
+++ b/include/zephyr/usb/usb_ch9.h
@@ -12,7 +12,7 @@
* and follows, with few exceptions, the USB Specification 2.0.
*/
-#include <version.h>
+#include <zephyr/version.h>
#include <zephyr/sys/util.h>
#include <zephyr/math/ilog2.h>
#include <zephyr/usb/class/usb_hub.h>
diff --git a/kernel/atomic_c.c b/kernel/atomic_c.c
index c873192..70fff83 100644
--- a/kernel/atomic_c.c
+++ b/kernel/atomic_c.c
@@ -112,7 +112,7 @@
return z_impl_atomic_cas((atomic_t *)target, old_value, new_value);
}
-#include <syscalls/atomic_cas_mrsh.c>
+#include <zephyr/syscalls/atomic_cas_mrsh.c>
#endif /* CONFIG_USERSPACE */
bool z_impl_atomic_ptr_cas(atomic_ptr_t *target, atomic_ptr_val_t old_value,
@@ -142,7 +142,7 @@
return z_impl_atomic_ptr_cas(target, old_value, new_value);
}
-#include <syscalls/atomic_ptr_cas_mrsh.c>
+#include <zephyr/syscalls/atomic_ptr_cas_mrsh.c>
#endif /* CONFIG_USERSPACE */
/**
@@ -280,7 +280,7 @@
return z_impl_atomic_ptr_set(target, value);
}
-#include <syscalls/atomic_ptr_set_mrsh.c>
+#include <zephyr/syscalls/atomic_ptr_set_mrsh.c>
#endif /* CONFIG_USERSPACE */
/**
@@ -404,11 +404,11 @@
ATOMIC_SYSCALL_HANDLER_TARGET_VALUE(atomic_nand);
#ifdef CONFIG_USERSPACE
-#include <syscalls/atomic_add_mrsh.c>
-#include <syscalls/atomic_sub_mrsh.c>
-#include <syscalls/atomic_set_mrsh.c>
-#include <syscalls/atomic_or_mrsh.c>
-#include <syscalls/atomic_xor_mrsh.c>
-#include <syscalls/atomic_and_mrsh.c>
-#include <syscalls/atomic_nand_mrsh.c>
+#include <zephyr/syscalls/atomic_add_mrsh.c>
+#include <zephyr/syscalls/atomic_sub_mrsh.c>
+#include <zephyr/syscalls/atomic_set_mrsh.c>
+#include <zephyr/syscalls/atomic_or_mrsh.c>
+#include <zephyr/syscalls/atomic_xor_mrsh.c>
+#include <zephyr/syscalls/atomic_and_mrsh.c>
+#include <zephyr/syscalls/atomic_nand_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/kernel/banner.c b/kernel/banner.c
index dc2506f..d2a431e 100644
--- a/kernel/banner.c
+++ b/kernel/banner.c
@@ -7,7 +7,7 @@
#include <zephyr/kernel.h>
#include <zephyr/init.h>
#include <zephyr/device.h>
-#include <version.h>
+#include <zephyr/version.h>
#if defined(CONFIG_BOOT_DELAY) && (CONFIG_BOOT_DELAY > 0)
#define DELAY_STR STRINGIFY(CONFIG_BOOT_DELAY)
diff --git a/kernel/busy_wait.c b/kernel/busy_wait.c
index cb7c993..da0ea14 100644
--- a/kernel/busy_wait.c
+++ b/kernel/busy_wait.c
@@ -52,5 +52,5 @@
{
z_impl_k_busy_wait(usec_to_wait);
}
-#include <syscalls/k_busy_wait_mrsh.c>
+#include <zephyr/syscalls/k_busy_wait_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/kernel/condvar.c b/kernel/condvar.c
index 2430523..b8d0df9 100644
--- a/kernel/condvar.c
+++ b/kernel/condvar.c
@@ -38,7 +38,7 @@
K_OOPS(K_SYSCALL_OBJ_INIT(condvar, K_OBJ_CONDVAR));
return z_impl_k_condvar_init(condvar);
}
-#include <syscalls/k_condvar_init_mrsh.c>
+#include <zephyr/syscalls/k_condvar_init_mrsh.c>
#endif /* CONFIG_USERSPACE */
int z_impl_k_condvar_signal(struct k_condvar *condvar)
@@ -70,7 +70,7 @@
K_OOPS(K_SYSCALL_OBJ(condvar, K_OBJ_CONDVAR));
return z_impl_k_condvar_signal(condvar);
}
-#include <syscalls/k_condvar_signal_mrsh.c>
+#include <zephyr/syscalls/k_condvar_signal_mrsh.c>
#endif /* CONFIG_USERSPACE */
int z_impl_k_condvar_broadcast(struct k_condvar *condvar)
@@ -103,7 +103,7 @@
K_OOPS(K_SYSCALL_OBJ(condvar, K_OBJ_CONDVAR));
return z_impl_k_condvar_broadcast(condvar);
}
-#include <syscalls/k_condvar_broadcast_mrsh.c>
+#include <zephyr/syscalls/k_condvar_broadcast_mrsh.c>
#endif /* CONFIG_USERSPACE */
int z_impl_k_condvar_wait(struct k_condvar *condvar, struct k_mutex *mutex,
@@ -132,7 +132,7 @@
K_OOPS(K_SYSCALL_OBJ(mutex, K_OBJ_MUTEX));
return z_impl_k_condvar_wait(condvar, mutex, timeout);
}
-#include <syscalls/k_condvar_wait_mrsh.c>
+#include <zephyr/syscalls/k_condvar_wait_mrsh.c>
#endif /* CONFIG_USERSPACE */
#ifdef CONFIG_OBJ_CORE_CONDVAR
diff --git a/kernel/device.c b/kernel/device.c
index 4b19d24..45806fc 100644
--- a/kernel/device.c
+++ b/kernel/device.c
@@ -66,7 +66,7 @@
return z_impl_device_get_binding(name_copy);
}
-#include <syscalls/device_get_binding_mrsh.c>
+#include <zephyr/syscalls/device_get_binding_mrsh.c>
static inline bool z_vrfy_device_is_ready(const struct device *dev)
{
@@ -74,7 +74,7 @@
return z_impl_device_is_ready(dev);
}
-#include <syscalls/device_is_ready_mrsh.c>
+#include <zephyr/syscalls/device_is_ready_mrsh.c>
#endif /* CONFIG_USERSPACE */
size_t z_device_get_all_static(struct device const **devices)
diff --git a/kernel/dynamic.c b/kernel/dynamic.c
index 89f8093..a9ec33d 100644
--- a/kernel/dynamic.c
+++ b/kernel/dynamic.c
@@ -105,7 +105,7 @@
{
return z_impl_k_thread_stack_alloc(size, flags);
}
-#include <syscalls/k_thread_stack_alloc_mrsh.c>
+#include <zephyr/syscalls/k_thread_stack_alloc_mrsh.c>
#endif /* CONFIG_USERSPACE */
static void dyn_cb(const struct k_thread *thread, void *user_data)
@@ -177,5 +177,5 @@
return z_impl_k_thread_stack_free(stack);
}
-#include <syscalls/k_thread_stack_free_mrsh.c>
+#include <zephyr/syscalls/k_thread_stack_free_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/kernel/errno.c b/kernel/errno.c
index 645597f..f268bb7 100644
--- a/kernel/errno.c
+++ b/kernel/errno.c
@@ -43,7 +43,7 @@
{
return z_impl_z_errno();
}
-#include <syscalls/z_errno_mrsh.c>
+#include <zephyr/syscalls/z_errno_mrsh.c>
#else
int *z_impl_z_errno(void)
diff --git a/kernel/events.c b/kernel/events.c
index 082f418..d2950e4 100644
--- a/kernel/events.c
+++ b/kernel/events.c
@@ -71,7 +71,7 @@
K_OOPS(K_SYSCALL_OBJ_NEVER_INIT(event, K_OBJ_EVENT));
z_impl_k_event_init(event);
}
-#include <syscalls/k_event_init_mrsh.c>
+#include <zephyr/syscalls/k_event_init_mrsh.c>
#endif /* CONFIG_USERSPACE */
/**
@@ -190,7 +190,7 @@
K_OOPS(K_SYSCALL_OBJ(event, K_OBJ_EVENT));
return z_impl_k_event_post(event, events);
}
-#include <syscalls/k_event_post_mrsh.c>
+#include <zephyr/syscalls/k_event_post_mrsh.c>
#endif /* CONFIG_USERSPACE */
uint32_t z_impl_k_event_set(struct k_event *event, uint32_t events)
@@ -204,7 +204,7 @@
K_OOPS(K_SYSCALL_OBJ(event, K_OBJ_EVENT));
return z_impl_k_event_set(event, events);
}
-#include <syscalls/k_event_set_mrsh.c>
+#include <zephyr/syscalls/k_event_set_mrsh.c>
#endif /* CONFIG_USERSPACE */
uint32_t z_impl_k_event_set_masked(struct k_event *event, uint32_t events,
@@ -220,7 +220,7 @@
K_OOPS(K_SYSCALL_OBJ(event, K_OBJ_EVENT));
return z_impl_k_event_set_masked(event, events, events_mask);
}
-#include <syscalls/k_event_set_masked_mrsh.c>
+#include <zephyr/syscalls/k_event_set_masked_mrsh.c>
#endif /* CONFIG_USERSPACE */
uint32_t z_impl_k_event_clear(struct k_event *event, uint32_t events)
@@ -234,7 +234,7 @@
K_OOPS(K_SYSCALL_OBJ(event, K_OBJ_EVENT));
return z_impl_k_event_clear(event, events);
}
-#include <syscalls/k_event_clear_mrsh.c>
+#include <zephyr/syscalls/k_event_clear_mrsh.c>
#endif /* CONFIG_USERSPACE */
static uint32_t k_event_wait_internal(struct k_event *event, uint32_t events,
@@ -320,7 +320,7 @@
K_OOPS(K_SYSCALL_OBJ(event, K_OBJ_EVENT));
return z_impl_k_event_wait(event, events, reset, timeout);
}
-#include <syscalls/k_event_wait_mrsh.c>
+#include <zephyr/syscalls/k_event_wait_mrsh.c>
#endif /* CONFIG_USERSPACE */
/**
@@ -342,7 +342,7 @@
K_OOPS(K_SYSCALL_OBJ(event, K_OBJ_EVENT));
return z_impl_k_event_wait_all(event, events, reset, timeout);
}
-#include <syscalls/k_event_wait_all_mrsh.c>
+#include <zephyr/syscalls/k_event_wait_all_mrsh.c>
#endif /* CONFIG_USERSPACE */
#ifdef CONFIG_OBJ_CORE_EVENT
diff --git a/kernel/float.c b/kernel/float.c
index 69e806d..fa81edf 100644
--- a/kernel/float.c
+++ b/kernel/float.c
@@ -35,13 +35,13 @@
K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
return z_impl_k_float_disable(thread);
}
-#include <syscalls/k_float_disable_mrsh.c>
+#include <zephyr/syscalls/k_float_disable_mrsh.c>
static inline int z_vrfy_k_float_enable(struct k_thread *thread, unsigned int options)
{
K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
return z_impl_k_float_enable(thread, options);
}
-#include <syscalls/k_float_enable_mrsh.c>
+#include <zephyr/syscalls/k_float_enable_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/kernel/futex.c b/kernel/futex.c
index 813ce0f..86acc0c 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -60,7 +60,7 @@
return z_impl_k_futex_wake(futex, wake_all);
}
-#include <syscalls/k_futex_wake_mrsh.c>
+#include <zephyr/syscalls/k_futex_wake_mrsh.c>
int z_impl_k_futex_wait(struct k_futex *futex, int expected,
k_timeout_t timeout)
@@ -98,4 +98,4 @@
return z_impl_k_futex_wait(futex, expected, timeout);
}
-#include <syscalls/k_futex_wait_mrsh.c>
+#include <zephyr/syscalls/k_futex_wait_mrsh.c>
diff --git a/kernel/include/kernel_offsets.h b/kernel/include/kernel_offsets.h
index 41b310a..a7b1f4e 100644
--- a/kernel/include/kernel_offsets.h
+++ b/kernel/include/kernel_offsets.h
@@ -10,7 +10,7 @@
#ifndef ZEPHYR_KERNEL_INCLUDE_KERNEL_OFFSETS_H_
#define ZEPHYR_KERNEL_INCLUDE_KERNEL_OFFSETS_H_
-#include <syscall_list.h>
+#include <zephyr/syscall_list.h>
/* All of this is build time magic, but LCOV gets confused. Disable coverage
* for this whole file.
diff --git a/kernel/include/offsets_short.h b/kernel/include/offsets_short.h
index 13e1afe..373d7e0 100644
--- a/kernel/include/offsets_short.h
+++ b/kernel/include/offsets_short.h
@@ -7,7 +7,7 @@
#ifndef ZEPHYR_KERNEL_INCLUDE_OFFSETS_SHORT_H_
#define ZEPHYR_KERNEL_INCLUDE_OFFSETS_SHORT_H_
-#include <offsets.h>
+#include <zephyr/offsets.h>
#include <offsets_short_arch.h>
/* kernel */
diff --git a/kernel/init.c b/kernel/init.c
index 00765f5..998cb93 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -395,7 +395,7 @@
return z_impl_device_init(dev);
}
-#include <syscalls/device_init_mrsh.c>
+#include <zephyr/syscalls/device_init_mrsh.c>
#endif
extern void boot_banner(void);
diff --git a/kernel/msg_q.c b/kernel/msg_q.c
index 5214902..0c46109 100644
--- a/kernel/msg_q.c
+++ b/kernel/msg_q.c
@@ -97,7 +97,7 @@
return z_impl_k_msgq_alloc_init(msgq, msg_size, max_msgs);
}
-#include <syscalls/k_msgq_alloc_init_mrsh.c>
+#include <zephyr/syscalls/k_msgq_alloc_init_mrsh.c>
#endif /* CONFIG_USERSPACE */
int k_msgq_cleanup(struct k_msgq *msgq)
@@ -192,7 +192,7 @@
return z_impl_k_msgq_put(msgq, data, timeout);
}
-#include <syscalls/k_msgq_put_mrsh.c>
+#include <zephyr/syscalls/k_msgq_put_mrsh.c>
#endif /* CONFIG_USERSPACE */
void z_impl_k_msgq_get_attrs(struct k_msgq *msgq, struct k_msgq_attrs *attrs)
@@ -210,7 +210,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(attrs, sizeof(struct k_msgq_attrs)));
z_impl_k_msgq_get_attrs(msgq, attrs);
}
-#include <syscalls/k_msgq_get_attrs_mrsh.c>
+#include <zephyr/syscalls/k_msgq_get_attrs_mrsh.c>
#endif /* CONFIG_USERSPACE */
int z_impl_k_msgq_get(struct k_msgq *msgq, void *data, k_timeout_t timeout)
@@ -290,7 +290,7 @@
return z_impl_k_msgq_get(msgq, data, timeout);
}
-#include <syscalls/k_msgq_get_mrsh.c>
+#include <zephyr/syscalls/k_msgq_get_mrsh.c>
#endif /* CONFIG_USERSPACE */
int z_impl_k_msgq_peek(struct k_msgq *msgq, void *data)
@@ -324,7 +324,7 @@
return z_impl_k_msgq_peek(msgq, data);
}
-#include <syscalls/k_msgq_peek_mrsh.c>
+#include <zephyr/syscalls/k_msgq_peek_mrsh.c>
#endif /* CONFIG_USERSPACE */
int z_impl_k_msgq_peek_at(struct k_msgq *msgq, void *data, uint32_t idx)
@@ -370,7 +370,7 @@
return z_impl_k_msgq_peek_at(msgq, data, idx);
}
-#include <syscalls/k_msgq_peek_at_mrsh.c>
+#include <zephyr/syscalls/k_msgq_peek_at_mrsh.c>
#endif /* CONFIG_USERSPACE */
void z_impl_k_msgq_purge(struct k_msgq *msgq)
@@ -401,21 +401,21 @@
K_OOPS(K_SYSCALL_OBJ(msgq, K_OBJ_MSGQ));
z_impl_k_msgq_purge(msgq);
}
-#include <syscalls/k_msgq_purge_mrsh.c>
+#include <zephyr/syscalls/k_msgq_purge_mrsh.c>
static inline uint32_t z_vrfy_k_msgq_num_free_get(struct k_msgq *msgq)
{
K_OOPS(K_SYSCALL_OBJ(msgq, K_OBJ_MSGQ));
return z_impl_k_msgq_num_free_get(msgq);
}
-#include <syscalls/k_msgq_num_free_get_mrsh.c>
+#include <zephyr/syscalls/k_msgq_num_free_get_mrsh.c>
static inline uint32_t z_vrfy_k_msgq_num_used_get(struct k_msgq *msgq)
{
K_OOPS(K_SYSCALL_OBJ(msgq, K_OBJ_MSGQ));
return z_impl_k_msgq_num_used_get(msgq);
}
-#include <syscalls/k_msgq_num_used_get_mrsh.c>
+#include <zephyr/syscalls/k_msgq_num_used_get_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/kernel/mutex.c b/kernel/mutex.c
index 3635e76..d60b08c 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -76,7 +76,7 @@
K_OOPS(K_SYSCALL_OBJ_INIT(mutex, K_OBJ_MUTEX));
return z_impl_k_mutex_init(mutex);
}
-#include <syscalls/k_mutex_init_mrsh.c>
+#include <zephyr/syscalls/k_mutex_init_mrsh.c>
#endif /* CONFIG_USERSPACE */
static int32_t new_prio_for_inheritance(int32_t target, int32_t limit)
@@ -205,7 +205,7 @@
K_OOPS(K_SYSCALL_OBJ(mutex, K_OBJ_MUTEX));
return z_impl_k_mutex_lock(mutex, timeout);
}
-#include <syscalls/k_mutex_lock_mrsh.c>
+#include <zephyr/syscalls/k_mutex_lock_mrsh.c>
#endif /* CONFIG_USERSPACE */
int z_impl_k_mutex_unlock(struct k_mutex *mutex)
@@ -289,7 +289,7 @@
K_OOPS(K_SYSCALL_OBJ(mutex, K_OBJ_MUTEX));
return z_impl_k_mutex_unlock(mutex);
}
-#include <syscalls/k_mutex_unlock_mrsh.c>
+#include <zephyr/syscalls/k_mutex_unlock_mrsh.c>
#endif /* CONFIG_USERSPACE */
#ifdef CONFIG_OBJ_CORE_MUTEX
diff --git a/kernel/paging/statistics.c b/kernel/paging/statistics.c
index 06e867c..c0617af 100644
--- a/kernel/paging/statistics.c
+++ b/kernel/paging/statistics.c
@@ -105,7 +105,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(stats, sizeof(*stats)));
z_impl_k_mem_paging_stats_get(stats);
}
-#include <syscalls/k_mem_paging_stats_get_mrsh.c>
+#include <zephyr/syscalls/k_mem_paging_stats_get_mrsh.c>
#endif /* CONFIG_USERSPACE */
#ifdef CONFIG_DEMAND_PAGING_THREAD_STATS
@@ -129,7 +129,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(stats, sizeof(*stats)));
z_impl_k_mem_paging_thread_stats_get(thread, stats);
}
-#include <syscalls/k_mem_paging_thread_stats_get_mrsh.c>
+#include <zephyr/syscalls/k_mem_paging_thread_stats_get_mrsh.c>
#endif /* CONFIG_USERSPACE */
#endif /* CONFIG_DEMAND_PAGING_THREAD_STATS */
@@ -227,7 +227,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(hist, sizeof(*hist)));
z_impl_k_mem_paging_histogram_eviction_get(hist);
}
-#include <syscalls/k_mem_paging_histogram_eviction_get_mrsh.c>
+#include <zephyr/syscalls/k_mem_paging_histogram_eviction_get_mrsh.c>
static inline
void z_vrfy_k_mem_paging_histogram_backing_store_page_in_get(
@@ -236,7 +236,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(hist, sizeof(*hist)));
z_impl_k_mem_paging_histogram_backing_store_page_in_get(hist);
}
-#include <syscalls/k_mem_paging_histogram_backing_store_page_in_get_mrsh.c>
+#include <zephyr/syscalls/k_mem_paging_histogram_backing_store_page_in_get_mrsh.c>
static inline
void z_vrfy_k_mem_paging_histogram_backing_store_page_out_get(
@@ -245,7 +245,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(hist, sizeof(*hist)));
z_impl_k_mem_paging_histogram_backing_store_page_out_get(hist);
}
-#include <syscalls/k_mem_paging_histogram_backing_store_page_out_get_mrsh.c>
+#include <zephyr/syscalls/k_mem_paging_histogram_backing_store_page_out_get_mrsh.c>
#endif /* CONFIG_USERSPACE */
#endif /* CONFIG_DEMAND_PAGING_TIMING_HISTOGRAM */
diff --git a/kernel/pipes.c b/kernel/pipes.c
index d91a4d6..a81393c 100644
--- a/kernel/pipes.c
+++ b/kernel/pipes.c
@@ -93,7 +93,7 @@
return z_impl_k_pipe_alloc_init(pipe, size);
}
-#include <syscalls/k_pipe_alloc_init_mrsh.c>
+#include <zephyr/syscalls/k_pipe_alloc_init_mrsh.c>
#endif /* CONFIG_USERSPACE */
static inline void handle_poll_events(struct k_pipe *pipe)
@@ -126,7 +126,7 @@
z_impl_k_pipe_flush(pipe);
}
-#include <syscalls/k_pipe_flush_mrsh.c>
+#include <zephyr/syscalls/k_pipe_flush_mrsh.c>
#endif /* CONFIG_USERSPACE */
void z_impl_k_pipe_buffer_flush(struct k_pipe *pipe)
@@ -525,7 +525,7 @@
bytes_to_write, bytes_written, min_xfer,
timeout);
}
-#include <syscalls/k_pipe_put_mrsh.c>
+#include <zephyr/syscalls/k_pipe_put_mrsh.c>
#endif /* CONFIG_USERSPACE */
static int pipe_get_internal(k_spinlock_key_t key, struct k_pipe *pipe,
@@ -733,7 +733,7 @@
bytes_to_read, bytes_read, min_xfer,
timeout);
}
-#include <syscalls/k_pipe_get_mrsh.c>
+#include <zephyr/syscalls/k_pipe_get_mrsh.c>
#endif /* CONFIG_USERSPACE */
size_t z_impl_k_pipe_read_avail(struct k_pipe *pipe)
@@ -770,7 +770,7 @@
return z_impl_k_pipe_read_avail(pipe);
}
-#include <syscalls/k_pipe_read_avail_mrsh.c>
+#include <zephyr/syscalls/k_pipe_read_avail_mrsh.c>
#endif /* CONFIG_USERSPACE */
size_t z_impl_k_pipe_write_avail(struct k_pipe *pipe)
@@ -807,7 +807,7 @@
return z_impl_k_pipe_write_avail(pipe);
}
-#include <syscalls/k_pipe_write_avail_mrsh.c>
+#include <zephyr/syscalls/k_pipe_write_avail_mrsh.c>
#endif /* CONFIG_USERSPACE */
#ifdef CONFIG_OBJ_CORE_PIPE
diff --git a/kernel/poll.c b/kernel/poll.c
index 185aba6..502e975 100644
--- a/kernel/poll.c
+++ b/kernel/poll.c
@@ -434,7 +434,7 @@
k_free(events_copy);
K_OOPS(1);
}
-#include <syscalls/k_poll_mrsh.c>
+#include <zephyr/syscalls/k_poll_mrsh.c>
#endif /* CONFIG_USERSPACE */
/* must be called with interrupts locked */
@@ -493,7 +493,7 @@
K_OOPS(K_SYSCALL_OBJ_INIT(sig, K_OBJ_POLL_SIGNAL));
z_impl_k_poll_signal_init(sig);
}
-#include <syscalls/k_poll_signal_init_mrsh.c>
+#include <zephyr/syscalls/k_poll_signal_init_mrsh.c>
#endif /* CONFIG_USERSPACE */
void z_impl_k_poll_signal_reset(struct k_poll_signal *sig)
@@ -521,7 +521,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(result, sizeof(int)));
z_impl_k_poll_signal_check(sig, signaled, result);
}
-#include <syscalls/k_poll_signal_check_mrsh.c>
+#include <zephyr/syscalls/k_poll_signal_check_mrsh.c>
#endif /* CONFIG_USERSPACE */
int z_impl_k_poll_signal_raise(struct k_poll_signal *sig, int result)
@@ -556,14 +556,14 @@
K_OOPS(K_SYSCALL_OBJ(sig, K_OBJ_POLL_SIGNAL));
return z_impl_k_poll_signal_raise(sig, result);
}
-#include <syscalls/k_poll_signal_raise_mrsh.c>
+#include <zephyr/syscalls/k_poll_signal_raise_mrsh.c>
static inline void z_vrfy_k_poll_signal_reset(struct k_poll_signal *sig)
{
K_OOPS(K_SYSCALL_OBJ(sig, K_OBJ_POLL_SIGNAL));
z_impl_k_poll_signal_reset(sig);
}
-#include <syscalls/k_poll_signal_reset_mrsh.c>
+#include <zephyr/syscalls/k_poll_signal_reset_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/kernel/queue.c b/kernel/queue.c
index fcccde5..a3c99d6 100644
--- a/kernel/queue.c
+++ b/kernel/queue.c
@@ -75,7 +75,7 @@
K_OOPS(K_SYSCALL_OBJ_NEVER_INIT(queue, K_OBJ_QUEUE));
z_impl_k_queue_init(queue);
}
-#include <syscalls/k_queue_init_mrsh.c>
+#include <zephyr/syscalls/k_queue_init_mrsh.c>
#endif /* CONFIG_USERSPACE */
static void prepare_thread_to_run(struct k_thread *thread, void *data)
@@ -117,7 +117,7 @@
K_OOPS(K_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
z_impl_k_queue_cancel_wait(queue);
}
-#include <syscalls/k_queue_cancel_wait_mrsh.c>
+#include <zephyr/syscalls/k_queue_cancel_wait_mrsh.c>
#endif /* CONFIG_USERSPACE */
static int32_t queue_insert(struct k_queue *queue, void *prev, void *data,
@@ -220,7 +220,7 @@
K_OOPS(K_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
return z_impl_k_queue_alloc_append(queue, data);
}
-#include <syscalls/k_queue_alloc_append_mrsh.c>
+#include <zephyr/syscalls/k_queue_alloc_append_mrsh.c>
#endif /* CONFIG_USERSPACE */
int32_t z_impl_k_queue_alloc_prepend(struct k_queue *queue, void *data)
@@ -241,7 +241,7 @@
K_OOPS(K_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
return z_impl_k_queue_alloc_prepend(queue, data);
}
-#include <syscalls/k_queue_alloc_prepend_mrsh.c>
+#include <zephyr/syscalls/k_queue_alloc_prepend_mrsh.c>
#endif /* CONFIG_USERSPACE */
int k_queue_append_list(struct k_queue *queue, void *head, void *tail)
@@ -408,28 +408,28 @@
K_OOPS(K_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
return z_impl_k_queue_get(queue, timeout);
}
-#include <syscalls/k_queue_get_mrsh.c>
+#include <zephyr/syscalls/k_queue_get_mrsh.c>
static inline int z_vrfy_k_queue_is_empty(struct k_queue *queue)
{
K_OOPS(K_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
return z_impl_k_queue_is_empty(queue);
}
-#include <syscalls/k_queue_is_empty_mrsh.c>
+#include <zephyr/syscalls/k_queue_is_empty_mrsh.c>
static inline void *z_vrfy_k_queue_peek_head(struct k_queue *queue)
{
K_OOPS(K_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
return z_impl_k_queue_peek_head(queue);
}
-#include <syscalls/k_queue_peek_head_mrsh.c>
+#include <zephyr/syscalls/k_queue_peek_head_mrsh.c>
static inline void *z_vrfy_k_queue_peek_tail(struct k_queue *queue)
{
K_OOPS(K_SYSCALL_OBJ(queue, K_OBJ_QUEUE));
return z_impl_k_queue_peek_tail(queue);
}
-#include <syscalls/k_queue_peek_tail_mrsh.c>
+#include <zephyr/syscalls/k_queue_peek_tail_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/kernel/sched.c b/kernel/sched.c
index 98de4f7..506ad57 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -521,7 +521,7 @@
K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
z_impl_k_thread_suspend(thread);
}
-#include <syscalls/k_thread_suspend_mrsh.c>
+#include <zephyr/syscalls/k_thread_suspend_mrsh.c>
#endif /* CONFIG_USERSPACE */
void z_impl_k_thread_resume(struct k_thread *thread)
@@ -550,7 +550,7 @@
K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
z_impl_k_thread_resume(thread);
}
-#include <syscalls/k_thread_resume_mrsh.c>
+#include <zephyr/syscalls/k_thread_resume_mrsh.c>
#endif /* CONFIG_USERSPACE */
static _wait_q_t *pended_on_thread(struct k_thread *thread)
@@ -1025,7 +1025,7 @@
#endif /* CONFIG_USERSPACE_THREAD_MAY_RAISE_PRIORITY */
z_impl_k_thread_priority_set(thread, prio);
}
-#include <syscalls/k_thread_priority_set_mrsh.c>
+#include <zephyr/syscalls/k_thread_priority_set_mrsh.c>
#endif /* CONFIG_USERSPACE */
#ifdef CONFIG_SCHED_DEADLINE
@@ -1063,7 +1063,7 @@
z_impl_k_thread_deadline_set((k_tid_t)thread, deadline);
}
-#include <syscalls/k_thread_deadline_set_mrsh.c>
+#include <zephyr/syscalls/k_thread_deadline_set_mrsh.c>
#endif /* CONFIG_USERSPACE */
#endif /* CONFIG_SCHED_DEADLINE */
@@ -1095,7 +1095,7 @@
{
z_impl_k_yield();
}
-#include <syscalls/k_yield_mrsh.c>
+#include <zephyr/syscalls/k_yield_mrsh.c>
#endif /* CONFIG_USERSPACE */
static int32_t z_tick_sleep(k_ticks_t ticks)
@@ -1173,7 +1173,7 @@
{
return z_impl_k_sleep(timeout);
}
-#include <syscalls/k_sleep_mrsh.c>
+#include <zephyr/syscalls/k_sleep_mrsh.c>
#endif /* CONFIG_USERSPACE */
int32_t z_impl_k_usleep(int us)
@@ -1197,7 +1197,7 @@
{
return z_impl_k_usleep(us);
}
-#include <syscalls/k_usleep_mrsh.c>
+#include <zephyr/syscalls/k_usleep_mrsh.c>
#endif /* CONFIG_USERSPACE */
void z_impl_k_wakeup(k_tid_t thread)
@@ -1236,7 +1236,7 @@
K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
z_impl_k_wakeup(thread);
}
-#include <syscalls/k_wakeup_mrsh.c>
+#include <zephyr/syscalls/k_wakeup_mrsh.c>
#endif /* CONFIG_USERSPACE */
k_tid_t z_impl_k_sched_current_thread_query(void)
@@ -1262,7 +1262,7 @@
{
return z_impl_k_sched_current_thread_query();
}
-#include <syscalls/k_sched_current_thread_query_mrsh.c>
+#include <zephyr/syscalls/k_sched_current_thread_query_mrsh.c>
#endif /* CONFIG_USERSPACE */
static inline void unpend_all(_wait_q_t *wait_q)
@@ -1485,7 +1485,7 @@
return z_impl_k_thread_join(thread, timeout);
}
-#include <syscalls/k_thread_join_mrsh.c>
+#include <zephyr/syscalls/k_thread_join_mrsh.c>
static inline void z_vrfy_k_thread_abort(k_tid_t thread)
{
@@ -1498,7 +1498,7 @@
z_impl_k_thread_abort((struct k_thread *)thread);
}
-#include <syscalls/k_thread_abort_mrsh.c>
+#include <zephyr/syscalls/k_thread_abort_mrsh.c>
#endif /* CONFIG_USERSPACE */
/*
diff --git a/kernel/sem.c b/kernel/sem.c
index 0a8b861..f2ae7a6 100644
--- a/kernel/sem.c
+++ b/kernel/sem.c
@@ -79,7 +79,7 @@
K_OOPS(K_SYSCALL_OBJ_INIT(sem, K_OBJ_SEM));
return z_impl_k_sem_init(sem, initial_count, limit);
}
-#include <syscalls/k_sem_init_mrsh.c>
+#include <zephyr/syscalls/k_sem_init_mrsh.c>
#endif /* CONFIG_USERSPACE */
static inline bool handle_poll_events(struct k_sem *sem)
@@ -126,7 +126,7 @@
K_OOPS(K_SYSCALL_OBJ(sem, K_OBJ_SEM));
z_impl_k_sem_give(sem);
}
-#include <syscalls/k_sem_give_mrsh.c>
+#include <zephyr/syscalls/k_sem_give_mrsh.c>
#endif /* CONFIG_USERSPACE */
int z_impl_k_sem_take(struct k_sem *sem, k_timeout_t timeout)
@@ -191,21 +191,21 @@
K_OOPS(K_SYSCALL_OBJ(sem, K_OBJ_SEM));
return z_impl_k_sem_take(sem, timeout);
}
-#include <syscalls/k_sem_take_mrsh.c>
+#include <zephyr/syscalls/k_sem_take_mrsh.c>
static inline void z_vrfy_k_sem_reset(struct k_sem *sem)
{
K_OOPS(K_SYSCALL_OBJ(sem, K_OBJ_SEM));
z_impl_k_sem_reset(sem);
}
-#include <syscalls/k_sem_reset_mrsh.c>
+#include <zephyr/syscalls/k_sem_reset_mrsh.c>
static inline unsigned int z_vrfy_k_sem_count_get(struct k_sem *sem)
{
K_OOPS(K_SYSCALL_OBJ(sem, K_OBJ_SEM));
return z_impl_k_sem_count_get(sem);
}
-#include <syscalls/k_sem_count_get_mrsh.c>
+#include <zephyr/syscalls/k_sem_count_get_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/kernel/stack.c b/kernel/stack.c
index 5c2bae6..e637cc3 100644
--- a/kernel/stack.c
+++ b/kernel/stack.c
@@ -74,7 +74,7 @@
&total_size)));
return z_impl_k_stack_alloc_init(stack, num_entries);
}
-#include <syscalls/k_stack_alloc_init_mrsh.c>
+#include <zephyr/syscalls/k_stack_alloc_init_mrsh.c>
#endif /* CONFIG_USERSPACE */
int k_stack_cleanup(struct k_stack *stack)
@@ -142,7 +142,7 @@
return z_impl_k_stack_push(stack, data);
}
-#include <syscalls/k_stack_push_mrsh.c>
+#include <zephyr/syscalls/k_stack_push_mrsh.c>
#endif /* CONFIG_USERSPACE */
int z_impl_k_stack_pop(struct k_stack *stack, stack_data_t *data,
@@ -197,7 +197,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(data, sizeof(stack_data_t)));
return z_impl_k_stack_pop(stack, data, timeout);
}
-#include <syscalls/k_stack_pop_mrsh.c>
+#include <zephyr/syscalls/k_stack_pop_mrsh.c>
#endif /* CONFIG_USERSPACE */
#ifdef CONFIG_OBJ_CORE_STACK
diff --git a/kernel/thread.c b/kernel/thread.c
index 3b19774..7b458d1 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c
@@ -90,7 +90,7 @@
{
z_impl_k_thread_custom_data_set(data);
}
-#include <syscalls/k_thread_custom_data_set_mrsh.c>
+#include <zephyr/syscalls/k_thread_custom_data_set_mrsh.c>
#endif /* CONFIG_USERSPACE */
void *z_impl_k_thread_custom_data_get(void)
@@ -103,7 +103,7 @@
{
return z_impl_k_thread_custom_data_get();
}
-#include <syscalls/k_thread_custom_data_get_mrsh.c>
+#include <zephyr/syscalls/k_thread_custom_data_get_mrsh.c>
#endif /* CONFIG_USERSPACE */
#endif /* CONFIG_THREAD_CUSTOM_DATA */
@@ -118,7 +118,7 @@
{
return z_impl_k_is_preempt_thread();
}
-#include <syscalls/k_is_preempt_thread_mrsh.c>
+#include <zephyr/syscalls/k_is_preempt_thread_mrsh.c>
#endif /* CONFIG_USERSPACE */
int z_impl_k_thread_priority_get(k_tid_t thread)
@@ -132,7 +132,7 @@
K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
return z_impl_k_thread_priority_get(thread);
}
-#include <syscalls/k_thread_priority_get_mrsh.c>
+#include <zephyr/syscalls/k_thread_priority_get_mrsh.c>
#endif /* CONFIG_USERSPACE */
int z_impl_k_thread_name_set(struct k_thread *thread, const char *value)
@@ -183,7 +183,7 @@
return -ENOSYS;
#endif /* CONFIG_THREAD_NAME */
}
-#include <syscalls/k_thread_name_set_mrsh.c>
+#include <zephyr/syscalls/k_thread_name_set_mrsh.c>
#endif /* CONFIG_USERSPACE */
const char *k_thread_name_get(k_tid_t thread)
@@ -304,7 +304,7 @@
return -ENOSYS;
#endif /* CONFIG_THREAD_NAME */
}
-#include <syscalls/k_thread_name_copy_mrsh.c>
+#include <zephyr/syscalls/k_thread_name_copy_mrsh.c>
#endif /* CONFIG_USERSPACE */
#ifdef CONFIG_STACK_SENTINEL
@@ -353,7 +353,7 @@
K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
return z_impl_k_thread_start(thread);
}
-#include <syscalls/k_thread_start_mrsh.c>
+#include <zephyr/syscalls/k_thread_start_mrsh.c>
#endif /* CONFIG_USERSPACE */
#if defined(CONFIG_STACK_POINTER_RANDOM) && (CONFIG_STACK_POINTER_RANDOM != 0)
@@ -741,7 +741,7 @@
return new_thread;
}
-#include <syscalls/k_thread_create_mrsh.c>
+#include <zephyr/syscalls/k_thread_create_mrsh.c>
#endif /* CONFIG_USERSPACE */
void z_init_thread_base(struct _thread_base *thread_base, int priority,
@@ -895,7 +895,7 @@
return 0;
}
-#include <syscalls/k_thread_stack_space_get_mrsh.c>
+#include <zephyr/syscalls/k_thread_stack_space_get_mrsh.c>
#endif /* CONFIG_USERSPACE */
#endif /* CONFIG_INIT_STACKS && CONFIG_THREAD_STACK_INFO */
@@ -906,7 +906,7 @@
K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
return z_impl_k_thread_timeout_remaining_ticks(thread);
}
-#include <syscalls/k_thread_timeout_remaining_ticks_mrsh.c>
+#include <zephyr/syscalls/k_thread_timeout_remaining_ticks_mrsh.c>
static inline k_ticks_t z_vrfy_k_thread_timeout_expires_ticks(
const struct k_thread *thread)
@@ -914,7 +914,7 @@
K_OOPS(K_SYSCALL_OBJ(thread, K_OBJ_THREAD));
return z_impl_k_thread_timeout_expires_ticks(thread);
}
-#include <syscalls/k_thread_timeout_expires_ticks_mrsh.c>
+#include <zephyr/syscalls/k_thread_timeout_expires_ticks_mrsh.c>
#endif /* CONFIG_USERSPACE */
#ifdef CONFIG_INSTRUMENT_THREAD_SWITCHING
diff --git a/kernel/timeout.c b/kernel/timeout.c
index cf4a6d6..1a8a361 100644
--- a/kernel/timeout.c
+++ b/kernel/timeout.c
@@ -32,7 +32,7 @@
{
return z_impl_sys_clock_hw_cycles_per_sec_runtime_get();
}
-#include <syscalls/sys_clock_hw_cycles_per_sec_runtime_get_mrsh.c>
+#include <zephyr/syscalls/sys_clock_hw_cycles_per_sec_runtime_get_mrsh.c>
#endif /* CONFIG_USERSPACE */
#endif /* CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME */
@@ -287,7 +287,7 @@
{
return z_impl_k_uptime_ticks();
}
-#include <syscalls/k_uptime_ticks_mrsh.c>
+#include <zephyr/syscalls/k_uptime_ticks_mrsh.c>
#endif /* CONFIG_USERSPACE */
k_timepoint_t sys_timepoint_calc(k_timeout_t timeout)
diff --git a/kernel/timer.c b/kernel/timer.c
index 8eafbb4..466cab6 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -188,7 +188,7 @@
K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
z_impl_k_timer_start(timer, duration, period);
}
-#include <syscalls/k_timer_start_mrsh.c>
+#include <zephyr/syscalls/k_timer_start_mrsh.c>
#endif /* CONFIG_USERSPACE */
void z_impl_k_timer_stop(struct k_timer *timer)
@@ -221,7 +221,7 @@
K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
z_impl_k_timer_stop(timer);
}
-#include <syscalls/k_timer_stop_mrsh.c>
+#include <zephyr/syscalls/k_timer_stop_mrsh.c>
#endif /* CONFIG_USERSPACE */
uint32_t z_impl_k_timer_status_get(struct k_timer *timer)
@@ -241,7 +241,7 @@
K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
return z_impl_k_timer_status_get(timer);
}
-#include <syscalls/k_timer_status_get_mrsh.c>
+#include <zephyr/syscalls/k_timer_status_get_mrsh.c>
#endif /* CONFIG_USERSPACE */
uint32_t z_impl_k_timer_status_sync(struct k_timer *timer)
@@ -309,7 +309,7 @@
K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
return z_impl_k_timer_status_sync(timer);
}
-#include <syscalls/k_timer_status_sync_mrsh.c>
+#include <zephyr/syscalls/k_timer_status_sync_mrsh.c>
static inline k_ticks_t z_vrfy_k_timer_remaining_ticks(
const struct k_timer *timer)
@@ -317,7 +317,7 @@
K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
return z_impl_k_timer_remaining_ticks(timer);
}
-#include <syscalls/k_timer_remaining_ticks_mrsh.c>
+#include <zephyr/syscalls/k_timer_remaining_ticks_mrsh.c>
static inline k_ticks_t z_vrfy_k_timer_expires_ticks(
const struct k_timer *timer)
@@ -325,14 +325,14 @@
K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
return z_impl_k_timer_expires_ticks(timer);
}
-#include <syscalls/k_timer_expires_ticks_mrsh.c>
+#include <zephyr/syscalls/k_timer_expires_ticks_mrsh.c>
static inline void *z_vrfy_k_timer_user_data_get(const struct k_timer *timer)
{
K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
return z_impl_k_timer_user_data_get(timer);
}
-#include <syscalls/k_timer_user_data_get_mrsh.c>
+#include <zephyr/syscalls/k_timer_user_data_get_mrsh.c>
static inline void z_vrfy_k_timer_user_data_set(struct k_timer *timer,
void *user_data)
@@ -340,7 +340,7 @@
K_OOPS(K_SYSCALL_OBJ(timer, K_OBJ_TIMER));
z_impl_k_timer_user_data_set(timer, user_data);
}
-#include <syscalls/k_timer_user_data_set_mrsh.c>
+#include <zephyr/syscalls/k_timer_user_data_set_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/kernel/userspace.c b/kernel/userspace.c
index 664971e..5543258 100644
--- a/kernel/userspace.c
+++ b/kernel/userspace.c
@@ -94,7 +94,7 @@
case K_OBJ_ANY:
ret = "generic";
break;
-#include <otype-to-str.h>
+#include <zephyr/otype-to-str.h>
default:
ret = "?";
break;
@@ -192,7 +192,7 @@
size_t ret;
switch (otype) {
-#include <otype-to-size.h>
+#include <zephyr/otype-to-size.h>
default:
ret = sizeof(const struct device);
break;
diff --git a/kernel/userspace_handler.c b/kernel/userspace_handler.c
index da4053b..ab6e4f0 100644
--- a/kernel/userspace_handler.c
+++ b/kernel/userspace_handler.c
@@ -64,7 +64,7 @@
object));
k_thread_perms_set(ko, thread);
}
-#include <syscalls/k_object_access_grant_mrsh.c>
+#include <zephyr/syscalls/k_object_access_grant_mrsh.c>
static inline void z_vrfy_k_object_release(const void *object)
{
@@ -74,16 +74,16 @@
K_OOPS(K_SYSCALL_VERIFY_MSG(ko != NULL, "object %p access denied", object));
k_thread_perms_clear(ko, _current);
}
-#include <syscalls/k_object_release_mrsh.c>
+#include <zephyr/syscalls/k_object_release_mrsh.c>
static inline void *z_vrfy_k_object_alloc(enum k_objects otype)
{
return z_impl_k_object_alloc(otype);
}
-#include <syscalls/k_object_alloc_mrsh.c>
+#include <zephyr/syscalls/k_object_alloc_mrsh.c>
static inline void *z_vrfy_k_object_alloc_size(enum k_objects otype, size_t size)
{
return z_impl_k_object_alloc_size(otype, size);
}
-#include <syscalls/k_object_alloc_size_mrsh.c>
+#include <zephyr/syscalls/k_object_alloc_size_mrsh.c>
diff --git a/kernel/version.c b/kernel/version.c
index 799e555..029671f 100644
--- a/kernel/version.c
+++ b/kernel/version.c
@@ -5,7 +5,7 @@
*/
#include <zephyr/types.h>
-#include "version.h" /* generated by MAKE, at compile time */
+#include <zephyr/version.h> /* generated by MAKE, at compile time */
/**
* @brief Return the kernel version of the present build
diff --git a/lib/libc/arcmwdt/libc-hooks.c b/lib/libc/arcmwdt/libc-hooks.c
index babf24e..8e094d2 100644
--- a/lib/libc/arcmwdt/libc-hooks.c
+++ b/lib/libc/arcmwdt/libc-hooks.c
@@ -59,7 +59,7 @@
K_OOPS(K_SYSCALL_MEMORY_READ(buf, nbytes));
return z_impl_zephyr_write_stdout(buf, nbytes);
}
-#include <syscalls/zephyr_write_stdout_mrsh.c>
+#include <zephyr/syscalls/zephyr_write_stdout_mrsh.c>
#endif
#ifndef CONFIG_POSIX_API
diff --git a/lib/libc/minimal/source/stdout/stdout_console.c b/lib/libc/minimal/source/stdout/stdout_console.c
index 33ea7ff..e3d5a37 100644
--- a/lib/libc/minimal/source/stdout/stdout_console.c
+++ b/lib/libc/minimal/source/stdout/stdout_console.c
@@ -35,7 +35,7 @@
{
return z_impl_zephyr_fputc(c, stream);
}
-#include <syscalls/zephyr_fputc_mrsh.c>
+#include <zephyr/syscalls/zephyr_fputc_mrsh.c>
#endif
int fputc(int c, FILE *stream)
@@ -105,7 +105,7 @@
return z_impl_zephyr_fwrite((const void *ZRESTRICT)ptr, size,
nitems, (FILE *ZRESTRICT)stream);
}
-#include <syscalls/zephyr_fwrite_mrsh.c>
+#include <zephyr/syscalls/zephyr_fwrite_mrsh.c>
#endif
size_t fwrite(const void *ZRESTRICT ptr, size_t size, size_t nitems,
diff --git a/lib/libc/newlib/libc-hooks.c b/lib/libc/newlib/libc-hooks.c
index 5e8629d..75a2859 100644
--- a/lib/libc/newlib/libc-hooks.c
+++ b/lib/libc/newlib/libc-hooks.c
@@ -184,7 +184,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(buf, nbytes));
return z_impl_zephyr_read_stdin((char *)buf, nbytes);
}
-#include <syscalls/zephyr_read_stdin_mrsh.c>
+#include <zephyr/syscalls/zephyr_read_stdin_mrsh.c>
#endif
int z_impl_zephyr_write_stdout(const void *buffer, int nbytes)
@@ -207,7 +207,7 @@
K_OOPS(K_SYSCALL_MEMORY_READ(buf, nbytes));
return z_impl_zephyr_write_stdout((const void *)buf, nbytes);
}
-#include <syscalls/zephyr_write_stdout_mrsh.c>
+#include <zephyr/syscalls/zephyr_write_stdout_mrsh.c>
#endif
#ifndef CONFIG_POSIX_API
diff --git a/lib/libc/picolibc/libc-hooks.c b/lib/libc/picolibc/libc-hooks.c
index e7539bc..cefb0d4 100644
--- a/lib/libc/picolibc/libc-hooks.c
+++ b/lib/libc/picolibc/libc-hooks.c
@@ -39,7 +39,7 @@
{
return z_impl_zephyr_fputc(c, stream);
}
-#include <syscalls/zephyr_fputc_mrsh.c>
+#include <zephyr/syscalls/zephyr_fputc_mrsh.c>
#endif
static int picolibc_put(char a, FILE *f)
diff --git a/lib/os/mutex.c b/lib/os/mutex.c
index e1c6d7f..9bfcf63 100644
--- a/lib/os/mutex.c
+++ b/lib/os/mutex.c
@@ -50,7 +50,7 @@
return z_impl_z_sys_mutex_kernel_lock(mutex, timeout);
}
-#include <syscalls/z_sys_mutex_kernel_lock_mrsh.c>
+#include <zephyr/syscalls/z_sys_mutex_kernel_lock_mrsh.c>
int z_impl_z_sys_mutex_kernel_unlock(struct sys_mutex *mutex)
{
@@ -71,4 +71,4 @@
return z_impl_z_sys_mutex_kernel_unlock(mutex);
}
-#include <syscalls/z_sys_mutex_kernel_unlock_mrsh.c>
+#include <zephyr/syscalls/z_sys_mutex_kernel_unlock_mrsh.c>
diff --git a/lib/os/printk.c b/lib/os/printk.c
index 71a0d6a..cb4073f 100644
--- a/lib/os/printk.c
+++ b/lib/os/printk.c
@@ -178,7 +178,7 @@
K_OOPS(K_SYSCALL_MEMORY_READ(c, n));
z_impl_k_str_out((char *)c, n);
}
-#include <syscalls/k_str_out_mrsh.c>
+#include <zephyr/syscalls/k_str_out_mrsh.c>
#endif /* CONFIG_USERSPACE */
/**
diff --git a/lib/posix/options/clock.c b/lib/posix/options/clock.c
index 48789ae..68692b5 100644
--- a/lib/posix/options/clock.c
+++ b/lib/posix/options/clock.c
@@ -57,7 +57,7 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(ts, sizeof(*ts)));
return z_impl___posix_clock_get_base(clock_id, ts);
}
-#include <syscalls/__posix_clock_get_base_mrsh.c>
+#include <zephyr/syscalls/__posix_clock_get_base_mrsh.c>
#endif
int clock_gettime(clockid_t clock_id, struct timespec *ts)
diff --git a/lib/posix/options/posix_clock.h b/lib/posix/options/posix_clock.h
index a665f4c..f505dbc 100644
--- a/lib/posix/options/posix_clock.h
+++ b/lib/posix/options/posix_clock.h
@@ -14,6 +14,6 @@
__syscall int __posix_clock_get_base(clockid_t clock_id, struct timespec *ts);
-#include <syscalls/posix_clock.h>
+#include <zephyr/syscalls/posix_clock.h>
#endif
diff --git a/lib/posix/options/uname.c b/lib/posix/options/uname.c
index eb1d9a3..decba8d 100644
--- a/lib/posix/options/uname.c
+++ b/lib/posix/options/uname.c
@@ -4,11 +4,11 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#include "version.h"
#include <string.h>
#include <zephyr/kernel.h>
#include <zephyr/net/hostname.h>
#include <zephyr/posix/sys/utsname.h>
+#include <zephyr/version.h>
#ifdef CONFIG_NET_HOSTNAME_ENABLE
#define UTSNAME_NODENAME CONFIG_NET_HOSTNAME
diff --git a/samples/posix/env/src/main.c b/samples/posix/env/src/main.c
index 9385abc..9ae50c3 100644
--- a/samples/posix/env/src/main.c
+++ b/samples/posix/env/src/main.c
@@ -4,8 +4,6 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#include "version.h"
-
#include <pthread.h>
#include <stdbool.h>
#include <stdio.h>
@@ -15,6 +13,7 @@
#include <zephyr/sys/util.h>
#include <zephyr/kernel.h>
+#include <zephyr/version.h>
#ifdef BUILD_VERSION
#define VERSION_BUILD STRINGIFY(BUILD_VERSION)
diff --git a/samples/subsys/llext/edk/app/include/app_api.h b/samples/subsys/llext/edk/app/include/app_api.h
index bc6cb49..73d8fe3 100644
--- a/samples/subsys/llext/edk/app/include/app_api.h
+++ b/samples/subsys/llext/edk/app/include/app_api.h
@@ -34,5 +34,5 @@
}
#endif
-#include <syscalls/app_api.h>
+#include <zephyr/syscalls/app_api.h>
#endif /* _TEST_EDK_H_ */
diff --git a/samples/subsys/llext/edk/app/src/pubsub.c b/samples/subsys/llext/edk/app/src/pubsub.c
index fa7641b..79719af 100644
--- a/samples/subsys/llext/edk/app/src/pubsub.c
+++ b/samples/subsys/llext/edk/app/src/pubsub.c
@@ -151,7 +151,7 @@
return ret;
}
-#include <syscalls/publish_mrsh.c>
+#include <zephyr/syscalls/publish_mrsh.c>
#endif
int z_impl_receive(enum Channels channel, void *data, size_t data_len)
@@ -182,7 +182,7 @@
return z_impl_receive(channel, data, data_len);
}
-#include <syscalls/receive_mrsh.c>
+#include <zephyr/syscalls/receive_mrsh.c>
#endif
int z_impl_register_subscriber(enum Channels channel, struct k_event *evt)
@@ -218,5 +218,5 @@
return z_impl_register_subscriber(channel, evt);
}
-#include <syscalls/register_subscriber_mrsh.c>
+#include <zephyr/syscalls/register_subscriber_mrsh.c>
#endif
diff --git a/samples/subsys/shell/shell_module/src/main.c b/samples/subsys/shell/shell_module/src/main.c
index a3248cc..c7519c7 100644
--- a/samples/subsys/shell/shell_module/src/main.c
+++ b/samples/subsys/shell/shell_module/src/main.c
@@ -6,7 +6,7 @@
#include <zephyr/kernel.h>
#include <zephyr/shell/shell.h>
-#include <version.h>
+#include <zephyr/version.h>
#include <zephyr/logging/log.h>
#include <stdlib.h>
#include <zephyr/drivers/uart.h>
diff --git a/samples/userspace/prod_consumer/src/app_syscall.c b/samples/userspace/prod_consumer/src/app_syscall.c
index c1b630b..2809026 100644
--- a/samples/userspace/prod_consumer/src/app_syscall.c
+++ b/samples/userspace/prod_consumer/src/app_syscall.c
@@ -54,4 +54,4 @@
return ret;
}
-#include <syscalls/magic_syscall_mrsh.c>
+#include <zephyr/syscalls/magic_syscall_mrsh.c>
diff --git a/samples/userspace/prod_consumer/src/app_syscall.h b/samples/userspace/prod_consumer/src/app_syscall.h
index 7a6d1ff..cda913a 100644
--- a/samples/userspace/prod_consumer/src/app_syscall.h
+++ b/samples/userspace/prod_consumer/src/app_syscall.h
@@ -8,6 +8,6 @@
__syscall int magic_syscall(unsigned int *cookie);
-#include <syscalls/app_syscall.h>
+#include <zephyr/syscalls/app_syscall.h>
#endif /* MAGIC_SYSCALL_H */
diff --git a/samples/userspace/prod_consumer/src/sample_driver.h b/samples/userspace/prod_consumer/src/sample_driver.h
index 0f5eaec..8832931 100644
--- a/samples/userspace/prod_consumer/src/sample_driver.h
+++ b/samples/userspace/prod_consumer/src/sample_driver.h
@@ -86,6 +86,6 @@
return api->set_callback(dev, cb, context);
}
-#include <syscalls/sample_driver.h>
+#include <zephyr/syscalls/sample_driver.h>
#endif
diff --git a/samples/userspace/prod_consumer/src/sample_driver_handlers.c b/samples/userspace/prod_consumer/src/sample_driver_handlers.c
index 89a4ff1..333204e 100644
--- a/samples/userspace/prod_consumer/src/sample_driver_handlers.c
+++ b/samples/userspace/prod_consumer/src/sample_driver_handlers.c
@@ -17,7 +17,7 @@
return z_impl_sample_driver_state_set(dev, active);
}
-#include <syscalls/sample_driver_state_set_mrsh.c>
+#include <zephyr/syscalls/sample_driver_state_set_mrsh.c>
int z_vrfy_sample_driver_write(const struct device *dev, void *buf)
{
@@ -31,4 +31,4 @@
return z_impl_sample_driver_write(dev, buf);
}
-#include <syscalls/sample_driver_write_mrsh.c>
+#include <zephyr/syscalls/sample_driver_write_mrsh.c>
diff --git a/scripts/build/gen_syscalls.py b/scripts/build/gen_syscalls.py
index b6e332d..84f6b54 100755
--- a/scripts/build/gen_syscalls.py
+++ b/scripts/build/gen_syscalls.py
@@ -91,7 +91,7 @@
#include <stdarg.h>
-#include <syscall_list.h>
+#include <zephyr/syscall_list.h>
#include <zephyr/syscall.h>
#include <zephyr/linker/sections.h>
@@ -476,7 +476,7 @@
if mrsh and to_emit:
syscall = typename_split(match_group[0])[1]
mrsh_defs[syscall] = mrsh
- mrsh_includes[syscall] = "#include <syscalls/%s>" % fn
+ mrsh_includes[syscall] = "#include <zephyr/syscalls/%s>" % fn
with open(args.syscall_dispatch, "w") as fp:
table_entries.append("[K_SYSCALL_BAD] = handler_bad_syscall")
diff --git a/soc/andestech/ae350/soc_irq.S b/soc/andestech/ae350/soc_irq.S
index f057cd8..d5e28d3 100644
--- a/soc/andestech/ae350/soc_irq.S
+++ b/soc/andestech/ae350/soc_irq.S
@@ -6,7 +6,7 @@
#include "soc_v5.h"
-#include <offsets.h>
+#include <zephyr/offsets.h>
#include <zephyr/toolchain.h>
#ifdef CONFIG_RISCV_SOC_CONTEXT_SAVE
diff --git a/soc/common/riscv-privileged/soc_irq.S b/soc/common/riscv-privileged/soc_irq.S
index acf7e72..21d6bd5 100644
--- a/soc/common/riscv-privileged/soc_irq.S
+++ b/soc/common/riscv-privileged/soc_irq.S
@@ -9,7 +9,7 @@
* privileged architecture specification
*/
#include <zephyr/kernel_structs.h>
-#include <offsets.h>
+#include <zephyr/offsets.h>
#include <zephyr/toolchain.h>
#include <zephyr/linker/sections.h>
#include <zephyr/arch/riscv/irq.h>
diff --git a/soc/espressif/esp32/gdbstub.c b/soc/espressif/esp32/gdbstub.c
index c8913b7..835c2ff 100644
--- a/soc/espressif/esp32/gdbstub.c
+++ b/soc/espressif/esp32/gdbstub.c
@@ -7,7 +7,7 @@
#include <zephyr/kernel.h>
#include <xtensa_asm2_context.h>
#include <zephyr/debug/gdbstub.h>
-#include <offsets.h>
+#include <zephyr/offsets.h>
/*
* Address Mappings From ESP32 Technical Reference Manual Version 4.5
diff --git a/soc/espressif/esp32c3/soc_irq.S b/soc/espressif/esp32c3/soc_irq.S
index 6ce11ae..0a9e917 100644
--- a/soc/espressif/esp32c3/soc_irq.S
+++ b/soc/espressif/esp32c3/soc_irq.S
@@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#include <offsets.h>
+#include <zephyr/offsets.h>
#include <zephyr/toolchain.h>
/* Exports */
diff --git a/soc/intel/intel_adsp/common/multiprocessing.c b/soc/intel/intel_adsp/common/multiprocessing.c
index dfd7bd2..3797e28 100644
--- a/soc/intel/intel_adsp/common/multiprocessing.c
+++ b/soc/intel/intel_adsp/common/multiprocessing.c
@@ -17,7 +17,7 @@
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(soc_mp, CONFIG_SOC_LOG_LEVEL);
-#include <zsr.h>
+#include <zephyr/zsr.h>
#include <cavs-idc.h>
#include <soc.h>
#include <zephyr/cache.h>
diff --git a/soc/ite/ec/common/soc_irq.S b/soc/ite/ec/common/soc_irq.S
index ceb0f3a..c0f7810 100644
--- a/soc/ite/ec/common/soc_irq.S
+++ b/soc/ite/ec/common/soc_irq.S
@@ -9,7 +9,7 @@
* privileged architecture specification
*/
#include <zephyr/kernel_structs.h>
-#include <offsets.h>
+#include <zephyr/offsets.h>
#include <zephyr/toolchain.h>
#include <zephyr/linker/sections.h>
#include <soc.h>
diff --git a/soc/nordic/common/vpr/soc_context.S b/soc/nordic/common/vpr/soc_context.S
index 82c8ecf..19d041d 100644
--- a/soc/nordic/common/vpr/soc_context.S
+++ b/soc/nordic/common/vpr/soc_context.S
@@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#include <offsets.h>
+#include <zephyr/offsets.h>
#include <zephyr/toolchain.h>
GTEXT(__soc_save_context)
diff --git a/soc/openisa/rv32m1/soc_irq.S b/soc/openisa/rv32m1/soc_irq.S
index d3059d2..8333faa 100644
--- a/soc/openisa/rv32m1/soc_irq.S
+++ b/soc/openisa/rv32m1/soc_irq.S
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#include <offsets.h>
+#include <zephyr/offsets.h>
#include <zephyr/toolchain.h>
#include <soc.h>
diff --git a/soc/telink/tlsr/tlsr951x/soc_irq.S b/soc/telink/tlsr/tlsr951x/soc_irq.S
index ea43de3..76b3ac5 100644
--- a/soc/telink/tlsr/tlsr951x/soc_irq.S
+++ b/soc/telink/tlsr/tlsr951x/soc_irq.S
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#include <offsets.h>
+#include <zephyr/offsets.h>
#include <zephyr/toolchain.h>
#include <soc.h>
diff --git a/subsys/bindesc/bindesc_version.c b/subsys/bindesc/bindesc_version.c
index d1c3a90..76111ca 100644
--- a/subsys/bindesc/bindesc_version.c
+++ b/subsys/bindesc/bindesc_version.c
@@ -6,7 +6,7 @@
#include <zephyr/kernel.h>
#include <zephyr/bindesc.h>
-#include <version.h>
+#include <zephyr/version.h>
#if IS_ENABLED(CONFIG_BINDESC_KERNEL_VERSION_STRING)
BINDESC_STR_DEFINE(kernel_version_string, BINDESC_ID_KERNEL_VERSION_STRING,
@@ -34,7 +34,7 @@
#endif /* IS_ENABLED(CONFIG_BINDESC_KERNEL_VERSION_NUMBER) */
#if IS_ENABLED(HAS_APP_VERSION)
-#include <app_version.h>
+#include <zephyr/app_version.h>
#if IS_ENABLED(CONFIG_BINDESC_APP_VERSION_STRING)
BINDESC_STR_DEFINE(app_version_string, BINDESC_ID_APP_VERSION_STRING,
diff --git a/subsys/bluetooth/controller/hci/hci.c b/subsys/bluetooth/controller/hci/hci.c
index 247a509..0edc103 100644
--- a/subsys/bluetooth/controller/hci/hci.c
+++ b/subsys/bluetooth/controller/hci/hci.c
@@ -8,7 +8,7 @@
#include <stddef.h>
#include <string.h>
-#include <version.h>
+#include <zephyr/version.h>
#include <errno.h>
#include <zephyr/sys/util.h>
diff --git a/subsys/logging/log_core.c b/subsys/logging/log_core.c
index 3e76709..68e0854 100644
--- a/subsys/logging/log_core.c
+++ b/subsys/logging/log_core.c
@@ -458,7 +458,7 @@
{
z_impl_log_panic();
}
-#include <syscalls/log_panic_mrsh.c>
+#include <zephyr/syscalls/log_panic_mrsh.c>
#endif
static bool msg_filter_check(struct log_backend const *backend,
@@ -594,7 +594,7 @@
{
return z_impl_log_process();
}
-#include <syscalls/log_process_mrsh.c>
+#include <zephyr/syscalls/log_process_mrsh.c>
#endif
uint32_t z_impl_log_buffered_cnt(void)
@@ -607,7 +607,7 @@
{
return z_impl_log_buffered_cnt();
}
-#include <syscalls/log_buffered_cnt_mrsh.c>
+#include <zephyr/syscalls/log_buffered_cnt_mrsh.c>
#endif
void z_log_dropped(bool buffered)
diff --git a/subsys/logging/log_mgmt.c b/subsys/logging/log_mgmt.c
index ec64413..dbde3d2 100644
--- a/subsys/logging/log_mgmt.c
+++ b/subsys/logging/log_mgmt.c
@@ -498,7 +498,7 @@
return z_impl_log_filter_set(NULL, domain_id, src_id, level);
}
-#include <syscalls/log_filter_set_mrsh.c>
+#include <zephyr/syscalls/log_filter_set_mrsh.c>
#endif
static void link_filter_set(const struct log_link *link,
diff --git a/subsys/logging/log_msg.c b/subsys/logging/log_msg.c
index 11a8a97..0d40c5b 100644
--- a/subsys/logging/log_msg.c
+++ b/subsys/logging/log_msg.c
@@ -337,7 +337,7 @@
{
return z_impl_z_log_msg_static_create(source, desc, package, data);
}
-#include <syscalls/z_log_msg_static_create_mrsh.c>
+#include <zephyr/syscalls/z_log_msg_static_create_mrsh.c>
#endif
void z_log_msg_runtime_vcreate(uint8_t domain_id, const void *source,
diff --git a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
index 9fc02f8..e46c6aa 100644
--- a/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
+++ b/subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
@@ -40,7 +40,7 @@
#if defined(CONFIG_MCUMGR_GRP_OS_INFO) || defined(CONFIG_MCUMGR_GRP_OS_BOOTLOADER_INFO)
#include <stdio.h>
-#include <version.h>
+#include <zephyr/version.h>
#if defined(CONFIG_MCUMGR_GRP_OS_INFO)
#include <os_mgmt_processor.h>
#endif
diff --git a/subsys/mgmt/mcumgr/transport/src/smp_shell.c b/subsys/mgmt/mcumgr/transport/src/smp_shell.c
index 0660235..669f463 100644
--- a/subsys/mgmt/mcumgr/transport/src/smp_shell.c
+++ b/subsys/mgmt/mcumgr/transport/src/smp_shell.c
@@ -19,7 +19,7 @@
#include <zephyr/mgmt/mcumgr/transport/smp.h>
#include <zephyr/mgmt/mcumgr/transport/serial.h>
#include <zephyr/mgmt/mcumgr/transport/smp_shell.h>
-#include <syscalls/uart.h>
+#include <zephyr/syscalls/uart.h>
#include <string.h>
#include <mgmt/mcumgr/transport/smp_internal.h>
diff --git a/subsys/mgmt/updatehub/updatehub_handlers.c b/subsys/mgmt/updatehub/updatehub_handlers.c
index 4d88973..498b0b5 100644
--- a/subsys/mgmt/updatehub/updatehub_handlers.c
+++ b/subsys/mgmt/updatehub/updatehub_handlers.c
@@ -12,28 +12,28 @@
{
z_impl_updatehub_autohandler();
}
-#include <syscalls/updatehub_autohandler_mrsh.c>
+#include <zephyr/syscalls/updatehub_autohandler_mrsh.c>
static inline enum updatehub_response z_vrfy_updatehub_probe(void)
{
return z_impl_updatehub_probe();
}
-#include <syscalls/updatehub_probe_mrsh.c>
+#include <zephyr/syscalls/updatehub_probe_mrsh.c>
static inline enum updatehub_response z_vrfy_updatehub_update(void)
{
return z_impl_updatehub_update();
}
-#include <syscalls/updatehub_update_mrsh.c>
+#include <zephyr/syscalls/updatehub_update_mrsh.c>
static inline int z_vrfy_updatehub_confirm(void)
{
return z_impl_updatehub_confirm();
}
-#include <syscalls/updatehub_confirm_mrsh.c>
+#include <zephyr/syscalls/updatehub_confirm_mrsh.c>
static inline int z_vrfy_updatehub_reboot(void)
{
return z_impl_updatehub_reboot();
}
-#include <syscalls/updatehub_reboot_mrsh.c>
+#include <zephyr/syscalls/updatehub_reboot_mrsh.c>
diff --git a/subsys/net/ip/net_if.c b/subsys/net/ip/net_if.c
index dc115aa..e190366 100644
--- a/subsys/net/ip/net_if.c
+++ b/subsys/net/ip/net_if.c
@@ -166,7 +166,7 @@
return iface;
}
-#include <syscalls/net_if_get_by_index_mrsh.c>
+#include <zephyr/syscalls/net_if_get_by_index_mrsh.c>
#endif
static inline void net_context_send_cb(struct net_context *context,
@@ -1646,7 +1646,7 @@
return z_impl_net_if_ipv6_addr_lookup_by_index(&addr_v6);
}
-#include <syscalls/net_if_ipv6_addr_lookup_by_index_mrsh.c>
+#include <zephyr/syscalls/net_if_ipv6_addr_lookup_by_index_mrsh.c>
#endif
/* To be called when interface comes up so that all the non-joined multicast
@@ -2007,7 +2007,7 @@
vlifetime);
}
-#include <syscalls/net_if_ipv6_addr_add_by_index_mrsh.c>
+#include <zephyr/syscalls/net_if_ipv6_addr_add_by_index_mrsh.c>
#endif /* CONFIG_USERSPACE */
bool z_impl_net_if_ipv6_addr_rm_by_index(int index,
@@ -2040,7 +2040,7 @@
return z_impl_net_if_ipv6_addr_rm_by_index(index, &addr_v6);
}
-#include <syscalls/net_if_ipv6_addr_rm_by_index_mrsh.c>
+#include <zephyr/syscalls/net_if_ipv6_addr_rm_by_index_mrsh.c>
#endif /* CONFIG_USERSPACE */
void net_if_ipv6_addr_foreach(struct net_if *iface, net_if_ip_addr_cb_t cb,
@@ -3844,7 +3844,7 @@
return z_impl_net_if_ipv4_addr_lookup_by_index(&addr_v4);
}
-#include <syscalls/net_if_ipv4_addr_lookup_by_index_mrsh.c>
+#include <zephyr/syscalls/net_if_ipv4_addr_lookup_by_index_mrsh.c>
#endif
struct in_addr net_if_ipv4_get_netmask_by_addr(struct net_if *iface,
@@ -4056,7 +4056,7 @@
return z_impl_net_if_ipv4_set_netmask_by_index(index, &netmask_addr);
}
-#include <syscalls/net_if_ipv4_set_netmask_by_index_mrsh.c>
+#include <zephyr/syscalls/net_if_ipv4_set_netmask_by_index_mrsh.c>
bool z_vrfy_net_if_ipv4_set_netmask_by_addr_by_index(int index,
const struct in_addr *addr,
@@ -4080,7 +4080,7 @@
&netmask_addr);
}
-#include <syscalls/net_if_ipv4_set_netmask_by_addr_by_index_mrsh.c>
+#include <zephyr/syscalls/net_if_ipv4_set_netmask_by_addr_by_index_mrsh.c>
#endif /* CONFIG_USERSPACE */
void net_if_ipv4_set_gw(struct net_if *iface, const struct in_addr *gw)
@@ -4132,7 +4132,7 @@
return z_impl_net_if_ipv4_set_gw_by_index(index, &gw_addr);
}
-#include <syscalls/net_if_ipv4_set_gw_by_index_mrsh.c>
+#include <zephyr/syscalls/net_if_ipv4_set_gw_by_index_mrsh.c>
#endif /* CONFIG_USERSPACE */
static struct net_if_addr *ipv4_addr_find(struct net_if *iface,
@@ -4295,7 +4295,7 @@
vlifetime);
}
-#include <syscalls/net_if_ipv4_addr_add_by_index_mrsh.c>
+#include <zephyr/syscalls/net_if_ipv4_addr_add_by_index_mrsh.c>
#endif /* CONFIG_USERSPACE */
bool z_impl_net_if_ipv4_addr_rm_by_index(int index,
@@ -4328,7 +4328,7 @@
return (uint32_t)z_impl_net_if_ipv4_addr_rm_by_index(index, &addr_v4);
}
-#include <syscalls/net_if_ipv4_addr_rm_by_index_mrsh.c>
+#include <zephyr/syscalls/net_if_ipv4_addr_rm_by_index_mrsh.c>
#endif /* CONFIG_USERSPACE */
void net_if_ipv4_addr_foreach(struct net_if *iface, net_if_ip_addr_cb_t cb,
diff --git a/subsys/net/ip/utils.c b/subsys/net/ip/utils.c
index 623bb2b..51048b0 100644
--- a/subsys/net/ip/utils.c
+++ b/subsys/net/ip/utils.c
@@ -340,7 +340,7 @@
return dst;
}
-#include <syscalls/net_addr_ntop_mrsh.c>
+#include <zephyr/syscalls/net_addr_ntop_mrsh.c>
#endif /* CONFIG_USERSPACE */
int z_impl_net_addr_pton(sa_family_t family, const char *src,
@@ -512,7 +512,7 @@
return 0;
}
-#include <syscalls/net_addr_pton_mrsh.c>
+#include <zephyr/syscalls/net_addr_pton_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/subsys/net/l2/ethernet/ethernet.c b/subsys/net/l2/ethernet/ethernet.c
index 1f448d4..7659185 100644
--- a/subsys/net/l2/ethernet/ethernet.c
+++ b/subsys/net/l2/ethernet/ethernet.c
@@ -869,7 +869,7 @@
{
return z_impl_net_eth_get_ptp_clock_by_index(index);
}
-#include <syscalls/net_eth_get_ptp_clock_by_index_mrsh.c>
+#include <zephyr/syscalls/net_eth_get_ptp_clock_by_index_mrsh.c>
#endif /* CONFIG_USERSPACE */
#else /* CONFIG_PTP_CLOCK */
const struct device *z_impl_net_eth_get_ptp_clock_by_index(int index)
diff --git a/subsys/net/l2/openthread/openthread.c b/subsys/net/l2/openthread/openthread.c
index d820e08..2ba600f 100644
--- a/subsys/net/l2/openthread/openthread.c
+++ b/subsys/net/l2/openthread/openthread.c
@@ -19,7 +19,7 @@
#include <zephyr/sys/slist.h>
#include <zephyr/sys/util.h>
#include <zephyr/sys/__assert.h>
-#include <version.h>
+#include <zephyr/version.h>
#include <openthread/cli.h>
#include <openthread/ip6.h>
diff --git a/subsys/net/lib/sockets/getaddrinfo.c b/subsys/net/lib/sockets/getaddrinfo.c
index 70e3200..b0c01ab 100644
--- a/subsys/net/lib/sockets/getaddrinfo.c
+++ b/subsys/net/lib/sockets/getaddrinfo.c
@@ -346,7 +346,7 @@
return ret;
}
-#include <syscalls/z_zsock_getaddrinfo_internal_mrsh.c>
+#include <zephyr/syscalls/z_zsock_getaddrinfo_internal_mrsh.c>
#endif /* CONFIG_USERSPACE */
#endif /* defined(CONFIG_DNS_RESOLVER) */
diff --git a/subsys/net/lib/sockets/socketpair.c b/subsys/net/lib/sockets/socketpair.c
index 417a3b3..f02b91df 100644
--- a/subsys/net/lib/sockets/socketpair.c
+++ b/subsys/net/lib/sockets/socketpair.c
@@ -357,7 +357,7 @@
return ret;
}
-#include <syscalls/zsock_socketpair_mrsh.c>
+#include <zephyr/syscalls/zsock_socketpair_mrsh.c>
#endif /* CONFIG_USERSPACE */
/**
diff --git a/subsys/net/lib/sockets/sockets.c b/subsys/net/lib/sockets/sockets.c
index e75c0b0..454cd00 100644
--- a/subsys/net/lib/sockets/sockets.c
+++ b/subsys/net/lib/sockets/sockets.c
@@ -110,7 +110,7 @@
return z_impl_zsock_get_context_object(sock);
}
-#include <syscalls/zsock_get_context_object_mrsh.c>
+#include <zephyr/syscalls/zsock_get_context_object_mrsh.c>
#endif
static void zsock_received_cb(struct net_context *ctx,
@@ -249,7 +249,7 @@
*/
return z_impl_zsock_socket(family, type, proto);
}
-#include <syscalls/zsock_socket_mrsh.c>
+#include <zephyr/syscalls/zsock_socket_mrsh.c>
#endif /* CONFIG_USERSPACE */
int zsock_close_ctx(struct net_context *ctx)
@@ -308,7 +308,7 @@
{
return z_impl_zsock_close(sock);
}
-#include <syscalls/zsock_close_mrsh.c>
+#include <zephyr/syscalls/zsock_close_mrsh.c>
#endif /* CONFIG_USERSPACE */
int z_impl_zsock_shutdown(int sock, int how)
@@ -345,7 +345,7 @@
{
return z_impl_zsock_shutdown(sock, how);
}
-#include <syscalls/zsock_shutdown_mrsh.c>
+#include <zephyr/syscalls/zsock_shutdown_mrsh.c>
#endif /* CONFIG_USERSPACE */
static void zsock_accepted_cb(struct net_context *new_ctx,
@@ -487,7 +487,7 @@
return z_impl_zsock_bind(sock, (struct sockaddr *)&dest_addr_copy,
addrlen);
}
-#include <syscalls/zsock_bind_mrsh.c>
+#include <zephyr/syscalls/zsock_bind_mrsh.c>
#endif /* CONFIG_USERSPACE */
static void zsock_connected_cb(struct net_context *ctx, int status, void *user_data)
@@ -566,7 +566,7 @@
return z_impl_zsock_connect(sock, (struct sockaddr *)&dest_addr_copy,
addrlen);
}
-#include <syscalls/zsock_connect_mrsh.c>
+#include <zephyr/syscalls/zsock_connect_mrsh.c>
#endif /* CONFIG_USERSPACE */
int zsock_listen_ctx(struct net_context *ctx, int backlog)
@@ -587,7 +587,7 @@
{
return z_impl_zsock_listen(sock, backlog);
}
-#include <syscalls/zsock_listen_mrsh.c>
+#include <zephyr/syscalls/zsock_listen_mrsh.c>
#endif /* CONFIG_USERSPACE */
int zsock_accept_ctx(struct net_context *parent, struct sockaddr *addr,
@@ -704,7 +704,7 @@
return ret;
}
-#include <syscalls/zsock_accept_mrsh.c>
+#include <zephyr/syscalls/zsock_accept_mrsh.c>
#endif /* CONFIG_USERSPACE */
#define WAIT_BUFS_INITIAL_MS 10
@@ -872,7 +872,7 @@
dest_addr ? (struct sockaddr *)&dest_addr_copy : NULL,
addrlen);
}
-#include <syscalls/zsock_sendto_mrsh.c>
+#include <zephyr/syscalls/zsock_sendto_mrsh.c>
#endif /* CONFIG_USERSPACE */
size_t msghdr_non_empty_iov_count(const struct msghdr *msg)
@@ -1024,7 +1024,7 @@
return -1;
}
-#include <syscalls/zsock_sendmsg_mrsh.c>
+#include <zephyr/syscalls/zsock_sendmsg_mrsh.c>
#endif /* CONFIG_USERSPACE */
static int sock_get_pkt_src_addr(struct net_pkt *pkt,
@@ -1802,7 +1802,7 @@
return ret;
}
-#include <syscalls/zsock_recvfrom_mrsh.c>
+#include <zephyr/syscalls/zsock_recvfrom_mrsh.c>
#endif /* CONFIG_USERSPACE */
ssize_t zsock_recvmsg_ctx(struct net_context *ctx, struct msghdr *msg,
@@ -2017,7 +2017,7 @@
return -1;
}
-#include <syscalls/zsock_recvmsg_mrsh.c>
+#include <zephyr/syscalls/zsock_recvmsg_mrsh.c>
#endif /* CONFIG_USERSPACE */
/* As this is limited function, we don't follow POSIX signature, with
@@ -2051,7 +2051,7 @@
{
return z_impl_zsock_fcntl_impl(sock, cmd, flags);
}
-#include <syscalls/zsock_fcntl_impl_mrsh.c>
+#include <zephyr/syscalls/zsock_fcntl_impl_mrsh.c>
#endif
int z_impl_zsock_ioctl_impl(int sock, unsigned long request, va_list args)
@@ -2102,7 +2102,7 @@
return z_impl_zsock_ioctl_impl(sock, request, args);
}
-#include <syscalls/zsock_ioctl_impl_mrsh.c>
+#include <zephyr/syscalls/zsock_ioctl_impl_mrsh.c>
#endif
static int zsock_poll_prepare_ctx(struct net_context *ctx,
@@ -2402,7 +2402,7 @@
return ret;
}
-#include <syscalls/zsock_poll_mrsh.c>
+#include <zephyr/syscalls/zsock_poll_mrsh.c>
#endif
int z_impl_zsock_inet_pton(sa_family_t family, const char *src, void *dst)
@@ -2441,7 +2441,7 @@
return ret;
}
-#include <syscalls/zsock_inet_pton_mrsh.c>
+#include <zephyr/syscalls/zsock_inet_pton_mrsh.c>
#endif
static enum tcp_conn_option get_tcp_option(int optname)
@@ -2788,7 +2788,7 @@
return ret;
}
-#include <syscalls/zsock_getsockopt_mrsh.c>
+#include <zephyr/syscalls/zsock_getsockopt_mrsh.c>
#endif /* CONFIG_USERSPACE */
static int ipv4_multicast_group(struct net_context *ctx, const void *optval,
@@ -3393,7 +3393,7 @@
return ret;
}
-#include <syscalls/zsock_setsockopt_mrsh.c>
+#include <zephyr/syscalls/zsock_setsockopt_mrsh.c>
#endif /* CONFIG_USERSPACE */
int zsock_getpeername_ctx(struct net_context *ctx, struct sockaddr *addr,
@@ -3477,7 +3477,7 @@
return ret;
}
-#include <syscalls/zsock_getpeername_mrsh.c>
+#include <zephyr/syscalls/zsock_getpeername_mrsh.c>
#endif /* CONFIG_USERSPACE */
int zsock_getsockname_ctx(struct net_context *ctx, struct sockaddr *addr,
@@ -3563,7 +3563,7 @@
return ret;
}
-#include <syscalls/zsock_getsockname_mrsh.c>
+#include <zephyr/syscalls/zsock_getsockname_mrsh.c>
#endif /* CONFIG_USERSPACE */
static ssize_t sock_read_vmeth(void *obj, void *buffer, size_t count)
diff --git a/subsys/net/lib/sockets/sockets_misc.c b/subsys/net/lib/sockets/sockets_misc.c
index f16bfc8..19e8155 100644
--- a/subsys/net/lib/sockets/sockets_misc.c
+++ b/subsys/net/lib/sockets/sockets_misc.c
@@ -24,5 +24,5 @@
K_OOPS(K_SYSCALL_MEMORY_WRITE(buf, len));
return z_impl_zsock_gethostname(buf, len);
}
-#include <syscalls/zsock_gethostname_mrsh.c>
+#include <zephyr/syscalls/zsock_gethostname_mrsh.c>
#endif
diff --git a/subsys/net/lib/sockets/sockets_select.c b/subsys/net/lib/sockets/sockets_select.c
index af88e51..49d61a2 100644
--- a/subsys/net/lib/sockets/sockets_select.c
+++ b/subsys/net/lib/sockets/sockets_select.c
@@ -284,5 +284,5 @@
return ret;
}
-#include <syscalls/zsock_select_mrsh.c>
+#include <zephyr/syscalls/zsock_select_mrsh.c>
#endif
diff --git a/subsys/random/random_handlers.c b/subsys/random/random_handlers.c
index 77bf068..dc5fba5 100644
--- a/subsys/random/random_handlers.c
+++ b/subsys/random/random_handlers.c
@@ -13,7 +13,7 @@
z_impl_sys_rand_get(dst, len);
}
-#include <syscalls/sys_rand_get_mrsh.c>
+#include <zephyr/syscalls/sys_rand_get_mrsh.c>
#ifdef CONFIG_CSPRNG_ENABLED
static inline int z_vrfy_sys_csrand_get(void *dst, size_t len)
@@ -22,5 +22,5 @@
return z_impl_sys_csrand_get(dst, len);
}
-#include <syscalls/sys_csrand_get_mrsh.c>
+#include <zephyr/syscalls/sys_csrand_get_mrsh.c>
#endif
diff --git a/subsys/rtio/rtio_handlers.c b/subsys/rtio/rtio_handlers.c
index 3930d5b..d3f3824 100644
--- a/subsys/rtio/rtio_handlers.c
+++ b/subsys/rtio/rtio_handlers.c
@@ -57,7 +57,7 @@
K_OOPS(K_SYSCALL_OBJ(r, K_OBJ_RTIO));
z_impl_rtio_release_buffer(r, buff, buff_len);
}
-#include <syscalls/rtio_release_buffer_mrsh.c>
+#include <zephyr/syscalls/rtio_release_buffer_mrsh.c>
static inline int z_vrfy_rtio_cqe_get_mempool_buffer(const struct rtio *r, struct rtio_cqe *cqe,
uint8_t **buff, uint32_t *buff_len)
@@ -68,13 +68,13 @@
K_OOPS(K_SYSCALL_MEMORY_READ(buff_len, sizeof(uint32_t)));
return z_impl_rtio_cqe_get_mempool_buffer(r, cqe, buff, buff_len);
}
-#include <syscalls/rtio_cqe_get_mempool_buffer_mrsh.c>
+#include <zephyr/syscalls/rtio_cqe_get_mempool_buffer_mrsh.c>
static inline int z_vrfy_rtio_sqe_cancel(struct rtio_sqe *sqe)
{
return z_impl_rtio_sqe_cancel(sqe);
}
-#include <syscalls/rtio_sqe_cancel_mrsh.c>
+#include <zephyr/syscalls/rtio_sqe_cancel_mrsh.c>
static inline int z_vrfy_rtio_sqe_copy_in_get_handles(struct rtio *r, const struct rtio_sqe *sqes,
struct rtio_sqe **handle, size_t sqe_count)
@@ -107,7 +107,7 @@
/* Already copied *and* verified, no need to redo */
return z_impl_rtio_sqe_copy_in_get_handles(r, NULL, NULL, 0);
}
-#include <syscalls/rtio_sqe_copy_in_get_handles_mrsh.c>
+#include <zephyr/syscalls/rtio_sqe_copy_in_get_handles_mrsh.c>
static inline int z_vrfy_rtio_cqe_copy_out(struct rtio *r,
struct rtio_cqe *cqes,
@@ -120,7 +120,7 @@
return z_impl_rtio_cqe_copy_out(r, cqes, cqe_count, timeout);
}
-#include <syscalls/rtio_cqe_copy_out_mrsh.c>
+#include <zephyr/syscalls/rtio_cqe_copy_out_mrsh.c>
static inline int z_vrfy_rtio_submit(struct rtio *r, uint32_t wait_count)
{
@@ -132,4 +132,4 @@
return z_impl_rtio_submit(r, wait_count);
}
-#include <syscalls/rtio_submit_mrsh.c>
+#include <zephyr/syscalls/rtio_submit_mrsh.c>
diff --git a/subsys/shell/modules/kernel_service.c b/subsys/shell/modules/kernel_service.c
index 3d940ba..992a83f 100644
--- a/subsys/shell/modules/kernel_service.c
+++ b/subsys/shell/modules/kernel_service.c
@@ -5,7 +5,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#include <version.h>
+#include <zephyr/version.h>
#include <zephyr/sys/printk.h>
#include <zephyr/shell/shell.h>
diff --git a/subsys/testsuite/ztest/include/zephyr/ztest_error_hook.h b/subsys/testsuite/ztest/include/zephyr/ztest_error_hook.h
index 6ebee08..5d6ac64 100644
--- a/subsys/testsuite/ztest/include/zephyr/ztest_error_hook.h
+++ b/subsys/testsuite/ztest/include/zephyr/ztest_error_hook.h
@@ -76,7 +76,7 @@
#endif
#if defined(CONFIG_ZTEST_FATAL_HOOK) || defined(CONFIG_ZTEST_ASSERT_HOOK)
-#include <syscalls/ztest_error_hook.h>
+#include <zephyr/syscalls/ztest_error_hook.h>
#endif
#endif /* ZEPHYR_INCLUDE_ZTEST_FATAL_HOOK_H_ */
diff --git a/subsys/testsuite/ztest/include/zephyr/ztest_test.h b/subsys/testsuite/ztest/include/zephyr/ztest_test.h
index b6bec89..2924de9 100644
--- a/subsys/testsuite/ztest/include/zephyr/ztest_test.h
+++ b/subsys/testsuite/ztest/include/zephyr/ztest_test.h
@@ -577,7 +577,7 @@
#endif
#ifndef ZTEST_UNITTEST
-#include <syscalls/ztest_test.h>
+#include <zephyr/syscalls/ztest_test.h>
#endif
#endif /* ZEPHYR_TESTSUITE_ZTEST_TEST_H_ */
diff --git a/subsys/testsuite/ztest/src/ztest.c b/subsys/testsuite/ztest/src/ztest.c
index a3eba14..b9a6be2 100644
--- a/subsys/testsuite/ztest/src/ztest.c
+++ b/subsys/testsuite/ztest/src/ztest.c
@@ -289,10 +289,10 @@
#ifdef CONFIG_USERSPACE
void z_vrfy_z_test_1cpu_start(void) { z_impl_z_test_1cpu_start(); }
-#include <syscalls/z_test_1cpu_start_mrsh.c>
+#include <zephyr/syscalls/z_test_1cpu_start_mrsh.c>
void z_vrfy_z_test_1cpu_stop(void) { z_impl_z_test_1cpu_stop(); }
-#include <syscalls/z_test_1cpu_stop_mrsh.c>
+#include <zephyr/syscalls/z_test_1cpu_stop_mrsh.c>
#endif /* CONFIG_USERSPACE */
#endif
@@ -1135,13 +1135,13 @@
{
z_impl___ztest_set_test_result(new_result);
}
-#include <syscalls/__ztest_set_test_result_mrsh.c>
+#include <zephyr/syscalls/__ztest_set_test_result_mrsh.c>
void z_vrfy___ztest_set_test_phase(enum ztest_phase new_phase)
{
z_impl___ztest_set_test_phase(new_phase);
}
-#include <syscalls/__ztest_set_test_phase_mrsh.c>
+#include <zephyr/syscalls/__ztest_set_test_phase_mrsh.c>
#endif /* CONFIG_USERSPACE */
void ztest_verify_all_test_suites_ran(void)
diff --git a/subsys/testsuite/ztest/src/ztest_error_hook.c b/subsys/testsuite/ztest/src/ztest_error_hook.c
index 64dede7..6982e96 100644
--- a/subsys/testsuite/ztest/src/ztest_error_hook.c
+++ b/subsys/testsuite/ztest/src/ztest_error_hook.c
@@ -38,7 +38,7 @@
{
z_impl_ztest_set_fault_valid(valid);
}
-#include <syscalls/ztest_set_fault_valid_mrsh.c>
+#include <zephyr/syscalls/ztest_set_fault_valid_mrsh.c>
#endif
__weak void ztest_post_fatal_error_hook(unsigned int reason,
@@ -100,7 +100,7 @@
{
z_impl_ztest_set_assert_valid(valid);
}
-#include <syscalls/ztest_set_assert_valid_mrsh.c>
+#include <zephyr/syscalls/ztest_set_assert_valid_mrsh.c>
#endif
__weak void ztest_post_assert_fail_hook(void)
diff --git a/tests/arch/arm/arm_interrupt/src/arm_interrupt.c b/tests/arch/arm/arm_interrupt/src/arm_interrupt.c
index 1bbfe08..b569bbe 100644
--- a/tests/arch/arm/arm_interrupt/src/arm_interrupt.c
+++ b/tests/arch/arm/arm_interrupt/src/arm_interrupt.c
@@ -415,7 +415,7 @@
{
z_impl_test_arm_user_interrupt_syscall();
}
-#include <syscalls/test_arm_user_interrupt_syscall_mrsh.c>
+#include <zephyr/syscalls/test_arm_user_interrupt_syscall_mrsh.c>
ZTEST_USER(arm_interrupt, test_arm_user_interrupt)
{
diff --git a/tests/arch/arm/arm_interrupt/src/test_syscalls.h b/tests/arch/arm/arm_interrupt/src/test_syscalls.h
index 5d85f7d..1bef59e 100644
--- a/tests/arch/arm/arm_interrupt/src/test_syscalls.h
+++ b/tests/arch/arm/arm_interrupt/src/test_syscalls.h
@@ -10,6 +10,6 @@
__syscall void test_arm_user_interrupt_syscall(void);
-#include <syscalls/test_syscalls.h>
+#include <zephyr/syscalls/test_syscalls.h>
#endif /* _TEST_SYSCALLS_H_ */
diff --git a/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c b/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
index e32de6c..e1573bd 100644
--- a/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
+++ b/tests/arch/arm/arm_thread_swap/src/arm_syscalls.c
@@ -66,7 +66,7 @@
{
z_impl_test_arm_user_syscall();
}
-#include <syscalls/test_arm_user_syscall_mrsh.c>
+#include <zephyr/syscalls/test_arm_user_syscall_mrsh.c>
void arm_isr_handler(const void *args)
@@ -271,7 +271,7 @@
{
z_impl_test_arm_cpu_write_reg();
}
-#include <syscalls/test_arm_cpu_write_reg_mrsh.c>
+#include <zephyr/syscalls/test_arm_cpu_write_reg_mrsh.c>
/**
* @brief Test CPU scrubs registers after system call
diff --git a/tests/arch/arm/arm_thread_swap/src/test_syscalls.h b/tests/arch/arm/arm_thread_swap/src/test_syscalls.h
index 760ae3c..712db16 100644
--- a/tests/arch/arm/arm_thread_swap/src/test_syscalls.h
+++ b/tests/arch/arm/arm_thread_swap/src/test_syscalls.h
@@ -11,6 +11,6 @@
__syscall void test_arm_user_syscall(void);
__syscall void test_arm_cpu_write_reg(void);
-#include <syscalls/test_syscalls.h>
+#include <zephyr/syscalls/test_syscalls.h>
#endif /* _TEST_SYSCALLS_H_ */
diff --git a/tests/arch/x86/cpu_scrubs_regs/src/main.c b/tests/arch/x86/cpu_scrubs_regs/src/main.c
index 6c27f73..3f4ea3f 100644
--- a/tests/arch/x86/cpu_scrubs_regs/src/main.c
+++ b/tests/arch/x86/cpu_scrubs_regs/src/main.c
@@ -54,7 +54,7 @@
{
z_impl_test_cpu_write_reg();
}
-#include <syscalls/test_cpu_write_reg_mrsh.c>
+#include <zephyr/syscalls/test_cpu_write_reg_mrsh.c>
/**
* @brief Test CPU scrubs registers after system call
diff --git a/tests/arch/x86/cpu_scrubs_regs/src/test_syscalls.h b/tests/arch/x86/cpu_scrubs_regs/src/test_syscalls.h
index 105ded8..5b6817d 100644
--- a/tests/arch/x86/cpu_scrubs_regs/src/test_syscalls.h
+++ b/tests/arch/x86/cpu_scrubs_regs/src/test_syscalls.h
@@ -10,6 +10,6 @@
__syscall void test_cpu_write_reg(void);
-#include <syscalls/test_syscalls.h>
+#include <zephyr/syscalls/test_syscalls.h>
#endif /* _TEST_SYSCALLS_H_ */
diff --git a/tests/arch/x86/pagetables/src/main.c b/tests/arch/x86/pagetables/src/main.c
index aa3fde1..e42c4e3 100644
--- a/tests/arch/x86/pagetables/src/main.c
+++ b/tests/arch/x86/pagetables/src/main.c
@@ -238,7 +238,7 @@
{
z_impl_dump_my_ptables();
}
-#include <syscalls/dump_my_ptables_mrsh.c>
+#include <zephyr/syscalls/dump_my_ptables_mrsh.c>
#endif /* CONFIG_USERSPACE */
void dump_pagetables(void)
diff --git a/tests/arch/x86/pagetables/src/main.h b/tests/arch/x86/pagetables/src/main.h
index 2a7fa3f..7f7dd71 100644
--- a/tests/arch/x86/pagetables/src/main.h
+++ b/tests/arch/x86/pagetables/src/main.h
@@ -8,6 +8,6 @@
__syscall void dump_my_ptables(void);
-#include <syscalls/main.h>
+#include <zephyr/syscalls/main.h>
#endif
diff --git a/tests/benchmarks/app_kernel/src/master.c b/tests/benchmarks/app_kernel/src/master.c
index ba0cf53..541be64 100644
--- a/tests/benchmarks/app_kernel/src/master.c
+++ b/tests/benchmarks/app_kernel/src/master.c
@@ -95,7 +95,7 @@
return z_impl_timing_timestamp_get();
}
-#include <syscalls/timing_timestamp_get_mrsh.c>
+#include <zephyr/syscalls/timing_timestamp_get_mrsh.c>
#endif
/*
diff --git a/tests/benchmarks/app_kernel/src/master.h b/tests/benchmarks/app_kernel/src/master.h
index 9f9c902..952961f 100644
--- a/tests/benchmarks/app_kernel/src/master.h
+++ b/tests/benchmarks/app_kernel/src/master.h
@@ -126,6 +126,6 @@
__syscall void test_thread_priority_set(k_tid_t thread, int prio);
__syscall timing_t timing_timestamp_get(void);
-#include <syscalls/master.h>
+#include <zephyr/syscalls/master.h>
#endif /* _MASTER_H */
diff --git a/tests/benchmarks/footprints/src/userspace.c b/tests/benchmarks/footprints/src/userspace.c
index ef6a62c..7e94a31 100644
--- a/tests/benchmarks/footprints/src/userspace.c
+++ b/tests/benchmarks/footprints/src/userspace.c
@@ -32,7 +32,7 @@
{
return 0;
}
-#include <syscalls/dummy_syscall_mrsh.c>
+#include <zephyr/syscalls/dummy_syscall_mrsh.c>
int z_impl_validation_overhead_syscall(void)
{
@@ -47,7 +47,7 @@
return status_0 || status_1;
}
-#include <syscalls/validation_overhead_syscall_mrsh.c>
+#include <zephyr/syscalls/validation_overhead_syscall_mrsh.c>
void test_drop_to_user_mode_1(void *p1, void *p2, void *p3)
diff --git a/tests/benchmarks/footprints/src/userspace.h b/tests/benchmarks/footprints/src/userspace.h
index 5c682a3..d85da72 100644
--- a/tests/benchmarks/footprints/src/userspace.h
+++ b/tests/benchmarks/footprints/src/userspace.h
@@ -10,6 +10,6 @@
__syscall int dummy_syscall(void);
__syscall int validation_overhead_syscall(void);
-#include <syscalls/userspace.h>
+#include <zephyr/syscalls/userspace.h>
#endif /* _USERSPACE_H_ */
diff --git a/tests/benchmarks/latency_measure/src/timing_sc.c b/tests/benchmarks/latency_measure/src/timing_sc.c
index 9397a25..6b160e9 100644
--- a/tests/benchmarks/latency_measure/src/timing_sc.c
+++ b/tests/benchmarks/latency_measure/src/timing_sc.c
@@ -29,7 +29,7 @@
{
return z_impl_timing_timestamp_get();
}
-#include <syscalls/timing_timestamp_get_mrsh.c>
+#include <zephyr/syscalls/timing_timestamp_get_mrsh.c>
#endif
static void start_thread_entry(void *p1, void *p2, void *p3)
diff --git a/tests/benchmarks/latency_measure/src/timing_sc.h b/tests/benchmarks/latency_measure/src/timing_sc.h
index 265d71f..5d08fac 100644
--- a/tests/benchmarks/latency_measure/src/timing_sc.h
+++ b/tests/benchmarks/latency_measure/src/timing_sc.h
@@ -16,6 +16,6 @@
void timestamp_overhead_init(uint32_t num_iterations);
uint64_t timestamp_overhead_adjustment(uint32_t options1, uint32_t options2);
-#include <syscalls/timing_sc.h>
+#include <zephyr/syscalls/timing_sc.h>
#endif
diff --git a/tests/bluetooth/host/id/mocks/devicetree_generated.h b/tests/bluetooth/host/id/mocks/zephyr/devicetree_generated.h
similarity index 100%
rename from tests/bluetooth/host/id/mocks/devicetree_generated.h
rename to tests/bluetooth/host/id/mocks/zephyr/devicetree_generated.h
diff --git a/tests/bluetooth/host/id/mocks/syscalls/device.h b/tests/bluetooth/host/id/mocks/zephyr/syscalls/device.h
similarity index 100%
rename from tests/bluetooth/host/id/mocks/syscalls/device.h
rename to tests/bluetooth/host/id/mocks/zephyr/syscalls/device.h
diff --git a/tests/bluetooth/host/id/mocks/syscalls/mem_manage.h b/tests/bluetooth/host/id/mocks/zephyr/syscalls/mem_manage.h
similarity index 100%
rename from tests/bluetooth/host/id/mocks/syscalls/mem_manage.h
rename to tests/bluetooth/host/id/mocks/zephyr/syscalls/mem_manage.h
diff --git a/tests/boot/mcuboot_data_sharing/CMakeLists.txt b/tests/boot/mcuboot_data_sharing/CMakeLists.txt
index 6bdbb43..ca9f150 100644
--- a/tests/boot/mcuboot_data_sharing/CMakeLists.txt
+++ b/tests/boot/mcuboot_data_sharing/CMakeLists.txt
@@ -27,4 +27,8 @@
file(READ ${ZEPHYR_BASE}/version.h.in version_content)
string(CONFIGURE "${version_content}" version_content)
string(CONFIGURE "${version_content}" version_content)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/zephyr/include/generated/mcuboot_version.h "${version_content}")
+file(
+ WRITE
+ ${CMAKE_CURRENT_BINARY_DIR}/zephyr/include/generated/zephyr/mcuboot_version.h
+ "${version_content}"
+)
diff --git a/tests/boot/mcuboot_data_sharing/src/main.c b/tests/boot/mcuboot_data_sharing/src/main.c
index 1cf3954..f26da71 100644
--- a/tests/boot/mcuboot_data_sharing/src/main.c
+++ b/tests/boot/mcuboot_data_sharing/src/main.c
@@ -11,7 +11,7 @@
#include <zephyr/settings/settings.h>
#include <bootutil/boot_status.h>
#include <bootutil/image.h>
-#include <mcuboot_version.h>
+#include <zephyr/mcuboot_version.h>
#define FLASH_SECTOR_SIZE 1024
#define FLASH_SECTOR_SIZE_KB 4
diff --git a/tests/kernel/common/src/main.c b/tests/kernel/common/src/main.c
index e618d88..352ae87 100644
--- a/tests/kernel/common/src/main.c
+++ b/tests/kernel/common/src/main.c
@@ -8,7 +8,7 @@
#include <zephyr/ztest.h>
#include <zephyr/kernel_version.h>
#include <zephyr/sys/speculation.h>
-#include "version.h"
+#include <zephyr/version.h>
/**
* @defgroup kernel_common_tests Common Tests
diff --git a/tests/kernel/fatal/exception/src/main.c b/tests/kernel/fatal/exception/src/main.c
index 30050d3..8d2cff2 100644
--- a/tests/kernel/fatal/exception/src/main.c
+++ b/tests/kernel/fatal/exception/src/main.c
@@ -225,7 +225,7 @@
{
z_impl_blow_up_priv_stack();
}
-#include <syscalls/blow_up_priv_stack_mrsh.c>
+#include <zephyr/syscalls/blow_up_priv_stack_mrsh.c>
#endif /* CONFIG_USERSPACE */
#endif /* CONFIG_STACK_SENTINEL */
diff --git a/tests/kernel/fatal/exception/src/test_syscalls.h b/tests/kernel/fatal/exception/src/test_syscalls.h
index 096547c..a3bf556 100644
--- a/tests/kernel/fatal/exception/src/test_syscalls.h
+++ b/tests/kernel/fatal/exception/src/test_syscalls.h
@@ -10,6 +10,6 @@
__syscall void blow_up_priv_stack(void);
-#include <syscalls/test_syscalls.h>
+#include <zephyr/syscalls/test_syscalls.h>
#endif /* _TEST_SYSCALLS_H_ */
diff --git a/tests/kernel/mem_protect/mem_protect/src/inherit.c b/tests/kernel/mem_protect/mem_protect/src/inherit.c
index 8925535..021fdf8 100644
--- a/tests/kernel/mem_protect/mem_protect/src/inherit.c
+++ b/tests/kernel/mem_protect/mem_protect/src/inherit.c
@@ -132,7 +132,7 @@
{
return z_impl_ret_resource_pool_ptr();
}
-#include <syscalls/ret_resource_pool_ptr_mrsh.c>
+#include <zephyr/syscalls/ret_resource_pool_ptr_mrsh.c>
struct k_heap *child_heap_mem_ptr;
struct k_heap *parent_heap_mem_ptr;
diff --git a/tests/kernel/mem_protect/mem_protect/src/mem_protect.h b/tests/kernel/mem_protect/mem_protect/src/mem_protect.h
index 4d5400b..db6d448 100644
--- a/tests/kernel/mem_protect/mem_protect/src/mem_protect.h
+++ b/tests/kernel/mem_protect/mem_protect/src/mem_protect.h
@@ -93,6 +93,6 @@
__syscall struct k_heap *ret_resource_pool_ptr(void);
-#include <syscalls/mem_protect.h>
+#include <zephyr/syscalls/mem_protect.h>
#endif /* _TEST_SYSCALLS_H_ */
diff --git a/tests/kernel/mem_protect/syscalls/src/main.c b/tests/kernel/mem_protect/syscalls/src/main.c
index 5ba99e2..7d2b056 100644
--- a/tests/kernel/mem_protect/syscalls/src/main.c
+++ b/tests/kernel/mem_protect/syscalls/src/main.c
@@ -63,7 +63,7 @@
return ret;
}
-#include <syscalls/string_nlen_mrsh.c>
+#include <zephyr/syscalls/string_nlen_mrsh.c>
int z_impl_string_alloc_copy(char *src)
{
@@ -89,7 +89,7 @@
return ret;
}
-#include <syscalls/string_alloc_copy_mrsh.c>
+#include <zephyr/syscalls/string_alloc_copy_mrsh.c>
int z_impl_string_copy(char *src)
{
@@ -110,7 +110,7 @@
return z_impl_string_copy(kernel_buf);
}
-#include <syscalls/string_copy_mrsh.c>
+#include <zephyr/syscalls/string_copy_mrsh.c>
/* Not actually used, but will copy wrong string if called by mistake instead
* of the handler
@@ -125,7 +125,7 @@
{
return k_usermode_to_copy((char *)dest, user_string, BUF_SIZE);
}
-#include <syscalls/to_copy_mrsh.c>
+#include <zephyr/syscalls/to_copy_mrsh.c>
int z_impl_syscall_arg64(uint64_t arg)
{
@@ -139,7 +139,7 @@
{
return z_impl_syscall_arg64(arg);
}
-#include <syscalls/syscall_arg64_mrsh.c>
+#include <zephyr/syscalls/syscall_arg64_mrsh.c>
/* Bigger 64 bit arg syscall to exercise marshalling 7+ words of
* arguments (this one happens to need 9), and to test generation of
@@ -166,7 +166,7 @@
{
return z_impl_syscall_arg64_big(arg1, arg2, arg3, arg4, arg5, arg6);
}
-#include <syscalls/syscall_arg64_big_mrsh.c>
+#include <zephyr/syscalls/syscall_arg64_big_mrsh.c>
uint32_t z_impl_more_args(uint32_t arg1, uint32_t arg2, uint32_t arg3,
uint32_t arg4, uint32_t arg5, uint32_t arg6,
@@ -190,7 +190,7 @@
{
return z_impl_more_args(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
}
-#include <syscalls/more_args_mrsh.c>
+#include <zephyr/syscalls/more_args_mrsh.c>
/**
* @brief Test to demonstrate usage of k_usermode_string_nlen()
@@ -417,7 +417,7 @@
{
return z_impl_syscall_context();
}
-#include <syscalls/syscall_context_mrsh.c>
+#include <zephyr/syscalls/syscall_context_mrsh.c>
void test_syscall_context_user(void *p1, void *p2, void *p3)
{
diff --git a/tests/kernel/mem_protect/syscalls/src/test_syscalls.h b/tests/kernel/mem_protect/syscalls/src/test_syscalls.h
index 968928c..88f2c8e 100644
--- a/tests/kernel/mem_protect/syscalls/src/test_syscalls.h
+++ b/tests/kernel/mem_protect/syscalls/src/test_syscalls.h
@@ -27,6 +27,6 @@
uint32_t arg4, uint32_t arg5, uint32_t arg6,
uint32_t arg7);
-#include <syscalls/test_syscalls.h>
+#include <zephyr/syscalls/test_syscalls.h>
#endif /* _TEST_SYSCALLS_H_ */
diff --git a/tests/kernel/mem_protect/userspace/src/main.c b/tests/kernel/mem_protect/userspace/src/main.c
index d2b5842..9851046 100644
--- a/tests/kernel/mem_protect/userspace/src/main.c
+++ b/tests/kernel/mem_protect/userspace/src/main.c
@@ -1009,7 +1009,7 @@
{
return z_impl_check_syscall_context();
}
-#include <syscalls/check_syscall_context_mrsh.c>
+#include <zephyr/syscalls/check_syscall_context_mrsh.c>
ZTEST_USER(userspace, test_syscall_context)
{
diff --git a/tests/kernel/mem_protect/userspace/src/test_syscall.h b/tests/kernel/mem_protect/userspace/src/test_syscall.h
index bc2a5d6..f92b41a 100644
--- a/tests/kernel/mem_protect/userspace/src/test_syscall.h
+++ b/tests/kernel/mem_protect/userspace/src/test_syscall.h
@@ -10,6 +10,6 @@
__syscall void missing_syscall(void);
__syscall void check_syscall_context(void);
-#include <syscalls/test_syscall.h>
+#include <zephyr/syscalls/test_syscall.h>
#endif
diff --git a/tests/kernel/threads/dynamic_thread/src/main.c b/tests/kernel/threads/dynamic_thread/src/main.c
index f7e4a93..0fa88ca 100644
--- a/tests/kernel/threads/dynamic_thread/src/main.c
+++ b/tests/kernel/threads/dynamic_thread/src/main.c
@@ -156,7 +156,7 @@
switch (K_OBJ_THREAD) {
/** @cond keep_doxygen_away */
- #include <otype-to-size.h>
+ #include <zephyr/otype-to-size.h>
/** @endcond */
}
blob = k_object_create_dynamic_aligned(16, ret);
diff --git a/tests/kernel/threads/thread_stack/src/main.c b/tests/kernel/threads/thread_stack/src/main.c
index ad14e92..bc16842 100644
--- a/tests/kernel/threads/thread_stack/src/main.c
+++ b/tests/kernel/threads/thread_stack/src/main.c
@@ -46,7 +46,7 @@
z_impl_stack_info_get(start_addr, size);
}
-#include <syscalls/stack_info_get_mrsh.c>
+#include <zephyr/syscalls/stack_info_get_mrsh.c>
int z_impl_check_perms(void *addr, size_t size, int write)
{
@@ -57,7 +57,7 @@
{
return z_impl_check_perms((void *)addr, size, write);
}
-#include <syscalls/check_perms_mrsh.c>
+#include <zephyr/syscalls/check_perms_mrsh.c>
#endif /* CONFIG_USERSPACE */
/* Global data structure with object information, used by
diff --git a/tests/kernel/threads/thread_stack/src/test_syscall.h b/tests/kernel/threads/thread_stack/src/test_syscall.h
index eb466dd..a9bd7db 100644
--- a/tests/kernel/threads/thread_stack/src/test_syscall.h
+++ b/tests/kernel/threads/thread_stack/src/test_syscall.h
@@ -11,6 +11,6 @@
#ifdef CONFIG_USERSPACE
__syscall int check_perms(void *addr, size_t size, int write);
#endif
-#include <syscalls/test_syscall.h>
+#include <zephyr/syscalls/test_syscall.h>
#endif
diff --git a/tests/misc/llext-edk/include/app_api.h b/tests/misc/llext-edk/include/app_api.h
index 5270bca..3bf1c11 100644
--- a/tests/misc/llext-edk/include/app_api.h
+++ b/tests/misc/llext-edk/include/app_api.h
@@ -18,5 +18,5 @@
}
#endif
-#include <syscalls/app_api.h>
+#include <zephyr/syscalls/app_api.h>
#endif /* _TEST_EDK_H_ */
diff --git a/tests/misc/llext-edk/src/foo.c b/tests/misc/llext-edk/src/foo.c
index 190dac2..e7a3d22 100644
--- a/tests/misc/llext-edk/src/foo.c
+++ b/tests/misc/llext-edk/src/foo.c
@@ -19,5 +19,5 @@
/* Nothing to verify */
return z_impl_foo(bar);
}
-#include <syscalls/foo_mrsh.c>
+#include <zephyr/syscalls/foo_mrsh.c>
#endif
diff --git a/tests/subsys/bindesc/definition/src/main.c b/tests/subsys/bindesc/definition/src/main.c
index 487fa18..a112cc3 100644
--- a/tests/subsys/bindesc/definition/src/main.c
+++ b/tests/subsys/bindesc/definition/src/main.c
@@ -6,7 +6,7 @@
#include <zephyr/ztest.h>
#include <zephyr/bindesc.h>
-#include <version.h>
+#include <zephyr/version.h>
#define STR_ID 1
#define UINT_ID 2
diff --git a/tests/subsys/llext/simple/src/syscalls_ext.h b/tests/subsys/llext/simple/src/syscalls_ext.h
index 4d1b7fd..85b7371 100644
--- a/tests/subsys/llext/simple/src/syscalls_ext.h
+++ b/tests/subsys/llext/simple/src/syscalls_ext.h
@@ -16,4 +16,4 @@
*/
__syscall void ext_syscall_fail(void);
-#include <syscalls/syscalls_ext.h>
+#include <zephyr/syscalls/syscalls_ext.h>
diff --git a/tests/subsys/llext/simple/src/test_llext_simple.c b/tests/subsys/llext/simple/src/test_llext_simple.c
index f5e608d..2552844 100644
--- a/tests/subsys/llext/simple/src/test_llext_simple.c
+++ b/tests/subsys/llext/simple/src/test_llext_simple.c
@@ -61,7 +61,7 @@
{
return z_impl_ext_syscall_ok(a);
}
-#include <syscalls/ext_syscall_ok_mrsh.c>
+#include <zephyr/syscalls/ext_syscall_ok_mrsh.c>
#endif /* CONFIG_USERSPACE */
diff --git a/tests/subsys/logging/log_benchmark/src/test_helpers.c b/tests/subsys/logging/log_benchmark/src/test_helpers.c
index ad8b4f5..f4d5ca7 100644
--- a/tests/subsys/logging/log_benchmark/src/test_helpers.c
+++ b/tests/subsys/logging/log_benchmark/src/test_helpers.c
@@ -31,7 +31,7 @@
{
return z_impl_test_helpers_log_setup();
}
-#include <syscalls/test_helpers_log_setup_mrsh.c>
+#include <zephyr/syscalls/test_helpers_log_setup_mrsh.c>
#endif
int z_impl_test_helpers_cycle_get(void)
@@ -44,7 +44,7 @@
{
return z_impl_test_helpers_cycle_get();
}
-#include <syscalls/test_helpers_cycle_get_mrsh.c>
+#include <zephyr/syscalls/test_helpers_cycle_get_mrsh.c>
#endif
bool z_impl_test_helpers_log_dropped_pending(void)
@@ -57,5 +57,5 @@
{
return z_impl_test_helpers_log_dropped_pending();
}
-#include <syscalls/test_helpers_log_dropped_pending_mrsh.c>
+#include <zephyr/syscalls/test_helpers_log_dropped_pending_mrsh.c>
#endif
diff --git a/tests/subsys/logging/log_benchmark/src/test_helpers.h b/tests/subsys/logging/log_benchmark/src/test_helpers.h
index 0383d84..d2b0c22 100644
--- a/tests/subsys/logging/log_benchmark/src/test_helpers.h
+++ b/tests/subsys/logging/log_benchmark/src/test_helpers.h
@@ -12,6 +12,6 @@
__syscall int test_helpers_cycle_get(void);
__syscall bool test_helpers_log_dropped_pending(void);
-#include <syscalls/test_helpers.h>
+#include <zephyr/syscalls/test_helpers.h>
#endif /* SRC_TEST_HELPERS_H__ */
diff --git a/tests/subsys/mgmt/mcumgr/cb_notifications/src/main.c b/tests/subsys/mgmt/mcumgr/cb_notifications/src/main.c
index 99dee33..aa1bd14 100644
--- a/tests/subsys/mgmt/mcumgr/cb_notifications/src/main.c
+++ b/tests/subsys/mgmt/mcumgr/cb_notifications/src/main.c
@@ -14,7 +14,7 @@
#include <zcbor_decode.h>
#include <zcbor_encode.h>
#include <mgmt/mcumgr/util/zcbor_bulk.h>
-#include <version.h>
+#include <zephyr/version.h>
#include <string.h>
#include <smp_internal.h>
#include "smp_test_util.h"
diff --git a/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/build_date.c b/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/build_date.c
index 5674e33..a1503e0 100644
--- a/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/build_date.c
+++ b/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/build_date.c
@@ -18,7 +18,7 @@
#include <zcbor_decode.h>
#include <zcbor_encode.h>
#include <mgmt/mcumgr/util/zcbor_bulk.h>
-#include <version.h>
+#include <zephyr/version.h>
#include <smp_internal.h>
#include "smp_test_util.h"
diff --git a/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/limited.c b/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/limited.c
index 613402e..9932d11 100644
--- a/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/limited.c
+++ b/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/limited.c
@@ -17,7 +17,7 @@
#include <zcbor_decode.h>
#include <zcbor_encode.h>
#include <mgmt/mcumgr/util/zcbor_bulk.h>
-#include <version.h>
+#include <zephyr/version.h>
#include <string.h>
#include <smp_internal.h>
#include "smp_test_util.h"
diff --git a/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/main.c b/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/main.c
index bc86791..f182885 100644
--- a/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/main.c
+++ b/tests/subsys/mgmt/mcumgr/os_mgmt_info/src/main.c
@@ -17,7 +17,7 @@
#include <zcbor_decode.h>
#include <zcbor_encode.h>
#include <mgmt/mcumgr/util/zcbor_bulk.h>
-#include <version.h>
+#include <zephyr/version.h>
#include <string.h>
#include <smp_internal.h>
#include "smp_test_util.h"
diff --git a/tests/subsys/shell/shell_backend_uart/src/main.c b/tests/subsys/shell/shell_backend_uart/src/main.c
index 0e5d270..2aa6d79 100644
--- a/tests/subsys/shell/shell_backend_uart/src/main.c
+++ b/tests/subsys/shell/shell_backend_uart/src/main.c
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#include <version.h>
+#include <zephyr/version.h>
#include <zephyr/device.h>
#include <zephyr/devicetree.h>
