rtos: abstraction: partition RTOS logic into separate directories

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

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()

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()

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}")

src/arch/host/include/arch/spinlock.h

@@ -5,7 +5,8 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#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__

src/arch/host/include/arch/string.h

@@ -5,7 +5,7 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#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);

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)
 

src/arch/xtensa/include/arch/spinlock.h

@@ -5,7 +5,7 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#ifdef __SOF_SPINLOCK_H__
+#ifdef __XTOS_RTOS_SPINLOCK_H__
 
 #ifndef __ARCH_SPINLOCK_H__
 #define __ARCH_SPINLOCK_H__

src/arch/xtensa/include/arch/string.h

@@ -5,7 +5,7 @@
  * Author: Liam Girdwood <liam.r.girdwood@linux.intel.com>
  */
 
-#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);

src/arch/xtensa/init.c

@@ -16,7 +16,7 @@
 #include <sof/init.h>
 #include <sof/lib/cpu.h>
 #include <sof/sof.h>
-#include <sof/spinlock.h>
+#include <rtos/spinlock.h>
 
 #include <ipc/trace.h>
 

src/audio/aria/aria.c

@@ -16,7 +16,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/ut.h>
 #include <sof/trace/trace.h>
 #include <ipc4/aria.h>

src/audio/asrc/asrc.c

@@ -19,7 +19,7 @@
 #include <sof/compiler_attributes.h>
 #include <sof/list.h>
 #include <sof/platform.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/ut.h>
 #include <ipc/control.h>
 #include <ipc/stream.h>

src/audio/asrc/asrc_farrow.c

@@ -8,7 +8,7 @@
 #include <sof/debug/panic.h>
 #include <sof/math/numbers.h>
 #include <sof/platform.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/trace/trace.h>
 #include <sof/audio/format.h>
 #include <user/trace.h>

src/audio/buffer.c

@@ -13,7 +13,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/notifier.h>
 #include <sof/list.h>
-#include <sof/spinlock.h>
+#include <rtos/spinlock.h>
 #include <ipc/topology.h>
 #include <errno.h>
 #include <stddef.h>

src/audio/channel_map.c

@@ -8,7 +8,7 @@
 #include <sof/lib/uuid.h>
 #include <sof/trace/trace.h>
 #include <user/trace.h>
-#include <sof/bit.h>
+#include <rtos/bit.h>
 #include <sof/common.h>
 #include <ipc/channel_map.h>
 #include <stdint.h>

src/audio/component.c

@@ -14,7 +14,7 @@
 #include <sof/lib/memory.h>
 #include <sof/list.h>
 #include <sof/sof.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <ipc/topology.h>
 #include <errno.h>
 #include <stdbool.h>

src/audio/copier/copier.c

@@ -21,7 +21,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/ut.h>
 #include <sof/trace/trace.h>
 #include <ipc4/alh.h>

src/audio/crossover/crossover.c

@@ -21,7 +21,7 @@
 #include <sof/math/iir_df2t.h>
 #include <sof/list.h>
 #include <sof/platform.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/trace/trace.h>
 #include <sof/ut.h>
 #include <ipc/control.h>

src/audio/dai-legacy.c

@@ -22,7 +22,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/ut.h>
 #include <sof/trace/trace.h>
 #include <ipc/dai.h>

src/audio/dai-zephyr.c

@@ -22,7 +22,7 @@
 #include <sof/lib/notifier.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/ut.h>
 #include <sof/trace/trace.h>
 #include <ipc/dai.h>

src/audio/dcblock/dcblock.c

@@ -18,7 +18,7 @@
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/platform.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/ut.h>
 #include <sof/trace/trace.h>
 #include <ipc/control.h>

src/audio/drc/drc.c

@@ -21,7 +21,7 @@
 #include <sof/list.h>
 #include <sof/math/numbers.h>
 #include <sof/platform.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/ut.h>
 #include <sof/trace/trace.h>
 #include <ipc/control.h>

src/audio/eq_fir/eq_fir.c

@@ -21,7 +21,7 @@
 #include <sof/list.h>
 #include <sof/math/fir_config.h>
 #include <sof/platform.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/ut.h>
 #include <sof/trace/trace.h>
 #include <ipc/control.h>

src/audio/eq_iir/eq_iir.c

@@ -22,7 +22,7 @@
 #include <sof/list.h>
 #include <sof/math/iir_df2t.h>
 #include <sof/platform.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/ut.h>
 #include <sof/trace/trace.h>
 #include <ipc/control.h>

