Commit 1510053e authored by Erwan Gouriou's avatar Erwan Gouriou
Browse files

stm32cube: update stm32wba to cube version V1.1.0 

Update Cube version for STM32WBAxx series
on https://github.com/STMicroelectronics
from version v1.0.0
to version v1.1.0

Signed-off-by: default avatarErwan Gouriou <erwan.gouriou@st.com>
parent 8a8abf7a

stm32cube/stm32wbaxx/README

+2 −2
Changes for stm32cube/stm32wbaxx/README: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Origin: 
   http://www.st.com/en/embedded-software/stm32cubewba.html



Status:

   version v1.0.0

   version v1.1.0



Purpose:

   ST Microelectronics official MCU package for STM32WBA series.
@@ -23,7 +23,7 @@ URL: 
   https://github.com/STMicroelectronics/STM32CubeWBA



Commit:

   6f1321511b3b917cc1e68e640d489ba50ba28869

   dc0b81e36a2f00054b68dbf3a57cdea3d550bd1f



Maintained-by:

   External

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

+9 −8
Changes for stm32cube/stm32wbaxx/drivers/include/Legacy/stm32_hal_legacy.h: 9 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -37,16 +37,12 @@ extern "C" { 
#define AES_CLEARFLAG_CCF               CRYP_CLEARFLAG_CCF

#define AES_CLEARFLAG_RDERR             CRYP_CLEARFLAG_RDERR

#define AES_CLEARFLAG_WRERR             CRYP_CLEARFLAG_WRERR

#if defined(STM32U5) || defined(STM32H7) || defined(STM32MP1)

#if defined(STM32H7) || defined(STM32MP1)

#define CRYP_DATATYPE_32B               CRYP_NO_SWAP

#define CRYP_DATATYPE_16B               CRYP_HALFWORD_SWAP

#define CRYP_DATATYPE_8B                CRYP_BYTE_SWAP

#define CRYP_DATATYPE_1B                CRYP_BIT_SWAP

#if defined(STM32U5)

#define CRYP_CCF_CLEAR                  CRYP_CLEAR_CCF

#define CRYP_ERR_CLEAR                  CRYP_CLEAR_RWEIF

#endif /* STM32U5 */

#endif /* STM32U5 || STM32H7 || STM32MP1 */

#endif /* STM32H7 || STM32MP1 */

/**

  * @}

  */
@@ -279,7 +275,7 @@ extern "C" { 
#define DAC_WAVEGENERATION_NOISE                        DAC_WAVE_NOISE

#define DAC_WAVEGENERATION_TRIANGLE                     DAC_WAVE_TRIANGLE



#if defined(STM32G4) || defined(STM32L5) || defined(STM32H7) || defined (STM32U5)

#if defined(STM32G4) || defined(STM32H7) || defined (STM32U5)

#define DAC_CHIPCONNECT_DISABLE       DAC_CHIPCONNECT_EXTERNAL

#define DAC_CHIPCONNECT_ENABLE        DAC_CHIPCONNECT_INTERNAL

#endif
@@ -3752,7 +3748,6 @@ extern "C" { 
#define RCC_LPTIM1CLKSOURCE_PCLK    RCC_LPTIM1CLKSOURCE_PCLK1

#define RCC_LPTIM2CLKSOURCE_PCLK    RCC_LPTIM2CLKSOURCE_PCLK1





#define RCC_DFSDM1AUDIOCLKSOURCE_I2SAPB1    RCC_DFSDM1AUDIOCLKSOURCE_I2S1

#define RCC_DFSDM1AUDIOCLKSOURCE_I2SAPB2    RCC_DFSDM1AUDIOCLKSOURCE_I2S2

#define RCC_DFSDM2AUDIOCLKSOURCE_I2SAPB1    RCC_DFSDM2AUDIOCLKSOURCE_I2S1
@@ -3932,6 +3927,12 @@ extern "C" { 
                                                        __HAL_RTC_TAMPER_TIMESTAMP_EXTI_GENERATE_SWIT()))

#endif   /* STM32F1 */



#if defined (STM32F0) || defined (STM32F2) || defined (STM32F3) || defined (STM32F4) || defined (STM32F7) || \

    defined (STM32H7) || \

    defined (STM32L0) || defined (STM32L1)

#define __HAL_RTC_TAMPER_GET_IT                   __HAL_RTC_TAMPER_GET_FLAG

#endif



#define IS_ALARM                                  IS_RTC_ALARM

#define IS_ALARM_MASK                             IS_RTC_ALARM_MASK

#define IS_TAMPER                                 IS_RTC_TAMPER

stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal.h

+20 −0
Changes for stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal.h: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -71,6 +71,26 @@ extern HAL_TickFreqTypeDef uwTickFreq; 
  */



/* Exported constants --------------------------------------------------------*/

/** @defgroup HAL_Exported_Constants HAL Exported Constants

  * @{

  */



/**

  * @brief STM32WBAxx HAL Driver version number

  */

#define __STM32WBAxx_HAL_VERSION_MAIN   (0x01U) /*!< [31:24] main version */

#define __STM32WBAxx_HAL_VERSION_SUB1   (0x01U) /*!< [23:16] sub1 version */

#define __STM32WBAxx_HAL_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */

#define __STM32WBAxx_HAL_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */

#define __STM32WBAxx_HAL_VERSION    ((__STM32WBAxx_HAL_VERSION_MAIN << 24U)\

                                     |(__STM32WBAxx_HAL_VERSION_SUB1 << 16U)\

                                     |(__STM32WBAxx_HAL_VERSION_SUB2 << 8U )\

                                     |(__STM32WBAxx_HAL_VERSION_RC))



/**

  * @}

  */



/** @defgroup REV_ID device revision ID

  * @{

  */

stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal_cortex.h

+12 −5
Changes for stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal_cortex.h: 12 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ typedef struct 
  * @{

  */

#define  MPU_ACCESS_NOT_SHAREABLE        0U

#define  MPU_ACCESS_OUTER_SHAREABLE      1U

#define  MPU_ACCESS_OUTER_SHAREABLE      2U

#define  MPU_ACCESS_INNER_SHAREABLE      3U

/**

  * @}
@@ -221,9 +221,6 @@ typedef struct 
#define  MPU_W_ALLOCATE             0x1U  /* Normal memory, write allocate.      */

#define  MPU_R_ALLOCATE             0x2U  /* Normal memory, read allocate.       */

#define  MPU_RW_ALLOCATE            0x3U  /* Normal memory, read/write allocate. */



#define OUTER(__ATTR__)        ((__ATTR__) << 4U)

#define INNER_OUTER(__ATTR__)  ((__ATTR__) | ((__ATTR__) << 4U))

/**

  * @}

  */
@@ -238,7 +235,17 @@ typedef struct 
/** @defgroup CORTEX_Exported_Macros CORTEX Exported Macros

  * @{

  */



#if (__MPU_PRESENT == 1)

/** @defgroup CORTEX_MPU_Normal_Memory_Attributes CORTEX MPU Normal Memory Attributes

  * @{

  */

/* __ATTR__ being a combination of MPU Normal memory attributes */

#define OUTER(__ATTR__)        ((__ATTR__) << 4U)

#define INNER_OUTER(__ATTR__)  ((__ATTR__) | ((__ATTR__) << 4U))

/**

  * @}

  */

#endif /* __MPU_PRESENT */

/**

  * @}

  */

stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal_cryp.h

+19 −6
Changes for stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal_cryp.h: 19 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -364,10 +364,15 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point 
  * @{

  */



#define CRYP_NO_SWAP         0x00000000U             /*!< 32-bit data type (no swapping)        */

#define CRYP_HALFWORD_SWAP   AES_CR_DATATYPE_0       /*!< 16-bit data type (half-word swapping) */

#define CRYP_BYTE_SWAP       AES_CR_DATATYPE_1       /*!< 8-bit data type (byte swapping)       */

#define CRYP_BIT_SWAP        AES_CR_DATATYPE         /*!< 1-bit data type (bit swapping)        */

#define CRYP_DATATYPE_32B      0x00000000U

#define CRYP_DATATYPE_16B      AES_CR_DATATYPE_0

#define CRYP_DATATYPE_8B       AES_CR_DATATYPE_1

#define CRYP_DATATYPE_1B       AES_CR_DATATYPE



#define CRYP_NO_SWAP           CRYP_DATATYPE_32B      /*!< 32-bit data type (no swapping)        */

#define CRYP_HALFWORD_SWAP     CRYP_DATATYPE_16B      /*!< 16-bit data type (half-word swapping) */

#define CRYP_BYTE_SWAP         CRYP_DATATYPE_8B       /*!< 8-bit data type (byte swapping)       */

#define CRYP_BIT_SWAP          CRYP_DATATYPE_1B       /*!< 1-bit data type (bit swapping)        */



/**

  * @}
@@ -613,11 +618,11 @@ HAL_StatusTypeDef HAL_CRYP_Decrypt_DMA(CRYP_HandleTypeDef *hcryp, uint32_t *pInp 
  */

/* Interrupt Handler functions  **********************************************/

void HAL_CRYP_IRQHandler(CRYP_HandleTypeDef *hcryp);

HAL_CRYP_STATETypeDef HAL_CRYP_GetState(CRYP_HandleTypeDef *hcryp);

HAL_CRYP_STATETypeDef HAL_CRYP_GetState(const CRYP_HandleTypeDef *hcryp);

void HAL_CRYP_InCpltCallback(CRYP_HandleTypeDef *hcryp);

void HAL_CRYP_OutCpltCallback(CRYP_HandleTypeDef *hcryp);

void HAL_CRYP_ErrorCallback(CRYP_HandleTypeDef *hcryp);

uint32_t HAL_CRYP_GetError(CRYP_HandleTypeDef *hcryp);

uint32_t HAL_CRYP_GetError(const CRYP_HandleTypeDef *hcryp);



/**

  * @}
@@ -655,6 +660,14 @@ uint32_t HAL_CRYP_GetError(CRYP_HandleTypeDef *hcryp); 
                             ((CONFIG) == CRYP_IVCONFIG_ONCE)  || \

                             ((CONFIG) == CRYP_KEYIVCONFIG_ONCE))



#define IS_CRYP_BUFFERSIZE(ALGO, DATAWIDTH, SIZE)                                             \

  (((((ALGO) == CRYP_AES_CTR)) &&                                             \

    ((((DATAWIDTH) == CRYP_DATAWIDTHUNIT_WORD) && (((SIZE) % 4U) == 0U))           || \

     (((DATAWIDTH) == CRYP_DATAWIDTHUNIT_BYTE) && (((SIZE) % 16U) == 0U))))        || \

   (((ALGO) == CRYP_AES_ECB) || ((ALGO) == CRYP_AES_CBC)                  || \

    ((ALGO)== CRYP_AES_GCM_GMAC) || ((ALGO) == CRYP_AES_CCM)))





/**

  * @}

  */

CRA Git | Maintained and supported by SUSTech CRA and CCSE