Skip to content

Commit 064947c

Browse files
fpistmfpistm
committed
[F2] Update STM32F2xx CMSIS to v2.2.2
Included in STM32CubeF2 FW V1.8.0 Signed-off-by: Frederic.Pillon <frederic.pillon@st.com>
1 parent a597c95 commit 064947c

File tree

13 files changed

+20277
-20317
lines changed

13 files changed

+20277
-20317
lines changed

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f205xx.h

Lines changed: 4854 additions & 4847 deletions
Large diffs are not rendered by default.

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f207xx.h

Lines changed: 5166 additions & 5159 deletions
Large diffs are not rendered by default.

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f215xx.h

Lines changed: 4923 additions & 4916 deletions
Large diffs are not rendered by default.

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f217xx.h

Lines changed: 5235 additions & 5228 deletions
Large diffs are not rendered by default.

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f2xx.h

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,29 +16,13 @@
1616
******************************************************************************
1717
* @attention
1818
*
19-
* <h2><center>&copy; COPYRIGHT(c) 2017 STMicroelectronics</center></h2>
19+
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
20+
* All rights reserved.</center></h2>
2021
*
21-
* Redistribution and use in source and binary forms, with or without modification,
22-
* are permitted provided that the following conditions are met:
23-
* 1. Redistributions of source code must retain the above copyright notice,
24-
* this list of conditions and the following disclaimer.
25-
* 2. Redistributions in binary form must reproduce the above copyright notice,
26-
* this list of conditions and the following disclaimer in the documentation
27-
* and/or other materials provided with the distribution.
28-
* 3. Neither the name of STMicroelectronics nor the names of its contributors
29-
* may be used to endorse or promote products derived from this software
30-
* without specific prior written permission.
31-
*
32-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
33-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
34-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
35-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
36-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
37-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
38-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
39-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
40-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
41-
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
22+
* This software component is licensed by ST under BSD 3-Clause license,
23+
* the "License"; You may not use this file except in compliance with the
24+
* License. You may obtain a copy of the License at:
25+
* opensource.org/licenses/BSD-3-Clause
4226
*
4327
******************************************************************************
4428
*/
@@ -97,11 +81,11 @@
9781
#endif /* USE_HAL_DRIVER */
9882

9983
/**
100-
* @brief CMSIS Device version number V2.2.1
84+
* @brief CMSIS Device version number V2.2.2
10185
*/
10286
#define __STM32F2xx_CMSIS_VERSION_MAIN (0x02U) /*!< [31:24] main version */
10387
#define __STM32F2xx_CMSIS_VERSION_SUB1 (0x02U) /*!< [23:16] sub1 version */
104-
#define __STM32F2xx_CMSIS_VERSION_SUB2 (0x01U) /*!< [15:8] sub2 version */
88+
#define __STM32F2xx_CMSIS_VERSION_SUB2 (0x02U) /*!< [15:8] sub2 version */
10589
#define __STM32F2xx_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
10690
#define __STM32F2xx_CMSIS_VERSION ((__STM32F2xx_CMSIS_VERSION_MAIN << 24)\
10791
|(__STM32F2xx_CMSIS_VERSION_SUB1 << 16)\
@@ -137,21 +121,21 @@
137121
*/
138122
typedef enum
139123
{
140-
RESET = 0,
124+
RESET = 0U,
141125
SET = !RESET
142126
} FlagStatus, ITStatus;
143127

144128
typedef enum
145129
{
146-
DISABLE = 0,
130+
DISABLE = 0U,
147131
ENABLE = !DISABLE
148132
} FunctionalState;
149133
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
150134

151135
typedef enum
152136
{
153-
ERROR = 0,
154-
SUCCESS = !ERROR
137+
SUCCESS = 0U,
138+
ERROR = !SUCCESS
155139
} ErrorStatus;
156140