src/audio/google_hotword_detect.c

@@ -20,7 +20,7 @@
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/numbers.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/trace/trace.h>
 #include <sof/ut.h>
 #include <ipc/control.h>

src/audio/google_rtc_audio_processing.c

@@ -23,7 +23,7 @@
 #include <sof/lib/wait.h>
 #include <sof/list.h>
 #include <sof/math/numbers.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/trace/trace.h>
 #include <sof/ut.h>
 #include <stdbool.h>

src/audio/host-legacy.c

@@ -21,7 +21,7 @@
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/numbers.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/ut.h>
 #include <sof/trace/trace.h>
 #include <ipc/stream.h>

src/audio/host-zephyr.c

@@ -21,7 +21,7 @@
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/math/numbers.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/ut.h>
 #include <sof/trace/trace.h>
 #include <ipc/stream.h>

src/audio/igo_nr/igo_nr.c

@@ -16,7 +16,7 @@
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
 #include <sof/platform.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/audio/buffer.h>
 #include <sof/audio/component.h>
 #include <sof/audio/data_blob.h>

src/audio/kpb.c

@@ -35,7 +35,7 @@
 #include <sof/schedule/edf_schedule.h>
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/ut.h>
 #include <ipc/topology.h>
 #include <user/kpb.h>

src/audio/mixer/mixer.c

@@ -20,7 +20,7 @@
 #include <sof/list.h>
 #include <sof/math/numbers.h>
 #include <sof/platform.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/trace/trace.h>
 #include <sof/ut.h>
 #include <ipc/stream.h>

src/audio/mixin_mixout.c

@@ -17,7 +17,7 @@
 #include <sof/list.h>
 #include <sof/math/numbers.h>
 #include <sof/platform.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/trace/trace.h>
 #include <sof/ut.h>
 #include <ipc/stream.h>

src/audio/module_adapter/iadk/system_agent.cpp

@@ -12,7 +12,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <utilities/array.h>
 #include <adsp_error_code.h>
 #include <logger.h>

src/audio/module_adapter/iadk/system_service.c

@@ -13,7 +13,7 @@
 #include <stdint.h>
 #include <sof/common.h>
 #include <sof/sof.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <ipc4/notification.h>
 #include <sof/ipc/msg.h>
 #include <adsp_error_code.h>

src/audio/module_adapter/module/volume/volume.c

@@ -31,7 +31,7 @@
 #include <sof/list.h>
 #include <sof/math/numbers.h>
 #include <sof/platform.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/trace/trace.h>
 #include <sof/ut.h>
 #include <ipc/control.h>

src/audio/multiband_drc/multiband_drc.c

@@ -20,7 +20,7 @@
 #include <sof/list.h>
 #include <sof/math/numbers.h>
 #include <sof/platform.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/ut.h>
 #include <sof/trace/trace.h>
 #include <ipc/control.h>

src/audio/mux/mux.c

@@ -20,7 +20,7 @@
 #include <sof/list.h>
 #include <sof/math/numbers.h>
 #include <sof/platform.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/trace/preproc.h>
 #include <sof/trace/trace.h>
 #include <sof/ut.h>

src/audio/mux/mux_generic.c

@@ -10,7 +10,7 @@
 #include <sof/audio/component.h>
 #include <sof/audio/format.h>
 #include <sof/audio/mux.h>
-#include <sof/bit.h>
+#include <rtos/bit.h>
 #include <sof/common.h>
 #include <ipc/stream.h>
 #include <stddef.h>

src/audio/pcm_converter/pcm_converter_generic.c

@@ -18,7 +18,7 @@
 
 #include <sof/audio/buffer.h>
 #include <sof/audio/format.h>
-#include <sof/bit.h>
+#include <rtos/bit.h>
 #include <sof/common.h>
 #include <sof/compiler_attributes.h>
 #include <ipc/stream.h>

src/audio/pipeline/pipeline-graph.c

@@ -14,8 +14,8 @@
 #include <sof/lib/uuid.h>
 #include <sof/compiler_attributes.h>
 #include <sof/list.h>
-#include <sof/spinlock.h>
-#include <sof/string.h>
+#include <rtos/spinlock.h>
+#include <rtos/string.h>
 #include <ipc/header.h>
 #include <ipc/stream.h>
 #include <ipc/topology.h>