From 8963bb69666bd4037281406c382699dad02e6110 Mon Sep 17 00:00:00 2001 From: SummerGift Date: Wed, 26 Dec 2018 10:18:42 +0800 Subject: [PATCH] [bsp][stm32] restore soft iic driver --- bsp/stm32/libraries/HAL_Drivers/drv_soft_i2c.c | 5 +---- bsp/stm32/libraries/HAL_Drivers/drv_soft_i2c.h | 9 --------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_soft_i2c.c b/bsp/stm32/libraries/HAL_Drivers/drv_soft_i2c.c index 81ea714cf0..a19c5c2984 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_soft_i2c.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_soft_i2c.c @@ -18,7 +18,7 @@ #define LOG_TAG "drv.i2c" #include -#if !defined(BSP_USING_I2C1) && !defined(BSP_USING_I2C2) && !defined(BSP_USING_I2C3) && !defined(BSP_USING_I2C4) +#if !defined(BSP_USING_I2C1) && !defined(BSP_USING_I2C2) && !defined(BSP_USING_I2C3) #error "Please define at least one BSP_USING_I2Cx" /* this driver can be disabled at menuconfig → RT-Thread Components → Device Drivers */ #endif @@ -34,9 +34,6 @@ static const struct stm32_soft_i2c_config soft_i2c_config[] = #ifdef BSP_USING_I2C3 I2C3_BUS_CONFIG, #endif -#ifdef BSP_USING_I2C4 - I2C4_BUS_CONFIG, -#endif }; static struct stm32_i2c i2c_obj[sizeof(soft_i2c_config) / sizeof(soft_i2c_config[0])]; diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_soft_i2c.h b/bsp/stm32/libraries/HAL_Drivers/drv_soft_i2c.h index 4ded66505c..dc4238f3d0 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_soft_i2c.h +++ b/bsp/stm32/libraries/HAL_Drivers/drv_soft_i2c.h @@ -56,15 +56,6 @@ struct stm32_i2c } #endif -#ifdef BSP_USING_I2C4 -#define I2C4_BUS_CONFIG \ - { \ - .scl = BSP_I2C4_SCL_PIN, \ - .sda = BSP_I2C4_SDA_PIN, \ - .bus_name = "i2c4", \ - } -#endif - int rt_hw_i2c_init(void); #endif -- GitLab