157141
/**

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/system_stm32f2xx.h

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,20 @@
22
******************************************************************************
33
* @file system_stm32f2xx.h
44
* @author MCD Application Team
5-
* @brief CMSIS Cortex-M3 Device System Source File for STM32F2xx devices.
6-
******************************************************************************
5+
* @brief CMSIS Cortex-M3 Device System Source File for STM32F2xx devices.
6+
****************************************************************************
77
* @attention
88
*
9-
* <h2><center>&copy; COPYRIGHT(c) 2017 STMicroelectronics</center></h2>
9+
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
10+
* All rights reserved.</center></h2>
1011
*
11-
* Redistribution and use in source and binary forms, with or without modification,
12-
* are permitted provided that the following conditions are met:
13-
* 1. Redistributions of source code must retain the above copyright notice,
14-
* this list of conditions and the following disclaimer.
15-
* 2. Redistributions in binary form must reproduce the above copyright notice,
16-
* this list of conditions and the following disclaimer in the documentation
17-
* and/or other materials provided with the distribution.
18-
* 3. Neither the name of STMicroelectronics nor the names of its contributors
19-
* may be used to endorse or promote products derived from this software
20-
* without specific prior written permission.
12+
* This software component is licensed by ST under BSD 3-Clause license,
13+
* the "License"; You may not use this file except in compliance with the
14+
* License. You may obtain a copy of the License at:
15+
* opensource.org/licenses/BSD-3-Clause
2116
*
22-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
23-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
24-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
25-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
26-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
28-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
29-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
30-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
31-
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32-
*
33-
******************************************************************************
34-
*/
17+
******************************************************************************
18+
*/
3519

