Skip to content

Commit 034bc64

Browse files
Alain Volmaterwango
authored andcommitted
stm32cube: stm32mp13xx: update hal / ll to STM32MP13 HAL tag v1.2.0
Sync all the stm32mp13xx drivers (include/src) to the STM32CubeMP13 tag v1.2.0 from https://github.com/STMicroelectronics/STM32CubeMP13.git Update done by performing copy of all files AS IS from the STM32CubeMP13 directory except for the two following points: - do not override back the PAGE_SIZE line and keep it disabled to avoid conflict with POSIX PAGE_SIZE - avoid copy of the file drivers/include/stm32_assert_template.h Signed-off-by: Alain Volmat <[email protected]>
1 parent 2373913 commit 034bc64

27 files changed

+415
-193
lines changed

stm32cube/stm32mp13xx/drivers/include/Legacy/stm32_hal_legacy.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ extern "C" {
139139
#define COMP_EXTI_LINE_COMP6_EVENT COMP_EXTI_LINE_COMP6
140140
#define COMP_EXTI_LINE_COMP7_EVENT COMP_EXTI_LINE_COMP7
141141
#if defined(STM32L0)
142-
#define COMP_LPTIMCONNECTION_ENABLED ((uint32_t)0x00000003U) /*!< COMPX output generic naming: connected to LPTIM
142+
#define COMP_LPTIMCONNECTION_ENABLED ((uint32_t)0x00000003U) /*!< COMPX output generic naming: connected to LPTIM
143143
input 1 for COMP1, LPTIM input 2 for COMP2 */
144144
#endif
145145
#define COMP_OUTPUT_COMP6TIM2OCREFCLR COMP_OUTPUT_COMP6_TIM2OCREFCLR
@@ -241,9 +241,9 @@ extern "C" {
241241
*/
242242
#if defined(STM32H5) || defined(STM32C0)
243243
#else
244-
#define HAL_CRC_Input_Data_Reverse HAL_CRCEx_Input_Data_Reverse /*!< Aliased to HAL_CRCEx_Input_Data_Reverse for
244+
#define HAL_CRC_Input_Data_Reverse HAL_CRCEx_Input_Data_Reverse /*!< Aliased to HAL_CRCEx_Input_Data_Reverse for
245245
inter STM32 series compatibility */
246-
#define HAL_CRC_Output_Data_Reverse HAL_CRCEx_Output_Data_Reverse /*!< Aliased to HAL_CRCEx_Output_Data_Reverse for
246+
#define HAL_CRC_Output_Data_Reverse HAL_CRCEx_Output_Data_Reverse /*!< Aliased to HAL_CRCEx_Output_Data_Reverse for
247247
inter STM32 series compatibility */
248248
#endif
249249
/**
@@ -1558,35 +1558,35 @@ extern "C" {
15581558
#define ETH_MAC_TXFIFONOT_EMPTY 0x01000000U /* Tx FIFO not empty */
15591559
#define ETH_MAC_TXFIFO_WRITE_ACTIVE 0x00400000U /* Tx FIFO write active */
15601560
#define ETH_MAC_TXFIFO_IDLE 0x00000000U /* Tx FIFO read status: Idle */
1561-
#define ETH_MAC_TXFIFO_READ 0x00100000U /* Tx FIFO read status: Read (transferring data to
1561+
#define ETH_MAC_TXFIFO_READ 0x00100000U /* Tx FIFO read status: Read (transferring data to
15621562
the MAC transmitter) */
1563-
#define ETH_MAC_TXFIFO_WAITING 0x00200000U /* Tx FIFO read status: Waiting for TxStatus from
1563+
#define ETH_MAC_TXFIFO_WAITING 0x00200000U /* Tx FIFO read status: Waiting for TxStatus from
15641564
MAC transmitter */
15651565
#define ETH_MAC_TXFIFO_WRITING 0x00300000U /* Tx FIFO read status: Writing the received TxStatus
15661566
or flushing the TxFIFO */
15671567
#define ETH_MAC_TRANSMISSION_PAUSE 0x00080000U /* MAC transmitter in pause */
15681568
#define ETH_MAC_TRANSMITFRAMECONTROLLER_IDLE 0x00000000U /* MAC transmit frame controller: Idle */
1569-
#define ETH_MAC_TRANSMITFRAMECONTROLLER_WAITING 0x00020000U /* MAC transmit frame controller: Waiting for Status
1569+
#define ETH_MAC_TRANSMITFRAMECONTROLLER_WAITING 0x00020000U /* MAC transmit frame controller: Waiting for Status
15701570
of previous frame or IFG/backoff period to be over */
1571-
#define ETH_MAC_TRANSMITFRAMECONTROLLER_GENRATING_PCF 0x00040000U /* MAC transmit frame controller: Generating and
1571+
#define ETH_MAC_TRANSMITFRAMECONTROLLER_GENRATING_PCF 0x00040000U /* MAC transmit frame controller: Generating and
15721572
transmitting a Pause control frame (in full duplex mode) */
1573-
#define ETH_MAC_TRANSMITFRAMECONTROLLER_TRANSFERRING 0x00060000U /* MAC transmit frame controller: Transferring input
1573+
#define ETH_MAC_TRANSMITFRAMECONTROLLER_TRANSFERRING 0x00060000U /* MAC transmit frame controller: Transferring input
15741574
frame for transmission */
15751575
#define ETH_MAC_MII_TRANSMIT_ACTIVE 0x00010000U /* MAC MII transmit engine active */
15761576
#define ETH_MAC_RXFIFO_EMPTY 0x00000000U /* Rx FIFO fill level: empty */
1577-
#define ETH_MAC_RXFIFO_BELOW_THRESHOLD 0x00000100U /* Rx FIFO fill level: fill-level below flow-control
1577+
#define ETH_MAC_RXFIFO_BELOW_THRESHOLD 0x00000100U /* Rx FIFO fill level: fill-level below flow-control
15781578
de-activate threshold */
1579-
#define ETH_MAC_RXFIFO_ABOVE_THRESHOLD 0x00000200U /* Rx FIFO fill level: fill-level above flow-control
1579+
#define ETH_MAC_RXFIFO_ABOVE_THRESHOLD 0x00000200U /* Rx FIFO fill level: fill-level above flow-control
15801580
activate threshold */
15811581
#define ETH_MAC_RXFIFO_FULL 0x00000300U /* Rx FIFO fill level: full */
15821582
#if defined(STM32F1)
15831583
#else
15841584
#define ETH_MAC_READCONTROLLER_IDLE 0x00000000U /* Rx FIFO read controller IDLE state */
15851585
#define ETH_MAC_READCONTROLLER_READING_DATA 0x00000020U /* Rx FIFO read controller Reading frame data */
1586-
#define ETH_MAC_READCONTROLLER_READING_STATUS 0x00000040U /* Rx FIFO read controller Reading frame status
1586+
#define ETH_MAC_READCONTROLLER_READING_STATUS 0x00000040U /* Rx FIFO read controller Reading frame status
15871587
(or time-stamp) */
15881588
#endif
1589-
#define ETH_MAC_READCONTROLLER_FLUSHING 0x00000060U /* Rx FIFO read controller Flushing the frame data and
1589+
#define ETH_MAC_READCONTROLLER_FLUSHING 0x00000060U /* Rx FIFO read controller Flushing the frame data and
15901590
status */
15911591
#define ETH_MAC_RXFIFO_WRITE_ACTIVE 0x00000010U /* Rx FIFO write controller active */
15921592
#define ETH_MAC_SMALL_FIFO_NOTACTIVE 0x00000000U /* MAC small FIFO read / write controllers not active */
@@ -2454,9 +2454,9 @@ extern "C" {
24542454
/** @defgroup HAL_COMP_Aliased_Functions HAL COMP Aliased Functions maintained for legacy purpose
24552455
* @{
24562456
*/
2457-
#define HAL_COMP_Start_IT HAL_COMP_Start /* Function considered as legacy as EXTI event or IT configuration is
2457+
#define HAL_COMP_Start_IT HAL_COMP_Start /* Function considered as legacy as EXTI event or IT configuration is
24582458
done into HAL_COMP_Init() */
2459-
#define HAL_COMP_Stop_IT HAL_COMP_Stop /* Function considered as legacy as EXTI event or IT configuration is
2459+
#define HAL_COMP_Stop_IT HAL_COMP_Stop /* Function considered as legacy as EXTI event or IT configuration is
24602460
done into HAL_COMP_Init() */
24612461
/**
24622462
* @}

stm32cube/stm32mp13xx/drivers/include/stm32mp13xx_hal_adc_ex.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -758,7 +758,16 @@ typedef struct
758758
* @param __HANDLE__ ADC handle.
759759
* @retval SET (ADC instance is valid) or RESET (ADC instance is invalid)
760760
*/
761+
#if defined(ADC1) & !defined(ADC2)
762+
#define ADC_VREFINT_INSTANCE(__HANDLE__) ((__HANDLE__)->Instance == ADC1)
763+
#endif
764+
#if defined(ADC2) & !defined(ADC1)
765+
#define ADC_VREFINT_INSTANCE(__HANDLE__) ((__HANDLE__)->Instance == ADC2)
766+
#endif
767+
#if defined(ADC1) & defined(ADC2)
761768
#define ADC_VREFINT_INSTANCE(__HANDLE__) (((__HANDLE__)->Instance == ADC1) || ((__HANDLE__)->Instance == ADC2))
769+
#endif
770+
762771
/**
763772
* @brief Verify the ADC instance connected to the internal voltage reference VDDCORE.
764773
* @param __HANDLE__ ADC handle.

stm32cube/stm32mp13xx/drivers/include/stm32mp13xx_hal_cryp.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
420420

421421
#define CRYP_FLAG_WRERR (SAES_SR_WRERR | 0x80000000U) /*!< SAES peripheral Write Error flag */
422422
#define CRYP_FLAG_RDERR (SAES_SR_RDERR | 0x80000000U) /*!< SAES peripheral Read error flag */
423-
#define CRYP_FLAG_CCF SAES_SR_CCF /*!< SAES peripheral Computation completed flag
423+
#define CRYP_FLAG_CCF SAES_SR_CCF /*!< SAES peripheral Computation completed flag
424424
as AES_ISR_CCF */
425425
#define CRYP_FLAG_KEIF SAES_ISR_KEIF /*!< SAES peripheral Key error interrupt flag */
426426
#define CRYP_FLAG_RWEIF SAES_ISR_RWEIF /*!< SAES peripheral Read or Write error Interrupt flag */
@@ -447,7 +447,7 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
447447
* @{
448448
*/
449449

450-
#define CRYP_KEYIVCONFIG_ALWAYS 0x00000000U /*!< Peripheral Key and IV configuration
450+
#define CRYP_KEYIVCONFIG_ALWAYS 0x00000000U /*!< Peripheral Key and IV configuration
451451
to do systematically */
452452
#define CRYP_KEYIVCONFIG_ONCE 0x00000001U /*!< Peripheral Key and IV configuration
453453
to do only once */
@@ -462,7 +462,7 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
462462
*/
463463

464464
#define CRYP_KEYMODE_NORMAL 0x00000000U /*!< Normal key usage, Key registers are freely usable */
465-
#define CRYP_KEYMODE_WRAPPED SAES_CR_KMOD_0 /*!< Only for SAES, Wrapped key: to encrypt
465+
#define CRYP_KEYMODE_WRAPPED SAES_CR_KMOD_0 /*!< Only for SAES, Wrapped key: to encrypt
466466
or decrypt AES keys */
467467
#define CRYP_KEYMODE_SHARED SAES_CR_KMOD_1 /*!< Key shared by SAES peripheral */
468468
/**
@@ -474,16 +474,16 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
474474
*/
475475

476476
#define CRYP_KEYSEL_NORMAL 0x00000000U /*!< Normal key, key registers SAES_KEYx or CRYP_KEYx */
477-
#define CRYP_KEYSEL_HW SAES_CR_KEYSEL_0 /*!< Only for SAES, Hardware key : derived hardware
477+
#define CRYP_KEYSEL_HW SAES_CR_KEYSEL_0 /*!< Only for SAES, Hardware key : derived hardware
478478
unique key (DHUK 256-bit) */
479-
#define CRYP_KEYSEL_SW SAES_CR_KEYSEL_1 /*!< Only for SAES, Software key : boot hardware
479+
#define CRYP_KEYSEL_SW SAES_CR_KEYSEL_1 /*!< Only for SAES, Software key : boot hardware
480480
key BHK (256-bit) */
481-
#define CRYP_KEYSEL_HSW SAES_CR_KEYSEL_2 /*!< Only for SAES, DHUK XOR BHK Hardware unique
481+
#define CRYP_KEYSEL_HSW SAES_CR_KEYSEL_2 /*!< Only for SAES, DHUK XOR BHK Hardware unique
482482
key XOR software key */
483-
#define CRYP_KEYSEL_AHK (SAES_CR_KEYSEL_1|SAES_CR_KEYSEL_0) /*!< Only for SAES, Software key :
483+
#define CRYP_KEYSEL_AHK (SAES_CR_KEYSEL_1|SAES_CR_KEYSEL_0) /*!< Only for SAES, Software key :
484484
application hardware key AHK (128- or 256-bit) */
485485
#define CRYP_KEYSEL_DUK_AHK (SAES_CR_KEYSEL_2|SAES_CR_KEYSEL_0) /*!< Only for SAES, DHUK XOR AHK */
486-
#define CRYP_KEYSEL_TEST_KEY (SAES_CR_KEYSEL_2|SAES_CR_KEYSEL_1|SAES_CR_KEYSEL_0) /*!< Test mode key (256-bit
486+
#define CRYP_KEYSEL_TEST_KEY (SAES_CR_KEYSEL_2|SAES_CR_KEYSEL_1|SAES_CR_KEYSEL_0) /*!< Test mode key (256-bit
487487
hardware constant key 0xA5A5...A5A5) */
488488
/**
489489
* @}
@@ -494,9 +494,9 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
494494
* @{
495495
*/
496496

497-
#define CRYP_KEYPROT_ENABLE SAES_CR_KEYPROT /*!< Only for SAES, Key can't be shared between
497+
#define CRYP_KEYPROT_ENABLE SAES_CR_KEYPROT /*!< Only for SAES, Key can't be shared between
498498
two applications with different security contexts */
499-
#define CRYP_KEYPROT_DISABLE 0x00000000U /*!< Only for SAES, Key can be shared between
499+
#define CRYP_KEYPROT_DISABLE 0x00000000U /*!< Only for SAES, Key can be shared between
500500
two applications with different security contexts */
501501

502502
/**

0 commit comments

Comments
 (0)