everywhere: Fix legacy include paths

Any project with Kconfig option CONFIG_LEGACY_INCLUDE_PATH set to n
couldn't be built because some files were missing zephyr/ prefix in
includes
Re-run the migrate_includes.py script to fix all legacy include paths

Signed-off-by: Tomislav Milkovic <milkovic@byte-lab.com>
This commit is contained in:
Tomislav Milkovic 2022-07-18 13:08:11 +02:00 committed by Fabio Baltieri
commit 0fe2c1fe90
52 changed files with 124 additions and 124 deletions

View file

@ -1,7 +1,7 @@
/* Copyright (c) 2022 Intel Corporation
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr.h>
#include <zephyr/zephyr.h>
void arch_timing_init(void)
{

View file

@ -8,7 +8,7 @@
#include <rpi_pico/rp2040.dtsi>
#include "rpi_pico-pinctrl.dtsi"
#include <dt-bindings/pwm/pwm.h>
#include <zephyr/dt-bindings/pwm/pwm.h>
#include <zephyr/dt-bindings/i2c/i2c.h>

View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <drivers/gpio.h>
#include <init.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/init.h>
static int board_swan_init(const struct device *dev)
{

View file

@ -4,14 +4,14 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <device.h>
#include <devicetree.h>
#include <drivers/adc.h>
#include <logging/log.h>
#include <drivers/i2c.h>
#include <zephyr.h>
#include <sys/byteorder.h>
#include <sys/util.h>
#include <zephyr/device.h>
#include <zephyr/devicetree.h>
#include <zephyr/drivers/adc.h>
#include <zephyr/logging/log.h>
#include <zephyr/drivers/i2c.h>
#include <zephyr/zephyr.h>
#include <zephyr/sys/byteorder.h>
#include <zephyr/sys/util.h>
#define ADC_CONTEXT_USES_KERNEL_TIMER 1
#include "adc_context.h"

View file

@ -17,7 +17,7 @@
#define ADC_CONTEXT_USES_KERNEL_TIMER
#include "adc_context.h"
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(adc_gd32, CONFIG_ADC_LOG_LEVEL);
/**

View file

@ -8,8 +8,8 @@
#define LOG_MODULE_NAME bt_hci_driver_b91
#include "common/log.h"
#include <sys/byteorder.h>
#include <drivers/bluetooth/hci_driver.h>
#include <zephyr/sys/byteorder.h>
#include <zephyr/drivers/bluetooth/hci_driver.h>
#include <b91_bt.h>

View file

@ -5,7 +5,7 @@
*/
#include <zephyr/kernel.h>
#include <arch/arm/aarch32/cortex_m/cmsis.h>
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
#include <zephyr/drivers/syscon.h>
/*

View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr/device.h>
#include <drivers/clock_control/clock_control_cavs.h>
#include <zephyr/drivers/clock_control/clock_control_cavs.h>
#include <zephyr/drivers/clock_control.h>
static int cavs_clock_ctrl_set_rate(const struct device *clk,

View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <debug/coredump.h>
#include <drivers/coredump.h>
#include <zephyr/debug/coredump.h>
#include <zephyr/drivers/coredump.h>
#define DT_DRV_COMPAT zephyr_coredump

View file

@ -6,7 +6,7 @@
#define DT_DRV_COMPAT silabs_gecko_semailbox
#include <drivers/entropy.h>
#include <zephyr/drivers/entropy.h>
#include <soc.h>
#include "em_cmu.h"
#include "sl_se_manager.h"

View file

@ -4,11 +4,11 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <device.h>
#include <devicetree.h>
#include <drivers/sensor.h>
#include <drivers/adc.h>
#include <logging/log.h>
#include <zephyr/device.h>
#include <zephyr/devicetree.h>
#include <zephyr/drivers/sensor.h>
#include <zephyr/drivers/adc.h>
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(stm32_vbat, CONFIG_SENSOR_LOG_LEVEL);

View file

@ -8,7 +8,7 @@
#include <hal/usb_serial_jtag_ll.h>
#include <device.h>
#include <zephyr/device.h>
#include <errno.h>
#include <soc.h>
#include <zephyr/drivers/uart.h>

View file

@ -6,11 +6,11 @@
#define DT_DRV_COMPAT microchip_mpfs_qspi
#include <device.h>
#include <drivers/spi.h>
#include <sys/sys_io.h>
#include <sys/util.h>
#include <logging/log.h>
#include <zephyr/device.h>
#include <zephyr/drivers/spi.h>
#include <zephyr/sys/sys_io.h>
#include <zephyr/sys/util.h>
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(mss_qspi, CONFIG_SPI_LOG_LEVEL);
#include "spi_context.h"

View file

@ -4,10 +4,10 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <device.h>
#include <sys/crc.h>
#include <zephyr/device.h>
#include <zephyr/sys/crc.h>
#include <zephyr/types.h>
#include <drivers/w1.h>
#include <zephyr/drivers/w1.h>
int z_impl_w1_read_block(const struct device *dev, uint8_t *buffer, size_t len)

View file

@ -13,8 +13,8 @@
* the arch_is_user_context() check.
*/
#include <logging/log.h>
#include <drivers/w1.h>
#include <zephyr/logging/log.h>
#include <zephyr/drivers/w1.h>
LOG_MODULE_REGISTER(w1, CONFIG_W1_LOG_LEVEL);

