refactor: Move to zephyr/ include paths.

* Zephyr moved to properly namespaced headers, so major "rip the bandaid" commit to move us to those everywhere.
2022-10-08 00:46:08 -04:00
parent 35a1c5a3d4
commit 3a958c667f
116 changed files with 332 additions and 329 deletions
--- a/app/drivers/display/il0323.c
+++ b/app/drivers/display/il0323.c
@@ -7,16 +7,16 @@
 #define DT_DRV_COMPAT gooddisplay_il0323

 #include <string.h>
-#include <device.h>
-#include <init.h>
-#include <drivers/display.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
-#include <sys/byteorder.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/drivers/display.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>
+#include <zephyr/sys/byteorder.h>

 #include "il0323_regs.h"

-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(il0323, CONFIG_DISPLAY_LOG_LEVEL);

 /**
--- a/app/drivers/gpio/gpio_595.c
+++ b/app/drivers/gpio/gpio_595.c
@@ -12,15 +12,15 @@

 #include <errno.h>

-#include <kernel.h>
-#include <device.h>
-#include <init.h>
-#include <sys/byteorder.h>
-#include <drivers/gpio.h>
-#include <drivers/spi.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/spi.h>

 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_595);

 /** Configuration data */
--- a/app/drivers/gpio/gpio_mcp23017.c
+++ b/app/drivers/gpio/gpio_mcp23017.c
@@ -12,9 +12,9 @@

 #include <errno.h>

-#include <kernel.h>
-#include <device.h>
-#include <init.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/init.h>
 #include <sys/byteorder.h>
 #include <drivers/gpio.h>
 #include <drivers/i2c.h>
@@ -22,7 +22,7 @@
 #include "gpio_mcp23017.h"

 #define LOG_LEVEL CONFIG_GPIO_LOG_LEVEL
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(gpio_mcp23017);

 /**
--- a/app/drivers/gpio/gpio_mcp23017.h
+++ b/app/drivers/gpio/gpio_mcp23017.h
@@ -11,7 +11,7 @@
 #ifndef ZEPHYR_DRIVERS_GPIO_GPIO_MCP23017_H_
 #define ZEPHYR_DRIVERS_GPIO_GPIO_MCP23017_H_

-#include <kernel.h>
+#include <zephyr/kernel.h>

 #include <drivers/gpio.h>
 #include <drivers/i2c.h>
--- a/app/drivers/kscan/debounce.h
+++ b/app/drivers/kscan/debounce.h
@@ -8,7 +8,7 @@

 #include <stdbool.h>
 #include <stdint.h>
-#include <sys/util.h>
+#include <zephyr/sys/util.h>

 #define DEBOUNCE_COUNTER_BITS 14
 #define DEBOUNCE_COUNTER_MAX BIT_MASK(DEBOUNCE_COUNTER_BITS)
--- a/app/drivers/kscan/kscan_composite.c
+++ b/app/drivers/kscan/kscan_composite.c
@@ -6,9 +6,9 @@

 #define DT_DRV_COMPAT zmk_kscan_composite

-#include <device.h>
+#include <zephyr/device.h>
 #include <drivers/kscan.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

 #define MATRIX_NODE_ID DT_DRV_INST(0)
--- a/app/drivers/kscan/kscan_gpio_demux.c
+++ b/app/drivers/kscan/kscan_gpio_demux.c
@@ -6,10 +6,10 @@

 #define DT_DRV_COMPAT zmk_kscan_gpio_demux

-#include <device.h>
-#include <drivers/kscan.h>
-#include <drivers/gpio.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/logging/log.h>

 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

--- a/app/drivers/kscan/kscan_gpio_direct.c
+++ b/app/drivers/kscan/kscan_gpio_direct.c
@@ -6,13 +6,13 @@

 #include "debounce.h"

-#include <device.h>
-#include <devicetree.h>
-#include <drivers/gpio.h>
-#include <drivers/kscan.h>
-#include <kernel.h>
-#include <logging/log.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/util.h>

 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

--- a/app/drivers/kscan/kscan_gpio_matrix.c
+++ b/app/drivers/kscan/kscan_gpio_matrix.c
@@ -6,14 +6,14 @@

 #include "debounce.h"

-#include <device.h>
-#include <devicetree.h>
-#include <drivers/gpio.h>
-#include <drivers/kscan.h>
-#include <kernel.h>
-#include <logging/log.h>
-#include <sys/__assert.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/sys/util.h>

 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

--- a/app/drivers/kscan/kscan_mock.c
+++ b/app/drivers/kscan/kscan_mock.c
@@ -7,9 +7,9 @@
 #define DT_DRV_COMPAT zmk_kscan_mock

 #include <stdlib.h>
-#include <device.h>
-#include <drivers/kscan.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/kscan.h>
+#include <zephyr/logging/log.h>

 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);

--- a/app/drivers/sensor/battery/battery_common.c
+++ b/app/drivers/sensor/battery/battery_common.c
@@ -5,7 +5,7 @@
 */

 #include <errno.h>
-#include <drivers/sensor.h>
+#include <zephyr/drivers/sensor.h>

 #include "battery_common.h"

--- a/app/drivers/sensor/battery/battery_common.h
+++ b/app/drivers/sensor/battery/battery_common.h
@@ -6,7 +6,7 @@

 #pragma once

-#include <drivers/sensor.h>
+#include <zephyr/drivers/sensor.h>
 #include <stdint.h>

 struct battery_value {
--- a/app/drivers/sensor/battery/battery_nrf_vddh.c
+++ b/app/drivers/sensor/battery/battery_nrf_vddh.c
@@ -9,11 +9,11 @@

 #define DT_DRV_COMPAT zmk_battery_nrf_vddh

-#include <device.h>
-#include <devicetree.h>
-#include <drivers/adc.h>
-#include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/logging/log.h>

 #include "battery_common.h"

--- a/app/drivers/sensor/battery/battery_voltage_divider.c
+++ b/app/drivers/sensor/battery/battery_voltage_divider.c
@@ -6,12 +6,12 @@

 #define DT_DRV_COMPAT zmk_battery_voltage_divider

-#include <device.h>
-#include <devicetree.h>
+#include <zephyr/device.h>
+#include <zephyr/devicetree.h>
 #include <drivers/gpio.h>
 #include <drivers/adc.h>
 #include <drivers/sensor.h>
-#include <logging/log.h>
+#include <zephyr/logging/log.h>

 #include "battery_common.h"

--- a/app/drivers/sensor/ec11/ec11.c
+++ b/app/drivers/sensor/ec11/ec11.c
@@ -6,13 +6,13 @@

 #define DT_DRV_COMPAT alps_ec11

-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>

 #include "ec11.h"

--- a/app/drivers/sensor/ec11/ec11.h
+++ b/app/drivers/sensor/ec11/ec11.h
@@ -6,9 +6,9 @@

 #pragma once

-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>

 struct ec11_config {
    const char *a_label;
--- a/app/drivers/sensor/ec11/ec11_trigger.c
+++ b/app/drivers/sensor/ec11/ec11_trigger.c
@@ -6,17 +6,17 @@

 #define DT_DRV_COMPAT alps_ec11

-#include <device.h>
-#include <drivers/gpio.h>
-#include <sys/util.h>
-#include <kernel.h>
-#include <drivers/sensor.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>

 #include "ec11.h"

 extern struct ec11_data ec11_driver;

-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 LOG_MODULE_DECLARE(EC11, CONFIG_SENSOR_LOG_LEVEL);

 static inline void setup_int(const struct device *dev, bool enable) {