Skip to content

Commit 933ae0a

Browse files
committed
Clean-up of General section
1 parent 4a4e39c commit 933ae0a

File tree

4 files changed

+20
-19
lines changed

4 files changed

+20
-19
lines changed

CMSIS/DoxyGen/General/general.dxy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@ HTML_EXTRA_STYLESHEET = ../Doxygen_Templates/cmsis.css
11381138

11391139
HTML_EXTRA_FILES = ../Doxygen_Templates/tabs.css \
11401140
../Doxygen_Templates/tab_topnav.png \
1141-
"../../../LICENSE" \
1141+
"../../../LICENSE.txt" \
11421142
../Doxygen_Templates/printComponentTabs.js
11431143

11441144
# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
Loading

CMSIS/DoxyGen/General/src/introduction.txt

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,28 @@ and middleware components. The CMSIS is intended to enable the combination of so
1414
from multiple middleware vendors.
1515

1616
CMSIS Version 5 supports also the <a class="el" href="http://www.arm.com/products/processors/instruction-set-architectures/armv8-m-architecture.php" target="_blank">ARMv8-M architecture</a>
17-
including <a class="el" href="http://www.arm.com/products/processors/technologies/trustzone/index.php" target="_blank">TrustZone&reg; for ARMv8-M</a> hardware security extensions.
17+
including <a class="el" href="http://www.arm.com/products/processors/technologies/trustzone/index.php" target="_blank">TrustZone&reg; for ARMv8-M</a> hardware security extensions and the
18+
<a class="el" href="http://www.arm.com/products/processors/cortex-m/cortex-m23-processor.php" target="_blank">Cortex-M23</a> and <a class="el" href="http://www.arm.com/products/processors/cortex-m/cortex-m33-processor.php" target="_blank">Cortex-M33</a> processors.
1819

1920
\anchor CM_Components
2021
The CMSIS components are:
21-
- <a href="../../Core/html/index.html"><b>CMSIS-CORE</b></a>: API for the Cortex-M processor core and peripherals. It provides a standardized interface for Cortex-M0, Cortex-M3, Cortex-M4, Cortex-M7, SC000, and SC300.
22-
Also included are SIMD intrinsic functions for Cortex-M4 and Cortex-M7 SIMD instructions.
23-
22+
- <a href="../../Core/html/index.html"><b>CMSIS-CORE</b></a>: API for the Cortex-M processor core and peripherals.
23+
It provides a standardized interface for Cortex-M0, Cortex-M0+, Cortex-M3, Cortex-M4, Cortex-M7, Cortex-M23, Cortex-M33, SC000, and SC300.
24+
Also included are SIMD intrinsic functions for Cortex-M4, Cortex-M7, and Cortex-M33 SIMD instructions.
25+
2426
- <a href="../../Driver/html/index.html"><b>CMSIS-Driver</b></a>: defines generic peripheral driver interfaces for middleware making it reusable across supported devices. The API is RTOS independent
2527
and connects microcontroller peripherals with middleware that implements for example communication stacks, file systems, or graphic user interfaces.
2628

2729
- <a href="../../DSP/html/index.html"><b>CMSIS-DSP</b></a>: DSP Library Collection with over 60 Functions for various data types: fixed-point (fractional q7, q15, q31) and single precision floating-point (32-bit).
28-
The library is available for all Cortex-M cores. The Cortex-M4 and Cortex-M7 implementations are optimized for the SIMD instruction set.
29-
30+
The library is available for all Cortex-M cores. Implementations that are optimized for the SIMD instruction set are available for Cortex-M4, Cortex-M7, and Cortex-M33.
31+
32+
3033
- <a href="../../RTOS/html/index.html"><b>CMSIS-RTOS v1</b></a>: Common API for Real-Time Operating Systems along with reference implementation based on RTX.
3134
It provides a standardized programming interface that is portable to many RTOS and enables software components that can work across multiple RTOS systems.
32-
35+
3336
- <a href="../../RTOS2/html/index.html"><b>CMSIS-RTOS v2</b></a>: extends CMSIS-RTOS v1 with support for ARMv8-M architecture, dynamic object creation,
3437
provisions for multi-core systems, and binary compatible interface across ABI compliant compilers.
35-
38+
3639
- <a href="../../Pack/html/index.html"><b>CMSIS-Pack</b></a>: describes with an XML-based package description (PDSC) file the user and device relevant parts of a file collection (called a software pack) that includes source, header and library files, documentation,
3740
Flash programming algorithms, source code templates, and example projects. Development tools and web infrastructures use the PDSC file to extract device parameters,
3841
software components, and evaluation board configurations.
@@ -121,7 +124,7 @@ with C language standards, specifically warnings that may be generated by the va
121124
\section License Licence
122125

