Skip to content

Commit e32b987

Browse files
GuentherMartinJonatanAntoni
authored andcommitted
Core: Align on CMSIS-Core version defines
1 parent b9979fe commit e32b987

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

CMSIS/Core/Include/cmsis_version.h

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,16 @@
2929
#ifndef __CMSIS_VERSION_H
3030
#define __CMSIS_VERSION_H
3131

32-
/* CMSIS Version definitions */
33-
#define __CM_CMSIS_VERSION_MAIN ( 5U) /*!< [31:16] CMSIS Core(M) main version */
34-
#define __CM_CMSIS_VERSION_SUB ( 6U) /*!< [15:0] CMSIS Core(M) sub version */
32+
/* CMSIS-Core(M) Version definitions */
33+
#define __CM_CMSIS_VERSION_MAIN ( 6U) /*!< \brief [31:16] CMSIS-Core(M) main version */
34+
#define __CM_CMSIS_VERSION_SUB ( 0U) /*!< \brief [15:0] CMSIS-Core(M) sub version */
3535
#define __CM_CMSIS_VERSION ((__CM_CMSIS_VERSION_MAIN << 16U) | \
36-
__CM_CMSIS_VERSION_SUB ) /*!< CMSIS Core(M) version number */
36+
__CM_CMSIS_VERSION_SUB ) /*!< \brief CMSIS Core(M) version number */
37+
38+
/* CMSIS-Core(A) Version definitions */
39+
#define __CA_CMSIS_VERSION_MAIN ( 6U) /*!< \brief [31:16] CMSIS-Core(A) main version */
40+
#define __CA_CMSIS_VERSION_SUB ( 0U) /*!< \brief [15:0] CMSIS-Core(A) sub version */
41+
#define __CA_CMSIS_VERSION ((__CA_CMSIS_VERSION_MAIN << 16U) | \
42+
__CA_CMSIS_VERSION_SUB ) /*!< \brief CMSIS-Core(A) version number */
43+
3744
#endif

0 commit comments

Comments
 (0)