From c6a898d71b9ef9272e2976d854673d3a0f2a0359 Mon Sep 17 00:00:00 2001 From: Laurent MEUNIER Date: Mon, 23 Jan 2017 17:06:00 +0100 Subject: [PATCH 1/3] STM32: remove F3 spi_api.c warning Solve below warning: "...\targets\TARGET_STM\TARGET_STM32F3\spi_api.c", line 73: Warning: #111-D: statement is unreachable --- targets/TARGET_STM/TARGET_STM32F3/spi_api.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/targets/TARGET_STM/TARGET_STM32F3/spi_api.c b/targets/TARGET_STM/TARGET_STM32F3/spi_api.c index c7082808e6c..0c91030dbef 100644 --- a/targets/TARGET_STM/TARGET_STM32F3/spi_api.c +++ b/targets/TARGET_STM/TARGET_STM32F3/spi_api.c @@ -62,16 +62,22 @@ int spi_get_clock_freq(spi_t *obj) { #endif #if defined SPI2_BASE case SPI_2: + /* SPI_2 and SPI_3. Source CLK is PCKL1 */ + spi_hz = HAL_RCC_GetPCLK1Freq(); + break; #endif #if defined SPI3_BASE case SPI_3: + /* SPI_2 and SPI_3. Source CLK is PCKL1 */ + spi_hz = HAL_RCC_GetPCLK1Freq(); + break; #endif #if defined SPI4_BASE case SPI_4: -#endif - /* SPI_2 and SPI_3. Source CLK is PCKL1 */ - spi_hz = HAL_RCC_GetPCLK1Freq(); + /* SPI_4. Source CLK is PCKL2 */ + spi_hz = HAL_RCC_GetPCLK2Freq(); break; +#endif default: error("CLK: SPI instance not set"); break; From 1b94e234e34e32d9ec8459bb8e00f67c2dde8d8d Mon Sep 17 00:00:00 2001 From: Laurent MEUNIER Date: Mon, 23 Jan 2017 17:06:42 +0100 Subject: [PATCH 2/3] STM32: I2C: remove warning Remove unused variables to avoid warnings. --- targets/TARGET_STM/i2c_api.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/targets/TARGET_STM/i2c_api.c b/targets/TARGET_STM/i2c_api.c index f90bb8772f6..50587a6abc1 100644 --- a/targets/TARGET_STM/i2c_api.c +++ b/targets/TARGET_STM/i2c_api.c @@ -492,14 +492,12 @@ int i2c_start(i2c_t *obj) { int i2c_stop(i2c_t *obj) { struct i2c_s *obj_s = I2C_S(obj); I2C_TypeDef *i2c = (I2C_TypeDef *)obj_s->i2c; - I2C_HandleTypeDef *handle = &(obj_s->handle); - int timeout; // Generate the STOP condition i2c->CR1 |= I2C_CR1_STOP; /* In case of mixed usage of the APIs (unitary + SYNC) - * re-inti HAL state + * re-init HAL state */ if(obj_s->XferOperation != I2C_FIRST_AND_LAST_FRAME) i2c_init(obj, obj_s->sda, obj_s->scl); From b63ca7eee228cfd88c3ad71030b940652adc031b Mon Sep 17 00:00:00 2001 From: Laurent MEUNIER Date: Fri, 27 Jan 2017 16:00:39 +0100 Subject: [PATCH 3/3] Fix alignements --- targets/TARGET_STM/TARGET_STM32F3/spi_api.c | 34 ++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/targets/TARGET_STM/TARGET_STM32F3/spi_api.c b/targets/TARGET_STM/TARGET_STM32F3/spi_api.c index 0c91030dbef..661c6a8b29b 100644 --- a/targets/TARGET_STM/TARGET_STM32F3/spi_api.c +++ b/targets/TARGET_STM/TARGET_STM32F3/spi_api.c @@ -55,31 +55,31 @@ int spi_get_clock_freq(spi_t *obj) { /* Get source clock depending on SPI instance */ switch ((int)spiobj->spi) { #if defined SPI1_BASE - case SPI_1: - /* SPI_1. Source CLK is PCKL2 */ - spi_hz = HAL_RCC_GetPCLK2Freq(); - break; + case SPI_1: + /* SPI_1. Source CLK is PCKL2 */ + spi_hz = HAL_RCC_GetPCLK2Freq(); + break; #endif #if defined SPI2_BASE - case SPI_2: + case SPI_2: /* SPI_2 and SPI_3. Source CLK is PCKL1 */ - spi_hz = HAL_RCC_GetPCLK1Freq(); - break; + spi_hz = HAL_RCC_GetPCLK1Freq(); + break; #endif #if defined SPI3_BASE - case SPI_3: - /* SPI_2 and SPI_3. Source CLK is PCKL1 */ - spi_hz = HAL_RCC_GetPCLK1Freq(); - break; + case SPI_3: + /* SPI_2 and SPI_3. Source CLK is PCKL1 */ + spi_hz = HAL_RCC_GetPCLK1Freq(); + break; #endif #if defined SPI4_BASE - case SPI_4: - /* SPI_4. Source CLK is PCKL2 */ - spi_hz = HAL_RCC_GetPCLK2Freq(); - break; + case SPI_4: + /* SPI_4. Source CLK is PCKL2 */ + spi_hz = HAL_RCC_GetPCLK2Freq(); + break; #endif - default: - error("CLK: SPI instance not set"); + default: + error("CLK: SPI instance not set"); break; } return spi_hz;