123126
The CMSIS is provided free of charge by ARM under Apache 2.0 license.
124-
View the <a href="LICENSE">Apache 2.0 License</a>.
127+
View the <a href="LICENSE.txt">Apache 2.0 License</a>.
125128

126129

127130
\section CM_Pack_Content ARM::CMSIS Pack
@@ -130,29 +133,27 @@ The <b>ARM::CMSIS</b> Pack contains the following:
130133

131134
File/Directory |Content
132135
:-----------------|:---------------------------------------------------------------------------------
133-
\b ARM.CMSIS.pdsc |Package description file
136+
\b ARM.CMSIS.pdsc |Package description file in CMSIS-Pack format.
137+
\b LICENSE.txt |CMSIS License Agreement (Apache 2.0)
134138
\b CMSIS |\ref CM_Components "CMSIS components" (see below)
135-
\b Device |ARM reference implementations of Cortex-M devices
139+
\b Device |CMSIS reference implementations of ARM Cortex-M processor based devices
136140

137141
CMSIS Directory
138142
---------------
139143

140-
The directory <b>CMSIS</b> contains the "CMSIS End User License Agreement" as PDF and RTF, a README text file, the
141-
index.html file for this documentation, and the following sub-directories:
142-
143144
Directory |Content
144145
:-------------------------|:----------------------------------------------------------------------------------------------------------------------------------------
145146
\b Documentation |This documentation
147+
\b Core |User code templates for Core related files, referenced in ARM.CMSIS.PDSC
146148
\b DAP |<a href="../../DAP/html/index.html"><b>CMSIS-DAP</b></a> Debug Access Port source code and reference implementations
147149
\b Driver |Header files for the <a href="../../Driver/html/index.html"><b>CMSIS-Driver</b></a> peripheral interface API
148150
\b DSP_Lib |<a href="../../DSP/html/index.html"><b>CMSIS-DSP</b></a> software library source code
149151
\b Include |Include files for <a href="../../Core/html/index.html"><b>CMSIS-CORE</b></a> and <a href="../../DSP/html/index.html"><b>CMSIS-DSP</b></a>
150152
\b Lib |<a href="../../DSP/html/index.html"><b>CMSIS-DSP</b></a> generated libraries for ARMCC and GCC
151153
\b Pack |<a href="../../Pack/html/pack_Example.html"><b>CMSIS-Pack</b></a> example
152-
\b RTOS |<a href="../../RTOS/html/index.html"><b>CMSIS-RTOS API Version 1</b></a> along with RTX reference implementation
154+
\b RTOS |<a href="../../RTOS/html/index.html"><b>CMSIS-RTOS Version 1</b></a> along with RTX reference implementation
153155
\b RTOS2 |<a href="../../RTOS/html/index.html"><b>CMSIS-RTOS Version 2</b></a> along with RTX reference implementation
154156
\b SVD |<a href="../../SVD/html/index.html"><b>CMSIS-SVD</b></a> example
155-
\b UserCodeTemplates\\ARM |ITM_Retarget.c, CMSIS <a href="../../Core/html/group__ITM__Debug__gr.html"><b>retarget output</b></a> to ITM Channel 0 template file
156157
\b Utilities |PACK.xsd (<a href="../../Pack/html/pack_Example.html"><b>CMSIS-Pack</b></a> schema file), PackChk.exe (checking tool for software packs), \n CMSIS-SVD.xsd (<a href="../../SVD/html/index.html"><b>CMSIS-SVD</b></a> schema file), SVDConv.exe (conversion tool for SVD files)
157158

158159
<hr>
@@ -186,8 +187,8 @@ In addition, each CMSIS component has its own release history:
186187
<td>5.0.0</td>
187188
<td>
188189
Added <a href="http://www.arm.com/products/processors/instruction-set-architectures/armv8-m-architecture.php" target="_blank"><b>ARMv8-M architecture</b></a> support.
189-
- CMSIS-CORE 5.0.0
190-
- CMSIS-RTOS 2.0.0
190+
- CMSIS-CORE 5.0.0 adding support for ARMv8-M and Cortex-M23, Cortex-M33 processors
191+
- CMSIS-RTOS 2.0.0 new API with RTX 5.0.0 reference implementation
191192
- CMSIS-PACK 1.4.4 introducing CPDSC project description
192193
</td>
193194
</tr>

LICENSE renamed to LICENSE.txt

File renamed without changes.

0 commit comments

Comments
 (0)