diff options
| author | Fabio Baltieri <fabiobaltieri@google.com> | 2022-05-09 16:00:03 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-05-09 18:43:20 +0000 |
| commit | 041042627a750d7a141ce2392630464a24be39b5 (patch) | |
| tree | 9cf331ac3543bba51c5d3c3ce12924cf0dada07e /include | |
| parent | a6fcdc3cffaf8d987514fcac48645869f171ac3e (diff) | |
| download | chrome-ec-041042627a750d7a141ce2392630464a24be39b5.tar.gz | |
zephyr: add a zephyr/ prefix to all zephyr includes
This adds a zephyr/ prefix to all #include path pointing to Zephyr
header files, so that we could drop LEGACY_INCLUD_PATH once all upstream
code has been converted.
Generated using something similar to the script in:
c7b5b3c419 samples: migrate includes to contain <zephyr/...> prefix
BRANCH=none
BUG=none
TEST=cq dry run
Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: I5ba2c859fe10a34ea8d3a49a612132ea4d02f2cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3634345
Reviewed-by: Yuval Peress <peress@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/atomic_t.h | 2 | ||||
| -rw-r--r-- | include/common.h | 4 | ||||
| -rw-r--r-- | include/compile_time_macros.h | 2 | ||||
| -rw-r--r-- | include/fan.h | 2 | ||||
| -rw-r--r-- | include/gpio.h | 2 | ||||
| -rw-r--r-- | include/util.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/include/atomic_t.h b/include/atomic_t.h index e35fc187bf..d7c1a99147 100644 --- a/include/atomic_t.h +++ b/include/atomic_t.h @@ -16,7 +16,7 @@ typedef long atomic_t; #endif typedef atomic_t atomic_val_t; #else -#include <sys/atomic.h> +#include <zephyr/sys/atomic.h> #endif #endif /* __CROS_EC_ATOMIC_T_H */ diff --git a/include/common.h b/include/common.h index 391000933b..33c9ab97c2 100644 --- a/include/common.h +++ b/include/common.h @@ -15,8 +15,8 @@ #ifdef CONFIG_ZEPHYR #include <fpu.h> -#include <sys/util.h> -#include <toolchain.h> +#include <zephyr/sys/util.h> +#include <zephyr/toolchain.h> #ifdef CONFIG_ZTEST #define TEST_BUILD #endif /* CONFIG_ZTEST */ diff --git a/include/compile_time_macros.h b/include/compile_time_macros.h index afb2c30d19..0151f1a391 100644 --- a/include/compile_time_macros.h +++ b/include/compile_time_macros.h @@ -14,7 +14,7 @@ /* sys/util.h in zephyr provides equivalents to most of these macros */ #ifdef CONFIG_ZEPHYR -#include <sys/util.h> +#include <zephyr/sys/util.h> #endif #ifdef __cplusplus diff --git a/include/fan.h b/include/fan.h index 573cc89aba..87c8f4b7a6 100644 --- a/include/fan.h +++ b/include/fan.h @@ -11,7 +11,7 @@ #ifdef CONFIG_ZEPHYR #ifdef CONFIG_PLATFORM_EC_FAN -#include <devicetree.h> +#include <zephyr/devicetree.h> #define NODE_ID_AND_COMMA(node_id) node_id, enum fan_channel { #if DT_NODE_EXISTS(DT_INST(0, cros_ec_fans)) diff --git a/include/gpio.h b/include/gpio.h index c6ff3e049f..a64ffd6926 100644 --- a/include/gpio.h +++ b/include/gpio.h @@ -20,7 +20,7 @@ * conflicts */ #ifdef CONFIG_ZEPHYR -#include <drivers/gpio.h> +#include <zephyr/drivers/gpio.h> /* * Some flag definitions are duplicated by our private devicetree binding diff --git a/include/util.h b/include/util.h index 3601ca6668..e39b81ccdf 100644 --- a/include/util.h +++ b/include/util.h @@ -16,7 +16,7 @@ #include <stdbool.h> #include <stddef.h> #ifdef CONFIG_ZEPHYR -#include <sys/util.h> +#include <zephyr/sys/util.h> #endif #ifdef __cplusplus |