Skip to content

Commit fb60aab

Browse files
gmarullcarlescufi
gmarull
authored and
carlescufi
committed
drivers: migrate includes to <zephyr/...>
In order to bring consistency in-tree, migrate all drivers to the new prefix <zephyr/...>. Note that the conversion has been scripted, refer to #45388 for more details. Signed-off-by: Gerard Marull-Paretas <[email protected]>
1 parent cbd31d7 commit fb60aab

File tree

1,118 files changed

+4772
-4772
lines changed

Some content is hidden

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

1,118 files changed

+4772
-4772
lines changed

‎drivers/adc/adc_ads1x1x.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
*/
77

88
#include <stdbool.h>
9-
#include <device.h>
10-
#include <devicetree.h>
11-
#include <drivers/adc.h>
12-
#include <logging/log.h>
13-
#include <drivers/i2c.h>
14-
#include <zephyr.h>
15-
#include <sys/byteorder.h>
16-
#include <sys/util.h>
9+
#include <zephyr/device.h>
10+
#include <zephyr/devicetree.h>
11+
#include <zephyr/drivers/adc.h>
12+
#include <zephyr/logging/log.h>
13+
#include <zephyr/drivers/i2c.h>
14+
#include <zephyr/zephyr.h>
15+
#include <zephyr/sys/byteorder.h>
16+
#include <zephyr/sys/util.h>
1717

1818
#define ADC_CONTEXT_USES_KERNEL_TIMER
1919
#include "adc_context.h"

‎drivers/adc/adc_cc32xx.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
#include <errno.h>
1010

11-
#include <drivers/adc.h>
12-
#include <device.h>
13-
#include <kernel.h>
14-
#include <init.h>
11+
#include <zephyr/drivers/adc.h>
12+
#include <zephyr/device.h>
13+
#include <zephyr/kernel.h>
14+
#include <zephyr/init.h>
1515
#include <soc.h>
1616

1717
/* Driverlib includes */
@@ -28,7 +28,7 @@
2828
#include "adc_context.h"
2929

3030
#define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
31-
#include <logging/log.h>
31+
#include <zephyr/logging/log.h>
3232
LOG_MODULE_REGISTER(adc_cc32xx);
3333

3434
#define ISR_MASK (ADC_DMA_DONE | ADC_FIFO_OVERFLOW | ADC_FIFO_UNDERFLOW \

‎drivers/adc/adc_common.c

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

7-
#include <drivers/adc.h>
7+
#include <zephyr/drivers/adc.h>
88

99
int adc_gain_invert(enum adc_gain gain,
1010
int32_t *value)

‎drivers/adc/adc_context.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#ifndef ZEPHYR_DRIVERS_ADC_ADC_CONTEXT_H_
99
#define ZEPHYR_DRIVERS_ADC_ADC_CONTEXT_H_
1010

11-
#include <drivers/adc.h>
12-
#include <sys/atomic.h>
11+
#include <zephyr/drivers/adc.h>
12+
#include <zephyr/sys/atomic.h>
1313

1414
#ifdef __cplusplus
1515
extern "C" {

‎drivers/adc/adc_emul.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212

1313
#define DT_DRV_COMPAT zephyr_adc_emul
1414

15-
#include <drivers/adc.h>
16-
#include <drivers/adc/adc_emul.h>
17-
#include <kernel.h>
18-
#include <logging/log.h>
19-
#include <sys/byteorder.h>
20-
#include <sys/util.h>
21-
#include <zephyr.h>
15+
#include <zephyr/drivers/adc.h>
16+
#include <zephyr/drivers/adc/adc_emul.h>
17+
#include <zephyr/kernel.h>
18+
#include <zephyr/logging/log.h>
19+
#include <zephyr/sys/byteorder.h>
20+
#include <zephyr/sys/util.h>
21+
#include <zephyr/zephyr.h>
2222

2323
LOG_MODULE_REGISTER(adc_emul, CONFIG_ADC_LOG_LEVEL);
2424

‎drivers/adc/adc_handlers.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
#include <drivers/adc.h>
8-
#include <syscall_handler.h>
9-
#include <kernel.h>
7+
#include <zephyr/drivers/adc.h>
8+
#include <zephyr/syscall_handler.h>
9+
#include <zephyr/kernel.h>
1010

1111
static inline int z_vrfy_adc_channel_setup(const struct device *dev,
1212
const struct adc_channel_cfg *user_channel_cfg)

‎drivers/adc/adc_ite_it8xxx2.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
#define DT_DRV_COMPAT ite_it8xxx2_adc
88

99
#define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
10-
#include <logging/log.h>
10+
#include <zephyr/logging/log.h>
1111
LOG_MODULE_REGISTER(adc_ite_it8xxx2);
1212

13-
#include <drivers/adc.h>
14-
#include <drivers/pinctrl.h>
13+
#include <zephyr/drivers/adc.h>
14+
#include <zephyr/drivers/pinctrl.h>
1515
#include <soc.h>
1616
#include <soc_dt.h>
1717
#include <errno.h>

‎drivers/adc/adc_lmp90xxx.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
* @brief ADC driver for the LMP90xxx AFE.
1010
*/
1111

12-
#include <drivers/adc.h>
13-
#include <drivers/adc/lmp90xxx.h>
14-
#include <drivers/gpio.h>
15-
#include <drivers/spi.h>
16-
#include <kernel.h>
17-
#include <sys/byteorder.h>
18-
#include <sys/crc.h>
19-
#include <zephyr.h>
12+
#include <zephyr/drivers/adc.h>
13+
#include <zephyr/drivers/adc/lmp90xxx.h>
14+
#include <zephyr/drivers/gpio.h>
15+
#include <zephyr/drivers/spi.h>
16+
#include <zephyr/kernel.h>
17+
#include <zephyr/sys/byteorder.h>
18+
#include <zephyr/sys/crc.h>
19+
#include <zephyr/zephyr.h>
2020

2121
#define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
22-
#include <logging/log.h>
22+
#include <zephyr/logging/log.h>
2323
LOG_MODULE_REGISTER(adc_lmp90xxx);
2424

2525
#define ADC_CONTEXT_USES_KERNEL_TIMER

‎drivers/adc/adc_mchp_xec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
#define DT_DRV_COMPAT microchip_xec_adc
88

99
#define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
10-
#include <logging/log.h>
10+
#include <zephyr/logging/log.h>
1111
LOG_MODULE_REGISTER(adc_mchp_xec);
1212

13-
#include <drivers/adc.h>
13+
#include <zephyr/drivers/adc.h>
1414
#include <soc.h>
1515
#include <errno.h>
1616

‎drivers/adc/adc_mchp_xec_v2.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
#define DT_DRV_COMPAT microchip_xec_adc_v2
88

99
#define LOG_LEVEL CONFIG_ADC_LOG_LEVEL
10-
#include <logging/log.h>
10+
#include <zephyr/logging/log.h>
1111
LOG_MODULE_REGISTER(adc_mchp_xec);
1212

13-
#include <drivers/adc.h>
14-
#include <drivers/interrupt_controller/intc_mchp_xec_ecia.h>
15-
#include <drivers/pinctrl.h>
13+
#include <zephyr/drivers/adc.h>
14+
#include <zephyr/drivers/interrupt_controller/intc_mchp_xec_ecia.h>
15+
#include <zephyr/drivers/pinctrl.h>
1616
#include <soc.h>
1717
#include <errno.h>
1818

0 commit comments

Comments
 (0)