From 0f570a7f751cea41eac05a7a8e677f66cde03bf9 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Fri, 19 Aug 2022 14:10:56 +0100 Subject: [PATCH 1/4] header: rtos: decouple headers into rtos specific directories. No functional runtime change, but changes to rtos partitioning and the layout of headers . This patch creates RTOS specifc header paths and updates spinlock.h and kernel.h to show the new usage. Other headers will incrementally follow. It reuses the current zephyr topleve directory and creates a new toplevel xtos directory for xtos specific files. Due to the mixing of RTOS, driver and library headers at the top level include directory it was necessary to create rtos specific header directories i.e. src/include/rtos-xtos src/include/rtos-zephyr These RTOS include directories will eventually contain RTOS specific headers whilst common logic and structures will be placed in non RTOS directories. This will also mean "#include " will become "#include " and will allow easier visualisation of where and why RTOS headers are being used. This will help to eliminate cross usage of headers between RTOSes. Subsequqnt patches will move more headers and rtos specific wrppaer source files into rtos specific locations. Signed-off-by: Liam Girdwood --- doc/sof.doxygen.in | 3 +- smex/CMakeLists.txt | 7 +++ src/arch/CMakeLists.txt | 4 -- src/arch/host/CMakeLists.txt | 7 +++ src/arch/host/include/arch/spinlock.h | 3 +- src/arch/xtensa/CMakeLists.txt | 4 ++ src/arch/xtensa/include/arch/spinlock.h | 2 +- src/arch/xtensa/init.c | 2 +- src/audio/buffer.c | 2 +- src/audio/pipeline/pipeline-graph.c | 2 +- src/audio/pipeline/pipeline-params.c | 2 +- src/audio/pipeline/pipeline-schedule.c | 2 +- src/audio/pipeline/pipeline-stream.c | 5 +- src/audio/pipeline/pipeline-xrun.c | 2 +- src/drivers/amd/rembrandt/acp_bt_dma.c | 2 +- src/drivers/amd/rembrandt/acp_dmic_dma.c | 2 +- src/drivers/amd/rembrandt/acp_hs_dma.c | 2 +- src/drivers/amd/rembrandt/acp_sp_dma.c | 2 +- src/drivers/amd/rembrandt/interrupt.c | 2 +- src/drivers/amd/rembrandt/ipc.c | 2 +- src/drivers/amd/renoir/acp_bt_dma.c | 2 +- src/drivers/amd/renoir/acp_dmic_dma.c | 2 +- src/drivers/amd/renoir/acp_sp_dma.c | 2 +- src/drivers/amd/renoir/interrupt.c | 2 +- src/drivers/amd/renoir/ipc.c | 2 +- src/drivers/dw/dma.c | 2 +- src/drivers/dw/ssi-spi.c | 2 +- src/drivers/generic/dummy-dma.c | 2 +- src/drivers/imx/interrupt-generic.c | 2 +- src/drivers/imx/interrupt-irqsteer.c | 2 +- src/drivers/imx/ipc.c | 2 +- src/drivers/intel/baytrail/ipc.c | 2 +- src/drivers/intel/baytrail/ssp.c | 2 +- src/drivers/intel/cavs/interrupt.c | 2 +- src/drivers/intel/cavs/ipc.c | 2 +- src/drivers/intel/cavs/sue-ipc.c | 2 +- src/drivers/intel/dmic/dmic.c | 2 +- src/drivers/intel/haswell/ipc.c | 2 +- src/drivers/intel/haswell/ssp.c | 2 +- src/drivers/intel/hda/hda-dma.c | 2 +- src/drivers/intel/ssp/mn.c | 2 +- src/drivers/intel/ssp/ssp.c | 2 +- src/drivers/interrupt.c | 2 +- src/drivers/mediatek/mt8186/interrupt.c | 2 +- src/drivers/mediatek/mt8186/ipc.c | 2 +- src/drivers/mediatek/mt8195/interrupt.c | 2 +- src/drivers/mediatek/mt8195/ipc.c | 2 +- src/idc/zephyr_idc.c | 2 +- src/include/Readme.md | 49 +++++++++++++++++++ src/include/sof/audio/buffer.h | 2 +- src/include/sof/audio/pipeline.h | 2 +- src/include/sof/coherent.h | 2 +- src/include/sof/debug/panic.h | 2 +- src/include/sof/drivers/interrupt.h | 2 +- src/include/sof/ipc/common.h | 2 +- src/include/sof/ipc/msg.h | 2 +- src/include/sof/ipc/topology.h | 2 +- src/include/sof/lib/dai-legacy.h | 2 +- src/include/sof/lib/dai-zephyr.h | 4 +- src/include/sof/lib/notifier.h | 2 +- src/include/sof/schedule/ll_schedule_domain.h | 2 +- src/include/sof/schedule/task.h | 5 +- src/include/sof/trace/dma-trace.h | 2 +- src/ipc/ipc-common.c | 2 +- src/ipc/ipc-helper.c | 2 +- src/ipc/ipc4/handler.c | 2 +- src/ipc/ipc4/helper.c | 2 +- src/lib/agent.c | 5 +- src/lib/alloc.c | 2 +- src/lib/clk.c | 2 +- src/lib/dai.c | 2 +- src/lib/dma.c | 2 +- src/lib/pm_runtime.c | 2 +- src/platform/amd/rembrandt/lib/clk.c | 2 +- src/platform/amd/rembrandt/lib/dai.c | 2 +- src/platform/amd/rembrandt/lib/dma.c | 2 +- src/platform/amd/renoir/lib/clk.c | 2 +- src/platform/amd/renoir/lib/dai.c | 2 +- src/platform/amd/renoir/lib/dma.c | 2 +- src/platform/baytrail/lib/clk.c | 2 +- src/platform/baytrail/lib/dma.c | 2 +- src/platform/haswell/lib/clk.c | 2 +- src/platform/haswell/lib/dma.c | 2 +- src/platform/imx8/lib/clk.c | 2 +- src/platform/imx8/lib/dai.c | 2 +- src/platform/imx8/lib/dma.c | 2 +- src/platform/imx8m/lib/clk.c | 2 +- src/platform/imx8m/lib/dai.c | 2 +- src/platform/imx8m/lib/dma.c | 2 +- src/platform/imx8ulp/lib/clk.c | 2 +- src/platform/imx8ulp/lib/dai.c | 2 +- src/platform/imx8ulp/lib/dma.c | 2 +- src/platform/intel/cavs/lib/clk.c | 2 +- src/platform/intel/cavs/lib/dai.c | 2 +- src/platform/intel/cavs/lib/dma.c | 2 +- src/platform/intel/cavs/lib/pm_runtime.c | 2 +- src/platform/mt8186/lib/clk.c | 2 +- src/platform/mt8186/lib/dai.c | 2 +- src/platform/mt8186/lib/dma.c | 2 +- src/platform/mt8195/lib/clk.c | 2 +- src/platform/mt8195/lib/dai.c | 2 +- src/platform/mt8195/lib/dma.c | 2 +- src/schedule/ll_schedule.c | 2 +- src/schedule/zephyr_ll.c | 2 +- src/spinlock.c | 2 +- src/trace/dma-trace.c | 2 +- src/trace/trace.c | 2 +- test/cmocka/src/common_mocks.c | 2 +- tools/fuzzer/CMakeLists.txt | 18 ++++++- tools/logger/CMakeLists.txt | 5 ++ tools/probes/CMakeLists.txt | 5 ++ tools/testbench/CMakeLists.txt | 8 ++- tools/tplg_parser/CMakeLists.txt | 3 ++ .../include}/CMakeLists.txt | 0 .../zephyr => xtos/include/rtos}/kernel.h | 6 +-- .../sof => xtos/include/rtos}/spinlock.h | 24 ++------- {src => xtos}/include/sof/atomic.h | 0 {src => xtos}/include/sof/bit.h | 0 .../include/sof/compiler_attributes.h | 0 {src => xtos}/include/sof/compiler_info.h | 2 +- .../include/sof/drivers/timer.h | 0 {src => xtos}/include/sof/init.h | 0 {src => xtos}/include/sof/lib/agent.h | 0 {src => xtos}/include/sof/lib/alloc.h | 2 +- {src => xtos}/include/sof/lib/cache.h | 2 +- {src => xtos}/include/sof/lib/clk.h | 2 +- {src => xtos}/include/sof/lib/cpu.h | 2 +- {src => xtos}/include/sof/lib/dai.h | 2 +- {src => xtos}/include/sof/lib/dma.h | 4 +- {src => xtos}/include/sof/lib/io.h | 0 {src => xtos}/include/sof/lib/mailbox.h | 0 {src => xtos}/include/sof/lib/memory.h | 0 {src => xtos}/include/sof/lib/mm_heap.h | 2 +- {src => xtos}/include/sof/lib/perf_cnt.h | 2 +- {src => xtos}/include/sof/lib/pm_runtime.h | 4 +- {src => xtos}/include/sof/lib/shim.h | 0 {src => xtos}/include/sof/lib/wait.h | 6 +-- {src => xtos}/include/sof/list.h | 0 {src => xtos}/include/sof/string.h | 0 zephyr/CMakeLists.txt | 10 +++- zephyr/Kconfig | 10 ++++ zephyr/include/rtos/kernel.h | 11 +++++ zephyr/include/rtos/spinlock.h | 20 ++++++++ 143 files changed, 279 insertions(+), 161 deletions(-) create mode 100644 src/include/Readme.md rename {src/arch/xtos-wrapper => xtos/include}/CMakeLists.txt (100%) rename {src/arch/xtos-wrapper/include/zephyr => xtos/include/rtos}/kernel.h (87%) rename {src/include/sof => xtos/include/rtos}/spinlock.h (93%) rename {src => xtos}/include/sof/atomic.h (100%) rename {src => xtos}/include/sof/bit.h (100%) rename {src => xtos}/include/sof/compiler_attributes.h (100%) rename {src => xtos}/include/sof/compiler_info.h (91%) rename {src/arch/xtos-wrapper => xtos}/include/sof/drivers/timer.h (100%) rename {src => xtos}/include/sof/init.h (100%) rename {src => xtos}/include/sof/lib/agent.h (100%) rename {src => xtos}/include/sof/lib/alloc.h (99%) rename {src => xtos}/include/sof/lib/cache.h (92%) rename {src => xtos}/include/sof/lib/clk.h (98%) rename {src => xtos}/include/sof/lib/cpu.h (97%) rename {src => xtos}/include/sof/lib/dai.h (93%) rename {src => xtos}/include/sof/lib/dma.h (99%) rename {src => xtos}/include/sof/lib/io.h (100%) rename {src => xtos}/include/sof/lib/mailbox.h (100%) rename {src => xtos}/include/sof/lib/memory.h (100%) rename {src => xtos}/include/sof/lib/mm_heap.h (99%) rename {src => xtos}/include/sof/lib/perf_cnt.h (99%) rename {src => xtos}/include/sof/lib/pm_runtime.h (98%) rename {src => xtos}/include/sof/lib/shim.h (100%) rename {src => xtos}/include/sof/lib/wait.h (90%) rename {src => xtos}/include/sof/list.h (100%) rename {src => xtos}/include/sof/string.h (100%) create mode 100644 zephyr/include/rtos/kernel.h create mode 100644 zephyr/include/rtos/spinlock.h diff --git a/doc/sof.doxygen.in b/doc/sof.doxygen.in index 32a99fc8c480..bfbea17a7149 100644 --- a/doc/sof.doxygen.in +++ b/doc/sof.doxygen.in @@ -9,7 +9,8 @@ CASE_SENSE_NAMES = NO INPUT = @top_srcdir@/src/include/ipc \ @top_srcdir@/src/include/kernel \ @top_srcdir@/src/include/user \ - @top_srcdir@/src/include/sof + @top_srcdir@/src/include/sof \ + @top_srcdir@/xtos/include # Exlude some 3rd party codec headers with external references EXCLUDE = @top_srcdir@/src/include/sof/audio/MaxxEffect RECURSIVE = YES diff --git a/smex/CMakeLists.txt b/smex/CMakeLists.txt index 631104982d51..fbad0a9519ba 100644 --- a/smex/CMakeLists.txt +++ b/smex/CMakeLists.txt @@ -26,3 +26,10 @@ target_include_directories(smex PRIVATE "${SOF_ROOT_SOURCE_DIRECTORY}/src/include" "${SOF_ROOT_SOURCE_DIRECTORY}/rimage/src/include" ) + +# TODO: smex should not need RTOS headers: FIX. +if (NOT CONFIG_SOF_ZEPHYR_STRICT_HEADERS) +target_include_directories(smex PRIVATE + "${SOF_ROOT_SOURCE_DIRECTORY}/xtos/include" +) +endif() \ No newline at end of file diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt index 8f415856d6a4..edaaec70a535 100644 --- a/src/arch/CMakeLists.txt +++ b/src/arch/CMakeLists.txt @@ -1,7 +1,3 @@ # SPDX-License-Identifier: BSD-3-Clause add_subdirectory(${ARCH}) - -if(NOT CONFIG_ZEPHYR_SOF_MODULE) - add_subdirectory("xtos-wrapper") -endif() diff --git a/src/arch/host/CMakeLists.txt b/src/arch/host/CMakeLists.txt index 52e8c11da25d..e0ed085044c5 100644 --- a/src/arch/host/CMakeLists.txt +++ b/src/arch/host/CMakeLists.txt @@ -4,6 +4,13 @@ target_include_directories(sof_public_headers INTERFACE ${PROJECT_SOURCE_DIR}/src/arch/host/include) target_include_directories(sof_public_headers INTERFACE ${PROJECT_SOURCE_DIR}/src/platform/library/include) +# TODO: library should not need RTOS headers: FIX. +if (NOT CONFIG_SOF_ZEPHYR_STRICT_HEADERS) +target_include_directories(sof_public_headers INTERFACE + ${PROJECT_SOURCE_DIR}/xtos/include +) +endif() + # C & ASM flags target_compile_options(sof_options INTERFACE -g -O3 -Wall -Werror -Wmissing-prototypes -Wimplicit-fallthrough -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -Wpointer-arith -DCONFIG_LIBRARY "-imacros${CONFIG_H_PATH}") diff --git a/src/arch/host/include/arch/spinlock.h b/src/arch/host/include/arch/spinlock.h index fa6298925efc..273133490e72 100644 --- a/src/arch/host/include/arch/spinlock.h +++ b/src/arch/host/include/arch/spinlock.h @@ -5,7 +5,8 @@ * Author: Liam Girdwood */ -#ifdef __SOF_SPINLOCK_H__ +/* TODO: this needs fixed as part of the "host does not need rtos headers work" */ +#ifdef __XTOS_RTOS_SPINLOCK_H__ #ifndef __ARCH_SPINLOCK_H__ #define __ARCH_SPINLOCK_H__ diff --git a/src/arch/xtensa/CMakeLists.txt b/src/arch/xtensa/CMakeLists.txt index e6aff9fabc83..5cbaa78638ba 100644 --- a/src/arch/xtensa/CMakeLists.txt +++ b/src/arch/xtensa/CMakeLists.txt @@ -60,10 +60,14 @@ if(CONFIG_REMBRANDT) endif() # includes +# None of these should be included if Zephyr strict headers are used. +if (NOT CONFIG_SOF_ZEPHYR_STRICT_HEADERS) target_include_directories(sof_options INTERFACE ${PROJECT_SOURCE_DIR}/src/arch/xtensa/include ${PROJECT_SOURCE_DIR}/src/arch/xtensa/xtos + ${PROJECT_SOURCE_DIR}/xtos/include ) +endif() target_include_directories(sof_options INTERFACE ${PROJECT_SOURCE_DIR}/src/platform/${platform_folder}/include) diff --git a/src/arch/xtensa/include/arch/spinlock.h b/src/arch/xtensa/include/arch/spinlock.h index 44874cd946df..0a0898a13563 100644 --- a/src/arch/xtensa/include/arch/spinlock.h +++ b/src/arch/xtensa/include/arch/spinlock.h @@ -5,7 +5,7 @@ * Author: Liam Girdwood */ -#ifdef __SOF_SPINLOCK_H__ +#ifdef __XTOS_RTOS_SPINLOCK_H__ #ifndef __ARCH_SPINLOCK_H__ #define __ARCH_SPINLOCK_H__ diff --git a/src/arch/xtensa/init.c b/src/arch/xtensa/init.c index 51ec1f802edb..7e0fb8b3f966 100644 --- a/src/arch/xtensa/init.c +++ b/src/arch/xtensa/init.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include diff --git a/src/audio/buffer.c b/src/audio/buffer.c index dba8dd8d3531..8da530339da2 100644 --- a/src/audio/buffer.c +++ b/src/audio/buffer.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/pipeline/pipeline-graph.c b/src/audio/pipeline/pipeline-graph.c index fdb933f84108..03ef5bdb0310 100644 --- a/src/audio/pipeline/pipeline-graph.c +++ b/src/audio/pipeline/pipeline-graph.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/pipeline/pipeline-params.c b/src/audio/pipeline/pipeline-params.c index be61afcba1e6..4069ef54137e 100644 --- a/src/audio/pipeline/pipeline-params.c +++ b/src/audio/pipeline/pipeline-params.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/pipeline/pipeline-schedule.c b/src/audio/pipeline/pipeline-schedule.c index 3c86a6a6bcd2..6b8ec2792837 100644 --- a/src/audio/pipeline/pipeline-schedule.c +++ b/src/audio/pipeline/pipeline-schedule.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/pipeline/pipeline-stream.c b/src/audio/pipeline/pipeline-stream.c index 9262f7133855..f005013b5075 100644 --- a/src/audio/pipeline/pipeline-stream.c +++ b/src/audio/pipeline/pipeline-stream.c @@ -11,12 +11,11 @@ #include #include #include -#include +#include #include #include #include - -#include +#include #include #include diff --git a/src/audio/pipeline/pipeline-xrun.c b/src/audio/pipeline/pipeline-xrun.c index 1bd7e20c63a2..e4852e7fb884 100644 --- a/src/audio/pipeline/pipeline-xrun.c +++ b/src/audio/pipeline/pipeline-xrun.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/rembrandt/acp_bt_dma.c b/src/drivers/amd/rembrandt/acp_bt_dma.c index 0629fc1e1619..8ce98032b3ee 100644 --- a/src/drivers/amd/rembrandt/acp_bt_dma.c +++ b/src/drivers/amd/rembrandt/acp_bt_dma.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/rembrandt/acp_dmic_dma.c b/src/drivers/amd/rembrandt/acp_dmic_dma.c index 9a66cd1e6ede..99589da43e57 100644 --- a/src/drivers/amd/rembrandt/acp_dmic_dma.c +++ b/src/drivers/amd/rembrandt/acp_dmic_dma.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/rembrandt/acp_hs_dma.c b/src/drivers/amd/rembrandt/acp_hs_dma.c index 294c0265c7e9..ba4ca8cbed84 100644 --- a/src/drivers/amd/rembrandt/acp_hs_dma.c +++ b/src/drivers/amd/rembrandt/acp_hs_dma.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/rembrandt/acp_sp_dma.c b/src/drivers/amd/rembrandt/acp_sp_dma.c index 0ca810934f37..4865040a39aa 100644 --- a/src/drivers/amd/rembrandt/acp_sp_dma.c +++ b/src/drivers/amd/rembrandt/acp_sp_dma.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/rembrandt/interrupt.c b/src/drivers/amd/rembrandt/interrupt.c index 90762782427a..a5a015f560ce 100644 --- a/src/drivers/amd/rembrandt/interrupt.c +++ b/src/drivers/amd/rembrandt/interrupt.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/rembrandt/ipc.c b/src/drivers/amd/rembrandt/ipc.c index a302e49809b5..95b069c887d2 100644 --- a/src/drivers/amd/rembrandt/ipc.c +++ b/src/drivers/amd/rembrandt/ipc.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/renoir/acp_bt_dma.c b/src/drivers/amd/renoir/acp_bt_dma.c index d3364f432b28..77682f33750f 100644 --- a/src/drivers/amd/renoir/acp_bt_dma.c +++ b/src/drivers/amd/renoir/acp_bt_dma.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/renoir/acp_dmic_dma.c b/src/drivers/amd/renoir/acp_dmic_dma.c index e89efb85b65e..e6c50b570bcd 100644 --- a/src/drivers/amd/renoir/acp_dmic_dma.c +++ b/src/drivers/amd/renoir/acp_dmic_dma.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/renoir/acp_sp_dma.c b/src/drivers/amd/renoir/acp_sp_dma.c index 8ca162119538..6430451fd947 100644 --- a/src/drivers/amd/renoir/acp_sp_dma.c +++ b/src/drivers/amd/renoir/acp_sp_dma.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/renoir/interrupt.c b/src/drivers/amd/renoir/interrupt.c index 80a9f02fc097..8732dcb5bb0b 100644 --- a/src/drivers/amd/renoir/interrupt.c +++ b/src/drivers/amd/renoir/interrupt.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/renoir/ipc.c b/src/drivers/amd/renoir/ipc.c index be2ff79e441d..0a46b16d9a42 100644 --- a/src/drivers/amd/renoir/ipc.c +++ b/src/drivers/amd/renoir/ipc.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/dw/dma.c b/src/drivers/dw/dma.c index 1531cb83cefa..20ae96ae605b 100644 --- a/src/drivers/dw/dma.c +++ b/src/drivers/dw/dma.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/drivers/dw/ssi-spi.c b/src/drivers/dw/ssi-spi.c index 42ef1c67bc22..9e9aaac72b90 100644 --- a/src/drivers/dw/ssi-spi.c +++ b/src/drivers/dw/ssi-spi.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/generic/dummy-dma.c b/src/drivers/generic/dummy-dma.c index fdccec5e623c..bf20c8209be7 100644 --- a/src/drivers/generic/dummy-dma.c +++ b/src/drivers/generic/dummy-dma.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/imx/interrupt-generic.c b/src/drivers/imx/interrupt-generic.c index 00223ee4bdd3..82781e205dcf 100644 --- a/src/drivers/imx/interrupt-generic.c +++ b/src/drivers/imx/interrupt-generic.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/imx/interrupt-irqsteer.c b/src/drivers/imx/interrupt-irqsteer.c index 27352f9e65e3..1668c2a69c4c 100644 --- a/src/drivers/imx/interrupt-irqsteer.c +++ b/src/drivers/imx/interrupt-irqsteer.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/imx/ipc.c b/src/drivers/imx/ipc.c index 1857c1dceade..22aab0fa5fbf 100644 --- a/src/drivers/imx/ipc.c +++ b/src/drivers/imx/ipc.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/intel/baytrail/ipc.c b/src/drivers/intel/baytrail/ipc.c index f6e8267d2354..c4eee8f52861 100644 --- a/src/drivers/intel/baytrail/ipc.c +++ b/src/drivers/intel/baytrail/ipc.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/intel/baytrail/ssp.c b/src/drivers/intel/baytrail/ssp.c index efc0a7a38a81..0332ce2f8a80 100644 --- a/src/drivers/intel/baytrail/ssp.c +++ b/src/drivers/intel/baytrail/ssp.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/intel/cavs/interrupt.c b/src/drivers/intel/cavs/interrupt.c index 0a7e1909723f..03a6ecc40124 100644 --- a/src/drivers/intel/cavs/interrupt.c +++ b/src/drivers/intel/cavs/interrupt.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/drivers/intel/cavs/ipc.c b/src/drivers/intel/cavs/ipc.c index 0d232d677792..f6a79218908a 100644 --- a/src/drivers/intel/cavs/ipc.c +++ b/src/drivers/intel/cavs/ipc.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/drivers/intel/cavs/sue-ipc.c b/src/drivers/intel/cavs/sue-ipc.c index 35b8a7fa25a2..a7194bacd8e4 100644 --- a/src/drivers/intel/cavs/sue-ipc.c +++ b/src/drivers/intel/cavs/sue-ipc.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/intel/dmic/dmic.c b/src/drivers/intel/dmic/dmic.c index 07b9e4b02bc2..249ec87788da 100644 --- a/src/drivers/intel/dmic/dmic.c +++ b/src/drivers/intel/dmic/dmic.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/intel/haswell/ipc.c b/src/drivers/intel/haswell/ipc.c index 542f5d4f277e..933e78f1534e 100644 --- a/src/drivers/intel/haswell/ipc.c +++ b/src/drivers/intel/haswell/ipc.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/intel/haswell/ssp.c b/src/drivers/intel/haswell/ssp.c index d15896962620..3a244aeb5946 100644 --- a/src/drivers/intel/haswell/ssp.c +++ b/src/drivers/intel/haswell/ssp.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/intel/hda/hda-dma.c b/src/drivers/intel/hda/hda-dma.c index 4fb82a879658..4832b1ca3ba4 100644 --- a/src/drivers/intel/hda/hda-dma.c +++ b/src/drivers/intel/hda/hda-dma.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/intel/ssp/mn.c b/src/drivers/intel/ssp/mn.c index 56607d02f0a3..da7bcd273d3b 100644 --- a/src/drivers/intel/ssp/mn.c +++ b/src/drivers/intel/ssp/mn.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/drivers/intel/ssp/ssp.c b/src/drivers/intel/ssp/ssp.c index e6a20f540295..58da0dffd036 100644 --- a/src/drivers/intel/ssp/ssp.c +++ b/src/drivers/intel/ssp/ssp.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/interrupt.c b/src/drivers/interrupt.c index 89df6c61453d..4ad297221005 100644 --- a/src/drivers/interrupt.c +++ b/src/drivers/interrupt.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/mediatek/mt8186/interrupt.c b/src/drivers/mediatek/mt8186/interrupt.c index 2cb86830f412..c80c8e18fadd 100644 --- a/src/drivers/mediatek/mt8186/interrupt.c +++ b/src/drivers/mediatek/mt8186/interrupt.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/mediatek/mt8186/ipc.c b/src/drivers/mediatek/mt8186/ipc.c index af3f1dd1a4c4..1da57d27e89c 100644 --- a/src/drivers/mediatek/mt8186/ipc.c +++ b/src/drivers/mediatek/mt8186/ipc.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/mediatek/mt8195/interrupt.c b/src/drivers/mediatek/mt8195/interrupt.c index 02ce1684a1ff..0045846082dc 100644 --- a/src/drivers/mediatek/mt8195/interrupt.c +++ b/src/drivers/mediatek/mt8195/interrupt.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/mediatek/mt8195/ipc.c b/src/drivers/mediatek/mt8195/ipc.c index ee101be4f332..39c43f4c2fae 100644 --- a/src/drivers/mediatek/mt8195/ipc.c +++ b/src/drivers/mediatek/mt8195/ipc.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/idc/zephyr_idc.c b/src/idc/zephyr_idc.c index bf525dfda02e..84e2f3194126 100644 --- a/src/idc/zephyr_idc.c +++ b/src/idc/zephyr_idc.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include /* diff --git a/src/include/Readme.md b/src/include/Readme.md new file mode 100644 index 000000000000..ca04815738e5 --- /dev/null +++ b/src/include/Readme.md @@ -0,0 +1,49 @@ +** SOF Header Layout ** + +Today SOF is somewhat coupled with xtensa xtos/HAL and it's own SOF RTOS logic. +This coupling is reflected in the headers where we have a mix of RTOS and +common headers at the top level ```src/include``` directory. + +Previously SOF had the following **mandatory** include PATHS + + 1) Toplevel ```src/include``` + + The top level common which included RTOS level APIs, drivers, library, IPC, debug and audio. + + 2) Platform ```$PLATFORM``` + + Platform level includes for IP configuration and IP drivers. + + 3) Architecture ```$ARCH``` + + DSP Architecture level includes that define DSP architecture. + + + ** RTOS Header Decoupling ** + + Due to the mixing of RTOS, driver and library headers at the top level include + directory it was necessary to create RTOS specific directories for RTOS specific + logic and headers i.e. + +``` +xtos/include +zephyr/include +``` + +These RTOS include directories will eventually contain RTOS specific headers +whilst common logic and structures will be placed in non RTOS directories. + +This will also mean + +```c +#include +``` + +will become + +```c +#include +``` + +and will allow easier visualisation of where and why RTOS headers are being used. +This will help to eliminate cross usage of headers between RTOSes. \ No newline at end of file diff --git a/src/include/sof/audio/buffer.h b/src/include/sof/audio/buffer.h index 78cf4a34c570..aba3e422545a 100644 --- a/src/include/sof/audio/buffer.h +++ b/src/include/sof/audio/buffer.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/include/sof/audio/pipeline.h b/src/include/sof/audio/pipeline.h index ff46003e0b24..48996759542a 100644 --- a/src/include/sof/audio/pipeline.h +++ b/src/include/sof/audio/pipeline.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/include/sof/coherent.h b/src/include/sof/coherent.h index e6fa0c2a1cef..faa3d0b76488 100644 --- a/src/include/sof/coherent.h +++ b/src/include/sof/coherent.h @@ -12,7 +12,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/include/sof/debug/panic.h b/src/include/sof/debug/panic.h index 2e6eb0c8b912..a7bb4f1391d6 100644 --- a/src/include/sof/debug/panic.h +++ b/src/include/sof/debug/panic.h @@ -31,7 +31,7 @@ void panic_dump(uint32_t p, struct sof_ipc_panic_info *panic_info, SOF_NORETURN; #ifdef __ZEPHYR__ -#include +#include #define panic(x) k_panic() #define assert(x) __ASSERT_NO_MSG(x) diff --git a/src/include/sof/drivers/interrupt.h b/src/include/sof/drivers/interrupt.h index d5da3af20470..756808e1c1be 100644 --- a/src/include/sof/drivers/interrupt.h +++ b/src/include/sof/drivers/interrupt.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/include/sof/ipc/common.h b/src/include/sof/ipc/common.h index d357c6f79360..4ffdc83e564a 100644 --- a/src/include/sof/ipc/common.h +++ b/src/include/sof/ipc/common.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/include/sof/ipc/msg.h b/src/include/sof/ipc/msg.h index 0ba3f107f8ab..4865ea8a33f1 100644 --- a/src/include/sof/ipc/msg.h +++ b/src/include/sof/ipc/msg.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/include/sof/ipc/topology.h b/src/include/sof/ipc/topology.h index bc737d2a4637..da7b26c81cd0 100644 --- a/src/include/sof/ipc/topology.h +++ b/src/include/sof/ipc/topology.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/include/sof/lib/dai-legacy.h b/src/include/sof/lib/dai-legacy.h index 270746703fd5..28a4194df18c 100644 --- a/src/include/sof/lib/dai-legacy.h +++ b/src/include/sof/lib/dai-legacy.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/include/sof/lib/dai-zephyr.h b/src/include/sof/lib/dai-zephyr.h index 896f7b6554e7..e824709ee0e8 100644 --- a/src/include/sof/lib/dai-zephyr.h +++ b/src/include/sof/lib/dai-zephyr.h @@ -7,7 +7,7 @@ */ /** - * \file include/sof/lib/dai.h + * \file include/sof/lib/dai-zephyr.h * \brief DAI Drivers definition * \author Liam Girdwood * \author Keyon Jie @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/include/sof/lib/notifier.h b/src/include/sof/lib/notifier.h index 9bdc7bce0449..4e39e1d32fb6 100644 --- a/src/include/sof/lib/notifier.h +++ b/src/include/sof/lib/notifier.h @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include diff --git a/src/include/sof/schedule/ll_schedule_domain.h b/src/include/sof/schedule/ll_schedule_domain.h index cb9254c1c503..5e959bed38f0 100644 --- a/src/include/sof/schedule/ll_schedule_domain.h +++ b/src/include/sof/schedule/ll_schedule_domain.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/include/sof/schedule/task.h b/src/include/sof/schedule/task.h index f5fb4f1fe79e..c5a4a0a9b2ea 100644 --- a/src/include/sof/schedule/task.h +++ b/src/include/sof/schedule/task.h @@ -13,10 +13,7 @@ #include #include #include - -#ifdef __ZEPHYR__ -#include -#endif +#include struct comp_dev; struct sof; diff --git a/src/include/sof/trace/dma-trace.h b/src/include/sof/trace/dma-trace.h index 8c7dbcd394e4..bbcf8a665ce6 100644 --- a/src/include/sof/trace/dma-trace.h +++ b/src/include/sof/trace/dma-trace.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/ipc/ipc-common.c b/src/ipc/ipc-common.c index 641367471f58..2fe2d4070f13 100644 --- a/src/ipc/ipc-common.c +++ b/src/ipc/ipc-common.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ipc/ipc-helper.c b/src/ipc/ipc-helper.c index 539842fec361..5e53e734ef4d 100644 --- a/src/ipc/ipc-helper.c +++ b/src/ipc/ipc-helper.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ipc/ipc4/handler.c b/src/ipc/ipc4/handler.c index 0c021fbbae69..962285b9d354 100644 --- a/src/ipc/ipc4/handler.c +++ b/src/ipc/ipc4/handler.c @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include diff --git a/src/ipc/ipc4/helper.c b/src/ipc/ipc4/helper.c index 0f2b5e141510..2cd773d648a5 100644 --- a/src/ipc/ipc4/helper.c +++ b/src/ipc/ipc4/helper.c @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/lib/agent.c b/src/lib/agent.c index 7cdf8bb3acca..1739a780e242 100644 --- a/src/lib/agent.c +++ b/src/lib/agent.c @@ -33,10 +33,7 @@ #include #include #include - -#ifdef __ZEPHYR__ -#include -#endif +#include LOG_MODULE_REGISTER(sa, CONFIG_SOF_LOG_LEVEL); diff --git a/src/lib/alloc.c b/src/lib/alloc.c index 0449293dcd38..87eaabd4d868 100644 --- a/src/lib/alloc.c +++ b/src/lib/alloc.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/lib/clk.c b/src/lib/clk.c index 7898d7b2b4e8..e8a9faf708b6 100644 --- a/src/lib/clk.c +++ b/src/lib/clk.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/lib/dai.c b/src/lib/dai.c index 02015f33ff10..3d7f0b6cc668 100644 --- a/src/lib/dai.c +++ b/src/lib/dai.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/lib/dma.c b/src/lib/dma.c index 27374690aa1d..6a81b7cba645 100644 --- a/src/lib/dma.c +++ b/src/lib/dma.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/lib/pm_runtime.c b/src/lib/pm_runtime.c index e334241d2a28..67eb308a1930 100644 --- a/src/lib/pm_runtime.c +++ b/src/lib/pm_runtime.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/platform/amd/rembrandt/lib/clk.c b/src/platform/amd/rembrandt/lib/clk.c index 95792cbd9bdc..4d71d4accc76 100644 --- a/src/platform/amd/rembrandt/lib/clk.c +++ b/src/platform/amd/rembrandt/lib/clk.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include const struct freq_table platform_cpu_freq[] = { diff --git a/src/platform/amd/rembrandt/lib/dai.c b/src/platform/amd/rembrandt/lib/dai.c index 896ec8a8b9f5..36b6829a3251 100644 --- a/src/platform/amd/rembrandt/lib/dai.c +++ b/src/platform/amd/rembrandt/lib/dai.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/platform/amd/rembrandt/lib/dma.c b/src/platform/amd/rembrandt/lib/dma.c index 779c05114ae7..384741cdb7f8 100644 --- a/src/platform/amd/rembrandt/lib/dma.c +++ b/src/platform/amd/rembrandt/lib/dma.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include extern struct dma_ops acp_dma_ops; extern struct dma_ops acp_dmic_dma_ops; diff --git a/src/platform/amd/renoir/lib/clk.c b/src/platform/amd/renoir/lib/clk.c index 7450a3350ffc..594825500160 100644 --- a/src/platform/amd/renoir/lib/clk.c +++ b/src/platform/amd/renoir/lib/clk.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include static struct freq_table platform_cpu_freq[] = { diff --git a/src/platform/amd/renoir/lib/dai.c b/src/platform/amd/renoir/lib/dai.c index b34edafa78c0..f74b97d32e32 100644 --- a/src/platform/amd/renoir/lib/dai.c +++ b/src/platform/amd/renoir/lib/dai.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/platform/amd/renoir/lib/dma.c b/src/platform/amd/renoir/lib/dma.c index cbc09f49dba0..6fa28377bf5b 100644 --- a/src/platform/amd/renoir/lib/dma.c +++ b/src/platform/amd/renoir/lib/dma.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #define ACP_ADDR_MASK 0x20000000 diff --git a/src/platform/baytrail/lib/clk.c b/src/platform/baytrail/lib/clk.c index 9994802111ab..68cf0ca3ddd6 100644 --- a/src/platform/baytrail/lib/clk.c +++ b/src/platform/baytrail/lib/clk.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #if CONFIG_BAYTRAIL static const struct freq_table platform_cpu_freq[] = { diff --git a/src/platform/baytrail/lib/dma.c b/src/platform/baytrail/lib/dma.c index 0e1ea80e17f8..2f928d76cd88 100644 --- a/src/platform/baytrail/lib/dma.c +++ b/src/platform/baytrail/lib/dma.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include static const struct dw_drv_plat_data dmac0 = { .chan[0] = { diff --git a/src/platform/haswell/lib/clk.c b/src/platform/haswell/lib/clk.c index 03fde94cecf1..a284f5ea1772 100644 --- a/src/platform/haswell/lib/clk.c +++ b/src/platform/haswell/lib/clk.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include static const struct freq_table platform_cpu_freq[] = { { 32000000, 32000 }, diff --git a/src/platform/haswell/lib/dma.c b/src/platform/haswell/lib/dma.c index 907b05774f5d..4c6addfe7423 100644 --- a/src/platform/haswell/lib/dma.c +++ b/src/platform/haswell/lib/dma.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include static const struct dw_drv_plat_data dmac0 = { .chan[0] = { diff --git a/src/platform/imx8/lib/clk.c b/src/platform/imx8/lib/clk.c index 45d014b56417..9cb6c9f0a1c9 100644 --- a/src/platform/imx8/lib/clk.c +++ b/src/platform/imx8/lib/clk.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #ifdef __ZEPHYR__ #include diff --git a/src/platform/imx8/lib/dai.c b/src/platform/imx8/lib/dai.c index c908bd8c575f..8cd57ded3010 100644 --- a/src/platform/imx8/lib/dai.c +++ b/src/platform/imx8/lib/dai.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/platform/imx8/lib/dma.c b/src/platform/imx8/lib/dma.c index 9ef2a13f9207..6655397d9eec 100644 --- a/src/platform/imx8/lib/dma.c +++ b/src/platform/imx8/lib/dma.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include extern struct dma_ops dummy_dma_ops; extern struct dma_ops edma_ops; diff --git a/src/platform/imx8m/lib/clk.c b/src/platform/imx8m/lib/clk.c index 666e455c17f1..b9a613b251d0 100644 --- a/src/platform/imx8m/lib/clk.c +++ b/src/platform/imx8m/lib/clk.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #ifdef __ZEPHYR__ #include diff --git a/src/platform/imx8m/lib/dai.c b/src/platform/imx8m/lib/dai.c index 323782c6b0ba..a4ef691af065 100644 --- a/src/platform/imx8m/lib/dai.c +++ b/src/platform/imx8m/lib/dai.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/platform/imx8m/lib/dma.c b/src/platform/imx8m/lib/dma.c index 5444773b9efa..d0cf043e5aed 100644 --- a/src/platform/imx8m/lib/dma.c +++ b/src/platform/imx8m/lib/dma.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include extern struct dma_ops dummy_dma_ops; extern struct dma_ops sdma_ops; diff --git a/src/platform/imx8ulp/lib/clk.c b/src/platform/imx8ulp/lib/clk.c index a031f751cf4b..656b9709cae4 100644 --- a/src/platform/imx8ulp/lib/clk.c +++ b/src/platform/imx8ulp/lib/clk.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include const struct freq_table platform_cpu_freq[] = { { 528000000, 528000 }, diff --git a/src/platform/imx8ulp/lib/dai.c b/src/platform/imx8ulp/lib/dai.c index 45d7a241023a..6ee821e002d3 100644 --- a/src/platform/imx8ulp/lib/dai.c +++ b/src/platform/imx8ulp/lib/dai.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/platform/imx8ulp/lib/dma.c b/src/platform/imx8ulp/lib/dma.c index 5515f595bd0e..692a03a7e993 100644 --- a/src/platform/imx8ulp/lib/dma.c +++ b/src/platform/imx8ulp/lib/dma.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include extern struct dma_ops dummy_dma_ops; extern struct dma_ops edma_ops; diff --git a/src/platform/intel/cavs/lib/clk.c b/src/platform/intel/cavs/lib/clk.c index 21d471cd4a5a..871fb6e0e022 100644 --- a/src/platform/intel/cavs/lib/clk.c +++ b/src/platform/intel/cavs/lib/clk.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include diff --git a/src/platform/intel/cavs/lib/dai.c b/src/platform/intel/cavs/lib/dai.c index 0cf77c323f5b..1f5e3b253798 100644 --- a/src/platform/intel/cavs/lib/dai.c +++ b/src/platform/intel/cavs/lib/dai.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/platform/intel/cavs/lib/dma.c b/src/platform/intel/cavs/lib/dma.c index 6684bac8f0ae..e0ac851495da 100644 --- a/src/platform/intel/cavs/lib/dma.c +++ b/src/platform/intel/cavs/lib/dma.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #ifdef __ZEPHYR__ #include #endif diff --git a/src/platform/intel/cavs/lib/pm_runtime.c b/src/platform/intel/cavs/lib/pm_runtime.c index 7e282863842e..d6383d63c391 100644 --- a/src/platform/intel/cavs/lib/pm_runtime.c +++ b/src/platform/intel/cavs/lib/pm_runtime.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/platform/mt8186/lib/clk.c b/src/platform/mt8186/lib/clk.c index 7d21da9a0a1e..a4ac09a436c1 100644 --- a/src/platform/mt8186/lib/clk.c +++ b/src/platform/mt8186/lib/clk.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include /* 53863428-9a72-44df-af0f-fe45ea2348ba */ diff --git a/src/platform/mt8186/lib/dai.c b/src/platform/mt8186/lib/dai.c index 2403836d94e1..1d287a767097 100644 --- a/src/platform/mt8186/lib/dai.c +++ b/src/platform/mt8186/lib/dai.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/platform/mt8186/lib/dma.c b/src/platform/mt8186/lib/dma.c index a0b46d615d96..b6387241dbcc 100644 --- a/src/platform/mt8186/lib/dma.c +++ b/src/platform/mt8186/lib/dma.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/platform/mt8195/lib/clk.c b/src/platform/mt8195/lib/clk.c index 47cfc793c1f7..d79664396283 100644 --- a/src/platform/mt8195/lib/clk.c +++ b/src/platform/mt8195/lib/clk.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include DECLARE_SOF_UUID("clkdrv", clkdrv_uuid, 0x23b12fd5, 0xc2a9, 0x41a8, 0xa2, 0xb3, 0x23, 0x1a, 0xb7, 0xdc, 0xdc, 0x70); diff --git a/src/platform/mt8195/lib/dai.c b/src/platform/mt8195/lib/dai.c index 2a0472704469..43a4986a957e 100644 --- a/src/platform/mt8195/lib/dai.c +++ b/src/platform/mt8195/lib/dai.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/platform/mt8195/lib/dma.c b/src/platform/mt8195/lib/dma.c index ff0c97add467..38fa7af42709 100644 --- a/src/platform/mt8195/lib/dma.c +++ b/src/platform/mt8195/lib/dma.c @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/schedule/ll_schedule.c b/src/schedule/ll_schedule.c index 840b03678ebe..d46dc3f5a3f6 100644 --- a/src/schedule/ll_schedule.c +++ b/src/schedule/ll_schedule.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/schedule/zephyr_ll.c b/src/schedule/zephyr_ll.c index 3f4fdb793df0..22f74d75a9ad 100644 --- a/src/schedule/zephyr_ll.c +++ b/src/schedule/zephyr_ll.c @@ -5,7 +5,7 @@ // Author: Guennadi Liakhovetski #include -#include +#include #include #include #include diff --git a/src/spinlock.c b/src/spinlock.c index 34cc5e533968..d0830b16abb8 100644 --- a/src/spinlock.c +++ b/src/spinlock.c @@ -8,7 +8,7 @@ #if CONFIG_DEBUG_LOCKS #include #endif -#include +#include #include diff --git a/src/trace/dma-trace.c b/src/trace/dma-trace.c index 2a76d323a0d1..445d7f60b6d3 100644 --- a/src/trace/dma-trace.c +++ b/src/trace/dma-trace.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/trace/trace.c b/src/trace/trace.c index 40a8bc63974c..56065f656340 100644 --- a/src/trace/trace.c +++ b/src/trace/trace.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/cmocka/src/common_mocks.c b/test/cmocka/src/common_mocks.c index 168b8cac2626..0c5c1cd1ea39 100644 --- a/test/cmocka/src/common_mocks.c +++ b/test/cmocka/src/common_mocks.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tools/fuzzer/CMakeLists.txt b/tools/fuzzer/CMakeLists.txt index 1ec6b9f6deb2..00be17cff2f2 100644 --- a/tools/fuzzer/CMakeLists.txt +++ b/tools/fuzzer/CMakeLists.txt @@ -53,8 +53,7 @@ ExternalProject_Add(sof_parser_ep SOURCE_DIR "${parser_src_dir}" PREFIX "${PROJECT_BINARY_DIR}/sof_parser" BINARY_DIR "${PROJECT_BINARY_DIR}/sof_parser/build" - CMAKE_ARGS - -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/sof_parser/install + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${parser_install_dir} -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE} BUILD_ALWAYS 1 BUILD_BYPRODUCTS "${parser_install_dir}/lib/libsof_tplg_parser.so" @@ -76,4 +75,19 @@ if(LIBRT) target_link_libraries(sof-fuzzer PRIVATE ${LIBRT}) endif() +set(SOF_ROOT_SOURCE_DIRECTORY "${PROJECT_SOURCE_DIR}/../..") + +target_include_directories(sof-fuzzer PRIVATE + "${SOF_ROOT_SOURCE_DIRECTORY}/src/include" + "${SOF_ROOT_SOURCE_DIRECTORY}/src/arch/host/include" + "${SOF_ROOT_SOURCE_DIRECTORY}" +) + +# TODO: fuzzer should not need RTOS headers: FIX. +if (NOT CONFIG_SOF_ZEPHYR_STRICT_HEADERS) +target_include_directories(sof-fuzzer PRIVATE + "${SOF_ROOT_SOURCE_DIRECTORY}/xtos/include" +) +endif() + install(TARGETS sof-fuzzer DESTINATION bin) diff --git a/tools/logger/CMakeLists.txt b/tools/logger/CMakeLists.txt index 57637706c5d6..0c7b2d8d914b 100644 --- a/tools/logger/CMakeLists.txt +++ b/tools/logger/CMakeLists.txt @@ -39,4 +39,9 @@ target_include_directories(sof-logger PRIVATE "${SOF_ROOT_SOURCE_DIRECTORY}" ) +# TODO: logger should not need to include RTOS headers. FIX. +target_include_directories(sof-logger PRIVATE + "${SOF_ROOT_SOURCE_DIRECTORY}/xtos/include" +) + install(TARGETS sof-logger DESTINATION bin) diff --git a/tools/probes/CMakeLists.txt b/tools/probes/CMakeLists.txt index 21f6f2decfb9..86d03812b685 100644 --- a/tools/probes/CMakeLists.txt +++ b/tools/probes/CMakeLists.txt @@ -15,4 +15,9 @@ target_include_directories(sof-probes PRIVATE "../../src/include" ) +# TODO: probes should not need to include RTOS headers. FIX. +target_include_directories(sof-probes PRIVATE + "../../xtos/include" +) + install(TARGETS sof-probes DESTINATION bin) diff --git a/tools/testbench/CMakeLists.txt b/tools/testbench/CMakeLists.txt index 5c2cf2f48b29..4ba5b99c9cfc 100644 --- a/tools/testbench/CMakeLists.txt +++ b/tools/testbench/CMakeLists.txt @@ -23,6 +23,13 @@ set(sof_binary_directory "${PROJECT_BINARY_DIR}/sof_ep/build") set(config_h ${sof_binary_directory}/library_autoconfig.h) +# TODO: testbench should not need RTOS headers: FIX. +if (NOT CONFIG_SOF_ZEPHYR_STRICT_HEADERS) +target_include_directories(testbench PRIVATE + "${PROJECT_SOURCE_DIR}/xtos/include" +) +endif() + target_compile_options(testbench PRIVATE -g -O3 -Wall -Werror -Wl,-EL -Wmissing-prototypes -Wimplicit-fallthrough -DCONFIG_LIBRARY -imacros${config_h}) @@ -30,7 +37,6 @@ target_link_libraries(testbench PRIVATE -ldl -lm) install(TARGETS testbench DESTINATION bin) - include(ExternalProject) ExternalProject_Add(sof_ep diff --git a/tools/tplg_parser/CMakeLists.txt b/tools/tplg_parser/CMakeLists.txt index e6b635a24b38..c89e3183cdb0 100644 --- a/tools/tplg_parser/CMakeLists.txt +++ b/tools/tplg_parser/CMakeLists.txt @@ -36,6 +36,9 @@ target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/i target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/arch/host/include) target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/src/platform/library/include) +# TODO: The topology parser should NOT need to include RTOS header. FIX. +target_include_directories(sof_tplg_parser PRIVATE ${sof_source_directory}/xtos/include) + # TODO: add IPC4 option when it's ready. target_compile_options(sof_tplg_parser PRIVATE -g -O -Wall -Werror -Wl,-EL -fPIC -DPIC diff --git a/src/arch/xtos-wrapper/CMakeLists.txt b/xtos/include/CMakeLists.txt similarity index 100% rename from src/arch/xtos-wrapper/CMakeLists.txt rename to xtos/include/CMakeLists.txt diff --git a/src/arch/xtos-wrapper/include/zephyr/kernel.h b/xtos/include/rtos/kernel.h similarity index 87% rename from src/arch/xtos-wrapper/include/zephyr/kernel.h rename to xtos/include/rtos/kernel.h index 67ac0a7ed32c..fd749f21ff1e 100644 --- a/src/arch/xtos-wrapper/include/zephyr/kernel.h +++ b/xtos/include/rtos/kernel.h @@ -5,8 +5,8 @@ * Author: Jyri Sarha */ -#ifndef __XTOS_WRAPPER_KERNEL_H__ -#define __XTOS_WRAPPER_KERNEL_H__ +#ifndef __XTOS_RTOS_KERNEL_H__ +#define __XTOS_RTOS_KERNEL_H__ #include @@ -41,4 +41,4 @@ static inline void k_usleep(int32_t us) wait_delay_us(us); } -#endif /* __XTOS_WRAPPER_KERNEL_H__ */ +#endif /* __XTOS_RTOS_KERNEL_H__ */ diff --git a/src/include/sof/spinlock.h b/xtos/include/rtos/spinlock.h similarity index 93% rename from src/include/sof/spinlock.h rename to xtos/include/rtos/spinlock.h index ce17dc1b6a5d..410c66bb920b 100644 --- a/src/include/sof/spinlock.h +++ b/xtos/include/rtos/spinlock.h @@ -10,13 +10,11 @@ * Simple spinlock implementation for SOF. */ -#ifndef __SOF_SPINLOCK_H__ -#define __SOF_SPINLOCK_H__ +#ifndef __XTOS_RTOS_SPINLOCK_H__ +#define __XTOS_RTOS_SPINLOCK_H__ -#ifndef __ZEPHYR__ #include typedef uint32_t k_spinlock_key_t; -#endif #include #include @@ -143,8 +141,6 @@ extern struct tr_ctx sl_tr; #endif /* CONFIG_DEBUG_LOCKS */ -#ifndef __ZEPHYR__ - /* all SMP spinlocks need init, nothing todo on UP */ static inline void _spinlock_init(struct k_spinlock *lock, int line) { @@ -164,18 +160,4 @@ k_spinlock_key_t _k_spin_lock_irq(struct k_spinlock *lock); void _k_spin_unlock_irq(struct k_spinlock *lock, k_spinlock_key_t key, int line); #define k_spin_unlock(lock, key) _k_spin_unlock_irq(lock, key, __LINE__) -#else - -#include - -/* This has to be moved to Zephyr */ -static inline void k_spinlock_init(struct k_spinlock *lock) -{ -#ifdef CONFIG_SMP - atomic_set(&lock->locked, 0); -#endif -} - -#endif /* __ZEPHYR__ */ - -#endif /* __SOF_SPINLOCK_H__ */ +#endif /* __XTOS_RTOS_SPINLOCK_H__ */ diff --git a/src/include/sof/atomic.h b/xtos/include/sof/atomic.h similarity index 100% rename from src/include/sof/atomic.h rename to xtos/include/sof/atomic.h diff --git a/src/include/sof/bit.h b/xtos/include/sof/bit.h similarity index 100% rename from src/include/sof/bit.h rename to xtos/include/sof/bit.h diff --git a/src/include/sof/compiler_attributes.h b/xtos/include/sof/compiler_attributes.h similarity index 100% rename from src/include/sof/compiler_attributes.h rename to xtos/include/sof/compiler_attributes.h diff --git a/src/include/sof/compiler_info.h b/xtos/include/sof/compiler_info.h similarity index 91% rename from src/include/sof/compiler_info.h rename to xtos/include/sof/compiler_info.h index 4a3e2e514d90..9716575b7188 100644 --- a/src/include/sof/compiler_info.h +++ b/xtos/include/sof/compiler_info.h @@ -6,7 +6,7 @@ */ /** - * \file include/sof/compiler_info.h + * \file xtos/include/sof/compiler_info.h * \brief Compiler version and name descriptor * \author Karol Trzcinski */ diff --git a/src/arch/xtos-wrapper/include/sof/drivers/timer.h b/xtos/include/sof/drivers/timer.h similarity index 100% rename from src/arch/xtos-wrapper/include/sof/drivers/timer.h rename to xtos/include/sof/drivers/timer.h diff --git a/src/include/sof/init.h b/xtos/include/sof/init.h similarity index 100% rename from src/include/sof/init.h rename to xtos/include/sof/init.h diff --git a/src/include/sof/lib/agent.h b/xtos/include/sof/lib/agent.h similarity index 100% rename from src/include/sof/lib/agent.h rename to xtos/include/sof/lib/agent.h diff --git a/src/include/sof/lib/alloc.h b/xtos/include/sof/lib/alloc.h similarity index 99% rename from src/include/sof/lib/alloc.h rename to xtos/include/sof/lib/alloc.h index 8f84ab9beefd..39e67e8c214e 100644 --- a/src/include/sof/lib/alloc.h +++ b/xtos/include/sof/lib/alloc.h @@ -7,7 +7,7 @@ */ /** - * \file include/sof/lib/alloc.h + * \file xtos/include/sof/lib/alloc.h * \brief Memory Allocation API definition * \author Liam Girdwood * \author Keyon Jie diff --git a/src/include/sof/lib/cache.h b/xtos/include/sof/lib/cache.h similarity index 92% rename from src/include/sof/lib/cache.h rename to xtos/include/sof/lib/cache.h index 1418845fc096..188e0a826a84 100644 --- a/src/include/sof/lib/cache.h +++ b/xtos/include/sof/lib/cache.h @@ -6,7 +6,7 @@ */ /** - * \file include/sof/lib/cache.h + * \file xtos/include/sof/lib/cache.h * \brief Cache header file * \authors Tomasz Lauda */ diff --git a/src/include/sof/lib/clk.h b/xtos/include/sof/lib/clk.h similarity index 98% rename from src/include/sof/lib/clk.h rename to xtos/include/sof/lib/clk.h index 95d7eee966b4..437467b2e713 100644 --- a/src/include/sof/lib/clk.h +++ b/xtos/include/sof/lib/clk.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include diff --git a/src/include/sof/lib/cpu.h b/xtos/include/sof/lib/cpu.h similarity index 97% rename from src/include/sof/lib/cpu.h rename to xtos/include/sof/lib/cpu.h index c178239eafc6..ebab5c8d7a53 100644 --- a/src/include/sof/lib/cpu.h +++ b/xtos/include/sof/lib/cpu.h @@ -6,7 +6,7 @@ */ /** - * \file include/sof/lib/cpu.h + * \file xtos/include/sof/lib/cpu.h * \brief CPU header file * \authors Tomasz Lauda */ diff --git a/src/include/sof/lib/dai.h b/xtos/include/sof/lib/dai.h similarity index 93% rename from src/include/sof/lib/dai.h rename to xtos/include/sof/lib/dai.h index 150ac5f48fff..27f593dd32ec 100644 --- a/src/include/sof/lib/dai.h +++ b/xtos/include/sof/lib/dai.h @@ -7,7 +7,7 @@ */ /** - * \file include/sof/lib/dai.h + * \file xtos/include/sof/lib/dai.h * \brief DAI Drivers definition * \author Liam Girdwood * \author Keyon Jie diff --git a/src/include/sof/lib/dma.h b/xtos/include/sof/lib/dma.h similarity index 99% rename from src/include/sof/lib/dma.h rename to xtos/include/sof/lib/dma.h index 4f8f24bb35f5..93a4cbb9edac 100644 --- a/src/include/sof/lib/dma.h +++ b/xtos/include/sof/lib/dma.h @@ -7,7 +7,7 @@ */ /** - * \file include/sof/lib/dma.h + * \file xtos/include/sof/lib/dma.h * \brief DMA Drivers definition * \author Liam Girdwood * \author Keyon Jie @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/include/sof/lib/io.h b/xtos/include/sof/lib/io.h similarity index 100% rename from src/include/sof/lib/io.h rename to xtos/include/sof/lib/io.h diff --git a/src/include/sof/lib/mailbox.h b/xtos/include/sof/lib/mailbox.h similarity index 100% rename from src/include/sof/lib/mailbox.h rename to xtos/include/sof/lib/mailbox.h diff --git a/src/include/sof/lib/memory.h b/xtos/include/sof/lib/memory.h similarity index 100% rename from src/include/sof/lib/memory.h rename to xtos/include/sof/lib/memory.h diff --git a/src/include/sof/lib/mm_heap.h b/xtos/include/sof/lib/mm_heap.h similarity index 99% rename from src/include/sof/lib/mm_heap.h rename to xtos/include/sof/lib/mm_heap.h index 29c0ba57f993..3c44e559b499 100644 --- a/src/include/sof/lib/mm_heap.h +++ b/xtos/include/sof/lib/mm_heap.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/include/sof/lib/perf_cnt.h b/xtos/include/sof/lib/perf_cnt.h similarity index 99% rename from src/include/sof/lib/perf_cnt.h rename to xtos/include/sof/lib/perf_cnt.h index 6e7cf45c63c1..4af812aee5ce 100644 --- a/src/include/sof/lib/perf_cnt.h +++ b/xtos/include/sof/lib/perf_cnt.h @@ -6,7 +6,7 @@ */ /** - * \file include/sof/lib/perf_cnt.h + * \file xtos/include/sof/lib/perf_cnt.h * \brief Simple performance counters * \author Marcin Maka */ diff --git a/src/include/sof/lib/pm_runtime.h b/xtos/include/sof/lib/pm_runtime.h similarity index 98% rename from src/include/sof/lib/pm_runtime.h rename to xtos/include/sof/lib/pm_runtime.h index 064b7584a1a7..ddacd055c322 100644 --- a/src/include/sof/lib/pm_runtime.h +++ b/xtos/include/sof/lib/pm_runtime.h @@ -7,7 +7,7 @@ */ /** - * \file include/sof/lib/pm_runtime.h + * \file xtos/include/sof/lib/pm_runtime.h * \brief Runtime power management header file * \author Tomasz Lauda */ @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/include/sof/lib/shim.h b/xtos/include/sof/lib/shim.h similarity index 100% rename from src/include/sof/lib/shim.h rename to xtos/include/sof/lib/shim.h diff --git a/src/include/sof/lib/wait.h b/xtos/include/sof/lib/wait.h similarity index 90% rename from src/include/sof/lib/wait.h rename to xtos/include/sof/lib/wait.h index 92d07f24aa9f..85150e33e78c 100644 --- a/src/include/sof/lib/wait.h +++ b/xtos/include/sof/lib/wait.h @@ -14,11 +14,7 @@ #include #include -#include -#include -#include -#include -#include +#include #include #include diff --git a/src/include/sof/list.h b/xtos/include/sof/list.h similarity index 100% rename from src/include/sof/list.h rename to xtos/include/sof/list.h diff --git a/src/include/sof/string.h b/xtos/include/sof/string.h similarity index 100% rename from src/include/sof/string.h rename to xtos/include/sof/string.h diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index c4109ad4cc4a..4cf79b0c0210 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -84,10 +84,18 @@ ExternalProject_Add(sof_logger_ep # default SOF includes target_include_directories(SOF INTERFACE ../rimage/src/include) -target_include_directories(SOF INTERFACE ../zephyr/include) target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/include) target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/arch/${ARCH}/include) +# TODO: Zephyr should not need xtos headers: FIX. +if (CONFIG_SOF_ZEPHYR_STRICT_HEADERS) + target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/../zephyr/include) +else() + # include Zephyr before xtos to flag up any errors in SOF + target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/../zephyr/include) + target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/../xtos/include) +endif() + # SOF module init zephyr_library_named(modules_sof) zephyr_include_directories( diff --git a/zephyr/Kconfig b/zephyr/Kconfig index 7700bd5da336..4f047f5b1f3c 100644 --- a/zephyr/Kconfig +++ b/zephyr/Kconfig @@ -18,4 +18,14 @@ config ZEPHYR_NATIVE_DRIVERS dai-zephyr will be used instead of legacy xtos version. +config SOF_ZEPHYR_STRICT_HEADERS + bool "Experimental: Force build with Zephyr RTOS headers only" + default n + help + This is a transitional option that allows developers to test builds + only using the Zephyr RTOS headers. This will eventually become the + default header configuration when native Zephyr is ready and this menu + choice will be removed. + If unsure, say n. + endif diff --git a/zephyr/include/rtos/kernel.h b/zephyr/include/rtos/kernel.h new file mode 100644 index 000000000000..17d388cbf8e8 --- /dev/null +++ b/zephyr/include/rtos/kernel.h @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: BSD-3-Clause +// +// Copyright(c) 2020 Intel Corporation. All rights reserved. +// + +#ifndef __ZEPHYR_RTOS_KERNEL_H__ +#define __ZEPHYR_RTOS_KERNEL_H__ + +#include + +#endif /* __ZEPHYR_RTOS_KERNEL_H__ */ diff --git a/zephyr/include/rtos/spinlock.h b/zephyr/include/rtos/spinlock.h new file mode 100644 index 000000000000..24b0ee9dc579 --- /dev/null +++ b/zephyr/include/rtos/spinlock.h @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: BSD-3-Clause +// +// Copyright(c) 2020 Intel Corporation. All rights reserved. +// + +#ifndef __ZEPHYR_RTOS_SPINLOCK_H__ +#define __ZEPHYR_RTOS_SPINLOCK_H__ + +#include +#include + +/* not implemented on Zephyr, but used within SOF */ +static inline void k_spinlock_init(struct k_spinlock *lock) +{ +#ifdef CONFIG_SMP + atomic_set(&lock->locked, 0); +#endif +} + +#endif /* __ZEPHYR_RTOS_SPINLOCK_H__ */ From 2bd2cbf56f21d1a8e1f0ee44b17cc248a8fadaf3 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Fri, 19 Aug 2022 20:40:52 +0100 Subject: [PATCH 2/4] header: rtos: use rtos specific version of atomic.h No runtime functional change. Code can now include Signed-off-by: Liam Girdwood --- src/drivers/amd/rembrandt/acp_bt_dma.c | 2 +- src/drivers/amd/rembrandt/acp_dmic_dma.c | 2 +- src/drivers/amd/rembrandt/acp_hs_dma.c | 2 +- src/drivers/amd/rembrandt/acp_sp_dma.c | 2 +- src/drivers/amd/renoir/acp_bt_dma.c | 2 +- src/drivers/amd/renoir/acp_dmic_dma.c | 2 +- src/drivers/amd/renoir/acp_sp_dma.c | 2 +- src/drivers/dw/dma.c | 2 +- src/drivers/generic/dummy-dma.c | 2 +- src/drivers/intel/hda/hda-dma.c | 2 +- src/include/sof/schedule/ll_schedule_domain.h | 2 +- src/lib/dma.c | 2 +- src/schedule/ll_schedule.c | 2 +- xtos/include/{sof => rtos}/atomic.h | 5 ----- xtos/include/sof/lib/agent.h | 2 +- xtos/include/sof/lib/dma.h | 2 +- zephyr/CMakeLists.txt | 1 - zephyr/include/{sof => rtos}/atomic.h | 6 +++--- 18 files changed, 18 insertions(+), 24 deletions(-) rename xtos/include/{sof => rtos}/atomic.h (91%) rename zephyr/include/{sof => rtos}/atomic.h (84%) diff --git a/src/drivers/amd/rembrandt/acp_bt_dma.c b/src/drivers/amd/rembrandt/acp_bt_dma.c index 8ce98032b3ee..09eb99716fc7 100644 --- a/src/drivers/amd/rembrandt/acp_bt_dma.c +++ b/src/drivers/amd/rembrandt/acp_bt_dma.c @@ -5,7 +5,7 @@ //Author: Basavaraj Hiregoudar // Bala Kishore -#include +#include #include #include #include diff --git a/src/drivers/amd/rembrandt/acp_dmic_dma.c b/src/drivers/amd/rembrandt/acp_dmic_dma.c index 99589da43e57..e8ed41682fff 100644 --- a/src/drivers/amd/rembrandt/acp_dmic_dma.c +++ b/src/drivers/amd/rembrandt/acp_dmic_dma.c @@ -5,7 +5,7 @@ //Author: Basavaraj Hiregoudar // Bala Kishore -#include +#include #include #include #include diff --git a/src/drivers/amd/rembrandt/acp_hs_dma.c b/src/drivers/amd/rembrandt/acp_hs_dma.c index ba4ca8cbed84..e33eaa8ca833 100644 --- a/src/drivers/amd/rembrandt/acp_hs_dma.c +++ b/src/drivers/amd/rembrandt/acp_hs_dma.c @@ -5,7 +5,7 @@ //Author: Basavaraj Hiregoudar // Bala Kishore -#include +#include #include #include #include diff --git a/src/drivers/amd/rembrandt/acp_sp_dma.c b/src/drivers/amd/rembrandt/acp_sp_dma.c index 4865040a39aa..a13034ad5c29 100644 --- a/src/drivers/amd/rembrandt/acp_sp_dma.c +++ b/src/drivers/amd/rembrandt/acp_sp_dma.c @@ -5,7 +5,7 @@ //Author: Basavaraj Hiregoudar // Bala Kishore -#include +#include #include #include #include diff --git a/src/drivers/amd/renoir/acp_bt_dma.c b/src/drivers/amd/renoir/acp_bt_dma.c index 77682f33750f..a44c72d309bc 100644 --- a/src/drivers/amd/renoir/acp_bt_dma.c +++ b/src/drivers/amd/renoir/acp_bt_dma.c @@ -6,7 +6,7 @@ // Anup Kulkarni // Bala Kishore -#include +#include #include #include #include diff --git a/src/drivers/amd/renoir/acp_dmic_dma.c b/src/drivers/amd/renoir/acp_dmic_dma.c index e6c50b570bcd..b948327963fb 100644 --- a/src/drivers/amd/renoir/acp_dmic_dma.c +++ b/src/drivers/amd/renoir/acp_dmic_dma.c @@ -5,7 +5,7 @@ //Author: Basavaraj Hiregoudar // Anup Kulkarni -#include +#include #include #include #include diff --git a/src/drivers/amd/renoir/acp_sp_dma.c b/src/drivers/amd/renoir/acp_sp_dma.c index 6430451fd947..c8151b13b3d7 100644 --- a/src/drivers/amd/renoir/acp_sp_dma.c +++ b/src/drivers/amd/renoir/acp_sp_dma.c @@ -6,7 +6,7 @@ // Anup Kulkarni // Bala Kishore -#include +#include #include #include #include diff --git a/src/drivers/dw/dma.c b/src/drivers/dw/dma.c index 20ae96ae605b..245895e01768 100644 --- a/src/drivers/dw/dma.c +++ b/src/drivers/dw/dma.c @@ -20,7 +20,7 @@ * used to construct the DMA configuration for the host client 1 above. */ -#include +#include #include #include #include diff --git a/src/drivers/generic/dummy-dma.c b/src/drivers/generic/dummy-dma.c index bf20c8209be7..da8da98588ad 100644 --- a/src/drivers/generic/dummy-dma.c +++ b/src/drivers/generic/dummy-dma.c @@ -25,7 +25,7 @@ * holds if you have CONFIG_HOST_PTABLE enabled, at least currently. */ -#include +#include #include #include #include diff --git a/src/drivers/intel/hda/hda-dma.c b/src/drivers/intel/hda/hda-dma.c index 4832b1ca3ba4..a045b2bf46e5 100644 --- a/src/drivers/intel/hda/hda-dma.c +++ b/src/drivers/intel/hda/hda-dma.c @@ -5,7 +5,7 @@ // Author: Keyon Jie // Liam Girdwood -#include +#include #include #include #include diff --git a/src/include/sof/schedule/ll_schedule_domain.h b/src/include/sof/schedule/ll_schedule_domain.h index 5e959bed38f0..f0aeb1feded1 100644 --- a/src/include/sof/schedule/ll_schedule_domain.h +++ b/src/include/sof/schedule/ll_schedule_domain.h @@ -8,7 +8,7 @@ #ifndef __SOF_SCHEDULE_LL_SCHEDULE_DOMAIN_H__ #define __SOF_SCHEDULE_LL_SCHEDULE_DOMAIN_H__ -#include +#include #include #include #include diff --git a/src/lib/dma.c b/src/lib/dma.c index 6a81b7cba645..2428e6540904 100644 --- a/src/lib/dma.c +++ b/src/lib/dma.c @@ -4,7 +4,7 @@ // // Author: Ranjani Sridharan -#include +#include #include #include #include diff --git a/src/schedule/ll_schedule.c b/src/schedule/ll_schedule.c index d46dc3f5a3f6..d7fc1e0df850 100644 --- a/src/schedule/ll_schedule.c +++ b/src/schedule/ll_schedule.c @@ -6,7 +6,7 @@ // Keyon Jie // Tomasz Lauda -#include +#include #include #include #include diff --git a/xtos/include/sof/atomic.h b/xtos/include/rtos/atomic.h similarity index 91% rename from xtos/include/sof/atomic.h rename to xtos/include/rtos/atomic.h index c35fe5ffe29e..6d16b6b6c9e6 100644 --- a/xtos/include/sof/atomic.h +++ b/xtos/include/rtos/atomic.h @@ -5,9 +5,6 @@ * Author: Liam Girdwood */ -#ifdef __ZEPHYR__ -#include -#else #ifndef __SOF_ATOMIC_H__ #define __SOF_ATOMIC_H__ @@ -40,5 +37,3 @@ static inline int32_t atomic_sub(atomic_t *a, int32_t value) } #endif /* __SOF_ATOMIC_H__ */ - -#endif /*__ZEPHYR__ */ diff --git a/xtos/include/sof/lib/agent.h b/xtos/include/sof/lib/agent.h index 8e863308a1cb..a5ed1ddcf0b9 100644 --- a/xtos/include/sof/lib/agent.h +++ b/xtos/include/sof/lib/agent.h @@ -8,7 +8,7 @@ #ifndef __SOF_LIB_AGENT_H__ #define __SOF_LIB_AGENT_H__ -#include +#include #include #include #include diff --git a/xtos/include/sof/lib/dma.h b/xtos/include/sof/lib/dma.h index 93a4cbb9edac..85417b614389 100644 --- a/xtos/include/sof/lib/dma.h +++ b/xtos/include/sof/lib/dma.h @@ -17,7 +17,7 @@ #define __SOF_LIB_DMA_H__ #include -#include +#include #include #include #include diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 4cf79b0c0210..56a273be6bc9 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -531,7 +531,6 @@ zephyr_library_sources( ${SOF_IPC_PATH}/dma-copy.c ${SOF_IPC_PATH}/ipc-common.c ${SOF_IPC_PATH}/ipc-helper.c - ${SOF_SRC_PATH}/spinlock.c # SOF math utilities ${SOF_MATH_PATH}/decibels.c diff --git a/zephyr/include/sof/atomic.h b/zephyr/include/rtos/atomic.h similarity index 84% rename from zephyr/include/sof/atomic.h rename to zephyr/include/rtos/atomic.h index 92ff9d7c9d48..60b1ba3b9180 100644 --- a/zephyr/include/sof/atomic.h +++ b/zephyr/include/rtos/atomic.h @@ -3,8 +3,8 @@ // Copyright(c) 2020 Intel Corporation. All rights reserved. // -#ifndef __INCLUDE_ATOMIC_H_ -#define __INCLUDE_ATOMIC_H_ +#ifndef __ZEPHYR_RTOS_ATOMIC_H__ +#define __ZEPHYR_RTOS_ATOMIC_H__ #include @@ -17,4 +17,4 @@ #define atomic_read(p) ((long)atomic_get(p)) #define atomic_init(p, v) atomic_set(p, v) -#endif +#endif /*__ZEPHYR_RTOS_ATOMIC_H__ */ From 04dbc353c61f819c69b8f3088fdaa7a06b1d73d6 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Fri, 19 Aug 2022 21:07:29 +0100 Subject: [PATCH 3/4] header: rtos: use rtos specific version of bit.h No runtime functional change. Code can now include Signed-off-by: Liam Girdwood --- src/audio/channel_map.c | 2 +- src/audio/mux/mux_generic.c | 2 +- .../pcm_converter/pcm_converter_generic.c | 2 +- src/audio/smart_amp/smart_amp_maxim_dsm.c | 2 +- src/drivers/amd/rembrandt/acp_bt_dma.c | 2 +- src/drivers/amd/rembrandt/acp_dmic_dma.c | 2 +- src/drivers/amd/rembrandt/acp_hs_dma.c | 2 +- src/drivers/amd/rembrandt/acp_sp_dma.c | 2 +- src/drivers/amd/renoir/acp_bt_dma.c | 2 +- src/drivers/amd/renoir/acp_dmic_dma.c | 2 +- src/drivers/amd/renoir/acp_sp_dma.c | 2 +- src/drivers/dw/dma.c | 2 +- src/drivers/imx/sai.c | 2 +- src/drivers/intel/hda/hda-dma.c | 2 +- src/drivers/mediatek/mt8186/interrupt.c | 2 +- src/drivers/mediatek/mt8195/interrupt.c | 2 +- src/include/ipc/header-intel-cavs.h | 2 +- src/include/ipc/probe.h | 2 +- src/include/ipc4/gateway.h | 2 +- src/include/ipc4/mixin_mixout.h | 2 +- src/include/sof/audio/aria/aria.h | 2 +- .../sof/audio/up_down_mixer/up_down_mixer.h | 2 +- src/include/sof/audio/volume.h | 2 +- src/include/sof/drivers/acp_dai_dma.h | 2 +- src/include/sof/drivers/afe-dai.h | 2 +- src/include/sof/drivers/afe-memif.h | 2 +- src/include/sof/drivers/dmic.h | 2 +- src/include/sof/drivers/dw-dma.h | 2 +- src/include/sof/drivers/edma.h | 2 +- src/include/sof/drivers/esai.h | 2 +- src/include/sof/drivers/mu.h | 2 +- src/include/sof/drivers/sai.h | 2 +- src/include/sof/drivers/ssp.h | 2 +- src/include/sof/ipc/common.h | 2 +- src/include/sof/lib/dai-legacy.h | 2 +- src/include/sof/lib/dai-zephyr.h | 2 +- src/include/sof/lib/notifier.h | 2 +- src/init/ext_manifest.c | 2 +- .../include/platform/drivers/interrupt.h | 2 +- .../include/platform/drivers/interrupt.h | 2 +- .../include/platform/drivers/interrupt.h | 2 +- .../apollolake/include/platform/lib/shim.h | 2 +- .../include/platform/drivers/dw-dma.h | 2 +- .../include/platform/drivers/interrupt.h | 2 +- .../include/platform/drivers/interrupt.h | 2 +- .../cannonlake/include/platform/lib/shim.h | 2 +- .../haswell/include/platform/drivers/dw-dma.h | 2 +- .../include/platform/drivers/interrupt.h | 2 +- .../include/platform/drivers/interrupt.h | 2 +- .../icelake/include/platform/lib/shim.h | 2 +- .../imx8/include/platform/drivers/interrupt.h | 2 +- .../include/platform/drivers/interrupt.h | 2 +- .../include/platform/drivers/interrupt.h | 2 +- .../intel/cavs/alternate_reset_vector.S | 2 +- src/platform/intel/cavs/boot_loader.c | 2 +- .../intel/cavs/include/cavs/drivers/dw-dma.h | 2 +- .../intel/cavs/include/cavs/drivers/mn.h | 2 +- .../cavs/include/cavs/drivers/sideband-ipc.h | 2 +- .../cavs/include/cavs/drivers/timestamp.h | 2 +- .../intel/cavs/include/cavs/lib/pm_memory.h | 2 +- .../intel/cavs/include/cavs/mem_window.h | 2 +- .../mt8186/include/platform/drivers/timer.h | 2 +- .../mt8195/include/platform/drivers/timer.h | 2 +- .../include/platform/drivers/interrupt.h | 2 +- .../suecreek/include/platform/lib/shim.h | 2 +- .../include/platform/drivers/interrupt.h | 2 +- .../tigerlake/include/platform/lib/shim.h | 2 +- src/schedule/dma_multi_chan_domain.c | 2 +- src/schedule/dma_single_chan_domain.c | 2 +- tools/fuzzer/platform/mu.h | 2 +- xtos/include/{sof => rtos}/bit.h | 11 +++----- xtos/include/sof/lib/alloc.h | 2 +- xtos/include/sof/lib/dma.h | 2 +- zephyr/include/rtos/bit.h | 25 +++++++++++++++++++ 74 files changed, 100 insertions(+), 80 deletions(-) rename xtos/include/{sof => rtos}/bit.h (77%) create mode 100644 zephyr/include/rtos/bit.h diff --git a/src/audio/channel_map.c b/src/audio/channel_map.c index b880dc678d37..4c116d55cfa9 100644 --- a/src/audio/channel_map.c +++ b/src/audio/channel_map.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/mux/mux_generic.c b/src/audio/mux/mux_generic.c index 8d4d52aa5217..ade461b9dbc6 100644 --- a/src/audio/mux/mux_generic.c +++ b/src/audio/mux/mux_generic.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/pcm_converter/pcm_converter_generic.c b/src/audio/pcm_converter/pcm_converter_generic.c index 1b9e61eb5d85..1cc7dc38685d 100644 --- a/src/audio/pcm_converter/pcm_converter_generic.c +++ b/src/audio/pcm_converter/pcm_converter_generic.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/audio/smart_amp/smart_amp_maxim_dsm.c b/src/audio/smart_amp/smart_amp_maxim_dsm.c index 14cf31119f65..89d7ce372c2b 100644 --- a/src/audio/smart_amp/smart_amp_maxim_dsm.c +++ b/src/audio/smart_amp/smart_amp_maxim_dsm.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/rembrandt/acp_bt_dma.c b/src/drivers/amd/rembrandt/acp_bt_dma.c index 09eb99716fc7..85c84cf45bb2 100644 --- a/src/drivers/amd/rembrandt/acp_bt_dma.c +++ b/src/drivers/amd/rembrandt/acp_bt_dma.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/rembrandt/acp_dmic_dma.c b/src/drivers/amd/rembrandt/acp_dmic_dma.c index e8ed41682fff..67cf46aae91e 100644 --- a/src/drivers/amd/rembrandt/acp_dmic_dma.c +++ b/src/drivers/amd/rembrandt/acp_dmic_dma.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/rembrandt/acp_hs_dma.c b/src/drivers/amd/rembrandt/acp_hs_dma.c index e33eaa8ca833..dda8e1442564 100644 --- a/src/drivers/amd/rembrandt/acp_hs_dma.c +++ b/src/drivers/amd/rembrandt/acp_hs_dma.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/rembrandt/acp_sp_dma.c b/src/drivers/amd/rembrandt/acp_sp_dma.c index a13034ad5c29..c6eb26c71b97 100644 --- a/src/drivers/amd/rembrandt/acp_sp_dma.c +++ b/src/drivers/amd/rembrandt/acp_sp_dma.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/renoir/acp_bt_dma.c b/src/drivers/amd/renoir/acp_bt_dma.c index a44c72d309bc..07f19fe1df8a 100644 --- a/src/drivers/amd/renoir/acp_bt_dma.c +++ b/src/drivers/amd/renoir/acp_bt_dma.c @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/renoir/acp_dmic_dma.c b/src/drivers/amd/renoir/acp_dmic_dma.c index b948327963fb..509e67453de3 100644 --- a/src/drivers/amd/renoir/acp_dmic_dma.c +++ b/src/drivers/amd/renoir/acp_dmic_dma.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/drivers/amd/renoir/acp_sp_dma.c b/src/drivers/amd/renoir/acp_sp_dma.c index c8151b13b3d7..d67f7c33f970 100644 --- a/src/drivers/amd/renoir/acp_sp_dma.c +++ b/src/drivers/amd/renoir/acp_sp_dma.c @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/drivers/dw/dma.c b/src/drivers/dw/dma.c index 245895e01768..8d480ca4af3e 100644 --- a/src/drivers/dw/dma.c +++ b/src/drivers/dw/dma.c @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/drivers/imx/sai.c b/src/drivers/imx/sai.c index 55b5311a7aff..bf4189bbc287 100644 --- a/src/drivers/imx/sai.c +++ b/src/drivers/imx/sai.c @@ -7,7 +7,7 @@ // Author: Guido Roncarolo #include -#include +#include #include #include #include diff --git a/src/drivers/intel/hda/hda-dma.c b/src/drivers/intel/hda/hda-dma.c index a045b2bf46e5..04b369155e32 100644 --- a/src/drivers/intel/hda/hda-dma.c +++ b/src/drivers/intel/hda/hda-dma.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/drivers/mediatek/mt8186/interrupt.c b/src/drivers/mediatek/mt8186/interrupt.c index c80c8e18fadd..f998ebc33e46 100644 --- a/src/drivers/mediatek/mt8186/interrupt.c +++ b/src/drivers/mediatek/mt8186/interrupt.c @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/drivers/mediatek/mt8195/interrupt.c b/src/drivers/mediatek/mt8195/interrupt.c index 0045846082dc..71b485bf2b76 100644 --- a/src/drivers/mediatek/mt8195/interrupt.c +++ b/src/drivers/mediatek/mt8195/interrupt.c @@ -5,7 +5,7 @@ // Author: Allen-KH Cheng #include -#include +#include #include #include #include diff --git a/src/include/ipc/header-intel-cavs.h b/src/include/ipc/header-intel-cavs.h index 4b66753a274b..4891317f8b2c 100644 --- a/src/include/ipc/header-intel-cavs.h +++ b/src/include/ipc/header-intel-cavs.h @@ -14,7 +14,7 @@ #ifndef __IPC_HEADER_INTEL_CAVS_H__ #define __IPC_HEADER_INTEL_CAVS_H__ -#include +#include /* Primary register, mapped to * - DIPCTDR (HIPCIDR) in sideband IPC (cAVS 1.8+) diff --git a/src/include/ipc/probe.h b/src/include/ipc/probe.h index 335de396d201..a3c6b90b80dc 100644 --- a/src/include/ipc/probe.h +++ b/src/include/ipc/probe.h @@ -17,7 +17,7 @@ #define __IPC_PROBE_H__ #include -#include +#include #include #define PROBE_PURPOSE_EXTRACTION 0x1 diff --git a/src/include/ipc4/gateway.h b/src/include/ipc4/gateway.h index 90f3255f924e..96a7dcada055 100644 --- a/src/include/ipc4/gateway.h +++ b/src/include/ipc4/gateway.h @@ -25,7 +25,7 @@ #define __SOF_IPC4_GATEWAY_H__ #include -#include +#include /**< Type of the gateway. */ enum ipc4_connector_node_id_type { diff --git a/src/include/ipc4/mixin_mixout.h b/src/include/ipc4/mixin_mixout.h index efde5bb0358a..eef9b9e1d458 100644 --- a/src/include/ipc4/mixin_mixout.h +++ b/src/include/ipc4/mixin_mixout.h @@ -24,7 +24,7 @@ #define __SOF_IPC4_MIXIN_MIXOUT_H__ #include -#include +#include enum ipc4_mixin_config_param { /* large_config_set param id for ipc4_mixer_mode_config */ diff --git a/src/include/sof/audio/aria/aria.h b/src/include/sof/audio/aria/aria.h index 35d8b642b0d1..4dc550a226d8 100644 --- a/src/include/sof/audio/aria/aria.h +++ b/src/include/sof/audio/aria/aria.h @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/include/sof/audio/up_down_mixer/up_down_mixer.h b/src/include/sof/audio/up_down_mixer/up_down_mixer.h index fb98ff79078b..2397f5fff1fb 100644 --- a/src/include/sof/audio/up_down_mixer/up_down_mixer.h +++ b/src/include/sof/audio/up_down_mixer/up_down_mixer.h @@ -10,7 +10,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/include/sof/audio/volume.h b/src/include/sof/audio/volume.h index 88a14633cb73..04ea11406ce3 100644 --- a/src/include/sof/audio/volume.h +++ b/src/include/sof/audio/volume.h @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/include/sof/drivers/acp_dai_dma.h b/src/include/sof/drivers/acp_dai_dma.h index 21db03bfee59..e469940fd72d 100644 --- a/src/include/sof/drivers/acp_dai_dma.h +++ b/src/include/sof/drivers/acp_dai_dma.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/include/sof/drivers/afe-dai.h b/src/include/sof/drivers/afe-dai.h index c87b8958b9d1..7732a95bdba3 100644 --- a/src/include/sof/drivers/afe-dai.h +++ b/src/include/sof/drivers/afe-dai.h @@ -8,7 +8,7 @@ #ifndef __SOF_DRIVERS_AFE_DAI_H__ #define __SOF_DRIVERS_AFE_DAI_H__ -#include +#include #include #include #include diff --git a/src/include/sof/drivers/afe-memif.h b/src/include/sof/drivers/afe-memif.h index 5e7376dc1b82..5a15f0b38742 100644 --- a/src/include/sof/drivers/afe-memif.h +++ b/src/include/sof/drivers/afe-memif.h @@ -8,7 +8,7 @@ #ifndef __SOF_DRIVERS_AFE_MEMIF_H__ #define __SOF_DRIVERS_AFE_MEMIF_H__ -#include +#include #include #include #include diff --git a/src/include/sof/drivers/dmic.h b/src/include/sof/drivers/dmic.h index 47798a763697..f002117d0110 100644 --- a/src/include/sof/drivers/dmic.h +++ b/src/include/sof/drivers/dmic.h @@ -69,7 +69,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/include/sof/drivers/dw-dma.h b/src/include/sof/drivers/dw-dma.h index b96e7adcd1e7..fb4d9e5b0ba4 100644 --- a/src/include/sof/drivers/dw-dma.h +++ b/src/include/sof/drivers/dw-dma.h @@ -10,7 +10,7 @@ #define __SOF_DRIVERS_DW_DMA_H__ #include -#include +#include #include #include #include diff --git a/src/include/sof/drivers/edma.h b/src/include/sof/drivers/edma.h index 7857e0fa0cb7..567e4e8cf044 100644 --- a/src/include/sof/drivers/edma.h +++ b/src/include/sof/drivers/edma.h @@ -8,7 +8,7 @@ #ifndef __SOF_DRIVERS_EDMA_H__ #define __SOF_DRIVERS_EDMA_H__ -#include +#include #include #include diff --git a/src/include/sof/drivers/esai.h b/src/include/sof/drivers/esai.h index 0550422a41d7..c71a2a566867 100644 --- a/src/include/sof/drivers/esai.h +++ b/src/include/sof/drivers/esai.h @@ -8,7 +8,7 @@ #ifndef __SOF_DRIVERS_ESAI_H__ #define __SOF_DRIVERS_ESAI_H__ -#include +#include #include #include #include diff --git a/src/include/sof/drivers/mu.h b/src/include/sof/drivers/mu.h index 3271eac0b558..26e223374dba 100644 --- a/src/include/sof/drivers/mu.h +++ b/src/include/sof/drivers/mu.h @@ -10,7 +10,7 @@ #ifndef __SOF_DRIVERS_MU_H__ #define __SOF_DRIVERS_MU_H__ -#include +#include #include enum imx_mu_type { diff --git a/src/include/sof/drivers/sai.h b/src/include/sof/drivers/sai.h index 2413b1784b5a..d5030e541883 100644 --- a/src/include/sof/drivers/sai.h +++ b/src/include/sof/drivers/sai.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/include/sof/drivers/ssp.h b/src/include/sof/drivers/ssp.h index 7757816fe904..294cf71b5713 100644 --- a/src/include/sof/drivers/ssp.h +++ b/src/include/sof/drivers/ssp.h @@ -8,7 +8,7 @@ #ifndef __SOF_DRIVERS_SSP_H__ #define __SOF_DRIVERS_SSP_H__ -#include +#include #include #include #include diff --git a/src/include/sof/ipc/common.h b/src/include/sof/ipc/common.h index 4ffdc83e564a..a655f59522f7 100644 --- a/src/include/sof/ipc/common.h +++ b/src/include/sof/ipc/common.h @@ -9,7 +9,7 @@ #ifndef __SOF_IPC_COMMON_H__ #define __SOF_IPC_COMMON_H__ -#include +#include #include #include #include diff --git a/src/include/sof/lib/dai-legacy.h b/src/include/sof/lib/dai-legacy.h index 28a4194df18c..f211f4fd2cb9 100644 --- a/src/include/sof/lib/dai-legacy.h +++ b/src/include/sof/lib/dai-legacy.h @@ -22,7 +22,7 @@ #define __SOF_LIB_DAI_LEGACY_H__ #include -#include +#include #include #include #include diff --git a/src/include/sof/lib/dai-zephyr.h b/src/include/sof/lib/dai-zephyr.h index e824709ee0e8..bc5ec774a40e 100644 --- a/src/include/sof/lib/dai-zephyr.h +++ b/src/include/sof/lib/dai-zephyr.h @@ -17,7 +17,7 @@ #define __SOF_LIB_DAI_ZEPHYR_H__ #include -#include +#include #include #include #include diff --git a/src/include/sof/lib/notifier.h b/src/include/sof/lib/notifier.h index 4e39e1d32fb6..06762b071f4e 100644 --- a/src/include/sof/lib/notifier.h +++ b/src/include/sof/lib/notifier.h @@ -8,7 +8,7 @@ #ifndef __SOF_LIB_NOTIFIER_H__ #define __SOF_LIB_NOTIFIER_H__ -#include +#include #include #include #include diff --git a/src/init/ext_manifest.c b/src/init/ext_manifest.c index ce7b73ef7ab6..f70760154f37 100644 --- a/src/init/ext_manifest.c +++ b/src/init/ext_manifest.c @@ -5,7 +5,7 @@ // Author: Karol Trzcinski // -#include +#include #include #include #include diff --git a/src/platform/amd/rembrandt/include/platform/drivers/interrupt.h b/src/platform/amd/rembrandt/include/platform/drivers/interrupt.h index 3efb0ef9bf6e..dfbb58df5ea6 100644 --- a/src/platform/amd/rembrandt/include/platform/drivers/interrupt.h +++ b/src/platform/amd/rembrandt/include/platform/drivers/interrupt.h @@ -10,7 +10,7 @@ #ifndef __PLATFORM_DRIVERS_INTERRUPT_H__ #define __PLATFORM_DRIVERS_INTERRUPT_H__ -#include +#include #include #include diff --git a/src/platform/amd/renoir/include/platform/drivers/interrupt.h b/src/platform/amd/renoir/include/platform/drivers/interrupt.h index f096ff34b8c5..61dda2141464 100644 --- a/src/platform/amd/renoir/include/platform/drivers/interrupt.h +++ b/src/platform/amd/renoir/include/platform/drivers/interrupt.h @@ -11,7 +11,7 @@ #ifndef __PLATFORM_DRIVERS_INTERRUPT_H__ #define __PLATFORM_DRIVERS_INTERRUPT_H__ -#include +#include #include #include diff --git a/src/platform/apollolake/include/platform/drivers/interrupt.h b/src/platform/apollolake/include/platform/drivers/interrupt.h index 2c04ccb73012..74a1a33dacdd 100644 --- a/src/platform/apollolake/include/platform/drivers/interrupt.h +++ b/src/platform/apollolake/include/platform/drivers/interrupt.h @@ -12,7 +12,7 @@ #define __PLATFORM_DRIVERS_INTERRUPT_H__ #include -#include +#include #define PLATFORM_IRQ_HW_NUM XCHAL_NUM_INTERRUPTS #define PLATFORM_IRQ_FIRST_CHILD PLATFORM_IRQ_HW_NUM diff --git a/src/platform/apollolake/include/platform/lib/shim.h b/src/platform/apollolake/include/platform/lib/shim.h index 756b61c69157..de2a81bd675b 100644 --- a/src/platform/apollolake/include/platform/lib/shim.h +++ b/src/platform/apollolake/include/platform/lib/shim.h @@ -12,7 +12,7 @@ #define __PLATFORM_LIB_SHIM_H__ #include -#include +#include #include /* DSP IPC for Host Registers */ diff --git a/src/platform/baytrail/include/platform/drivers/dw-dma.h b/src/platform/baytrail/include/platform/drivers/dw-dma.h index c05ca51e7efa..beb4ddf7328e 100644 --- a/src/platform/baytrail/include/platform/drivers/dw-dma.h +++ b/src/platform/baytrail/include/platform/drivers/dw-dma.h @@ -10,7 +10,7 @@ #ifndef __PLATFORM_DRIVERS_DW_DMA_H__ #define __PLATFORM_DRIVERS_DW_DMA_H__ -#include +#include #include diff --git a/src/platform/baytrail/include/platform/drivers/interrupt.h b/src/platform/baytrail/include/platform/drivers/interrupt.h index 2482d04ba987..468503a9c59c 100644 --- a/src/platform/baytrail/include/platform/drivers/interrupt.h +++ b/src/platform/baytrail/include/platform/drivers/interrupt.h @@ -10,7 +10,7 @@ #ifndef __PLATFORM_DRIVERS_INTERRUPT_H__ #define __PLATFORM_DRIVERS_INTERRUPT_H__ -#include +#include /* IRQ numbers */ #if CONFIG_XT_INTERRUPT_LEVEL_1 diff --git a/src/platform/cannonlake/include/platform/drivers/interrupt.h b/src/platform/cannonlake/include/platform/drivers/interrupt.h index 7b47485cc7c2..9a9bae649ed1 100644 --- a/src/platform/cannonlake/include/platform/drivers/interrupt.h +++ b/src/platform/cannonlake/include/platform/drivers/interrupt.h @@ -13,7 +13,7 @@ #define __PLATFORM_DRIVERS_INTERRUPT_H__ #include -#include +#include #define PLATFORM_IRQ_HW_NUM XCHAL_NUM_INTERRUPTS #define PLATFORM_IRQ_FIRST_CHILD PLATFORM_IRQ_HW_NUM diff --git a/src/platform/cannonlake/include/platform/lib/shim.h b/src/platform/cannonlake/include/platform/lib/shim.h index 53ee6f55aea5..dc3c43c14586 100644 --- a/src/platform/cannonlake/include/platform/lib/shim.h +++ b/src/platform/cannonlake/include/platform/lib/shim.h @@ -14,7 +14,7 @@ #include #include -#include +#include #include /* DSP IPC for Host Registers */ diff --git a/src/platform/haswell/include/platform/drivers/dw-dma.h b/src/platform/haswell/include/platform/drivers/dw-dma.h index 68addff64c95..5789924f390d 100644 --- a/src/platform/haswell/include/platform/drivers/dw-dma.h +++ b/src/platform/haswell/include/platform/drivers/dw-dma.h @@ -10,7 +10,7 @@ #ifndef __PLATFORM_DRIVERS_DW_DMA_H__ #define __PLATFORM_DRIVERS_DW_DMA_H__ -#include +#include #include struct dma; diff --git a/src/platform/haswell/include/platform/drivers/interrupt.h b/src/platform/haswell/include/platform/drivers/interrupt.h index 15713f457521..5929da2f789a 100644 --- a/src/platform/haswell/include/platform/drivers/interrupt.h +++ b/src/platform/haswell/include/platform/drivers/interrupt.h @@ -10,7 +10,7 @@ #ifndef __PLATFORM_DRIVERS_INTERRUPT_H__ #define __PLATFORM_DRIVERS_INTERRUPT_H__ -#include +#include #define PLATFORM_IRQ_HW_NUM XCHAL_NUM_INTERRUPTS #define PLATFORM_IRQ_FIRST_CHILD PLATFORM_IRQ_HW_NUM diff --git a/src/platform/icelake/include/platform/drivers/interrupt.h b/src/platform/icelake/include/platform/drivers/interrupt.h index 7b47485cc7c2..9a9bae649ed1 100644 --- a/src/platform/icelake/include/platform/drivers/interrupt.h +++ b/src/platform/icelake/include/platform/drivers/interrupt.h @@ -13,7 +13,7 @@ #define __PLATFORM_DRIVERS_INTERRUPT_H__ #include -#include +#include #define PLATFORM_IRQ_HW_NUM XCHAL_NUM_INTERRUPTS #define PLATFORM_IRQ_FIRST_CHILD PLATFORM_IRQ_HW_NUM diff --git a/src/platform/icelake/include/platform/lib/shim.h b/src/platform/icelake/include/platform/lib/shim.h index 0cc0917b29d4..b8596d88b9af 100644 --- a/src/platform/icelake/include/platform/lib/shim.h +++ b/src/platform/icelake/include/platform/lib/shim.h @@ -14,7 +14,7 @@ #include #include -#include +#include #include /* DSP IPC for Host Registers */ diff --git a/src/platform/imx8/include/platform/drivers/interrupt.h b/src/platform/imx8/include/platform/drivers/interrupt.h index 351fee05d96c..d18af631df26 100644 --- a/src/platform/imx8/include/platform/drivers/interrupt.h +++ b/src/platform/imx8/include/platform/drivers/interrupt.h @@ -10,7 +10,7 @@ #ifndef __PLATFORM_DRIVERS_INTERRUPT_H__ #define __PLATFORM_DRIVERS_INTERRUPT_H__ -#include +#include /* IRQ numbers */ #if CONFIG_XT_INTERRUPT_LEVEL_1 diff --git a/src/platform/imx8m/include/platform/drivers/interrupt.h b/src/platform/imx8m/include/platform/drivers/interrupt.h index 222d904f3435..88fbe20eacc7 100644 --- a/src/platform/imx8m/include/platform/drivers/interrupt.h +++ b/src/platform/imx8m/include/platform/drivers/interrupt.h @@ -10,7 +10,7 @@ #ifndef __PLATFORM_DRIVERS_INTERRUPT_H__ #define __PLATFORM_DRIVERS_INTERRUPT_H__ -#include +#include /* IRQ numbers */ diff --git a/src/platform/imx8ulp/include/platform/drivers/interrupt.h b/src/platform/imx8ulp/include/platform/drivers/interrupt.h index 1d9eeeaafffd..f2dfc054453f 100644 --- a/src/platform/imx8ulp/include/platform/drivers/interrupt.h +++ b/src/platform/imx8ulp/include/platform/drivers/interrupt.h @@ -10,7 +10,7 @@ #ifndef __PLATFORM_DRIVERS_INTERRUPT_H__ #define __PLATFORM_DRIVERS_INTERRUPT_H__ -#include +#include /* IRQ numbers */ #define IRQ_DSP_SYS_NMI 0 diff --git a/src/platform/intel/cavs/alternate_reset_vector.S b/src/platform/intel/cavs/alternate_reset_vector.S index d3e78a71b2e2..4879043ee36c 100644 --- a/src/platform/intel/cavs/alternate_reset_vector.S +++ b/src/platform/intel/cavs/alternate_reset_vector.S @@ -4,7 +4,7 @@ */ -#include +#include #include #include #if CONFIG_XT_BOOT_LOADER && !CONFIG_VM_ROM diff --git a/src/platform/intel/cavs/boot_loader.c b/src/platform/intel/cavs/boot_loader.c index 816e6be016c7..741a3d949cd2 100644 --- a/src/platform/intel/cavs/boot_loader.c +++ b/src/platform/intel/cavs/boot_loader.c @@ -5,7 +5,7 @@ // Author: Liam Girdwood #include -#include +#include #include #include #include diff --git a/src/platform/intel/cavs/include/cavs/drivers/dw-dma.h b/src/platform/intel/cavs/include/cavs/drivers/dw-dma.h index 4a48333ac4df..5b34ef7955cc 100644 --- a/src/platform/intel/cavs/include/cavs/drivers/dw-dma.h +++ b/src/platform/intel/cavs/include/cavs/drivers/dw-dma.h @@ -10,7 +10,7 @@ #ifndef __CAVS_LIB_DW_DMA_H__ #define __CAVS_LIB_DW_DMA_H__ -#include +#include #include #include diff --git a/src/platform/intel/cavs/include/cavs/drivers/mn.h b/src/platform/intel/cavs/include/cavs/drivers/mn.h index ec348ebbfa40..4a1407dba68c 100644 --- a/src/platform/intel/cavs/include/cavs/drivers/mn.h +++ b/src/platform/intel/cavs/include/cavs/drivers/mn.h @@ -10,7 +10,7 @@ #ifndef __CAVS_DRIVERS_MN_H__ #define __CAVS_DRIVERS_MN_H__ -#include +#include /** \brief Offset of MCLK Divider Control Register. */ #define MN_MDIVCTRL 0x0 diff --git a/src/platform/intel/cavs/include/cavs/drivers/sideband-ipc.h b/src/platform/intel/cavs/include/cavs/drivers/sideband-ipc.h index 4a2ab57a64b7..6476d19ddd3f 100644 --- a/src/platform/intel/cavs/include/cavs/drivers/sideband-ipc.h +++ b/src/platform/intel/cavs/include/cavs/drivers/sideband-ipc.h @@ -15,7 +15,7 @@ #ifndef __CAVS_DRIVERS_SIDEBAND_IPC_H__ #define __CAVS_DRIVERS_SIDEBAND_IPC_H__ -#include +#include /* DIPCTDR */ #define IPC_DIPCTDR_BUSY BIT(31) diff --git a/src/platform/intel/cavs/include/cavs/drivers/timestamp.h b/src/platform/intel/cavs/include/cavs/drivers/timestamp.h index bc9c0d373567..f6b76d1fdd27 100644 --- a/src/platform/intel/cavs/include/cavs/drivers/timestamp.h +++ b/src/platform/intel/cavs/include/cavs/drivers/timestamp.h @@ -10,7 +10,7 @@ #ifndef __CAVS_DRIVERS_TIMESTAMP_H__ #define __CAVS_DRIVERS_TIMESTAMP_H__ -#include +#include #define TS_LOCAL_TSCTRL_NTK_BIT BIT(31) #define TS_LOCAL_TSCTRL_IONTE_BIT BIT(30) diff --git a/src/platform/intel/cavs/include/cavs/lib/pm_memory.h b/src/platform/intel/cavs/include/cavs/lib/pm_memory.h index b645ad2aec97..ad78ae0ab86a 100644 --- a/src/platform/intel/cavs/include/cavs/lib/pm_memory.h +++ b/src/platform/intel/cavs/include/cavs/lib/pm_memory.h @@ -15,7 +15,7 @@ #define __CAVS_LIB_PM_MEMORY_H__ #include -#include +#include #include #include #include diff --git a/src/platform/intel/cavs/include/cavs/mem_window.h b/src/platform/intel/cavs/include/cavs/mem_window.h index 614103507ef5..0792d4e8f925 100644 --- a/src/platform/intel/cavs/include/cavs/mem_window.h +++ b/src/platform/intel/cavs/include/cavs/mem_window.h @@ -8,7 +8,7 @@ #ifndef __CAVS_MEM_WINDOW_H__ #define __CAVS_MEM_WINDOW_H__ -#include +#include #include /** \brief Zero memory window during initialization */ diff --git a/src/platform/mt8186/include/platform/drivers/timer.h b/src/platform/mt8186/include/platform/drivers/timer.h index 1d133368d891..f3499678163b 100644 --- a/src/platform/mt8186/include/platform/drivers/timer.h +++ b/src/platform/mt8186/include/platform/drivers/timer.h @@ -8,7 +8,7 @@ #ifndef __PLATFORM_DRIVERS_TIMER_H__ #define __PLATFORM_DRIVERS_TIMER_H__ -#include +#include #include /*-------timer:ostimer0-------*/ diff --git a/src/platform/mt8195/include/platform/drivers/timer.h b/src/platform/mt8195/include/platform/drivers/timer.h index 155e9299ab5d..0b54687573cd 100644 --- a/src/platform/mt8195/include/platform/drivers/timer.h +++ b/src/platform/mt8195/include/platform/drivers/timer.h @@ -8,7 +8,7 @@ #ifndef __PLATFORM_DRIVERS_TIMER_H__ #define __PLATFORM_DRIVERS_TIMER_H__ -#include +#include #include /*-------timer:ostimer0-------*/ diff --git a/src/platform/suecreek/include/platform/drivers/interrupt.h b/src/platform/suecreek/include/platform/drivers/interrupt.h index 8af635b7bc45..d3878da07c4a 100644 --- a/src/platform/suecreek/include/platform/drivers/interrupt.h +++ b/src/platform/suecreek/include/platform/drivers/interrupt.h @@ -13,7 +13,7 @@ #define __PLATFORM_DRIVERS_INTERRUPT_H__ #include -#include +#include #include #define PLATFORM_IRQ_HW_NUM XCHAL_NUM_INTERRUPTS diff --git a/src/platform/suecreek/include/platform/lib/shim.h b/src/platform/suecreek/include/platform/lib/shim.h index 3f0951c85d3a..febf75079050 100644 --- a/src/platform/suecreek/include/platform/lib/shim.h +++ b/src/platform/suecreek/include/platform/lib/shim.h @@ -14,7 +14,7 @@ #include #include -#include +#include #include /* DSP IPC for Host Registers */ diff --git a/src/platform/tigerlake/include/platform/drivers/interrupt.h b/src/platform/tigerlake/include/platform/drivers/interrupt.h index 7391e28cda09..199e0fd8d65e 100644 --- a/src/platform/tigerlake/include/platform/drivers/interrupt.h +++ b/src/platform/tigerlake/include/platform/drivers/interrupt.h @@ -14,7 +14,7 @@ #if !defined(__ASSEMBLER__) && !defined(LINKER) #include -#include +#include #endif diff --git a/src/platform/tigerlake/include/platform/lib/shim.h b/src/platform/tigerlake/include/platform/lib/shim.h index 64ffdf33877b..b0908d7d5e17 100644 --- a/src/platform/tigerlake/include/platform/lib/shim.h +++ b/src/platform/tigerlake/include/platform/lib/shim.h @@ -14,7 +14,7 @@ #include #include -#include +#include #include /* DSP IPC for Host Registers */ diff --git a/src/schedule/dma_multi_chan_domain.c b/src/schedule/dma_multi_chan_domain.c index 8f83c8fa1c91..6c06f2c0fd5a 100644 --- a/src/schedule/dma_multi_chan_domain.c +++ b/src/schedule/dma_multi_chan_domain.c @@ -5,7 +5,7 @@ // Author: Tomasz Lauda #include -#include +#include #include #include #include diff --git a/src/schedule/dma_single_chan_domain.c b/src/schedule/dma_single_chan_domain.c index 70d0e4c9d727..f877692831c0 100644 --- a/src/schedule/dma_single_chan_domain.c +++ b/src/schedule/dma_single_chan_domain.c @@ -5,7 +5,7 @@ // Author: Tomasz Lauda #include -#include +#include #include #include #include diff --git a/tools/fuzzer/platform/mu.h b/tools/fuzzer/platform/mu.h index 63d8c915d977..e53279042179 100644 --- a/tools/fuzzer/platform/mu.h +++ b/tools/fuzzer/platform/mu.h @@ -11,7 +11,7 @@ #ifndef __SOF_DRIVERS_MU_H__ #define __SOF_DRIVERS_MU_H__ -#include +#include #include #include "../fuzzer.h" diff --git a/xtos/include/sof/bit.h b/xtos/include/rtos/bit.h similarity index 77% rename from xtos/include/sof/bit.h rename to xtos/include/rtos/bit.h index 9d7c0b45e11d..3dde908c2d6b 100644 --- a/xtos/include/sof/bit.h +++ b/xtos/include/rtos/bit.h @@ -5,13 +5,8 @@ * Author: Liam Girdwood */ -#ifndef __SOF_BIT_H__ -#define __SOF_BIT_H__ - -/* Zephyr defines this - remove local copy once Zephyr integration complete */ -#ifdef BIT -#undef BIT -#endif +#ifndef __XTOS_RTOS_BIT_H__ +#define __XTOS_RTOS_BIT_H__ #if ASSEMBLY #define BIT(b) (1 << (b)) @@ -29,4 +24,4 @@ #define GET_BITS(b_hi, b_lo, x) \ (((x) & MASK(b_hi, b_lo)) >> (b_lo)) -#endif /* __SOF_BIT_H__ */ +#endif /* __XTOS_RTOS_BIT_H__ */ diff --git a/xtos/include/sof/lib/alloc.h b/xtos/include/sof/lib/alloc.h index 39e67e8c214e..f0d8ae13f133 100644 --- a/xtos/include/sof/lib/alloc.h +++ b/xtos/include/sof/lib/alloc.h @@ -16,7 +16,7 @@ #ifndef __SOF_LIB_ALLOC_H__ #define __SOF_LIB_ALLOC_H__ -#include +#include #include #include #include diff --git a/xtos/include/sof/lib/dma.h b/xtos/include/sof/lib/dma.h index 85417b614389..6ffb73903650 100644 --- a/xtos/include/sof/lib/dma.h +++ b/xtos/include/sof/lib/dma.h @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include #include diff --git a/zephyr/include/rtos/bit.h b/zephyr/include/rtos/bit.h new file mode 100644 index 000000000000..133ca5424d87 --- /dev/null +++ b/zephyr/include/rtos/bit.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * + * Copyright(c) 2018 Intel Corporation. All rights reserved. + * + * Author: Liam Girdwood + */ + +#ifndef __ZEPHYR_RTOS_BIT_H__ +#define __ZEPHYR_RTOS_BIT_H__ + +#include + +/* TODO: align with Zephyr BIT APIs */ + +#define MASK(b_hi, b_lo) \ + (((1ULL << ((b_hi) - (b_lo) + 1ULL)) - 1ULL) << (b_lo)) +#define SET_BIT(b, x) (((x) & 1) << (b)) +#define SET_BITS(b_hi, b_lo, x) \ + (((x) & ((1ULL << ((b_hi) - (b_lo) + 1ULL)) - 1ULL)) << (b_lo)) +#define GET_BIT(b, x) \ + (((x) & (1ULL << (b))) >> (b)) +#define GET_BITS(b_hi, b_lo, x) \ + (((x) & MASK(b_hi, b_lo)) >> (b_lo)) + +#endif /* __ZEPHYR_RTOS_BIT_H__ */ From 7a0a27a5f17ee3bc65c5c261989a613e0c4e939a Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Mon, 29 Aug 2022 12:15:05 +0100 Subject: [PATCH 4/4] header: rtos: use rtos specific version of string.h No runtime semantic change. Use C library when RTOS uses C library otherwise use own C library calls. Signed-off-by: Liam Girdwood --- src/arch/host/include/arch/string.h | 4 +- src/arch/xtensa/include/arch/string.h | 4 +- src/audio/aria/aria.c | 2 +- src/audio/asrc/asrc.c | 2 +- src/audio/asrc/asrc_farrow.c | 2 +- src/audio/component.c | 2 +- src/audio/copier/copier.c | 2 +- src/audio/crossover/crossover.c | 2 +- src/audio/dai-legacy.c | 2 +- src/audio/dai-zephyr.c | 2 +- src/audio/dcblock/dcblock.c | 2 +- src/audio/drc/drc.c | 2 +- src/audio/eq_fir/eq_fir.c | 2 +- src/audio/eq_iir/eq_iir.c | 2 +- src/audio/google_hotword_detect.c | 2 +- src/audio/google_rtc_audio_processing.c | 2 +- src/audio/host-legacy.c | 2 +- src/audio/host-zephyr.c | 2 +- src/audio/igo_nr/igo_nr.c | 2 +- src/audio/kpb.c | 2 +- src/audio/mixer/mixer.c | 2 +- src/audio/mixin_mixout.c | 2 +- .../module_adapter/iadk/system_agent.cpp | 2 +- .../module_adapter/iadk/system_service.c | 2 +- .../module_adapter/module/volume/volume.c | 2 +- src/audio/multiband_drc/multiband_drc.c | 2 +- src/audio/mux/mux.c | 2 +- src/audio/pipeline/pipeline-graph.c | 2 +- src/audio/pipeline/pipeline-schedule.c | 2 +- src/audio/pipeline/pipeline-stream.c | 2 +- src/audio/pipeline/pipeline-xrun.c | 2 +- src/audio/rtnr/rtnr.c | 2 +- src/audio/selector/selector.c | 2 +- src/audio/src/src.c | 2 +- src/audio/tdfb/tdfb.c | 2 +- src/audio/tone.c | 2 +- src/audio/up_down_mixer/up_down_mixer.c | 2 +- src/debug/panic.c | 2 +- src/drivers/dw/ssi-spi.c | 2 +- src/drivers/generic/dummy-dma.c | 2 +- src/drivers/intel/cavs/idc.c | 2 +- src/drivers/intel/dmic/dmic.c | 2 +- src/include/sof/audio/buffer.h | 2 +- src/include/sof/debug/debug.h | 2 +- src/ipc/ipc3/handler.c | 2 +- src/lib/alloc.c | 2 +- src/lib/lib.c | 2 +- .../intel/cavs/include/cavs/lib/mailbox.h | 2 +- src/samples/audio/detect_test.c | 2 +- src/trace/dma-trace.c | 2 +- src/trace/trace.c | 2 +- .../src/math/arithmetic/base2_logarithm.c | 2 +- .../src/math/arithmetic/base_10_logarithm.c | 2 +- .../src/math/arithmetic/base_e_logarithm.c | 2 +- test/cmocka/src/math/arithmetic/square_root.c | 2 +- tools/testbench/common_test.c | 2 +- tools/testbench/topology.c | 2 +- xtos/include/{sof => rtos}/string.h | 6 +- xtos/include/sof/lib/alloc.h | 9 +-- xtos/include/sof/lib/mailbox.h | 2 +- zephyr/CMakeLists.txt | 1 - zephyr/include/rtos/string.h | 63 +++++++++++++++++++ 62 files changed, 127 insertions(+), 72 deletions(-) rename xtos/include/{sof => rtos}/string.h (86%) create mode 100644 zephyr/include/rtos/string.h diff --git a/src/arch/host/include/arch/string.h b/src/arch/host/include/arch/string.h index 8360f2000547..40140074c21a 100644 --- a/src/arch/host/include/arch/string.h +++ b/src/arch/host/include/arch/string.h @@ -5,7 +5,7 @@ * Author: Liam Girdwood */ -#ifdef __SOF_STRING_H__ +#ifdef __XTOS_RTOS_STRING_H__ #ifndef __ARCH_STRING_H__ #define __ARCH_STRING_H__ @@ -17,7 +17,7 @@ #define arch_memcpy(dest, src, size) \ memcpy(dest, src, size) -#define arch_bzero(ptr, size) \ +#define bzero(ptr, size) \ memset(ptr, 0, size) void *memcpy(void *dest, const void *src, size_t length); diff --git a/src/arch/xtensa/include/arch/string.h b/src/arch/xtensa/include/arch/string.h index 1172cb488b88..61e57656a304 100644 --- a/src/arch/xtensa/include/arch/string.h +++ b/src/arch/xtensa/include/arch/string.h @@ -5,7 +5,7 @@ * Author: Liam Girdwood */ -#ifdef __SOF_STRING_H__ +#ifdef __XTOS_RTOS_STRING_H__ #ifndef __ARCH_STRING_H__ #define __ARCH_STRING_H__ @@ -18,7 +18,7 @@ #define arch_memcpy(dest, src, size) \ xthal_memcpy(dest, src, size) -#define arch_bzero(ptr, size) \ +#define bzero(ptr, size) \ memset_s(ptr, size, 0, size) void *xthal_memcpy(void *dst, const void *src, size_t len); diff --git a/src/audio/aria/aria.c b/src/audio/aria/aria.c index 048c9d110f38..2fff864092e4 100644 --- a/src/audio/aria/aria.c +++ b/src/audio/aria/aria.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/asrc/asrc.c b/src/audio/asrc/asrc.c index c345f989c8e5..b0b722ae89b2 100644 --- a/src/audio/asrc/asrc.c +++ b/src/audio/asrc/asrc.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/asrc/asrc_farrow.c b/src/audio/asrc/asrc_farrow.c index c3162b3a6413..f2908f0b41db 100644 --- a/src/audio/asrc/asrc_farrow.c +++ b/src/audio/asrc/asrc_farrow.c @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/component.c b/src/audio/component.c index 12fb2390acaf..80f8e94c3f94 100644 --- a/src/audio/component.c +++ b/src/audio/component.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/copier/copier.c b/src/audio/copier/copier.c index f0126e971f47..b21d2ac24a70 100644 --- a/src/audio/copier/copier.c +++ b/src/audio/copier/copier.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/crossover/crossover.c b/src/audio/crossover/crossover.c index e3f11cda3b07..adc61bf9398d 100644 --- a/src/audio/crossover/crossover.c +++ b/src/audio/crossover/crossover.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/dai-legacy.c b/src/audio/dai-legacy.c index c7e7ea29dbc3..12f37255e2c4 100644 --- a/src/audio/dai-legacy.c +++ b/src/audio/dai-legacy.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/dai-zephyr.c b/src/audio/dai-zephyr.c index eb4d8db979d6..f9b84f78a64c 100644 --- a/src/audio/dai-zephyr.c +++ b/src/audio/dai-zephyr.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/dcblock/dcblock.c b/src/audio/dcblock/dcblock.c index c29f715bce8f..98211ee02b6e 100644 --- a/src/audio/dcblock/dcblock.c +++ b/src/audio/dcblock/dcblock.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/drc/drc.c b/src/audio/drc/drc.c index e4ca2d693ad2..3f09047ea4a3 100644 --- a/src/audio/drc/drc.c +++ b/src/audio/drc/drc.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/eq_fir/eq_fir.c b/src/audio/eq_fir/eq_fir.c index bc0c525f8c99..3e379f0c6910 100644 --- a/src/audio/eq_fir/eq_fir.c +++ b/src/audio/eq_fir/eq_fir.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/eq_iir/eq_iir.c b/src/audio/eq_iir/eq_iir.c index 283fc145da2a..68948509bfdb 100644 --- a/src/audio/eq_iir/eq_iir.c +++ b/src/audio/eq_iir/eq_iir.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/google_hotword_detect.c b/src/audio/google_hotword_detect.c index 25cf80d13c70..dc40be74a81b 100644 --- a/src/audio/google_hotword_detect.c +++ b/src/audio/google_hotword_detect.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/google_rtc_audio_processing.c b/src/audio/google_rtc_audio_processing.c index c45a058c9868..dcd3ee2404f4 100644 --- a/src/audio/google_rtc_audio_processing.c +++ b/src/audio/google_rtc_audio_processing.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/host-legacy.c b/src/audio/host-legacy.c index d415bb480943..4108ade27767 100644 --- a/src/audio/host-legacy.c +++ b/src/audio/host-legacy.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/host-zephyr.c b/src/audio/host-zephyr.c index b4fe249bd805..b3b191f566d0 100644 --- a/src/audio/host-zephyr.c +++ b/src/audio/host-zephyr.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/igo_nr/igo_nr.c b/src/audio/igo_nr/igo_nr.c index 6f4aa24ff3ac..5a957ee2317f 100755 --- a/src/audio/igo_nr/igo_nr.c +++ b/src/audio/igo_nr/igo_nr.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/kpb.c b/src/audio/kpb.c index 606a574eb6f6..e13e892f1b26 100644 --- a/src/audio/kpb.c +++ b/src/audio/kpb.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/mixer/mixer.c b/src/audio/mixer/mixer.c index 1be4805b8d52..fde8d07c4ac1 100644 --- a/src/audio/mixer/mixer.c +++ b/src/audio/mixer/mixer.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/mixin_mixout.c b/src/audio/mixin_mixout.c index b8a054bbcac4..976812d3b2b7 100644 --- a/src/audio/mixin_mixout.c +++ b/src/audio/mixin_mixout.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/module_adapter/iadk/system_agent.cpp b/src/audio/module_adapter/iadk/system_agent.cpp index 20cbf971a4a3..fc0e11bb6d1b 100644 --- a/src/audio/module_adapter/iadk/system_agent.cpp +++ b/src/audio/module_adapter/iadk/system_agent.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/module_adapter/iadk/system_service.c b/src/audio/module_adapter/iadk/system_service.c index cf0b66f3610a..a49abf89c12f 100644 --- a/src/audio/module_adapter/iadk/system_service.c +++ b/src/audio/module_adapter/iadk/system_service.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/module_adapter/module/volume/volume.c b/src/audio/module_adapter/module/volume/volume.c index e6e0d0694bbc..564767ac17bd 100644 --- a/src/audio/module_adapter/module/volume/volume.c +++ b/src/audio/module_adapter/module/volume/volume.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/multiband_drc/multiband_drc.c b/src/audio/multiband_drc/multiband_drc.c index f513b9dfc268..16a4c0f1320f 100644 --- a/src/audio/multiband_drc/multiband_drc.c +++ b/src/audio/multiband_drc/multiband_drc.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/mux/mux.c b/src/audio/mux/mux.c index 3c37e35049e4..1e4b8ec5af14 100644 --- a/src/audio/mux/mux.c +++ b/src/audio/mux/mux.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/pipeline/pipeline-graph.c b/src/audio/pipeline/pipeline-graph.c index 03ef5bdb0310..ff46839e7255 100644 --- a/src/audio/pipeline/pipeline-graph.c +++ b/src/audio/pipeline/pipeline-graph.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/pipeline/pipeline-schedule.c b/src/audio/pipeline/pipeline-schedule.c index 6b8ec2792837..e94431a966ef 100644 --- a/src/audio/pipeline/pipeline-schedule.c +++ b/src/audio/pipeline/pipeline-schedule.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/pipeline/pipeline-stream.c b/src/audio/pipeline/pipeline-stream.c index f005013b5075..7dd81be77d59 100644 --- a/src/audio/pipeline/pipeline-stream.c +++ b/src/audio/pipeline/pipeline-stream.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/pipeline/pipeline-xrun.c b/src/audio/pipeline/pipeline-xrun.c index e4852e7fb884..08959bd953f4 100644 --- a/src/audio/pipeline/pipeline-xrun.c +++ b/src/audio/pipeline/pipeline-xrun.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/rtnr/rtnr.c b/src/audio/rtnr/rtnr.c index 797a798b1fc8..2441b0970137 100644 --- a/src/audio/rtnr/rtnr.c +++ b/src/audio/rtnr/rtnr.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/selector/selector.c b/src/audio/selector/selector.c index 49cecb8e4946..ea90b969b436 100644 --- a/src/audio/selector/selector.c +++ b/src/audio/selector/selector.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/src/src.c b/src/audio/src/src.c index 2bb97640a54b..1cf331f72c3a 100644 --- a/src/audio/src/src.c +++ b/src/audio/src/src.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/tdfb/tdfb.c b/src/audio/tdfb/tdfb.c index 2fe204a9bdd1..0a7b7b8a0982 100644 --- a/src/audio/tdfb/tdfb.c +++ b/src/audio/tdfb/tdfb.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/tone.c b/src/audio/tone.c index f2a6666434a3..eab0cc413bee 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/audio/up_down_mixer/up_down_mixer.c b/src/audio/up_down_mixer/up_down_mixer.c index 92f8eb940962..f37ec87b7c60 100644 --- a/src/audio/up_down_mixer/up_down_mixer.c +++ b/src/audio/up_down_mixer/up_down_mixer.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/debug/panic.c b/src/debug/panic.c index 7df4f959cb4b..5727f79fb03c 100644 --- a/src/debug/panic.c +++ b/src/debug/panic.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/drivers/dw/ssi-spi.c b/src/drivers/dw/ssi-spi.c index 9e9aaac72b90..917e4a812b74 100644 --- a/src/drivers/dw/ssi-spi.c +++ b/src/drivers/dw/ssi-spi.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/generic/dummy-dma.c b/src/drivers/generic/dummy-dma.c index da8da98588ad..9a2abcf3ecbd 100644 --- a/src/drivers/generic/dummy-dma.c +++ b/src/drivers/generic/dummy-dma.c @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/intel/cavs/idc.c b/src/drivers/intel/cavs/idc.c index cea98740f3f5..667b7a9c004e 100644 --- a/src/drivers/intel/cavs/idc.c +++ b/src/drivers/intel/cavs/idc.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/drivers/intel/dmic/dmic.c b/src/drivers/intel/dmic/dmic.c index 249ec87788da..83f1cfaeb9ef 100644 --- a/src/drivers/intel/dmic/dmic.c +++ b/src/drivers/intel/dmic/dmic.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/include/sof/audio/buffer.h b/src/include/sof/audio/buffer.h index aba3e422545a..91695dc7aba0 100644 --- a/src/include/sof/audio/buffer.h +++ b/src/include/sof/audio/buffer.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/include/sof/debug/debug.h b/src/include/sof/debug/debug.h index 6ea3c79fff0b..bc28c752865b 100644 --- a/src/include/sof/debug/debug.h +++ b/src/include/sof/debug/debug.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/ipc/ipc3/handler.c b/src/ipc/ipc3/handler.c index 981eac2561e5..2a350e0668cf 100644 --- a/src/ipc/ipc3/handler.c +++ b/src/ipc/ipc3/handler.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/lib/alloc.c b/src/lib/alloc.c index 87eaabd4d868..8f9ebb29a01c 100644 --- a/src/lib/alloc.c +++ b/src/lib/alloc.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/lib/lib.c b/src/lib/lib.c index be8d6c6ae534..14aae282b7d4 100644 --- a/src/lib/lib.c +++ b/src/lib/lib.c @@ -5,7 +5,7 @@ // Author: Liam Girdwood #include -#include +#include #include #include diff --git a/src/platform/intel/cavs/include/cavs/lib/mailbox.h b/src/platform/intel/cavs/include/cavs/lib/mailbox.h index 610333dded26..3f433a1edb29 100644 --- a/src/platform/intel/cavs/include/cavs/lib/mailbox.h +++ b/src/platform/intel/cavs/include/cavs/lib/mailbox.h @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/src/samples/audio/detect_test.c b/src/samples/audio/detect_test.c index 64e0bddbcbbe..397373039cd6 100644 --- a/src/samples/audio/detect_test.c +++ b/src/samples/audio/detect_test.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/trace/dma-trace.c b/src/trace/dma-trace.c index 445d7f60b6d3..26540ca2dc4e 100644 --- a/src/trace/dma-trace.c +++ b/src/trace/dma-trace.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/trace/trace.c b/src/trace/trace.c index 56065f656340..8d5cff8534e4 100644 --- a/src/trace/trace.c +++ b/src/trace/trace.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/test/cmocka/src/math/arithmetic/base2_logarithm.c b/test/cmocka/src/math/arithmetic/base2_logarithm.c index c66ee2c074ff..a06e44d09b78 100644 --- a/test/cmocka/src/math/arithmetic/base2_logarithm.c +++ b/test/cmocka/src/math/arithmetic/base2_logarithm.c @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include "log2_tables.h" /* 'Error[max] = 0.0000236785999981,THD(-dBc) = -92.5128795787487235' */ diff --git a/test/cmocka/src/math/arithmetic/base_10_logarithm.c b/test/cmocka/src/math/arithmetic/base_10_logarithm.c index cb5e7c027d5e..3973df31a515 100644 --- a/test/cmocka/src/math/arithmetic/base_10_logarithm.c +++ b/test/cmocka/src/math/arithmetic/base_10_logarithm.c @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include "log2_tables.h" /* 'Error[max] = 0.0000071279028671,THD = -102.9407645424143993 ' */ diff --git a/test/cmocka/src/math/arithmetic/base_e_logarithm.c b/test/cmocka/src/math/arithmetic/base_e_logarithm.c index 1c9dc2f44a7e..c2c1d2083c8b 100644 --- a/test/cmocka/src/math/arithmetic/base_e_logarithm.c +++ b/test/cmocka/src/math/arithmetic/base_e_logarithm.c @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include "log2_tables.h" /* 'Error[max] = 0.0000164133276926,THD(-dBc) = -95.6960671942683234' */ diff --git a/test/cmocka/src/math/arithmetic/square_root.c b/test/cmocka/src/math/arithmetic/square_root.c index fd0abebdc6e3..f6c03c9c42cf 100644 --- a/test/cmocka/src/math/arithmetic/square_root.c +++ b/test/cmocka/src/math/arithmetic/square_root.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include /* 'Error[max] = 0.0003000860000000,THD(-dBc) = -87.1210823527511309' */ diff --git a/tools/testbench/common_test.c b/tools/testbench/common_test.c index 78808c8450fc..b17f3b0f2000 100644 --- a/tools/testbench/common_test.c +++ b/tools/testbench/common_test.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tools/testbench/topology.c b/tools/testbench/topology.c index d465ba0cbe3d..5a75a89a02ed 100644 --- a/tools/testbench/topology.c +++ b/tools/testbench/topology.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/xtos/include/sof/string.h b/xtos/include/rtos/string.h similarity index 86% rename from xtos/include/sof/string.h rename to xtos/include/rtos/string.h index d76e5b45d298..6959475f8c96 100644 --- a/xtos/include/sof/string.h +++ b/xtos/include/rtos/string.h @@ -5,8 +5,8 @@ * Author: Liam Girdwood */ -#ifndef __SOF_STRING_H__ -#define __SOF_STRING_H__ +#ifndef __XTOS_RTOS_STRING_H__ +#define __XTOS_RTOS_STRING_H__ #include #include @@ -25,4 +25,4 @@ int rstrcmp(const char *s1, const char *s2); cmemcpy(dest, src, size) #endif -#endif /* __SOF_STRING_H__ */ +#endif /* __XTOS_RTOS_STRING_H__ */ diff --git a/xtos/include/sof/lib/alloc.h b/xtos/include/sof/lib/alloc.h index f0d8ae13f133..e62c806b2ac4 100644 --- a/xtos/include/sof/lib/alloc.h +++ b/xtos/include/sof/lib/alloc.h @@ -17,7 +17,7 @@ #define __SOF_LIB_ALLOC_H__ #include -#include +#include #include #include @@ -152,13 +152,6 @@ void rfree(void *ptr); */ void *rzalloc_core_sys(int core, size_t bytes); -/** \brief Zeroes memory block. - * @param ptr Pointer to the memory block. - * @param size Size of the block in bytes. - */ -#define bzero(ptr, size) \ - arch_bzero(ptr, size) - /** * Calculates length of the null-terminated string. * @param s String. diff --git a/xtos/include/sof/lib/mailbox.h b/xtos/include/sof/lib/mailbox.h index 86dcf0da04d6..d124ba0b1b69 100644 --- a/xtos/include/sof/lib/mailbox.h +++ b/xtos/include/sof/lib/mailbox.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 56a273be6bc9..58254d63786a 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -540,7 +540,6 @@ zephyr_library_sources( # SOF library - parts to transition to Zephyr over time ${SOF_LIB_PATH}/clk.c ${SOF_LIB_PATH}/notifier.c - ${SOF_LIB_PATH}/lib.c ${SOF_LIB_PATH}/pm_runtime.c ${SOF_LIB_PATH}/wait.c ${SOF_LIB_PATH}/dma.c diff --git a/zephyr/include/rtos/string.h b/zephyr/include/rtos/string.h new file mode 100644 index 000000000000..34fc857aced0 --- /dev/null +++ b/zephyr/include/rtos/string.h @@ -0,0 +1,63 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * + * Copyright(c) 20222 Intel Corporation. All rights reserved. + */ + +#ifndef __ZEPHYR_RTOS_STRING_H__ +#define __ZEPHYR_RTOS_STRING_H__ + +/* Zephyr uses a C library so lets use it */ +#include +#include +#include + +/* missing from zephyr - TODO: convert to memset() */ +#define bzero(ptr, size) \ + memset(ptr, 0, size) + +/* TODO: need converted to C library calling conventions */ +static inline int rstrlen(const char *s) +{ + return strlen(s); +} + +/* TODO: need converted to C library calling conventions */ +static inline int rstrcmp(const char *s1, const char *s2) +{ + return strcmp(s1, s2); +} + +/* C library does not have the "_s" versions used by Windows */ +static inline int memcpy_s(void *dest, size_t dest_size, + const void *src, size_t src_size) +{ + if (!dest || !src) + return -EINVAL; + + if ((dest >= src && (char *)dest < ((char *)src + src_size)) || + (src >= dest && (char *)src < ((char *)dest + dest_size))) + return -EINVAL; + + if (src_size > dest_size) + return -EINVAL; + + memcpy(dest, src, src_size); + + return 0; +} + +static inline int memset_s(void *dest, size_t dest_size, int data, size_t count) +{ + if (!dest) + return -EINVAL; + + if (count > dest_size) + return -EINVAL; + + if (!memset(dest, data, count)) + return -ENOMEM; + + return 0; +} + +#endif /* __ZEPHYR_RTOS_STRING_H__ */