Skip to content

Commit de522b4

Browse files
fpistmfpistm
committed
system(WBA): update STM32WBAxx CMSIS Drivers to v1.5.0
Included in STM32CubeWBA FW v1.5.0 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 00c813b commit de522b4

17 files changed

+18127
-42
lines changed

‎system/Drivers/CMSIS/Device/ST/STM32WBAxx/Include/Templates/partition_stm32wba5mxx.h‎

Lines changed: 593 additions & 0 deletions
Large diffs are not rendered by default.

‎system/Drivers/CMSIS/Device/ST/STM32WBAxx/Include/partition_stm32wbaxx.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
#include "partition_stm32wba54xx.h"
4949
#elif defined(STM32WBA55xx)
5050
#include "partition_stm32wba55xx.h"
51+
#elif defined(STM32WBA5Mxx)
52+
#include "partition_stm32wba5mxx.h"
5153
#else
5254
#error "Please select first the target STM32WBAxx device used in your application (in stm32wbaxx.h file)"
5355
#endif

‎system/Drivers/CMSIS/Device/ST/STM32WBAxx/Include/stm32wba50xx.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ typedef enum
158158

159159
/** @} */ /* End of group Configuration_of_CMSIS */
160160

161-
#include <core_cm33.h> /*!< ARM Cortex-M33 processor and core peripherals */
161+
#include "core_cm33.h" /*!< ARM Cortex-M33 processor and core peripherals */
162162
#include "system_stm32wbaxx.h" /*!< system_stm32wbaxx System */
163163

164164

@@ -7790,11 +7790,12 @@ typedef struct
77907790
#define TAMP_ATCR1_ATOSEL3_0 (0x1UL << TAMP_ATCR1_ATOSEL3_Pos) /*!< 0x00001000 */
77917791
#define TAMP_ATCR1_ATOSEL3_1 (0x2UL << TAMP_ATCR1_ATOSEL3_Pos) /*!< 0x00002000 */
77927792
#define TAMP_ATCR1_ATCKSEL_Pos (16U)
7793-
#define TAMP_ATCR1_ATCKSEL_Msk (0x7UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00070000 */
7793+
#define TAMP_ATCR1_ATCKSEL_Msk (0xFUL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x000F0000 */
77947794
#define TAMP_ATCR1_ATCKSEL TAMP_ATCR1_ATCKSEL_Msk
77957795
#define TAMP_ATCR1_ATCKSEL_0 (0x1UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00010000 */
77967796
#define TAMP_ATCR1_ATCKSEL_1 (0x2UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00020000 */
77977797
#define TAMP_ATCR1_ATCKSEL_2 (0x4UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00040000 */
7798+
#define TAMP_ATCR1_ATCKSEL_3 (0x8UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00080000 */
77987799
#define TAMP_ATCR1_ATPER_Pos (24U)
77997800
#define TAMP_ATCR1_ATPER_Msk (0x7UL << TAMP_ATCR1_ATPER_Pos) /*!< 0x07000000 */
78007801
#define TAMP_ATCR1_ATPER TAMP_ATCR1_ATPER_Msk

‎system/Drivers/CMSIS/Device/ST/STM32WBAxx/Include/stm32wba52xx.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ typedef enum
172172

173173
/** @} */ /* End of group Configuration_of_CMSIS */
174174

175-
#include <core_cm33.h> /*!< ARM Cortex-M33 processor and core peripherals */
175+
#include "core_cm33.h" /*!< ARM Cortex-M33 processor and core peripherals */
176176
#include "system_stm32wbaxx.h" /*!< system_stm32wbaxx System */
177177

178178

@@ -1211,12 +1211,13 @@ typedef struct
12111211
* Vector table. The function does not return on successful execution.
12121212
* @param HdpArea notifies which hdp area to close, can be a combination of
12131213
* hdpa area 1 and hdp area 2
1214-
* @param pointer on the vector table containing the reset handler the function
1214+
* @param VectorTableAddr pointer on the vector table containing the reset handler the function
12151215
* jumps to.
12161216
* @retval RSSLIB_RSS_ERROR on error on input parameter, otherwise does not return.
12171217
*/
12181218
typedef uint32_t ( *RSSLIB_S_CloseExitHDP_TypeDef)( uint32_t HdpArea, uint32_t VectorTableAddr );
12191219

