djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zephyr: Update include paths to use the zephyr namespace. 

Zephyr v3.1.0 moved all public headers to include/zephyr.

Signed-off-by: Maureen Helm <maureen.helm@intel.com>
This commit is contained in:
Maureen Helm 2022-05-23 14:43:13 -05:00 committed by Damien George
parent 49c23ac08f
commit 4fd54a4756
16 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/zephyr/machine_i2c.c
View File

@ -29,8 +29,8 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <zephyr.h> #include <zephyr/zephyr.h>
#include <drivers/i2c.h> #include <zephyr/drivers/i2c.h>
#include "py/runtime.h" #include "py/runtime.h"
#include "py/gc.h" #include "py/gc.h"

4
ports/zephyr/machine_pin.c
View File

@ -29,8 +29,8 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <zephyr.h> #include <zephyr/zephyr.h>
#include <drivers/gpio.h> #include <zephyr/drivers/gpio.h>
#include "py/runtime.h" #include "py/runtime.h"
#include "py/gc.h" #include "py/gc.h"

4
ports/zephyr/machine_spi.c
View File

@ -28,8 +28,8 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <zephyr.h> #include <zephyr/zephyr.h>
#include <drivers/spi.h> #include <zephyr/drivers/spi.h>
#include "py/runtime.h" #include "py/runtime.h"
#include "py/gc.h" #include "py/gc.h"

4
ports/zephyr/machine_uart.c
View File

@ -29,8 +29,8 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <zephyr.h> #include <zephyr/zephyr.h>
#include <drivers/uart.h> #include <zephyr/drivers/uart.h>
#include "py/runtime.h" #include "py/runtime.h"
#include "py/stream.h" #include "py/stream.h"

8
ports/zephyr/main.c
View File

@ -29,16 +29,16 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <zephyr.h> #include <zephyr/zephyr.h>
#ifdef CONFIG_NETWORKING #ifdef CONFIG_NETWORKING
#include <net/net_context.h> #include <zephyr/net/net_context.h>
#endif #endif
#ifdef CONFIG_USB_DEVICE_STACK #ifdef CONFIG_USB_DEVICE_STACK
#include <usb/usb_device.h> #include <zephyr/usb/usb_device.h>
#endif #endif
#include <storage/flash_map.h> #include <zephyr/storage/flash_map.h>
#include "py/mperrno.h" #include "py/mperrno.h"
#include "py/builtin.h" #include "py/builtin.h"

2
ports/zephyr/modmachine.c
View File

@ -28,7 +28,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <sys/reboot.h> #include <zephyr/sys/reboot.h>
#include "py/obj.h" #include "py/obj.h"
#include "py/runtime.h" #include "py/runtime.h"

10
ports/zephyr/modusocket.c
View File

@ -31,14 +31,14 @@
#include "py/stream.h" #include "py/stream.h"
#include <stdio.h> #include <stdio.h>
#include <zephyr.h> #include <zephyr/zephyr.h>
// Zephyr's generated version header // Zephyr's generated version header
#include <version.h> #include <version.h>
#include <net/net_context.h> #include <zephyr/net/net_context.h>
#include <net/net_pkt.h> #include <zephyr/net/net_pkt.h>
#include <net/dns_resolve.h> #include <zephyr/net/dns_resolve.h>
#ifdef CONFIG_NET_SOCKETS #ifdef CONFIG_NET_SOCKETS
#include <net/socket.h> #include <zephyr/net/socket.h>
#endif #endif
#define DEBUG_PRINT 0 #define DEBUG_PRINT 0

2
ports/zephyr/modutime.c
View File

@ -28,7 +28,7 @@
#include "py/mpconfig.h" #include "py/mpconfig.h"
#if MICROPY_PY_UTIME #if MICROPY_PY_UTIME
#include <zephyr.h> #include <zephyr/zephyr.h>
#include "py/runtime.h" #include "py/runtime.h"
#include "py/smallint.h" #include "py/smallint.h"

