Skip to content

Commit 4d91379

Browse files
jeromecoutantjeromecoutant
committed
STM32F4 V1.19.0 -> V1.25.0 : adaptation
1 parent 12b4128 commit 4d91379

File tree

67 files changed

+70
-1644
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+70
-1644
lines changed

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f401xc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f401xe.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f405xx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f407xx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f410cx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f410rx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f410tx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f411xe.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f412cx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f412rx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f412vx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f412zx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f413xx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f415xx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f417xx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f423xx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f427xx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f429xx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f437xx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f439xx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f446xx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f469xx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/CMSIS/stm32f479xx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#define __MPU_PRESENT 1U /*!< STM32F4XX provides an MPU */
5050
#define __NVIC_PRIO_BITS 4U /*!< STM32F4XX uses 4 Bits for the Priority Levels */
5151
#define __Vendor_SysTickConfig 0U /*!< Set to 1 if different SysTick Config is used */
52-
#define __FPU_PRESENT 1U /*!< FPU present */
52+
#define __FPU_PRESENT 1 /*!< FPU present */
5353

5454
/**
5555
* @}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/STM32F4xx_HAL_Driver/stm32f4xx_hal_adc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1703,7 +1703,7 @@ HAL_StatusTypeDef HAL_ADC_ConfigChannel(ADC_HandleTypeDef* hadc, ADC_ChannelConf
17031703
/* Enable the Temperature sensor and VREFINT channel*/
17041704
tmpADC_Common->CCR |= ADC_CCR_TSVREFE;
17051705

1706-
if((sConfig->Channel == ADC_CHANNEL_TEMPSENSOR))
1706+
if (sConfig->Channel == ADC_CHANNEL_TEMPSENSOR)
17071707
{
17081708
/* Delay for temperature sensor stabilization time */
17091709
/* Compute number of CPU cycles to wait for */

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/STM32F4xx_HAL_Driver/stm32f4xx_hal_eth.c

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -893,9 +893,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
893893
{
894894
uint32_t bufcount = 0U, size = 0U, i = 0U;
895895

896-
/* Process Locked */
897-
__HAL_LOCK(heth);
898-
899896
/* Set the ETH peripheral state to BUSY */
900897
heth->State = HAL_ETH_STATE_BUSY;
901898

@@ -904,9 +901,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
904901
/* Set ETH HAL state to READY */
905902
heth->State = HAL_ETH_STATE_READY;
906903

907-
/* Process Unlocked */
908-
__HAL_UNLOCK(heth);
909-
910904
return HAL_ERROR;
911905
}
912906

@@ -916,9 +910,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
916910
/* OWN bit set */
917911
heth->State = HAL_ETH_STATE_BUSY_TX;
918912

919-
/* Process Unlocked */
920-
__HAL_UNLOCK(heth);
921-
922913
return HAL_ERROR;
923914
}
924915

@@ -989,9 +980,6 @@ HAL_StatusTypeDef HAL_ETH_TransmitFrame(ETH_HandleTypeDef *heth, uint32_t FrameL
989980
/* Set ETH HAL State to Ready */
990981
heth->State = HAL_ETH_STATE_READY;
991982

992-
/* Process Unlocked */
993-
__HAL_UNLOCK(heth);
994-
995983
/* Return function status */
996984
return HAL_OK;
997985
}
@@ -1006,9 +994,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame(ETH_HandleTypeDef *heth)
1006994
{
1007995
uint32_t framelength = 0U;
1008996

1009-
/* Process Locked */
1010-
__HAL_LOCK(heth);
1011-
1012997
/* Check the ETH state to BUSY */
1013998
heth->State = HAL_ETH_STATE_BUSY;
1014999

@@ -1042,9 +1027,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame(ETH_HandleTypeDef *heth)
10421027
/* Set HAL State to Ready */
10431028
heth->State = HAL_ETH_STATE_READY;
10441029

1045-
/* Process Unlocked */
1046-
__HAL_UNLOCK(heth);
1047-
10481030
/* Return function status */
10491031
return HAL_OK;
10501032
}
@@ -1069,9 +1051,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame(ETH_HandleTypeDef *heth)
10691051
/* Set ETH HAL State to Ready */
10701052
heth->State = HAL_ETH_STATE_READY;
10711053

