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 <gerard.marull@nordicsemi.no>
This commit is contained in:
parent
cbd31d720b
commit
fb60aab245
1118 changed files with 4745 additions and 4745 deletions
|
@ -4,10 +4,10 @@
|
|||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <drivers/can.h>
|
||||
#include <kernel.h>
|
||||
#include <sys/util.h>
|
||||
#include <logging/log.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
#include <zephyr/kernel.h>
|
||||
#include <zephyr/sys/util.h>
|
||||
#include <zephyr/logging/log.h>
|
||||
|
||||
LOG_MODULE_REGISTER(can_common, CONFIG_CAN_LOG_LEVEL);
|
||||
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <syscall_handler.h>
|
||||
#include <drivers/can.h>
|
||||
#include <zephyr/syscall_handler.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
|
||||
static int z_vrfy_can_calc_timing(const struct device *dev, struct can_timing *res,
|
||||
uint32_t bitrate, uint16_t sample_pnt)
|
||||
|
|
|
@ -10,9 +10,9 @@
|
|||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <drivers/can.h>
|
||||
#include <kernel.h>
|
||||
#include <logging/log.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
#include <zephyr/kernel.h>
|
||||
#include <zephyr/logging/log.h>
|
||||
|
||||
LOG_MODULE_REGISTER(can_loopback, CONFIG_CAN_LOG_LEVEL);
|
||||
|
||||
|
|
|
@ -5,12 +5,12 @@
|
|||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <sys/util.h>
|
||||
#include <zephyr/sys/util.h>
|
||||
#include <string.h>
|
||||
#include <kernel.h>
|
||||
#include <drivers/can.h>
|
||||
#include <drivers/can/transceiver.h>
|
||||
#include <logging/log.h>
|
||||
#include <zephyr/kernel.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
#include <zephyr/drivers/can/transceiver.h>
|
||||
#include <zephyr/logging/log.h>
|
||||
|
||||
#include "can_mcan.h"
|
||||
#include "can_mcan_priv.h"
|
||||
|
@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(can_mcan, CONFIG_CAN_LOG_LEVEL);
|
|||
#endif
|
||||
|
||||
#if CONFIG_HAS_CMSIS_CORE_M
|
||||
#include <arch/arm/aarch32/cortex_m/cmsis.h>
|
||||
#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
|
||||
|
||||
#if __DCACHE_PRESENT == 1
|
||||
#define CACHE_INVALIDATE(addr, size) SCB_InvalidateDCache_by_Addr((addr), (size))
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
#ifndef ZEPHYR_DRIVERS_CAN_MCAN_H_
|
||||
#define ZEPHYR_DRIVERS_CAN_MCAN_H_
|
||||
|
||||
#include <kernel.h>
|
||||
#include <devicetree.h>
|
||||
#include <drivers/can.h>
|
||||
#include <zephyr/kernel.h>
|
||||
#include <zephyr/devicetree.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
|
||||
#include <toolchain.h>
|
||||
#include <zephyr/toolchain.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#ifdef CONFIG_CAN_MCUX_MCAN
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#ifndef ZEPHYR_DRIVERS_CAN_CAN_MCAN_PRIV_H_
|
||||
#define ZEPHYR_DRIVERS_CAN_CAN_MCAN_PRIV_H_
|
||||
|
||||
#include <drivers/can.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
|
||||
/*
|
||||
* Register Masks are taken from the stm32cube library and extended for
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
#define DT_DRV_COMPAT microchip_mcp2515
|
||||
|
||||
#include <kernel.h>
|
||||
#include <device.h>
|
||||
#include <drivers/can/transceiver.h>
|
||||
#include <drivers/spi.h>
|
||||
#include <drivers/gpio.h>
|
||||
#include <logging/log.h>
|
||||
#include <zephyr/kernel.h>
|
||||
#include <zephyr/device.h>
|
||||
#include <zephyr/drivers/can/transceiver.h>
|
||||
#include <zephyr/drivers/spi.h>
|
||||
#include <zephyr/drivers/gpio.h>
|
||||
#include <zephyr/logging/log.h>
|
||||
|
||||
LOG_MODULE_REGISTER(can_mcp2515, CONFIG_CAN_LOG_LEVEL);
|
||||
|
||||
|
|
|
@ -8,8 +8,8 @@
|
|||
#ifndef _MCP2515_H_
|
||||
#define _MCP2515_H_
|
||||
|
||||
#include <drivers/gpio.h>
|
||||
#include <drivers/can.h>
|
||||
#include <zephyr/drivers/gpio.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
|
||||
#define MCP2515_RX_CNT 2
|
||||
/* Reduce the number of Tx buffers to 1 in order to avoid priority inversion. */
|
||||
|
|
|
@ -6,18 +6,18 @@
|
|||
|
||||
#define DT_DRV_COMPAT nxp_kinetis_flexcan
|
||||
|
||||
#include <zephyr.h>
|
||||
#include <sys/atomic.h>
|
||||
#include <drivers/can.h>
|
||||
#include <drivers/can/transceiver.h>
|
||||
#include <drivers/clock_control.h>
|
||||
#include <device.h>
|
||||
#include <sys/byteorder.h>
|
||||
#include <zephyr/zephyr.h>
|
||||
#include <zephyr/sys/atomic.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
#include <zephyr/drivers/can/transceiver.h>
|
||||
#include <zephyr/drivers/clock_control.h>
|
||||
#include <zephyr/device.h>
|
||||
#include <zephyr/sys/byteorder.h>
|
||||
#include <fsl_flexcan.h>
|
||||
#include <logging/log.h>
|
||||
#include <zephyr/logging/log.h>
|
||||
|
||||
#ifdef CONFIG_PINCTRL
|
||||
#include <drivers/pinctrl.h>
|
||||
#include <zephyr/drivers/pinctrl.h>
|
||||
#endif
|
||||
|
||||
LOG_MODULE_REGISTER(can_mcux_flexcan, CONFIG_CAN_LOG_LEVEL);
|
||||
|
|
|
@ -4,10 +4,10 @@
|
|||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <device.h>
|
||||
#include <drivers/can.h>
|
||||
#include <drivers/clock_control.h>
|
||||
#include <logging/log.h>
|
||||
#include <zephyr/device.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
#include <zephyr/drivers/clock_control.h>
|
||||
#include <zephyr/logging/log.h>
|
||||
|
||||
#include "can_mcan.h"
|
||||
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
#define DT_DRV_COMPAT renesas_rcar_can
|
||||
|
||||
#include <kernel.h>
|
||||
#include <zephyr/kernel.h>
|
||||
#include <errno.h>
|
||||
#include <drivers/can.h>
|
||||
#include <drivers/can/transceiver.h>
|
||||
#include <drivers/clock_control.h>
|
||||
#include <drivers/clock_control/rcar_clock_control.h>
|
||||
#include <drivers/pinctrl.h>
|
||||
#include <logging/log.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
#include <zephyr/drivers/can/transceiver.h>
|
||||
#include <zephyr/drivers/clock_control.h>
|
||||
#include <zephyr/drivers/clock_control/rcar_clock_control.h>
|
||||
#include <zephyr/drivers/pinctrl.h>
|
||||
#include <zephyr/logging/log.h>
|
||||
|
||||
LOG_MODULE_REGISTER(can_rcar, CONFIG_CAN_LOG_LEVEL);
|
||||
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <drivers/can.h>
|
||||
#include <drivers/pinctrl.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
#include <zephyr/drivers/pinctrl.h>
|
||||
#include <soc.h>
|
||||
#include <kernel.h>
|
||||
#include <logging/log.h>
|
||||
#include <zephyr/kernel.h>
|
||||
#include <zephyr/logging/log.h>
|
||||
|
||||
#include "can_mcan.h"
|
||||
|
||||
|
|
|
@ -4,9 +4,9 @@
|
|||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <sys/printk.h>
|
||||
#include <shell/shell.h>
|
||||
#include <drivers/can.h>
|
||||
#include <zephyr/sys/printk.h>
|
||||
#include <zephyr/shell/shell.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
#include <zephyr/types.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <net/net_pkt.h>
|
||||
#include <net/socket_can.h>
|
||||
#include <drivers/can.h>
|
||||
#include <devicetree.h>
|
||||
#include <device.h>
|
||||
#include <zephyr/net/net_pkt.h>
|
||||
#include <zephyr/net/socket_can.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
#include <zephyr/devicetree.h>
|
||||
#include <zephyr/device.h>
|
||||
|
||||
#include <logging/log.h>
|
||||
#include <zephyr/logging/log.h>
|
||||
LOG_MODULE_REGISTER(can_socketcan, CONFIG_CAN_LOG_LEVEL);
|
||||
|
||||
#define SEND_TIMEOUT K_MSEC(100)
|
||||
|
|
|
@ -4,18 +4,18 @@
|
|||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <drivers/can/transceiver.h>
|
||||
#include <drivers/clock_control/stm32_clock_control.h>
|
||||
#include <drivers/clock_control.h>
|
||||
#include <drivers/pinctrl.h>
|
||||
#include <sys/util.h>
|
||||
#include <zephyr/drivers/can/transceiver.h>
|
||||
#include <zephyr/drivers/clock_control/stm32_clock_control.h>
|
||||
#include <zephyr/drivers/clock_control.h>
|
||||
#include <zephyr/drivers/pinctrl.h>
|
||||
#include <zephyr/sys/util.h>
|
||||
#include <string.h>
|
||||
#include <kernel.h>
|
||||
#include <zephyr/kernel.h>
|
||||
#include <soc.h>
|
||||
#include <errno.h>
|
||||
#include <stdbool.h>
|
||||
#include <drivers/can.h>
|
||||
#include <logging/log.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
#include <zephyr/logging/log.h>
|
||||
|
||||
#include "can_stm32.h"
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#ifndef ZEPHYR_DRIVERS_CAN_STM32_CAN_H_
|
||||
#define ZEPHYR_DRIVERS_CAN_STM32_CAN_H_
|
||||
|
||||
#include <drivers/can.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
|
||||
#define BIT_SEG_LENGTH(cfg) ((cfg)->prop_ts1 + (cfg)->ts2 + 1)
|
||||
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <drivers/can.h>
|
||||
#include <drivers/pinctrl.h>
|
||||
#include <kernel.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
#include <zephyr/drivers/pinctrl.h>
|
||||
#include <zephyr/kernel.h>
|
||||
#include <soc.h>
|
||||
#include <stm32_ll_rcc.h>
|
||||
#include <stm32_ll_bus.h>
|
||||
#include <logging/log.h>
|
||||
#include <zephyr/logging/log.h>
|
||||
|
||||
#include "can_mcan.h"
|
||||
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <drivers/can.h>
|
||||
#include <drivers/clock_control/stm32_clock_control.h>
|
||||
#include <drivers/clock_control.h>
|
||||
#include <drivers/pinctrl.h>
|
||||
#include <kernel.h>
|
||||
#include <zephyr/drivers/can.h>
|
||||
#include <zephyr/drivers/clock_control/stm32_clock_control.h>
|
||||
#include <zephyr/drivers/clock_control.h>
|
||||
#include <zephyr/drivers/pinctrl.h>
|
||||
#include <zephyr/kernel.h>
|
||||
#include <stm32_ll_rcc.h>
|
||||
#include <logging/log.h>
|
||||
#include <zephyr/logging/log.h>
|
||||
|
||||
#include "can_mcan.h"
|
||||
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
|
||||
#define DT_DRV_COMPAT can_transceiver_gpio
|
||||
|
||||
#include <device.h>
|
||||
#include <drivers/can/transceiver.h>
|
||||
#include <drivers/gpio.h>
|
||||
#include <logging/log.h>
|
||||
#include <zephyr/device.h>
|
||||
#include <zephyr/drivers/can/transceiver.h>
|
||||
#include <zephyr/drivers/gpio.h>
|
||||
#include <zephyr/logging/log.h>
|
||||
|
||||
LOG_MODULE_REGISTER(can_transceiver_gpio, CONFIG_CAN_LOG_LEVEL);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue