stm32cube: update stm32wba to cube version V1.2.0

Update Cube version for STM32WBAxx series on https://github.com/STMicroelectronics from version v1.1.0 to version v1.2.0 Signed-off-by: Abderrahmane Jarmouni <[email protected]>
zephyrproject-rtos · Dec 5, 2023 · d82efe8 · d82efe8
1 parent 4dc0a98
commit d82efe8
Show file tree

Hide file tree

Showing 69 changed files with 3,835 additions and 2,643 deletions.
diff --git a/stm32cube/stm32wbaxx/README b/stm32cube/stm32wbaxx/README
@@ -6,7 +6,7 @@ Origin:
    http://www.st.com/en/embedded-software/stm32cubewba.html
 
 Status:
-   version v1.1.0
+   version v1.2.0
 
 Purpose:
    ST Microelectronics official MCU package for STM32WBA series.
@@ -23,7 +23,7 @@ URL:
    https://github.com/STMicroelectronics/STM32CubeWBA
 
 Commit:
-   dc0b81e36a2f00054b68dbf3a57cdea3d550bd1f
+   b489561c58eed1d7ef434fe31c1bd279aa1451d7
 
 Maintained-by:
    External

diff --git a/stm32cube/stm32wbaxx/Release_Notes.html b/stm32cube/stm32wbaxx/Release_Notes.html
diff --git a/stm32cube/stm32wbaxx/drivers/include/Legacy/stm32_hal_legacy.h b/stm32cube/stm32wbaxx/drivers/include/Legacy/stm32_hal_legacy.h
@@ -1595,6 +1595,8 @@ extern "C" {
 #define ETH_MAC_SMALL_FIFO_RW_ACTIVE          0x00000006U  /* MAC small FIFO read / write controllers active */
 #define ETH_MAC_MII_RECEIVE_PROTOCOL_ACTIVE   0x00000001U  /* MAC MII receive protocol engine active */
 
+#define ETH_TxPacketConfig                    ETH_TxPacketConfig_t  /* Transmit Packet Configuration structure definition */
+
 /**
   * @}
   */
@@ -3929,7 +3931,8 @@ extern "C" {
 
 #if defined (STM32F0) || defined (STM32F2) || defined (STM32F3) || defined (STM32F4) || defined (STM32F7) || \
     defined (STM32H7) || \
-    defined (STM32L0) || defined (STM32L1)
+    defined (STM32L0) || defined (STM32L1) || \
+    defined (STM32WB)
 #define __HAL_RTC_TAMPER_GET_IT                   __HAL_RTC_TAMPER_GET_FLAG
 #endif
 

diff --git a/stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal.h b/stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal.h
@@ -79,7 +79,7 @@ extern HAL_TickFreqTypeDef      uwTickFreq;
   * @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_SUB1   (0x02U) /*!< [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)\
@@ -113,6 +113,7 @@ extern HAL_TickFreqTypeDef      uwTickFreq;
 #define SYSCFG_IT_FPU_OFC              SYSCFG_FPUIMR_FPU_IE_3  /*!< Floating Point Unit Overflow Interrupt */
 #define SYSCFG_IT_FPU_IDC              SYSCFG_FPUIMR_FPU_IE_4  /*!< Floating Point Unit Input denormal Interrupt */
 #define SYSCFG_IT_FPU_IXC              SYSCFG_FPUIMR_FPU_IE_5  /*!< Floating Point Unit Inexact Interrupt */
+#define SYSCFG_IT_FPU_ALL              (SYSCFG_IT_FPU_IOC|SYSCFG_IT_FPU_DZC|SYSCFG_IT_FPU_UFC|SYSCFG_IT_FPU_OFC|SYSCFG_IT_FPU_IDC|SYSCFG_IT_FPU_IXC)  /*!< All */
 
 /**
   * @}
@@ -139,6 +140,7 @@ extern HAL_TickFreqTypeDef      uwTickFreq;
 #define SYSCFG_FASTMODEPLUS_PA7        SYSCFG_CFGR1_PA7_FMP   /*!< Enable Fast-mode Plus on PA7  */
 #define SYSCFG_FASTMODEPLUS_PA15       SYSCFG_CFGR1_PA15_FMP  /*!< Enable Fast-mode Plus on PA15 */
 #define SYSCFG_FASTMODEPLUS_PB3        SYSCFG_CFGR1_PB3_FMP   /*!< Enable Fast-mode Plus on PB3  */
+#define SYSCFG_FASTMODEPLUS_ALL        (SYSCFG_FASTMODEPLUS_PA6|SYSCFG_FASTMODEPLUS_PA7|SYSCFG_FASTMODEPLUS_PA15|SYSCFG_FASTMODEPLUS_PB3)  /*!< All */
 
 /**
   * @}
@@ -162,8 +164,7 @@ extern HAL_TickFreqTypeDef      uwTickFreq;
   * @}
   */
 
-#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
-
+#if defined (SYSCFG_SECCFGR_SYSCFGSEC)
 /** @defgroup SYSCFG_Attributes_items SYSCFG Attributes items
   * @brief SYSCFG items to configure secure or non-secure attributes on
   * @{
@@ -175,6 +176,7 @@ extern HAL_TickFreqTypeDef      uwTickFreq;
 /**
   * @}
   */
+#endif /* SYSCFG_SECCFGR_SYSCFGSEC */
 
 /** @defgroup SYSCFG_attributes SYSCFG attributes
   * @brief SYSCFG secure or non-secure attributes
@@ -186,8 +188,6 @@ extern HAL_TickFreqTypeDef      uwTickFreq;
   * @}
   */
 
-#endif /* __ARM_FEATURE_CMSE */
-
 /**
   * @}
   */
@@ -388,48 +388,37 @@ extern HAL_TickFreqTypeDef      uwTickFreq;
   * @{
   */
 
-#define IS_SYSCFG_FPU_INTERRUPT(__INTERRUPT__) ((((__INTERRUPT__) & SYSCFG_IT_FPU_IOC) == SYSCFG_IT_FPU_IOC) || \
-                                                (((__INTERRUPT__) & SYSCFG_IT_FPU_DZC) == SYSCFG_IT_FPU_DZC) || \
-                                                (((__INTERRUPT__) & SYSCFG_IT_FPU_UFC) == SYSCFG_IT_FPU_UFC) || \
-                                                (((__INTERRUPT__) & SYSCFG_IT_FPU_OFC) == SYSCFG_IT_FPU_OFC) || \
-                                                (((__INTERRUPT__) & SYSCFG_IT_FPU_IDC) == SYSCFG_IT_FPU_IDC) || \
-                                                (((__INTERRUPT__) & SYSCFG_IT_FPU_IXC) == SYSCFG_IT_FPU_IXC))
+#define IS_SYSCFG_FPU_INTERRUPT(__INTERRUPT__) ((((__INTERRUPT__) & SYSCFG_IT_FPU_ALL) != 0x00U) && \
+                                                (((__INTERRUPT__) & ~SYSCFG_IT_FPU_ALL) == 0x00U))
 
 #define IS_SYSCFG_BREAK_CONFIG(__CONFIG__) (((__CONFIG__) == SYSCFG_BREAK_ECC)           || \
                                             ((__CONFIG__) == SYSCFG_BREAK_PVD)           || \
                                             ((__CONFIG__) == SYSCFG_BREAK_SRAM2_PARITY)  || \
                                             ((__CONFIG__) == SYSCFG_BREAK_LOCKUP))
 
