From c25e12d0dd2b1b8a9fdc1231a1377f7983b41ccb Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Mon, 30 Dec 2019 07:22:59 -0600
Subject: [PATCH] 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.
---
 ports/zephyr/machine_i2c.c        | 2 +-
 ports/zephyr/machine_pin.c        | 2 +-
 ports/zephyr/modmachine.c         | 2 +-
 ports/zephyr/modzephyr.c          | 2 +-
 ports/zephyr/modzsensor.c         | 2 +-
 ports/zephyr/src/zephyr_getchar.c | 4 ++--
 ports/zephyr/src/zephyr_start.c   | 2 +-
 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 0a9e9cfaba..087cf4bead 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 c4ea328a2a..d15c556eca 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 c89529aa9c..dd797740a4 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 3d686605d5..781eb22035 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 2630899b04..570017b632 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 52b3394d03..40dc1c3201 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 591eec76bb..2e0993451b 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 325e437434..1c92650374 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