8
ports/zephyr/modzephyr.c
View File

@ -29,10 +29,10 @@
#if MICROPY_PY_ZEPHYR #if MICROPY_PY_ZEPHYR
#include <stdio.h> #include <stdio.h>
#include <zephyr.h> #include <zephyr/zephyr.h>
#include <debug/thread_analyzer.h> #include <zephyr/debug/thread_analyzer.h>
#include <shell/shell.h> #include <zephyr/shell/shell.h>
#include <shell/shell_uart.h> #include <zephyr/shell/shell_uart.h>
#include "modzephyr.h" #include "modzephyr.h"
#include "py/runtime.h" #include "py/runtime.h"

4
ports/zephyr/modzsensor.c
View File

@ -28,8 +28,8 @@
#include "py/runtime.h" #include "py/runtime.h"
#include <zephyr.h> #include <zephyr/zephyr.h>
#include <drivers/sensor.h> #include <zephyr/drivers/sensor.h>
#if MICROPY_PY_ZSENSOR #if MICROPY_PY_ZSENSOR

4
ports/zephyr/mpconfigport.h
View File

@ -28,8 +28,8 @@
// Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles // Include Zephyr's autoconf.h, which should be made first by Zephyr makefiles
#include "autoconf.h" #include "autoconf.h"
// Included here to get basic Zephyr environment (macros, etc.) // Included here to get basic Zephyr environment (macros, etc.)
#include <zephyr.h> #include <zephyr/zephyr.h>
#include <drivers/spi.h> #include <zephyr/drivers/spi.h>
// Usually passed from Makefile // Usually passed from Makefile
#ifndef MICROPY_HEAP_SIZE #ifndef MICROPY_HEAP_SIZE

2
ports/zephyr/mphalport.h
View File

@ -1,4 +1,4 @@
#include <zephyr.h> #include <zephyr/zephyr.h>
#include "shared/runtime/interrupt_char.h" #include "shared/runtime/interrupt_char.h"
void mp_hal_init(void); void mp_hal_init(void);

8
ports/zephyr/src/zephyr_getchar.c
View File

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
#include <zephyr.h> #include <zephyr/zephyr.h>
#include <drivers/uart.h> #include <zephyr/drivers/uart.h>
#include <drivers/console/uart_console.h> #include <zephyr/drivers/console/uart_console.h>
#include <sys/printk.h> #include <zephyr/sys/printk.h>
#include "zephyr_getchar.h" #include "zephyr_getchar.h"
extern int mp_interrupt_char; extern int mp_interrupt_char;

4
ports/zephyr/src/zephyr_start.c
View File

@ -23,8 +23,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include <zephyr.h> #include <zephyr/zephyr.h>
#include <console/console.h> #include <zephyr/console/console.h>
#include "zephyr_getchar.h" #include "zephyr_getchar.h"
int real_main(void); int real_main(void);

4
ports/zephyr/uart_core.c
View File

@ -27,8 +27,8 @@
#include "py/mpconfig.h" #include "py/mpconfig.h"
#include "src/zephyr_getchar.h" #include "src/zephyr_getchar.h"
// Zephyr headers // Zephyr headers
#include <drivers/uart.h> #include <zephyr/drivers/uart.h>
#include <console/console.h> #include <zephyr/console/console.h>
/* /*
* Core UART functions to implement for a port * Core UART functions to implement for a port

4
ports/zephyr/zephyr_storage.c
View File

@ -32,11 +32,11 @@
#endif #endif
#ifdef CONFIG_DISK_ACCESS #ifdef CONFIG_DISK_ACCESS
#include <storage/disk_access.h> #include <zephyr/storage/disk_access.h>
#endif #endif
#ifdef CONFIG_FLASH_MAP #ifdef CONFIG_FLASH_MAP
#include <storage/flash_map.h> #include <zephyr/storage/flash_map.h>
#endif #endif
#ifdef CONFIG_DISK_ACCESS #ifdef CONFIG_DISK_ACCESS