3620
/** @addtogroup CMSIS
3721
* @{

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Release_Notes.html

Lines changed: 46 additions & 2 deletions
Large diffs are not rendered by default.

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc/startup_stm32f205xx.s

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,13 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; COPYRIGHT 2017 STMicroelectronics</center></h2>
17+
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
18+
* All rights reserved.</center></h2>
1819
*
19-
* Redistribution and use in source and binary forms, with or without modification,
20-
* are permitted provided that the following conditions are met:
21-
* 1. Redistributions of source code must retain the above copyright notice,
22-
* this list of conditions and the following disclaimer.
23-
* 2. Redistributions in binary form must reproduce the above copyright notice,
24-
* this list of conditions and the following disclaimer in the documentation
25-
* and/or other materials provided with the distribution.
26-
* 3. Neither the name of STMicroelectronics nor the names of its contributors
27-
* may be used to endorse or promote products derived from this software
28-
* without specific prior written permission.
29-
*
30-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
31-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
32-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
33-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
34-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
35-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
36-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
37-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
38-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
39-
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
20+
* This software component is licensed by ST under BSD 3-Clause license,
21+
* the "License"; You may not use this file except in compliance with the
22+
* License. You may obtain a copy of the License at:
23+
* opensource.org/licenses/BSD-3-Clause
4024
*
4125
******************************************************************************
4226
*/

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc/startup_stm32f207xx.s

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,13 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; COPYRIGHT 2017 STMicroelectronics</center></h2>
17+
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
18+
* All rights reserved.</center></h2>
1819
*
19-
* Redistribution and use in source and binary forms, with or without modification,
20-
* are permitted provided that the following conditions are met:
21-
* 1. Redistributions of source code must retain the above copyright notice,
22-
* this list of conditions and the following disclaimer.
23-
* 2. Redistributions in binary form must reproduce the above copyright notice,
24-
* this list of conditions and the following disclaimer in the documentation
25-
* and/or other materials provided with the distribution.
26-
* 3. Neither the name of STMicroelectronics nor the names of its contributors
27-
* may be used to endorse or promote products derived from this software
28-
* without specific prior written permission.
29-
*
30-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
31-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
32-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
33-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
34-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
35-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
36-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
37-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
38-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
39-
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
20+
* This software component is licensed by ST under BSD 3-Clause license,
21+
* the "License"; You may not use this file except in compliance with the
22+
* License. You may obtain a copy of the License at:
23+
* opensource.org/licenses/BSD-3-Clause
4024
*
4125
******************************************************************************
4226
*/

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc/startup_stm32f215xx.s

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,13 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; COPYRIGHT 2017 STMicroelectronics</center></h2>
17+
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
18+
* All rights reserved.</center></h2>
1819
*
19-
* Redistribution and use in source and binary forms, with or without modification,
20-
* are permitted provided that the following conditions are met:
21-
* 1. Redistributions of source code must retain the above copyright notice,
22-
* this list of conditions and the following disclaimer.
23-
* 2. Redistributions in binary form must reproduce the above copyright notice,
24-
* this list of conditions and the following disclaimer in the documentation
25-
* and/or other materials provided with the distribution.
26-
* 3. Neither the name of STMicroelectronics nor the names of its contributors
27-
* may be used to endorse or promote products derived from this software
28-
* without specific prior written permission.
29-
*
30-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
31-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
32-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
33-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
34-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
35-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
36-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
37-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
38-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
39-
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
20+
* This software component is licensed by ST under BSD 3-Clause license,
21+
* the "License"; You may not use this file except in compliance with the
22+
* License. You may obtain a copy of the License at:
23+
* opensource.org/licenses/BSD-3-Clause
4024
*
4125
******************************************************************************
4226
*/

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc/startup_stm32f217xx.s

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,13 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; COPYRIGHT 2017 STMicroelectronics</center></h2>
17+
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
18+
* All rights reserved.</center></h2>
1819
*
19-
* Redistribution and use in source and binary forms, with or without modification,
20-
* are permitted provided that the following conditions are met:
21-
* 1. Redistributions of source code must retain the above copyright notice,
22-
* this list of conditions and the following disclaimer.
23-
* 2. Redistributions in binary form must reproduce the above copyright notice,
24-
* this list of conditions and the following disclaimer in the documentation
25-
* and/or other materials provided with the distribution.
26-
* 3. Neither the name of STMicroelectronics nor the names of its contributors
27-
* may be used to endorse or promote products derived from this software
28-
* without specific prior written permission.
29-
*
30-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
31-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
32-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
33-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
34-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
35-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
36-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
37-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
38-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
39-
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
20+
* This software component is licensed by ST under BSD 3-Clause license,
21+
* the "License"; You may not use this file except in compliance with the
22+
* License. You may obtain a copy of the License at:
23+
* opensource.org/licenses/BSD-3-Clause
4024
*
4125
******************************************************************************
4226
*/

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,13 @@
2121
******************************************************************************
2222
* @attention
2323
*
24-
* <h2><center>&copy; COPYRIGHT 2016 STMicroelectronics</center></h2>
24+
* <h2><center>&copy; Copyright (c) 2016 STMicroelectronics.
25+
* All rights reserved.</center></h2>
2526
*
26-
* Redistribution and use in source and binary forms, with or without modification,
27-
* are permitted provided that the following conditions are met:
28-
* 1. Redistributions of source code must retain the above copyright notice,
29-
* this list of conditions and the following disclaimer.
30-
* 2. Redistributions in binary form must reproduce the above copyright notice,
31-
* this list of conditions and the following disclaimer in the documentation
32-
* and/or other materials provided with the distribution.
33-
* 3. Neither the name of STMicroelectronics nor the names of its contributors
34-
* may be used to endorse or promote products derived from this software
35-
* without specific prior written permission.
36-
*
37-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
38-
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
39-
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
40-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
41-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
42-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
43-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
44-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
45-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
46-
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27+
* This software component is licensed by ST under BSD 3-Clause license,
28+
* the "License"; You may not use this file except in compliance with the
29+
* License. You may obtain a copy of the License at:
30+
* opensource.org/licenses/BSD-3-Clause
4731
*
4832
******************************************************************************
4933
*/

‎system/Drivers/CMSIS/Device/ST/STM32YYxx_CMSIS_version.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
* STM32F0: 2.3.3
44
* STM32F1: 4.3.0
5-
* STM32F2: 2.2.1
5+
* STM32F2: 2.2.2
66
* STM32F3: 2.3.3
77
* STM32F4: 2.6.3
88
* STM32F7: 1.2.4

0 commit comments

Comments
 (0)