Skip to content
Permalink
Browse files

cleanup: include/: move uart.h to drivers/uart.h

move uart.h to drivers/uart.h and
create a shim for backward-compatibility.

No functional changes to the headers.
A warning in the shim can be controlled with CONFIG_COMPAT_INCLUDES.

Related to #16539

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
  • Loading branch information...
nashif committed Jun 25, 2019
1 parent bd70f6f commit d1b27186875f38a1bba225833795c6135eff1158
Showing with 1,234 additions and 1,219 deletions.
  1. +1 −1 boards/arm/nrf9160_pca10090/nrf52840_reset.c
  2. +1 −1 boards/x86/arduino_101/nrf51_pm.c
  3. +1 −1 boards/x86/quark_se_c1000_devboard/board.c
  4. +1 −1 drivers/bluetooth/hci/h4.c
  5. +1 −1 drivers/bluetooth/hci/h5.c
  6. +1 −1 drivers/console/uart_console.c
  7. +1 −1 drivers/console/uart_mcumgr.c
  8. +1 −1 drivers/console/uart_pipe.c
  9. +1 −1 drivers/modem/modem_receiver.c
  10. +1 −1 drivers/sensor/pms7003/pms7003.c
  11. +1 −1 drivers/serial/leuart_gecko.c
  12. +1 −1 drivers/serial/uart_altera_jtag_hal.c
  13. +1 −1 drivers/serial/uart_cc13xx_cc26xx.c
  14. +1 −1 drivers/serial/uart_cc32xx.c
  15. +1 −1 drivers/serial/uart_cmsdk_apb.c
  16. +1 −1 drivers/serial/uart_esp32.c
  17. +1 −1 drivers/serial/uart_gecko.c
  18. +1 −1 drivers/serial/uart_handlers.c
  19. +1 −1 drivers/serial/uart_imx.c
  20. +1 −1 drivers/serial/uart_liteuart.c
  21. +1 −1 drivers/serial/uart_mcux.c
  22. +1 −1 drivers/serial/uart_mcux_lpsci.c
  23. +1 −1 drivers/serial/uart_mcux_lpuart.c
  24. +1 −1 drivers/serial/uart_miv.c
  25. +1 −1 drivers/serial/uart_msp432p4xx.c
  26. +1 −1 drivers/serial/uart_native_posix.c
  27. +1 −1 drivers/serial/uart_nrfx_uart.c
  28. +1 −1 drivers/serial/uart_nrfx_uarte.c
  29. +1 −1 drivers/serial/uart_ns16550.c
  30. +1 −1 drivers/serial/uart_nsim.c
  31. +1 −1 drivers/serial/uart_pl011.c
  32. +1 −1 drivers/serial/uart_psoc6.c
  33. +1 −1 drivers/serial/uart_qmsi.c
  34. +1 −1 drivers/serial/uart_rv32m1_lpuart.c
  35. +1 −1 drivers/serial/uart_sam.c
  36. +1 −1 drivers/serial/uart_sam0.c
  37. +1 −1 drivers/serial/uart_sifive.c
  38. +1 −1 drivers/serial/uart_stellaris.c
  39. +1 −1 drivers/serial/uart_stm32.c
  40. +1 −1 drivers/serial/usart_mcux_lpc.c
  41. +1 −1 drivers/serial/usart_sam.c
  42. +1,162 −0 include/drivers/uart.h
  43. +4 −1,151 include/uart.h
  44. +1 −1 samples/bluetooth/hci_uart/src/main.c
  45. +1 −1 samples/net/wpan_serial/src/main.c
  46. +1 −1 samples/nfc/nfc_hello/src/main.c
  47. +1 −1 samples/subsys/usb/cdc_acm/src/main.c
  48. +1 −1 samples/subsys/usb/cdc_acm_composite/src/main.c
  49. +1 −1 samples/subsys/usb/hid-cdc/src/main.c
  50. +1 −1 soc/arm/nxp_kinetis/k6x/soc.c
  51. +1 −1 soc/arm/nxp_kinetis/kwx/soc_kw2xd.c
  52. +1 −1 soc/arm/nxp_kinetis/kwx/soc_kw4xz.c
  53. +1 −1 soc/arm/nxp_lpc/lpc54xxx/soc.c
  54. +1 −1 soc/arm/nxp_lpc/lpc55xxx/soc.c
  55. +1 −1 soc/arm/ti_lm3s6965/soc_config.c
  56. +1 −1 soc/x86/apollo_lake/soc.c
  57. +1 −1 soc/x86/atom/soc.c
  58. +1 −1 soc/x86/ia32/soc.c
  59. +1 −1 soc/x86/intel_quark/quark_se/soc.c
  60. +1 −1 soc/x86/intel_quark/quark_se/soc.h
  61. +1 −1 soc/x86/intel_quark/quark_x1000/soc.c
  62. +1 −1 subsys/bluetooth/host/monitor.c
  63. +1 −1 subsys/console/getline.c
  64. +1 −1 subsys/console/tty.c
  65. +1 −1 subsys/logging/log_backend_uart.c
  66. +1 −1 subsys/shell/shell_uart.c
  67. +1 −1 subsys/usb/class/cdc_acm.c
  68. +1 −1 tests/application_development/cpp/src/main.cpp
  69. +1 −1 tests/drivers/uart/uart_async_api/src/test_uart.h
  70. +1 −1 tests/drivers/uart/uart_basic_api/src/test_uart.h
