Skip to content

Commit e2c9709

Browse files
fpistmfpistm
committed
[MP1] Update STM32MP1xx HAL Drivers to v1.4.0
Included in STM32CubeMP1 FW 1.4.0 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent fbb7951 commit e2c9709

17 files changed

+2860
-1478
lines changed

‎system/Drivers/STM32MP1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h‎

Lines changed: 70 additions & 98 deletions
Large diffs are not rendered by default.

‎system/Drivers/STM32MP1xx_HAL_Driver/Inc/stm32mp1xx_hal_exti.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ typedef struct
108108
#define EXTI_LINE_17 (EXTI_CONFIG | EXTI_EVENT | EXTI_REG1 | 0x11u) /* RTC timestamp and SecureError wakeup */
109109
#define EXTI_LINE_18 (EXTI_CONFIG | EXTI_EVENT | EXTI_REG1 | 0x12u) /* TAMP tamper and SecureError wakeup */
110110
#define EXTI_LINE_19 (EXTI_CONFIG | EXTI_EVENT | EXTI_REG1 | 0x13u) /* RTC Wakeup timer and Alarms (A and B) and SecureError wakeup */
111-
#define EXTI_LINE_20 (EXTI_RESERVED | | EXTI_REG1 | 0x14u) /* RESERVED */
111+
#define EXTI_LINE_20 (EXTI_RESERVED | EXTI_REG1 | 0x14u) /* RESERVED */
112112
#define EXTI_LINE_21 (EXTI_DIRECT | EXTI_REG1 | 0x15u) /* I2C1 wakeup */
113113
#define EXTI_LINE_22 (EXTI_DIRECT | EXTI_REG1 | 0x16u) /* I2C2 wakeup */
114114
#define EXTI_LINE_23 (EXTI_DIRECT | EXTI_REG1 | 0x17u) /* I2C3 wakeup */
@@ -175,7 +175,6 @@ typedef struct
175175
*/
176176
#define EXTI_MODE_C1_NONE 0x00000010u
177177
#define EXTI_MODE_C1_INTERRUPT 0x00000011u
178-
#define EXTI_MODE_C1_EVENT 0x00000012u
179178
#define EXTI_MODE_C2_NONE 0x00000020u
180179
#define EXTI_MODE_C2_INTERRUPT 0x00000021u
181180
#define EXTI_MODE_C2_EVENT 0x00000022u

‎system/Drivers/STM32MP1xx_HAL_Driver/Inc/stm32mp1xx_hal_smartcard.h‎

Lines changed: 581 additions & 402 deletions
Large diffs are not rendered by default.

‎system/Drivers/STM32MP1xx_HAL_Driver/Inc/stm32mp1xx_hal_smartcard_ex.h‎

Lines changed: 163 additions & 162 deletions
Large diffs are not rendered by default.

‎system/Drivers/STM32MP1xx_HAL_Driver/Inc/stm32mp1xx_hal_usart.h‎

Lines changed: 60 additions & 51 deletions
Large diffs are not rendered by default.

