From efbcd5171e483de2f21da3eb9d4919be76db8847 Mon Sep 17 00:00:00 2001 From: Mika Laurila Date: Tue, 10 Nov 2015 10:23:31 +0200 Subject: [PATCH] Removed F410RB specific ifdef from i2c_api.c and added FMPI2C_1 to F446RE PeripheralNames.h to make it compile --- .../TARGET_STM32F4/TARGET_NUCLEO_F446RE/PeripheralNames.h | 3 ++- .../mbed/targets/hal/TARGET_STM/TARGET_STM32F4/i2c_api.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F446RE/PeripheralNames.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F446RE/PeripheralNames.h index 6ad47076c4..3499866cfa 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F446RE/PeripheralNames.h +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F446RE/PeripheralNames.h @@ -67,7 +67,8 @@ typedef enum { typedef enum { I2C_1 = (int)I2C1_BASE, I2C_2 = (int)I2C2_BASE, - I2C_3 = (int)I2C3_BASE + I2C_3 = (int)I2C3_BASE, + FMPI2C_1 = (int)FMPI2C1_BASE } I2CName; typedef enum { diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/i2c_api.c b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/i2c_api.c index e25ac027d9..d837003d19 100644 --- a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/i2c_api.c +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F4/i2c_api.c @@ -91,7 +91,7 @@ void i2c_init(i2c_t *obj, PinName sda, PinName scl) } #endif -#if (defined(FMPI2C1_BASE) && defined(TARGET_NUCLEO_F410RB)) +#if defined FMPI2C1_BASE // Enable I2C3 clock and pinout if not done if ((obj->i2c == FMPI2C_1) && !fmpi2c1_inited) { fmpi2c1_inited = 1; @@ -338,7 +338,7 @@ void i2c_reset(i2c_t *obj) } #endif -#if (defined(FMPI2C1_BASE) && defined(TARGET_NUCLEO_F410RB)) +#if defined FMPI2C1_BASE if (obj->i2c == FMPI2C_1) { __HAL_RCC_FMPI2C1_FORCE_RESET(); __HAL_RCC_FMPI2C1_RELEASE_RESET();