From a445defbc2f5a151ccd7feea900398c7d492ceeb Mon Sep 17 00:00:00 2001 From: Wlad Meixner Date: Sun, 15 Sep 2019 23:01:06 +0200 Subject: [PATCH] include stdio_init call bedore periph_init --- cpu/cc3200/cpu.c | 5 ++++- cpu/cc3200/periph/gpio.c | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cpu/cc3200/cpu.c b/cpu/cc3200/cpu.c index 9296a155d..e198cdd16 100644 --- a/cpu/cc3200/cpu.c +++ b/cpu/cc3200/cpu.c @@ -26,6 +26,7 @@ #include "cpu.h" #include "periph/init.h" #include "periph_cpu.h" +#include "stdio_uart.h" #include "vendor/hw_types.h" #include "vendor/rom.h" @@ -50,8 +51,10 @@ void cpu_init(void) /* reset board */ periph_reset(); - /* trigger static peripheral initialization */ stdio_init(); + + /* trigger static peripheral initialization */ + periph_init(); } /** diff --git a/cpu/cc3200/periph/gpio.c b/cpu/cc3200/periph/gpio.c index 30731fa51..7828a59dd 100644 --- a/cpu/cc3200/periph/gpio.c +++ b/cpu/cc3200/periph/gpio.c @@ -67,8 +67,7 @@ static uint32_t ports[] = { /** * @brief static callback memory */ -static gpio_isr_ctx_t isr_ctx[sizeof(ports) / sizeof(uint32_t)] - [GPIO_PINS_PER_PORT]; +static gpio_isr_ctx_t isr_ctx[ARRAY_SIZE(ports)][GPIO_PINS_PER_PORT]; #endif /* MODULE_PERIPH_GPIO_IRQ */ /**