‎system/Drivers/STM32MP1xx_HAL_Driver/Inc/stm32mp1xx_hal_usart_ex.h‎

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ extern "C" {
4545
/** @defgroup USARTEx_Word_Length USARTEx Word Length
4646
* @{
4747
*/
48-
#define USART_WORDLENGTH_7B ((uint32_t)USART_CR1_M1) /*!< 7-bit long USART frame */
49-
#define USART_WORDLENGTH_8B 0x00000000U /*!< 8-bit long USART frame */
50-
#define USART_WORDLENGTH_9B ((uint32_t)USART_CR1_M0) /*!< 9-bit long USART frame */
48+
#define USART_WORDLENGTH_7B (USART_CR1_M1) /*!< 7-bit long USART frame */
49+
#define USART_WORDLENGTH_8B (0x00000000U) /*!< 8-bit long USART frame */
50+
#define USART_WORDLENGTH_9B (USART_CR1_M0) /*!< 9-bit long USART frame */
5151
/**
5252
* @}
5353
*/
@@ -130,45 +130,44 @@ extern "C" {
130130
*/
131131
#define USART_MASK_COMPUTATION(__HANDLE__) \
132132
do { \
133-
if ((__HANDLE__)->Init.WordLength == USART_WORDLENGTH_9B) \
134-
{ \
135-
if ((__HANDLE__)->Init.Parity == USART_PARITY_NONE) \
136-
{ \
133+
if ((__HANDLE__)->Init.WordLength == USART_WORDLENGTH_9B) \
134+
{ \
135+
if ((__HANDLE__)->Init.Parity == USART_PARITY_NONE) \
136+
{ \
137137
(__HANDLE__)->Mask = 0x01FFU; \
138-
} \
139-
else \
140-
{ \
138+
} \
139+
else \
140+
{ \
141141
(__HANDLE__)->Mask = 0x00FFU; \
142-
} \
143-
} \
144-
else if ((__HANDLE__)->Init.WordLength == USART_WORDLENGTH_8B) \
145-
{ \
146-
if ((__HANDLE__)->Init.Parity == USART_PARITY_NONE) \
147-
{ \
142+
} \
143+
} \
144+
else if ((__HANDLE__)->Init.WordLength == USART_WORDLENGTH_8B) \
145+
{ \
146+
if ((__HANDLE__)->Init.Parity == USART_PARITY_NONE) \
147+
{ \
148148
(__HANDLE__)->Mask = 0x00FFU; \
149-
} \
150-
else \
151-
{ \
149+
} \
150+
else \
151+
{ \
152152
(__HANDLE__)->Mask = 0x007FU; \
153-
} \
154-
} \
155-
else if ((__HANDLE__)->Init.WordLength == USART_WORDLENGTH_7B) \
156-
{ \
157-
if ((__HANDLE__)->Init.Parity == USART_PARITY_NONE) \
158-
{ \
153+
} \
154+
} \
155+
else if ((__HANDLE__)->Init.WordLength == USART_WORDLENGTH_7B) \
156+
{ \
157+
if ((__HANDLE__)->Init.Parity == USART_PARITY_NONE) \
158+
{ \
159159
(__HANDLE__)->Mask = 0x007FU; \
160-
} \
161-
else \
162-
{ \
160+
} \
161+
else \
162+
{ \
163163
(__HANDLE__)->Mask = 0x003FU; \
164-
} \
165-
} \
166-
else \
167-
{ \
168-
(__HANDLE__)->Mask = 0x0000U; \
169-
} \
170-
} while(0U)
171-
164+
} \
165+
} \
166+
else \
167+
{ \
168+
(__HANDLE__)->Mask = 0x0000U; \
169+
} \
170+
} while(0U)
172171

173172
/**
174173
* @brief Ensure that USART frame length is valid.

‎system/Drivers/STM32MP1xx_HAL_Driver/Inc/stm32mp1xx_ll_bus.h‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ extern "C" {
139139
#define LL_AHB5_GRP1_PERIPH_HASH1 RCC_MC_AHB5ENSETR_HASH1EN
140140
#define LL_AHB5_GRP1_PERIPH_RNG1 RCC_MC_AHB5ENSETR_RNG1EN
141141
#define LL_AHB5_GRP1_PERIPH_BKPSRAM RCC_MC_AHB5ENSETR_BKPSRAMEN
142-
#define LL_AHB5_GRP1_PERIPH_AXIMC RCC_MC_AHB5ENSETR_AXIMC
143142
/**
144143
* @}
145144
*/
@@ -258,7 +257,6 @@ extern "C" {
258257
#define LL_APB3_GRP1_PERIPH_SYSCFG RCC_MC_APB3ENSETR_SYSCFGEN
259258
#define LL_APB3_GRP1_PERIPH_VREF RCC_MC_APB3ENSETR_VREFEN
260259
#define LL_APB3_GRP1_PERIPH_TMPSENS RCC_MC_APB3ENSETR_DTSEN
261-
#define LL_APB3_GRP1_PERIPH_PMBCTRL RCC_MC_APB3ENSETR_PMBCTRLEN
262260
#define LL_APB3_GRP1_PERIPH_HDP RCC_MC_APB3ENSETR_HDPEN
263261
/**
264262
* @}
@@ -1017,7 +1015,6 @@ __STATIC_INLINE void LL_AHB5_GRP1_DisableClock(uint32_t Periphs)
10171015
* @arg @ref LL_AHB5_GRP1_PERIPH_CRYP1 (*)
10181016
* @arg @ref LL_AHB5_GRP1_PERIPH_HASH1
10191017
* @arg @ref LL_AHB5_GRP1_PERIPH_RNG1
1020-
* @arg @ref LL_AHB5_GRP1_PERIPH_AXIMC
10211018
*
10221019
* (*) value not defined in all devices.
10231020
* @retval None
@@ -1040,7 +1037,6 @@ __STATIC_INLINE void LL_AHB5_GRP1_ForceReset(uint32_t Periphs)
10401037
* @arg @ref LL_AHB5_GRP1_PERIPH_CRYP1 (*)
10411038
* @arg @ref LL_AHB5_GRP1_PERIPH_HASH1
10421039
* @arg @ref LL_AHB5_GRP1_PERIPH_RNG1
1043-
* @arg @ref LL_AHB5_GRP1_PERIPH_AXIMC
10441040
*
10451041
* (*) value not defined in all devices.
10461042
* @retval None
@@ -2295,7 +2291,6 @@ __STATIC_INLINE void LL_APB2_GRP1_DisableClockSleep(uint32_t Periphs)
22952291
* @arg @ref LL_APB3_GRP1_PERIPH_SYSCFG
22962292
* @arg @ref LL_APB3_GRP1_PERIPH_VREF
22972293
* @arg @ref LL_APB3_GRP1_PERIPH_TMPSENS
2298-
* @arg @ref LL_APB3_GRP1_PERIPH_PMBCTRL
22992294
* @arg @ref LL_APB3_GRP1_PERIPH_HDP
23002295
* @retval None
23012296
*/
@@ -2329,7 +2324,6 @@ __STATIC_INLINE void LL_APB3_GRP1_EnableClock(uint32_t Periphs)
23292324
* @arg @ref LL_APB3_GRP1_PERIPH_SYSCFG
23302325
* @arg @ref LL_APB3_GRP1_PERIPH_VREF
23312326
* @arg @ref LL_APB3_GRP1_PERIPH_TMPSENS
2332-
* @arg @ref LL_APB3_GRP1_PERIPH_PMBCTRL
23332327
* @arg @ref LL_APB3_GRP1_PERIPH_HDP
23342328
* @retval State of Periphs (1 or 0).
23352329
*/
@@ -2359,7 +2353,6 @@ __STATIC_INLINE uint32_t LL_APB3_GRP1_IsEnabledClock(uint32_t Periphs)
23592353
* @arg @ref LL_APB3_GRP1_PERIPH_SYSCFG
23602354
* @arg @ref LL_APB3_GRP1_PERIPH_VREF
23612355
* @arg @ref LL_APB3_GRP1_PERIPH_TMPSENS
2362-
* @arg @ref LL_APB3_GRP1_PERIPH_PMBCTRL
23632356
* @arg @ref LL_APB3_GRP1_PERIPH_HDP
23642357
* @retval None
23652358
*/
@@ -2389,7 +2382,6 @@ __STATIC_INLINE void LL_APB3_GRP1_DisableClock(uint32_t Periphs)
23892382
* @arg @ref LL_APB3_GRP1_PERIPH_SYSCFG
23902383
* @arg @ref LL_APB3_GRP1_PERIPH_VREF
23912384
* @arg @ref LL_APB3_GRP1_PERIPH_TMPSENS
2392-
* @arg @ref LL_APB3_GRP1_PERIPH_PMBCTRL
23932385
* @retval None
23942386
*/
23952387
__STATIC_INLINE void LL_APB3_GRP1_ForceReset(uint32_t Periphs)
@@ -2418,7 +2410,6 @@ __STATIC_INLINE void LL_APB3_GRP1_ForceReset(uint32_t Periphs)
24182410
* @arg @ref LL_APB3_GRP1_PERIPH_SYSCFG
24192411
* @arg @ref LL_APB3_GRP1_PERIPH_VREF
24202412
* @arg @ref LL_APB3_GRP1_PERIPH_TMPSENS
2421-
* @arg @ref LL_APB3_GRP1_PERIPH_PMBCTRL
24222413
* @retval None
24232414
*/
24242415
__STATIC_INLINE void LL_APB3_GRP1_ReleaseReset(uint32_t Periphs)
@@ -2447,7 +2438,6 @@ __STATIC_INLINE void LL_APB3_GRP1_ReleaseReset(uint32_t Periphs)
24472438
* @arg @ref LL_APB3_GRP1_PERIPH_SYSCFG
24482439
* @arg @ref LL_APB3_GRP1_PERIPH_VREF
24492440
* @arg @ref LL_APB3_GRP1_PERIPH_TMPSENS
2450-
* @arg @ref LL_APB3_GRP1_PERIPH_PMBCTRL
24512441
* @retval None
24522442
*/
24532443
__STATIC_INLINE void LL_APB3_GRP1_EnableClockSleep(uint32_t Periphs)
@@ -2479,7 +2469,6 @@ __STATIC_INLINE void LL_APB3_GRP1_EnableClockSleep(uint32_t Periphs)
24792469
* @arg @ref LL_APB3_GRP1_PERIPH_SYSCFG
24802470
* @arg @ref LL_APB3_GRP1_PERIPH_VREF
24812471
* @arg @ref LL_APB3_GRP1_PERIPH_TMPSENS
2482-
* @arg @ref LL_APB3_GRP1_PERIPH_PMBCTRL
24832472
* @retval None
24842473
*/
24852474
__STATIC_INLINE void LL_APB3_GRP1_DisableClockSleep(uint32_t Periphs)

0 commit comments

Comments
 (0)