Skip to content

Commit 4d12b66

Browse files
fpistmfpistm
authored
Merge pull request #831 from fpistm/HAL_update
Update STM32F4xx Drivers and CMSIS
2 parents d4792de + 2660d9f commit 4d12b66

File tree

121 files changed

+9851
-4170
lines changed

Some content is hidden

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

121 files changed

+9851
-4170
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8408,10 +8408,6 @@ typedef struct
84088408
((INSTANCE) == TIM4) || \
84098409
((INSTANCE) == TIM5) || \
84108410
((INSTANCE) == TIM9))
8411-
8412-
/****************** TIM Instances : supporting synchronization ****************/
8413-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
8414-
84158411
/********************** TIM Instances : 32 bit Counter ************************/
84168412
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
84178413
((INSTANCE) == TIM5))

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8408,10 +8408,6 @@ typedef struct
84088408
((INSTANCE) == TIM4) || \
84098409
((INSTANCE) == TIM5) || \
84108410
((INSTANCE) == TIM9))
8411-
8412-
/****************** TIM Instances : supporting synchronization ****************/
8413-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
8414-
84158411
/********************** TIM Instances : 32 bit Counter ************************/
84168412
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
84178413
((INSTANCE) == TIM5))

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14004,10 +14004,6 @@ typedef struct
1400414004
((INSTANCE) == TIM8) || \
1400514005
((INSTANCE) == TIM9) || \
1400614006
((INSTANCE) == TIM12))
14007-
14008-
/****************** TIM Instances : supporting synchronization ****************/
14009-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
14010-
1401114007
/********************** TIM Instances : 32 bit Counter ************************/
1401214008
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
1401314009
((INSTANCE) == TIM5))

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13576,7 +13576,7 @@ typedef struct
1357613576
#define ETH_DMASR_TPS_Reading ETH_DMASR_TPS_Reading_Msk /* Running - reading the data from host memory */
1357713577
#define ETH_DMASR_TPS_Suspended_Pos (21U)
1357813578
#define ETH_DMASR_TPS_Suspended_Msk (0x3UL << ETH_DMASR_TPS_Suspended_Pos) /*!< 0x00600000 */
13579-
#define ETH_DMASR_TPS_Suspended ETH_DMASR_TPS_Suspended_Msk /* Suspended - Tx Descriptor unavailabe */
13579+
#define ETH_DMASR_TPS_Suspended ETH_DMASR_TPS_Suspended_Msk /* Suspended - Tx Descriptor unavailable */
1358013580
#define ETH_DMASR_TPS_Closing_Pos (20U)
1358113581
#define ETH_DMASR_TPS_Closing_Msk (0x7UL << ETH_DMASR_TPS_Closing_Pos) /*!< 0x00700000 */
1358213582
#define ETH_DMASR_TPS_Closing ETH_DMASR_TPS_Closing_Msk /* Running - closing Rx descriptor */
@@ -13598,7 +13598,7 @@ typedef struct
1359813598
#define ETH_DMASR_RPS_Closing ETH_DMASR_RPS_Closing_Msk /* Running - closing descriptor */
1359913599
#define ETH_DMASR_RPS_Queuing_Pos (17U)
1360013600
#define ETH_DMASR_RPS_Queuing_Msk (0x7UL << ETH_DMASR_RPS_Queuing_Pos) /*!< 0x000E0000 */
13601-
#define ETH_DMASR_RPS_Queuing ETH_DMASR_RPS_Queuing_Msk /* Running - queuing the recieve frame into host memory */
13601+
#define ETH_DMASR_RPS_Queuing ETH_DMASR_RPS_Queuing_Msk /* Running - queuing the receive frame into host memory */
1360213602
#define ETH_DMASR_NIS_Pos (16U)
1360313603
#define ETH_DMASR_NIS_Msk (0x1UL << ETH_DMASR_NIS_Pos) /*!< 0x00010000 */
1360413604
#define ETH_DMASR_NIS ETH_DMASR_NIS_Msk /* Normal interrupt summary */
@@ -15295,10 +15295,6 @@ typedef struct
1529515295
((INSTANCE) == TIM8) || \
1529615296
((INSTANCE) == TIM9) || \
1529715297
((INSTANCE) == TIM12))
15298-
15299-
/****************** TIM Instances : supporting synchronization ****************/
15300-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
15301-
1530215298
/********************** TIM Instances : 32 bit Counter ************************/
1530315299
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
1530415300
((INSTANCE) == TIM5))

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7132,9 +7132,6 @@ typedef struct
71327132
((INSTANCE) == TIM9) || \
71337133
((INSTANCE) == TIM11))
71347134

7135-
/****************** TIM Instances : supporting synchronization ****************/
7136-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
7137-
71387135
/************* TIM Instances : at least 1 capture/compare channel *************/
71397136
#define IS_TIM_CC1_INSTANCE(INSTANCE) (((INSTANCE) == TIM1) || \
71407137
((INSTANCE) == TIM5) || \

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7136,9 +7136,6 @@ typedef struct
71367136
((INSTANCE) == TIM9) || \
71377137
((INSTANCE) == TIM11))
71387138

7139-
/****************** TIM Instances : supporting synchronization ****************/
7140-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
7141-
71427139
/************* TIM Instances : at least 1 capture/compare channel *************/
71437140
#define IS_TIM_CC1_INSTANCE(INSTANCE) (((INSTANCE) == TIM1) || \
71447141
((INSTANCE) == TIM5) || \

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7080,9 +7080,6 @@ typedef struct
70807080
((INSTANCE) == TIM9) || \
70817081
((INSTANCE) == TIM11))
70827082

7083-
/****************** TIM Instances : supporting synchronization ****************/
7084-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
7085-
70867083
/************* TIM Instances : at least 1 capture/compare channel *************/
70877084
#define IS_TIM_CC1_INSTANCE(INSTANCE) (((INSTANCE) == TIM1) || \
70887085
((INSTANCE) == TIM5) || \

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8443,10 +8443,6 @@ typedef struct
84438443
((INSTANCE) == TIM4) || \
84448444
((INSTANCE) == TIM5) || \
84458445
((INSTANCE) == TIM9))
8446-
8447-
/****************** TIM Instances : supporting synchronization ****************/
8448-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
8449-
84508446
/********************** TIM Instances : 32 bit Counter ************************/
84518447
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
84528448
((INSTANCE) == TIM5))

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13117,9 +13117,6 @@ typedef struct
1311713117
((INSTANCE) == TIM13)|| \
1311813118
((INSTANCE) == TIM14))
1311913119

13120-
/****************** TIM Instances : supporting synchronization ****************/
13121-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
13122-
1312313120
/************* TIM Instances : at least 1 capture/compare channel *************/
1312413121
#define IS_TIM_CC1_INSTANCE(INSTANCE) (((INSTANCE) == TIM1) || \
1312513122
((INSTANCE) == TIM2) || \
@@ -13461,8 +13458,6 @@ typedef struct
1346113458
/***************************** FMPI2C Instances *******************************/
1346213459
#define IS_FMPI2C_ALL_INSTANCE(__INSTANCE__) ((__INSTANCE__) == FMPI2C1)
1346313460
#define IS_FMPSMBUS_ALL_INSTANCE IS_FMPI2C_ALL_INSTANCE
13464-
/****************************** USB Instances ********************************/
13465-
#define IS_USB_ALL_INSTANCE(INSTANCE) ((INSTANCE) == USB_OTG_FS)
1346613461
/****************************** USB Exported Constants ************************/
1346713462
#define USB_OTG_FS_HOST_MAX_CHANNEL_NBR 12U
1346813463
#define USB_OTG_FS_MAX_IN_ENDPOINTS 6U /* Including EP0 */

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14095,9 +14095,6 @@ typedef struct
1409514095
((INSTANCE) == TIM13)|| \
1409614096
((INSTANCE) == TIM14))
1409714097

14098-
/****************** TIM Instances : supporting synchronization ****************/
14099-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
14100-
1410114098
/************* TIM Instances : at least 1 capture/compare channel *************/
1410214099
#define IS_TIM_CC1_INSTANCE(INSTANCE) (((INSTANCE) == TIM1) || \
1410314100
((INSTANCE) == TIM2) || \
@@ -14442,8 +14439,6 @@ typedef struct
1444214439

1444314440
/****************************** QSPI Instances ********************************/
1444414441
#define IS_QSPI_ALL_INSTANCE(__INSTANCE__) ((__INSTANCE__) == QUADSPI)
14445-
/****************************** USB Instances ********************************/
14446-
#define IS_USB_ALL_INSTANCE(INSTANCE) ((INSTANCE) == USB_OTG_FS)
1444714442
/****************************** USB Exported Constants ************************/
1444814443
#define USB_OTG_FS_HOST_MAX_CHANNEL_NBR 12U
1444914444
#define USB_OTG_FS_MAX_IN_ENDPOINTS 6U /* Including EP0 */

0 commit comments

Comments
 (0)