This is an automated email from the ASF dual-hosted git repository. utzig pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit e418a77180c42bfa81995312a6997342f8d242e6 Author: Fabio Utzig <ut...@apache.org> AuthorDate: Thu Mar 22 09:47:43 2018 -0300 Fix i2c config naming for all f4 bsps --- hw/bsp/nucleo-f401re/src/hal_bsp.c | 2 +- hw/bsp/nucleo-f413re/src/hal_bsp.c | 2 +- hw/bsp/nucleo-f413zh/src/hal_bsp.c | 2 +- hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c | 2 +- hw/bsp/stm32f4discovery/src/hal_bsp.c | 2 +- hw/mcu/stm/stm32f4xx/include/mcu/stm32f4xx_mynewt_hal.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/bsp/nucleo-f401re/src/hal_bsp.c b/hw/bsp/nucleo-f401re/src/hal_bsp.c index 60640bc..65eaf42 100644 --- a/hw/bsp/nucleo-f401re/src/hal_bsp.c +++ b/hw/bsp/nucleo-f401re/src/hal_bsp.c @@ -73,7 +73,7 @@ static const struct hal_bsp_mem_dump dump_cfg[] = { * be removed (they are the default connections) and SB46/SB52 need to * be added. */ -static struct stm32f4_hal_i2c_cfg i2c_cfg0 = { +static struct stm32_hal_i2c_cfg i2c_cfg0 = { .hic_i2c = I2C1, .hic_rcc_reg = &RCC->APB1ENR, .hic_rcc_dev = RCC_APB1ENR_I2C1EN, diff --git a/hw/bsp/nucleo-f413re/src/hal_bsp.c b/hw/bsp/nucleo-f413re/src/hal_bsp.c index 7938926..31c0dfc 100644 --- a/hw/bsp/nucleo-f413re/src/hal_bsp.c +++ b/hw/bsp/nucleo-f413re/src/hal_bsp.c @@ -59,7 +59,7 @@ static const struct stm32f4_uart_cfg uart_cfg[UART_CNT] = { #endif #if MYNEWT_VAL(I2C_0) -static struct stm32f4_hal_i2c_cfg i2c_cfg0 = { +static struct stm32_hal_i2c_cfg i2c_cfg0 = { .hic_i2c = I2C1, .hic_rcc_reg = &RCC->APB1ENR, .hic_rcc_dev = RCC_APB1ENR_I2C1EN, diff --git a/hw/bsp/nucleo-f413zh/src/hal_bsp.c b/hw/bsp/nucleo-f413zh/src/hal_bsp.c index d62af86..002fd6e 100644 --- a/hw/bsp/nucleo-f413zh/src/hal_bsp.c +++ b/hw/bsp/nucleo-f413zh/src/hal_bsp.c @@ -59,7 +59,7 @@ static const struct stm32f4_uart_cfg uart_cfg[UART_CNT] = { #endif #if MYNEWT_VAL(I2C_0) -static struct stm32f4_hal_i2c_cfg i2c_cfg0 = { +static struct stm32_hal_i2c_cfg i2c_cfg0 = { .hic_i2c = I2C1, .hic_rcc_reg = &RCC->APB1ENR, .hic_rcc_dev = RCC_APB1ENR_I2C1EN, diff --git a/hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c b/hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c index 4170c65..89a1e9d 100644 --- a/hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c +++ b/hw/bsp/olimex_stm32-e407_devboard/src/hal_bsp.c @@ -254,7 +254,7 @@ struct stm32f4_adc_dev_cfg adc3_config = STM32F4_ADC3_DEFAULT_CONFIG; #endif #if MYNEWT_VAL(I2C_0) -static struct stm32f4_hal_i2c_cfg i2c_cfg0 = { +static struct stm32_hal_i2c_cfg i2c_cfg0 = { .hic_i2c = I2C1, .hic_rcc_reg = &RCC->APB1ENR, .hic_rcc_dev = RCC_APB1ENR_I2C1EN, diff --git a/hw/bsp/stm32f4discovery/src/hal_bsp.c b/hw/bsp/stm32f4discovery/src/hal_bsp.c index b783f9d..3cf3d68 100644 --- a/hw/bsp/stm32f4discovery/src/hal_bsp.c +++ b/hw/bsp/stm32f4discovery/src/hal_bsp.c @@ -62,7 +62,7 @@ static const struct stm32f4_uart_cfg uart_cfg[UART_CNT] = { #endif #if MYNEWT_VAL(I2C_0) -static struct stm32f4_hal_i2c_cfg i2c_cfg0 = { +static struct stm32_hal_i2c_cfg i2c_cfg0 = { .hic_i2c = I2C1, .hic_rcc_reg = &RCC->APB1ENR, .hic_rcc_dev = RCC_APB1ENR_I2C1EN, diff --git a/hw/mcu/stm/stm32f4xx/include/mcu/stm32f4xx_mynewt_hal.h b/hw/mcu/stm/stm32f4xx/include/mcu/stm32f4xx_mynewt_hal.h index 73a420d..a656886 100644 --- a/hw/mcu/stm/stm32f4xx/include/mcu/stm32f4xx_mynewt_hal.h +++ b/hw/mcu/stm/stm32f4xx/include/mcu/stm32f4xx_mynewt_hal.h @@ -47,7 +47,7 @@ extern "C" { int hal_gpio_init_stm(int pin, GPIO_InitTypeDef *cfg); int hal_gpio_deinit_stm(int pin, GPIO_InitTypeDef *cfg); -struct stm32f4_hal_i2c_cfg { +struct stm32_hal_i2c_cfg { I2C_TypeDef *hic_i2c; volatile uint32_t *hic_rcc_reg; /* RCC register to modify */ uint32_t hic_rcc_dev; /* RCC device ID */ -- To stop receiving notification emails like this one, please contact ut...@apache.org.