1220+
12201221
/**
12211222
* @brief RSSLib non-secure callable function pointer structure
12221223
*/
@@ -1231,7 +1232,7 @@ typedef struct
12311232
typedef struct
12321233
{
12331234
__IM uint32_t Reserved2[2];
1234-
__IM RSSLIB_S_CloseExitHDP_TypeDef CloseExitHDP; /*!< RSSLIB Bootloader Close and exit HDP Address offset: 0x28 */
1235+
__IM RSSLIB_S_CloseExitHDP_TypeDef CloseExitHDP; /*!< RSSLIB Close and exit HDP Address offset: 0x28 */
12351236
}S_pFuncTypeDef;
12361237

12371238
/**
@@ -11855,11 +11856,12 @@ typedef struct
1185511856
#define TAMP_ATCR1_ATOSEL3_0 (0x1UL << TAMP_ATCR1_ATOSEL3_Pos) /*!< 0x00001000 */
1185611857
#define TAMP_ATCR1_ATOSEL3_1 (0x2UL << TAMP_ATCR1_ATOSEL3_Pos) /*!< 0x00002000 */
1185711858
#define TAMP_ATCR1_ATCKSEL_Pos (16U)
11858-
#define TAMP_ATCR1_ATCKSEL_Msk (0x7UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00070000 */
11859+
#define TAMP_ATCR1_ATCKSEL_Msk (0xFUL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x000F0000 */
1185911860
#define TAMP_ATCR1_ATCKSEL TAMP_ATCR1_ATCKSEL_Msk
1186011861
#define TAMP_ATCR1_ATCKSEL_0 (0x1UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00010000 */
1186111862
#define TAMP_ATCR1_ATCKSEL_1 (0x2UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00020000 */
1186211863
#define TAMP_ATCR1_ATCKSEL_2 (0x4UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00040000 */
11864+
#define TAMP_ATCR1_ATCKSEL_3 (0x8UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00080000 */
1186311865
#define TAMP_ATCR1_ATPER_Pos (24U)
1186411866
#define TAMP_ATCR1_ATPER_Msk (0x7UL << TAMP_ATCR1_ATPER_Pos) /*!< 0x07000000 */
1186511867
#define TAMP_ATCR1_ATPER TAMP_ATCR1_ATPER_Msk

‎system/Drivers/CMSIS/Device/ST/STM32WBAxx/Include/stm32wba54xx.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ typedef enum
175175

176176
/** @} */ /* End of group Configuration_of_CMSIS */
177177

178-
#include <core_cm33.h> /*!< ARM Cortex-M33 processor and core peripherals */
178+
#include "core_cm33.h" /*!< ARM Cortex-M33 processor and core peripherals */
179179
#include "system_stm32wbaxx.h" /*!< system_stm32wbaxx System */
180180

181181

@@ -1287,12 +1287,13 @@ typedef struct
12871287
* Vector table. The function does not return on successful execution.
12881288
* @param HdpArea notifies which hdp area to close, can be a combination of
12891289
* hdpa area 1 and hdp area 2
1290-
* @param pointer on the vector table containing the reset handler the function
1290+
* @param VectorTableAddr pointer on the vector table containing the reset handler the function
12911291
* jumps to.
12921292
* @retval RSSLIB_RSS_ERROR on error on input parameter, otherwise does not return.
12931293
*/
12941294
typedef uint32_t ( *RSSLIB_S_CloseExitHDP_TypeDef)( uint32_t HdpArea, uint32_t VectorTableAddr );
12951295

1296+
12961297
/**
12971298
* @brief RSSLib non-secure callable function pointer structure
12981299
*/
@@ -1307,7 +1308,7 @@ typedef struct
13071308
typedef struct
13081309
{
13091310
__IM uint32_t Reserved2[2];
1310-
__IM RSSLIB_S_CloseExitHDP_TypeDef CloseExitHDP; /*!< RSSLIB Bootloader Close and exit HDP Address offset: 0x28 */
1311+
__IM RSSLIB_S_CloseExitHDP_TypeDef CloseExitHDP; /*!< RSSLIB Close and exit HDP Address offset: 0x28 */
13111312
}S_pFuncTypeDef;
13121313