@@ -5,7 +5,7 @@
*/

#include <drivers/gpio.h>
#include <uart.h>
#include <drivers/uart.h>
#include <device.h>

#define RESET_PIN CONFIG_BOARD_NRF52840_GPIO_RESET_PIN
@@ -8,7 +8,7 @@

#include <zephyr.h>
#include <drivers/gpio.h>
#include <uart.h>
#include <drivers/uart.h>

#include <errno.h>

@@ -5,7 +5,7 @@
*/

#include <kernel.h>
#include <uart.h>
#include <drivers/uart.h>
#include <device.h>
#include <init.h>

@@ -13,7 +13,7 @@
#include <arch/cpu.h>

#include <init.h>
#include <uart.h>
#include <drivers/uart.h>
#include <misc/util.h>
#include <misc/byteorder.h>
#include <string.h>
@@ -12,7 +12,7 @@
#include <zephyr.h>

#include <init.h>
#include <uart.h>
#include <drivers/uart.h>
#include <misc/util.h>
#include <misc/byteorder.h>
#include <misc/stack.h>
@@ -23,7 +23,7 @@
#include <device.h>
#include <init.h>

#include <uart.h>
#include <drivers/uart.h>
#include <drivers/console/console.h>
#include <drivers/console/uart_console.h>
#include <toolchain.h>
@@ -12,7 +12,7 @@
#include <assert.h>
#include <string.h>
#include <kernel.h>
#include <uart.h>
#include <drivers/uart.h>
#include <mgmt/serial.h>
#include <console/uart_mcumgr.h>

@@ -16,7 +16,7 @@ LOG_MODULE_REGISTER(uart_pipe, CONFIG_UART_CONSOLE_LOG_LEVEL);

#include <kernel.h>

#include <uart.h>
#include <drivers/uart.h>

#include <console/uart_pipe.h>
#include <misc/printk.h>
@@ -13,7 +13,7 @@

#include <kernel.h>
#include <init.h>
#include <uart.h>
#include <drivers/uart.h>

#include <logging/log.h>

@@ -17,7 +17,7 @@
#include <drivers/sensor.h>
#include <stdlib.h>
#include <string.h>
#include <uart.h>
#include <drivers/uart.h>
#include <logging/log.h>

#define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL
@@ -5,7 +5,7 @@
*/

#include <errno.h>
#include <uart.h>
#include <drivers/uart.h>
#include <em_leuart.h>
#include <em_gpio.h>
#include <em_cmu.h>
@@ -7,7 +7,7 @@

#include <kernel.h>
#include <arch/cpu.h>
#include <uart.h>
#include <drivers/uart.h>
#include <sys/sys_io.h>

#include "altera_avalon_jtag_uart.h"
@@ -7,7 +7,7 @@
#include <device.h>
#include <errno.h>
#include <misc/__assert.h>
#include <uart.h>
#include <drivers/uart.h>

#include <driverlib/ioc.h>
#include <driverlib/prcm.h>
@@ -6,7 +6,7 @@

#include <kernel.h>
#include <arch/cpu.h>
#include <uart.h>
#include <drivers/uart.h>

/* Driverlib includes */
#include <inc/hw_types.h>
@@ -15,7 +15,7 @@
#include <clock_control/arm_clock_control.h>
#include <misc/__assert.h>
#include <init.h>
#include <uart.h>
#include <drivers/uart.h>
#include <linker/sections.h>

/* UART registers struct */
@@ -8,7 +8,7 @@
#include <rom/ets_sys.h>

#include <soc.h>
#include <uart.h>
#include <drivers/uart.h>
#include <errno.h>

