header: rtos: use rtos specific version of string.h

lrgirdwo · lgirdwood · commit c90055f2f51e · 2022-08-31T12:01:07.000+01:00
No runtime semantic change. Use C library when RTOS uses
C library otherwise use own C library calls.

Signed-off-by: Liam Girdwood &lt;liam.r.girdwood@linux.intel.com&gt;
diff --git a/src/arch/host/include/arch/string.h b/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);
diff --git a/src/arch/xtensa/include/arch/string.h b/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);
diff --git a/src/audio/aria/aria.c b/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>
diff --git a/src/audio/asrc/asrc.c b/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>
diff --git a/src/audio/asrc/asrc_farrow.c b/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>
diff --git a/src/audio/component.c b/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>
diff --git a/src/audio/copier/copier.c b/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>
diff --git a/src/audio/crossover/crossover.c b/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>
diff --git a/src/audio/dai-legacy.c b/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>
diff --git a/src/audio/dai-zephyr.c b/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>
diff --git a/src/audio/dcblock/dcblock.c b/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>
diff --git a/src/audio/drc/drc.c b/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>
diff --git a/src/audio/eq_fir/eq_fir.c b/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>
diff --git a/src/audio/eq_iir/eq_iir.c b/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>
diff --git a/src/audio/google_hotword_detect.c b/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>
diff --git a/src/audio/google_rtc_audio_processing.c b/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>
diff --git a/src/audio/host-legacy.c b/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>
diff --git a/src/audio/host-zephyr.c b/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>
diff --git a/src/audio/igo_nr/igo_nr.c b/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>
diff --git a/src/audio/kpb.c b/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>
diff --git a/src/audio/mixer/mixer.c b/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>
diff --git a/src/audio/mixin_mixout.c b/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>
diff --git a/src/audio/module_adapter/iadk/system_agent.cpp b/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>
diff --git a/src/audio/module_adapter/iadk/system_service.c b/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>
diff --git a/src/audio/module_adapter/module/volume/volume.c b/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>
diff --git a/src/audio/multiband_drc/multiband_drc.c b/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>
diff --git a/src/audio/mux/mux.c b/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>
diff --git a/src/audio/pipeline/pipeline-graph.c b/src/audio/pipeline/pipeline-graph.c
@@ -15,7 +15,7 @@
 #include <sof/compiler_attributes.h>
 #include <sof/list.h>
 #include <rtos/spinlock.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <ipc/header.h>
 #include <ipc/stream.h>
 #include <ipc/topology.h>
diff --git a/src/audio/pipeline/pipeline-schedule.c b/src/audio/pipeline/pipeline-schedule.c
@@ -15,7 +15,7 @@
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
 #include <rtos/spinlock.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <ipc/header.h>
 #include <ipc/stream.h>
 #include <ipc/topology.h>
diff --git a/src/audio/pipeline/pipeline-stream.c b/src/audio/pipeline/pipeline-stream.c
@@ -12,7 +12,7 @@
 #include <sof/lib/wait.h>
 #include <sof/list.h>
 #include <rtos/spinlock.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <ipc/stream.h>
 #include <ipc/topology.h>
 #include <rtos/kernel.h>
diff --git a/src/audio/pipeline/pipeline-xrun.c b/src/audio/pipeline/pipeline-xrun.c
@@ -11,7 +11,7 @@
 #include <sof/ipc/msg.h>
 #include <sof/list.h>
 #include <rtos/spinlock.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <ipc/header.h>
 #include <ipc/stream.h>
 #include <ipc/topology.h>
diff --git a/src/audio/rtnr/rtnr.c b/src/audio/rtnr/rtnr.c
@@ -19,7 +19,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>
diff --git a/src/audio/selector/selector.c b/src/audio/selector/selector.c
@@ -24,7 +24,7 @@
 #include <sof/lib/memory.h>
 #include <sof/lib/uuid.h>
 #include <sof/list.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/trace/trace.h>
 #include <sof/ut.h>
 #include <ipc/control.h>
