From ce49be43b1ac7582edcfec20c56928781a512a7d Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Sat, 12 Sep 2020 14:46:05 -0500 Subject: [PATCH] zephyr: Replace zephyr integer types with C99 types. Zephyr v2.4.0 stopped using custom integer types in favor of C99 types instead. Signed-off-by: Maureen Helm --- ports/zephyr/machine_i2c.c | 2 +- ports/zephyr/zephyr_storage.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/zephyr/machine_i2c.c b/ports/zephyr/machine_i2c.c index 4b29f41d1e..576cb19777 100644 --- a/ports/zephyr/machine_i2c.c +++ b/ports/zephyr/machine_i2c.c @@ -97,7 +97,7 @@ STATIC int machine_hard_i2c_transfer_single(mp_obj_base_t *self_in, uint16_t add struct i2c_msg msg; int ret; - msg.buf = (u8_t *)buf; + msg.buf = (uint8_t *)buf; msg.len = len; msg.flags = 0; diff --git a/ports/zephyr/zephyr_storage.c b/ports/zephyr/zephyr_storage.c index 83f19a8fee..1c25b32771 100644 --- a/ports/zephyr/zephyr_storage.c +++ b/ports/zephyr/zephyr_storage.c @@ -146,7 +146,7 @@ typedef struct _zephyr_flash_area_obj_t { const struct flash_area *area; int block_size; int block_count; - u8_t id; + uint8_t id; } zephyr_flash_area_obj_t; STATIC void zephyr_flash_area_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {