Skip to content

Commit 79a891f

Browse files
fpistmfpistm
authored
Merge pull request #1687 from ABOSTM/UPDATE_F4
system(F4) update STM32F4xx HAL Drivers to v1.8.0 and CMSIS Drivers to v2.6.8
2 parents cf51e49 + c879a72 commit 79a891f

File tree

255 files changed

+29065
-71058
lines changed

Some content is hidden

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

255 files changed

+29065
-71058
lines changed

‎system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f401xc.h‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
******************************************************************************
1313
* @attention
1414
*
15-
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
16-
* All rights reserved.</center></h2>
15+
* Copyright (c) 2017 STMicroelectronics.
16+
* All rights reserved.
1717
*
18-
* This software component is licensed by ST under BSD 3-Clause license,
19-
* the "License"; You may not use this file except in compliance with the
20-
* License. You may obtain a copy of the License at:
21-
* opensource.org/licenses/BSD-3-Clause
18+
* This software is licensed under terms that can be found in the LICENSE file
19+
* in the root directory of this software component.
20+
* If no LICENSE file comes with this software, it is provided AS-IS.
2221
*
2322
******************************************************************************
2423
*/
@@ -8408,7 +8407,7 @@ typedef struct
84088407
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
84098408
((INSTANCE) == TIM5))
84108409

8411-
/***************** TIM Instances : external trigger input availabe ************/
8410+
/***************** TIM Instances : external trigger input available ************/
84128411
#define IS_TIM_ETR_INSTANCE(INSTANCE) (((INSTANCE) == TIM1) || \
84138412
((INSTANCE) == TIM2) || \
84148413
((INSTANCE) == TIM3) || \
@@ -8640,7 +8639,3 @@ typedef struct
86408639
#endif /* __cplusplus */
86418640

86428641
#endif /* __STM32F401xC_H */
8643-
8644-
8645-
8646-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

‎system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f401xe.h‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
******************************************************************************
1313
* @attention
1414
*
15-
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
16-
* All rights reserved.</center></h2>
15+
* Copyright (c) 2017 STMicroelectronics.
16+
* All rights reserved.
1717
*
18-
* This software component is licensed by ST under BSD 3-Clause license,
19-
* the "License"; You may not use this file except in compliance with the
20-
* License. You may obtain a copy of the License at:
21-
* opensource.org/licenses/BSD-3-Clause
18+
* This software is licensed under terms that can be found in the LICENSE file
19+
* in the root directory of this software component.
20+
* If no LICENSE file comes with this software, it is provided AS-IS.
2221
*
2322
******************************************************************************
2423
*/
@@ -8408,7 +8407,7 @@ typedef struct
84088407
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
84098408
((INSTANCE) == TIM5))
84108409

8411-
/***************** TIM Instances : external trigger input availabe ************/
8410+
/***************** TIM Instances : external trigger input available ************/
84128411
#define IS_TIM_ETR_INSTANCE(INSTANCE) (((INSTANCE) == TIM1) || \
84138412
((INSTANCE) == TIM2) || \
84148413
((INSTANCE) == TIM3) || \
@@ -8640,7 +8639,3 @@ typedef struct
86408639
#endif /* __cplusplus */
86418640

86428641
#endif /* __STM32F401xE_H */
8643-
8644-
8645-
8646-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

‎system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f405xx.h‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
******************************************************************************
1313
* @attention
1414
*
15-
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
16-
* All rights reserved.</center></h2>
15+
* Copyright (c) 2017 STMicroelectronics.
16+
* All rights reserved.
1717
*
18-
* This software component is licensed by ST under BSD 3-Clause license,
19-
* the "License"; You may not use this file except in compliance with the
20-
* License. You may obtain a copy of the License at:
21-
* opensource.org/licenses/BSD-3-Clause
18+
* This software is licensed under terms that can be found in the LICENSE file
19+
* in the root directory of this software component.
20+
* If no LICENSE file comes with this software, it is provided AS-IS.
2221
*
2322
******************************************************************************
2423
*/
@@ -14004,7 +14003,7 @@ typedef struct
1400414003
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
1400514004
((INSTANCE) == TIM5))
1400614005

14007-
/***************** TIM Instances : external trigger input availabe ************/
14006+
/***************** TIM Instances : external trigger input available ************/
1400814007
#define IS_TIM_ETR_INSTANCE(INSTANCE) (((INSTANCE) == TIM1) || \
1400914008
((INSTANCE) == TIM2) || \
1401014009
((INSTANCE) == TIM3) || \
@@ -14309,7 +14308,3 @@ typedef struct
1430914308
#endif /* __cplusplus */
1431014309

1431114310
#endif /* __STM32F405xx_H */
14312-
14313-
14314-
14315-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

‎system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f407xx.h‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
******************************************************************************
1313
* @attention
1414
*
15-
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
16-
* All rights reserved.</center></h2>
15+
* Copyright (c) 2017 STMicroelectronics.
16+
* All rights reserved.
1717
*
18-
* This software component is licensed by ST under BSD 3-Clause license,
19-
* the "License"; You may not use this file except in compliance with the
20-
* License. You may obtain a copy of the License at:
21-
* opensource.org/licenses/BSD-3-Clause
18+
* This software is licensed under terms that can be found in the LICENSE file
19+
* in the root directory of this software component.
20+
* If no LICENSE file comes with this software, it is provided AS-IS.
2221
*
2322
******************************************************************************
2423
*/
@@ -13247,7 +13246,7 @@ typedef struct
1324713246
/* Ethernet MMC Registers bits definition */
1324813247
/******************************************************************************/
1324913248

13250-
/* Bit definition for Ethernet MMC Contol Register */
13249+
/* Bit definition for Ethernet MMC Control Register */
1325113250
#define ETH_MMCCR_MCFHP_Pos (5U)
1325213251
#define ETH_MMCCR_MCFHP_Msk (0x1UL << ETH_MMCCR_MCFHP_Pos) /*!< 0x00000020 */
1325313252
#define ETH_MMCCR_MCFHP ETH_MMCCR_MCFHP_Msk /* MMC counter Full-Half preset */
@@ -13331,7 +13330,7 @@ typedef struct
1333113330
#define ETH_MMCRFCECR_RFCEC_Msk (0xFFFFFFFFUL << ETH_MMCRFCECR_RFCEC_Pos) /*!< 0xFFFFFFFF */
1333213331
#define ETH_MMCRFCECR_RFCEC ETH_MMCRFCECR_RFCEC_Msk /* Number of frames received with CRC error. */
1333313332

13334-
/* Bit definition for Ethernet MMC Received Frames with Alignement Error Counter Register */
13333+
/* Bit definition for Ethernet MMC Received Frames with Alignment Error Counter Register */
1333513334
#define ETH_MMCRFAECR_RFAEC_Pos (0U)
1333613335
#define ETH_MMCRFAECR_RFAEC_Msk (0xFFFFFFFFUL << ETH_MMCRFAECR_RFAEC_Pos) /*!< 0xFFFFFFFF */
1333713336
#define ETH_MMCRFAECR_RFAEC ETH_MMCRFAECR_RFAEC_Msk /* Number of frames received with alignment (dribble) error */
@@ -13345,34 +13344,37 @@ typedef struct
1334513344
/* Ethernet PTP Registers bits definition */
1334613345
/******************************************************************************/
1334713346

13348-
/* Bit definition for Ethernet PTP Time Stamp Contol Register */
13347+
/* Bit definition for Ethernet PTP Time Stamp Control Register */
13348+
#define ETH_PTPTSCR_TSPFFMAE_Pos (18U)
13349+
#define ETH_PTPTSCR_TSPFFMAE_Msk (0x1UL << ETH_PTPTSCR_TSPFFMAE_Pos) /*!< 0x00008000 */
13350+
#define ETH_PTPTSCR_TSPFFMAE ETH_PTPTSCR_TSPFFMAE_Msk /* Time stamp PTP frame filtering MAC address enable */
1334913351
#define ETH_PTPTSCR_TSCNT_Pos (16U)
1335013352
#define ETH_PTPTSCR_TSCNT_Msk (0x3UL << ETH_PTPTSCR_TSCNT_Pos) /*!< 0x00030000 */
1335113353
#define ETH_PTPTSCR_TSCNT ETH_PTPTSCR_TSCNT_Msk /* Time stamp clock node type */
13352-
#define ETH_PTPTSSR_TSSMRME_Pos (15U)
13353-
#define ETH_PTPTSSR_TSSMRME_Msk (0x1UL << ETH_PTPTSSR_TSSMRME_Pos) /*!< 0x00008000 */
13354-
#define ETH_PTPTSSR_TSSMRME ETH_PTPTSSR_TSSMRME_Msk /* Time stamp snapshot for message relevant to master enable */
13355-
#define ETH_PTPTSSR_TSSEME_Pos (14U)
13356-
#define ETH_PTPTSSR_TSSEME_Msk (0x1UL << ETH_PTPTSSR_TSSEME_Pos) /*!< 0x00004000 */
13357-
#define ETH_PTPTSSR_TSSEME ETH_PTPTSSR_TSSEME_Msk /* Time stamp snapshot for event message enable */
13358-
#define ETH_PTPTSSR_TSSIPV4FE_Pos (13U)
13359-
#define ETH_PTPTSSR_TSSIPV4FE_Msk (0x1UL << ETH_PTPTSSR_TSSIPV4FE_Pos) /*!< 0x00002000 */
13360-
#define ETH_PTPTSSR_TSSIPV4FE ETH_PTPTSSR_TSSIPV4FE_Msk /* Time stamp snapshot for IPv4 frames enable */
13361-
#define ETH_PTPTSSR_TSSIPV6FE_Pos (12U)
13362-
#define ETH_PTPTSSR_TSSIPV6FE_Msk (0x1UL << ETH_PTPTSSR_TSSIPV6FE_Pos) /*!< 0x00001000 */
13363-
#define ETH_PTPTSSR_TSSIPV6FE ETH_PTPTSSR_TSSIPV6FE_Msk /* Time stamp snapshot for IPv6 frames enable */
13364-
#define ETH_PTPTSSR_TSSPTPOEFE_Pos (11U)
13365-
#define ETH_PTPTSSR_TSSPTPOEFE_Msk (0x1UL << ETH_PTPTSSR_TSSPTPOEFE_Pos) /*!< 0x00000800 */
13366-
#define ETH_PTPTSSR_TSSPTPOEFE ETH_PTPTSSR_TSSPTPOEFE_Msk /* Time stamp snapshot for PTP over ethernet frames enable */
13367-
#define ETH_PTPTSSR_TSPTPPSV2E_Pos (10U)
13368-
#define ETH_PTPTSSR_TSPTPPSV2E_Msk (0x1UL << ETH_PTPTSSR_TSPTPPSV2E_Pos) /*!< 0x00000400 */
13369-
#define ETH_PTPTSSR_TSPTPPSV2E ETH_PTPTSSR_TSPTPPSV2E_Msk /* Time stamp PTP packet snooping for version2 format enable */
13370-
#define ETH_PTPTSSR_TSSSR_Pos (9U)
13371-
#define ETH_PTPTSSR_TSSSR_Msk (0x1UL << ETH_PTPTSSR_TSSSR_Pos) /*!< 0x00000200 */
13372-
#define ETH_PTPTSSR_TSSSR ETH_PTPTSSR_TSSSR_Msk /* Time stamp Sub-seconds rollover */
13373-
#define ETH_PTPTSSR_TSSARFE_Pos (8U)
13374-
#define ETH_PTPTSSR_TSSARFE_Msk (0x1UL << ETH_PTPTSSR_TSSARFE_Pos) /*!< 0x00000100 */
13375-
#define ETH_PTPTSSR_TSSARFE ETH_PTPTSSR_TSSARFE_Msk /* Time stamp snapshot for all received frames enable */
13354+
#define ETH_PTPTSCR_TSSMRME_Pos (15U)
13355+
#define ETH_PTPTSCR_TSSMRME_Msk (0x1UL << ETH_PTPTSCR_TSSMRME_Pos) /*!< 0x00008000 */
13356+
#define ETH_PTPTSCR_TSSMRME ETH_PTPTSCR_TSSMRME_Msk /* Time stamp snapshot for message relevant to master enable */
13357+
#define ETH_PTPTSCR_TSSEME_Pos (14U)
13358+
#define ETH_PTPTSCR_TSSEME_Msk (0x1UL << ETH_PTPTSCR_TSSEME_Pos) /*!< 0x00004000 */
13359+
#define ETH_PTPTSCR_TSSEME ETH_PTPTSCR_TSSEME_Msk /* Time stamp snapshot for event message enable */
13360+
#define ETH_PTPTSCR_TSSIPV4FE_Pos (13U)
13361+
#define ETH_PTPTSCR_TSSIPV4FE_Msk (0x1UL << ETH_PTPTSCR_TSSIPV4FE_Pos) /*!< 0x00002000 */
13362+
#define ETH_PTPTSCR_TSSIPV4FE ETH_PTPTSCR_TSSIPV4FE_Msk /* Time stamp snapshot for IPv4 frames enable */
13363+
#define ETH_PTPTSCR_TSSIPV6FE_Pos (12U)
13364+
#define ETH_PTPTSCR_TSSIPV6FE_Msk (0x1UL << ETH_PTPTSCR_TSSIPV6FE_Pos) /*!< 0x00001000 */
13365+
#define ETH_PTPTSCR_TSSIPV6FE ETH_PTPTSCR_TSSIPV6FE_Msk /* Time stamp snapshot for IPv6 frames enable */
13366+
#define ETH_PTPTSCR_TSSPTPOEFE_Pos (11U)
13367+
#define ETH_PTPTSCR_TSSPTPOEFE_Msk (0x1UL << ETH_PTPTSCR_TSSPTPOEFE_Pos) /*!< 0x00000800 */
13368+
#define ETH_PTPTSCR_TSSPTPOEFE ETH_PTPTSCR_TSSPTPOEFE_Msk /* Time stamp snapshot for PTP over ethernet frames enable */
13369+
#define ETH_PTPTSCR_TSPTPPSV2E_Pos (10U)
13370+
#define ETH_PTPTSCR_TSPTPPSV2E_Msk (0x1UL << ETH_PTPTSCR_TSPTPPSV2E_Pos) /*!< 0x00000400 */
13371+
#define ETH_PTPTSCR_TSPTPPSV2E ETH_PTPTSCR_TSPTPPSV2E_Msk /* Time stamp PTP packet snooping for version2 format enable */
13372+
#define ETH_PTPTSCR_TSSSR_Pos (9U)
13373+
#define ETH_PTPTSCR_TSSSR_Msk (0x1UL << ETH_PTPTSCR_TSSSR_Pos) /*!< 0x00000200 */
13374+
#define ETH_PTPTSCR_TSSSR ETH_PTPTSCR_TSSSR_Msk /* Time stamp Sub-seconds rollover */
13375+
#define ETH_PTPTSCR_TSSARFE_Pos (8U)
13376+
#define ETH_PTPTSCR_TSSARFE_Msk (0x1UL << ETH_PTPTSCR_TSSARFE_Pos) /*!< 0x00000100 */
13377+
#define ETH_PTPTSCR_TSSARFE ETH_PTPTSCR_TSSARFE_Msk /* Time stamp snapshot for all received frames enable */
1337613378

1337713379
#define ETH_PTPTSCR_TSARU_Pos (5U)
1337813380
#define ETH_PTPTSCR_TSARU_Msk (0x1UL << ETH_PTPTSCR_TSARU_Pos) /*!< 0x00000020 */
@@ -13452,6 +13454,9 @@ typedef struct
1345213454
/******************************************************************************/
1345313455

1345413456
/* Bit definition for Ethernet DMA Bus Mode Register */
13457+
#define ETH_DMABMR_MB_Pos (26U)
13458+
#define ETH_DMABMR_MB_Msk (0x1UL << ETH_DMABMR_MB_Pos) /*!< 0x04000000 */
13459+
#define ETH_DMABMR_MB ETH_DMABMR_MB_Msk /* Mixed Burst */
1345513460
#define ETH_DMABMR_AAB_Pos (25U)
1345613461
#define ETH_DMABMR_AAB_Msk (0x1UL << ETH_DMABMR_AAB_Pos) /*!< 0x02000000 */
1345713462
#define ETH_DMABMR_AAB ETH_DMABMR_AAB_Msk /* Address-Aligned beats */
@@ -15295,7 +15300,7 @@ typedef struct
1529515300
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
1529615301
((INSTANCE) == TIM5))
1529715302

15298-
/***************** TIM Instances : external trigger input availabe ************/
15303+
/***************** TIM Instances : external trigger input available ************/
1529915304
#define IS_TIM_ETR_INSTANCE(INSTANCE) (((INSTANCE) == TIM1) || \
1530015305
((INSTANCE) == TIM2) || \
1530115306
((INSTANCE) == TIM3) || \
@@ -15600,7 +15605,3 @@ typedef struct
1560015605
#endif /* __cplusplus */
1560115606

1560215607
#endif /* __STM32F407xx_H */
15603-
15604-
15605-
15606-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

