rtos: add Zephyr implementation of sof/lib/dai.h

Implement sof/lib/dai.h for Zephyr build and do not rely o the xtos version for Zephyr builds. Add a warning to catch invalid build configurations. Link: thesofproject#9015 Signed-off-by: Kai Vehmanen <[email protected]>
pillo79 · Sep 11, 2024 · 76a700c · 76a700c
1 parent d00561e
commit 76a700c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/west.yml b/west.yml
@@ -43,7 +43,7 @@ manifest:
 
     - name: zephyr
       repo-path: zephyr
-      revision: 689d1edee1d57f052b1d4572d67618c0b0e2b8a4
+      revision: pull/78265/head
       remote: zephyrproject
 
       # Import some projects listed in zephyr/west.yml@revision

diff --git a/xtos/include/sof/lib/dai.h b/xtos/include/sof/lib/dai.h
@@ -13,13 +13,13 @@
   * \author Keyon Jie <[email protected]>
   */
 
+#ifdef __ZEPHYR__
+#error "Please use zephyr/include/sof/lib/dai.h instead"
+#endif
+
 #ifndef __SOF_LIB_DAI_H__
 #define __SOF_LIB_DAI_H__
 
-#ifdef CONFIG_ZEPHYR_NATIVE_DRIVERS
-#include <sof/lib/dai-zephyr.h>
-#else
 #include <sof/lib/dai-legacy.h>
-#endif
 
 #endif /* __SOF_LIB_DAI_H__ */
diff --git a/zephyr/include/sof/lib/dai.h b/zephyr/include/sof/lib/dai.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright(c) 2024 Intel Corporation.
+ */
+
+#ifndef __SOF_LIB_DAI_H__
+#define __SOF_LIB_DAI_H__
+
+/* no-op on Zephyr */
+
+#ifdef CONFIG_ZEPHYR_NATIVE_DRIVERS
+#include <sof/lib/dai-zephyr.h>
+#else
+#include <sof/lib/dai-legacy.h>
+#endif
+
+#endif /* __SOF_LIB_MEMORY_H__ */