static void esp32_uart_tx(struct device *dev,
@@ -5,7 +5,7 @@
*/

#include <errno.h>
#include <uart.h>
#include <drivers/uart.h>
#include <em_usart.h>
#include <em_gpio.h>
#include <em_cmu.h>
@@ -4,7 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <uart.h>
#include <drivers/uart.h>
#include <syscall_handler.h>

#define UART_SIMPLE(op_) \
@@ -17,7 +17,7 @@
#include <misc/__assert.h>
#include <soc.h>
#include <init.h>
#include <uart.h>
#include <drivers/uart.h>
#include <uart_imx.h>

#define DEV_CFG(dev) \
@@ -9,7 +9,7 @@
#include <init.h>
#include <irq.h>
#include <device.h>
#include <uart.h>
#include <drivers/uart.h>
#include <zephyr/types.h>

#define UART_EV_TX (1 << 0)
@@ -6,7 +6,7 @@

#include <errno.h>
#include <device.h>
#include <uart.h>
#include <drivers/uart.h>
#include <drivers/clock_control.h>
#include <fsl_uart.h>
#include <soc.h>
@@ -6,7 +6,7 @@

#include <errno.h>
#include <device.h>
#include <uart.h>
#include <drivers/uart.h>
#include <drivers/clock_control.h>
#include <fsl_lpsci.h>
#include <soc.h>
@@ -6,7 +6,7 @@

#include <errno.h>
#include <device.h>
#include <uart.h>
#include <drivers/uart.h>
#include <drivers/clock_control.h>
#include <fsl_lpuart.h>
#include <soc.h>
@@ -6,7 +6,7 @@

#include <kernel.h>
#include <arch/cpu.h>
#include <uart.h>
#include <drivers/uart.h>


/* UART REGISTERS DEFINITIONS */
@@ -10,7 +10,7 @@
* that the definition of BIT is not overridden */
#include <driverlib/gpio.h>

#include <uart.h>
#include <drivers/uart.h>

/* Driverlib includes */
#include <driverlib/rom.h>
@@ -14,7 +14,7 @@
#include <sys/select.h>
#include <unistd.h>

#include "uart.h"
#include <drivers/uart.h>
#include "cmdline.h" /* native_posix command line options header */
#include "soc.h"

@@ -8,7 +8,7 @@
* @brief Driver for Nordic Semiconductor nRF5X UART
*/

#include <uart.h>
#include <drivers/uart.h>
#include <hal/nrf_uart.h>
#include <hal/nrf_gpio.h>

@@ -8,7 +8,7 @@
* @brief Driver for Nordic Semiconductor nRF UARTE
*/

#include <uart.h>
#include <drivers/uart.h>
#include <hal/nrf_gpio.h>
#include <hal/nrf_uarte.h>
#include <nrfx_timer.h>
@@ -29,7 +29,7 @@
#include <init.h>
#include <toolchain.h>
#include <linker/sections.h>
#include <uart.h>
#include <drivers/uart.h>
#include <sys/sys_io.h>

#include "uart_ns16550.h"
@@ -14,7 +14,7 @@
#include <misc/util.h>
#include <string.h>
#include <init.h>
#include <uart.h>
#include <drivers/uart.h>

/*
* for nsimdrv, "nsim_mem-dev=uart0,base=0xf0000000,irq=24" is
@@ -9,7 +9,7 @@
#include <init.h>
#include <device.h>
#include <soc.h>
#include <uart.h>
#include <drivers/uart.h>
#include <arch/arm/cortex_m/cmsis.h>


@@ -15,7 +15,7 @@
#include <init.h>
#include <misc/__assert.h>
#include <soc.h>
#include <uart.h>
#include <drivers/uart.h>

#include "cy_syslib.h"
#include "cy_sysclk.h"
@@ -9,7 +9,7 @@
#if defined(CONFIG_IOAPIC)
#include <drivers/interrupt_controller/ioapic.h>
#endif
#include <uart.h>
#include <drivers/uart.h>
#include <power/power.h>

#include "qm_uart.h"
@@ -7,7 +7,7 @@

#include <errno.h>
#include <device.h>
#include <uart.h>
#include <drivers/uart.h>
#include <drivers/clock_control.h>
#include <fsl_lpuart.h>
#include <soc.h>
@@ -17,7 +17,7 @@
#include <device.h>
#include <init.h>
#include <soc.h>
#include <uart.h>
#include <drivers/uart.h>

/*
* Verify Kconfig configuration
@@ -9,7 +9,7 @@
#include <init.h>
#include <misc/__assert.h>
#include <soc.h>
#include <uart.h>
#include <drivers/uart.h>
#include <drivers/dma.h>

/* Device constant configuration parameters */
@@ -10,7 +10,7 @@

#include <kernel.h>
#include <arch/cpu.h>
#include <uart.h>
#include <drivers/uart.h>

#define RXDATA_EMPTY (1 << 31) /* Receive FIFO Empty */
#define RXDATA_MASK 0xFF /* Receive Data Mask */
@@ -23,7 +23,7 @@
#include <misc/__assert.h>
#include <soc.h>
#include <init.h>
#include <uart.h>
#include <drivers/uart.h>
#include <linker/sections.h>

/* definitions */
@@ -17,7 +17,7 @@
#include <misc/__assert.h>
#include <soc.h>
#include <init.h>
#include <uart.h>
#include <drivers/uart.h>
#include <drivers/clock_control.h>

#include <linker/sections.h>
@@ -14,7 +14,7 @@

#include <errno.h>
#include <device.h>
#include <uart.h>
#include <drivers/uart.h>
#include <fsl_usart.h>
#include <fsl_clock.h>
#include <soc.h>
@@ -17,7 +17,7 @@
#include <device.h>
#include <init.h>
#include <soc.h>
#include <uart.h>
#include <drivers/uart.h>

/*
* Verify Kconfig configuration

0 comments on commit d1b2718

Please sign in to comment.
You can’t perform that action at this time.