zephyr: update include paths to use <zephyr/...>

Zephyr has prefixed all of its includes with <zephyr/...>. While the old
mode can still be used (CONFIG_LEGACY_INCLUDE_PATH) and is still enabled
by default, it's better to be prepared for its removal in the future.

Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>

lib/system/zephyr/alloc.h

@@ -16,7 +16,7 @@
 #ifndef __METAL_ZEPHYR_ALLOC__H__
 #define __METAL_ZEPHYR_ALLOC__H__
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <stdlib.h>
 
 #ifdef __cplusplus

lib/system/zephyr/assert.h

@@ -16,7 +16,7 @@
 #ifndef __METAL_ZEPHYR_ASSERT__H__
 #define __METAL_ZEPHYR_ASSERT__H__
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 /**
  * @brief Assertion macro for Zephyr-based applications.

lib/system/zephyr/cache.h

@@ -16,7 +16,7 @@
 #ifndef __METAL_ZEPHYR_CACHE__H__
 #define __METAL_ZEPHYR_CACHE__H__
 
-#include <cache.h>
+#include <zephyr/cache.h>
 #include <metal/utilities.h>
 
 #ifdef __cplusplus

lib/system/zephyr/log.c

@@ -11,7 +11,7 @@
 
 #include <stdarg.h>
 #include <metal/log.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 static const char * const level_strs[] = {
 	"metal: emergency: ",

lib/system/zephyr/mutex.h

@@ -17,7 +17,7 @@
 #define __METAL_ZEPHYR_MUTEX__H__
 
 #include <metal/atomic.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {

lib/system/zephyr/sleep.h

@@ -16,7 +16,7 @@
 #ifndef __METAL_ZEPHYR_SLEEP__H__
 #define __METAL_ZEPHYR_SLEEP__H__
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 #ifdef __cplusplus
 extern "C" {

lib/system/zephyr/sys.c

@@ -12,7 +12,7 @@
 #include <metal/io.h>
 #include <metal/sys.h>
 
-#include <sys/arch_interface.h>
+#include <zephyr/sys/arch_interface.h>
 
 /**
  * @brief poll function until some event happens

lib/system/zephyr/time.c

@@ -10,7 +10,7 @@
  */
 
 #include <metal/time.h>
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 unsigned long long metal_get_timestamp(void)
 {

test/system/zephyr/alloc.c

@@ -10,7 +10,7 @@
 #include <metal/errno.h>
 #include <metal/log.h>
 #include <metal/sys.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #include "metal-test-internal.h"
 
 static int alloc(void)

test/system/zephyr/main.c

@@ -5,9 +5,9 @@
  */
 
 #include "metal-test-internal.h"
-#include <kernel.h>
+#include <zephyr/kernel.h>
 #include <metal/log.h>
-#include <sys/printk.h>
+#include <zephyr/sys/printk.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>