Skip to content

Commit 0fe2c1f

Browse files
tmilkovic51fabiobaltieri
tmilkovic51
authored and
fabiobaltieri
committed
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 <[email protected]>
1 parent 5658e9e commit 0fe2c1f

File tree

52 files changed

+125
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+125
-125
lines changed

‎arch/xtensa/core/timing.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Copyright (c) 2022 Intel Corporation
22
* SPDX-License-Identifier: Apache-2.0
33
*/
4-
#include <zephyr.h>
4+
#include <zephyr/zephyr.h>
55

66
void arch_timing_init(void)
77
{

‎boards/arm/rpi_pico/rpi_pico.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <rpi_pico/rp2040.dtsi>
1010
#include "rpi_pico-pinctrl.dtsi"
11-
#include <dt-bindings/pwm/pwm.h>
11+
#include <zephyr/dt-bindings/pwm/pwm.h>
1212

1313
#include <zephyr/dt-bindings/i2c/i2c.h>
1414

‎boards/arm/swan_r5/board.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <drivers/gpio.h>
8-
#include <init.h>
7+
#include <zephyr/drivers/gpio.h>
8+
#include <zephyr/init.h>
99

1010
static int board_swan_init(const struct device *dev)
1111
{

‎drivers/adc/adc_ads1119.c

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
*
55
* SPDX-License-Identifier: Apache-2.0
66
*/
7-
#include <device.h>
8-
#include <devicetree.h>
9-
#include <drivers/adc.h>
10-
#include <logging/log.h>
11-
#include <drivers/i2c.h>
12-
#include <zephyr.h>
13-
#include <sys/byteorder.h>
14-
#include <sys/util.h>
7+
#include <zephyr/device.h>
8+
#include <zephyr/devicetree.h>
9+
#include <zephyr/drivers/adc.h>
10+
#include <zephyr/logging/log.h>
11+
#include <zephyr/drivers/i2c.h>
12+
#include <zephyr/zephyr.h>
13+
#include <zephyr/sys/byteorder.h>
14+
#include <zephyr/sys/util.h>
1515

1616
#define ADC_CONTEXT_USES_KERNEL_TIMER 1
1717
#include "adc_context.h"

‎drivers/adc/adc_gd32.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#define ADC_CONTEXT_USES_KERNEL_TIMER
1818
#include "adc_context.h"
1919

20-
#include <logging/log.h>
20+
#include <zephyr/logging/log.h>
2121
LOG_MODULE_REGISTER(adc_gd32, CONFIG_ADC_LOG_LEVEL);
2222

2323
/**

‎drivers/bluetooth/hci/hci_b91.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#define LOG_MODULE_NAME bt_hci_driver_b91
99
#include "common/log.h"
1010

11-
#include <sys/byteorder.h>
12-
#include <drivers/bluetooth/hci_driver.h>
11+
#include <zephyr/sys/byteorder.h>
12+
#include <zephyr/drivers/bluetooth/hci_driver.h>
1313

1414
#include <b91_bt.h>
1515

‎drivers/cache/cache_aspeed.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
#include <zephyr/kernel.h>
8-
#include <arch/arm/aarch32/cortex_m/cmsis.h>
8+
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
99
#include <zephyr/drivers/syscon.h>
1010

1111
/*

‎drivers/clock_control/clock_control_cavs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66
#include <zephyr/device.h>
7-
#include <drivers/clock_control/clock_control_cavs.h>
7+
#include <zephyr/drivers/clock_control/clock_control_cavs.h>
88
#include <zephyr/drivers/clock_control.h>
99

1010
static int cavs_clock_ctrl_set_rate(const struct device *clk,

‎drivers/coredump/coredump_impl.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <debug/coredump.h>
8-
#include <drivers/coredump.h>
7+
#include <zephyr/debug/coredump.h>
8+
#include <zephyr/drivers/coredump.h>
99

1010
#define DT_DRV_COMPAT zephyr_coredump
1111

‎drivers/entropy/entropy_gecko_se.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#define DT_DRV_COMPAT silabs_gecko_semailbox
88

9-
#include <drivers/entropy.h>
9+
#include <zephyr/drivers/entropy.h>
1010
#include <soc.h>
1111
#include "em_cmu.h"
1212
#include "sl_se_manager.h"

‎drivers/sensor/stm32_vbat/stm32_vbat.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <device.h>
8-
#include <devicetree.h>
9-
#include <drivers/sensor.h>
10-
#include <drivers/adc.h>
11-
#include <logging/log.h>
7+
#include <zephyr/device.h>
8+
#include <zephyr/devicetree.h>
9+
#include <zephyr/drivers/sensor.h>
10+
#include <zephyr/drivers/adc.h>
11+
#include <zephyr/logging/log.h>
1212

1313
LOG_MODULE_REGISTER(stm32_vbat, CONFIG_SENSOR_LOG_LEVEL);
1414

‎drivers/serial/serial_esp32_usb.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <hal/usb_serial_jtag_ll.h>
1010

11-
#include <device.h>
11+
#include <zephyr/device.h>
1212
#include <errno.h>
1313
#include <soc.h>
1414
#include <zephyr/drivers/uart.h>

‎drivers/spi/spi_mchp_mss_qspi.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66

77
#define DT_DRV_COMPAT microchip_mpfs_qspi
88

9-
#include <device.h>
10-
#include <drivers/spi.h>
11-
#include <sys/sys_io.h>
12-
#include <sys/util.h>
13-
#include <logging/log.h>
9+
#include <zephyr/device.h>
10+
#include <zephyr/drivers/spi.h>
11+
#include <zephyr/sys/sys_io.h>
12+
#include <zephyr/sys/util.h>
13+
#include <zephyr/logging/log.h>
1414

1515
LOG_MODULE_REGISTER(mss_qspi, CONFIG_SPI_LOG_LEVEL);
1616
#include "spi_context.h"

‎drivers/w1/w1_common.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <device.h>
8-
#include <sys/crc.h>
7+
#include <zephyr/device.h>
8+
#include <zephyr/sys/crc.h>
99
#include <zephyr/types.h>
10-
#include <drivers/w1.h>
10+
#include <zephyr/drivers/w1.h>
1111

1212

1313
int z_impl_w1_read_block(const struct device *dev, uint8_t *buffer, size_t len)

‎drivers/w1/w1_net.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* the arch_is_user_context() check.
1414
*/
1515

16-
#include <logging/log.h>
17-
#include <drivers/w1.h>
16+
#include <zephyr/logging/log.h>
17+
#include <zephyr/drivers/w1.h>
1818

1919
LOG_MODULE_REGISTER(w1, CONFIG_W1_LOG_LEVEL);
2020

‎drivers/xen/gnttab.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
*
1818
****************************************************************************
1919
*/
20-
#include <arch/arm64/hypercall.h>
21-
#include <xen/generic.h>
22-
#include <xen/gnttab.h>
23-
#include <xen/public/grant_table.h>
24-
#include <xen/public/memory.h>
25-
#include <xen/public/xen.h>
26-
27-
#include <init.h>
28-
#include <kernel.h>
29-
#include <logging/log.h>
20+
#include <zephyr/arch/arm64/hypercall.h>
21+
#include <zephyr/xen/generic.h>
22+
#include <zephyr/xen/gnttab.h>
23+
#include <zephyr/xen/public/grant_table.h>
24+
#include <zephyr/xen/public/memory.h>
25+
#include <zephyr/xen/public/xen.h>
26+
27+
#include <zephyr/init.h>
28+
#include <zephyr/kernel.h>
29+
#include <zephyr/logging/log.h>
3030

3131
LOG_MODULE_REGISTER(xen_gnttab);
3232

‎dts/arm/atmel/saml2x.dtsi

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
#include <mem.h>
88
#include <arm/armv6-m.dtsi>
9-
#include <dt-bindings/gpio/gpio.h>
10-
#include <dt-bindings/i2c/i2c.h>
11-
#include <dt-bindings/pwm/pwm.h>
9+
#include <zephyr/dt-bindings/gpio/gpio.h>
10+
#include <zephyr/dt-bindings/i2c/i2c.h>
11+
#include <zephyr/dt-bindings/pwm/pwm.h>
1212

1313
/ {
1414
aliases {

‎dts/arm/atmel/samr34.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include <freq.h>
88
#include <atmel/saml21.dtsi>
9-
#include <dt-bindings/lora/sx126x.h>
9+
#include <zephyr/dt-bindings/lora/sx126x.h>
1010

1111
#include "saml21.dtsi"
1212

‎dts/arm/microchip/mec1727nsz.dtsi

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
#include <arm/armv7-m.dtsi>
88

9-
#include <dt-bindings/i2c/i2c.h>
10-
#include <dt-bindings/gpio/gpio.h>
11-
#include <dt-bindings/clock/mchp_xec_pcr.h>
12-
#include <dt-bindings/interrupt-controller/mchp-xec-ecia.h>
9+
#include <zephyr/dt-bindings/i2c/i2c.h>
10+
#include <zephyr/dt-bindings/gpio/gpio.h>
11+
#include <zephyr/dt-bindings/clock/mchp_xec_pcr.h>
12+
#include <zephyr/dt-bindings/interrupt-controller/mchp-xec-ecia.h>
1313

1414
#include "mec172xnsz.dtsi"
1515
#include "mec172x/mec172x-vw-routing.dtsi"

‎include/zephyr/bluetooth/audio/cap.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
*/
2121

2222
#include <zephyr/types.h>
23-
#include <bluetooth/audio/csis.h>
23+
#include <zephyr/bluetooth/audio/csis.h>
2424

2525
#ifdef __cplusplus
2626
extern "C" {

‎include/zephyr/kernel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <stdbool.h>
2121
#include <zephyr/toolchain.h>
2222
#include <zephyr/tracing/tracing_macros.h>
23-
#include <sys/mem_stats.h>
23+
#include <zephyr/sys/mem_stats.h>
2424

2525
#ifdef __cplusplus
2626
extern "C" {

‎include/zephyr/sys/sys_heap.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <stddef.h>
1010
#include <stdbool.h>
1111
#include <zephyr/types.h>
12-
#include <sys/mem_stats.h>
12+
#include <zephyr/sys/mem_stats.h>
1313

1414
#ifdef __cplusplus
1515
extern "C" {

‎include/zephyr/xen/gnttab.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef __XEN_GNTTAB_H__
77
#define __XEN_GNTTAB_H__
88

9-
#include <xen/public/grant_table.h>
9+
#include <zephyr/xen/public/grant_table.h>
1010

1111
/*
1212
* Assigns gref and permits access to 4K page for specific domain.

‎lib/libc/picolibc/libc-hooks.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ int z_impl_zephyr_write_stdout(const void *buffer, int nbytes)
256256
return nbytes;
257257
}
258258

259-
#include <sys/cbprintf.h>
259+
#include <zephyr/sys/cbprintf.h>
260260

261261
struct cb_bits {
262262
FILE f;
@@ -528,7 +528,7 @@ int _gettimeofday(struct timeval *__tp, void *__tzp)
528528
}
529529

530530
#include <stdlib.h>
531-
#include <zephyr.h>
531+
#include <zephyr/zephyr.h>
532532

533533
/* Replace picolibc abort with native Zephyr one */
534534
void abort(void)

‎samples/boards/mimxrt1060_evk/system_off/src/main.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
*/
66

77
#include <stdio.h>
8-
#include <zephyr.h>
9-
#include <device.h>
10-
#include <drivers/gpio.h>
11-
#include <drivers/counter.h>
12-
#include <pm/pm.h>
13-
#include <pm/policy.h>
8+
#include <zephyr/zephyr.h>
9+
#include <zephyr/device.h>
10+
#include <zephyr/drivers/gpio.h>
11+
#include <zephyr/drivers/counter.h>
12+
#include <zephyr/pm/pm.h>
13+
#include <zephyr/pm/policy.h>
1414

1515
#define BUSY_WAIT_S 2U
1616
#define SLEEP_S 2U

‎samples/drivers/led_ws2812/boards/mimxrt1050_evk.overlay

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <dt-bindings/led/led.h>
7+
#include <zephyr/dt-bindings/led/led.h>
88

99
&lpspi3 {
1010
led_strip: ws2812@0 {

‎samples/drivers/led_ws2812/boards/mimxrt1050_evk_qspi.overlay

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <dt-bindings/led/led.h>
7+
#include <zephyr/dt-bindings/led/led.h>
88

99
&lpspi3 {
1010
led_strip: ws2812@0 {

‎samples/subsys/rtio/sensor_batch_processing/src/main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <zephyr.h>
7+
#include <zephyr/zephyr.h>
88
#include <zephyr/rtio/rtio.h>
99
#include <zephyr/rtio/rtio_executor_simple.h>
1010
#include <zephyr/logging/log.h>

‎soc/arm/microchip_mec/mec172x/device_power.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
* SPDX-License-Identifier: Apache-2.0
66
*/
77

8-
#include <zephyr.h>
9-
#include <sys/sys_io.h>
10-
#include <sys/__assert.h>
11-
#include <pm/pm.h>
8+
#include <zephyr/zephyr.h>
9+
#include <zephyr/sys/sys_io.h>
10+
#include <zephyr/sys/__assert.h>
11+
#include <zephyr/pm/pm.h>
1212
#include <soc.h>
1313
#include "device_power.h"
1414

‎soc/arm/microchip_mec/mec172x/power.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
* SPDX-License-Identifier: Apache-2.0
66
*/
77

8-
#include <zephyr.h>
9-
#include <sys/sys_io.h>
10-
#include <sys/__assert.h>
11-
#include <pm/pm.h>
8+
#include <zephyr/zephyr.h>
9+
#include <zephyr/sys/sys_io.h>
10+
#include <zephyr/sys/__assert.h>
11+
#include <zephyr/pm/pm.h>
1212
#include <soc.h>
13-
#include <arch/cpu.h>
14-
#include <arch/arm/aarch32/cortex_m/cmsis.h>
13+
#include <zephyr/arch/cpu.h>
14+
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
1515
#ifndef CONFIG_PM_DEVICE
1616
#include "device_power.h"
1717
#endif

‎soc/xtensa/intel_adsp/ace_v1x/_soc_inthandlers.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
*/
1515

1616
#include <xtensa/config/core-isa.h>
17-
#include <sys/util.h>
18-
#include <sw_isr_table.h>
17+
#include <zephyr/sys/util.h>
18+
#include <zephyr/sw_isr_table.h>
1919

2020
#if !defined(XCHAL_INT0_LEVEL) || XCHAL_INT0_LEVEL != 1
2121
#error core-isa.h interrupt level does not match dispatcher!

‎soc/xtensa/intel_adsp/common/clk.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
6-
#include <device.h>
6+
#include <zephyr/device.h>
77

88
#include <cavs-clk.h>
99
#include <cavs-shim.h>

0 commit comments

Comments
 (0)