‎system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f410cx.h‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
******************************************************************************
1313
* @attention
1414
*
15-
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
16-
* All rights reserved.</center></h2>
15+
* Copyright (c) 2017 STMicroelectronics.
16+
* All rights reserved.
1717
*
18-
* This software component is licensed by ST under BSD 3-Clause license,
19-
* the "License"; You may not use this file except in compliance with the
20-
* License. You may obtain a copy of the License at:
21-
* opensource.org/licenses/BSD-3-Clause
18+
* This software is licensed under terms that can be found in the LICENSE file
19+
* in the root directory of this software component.
20+
* If no LICENSE file comes with this software, it is provided AS-IS.
2221
*
2322
******************************************************************************
2423
*/
@@ -7183,7 +7182,7 @@ typedef struct
71837182
/********************** TIM Instances : 32 bit Counter ************************/
71847183
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)((INSTANCE) == TIM5)
71857184

7186-
/***************** TIM Instances : external trigger input availabe ************/
7185+
/***************** TIM Instances : external trigger input available ************/
71877186
#define IS_TIM_ETR_INSTANCE(INSTANCE) (((INSTANCE) == TIM1) || \
71887187
((INSTANCE) == TIM5))
71897188

@@ -7356,7 +7355,3 @@ typedef struct
73567355
#endif /* __cplusplus */
73577356

73587357
#endif /* __STM32F410Cx_H */
7359-
7360-
7361-
7362-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

‎system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f410rx.h‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
******************************************************************************
1313
* @attention
1414
*
15-
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
16-
* All rights reserved.</center></h2>
15+
* Copyright (c) 2017 STMicroelectronics.
16+
* All rights reserved.
1717
*
18-
* This software component is licensed by ST under BSD 3-Clause license,
19-
* the "License"; You may not use this file except in compliance with the
20-
* License. You may obtain a copy of the License at:
21-
* opensource.org/licenses/BSD-3-Clause
18+
* This software is licensed under terms that can be found in the LICENSE file
19+
* in the root directory of this software component.
20+
* If no LICENSE file comes with this software, it is provided AS-IS.
2221
*
2322
******************************************************************************
2423
*/
@@ -7187,7 +7186,7 @@ typedef struct
71877186
/********************** TIM Instances : 32 bit Counter ************************/
71887187
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)((INSTANCE) == TIM5)
71897188

7190-
/***************** TIM Instances : external trigger input availabe ************/
7189+
/***************** TIM Instances : external trigger input available ************/
71917190
#define IS_TIM_ETR_INSTANCE(INSTANCE) (((INSTANCE) == TIM1) || \
71927191
((INSTANCE) == TIM5))
71937192

@@ -7360,7 +7359,3 @@ typedef struct
73607359
#endif /* __cplusplus */
73617360

73627361
#endif /* __STM32F410Rx_H */
7363-
7364-
7365-
7366-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

‎system/Drivers/CMSIS/Device/ST/STM32F4xx/Include/stm32f410tx.h‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
******************************************************************************
1313
* @attention
1414
*
15-
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
16-
* All rights reserved.</center></h2>
15+
* Copyright (c) 2017 STMicroelectronics.
16+
* All rights reserved.
1717
*
18-
* This software component is licensed by ST under BSD 3-Clause license,
19-
* the "License"; You may not use this file except in compliance with the
20-
* License. You may obtain a copy of the License at:
21-
* opensource.org/licenses/BSD-3-Clause
18+
* This software is licensed under terms that can be found in the LICENSE file
19+
* in the root directory of this software component.
20+
* If no LICENSE file comes with this software, it is provided AS-IS.
2221
*
2322
******************************************************************************
2423
*/
@@ -7137,7 +7136,7 @@ typedef struct
71377136
/********************** TIM Instances : 32 bit Counter ************************/
71387137
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)((INSTANCE) == TIM5)
71397138

7140-
/***************** TIM Instances : external trigger input availabe ************/
7139+
/***************** TIM Instances : external trigger input available ************/
71417140
#define IS_TIM_ETR_INSTANCE(INSTANCE) (((INSTANCE) == TIM1) || \
71427141
((INSTANCE) == TIM5))
71437142

@@ -7305,7 +7304,3 @@ typedef struct
73057304
#endif /* __cplusplus */
73067305

73077306
#endif /* __STM32F410Tx_H */
7308-
7309-
7310-
7311-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

0 commit comments

Comments
 (0)