13131314
/**
@@ -12563,11 +12564,12 @@ typedef struct
1256312564
#define TAMP_ATCR1_ATOSEL3_0 (0x1UL << TAMP_ATCR1_ATOSEL3_Pos) /*!< 0x00001000 */
1256412565
#define TAMP_ATCR1_ATOSEL3_1 (0x2UL << TAMP_ATCR1_ATOSEL3_Pos) /*!< 0x00002000 */
1256512566
#define TAMP_ATCR1_ATCKSEL_Pos (16U)
12566-
#define TAMP_ATCR1_ATCKSEL_Msk (0x7UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00070000 */
12567+
#define TAMP_ATCR1_ATCKSEL_Msk (0xFUL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x000F0000 */
1256712568
#define TAMP_ATCR1_ATCKSEL TAMP_ATCR1_ATCKSEL_Msk
1256812569
#define TAMP_ATCR1_ATCKSEL_0 (0x1UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00010000 */
1256912570
#define TAMP_ATCR1_ATCKSEL_1 (0x2UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00020000 */
1257012571
#define TAMP_ATCR1_ATCKSEL_2 (0x4UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00040000 */
12572+
#define TAMP_ATCR1_ATCKSEL_3 (0x8UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00080000 */
1257112573
#define TAMP_ATCR1_ATPER_Pos (24U)
1257212574
#define TAMP_ATCR1_ATPER_Msk (0x7UL << TAMP_ATCR1_ATPER_Pos) /*!< 0x07000000 */
1257312575
#define TAMP_ATCR1_ATPER TAMP_ATCR1_ATPER_Msk

‎system/Drivers/CMSIS/Device/ST/STM32WBAxx/Include/stm32wba55xx.h‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ typedef enum
175175

176176
/** @} */ /* End of group Configuration_of_CMSIS */
177177

178-
#include <core_cm33.h> /*!< ARM Cortex-M33 processor and core peripherals */
178+
#include "core_cm33.h" /*!< ARM Cortex-M33 processor and core peripherals */
179179
#include "system_stm32wbaxx.h" /*!< system_stm32wbaxx System */
180180

181181

@@ -1287,12 +1287,13 @@ typedef struct
12871287
* Vector table. The function does not return on successful execution.
12881288
* @param HdpArea notifies which hdp area to close, can be a combination of
12891289
* hdpa area 1 and hdp area 2
1290-
* @param pointer on the vector table containing the reset handler the function
1290+
* @param VectorTableAddr pointer on the vector table containing the reset handler the function
12911291
* jumps to.
12921292
* @retval RSSLIB_RSS_ERROR on error on input parameter, otherwise does not return.
12931293
*/
12941294
typedef uint32_t ( *RSSLIB_S_CloseExitHDP_TypeDef)( uint32_t HdpArea, uint32_t VectorTableAddr );
12951295

1296+
12961297
/**
12971298
* @brief RSSLib non-secure callable function pointer structure
12981299
*/
@@ -1307,7 +1308,7 @@ typedef struct
13071308
typedef struct
13081309
{
13091310
__IM uint32_t Reserved2[2];
1310-
__IM RSSLIB_S_CloseExitHDP_TypeDef CloseExitHDP; /*!< RSSLIB Bootloader Close and exit HDP Address offset: 0x28 */
1311+
__IM RSSLIB_S_CloseExitHDP_TypeDef CloseExitHDP; /*!< RSSLIB Close and exit HDP Address offset: 0x28 */
13111312
}S_pFuncTypeDef;
13121313

13131314
/**
@@ -12581,11 +12582,12 @@ typedef struct
1258112582
#define TAMP_ATCR1_ATOSEL3_0 (0x1UL << TAMP_ATCR1_ATOSEL3_Pos) /*!< 0x00001000 */
1258212583
#define TAMP_ATCR1_ATOSEL3_1 (0x2UL << TAMP_ATCR1_ATOSEL3_Pos) /*!< 0x00002000 */
1258312584
#define TAMP_ATCR1_ATCKSEL_Pos (16U)
12584-
#define TAMP_ATCR1_ATCKSEL_Msk (0x7UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00070000 */
12585+
#define TAMP_ATCR1_ATCKSEL_Msk (0xFUL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x000F0000 */
1258512586
#define TAMP_ATCR1_ATCKSEL TAMP_ATCR1_ATCKSEL_Msk
1258612587
#define TAMP_ATCR1_ATCKSEL_0 (0x1UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00010000 */
1258712588
#define TAMP_ATCR1_ATCKSEL_1 (0x2UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00020000 */
1258812589
#define TAMP_ATCR1_ATCKSEL_2 (0x4UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00040000 */
12590+
#define TAMP_ATCR1_ATCKSEL_3 (0x8UL << TAMP_ATCR1_ATCKSEL_Pos) /*!< 0x00080000 */
1258912591
#define TAMP_ATCR1_ATPER_Pos (24U)
1259012592
#define TAMP_ATCR1_ATPER_Msk (0x7UL << TAMP_ATCR1_ATPER_Pos) /*!< 0x07000000 */
1259112593
#define TAMP_ATCR1_ATPER TAMP_ATCR1_ATPER_Msk

0 commit comments

Comments
 (0)