diff --git a/src/audio/src/src.c b/src/audio/src/src.c
@@ -22,7 +22,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>
diff --git a/src/audio/tdfb/tdfb.c b/src/audio/tdfb/tdfb.c
@@ -22,7 +22,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>
diff --git a/src/audio/tone.c b/src/audio/tone.c
@@ -20,7 +20,7 @@
 #include <sof/list.h>
 #include <sof/math/trig.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>
diff --git 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 <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 <user/trace.h>
diff --git a/src/debug/panic.c b/src/debug/panic.c
@@ -11,7 +11,7 @@
 #include <sof/lib/cache.h>
 #include <sof/lib/mailbox.h>
 #include <sof/platform.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/trace/trace.h>
 #include <ipc/trace.h>
 
diff --git a/src/drivers/dw/ssi-spi.c b/src/drivers/dw/ssi-spi.c
@@ -24,7 +24,7 @@
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
 #include <rtos/spinlock.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <ipc/header.h>
 #include <ipc/topology.h>
 #include <stddef.h>
diff --git a/src/drivers/generic/dummy-dma.c b/src/drivers/generic/dummy-dma.c
@@ -35,7 +35,7 @@
 #include <sof/lib/uuid.h>
 #include <sof/platform.h>
 #include <rtos/spinlock.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/trace/trace.h>
 #include <sys/types.h>
 #include <ipc/topology.h>
diff --git a/src/drivers/intel/cavs/idc.c b/src/drivers/intel/cavs/idc.c
@@ -13,7 +13,7 @@
 #include <sof/platform.h>
 #include <sof/schedule/schedule.h>
 #include <sof/schedule/task.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <sof/trace/trace.h>
 #include <errno.h>
 #include <stdbool.h>
diff --git a/src/drivers/intel/dmic/dmic.c b/src/drivers/intel/dmic/dmic.c
@@ -23,7 +23,7 @@
 #include <sof/math/decibels.h>
 #include <sof/math/numbers.h>
 #include <rtos/spinlock.h>
-#include <sof/string.h>
+#include <rtos/string.h>
 #include <ipc/dai.h>
 #include <ipc/dai-intel.h>
 #include <ipc/topology.h>
diff --git a/src/include/sof/audio/buffer.h b/src/include/sof/audio/buffer.h
diff --git a/src/include/sof/debug/debug.h b/src/include/sof/debug/debug.h
diff --git a/src/ipc/ipc3/handler.c b/src/ipc/ipc3/handler.c
diff --git a/src/lib/alloc.c b/src/lib/alloc.c
diff --git a/src/lib/lib.c b/src/lib/lib.c
diff --git a/src/platform/intel/cavs/include/cavs/lib/mailbox.h b/src/platform/intel/cavs/include/cavs/lib/mailbox.h
diff --git a/src/samples/audio/detect_test.c b/src/samples/audio/detect_test.c
diff --git a/src/trace/dma-trace.c b/src/trace/dma-trace.c
diff --git a/src/trace/trace.c b/src/trace/trace.c
diff --git a/test/cmocka/src/math/arithmetic/base2_logarithm.c b/test/cmocka/src/math/arithmetic/base2_logarithm.c
diff --git a/test/cmocka/src/math/arithmetic/base_10_logarithm.c b/test/cmocka/src/math/arithmetic/base_10_logarithm.c
diff --git a/test/cmocka/src/math/arithmetic/base_e_logarithm.c b/test/cmocka/src/math/arithmetic/base_e_logarithm.c
diff --git a/test/cmocka/src/math/arithmetic/square_root.c b/test/cmocka/src/math/arithmetic/square_root.c
diff --git a/tools/testbench/common_test.c b/tools/testbench/common_test.c
diff --git a/tools/testbench/topology.c b/tools/testbench/topology.c
diff --git a/xtos/include/rtos/string.h b/xtos/include/rtos/string.h
diff --git a/xtos/include/sof/lib/alloc.h b/xtos/include/sof/lib/alloc.h
diff --git a/xtos/include/sof/lib/mailbox.h b/xtos/include/sof/lib/mailbox.h
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt
diff --git a/zephyr/include/rtos/string.h b/zephyr/include/rtos/string.h
