From 5141e69b0f5dc64d043b10954b3ce3c49c209157 Mon Sep 17 00:00:00 2001 From: Arnaud Pouliquen Date: Thu, 24 Oct 2024 10:30:24 +0200 Subject: [PATCH] lib: processor: hosted: fix compilation warning in metal_cpu_yield MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix cross inclusion between metal/sys.h and /processor/hosted/cpu.h replacing metal_wait_usec by k_busy_wait function call. Issue reported by Zephyr twister CI test: libmetal/lib/include/metal/processor/hosted/cpu.h:19:9: error: implicit declaration of function ‘metal_wait_usec’ 19 | metal_wait_usec(10); | ^~~~~~~~~~~~~~~ libmetal/lib/include/metal/system/zephyr/sys.h:46:20: error: conflicting types for ‘metal_wait_usec’; have ‘void(uint32_t)’ 46 | static inline void metal_wait_usec(uint32_t usec_to_wait) | ^~~~~~~~~~~~~~~ libmetal/lib/include/metal/processor/hosted/cpu.h:19:9: note: previous implicit declaration of ‘metal_wait_usec’ with type ‘void(uint32_t)’ {aka ‘void(unsigned int)’} 19 | metal_wait_usec(10); | ^~~~~~~~~~~~~~~ Signed-off-by: Arnaud Pouliquen --- lib/processor/hosted/cpu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/processor/hosted/cpu.h b/lib/processor/hosted/cpu.h index be8a1680..d31ea723 100644 --- a/lib/processor/hosted/cpu.h +++ b/lib/processor/hosted/cpu.h @@ -9,14 +9,14 @@ * @brief Hosted environment CPU specific primitives */ -#include +#include #ifndef __METAL_HOSTED_CPU__H__ #define __METAL_HOSTED_CPU__H__ static inline void metal_cpu_yield(void) { - metal_wait_usec(10); + k_busy_wait(10); } #endif /* __METAL_HOSTED_CPU__H__ */