-#define IS_SYSCFG_FASTMODEPLUS(__PIN__) ((((__PIN__) & SYSCFG_FASTMODEPLUS_PA6) == SYSCFG_FASTMODEPLUS_PA6) || \
-                                         (((__PIN__) & SYSCFG_FASTMODEPLUS_PA7) == SYSCFG_FASTMODEPLUS_PA7) || \
-                                         (((__PIN__) & SYSCFG_FASTMODEPLUS_PA15) == SYSCFG_FASTMODEPLUS_PA15) || \
-                                         (((__PIN__) & SYSCFG_FASTMODEPLUS_PB3) == SYSCFG_FASTMODEPLUS_PB3))
+#define IS_SYSCFG_FASTMODEPLUS(__PIN__) ((((__PIN__) & SYSCFG_FASTMODEPLUS_ALL) != 0x00U) && \
+                                         (((__PIN__) & ~SYSCFG_FASTMODEPLUS_ALL) == 0x00U))
 
 #if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
 
 #define IS_SYSCFG_ATTRIBUTES(__ATTRIBUTES__) (((__ATTRIBUTES__) == SYSCFG_SEC)  ||\
                                               ((__ATTRIBUTES__) == SYSCFG_NSEC))
 
-#define IS_SYSCFG_ITEMS_ATTRIBUTES(__ITEM__) ((((__ITEM__) & SYSCFG_CLK)    == SYSCFG_CLK)    || \
-                                              (((__ITEM__) & SYSCFG_CLASSB) == SYSCFG_CLASSB) || \
-                                              (((__ITEM__) & SYSCFG_FPU)    == SYSCFG_FPU)    || \
-                                              (((__ITEM__) & ~(SYSCFG_ALL)) == 0U))
+#define IS_SYSCFG_ITEMS_ATTRIBUTES(__ITEM__) ((((__ITEM__) & SYSCFG_ALL) != 0x00U) && \
+                                              (((__ITEM__) & ~SYSCFG_ALL) == 0x00U))
 
-#define IS_SYSCFG_LOCK_ITEMS(__ITEM__) ((((__ITEM__) & SYSCFG_MPU_NSEC)       == SYSCFG_MPU_NSEC)       || \
-                                        (((__ITEM__) & SYSCFG_VTOR_NSEC)      == SYSCFG_VTOR_NSEC)      || \
-                                        (((__ITEM__) & SYSCFG_SAU)            == SYSCFG_SAU)            || \
-                                        (((__ITEM__) & SYSCFG_MPU_SEC)        == SYSCFG_MPU_SEC)        || \
-                                        (((__ITEM__) & SYSCFG_VTOR_AIRCR_SEC) == SYSCFG_VTOR_AIRCR_SEC) || \
-                                        (((__ITEM__) & ~(SYSCFG_LOCK_ALL)) == 0U))
+#endif /* __ARM_FEATURE_CMSE */
 
-#else
+#if defined (SYSCFG_SECCFGR_SYSCFGSEC)
+#define IS_SYSCFG_SINGLE_ITEMS_ATTRIBUTES(__ITEM__) (((__ITEM__) == (SYSCFG_CLK))    || \
+                                                     ((__ITEM__) == (SYSCFG_CLASSB)) || \
+                                                     ((__ITEM__) == (SYSCFG_FPU)))
+#endif /* SYSCFG_SECCFGR_SYSCFGSEC */
 
-#define IS_SYSCFG_LOCK_ITEMS(__ITEM__) ((((__ITEM__) & SYSCFG_MPU_NSEC)  == SYSCFG_MPU_NSEC)    || \
-                                        (((__ITEM__) & SYSCFG_VTOR_NSEC) == SYSCFG_VTOR_NSEC)   || \
-                                        (((__ITEM__) & ~(SYSCFG_LOCK_ALL)) == 0U))
+#define IS_SYSCFG_LOCK_ITEMS(__ITEM__) ((((__ITEM__) & SYSCFG_LOCK_ALL) != 0x00U) && \
+                                        (((__ITEM__) & ~SYSCFG_LOCK_ALL) == 0x00U))
 
 
-#endif /* __ARM_FEATURE_CMSE */
 /**
   * @}
   */
@@ -527,22 +516,23 @@ HAL_StatusTypeDef HAL_SYSCFG_GetLock(uint32_t *pItem);
   * @}
   */
 
-#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
 
 /** @addtogroup HAL_Exported_Functions_Group6
   * @{
   */
 
+#if defined (SYSCFG_SECCFGR_SYSCFGSEC)
 /* SYSCFG Attributes functions ********************************************/
+#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
 void              HAL_SYSCFG_ConfigAttributes(uint32_t Item, uint32_t Attributes);
+#endif /* __ARM_FEATURE_CMSE */
 HAL_StatusTypeDef HAL_SYSCFG_GetConfigAttributes(uint32_t Item, uint32_t *pAttributes);
+#endif /* SYSCFG_SECCFGR_SYSCFGSEC */
 
 /**
   * @}
   */
 
-#endif /* __ARM_FEATURE_CMSE */
-
 /**
   * @}
   */

diff --git a/stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal_cortex.h b/stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal_cortex.h
@@ -40,7 +40,6 @@ extern "C" {
   * @{
   */
 
-#if (__MPU_PRESENT == 1)
 /** @defgroup CORTEX_MPU_Region_Initialization_Structure_definition MPU Region Initialization Structure Definition
   * @{
   */
@@ -81,8 +80,6 @@ typedef struct
   * @}
   */
 
-#endif /* __MPU_PRESENT */
-
 /**
   * @}
   */
@@ -121,7 +118,6 @@ typedef struct
   * @}
   */
 
-#if (__MPU_PRESENT == 1)
 /** @defgroup CORTEX_MPU_HFNMI_PRIVDEF_Control CORTEX MPU HFNMI and PRIVILEGED Access control
   * @{
   */
