From e56c7fbb5293a3d819e27a1059870e7d8bf139e3 Mon Sep 17 00:00:00 2001
From: Mariano Goluboff <goluboff@gmail.com>
Date: Sun, 11 Jun 2023 07:46:14 -0400
Subject: [PATCH] ports/zephyr: Replace deprecated includes.

Replace #include <zephyr/zephyr.h> which is deprecated with
#include <zephyr/kernel.h>.

Signed-off-by: Mariano Goluboff <goluboff@gmail.com>
---
 ports/zephyr/machine_i2c.c        | 2 +-
 ports/zephyr/machine_pin.c        | 2 +-
 ports/zephyr/machine_spi.c        | 2 +-
 ports/zephyr/machine_uart.c       | 2 +-
 ports/zephyr/main.c               | 2 +-
 ports/zephyr/modsocket.c          | 2 +-
 ports/zephyr/modtime.c            | 2 +-
 ports/zephyr/modzephyr.c          | 2 +-
 ports/zephyr/modzsensor.c         | 2 +-
 ports/zephyr/mpconfigport.h       | 2 +-
 ports/zephyr/mphalport.h          | 2 +-
 ports/zephyr/src/zephyr_getchar.c | 2 +-
 ports/zephyr/src/zephyr_start.c   | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c
index c261ffad0d251..a1ad46ceb8bb4 100644
--- a/ports/zephyr/machine_i2c.c
+++ b/ports/zephyr/machine_i2c.c
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/i2c.h>
 
 #include "py/runtime.h"
diff --git a/ports/zephyr/machine_pin.c b/ports/zephyr/machine_pin.c
index be0698651bbf6..fad8bc9a3390b 100644
--- a/ports/zephyr/machine_pin.c
+++ b/ports/zephyr/machine_pin.c
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/gpio.h>
 
 #include "py/runtime.h"
diff --git a/ports/zephyr/machine_spi.c b/ports/zephyr/machine_spi.c
index 507d839c66442..c850181d8134b 100644
--- a/ports/zephyr/machine_spi.c
+++ b/ports/zephyr/machine_spi.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/spi.h>
 
 #include "py/runtime.h"
diff --git a/ports/zephyr/machine_uart.c b/ports/zephyr/machine_uart.c
index b989c0f4817c4..e5af03c3382b2 100644
--- a/ports/zephyr/machine_uart.c
+++ b/ports/zephyr/machine_uart.c
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/uart.h>
 
 #include "py/runtime.h"
diff --git a/ports/zephyr/main.c b/ports/zephyr/main.c
index a2dfb16602b1f..85f4969453986 100644
--- a/ports/zephyr/main.c
+++ b/ports/zephyr/main.c
@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #ifdef CONFIG_NETWORKING
 #include <zephyr/net/net_context.h>
 #endif
diff --git a/ports/zephyr/modsocket.c b/ports/zephyr/modsocket.c
index eacdb049da495..4eb16aa0202a2 100644
--- a/ports/zephyr/modsocket.c
+++ b/ports/zephyr/modsocket.c
@@ -31,7 +31,7 @@
 #include "py/stream.h"
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 // Zephyr's generated version header
 #include <version.h>
 #include <zephyr/net/net_context.h>
diff --git a/ports/zephyr/modtime.c b/ports/zephyr/modtime.c
index 65ba1e6e6917c..2dfa5ca9f472b 100644
--- a/ports/zephyr/modtime.c
+++ b/ports/zephyr/modtime.c
@@ -25,7 +25,7 @@
  * THE SOFTWARE.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 
 #include "py/obj.h"
 
diff --git a/ports/zephyr/modzephyr.c b/ports/zephyr/modzephyr.c
index f87e2e33f3c78..c25351bffaf37 100644
--- a/ports/zephyr/modzephyr.c
+++ b/ports/zephyr/modzephyr.c
@@ -29,7 +29,7 @@
 #if MICROPY_PY_ZEPHYR
 
 #include <stdio.h>
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/debug/thread_analyzer.h>
 #include <zephyr/shell/shell.h>
 #include <zephyr/shell/shell_uart.h>
diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c
index 5b55f0ebbaa1e..8f0b1ee57d113 100644
--- a/ports/zephyr/modzsensor.c
+++ b/ports/zephyr/modzsensor.c
@@ -28,7 +28,7 @@
 
 #include "py/runtime.h"
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/sensor.h>
 
 #if MICROPY_PY_ZSENSOR
diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h
index 2f3e314db6e8b..65b2c9b96a44f 100644
--- a/ports/zephyr/mpconfigport.h
+++ b/ports/zephyr/mpconfigport.h
@@ -28,7 +28,7 @@
 // Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles
 #include "autoconf.h"
 // Included here to get basic Zephyr environment (macros, etc.)
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/spi.h>
 
 // Usually passed from Makefile
diff --git a/ports/zephyr/mphalport.h b/ports/zephyr/mphalport.h
index 615859391167a..8206de54bccc9 100644
--- a/ports/zephyr/mphalport.h
+++ b/ports/zephyr/mphalport.h
@@ -1,4 +1,4 @@
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include "shared/runtime/interrupt_char.h"
 
 void mp_hal_init(void);
diff --git a/ports/zephyr/src/zephyr_getchar.c b/ports/zephyr/src/zephyr_getchar.c
index 5bbf1a9f68e7d..cade05d83c4a5 100644
--- a/ports/zephyr/src/zephyr_getchar.c
+++ b/ports/zephyr/src/zephyr_getchar.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/drivers/console/uart_console.h>
 #include <zephyr/sys/printk.h>
diff --git a/ports/zephyr/src/zephyr_start.c b/ports/zephyr/src/zephyr_start.c
index b24e501c33363..bdc4fd4d06354 100644
--- a/ports/zephyr/src/zephyr_start.c
+++ b/ports/zephyr/src/zephyr_start.c
@@ -23,7 +23,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include <zephyr/zephyr.h>
+#include <zephyr/kernel.h>
 #include <zephyr/console/console.h>
 #include "zephyr_getchar.h"
 

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://rainy.clevelandohioweatherforecast.com/php-proxy/index.php?q=https://patch-diff.githubusercontent.com/raw/micropython/micropython/pull/11759.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/index.php?u=https://patch-diff.githubusercontent.com/raw/micropython/micropython/pull/11759.patch" target="_blank">pFad Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v3index.php?u=https://patch-diff.githubusercontent.com/raw/micropython/micropython/pull/11759.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://rainy.clevelandohioweatherforecast.com/pFad/v4index.php?u=https://patch-diff.githubusercontent.com/raw/micropython/micropython/pull/11759.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>