Skip to content

Commit

Permalink
zephyr: Update include paths for Zephyr v2.0.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
MaureenHelm authored and dpgeorge committed Feb 4, 2020
1 parent c4ea4c1 commit c25e12d
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion ports/zephyr/machine_i2c.c
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ports/zephyr/machine_pin.c
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ports/zephyr/modmachine.c
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ports/zephyr/modzephyr.c
Expand Up @@ -29,7 +29,7 @@

#include <stdio.h>
#include <zephyr.h>
#include <misc/stack.h>
#include <debug/stack.h>

#include "py/runtime.h"

Expand Down
2 changes: 1 addition & 1 deletion ports/zephyr/modzsensor.c
Expand Up @@ -29,7 +29,7 @@
#include "py/runtime.h"

#include <zephyr.h>
#include <sensor.h>
#include <drivers/sensor.h>

#if MICROPY_PY_ZSENSOR

Expand Down
4 changes: 2 additions & 2 deletions ports/zephyr/src/zephyr_getchar.c
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ports/zephyr/src/zephyr_start.c
Expand Up @@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
#include <zephyr.h>
#include <console.h>
#include <console/console.h>
#include "zephyr_getchar.h"

int real_main(void);
Expand Down
4 changes: 2 additions & 2 deletions ports/zephyr/uart_core.c
Expand Up @@ -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
Expand Down

0 comments on commit c25e12d

Please sign in to comment.