@@ -225,8 +221,6 @@ typedef struct
   * @}
   */
 
-#endif /* __MPU_PRESENT */
-
 /**
   * @}
   */
@@ -235,7 +229,7 @@ typedef struct
 /** @defgroup CORTEX_Exported_Macros CORTEX Exported Macros
   * @{
   */
-#if (__MPU_PRESENT == 1)
+
 /** @defgroup CORTEX_MPU_Normal_Memory_Attributes CORTEX MPU Normal Memory Attributes
   * @{
   */
@@ -245,7 +239,7 @@ typedef struct
 /**
   * @}
   */
-#endif /* __MPU_PRESENT */
+
 /**
   * @}
   */
@@ -282,10 +276,10 @@ void HAL_NVIC_SetPendingIRQ(IRQn_Type IRQn);
 void HAL_NVIC_ClearPendingIRQ(IRQn_Type IRQn);
 uint32_t HAL_NVIC_GetActive(IRQn_Type IRQn);
 void HAL_SYSTICK_CLKSourceConfig(uint32_t CLKSource);
+uint32_t HAL_SYSTICK_GetCLKSourceConfig(void);
 void HAL_SYSTICK_IRQHandler(void);
 void HAL_SYSTICK_Callback(void);
 
-#if (__MPU_PRESENT == 1)
 void HAL_MPU_Enable(uint32_t MPU_Control);
 void HAL_MPU_Disable(void);
 void HAL_MPU_ConfigRegion(MPU_Region_InitTypeDef *MPU_RegionInit);
@@ -296,7 +290,6 @@ void HAL_MPU_Disable_NS(void);
 void HAL_MPU_ConfigRegion_NS(MPU_Region_InitTypeDef *MPU_RegionInit);
 void HAL_MPU_ConfigMemoryAttributes_NS(MPU_Attributes_InitTypeDef *MPU_AttributesInit);
 #endif /* MPU_NS */
-#endif /* __MPU_PRESENT */
 /**
   * @}
   */
@@ -318,9 +311,13 @@ void HAL_MPU_ConfigMemoryAttributes_NS(MPU_Attributes_InitTypeDef *MPU_Attribute
                                        ((GROUP) == NVIC_PRIORITYGROUP_3) || \
                                        ((GROUP) == NVIC_PRIORITYGROUP_4))
 
-#define IS_NVIC_PREEMPTION_PRIORITY(PRIORITY)  ((PRIORITY) < (1UL<<__NVIC_PRIO_BITS))
+#define IS_NVIC_PREEMPTION_PRIORITY(PRIORITY, GROUP) (((0x07U - (GROUP)) < __NVIC_PRIO_BITS) ?\
+                                                      ((PRIORITY) < (0x1UL << (0x07U - (GROUP)))) :\
+                                                      ((PRIORITY) < (0x1UL << __NVIC_PRIO_BITS)))
 
-#define IS_NVIC_SUB_PRIORITY(PRIORITY)         ((PRIORITY) < (1UL<<__NVIC_PRIO_BITS))
+#define IS_NVIC_SUB_PRIORITY(PRIORITY, GROUP) (((GROUP) < (0x07U - __NVIC_PRIO_BITS)) ?\
+                                               ((PRIORITY) < (0x1UL)): \
+                                               ((PRIORITY) < (0x1UL << ((GROUP) - (0x07U - __NVIC_PRIO_BITS)))))
 
 #define IS_NVIC_DEVICE_IRQ(IRQ)                ((IRQ) > SysTick_IRQn)
 
@@ -329,7 +326,6 @@ void HAL_MPU_ConfigMemoryAttributes_NS(MPU_Attributes_InitTypeDef *MPU_Attribute
                                        ((SOURCE) == SYSTICK_CLKSOURCE_HCLK)|| \
                                        ((SOURCE) == SYSTICK_CLKSOURCE_HCLK_DIV8))
 
-#if (__MPU_PRESENT == 1)
 #define IS_MPU_REGION_ENABLE(STATE) (((STATE) == MPU_REGION_ENABLE) || \
                                      ((STATE) == MPU_REGION_DISABLE))
 
@@ -363,8 +359,6 @@ void HAL_MPU_ConfigMemoryAttributes_NS(MPU_Attributes_InitTypeDef *MPU_Attribute
                                            ((NUMBER) == MPU_ATTRIBUTES_NUMBER6) || \
                                            ((NUMBER) == MPU_ATTRIBUTES_NUMBER7))
 
-#endif /* __MPU_PRESENT */
-
 /**
   * @}
   */