1072-
/* Process Unlocked */
1073-
__HAL_UNLOCK(heth);
1074-
10751054
/* Return function status */
10761055
return HAL_ERROR;
10771056
}
@@ -1086,9 +1065,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame_IT(ETH_HandleTypeDef *heth)
10861065
{
10871066
uint32_t descriptorscancounter = 0U;
10881067

1089-
/* Process Locked */
1090-
__HAL_LOCK(heth);
1091-
10921068
/* Set ETH HAL State to BUSY */
10931069
heth->State = HAL_ETH_STATE_BUSY;
10941070

@@ -1143,9 +1119,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame_IT(ETH_HandleTypeDef *heth)
11431119
/* Set HAL State to Ready */
11441120
heth->State = HAL_ETH_STATE_READY;
11451121

1146-
/* Process Unlocked */
1147-
__HAL_UNLOCK(heth);
1148-
11491122
/* Return function status */
11501123
return HAL_OK;
11511124
}
@@ -1154,9 +1127,6 @@ HAL_StatusTypeDef HAL_ETH_GetReceivedFrame_IT(ETH_HandleTypeDef *heth)
11541127
/* Set HAL State to Ready */
11551128
heth->State = HAL_ETH_STATE_READY;
11561129

1157-
/* Process Unlocked */
1158-
__HAL_UNLOCK(heth);
1159-
11601130
/* Return function status */
11611131
return HAL_ERROR;
11621132
}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/STM32F4xx_HAL_Driver/stm32f4xx_hal_flash_ex.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,11 +1274,11 @@ static uint8_t FLASH_OB_GetRDP(void)
12741274
{
12751275
uint8_t readstatus = OB_RDP_LEVEL_0;
12761276

1277-
if((*(__IO uint8_t*)(OPTCR_BYTE1_ADDRESS) == (uint8_t)OB_RDP_LEVEL_2))
1277+
if (*(__IO uint8_t*)(OPTCR_BYTE1_ADDRESS) == (uint8_t)OB_RDP_LEVEL_2)
12781278
{
12791279
readstatus = OB_RDP_LEVEL_2;
12801280
}
1281-
else if((*(__IO uint8_t*)(OPTCR_BYTE1_ADDRESS) == (uint8_t)OB_RDP_LEVEL_0))
1281+
else if (*(__IO uint8_t*)(OPTCR_BYTE1_ADDRESS) == (uint8_t)OB_RDP_LEVEL_0)
12821282
{
12831283
readstatus = OB_RDP_LEVEL_0;
12841284
}

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/STM32F4xx_HAL_Driver/stm32f4xx_hal_iwdg.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,7 @@
102102
/** @defgroup IWDG_Private_Defines IWDG Private Defines
103103
* @{
104104
*/
105-
/* Status register need 5 RC LSI divided by prescaler clock to be updated. With
106-
higher prescaler (256), and according to LSI variation, we need to wait at
107-
least 6 cycles so 48 ms. */
108-
#define HAL_IWDG_DEFAULT_TIMEOUT 48u
105+
#define HAL_IWDG_DEFAULT_TIMEOUT 96u
109106
/**
110107
* @}
111108
*/

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/STM32F4xx_HAL_Driver/stm32f4xx_hal_smartcard.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,6 @@ HAL_StatusTypeDef HAL_SMARTCARD_Transmit(SMARTCARD_HandleTypeDef *hsc, uint8_t *
821821
*/
822822
HAL_StatusTypeDef HAL_SMARTCARD_Receive(SMARTCARD_HandleTypeDef *hsc, uint8_t *pData, uint16_t Size, uint32_t Timeout)
823823
{
824-
uint16_t* tmp;
825824
uint32_t tickstart = 0U;
826825

827826
if(hsc->RxState == HAL_SMARTCARD_STATE_READY)
@@ -851,8 +850,9 @@ HAL_StatusTypeDef HAL_SMARTCARD_Receive(SMARTCARD_HandleTypeDef *hsc, uint8_t *p
851850
{
852851
return HAL_TIMEOUT;
853852
}
854-
tmp = (uint16_t*) pData;
855-
*tmp = (uint8_t)(hsc->Instance->DR & (uint8_t)0xFF);
853+
/* MBED */
854+
*pData = (uint8_t)(hsc->Instance->DR & (uint8_t)0xFF);
855+
/* MBED */
856856
pData +=1U;
857857
}
858858

‎targets/TARGET_STM/TARGET_STM32F4/STM32Cube_FW/system_stm32f4xx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ const uint8_t APBPrescTable[8] = {0, 0, 0, 0, 1, 2, 3, 4};
147147
* @param None
148148
* @retval None
149149
*/
150-
void SystemInit(void)
150+
__weak void SystemInit(void)
151151
{
152152
/* FPU settings ------------------------------------------------------------*/
153153
#if (__FPU_PRESENT == 1) && (__FPU_USED == 1)

0 commit comments

Comments
 (0)