View file

@ -17,16 +17,16 @@
*
****************************************************************************
*/
#include <arch/arm64/hypercall.h>
#include <xen/generic.h>
#include <xen/gnttab.h>
#include <xen/public/grant_table.h>
#include <xen/public/memory.h>
#include <xen/public/xen.h>
#include <zephyr/arch/arm64/hypercall.h>
#include <zephyr/xen/generic.h>
#include <zephyr/xen/gnttab.h>
#include <zephyr/xen/public/grant_table.h>
#include <zephyr/xen/public/memory.h>
#include <zephyr/xen/public/xen.h>
#include <init.h>
#include <kernel.h>
#include <logging/log.h>
#include <zephyr/init.h>
#include <zephyr/kernel.h>
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(xen_gnttab);

View file

@ -6,9 +6,9 @@
#include <mem.h>
#include <arm/armv6-m.dtsi>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/i2c/i2c.h>
#include <dt-bindings/pwm/pwm.h>
#include <zephyr/dt-bindings/gpio/gpio.h>
#include <zephyr/dt-bindings/i2c/i2c.h>
#include <zephyr/dt-bindings/pwm/pwm.h>
/ {
aliases {

View file

@ -6,7 +6,7 @@
#include <freq.h>
#include <atmel/saml21.dtsi>
#include <dt-bindings/lora/sx126x.h>
#include <zephyr/dt-bindings/lora/sx126x.h>
#include "saml21.dtsi"

View file

@ -6,10 +6,10 @@
#include <arm/armv7-m.dtsi>
#include <dt-bindings/i2c/i2c.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/clock/mchp_xec_pcr.h>
#include <dt-bindings/interrupt-controller/mchp-xec-ecia.h>
#include <zephyr/dt-bindings/i2c/i2c.h>
#include <zephyr/dt-bindings/gpio/gpio.h>
#include <zephyr/dt-bindings/clock/mchp_xec_pcr.h>
#include <zephyr/dt-bindings/interrupt-controller/mchp-xec-ecia.h>
#include "mec172xnsz.dtsi"
#include "mec172x/mec172x-vw-routing.dtsi"

View file

@ -20,7 +20,7 @@
*/
#include <zephyr/types.h>
#include <bluetooth/audio/csis.h>
#include <zephyr/bluetooth/audio/csis.h>
#ifdef __cplusplus
extern "C" {

View file

@ -20,7 +20,7 @@
#include <stdbool.h>
#include <zephyr/toolchain.h>
#include <zephyr/tracing/tracing_macros.h>
#include <sys/mem_stats.h>
#include <zephyr/sys/mem_stats.h>
#ifdef __cplusplus
extern "C" {

View file

@ -9,7 +9,7 @@
#include <stddef.h>
#include <stdbool.h>
#include <zephyr/types.h>
#include <sys/mem_stats.h>
#include <zephyr/sys/mem_stats.h>
#ifdef __cplusplus
extern "C" {

View file

@ -6,7 +6,7 @@
#ifndef __XEN_GNTTAB_H__
#define __XEN_GNTTAB_H__
#include <xen/public/grant_table.h>
#include <zephyr/xen/public/grant_table.h>
/*
* Assigns gref and permits access to 4K page for specific domain.

View file

@ -256,7 +256,7 @@ int z_impl_zephyr_write_stdout(const void *buffer, int nbytes)
return nbytes;
}
#include <sys/cbprintf.h>
#include <zephyr/sys/cbprintf.h>
struct cb_bits {
FILE f;
@ -528,7 +528,7 @@ int _gettimeofday(struct timeval *__tp, void *__tzp)
}
#include <stdlib.h>
#include <zephyr.h>
#include <zephyr/zephyr.h>
/* Replace picolibc abort with native Zephyr one */
void abort(void)

View file

@ -5,12 +5,12 @@
*/
#include <stdio.h>
#include <zephyr.h>
#include <device.h>
#include <drivers/gpio.h>
#include <drivers/counter.h>
#include <pm/pm.h>
#include <pm/policy.h>
#include <zephyr/zephyr.h>
#include <zephyr/device.h>
#include <zephyr/drivers/gpio.h>
#include <zephyr/drivers/counter.h>
#include <zephyr/pm/pm.h>
#include <zephyr/pm/policy.h>
#define BUSY_WAIT_S 2U
#define SLEEP_S 2U

View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <dt-bindings/led/led.h>
#include <zephyr/dt-bindings/led/led.h>
&lpspi3 {
led_strip: ws2812@0 {

View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <dt-bindings/led/led.h>
#include <zephyr/dt-bindings/led/led.h>
&lpspi3 {
led_strip: ws2812@0 {

View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr.h>
#include <zephyr/zephyr.h>
#include <zephyr/rtio/rtio.h>
#include <zephyr/rtio/rtio_executor_simple.h>
#include <zephyr/logging/log.h>

View file

@ -5,10 +5,10 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr.h>
#include <sys/sys_io.h>
#include <sys/__assert.h>
#include <pm/pm.h>
#include <zephyr/zephyr.h>
#include <zephyr/sys/sys_io.h>
#include <zephyr/sys/__assert.h>
#include <zephyr/pm/pm.h>
#include <soc.h>
#include "device_power.h"

View file

@ -5,13 +5,13 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr.h>
#include <sys/sys_io.h>
#include <sys/__assert.h>
#include <pm/pm.h>
#include <zephyr/zephyr.h>
#include <zephyr/sys/sys_io.h>
#include <zephyr/sys/__assert.h>
#include <zephyr/pm/pm.h>
#include <soc.h>
#include <arch/cpu.h>
#include <arch/arm/aarch32/cortex_m/cmsis.h>
#include <zephyr/arch/cpu.h>
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
#ifndef CONFIG_PM_DEVICE
#include "device_power.h"
#endif

View file

@ -14,8 +14,8 @@
*/
#include <xtensa/config/core-isa.h>
#include <sys/util.h>
#include <sw_isr_table.h>
#include <zephyr/sys/util.h>
#include <zephyr/sw_isr_table.h>
#if !defined(XCHAL_INT0_LEVEL) || XCHAL_INT0_LEVEL != 1
#error core-isa.h interrupt level does not match dispatcher!

View file

@ -3,7 +3,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <device.h>
#include <zephyr/device.h>
#include <cavs-clk.h>
#include <cavs-shim.h>

View file

@ -4,9 +4,9 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <bluetooth/gatt.h>
#include <bluetooth/audio/tbs.h>
#include <bluetooth/audio/csis.h>
#include <zephyr/bluetooth/gatt.h>
#include <zephyr/bluetooth/audio/tbs.h>
#include <zephyr/bluetooth/audio/csis.h>
#include "cap_internal.h"
#define BT_DBG_ENABLED IS_ENABLED(CONFIG_BT_DEBUG_CAP)

View file

@ -7,6 +7,6 @@
*/
#include <zephyr/types.h>
#include <bluetooth/conn.h>
#include <zephyr/bluetooth/conn.h>
bool bt_cap_acceptor_ccid_exist(const struct bt_conn *conn, uint8_t ccid);

View file

@ -8,7 +8,7 @@
#include <zephyr/zephyr.h>
#include <zephyr/types.h>
#include <sys/check.h>
#include <zephyr/sys/check.h>
#include <zephyr/device.h>
#include <zephyr/init.h>

View file

@ -6,10 +6,10 @@
#include <zephyr/types.h>
#include <bluetooth/hci.h>
#include <sys/byteorder.h>
#include <sys/slist.h>
#include <sys/util.h>
#include <zephyr/bluetooth/hci.h>
#include <zephyr/sys/byteorder.h>
#include <zephyr/sys/slist.h>
#include <zephyr/sys/util.h>
#include "hal/ecb.h"
#include "hal/ccm.h"

View file

@ -30,7 +30,7 @@ static struct coredump_backend_api
#endif
#if defined(CONFIG_COREDUMP_DEVICE)
#include <drivers/coredump.h>
#include <zephyr/drivers/coredump.h>
#define DT_DRV_COMPAT zephyr_coredump
#endif

View file

@ -5,11 +5,11 @@
*/
#include "spinlock.h"
#include <rtio/rtio_executor_concurrent.h>
#include <rtio/rtio.h>
#include <zephyr/rtio/rtio_executor_concurrent.h>
#include <zephyr/rtio/rtio.h>
#include <zephyr/kernel.h>
#include <logging/log.h>
#include <zephyr/logging/log.h>
LOG_MODULE_REGISTER(rtio_executor_concurrent, CONFIG_RTIO_LOG_LEVEL);
#define CONEX_TASK_COMPLETE BIT(0)

View file

@ -8,10 +8,10 @@
#include <ztest.h>
#include "kconfig.h"
#include <bluetooth/hci.h>
#include <sys/byteorder.h>
#include <sys/slist.h>
#include <sys/util.h>
#include <zephyr/bluetooth/hci.h>
#include <zephyr/sys/byteorder.h>
#include <zephyr/sys/slist.h>
#include <zephyr/sys/util.h>
#include "hal/ccm.h"
#include "util/util.h"

View file

@ -8,10 +8,10 @@
#include <ztest.h>
#include "kconfig.h"
#include <bluetooth/hci.h>
#include <sys/byteorder.h>
#include <sys/slist.h>
#include <sys/util.h>
#include <zephyr/bluetooth/hci.h>
#include <zephyr/sys/byteorder.h>
#include <zephyr/sys/slist.h>
#include <zephyr/sys/util.h>
#include "hal/ccm.h"
#include "util/util.h"

View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr.h>
#include <zephyr/zephyr.h>
#include "hal/ccm.h"
#include "hal/ticker.h"

View file

@ -4,9 +4,9 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr.h>
#include <bluetooth/buf.h>
#include <sys/byteorder.h>
#include <zephyr/zephyr.h>
#include <zephyr/bluetooth/buf.h>
#include <zephyr/sys/byteorder.h>
#include "util/util.h"
#include "util/memq.h"

View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <ztest.h>
#include <drivers/clock_control/clock_control_cavs.h>
#include <zephyr/drivers/clock_control/clock_control_cavs.h>
#include <zephyr/drivers/clock_control.h>
static void check_clocks(struct cavs_clock_info *clocks, uint32_t freq_idx)

View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <drivers/coredump.h>
#include <zephyr/drivers/coredump.h>
#include <ztest.h>
/* Test will verify that these values are present in the core dump */

View file

@ -6,7 +6,7 @@
#include <zephyr/devicetree.h>
#include <zephyr/drivers/syscon.h>
#include <ztest.h>
#include <linker/devicetree_regions.h>
#include <zephyr/linker/devicetree_regions.h>
#define RES_SECT LINKER_DT_NODE_REGION_NAME(DT_NODELABEL(res))

View file

@ -6,8 +6,8 @@
#define DT_DRV_COMPAT test_w1_dummy_slave
#include <device.h>
#include <drivers/w1.h>
#include <zephyr/device.h>
#include <zephyr/drivers/w1.h>
struct w1_dummy_slave_api {
};

View file

@ -5,7 +5,7 @@
*/
#include <ztest.h>
#include <zephyr.h>
#include <zephyr/zephyr.h>
/**
* @brief Test the Z_POW2_CEIL() macro

View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr.h>
#include <zephyr/zephyr.h>
#include <ztest.h>
#include "lwm2m_util.h"

View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr.h>
#include <zephyr/zephyr.h>
#include <ztest.h>
#include "lwm2m_util.h"

View file

@ -7,11 +7,11 @@
#include <tc_util.h>
#include <stdbool.h>
#include <zephyr.h>
#include <zephyr/zephyr.h>
#include <ztest.h>
#include <logging/log_backend.h>
#include <logging/log_ctrl.h>
#include <logging/log.h>
#include <zephyr/logging/log_backend.h>
#include <zephyr/logging/log_ctrl.h>
#include <zephyr/logging/log.h>
#define LOG_MODULE_NAME test
LOG_MODULE_REGISTER(LOG_MODULE_NAME);

View file

@ -5,13 +5,13 @@
*/
#include <ztest.h>
#include <sys/util.h>
#include <zephyr/sys/util.h>
#include <string.h>
#include <ztress.h>
#include <random/rand32.h>
#include <logging/log.h>
#include <logging/log_ctrl.h>
#include <logging/log_backend.h>
#include <zephyr/random/rand32.h>
#include <zephyr/logging/log.h>
#include <zephyr/logging/log_ctrl.h>
#include <zephyr/logging/log_backend.h>
#define MODULE_NAME test

View file

@ -5,7 +5,7 @@
*/
#include <ztest.h>
#include <sys/byteorder.h>
#include <zephyr/sys/byteorder.h>
#include <zcbor_common.h>
#include <zcbor_decode.h>
#include <zcbor_encode.h>