diff options
| author | Maureen Helm <maureen.helm@nxp.com> | 2019-12-30 07:22:59 -0600 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2020-02-04 17:09:19 +1100 |
| commit | c25e12d0dd2b1b8a9fdc1231a1377f7983b41ccb (patch) | |
| tree | 0b42fe997334e59b8d5727d0ee4df9ccc384e419 | |
| parent | c4ea4c1810cac0725b348d77322abc5ba5b1ac80 (diff) | |
zephyr: Update include paths for Zephyr v2.0.
Zephyr restructured its includes in v2.0 and removed compatibility shims
after two releases in commit 1342dadc365ee22199e51779185899ddf7478686.
Updates include paths in MicroPython accordingly to fix build errors in
the zephyr port.
These changes are compatible with Zephyr v2.0 and later.
| -rw-r--r-- | ports/zephyr/machine_i2c.c | 2 | ||||
| -rw-r--r-- | ports/zephyr/machine_pin.c | 2 | ||||
| -rw-r--r-- | ports/zephyr/modmachine.c | 2 | ||||
| -rw-r--r-- | ports/zephyr/modzephyr.c | 2 | ||||
| -rw-r--r-- | ports/zephyr/modzsensor.c | 2 | ||||
| -rw-r--r-- | ports/zephyr/src/zephyr_getchar.c | 4 | ||||
| -rw-r--r-- | ports/zephyr/src/zephyr_start.c | 2 | ||||
| -rw-r--r-- | ports/zephyr/uart_core.c | 4 |
8 files changed, 10 insertions, 10 deletions
diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c index 0a9e9cfab..087cf4bea 100644 --- a/ports/zephyr/machine_i2c.c +++ b/ports/zephyr/machine_i2c.c @@ -30,7 +30,7 @@ #include <string.h> #include <zephyr.h> -#include <i2c.h> +#include <drivers/i2c.h> #include "py/runtime.h" #include "py/gc.h" diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c index c4ea328a2..d15c556ec 100644 --- a/ports/zephyr/machine_pin.c +++ b/ports/zephyr/machine_pin.c @@ -30,7 +30,7 @@ #include <string.h> #include <zephyr.h> -#include <gpio.h> +#include <drivers/gpio.h> #include "py/runtime.h" #include "py/gc.h" diff --git a/ports/zephyr/modmachine.c b/ports/zephyr/modmachine.c index c89529aa9..dd797740a 100644 --- a/ports/zephyr/modmachine.c +++ b/ports/zephyr/modmachine.c @@ -28,7 +28,7 @@ #include <stdint.h> #include <stdio.h> -#include <misc/reboot.h> +#include <power/reboot.h> #include "py/obj.h" #include "py/runtime.h" diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c index 3d686605d..781eb2203 100644 --- a/ports/zephyr/modzephyr.c +++ b/ports/zephyr/modzephyr.c @@ -29,7 +29,7 @@ #include <stdio.h> #include <zephyr.h> -#include <misc/stack.h> +#include <debug/stack.h> #include "py/runtime.h" diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c index 2630899b0..570017b63 100644 --- a/ports/zephyr/modzsensor.c +++ b/ports/zephyr/modzsensor.c @@ -29,7 +29,7 @@ #include "py/runtime.h" #include <zephyr.h> -#include <sensor.h> +#include <drivers/sensor.h> #if MICROPY_PY_ZSENSOR diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c index 52b3394d0..40dc1c320 100644 --- a/ports/zephyr/src/zephyr_getchar.c +++ b/ports/zephyr/src/zephyr_getchar.c @@ -15,9 +15,9 @@ */ #include <zephyr.h> -#include <uart.h> +#include <drivers/uart.h> #include <drivers/console/uart_console.h> -#include <misc/printk.h> +#include <sys/printk.h> #include "zephyr_getchar.h" extern int mp_interrupt_char; diff --git a/ports/zephyr/src/zephyr_start.c b/ports/zephyr/src/zephyr_start.c index 591eec76b..2e0993451 100644 --- a/ports/zephyr/src/zephyr_start.c +++ b/ports/zephyr/src/zephyr_start.c @@ -24,7 +24,7 @@ * THE SOFTWARE. */ #include <zephyr.h> -#include <console.h> +#include <console/console.h> #include "zephyr_getchar.h" int real_main(void); diff --git a/ports/zephyr/uart_core.c b/ports/zephyr/uart_core.c index 325e43743..1c9265037 100644 --- a/ports/zephyr/uart_core.c +++ b/ports/zephyr/uart_core.c @@ -27,8 +27,8 @@ #include "py/mpconfig.h" #include "src/zephyr_getchar.h" // Zephyr headers -#include <uart.h> -#include <console.h> +#include <drivers/uart.h> +#include <console/console.h> /* * Core UART functions to implement for a port |