Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ARM.CMSIS.pdsc
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@

<components>
<!-- CMSIS-Core component -->
<component Cclass="CMSIS" Cgroup="CORE" Cversion="6.2.0" condition="ARMv6_7_8-M Device" >
<component Cclass="CMSIS" Cgroup="CORE" Cversion="6.3.0" condition="ARMv6_7_8-M Device" >
<description>CMSIS-CORE for Cortex-M, SC000, SC300, Star-MC, ARMv8-M, ARMv8.1-M</description>
<files>
<!-- CPU independent -->
Expand All @@ -683,7 +683,7 @@
</files>
</component>

<component Cclass="CMSIS" Cgroup="CORE" Cversion="6.2.0" condition="ARMv7_8-A Device" >
<component Cclass="CMSIS" Cgroup="CORE" Cversion="6.3.0" condition="ARMv7_8-A Device" >
<description>CMSIS-CORE for Cortex-A</description>
<files>
<!-- CPU independent -->
Expand All @@ -692,7 +692,7 @@
</files>
</component>

<component Cclass="CMSIS" Cgroup="CORE" Cversion="6.1.0" condition="ARMv7-R Device" >
<component Cclass="CMSIS" Cgroup="CORE" Cversion="6.3.0" condition="ARMv7-R Device" >
<description>CMSIS-CORE for Cortex-R</description>
<files>
<!-- CPU independent -->
Expand Down
6 changes: 3 additions & 3 deletions CMSIS/Core/Include/cmsis_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@

/* CMSIS-Core(M) Version definitions */
#define __CM_CMSIS_VERSION_MAIN ( 6U) /*!< \brief [31:16] CMSIS-Core(M) main version */
#define __CM_CMSIS_VERSION_SUB ( 1U) /*!< \brief [15:0] CMSIS-Core(M) sub version */
#define __CM_CMSIS_VERSION_SUB ( 3U) /*!< \brief [15:0] CMSIS-Core(M) sub version */
#define __CM_CMSIS_VERSION ((__CM_CMSIS_VERSION_MAIN << 16U) | \
__CM_CMSIS_VERSION_SUB ) /*!< \brief CMSIS Core(M) version number */

/* CMSIS-Core(A) Version definitions */
#define __CA_CMSIS_VERSION_MAIN ( 6U) /*!< \brief [31:16] CMSIS-Core(A) main version */
#define __CA_CMSIS_VERSION_SUB ( 1U) /*!< \brief [15:0] CMSIS-Core(A) sub version */
#define __CA_CMSIS_VERSION_SUB ( 3U) /*!< \brief [15:0] CMSIS-Core(A) sub version */
#define __CA_CMSIS_VERSION ((__CA_CMSIS_VERSION_MAIN << 16U) | \
__CA_CMSIS_VERSION_SUB ) /*!< \brief CMSIS-Core(A) version number */

#define __CR_CMSIS_VERSION_MAIN (6U) /*!< \brief [31:16] CMSIS-Core(R) main version */
#define __CR_CMSIS_VERSION_SUB (0U) /*!< \brief [15:0] CMSIS-Core(R) sub version */
#define __CR_CMSIS_VERSION_SUB (3U) /*!< \brief [15:0] CMSIS-Core(R) sub version */
#define __CR_CMSIS_VERSION ((__CR_CMSIS_VERSION_MAIN << 16U) | \
__CR_CMSIS_VERSION_SUB ) /*!< \brief CMSIS-Core(R) version number */

Expand Down
2 changes: 1 addition & 1 deletion CMSIS/Documentation/Doxygen/Core/Core.dxy.in
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ PROJECT_NAME = "CMSIS-Core (Cortex-M)"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "Version 6.2.0"
PROJECT_NUMBER = "Version 6.3.0"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
8 changes: 8 additions & 0 deletions CMSIS/Documentation/Doxygen/Core/src/history.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ The table below provides information about the changes delivered with specific v
<th>Version</th>
<th>Description</th>
</tr>
<tr>
<td>V6.3.0</td>
<td>
<ul>
<li>Aligned version metadata for CMSIS-Core component to 6.3.0</li>
</ul>
</td>
</tr>
<tr>
<td>V6.2.0</td>
<td>
Expand Down
2 changes: 1 addition & 1 deletion CMSIS/Documentation/Doxygen/Core_A/Core_A.dxy.in
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ PROJECT_NAME = "CMSIS-Core (Cortex-A)"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "Version 6.2.0"
PROJECT_NUMBER = "Version 6.3.0"

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
8 changes: 8 additions & 0 deletions CMSIS/Documentation/Doxygen/Core_A/src/history.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ The table below provides information about the changes delivered with specific v
<th>Version</th>
<th>Description</th>
</tr>
<tr>
<td>V6.3.0</td>
<td>
<ul>
<li>Aligned version metadata for CMSIS-Core component to 6.3.0</li>
</ul>
</td>
</tr>
<tr>
<td>V6.1.1</td>
<td>
Expand Down
Loading