Added prefix 'cmsis_generic_' to core independent files

CMSIS/Core/gcc.h → CMSIS/Core/cmsis_generic_gcc.h

@@ -23,7 +23,7 @@
  */
 
 #ifndef __CMSIS_GENERIC_GCC_H
-#define __CMSIS_GCC_H
+#define __CMSIS_GENERIC_GCC_H
 
 /* ignore some GCC warnings */
 #pragma GCC diagnostic push

CMSIS/Core/iccarm.h → CMSIS/Core/cmsis_generic_iccarm.h

@@ -25,7 +25,6 @@
 //
 //------------------------------------------------------------------------------
 
-
 #ifndef __CMSIS_GENERIC_ICCARM_H__
 #define __CMSIS_GENERIC_ICCARM_H__
 

CMSIS/Core/version.h → CMSIS/Core/cmsis_generic_version.h

@@ -28,8 +28,8 @@
   #pragma clang system_header   /* treat file as system include file */
 #endif
 
-#ifndef __CMSIS_VERSION_H
-#define __CMSIS_VERSION_H
+#ifndef __CMSIS_GENERIC_VERSION_H
+#define __CMSIS_GENERIC_VERSION_H
 
 /*  CMSIS Version definitions */
 #define __CM_CMSIS_VERSION_MAIN  ( 5U)                                      /*!< [31:16] CMSIS Core(A/R/M) main version */

CMSIS/Core_A/Include/cmsis_armcc.h

@@ -26,7 +26,7 @@
 #define __CMSIS_ARMCC_H
 
 // Include the generic settigs:
-#include "./../../Core/armcc.h"
+#include "./../../Core/cmsis_generic_armcc.h"
 
 
 /** \brief  Get CPSR (Current Program Status Register)

CMSIS/Core_A/Include/cmsis_armclang.h

@@ -30,7 +30,7 @@
 #pragma clang system_header   /* treat file as system include file */
 
 // Include the generic settigs:
-#include "./../../Core/armclang.h"
+#include "./../../Core/cmsis_generic_armclang.h"
 
 
 /* ###########################  Core Function Access  ########################### */

CMSIS/Core_A/Include/cmsis_compiler.h

@@ -25,7 +25,7 @@
 #ifndef __CMSIS_COMPILER_H
 #define __CMSIS_COMPILER_H
 
-#include "./../../Core/compiler.h"
+#include "./../../Core/cmsis_generic_compiler.h"
 
 #endif /* __CMSIS_COMPILER_H */
 

CMSIS/Core_A/Include/cmsis_gcc.h

@@ -26,7 +26,7 @@
 #define __CMSIS_GCC_H
 
 // Include the generic settigs:
-#include "./../../Core/gcc.h"
+#include "./../../Core/cmsis_generic_gcc.h"
 
 /* ignore some GCC warnings */
 #pragma GCC diagnostic push

CMSIS/Core_A/Include/cmsis_iccarm.h

@@ -30,7 +30,7 @@
 #define __CMSIS_ICCARM_H__
 
 // Include the generic settigs:
-#include "./../../Core/iccarm.h"
+#include "./../../Core/cmsis_generic_iccarm.h"
 
 #ifndef __ICCARM__
   #error This file should only be compiled by ICCARM

CMSIS/Core_A/Include/cmsis_version.h

@@ -0,0 +1,36 @@
+/**************************************************************************//**
+ * @file     cmsis_version.h
+ * @brief    CMSIS Core(M) Version definitions
+ * @version  V5.1.0
+ * @date     02. February 2022
+ ******************************************************************************/
+/*
+ * Copyright (c) 2009-2022 ARM Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the License); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if   defined ( __ICCARM__ )
+  #pragma system_include         /* treat file as system include file for MISRA check */
+#elif defined (__clang__)
+  #pragma clang system_header   /* treat file as system include file */
+#endif
+
+#ifndef __CMSIS_VERSION_H
+#define __CMSIS_VERSION_H
+
+#include "./../../Core/cmsis_generic_version.h"
+
+#endif

CMSIS/Core_M/Include/cmsis_armcc.h

@@ -26,7 +26,7 @@
 #define __CMSIS_ARMCC_H
 
 // Include the generic settigs:
-#include "./../../Core/armcc.h"
+#include "./../../Core/cmsis_generic_armcc.h"
 
 /* #########################  Startup and Lowlevel Init  ######################## */
 

CMSIS/Core_M/Include/cmsis_armclang.h

@@ -30,7 +30,7 @@
 #pragma clang system_header   /* treat file as system include file */
 
 // Include the generic settigs:
-#include "./../../Core/armclang.h"
+#include "./../../Core/cmsis_generic_armclang.h"
 
 /* #########################  Startup and Lowlevel Init  ######################## */
 

CMSIS/Core_M/Include/cmsis_armclang_ltm.h

@@ -30,7 +30,7 @@
 #pragma clang system_header   /* treat file as system include file */
 
 // Include the generic settigs:
-#include "./../../Core/armclang_ltm.h"
+#include "./../../Core/cmsis_generic_armclang_ltm.h"
 
 /* #########################  Startup and Lowlevel Init  ######################## */
 

CMSIS/Core_M/Include/cmsis_compiler.h

@@ -25,7 +25,7 @@
 #ifndef __CMSIS_COMPILER_H
 #define __CMSIS_COMPILER_H
 
-#include "./../../Core/compiler.h"
+#include "./../../Core/cmsis_generic_compiler.h"
 
 #endif /* __CMSIS_COMPILER_H */
 

CMSIS/Core_M/Include/cmsis_gcc.h

@@ -26,7 +26,7 @@
 #define __CMSIS_GCC_H
 
 // Include the generic settigs:
-#include "./../../Core/gcc.h"
+#include "./../../Core/cmsis_generic_gcc.h"
 
 /* ignore some GCC warnings */
 #pragma GCC diagnostic push

CMSIS/Core_M/Include/cmsis_iccarm.h

@@ -30,7 +30,7 @@
 #define __CMSIS_ICCARM_H__
 
 // Include the generic settigs:
-#include "./../../Core/iccarm.h"
+#include "./../../Core/cmsis_generic_iccarm.h"
 
 #ifndef __ICCARM__
   #error This file should only be compiled by ICCARM

CMSIS/Core_M/Include/cmsis_version.h

@@ -1,7 +1,7 @@
 /**************************************************************************//**
  * @file     cmsis_version.h
  * @brief    CMSIS Core(M) Version definitions
- * @version  V5.0.5
+ * @version  V5.1.0
  * @date     02. February 2022
  ******************************************************************************/
 /*
@@ -31,9 +31,6 @@
 #ifndef __CMSIS_VERSION_H
 #define __CMSIS_VERSION_H
 
-/*  CMSIS Version definitions */
-#define __CM_CMSIS_VERSION_MAIN  ( 5U)                                      /*!< [31:16] CMSIS Core(M) main version */
-#define __CM_CMSIS_VERSION_SUB   ( 6U)                                      /*!< [15:0]  CMSIS Core(M) sub version */
-#define __CM_CMSIS_VERSION       ((__CM_CMSIS_VERSION_MAIN << 16U) | \
-                                   __CM_CMSIS_VERSION_SUB           )       /*!< CMSIS Core(M) version number */
-#endif
+#include "./../../Core/cmsis_generic_version.h"
+
+#endif

CMSIS/Core_R/Include/cmsis_armcc.h

@@ -26,7 +26,7 @@
 #define __CMSIS_ARMCC_H
 
 // Include the generic settigs:
-#include "./../../Core/armcc.h"
+#include "./../../Core/cmsis_generic_armcc.h"
 
 
 

CMSIS/Core_R/Include/cmsis_armclang.h

@@ -28,6 +28,6 @@
 #pragma clang system_header   /* treat file as system include file */
 
 // Include the generic settigs:
-#include "./../../Core/armclang.h"
+#include "./../../Core/cmsis_generic_armclang.h"
 
 #endif /* __CMSIS_ARMCLANG_H */

CMSIS/Core_R/Include/cmsis_compiler.h

@@ -25,7 +25,7 @@
 #ifndef __CMSIS_COMPILER_H
 #define __CMSIS_COMPILER_H
 
-#include "./../../Core/compiler.h"
+#include "./../../Core/cmsis_generic_compiler.h"
 
 #endif /* __CMSIS_COMPILER_H */
 

CMSIS/Core_R/Include/cmsis_gcc.h

@@ -26,6 +26,6 @@
 #define __CMSIS_GCC_H
 
 // Include the generic settigs:
-#include "./../../Core/gcc.h"
+#include "./../../Core/cmsis_generic_gcc.h"
 
 #endif /* __CMSIS_GCC_H */

CMSIS/Core_R/Include/cmsis_iccarm.h

@@ -29,6 +29,6 @@
 #define __CMSIS_ICCARM_H__
 
 // Include the generic settigs:
-#include "./../../Core/iccarm.h"
+#include "./../../Core/cmsis_generic_iccarm.h"
 
 #endif /* __CMSIS_ICCARM_H__ */

CMSIS/Core_R/Include/cmsis_version.h

@@ -0,0 +1,36 @@
+/**************************************************************************//**
+ * @file     cmsis_version.h
+ * @brief    CMSIS Core(M) Version definitions
+ * @version  V5.1.0
+ * @date     02. February 2022
+ ******************************************************************************/
+/*
+ * Copyright (c) 2009-2022 ARM Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Licensed under the Apache License, Version 2.0 (the License); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#if   defined ( __ICCARM__ )
+  #pragma system_include         /* treat file as system include file for MISRA check */
+#elif defined (__clang__)
+  #pragma clang system_header   /* treat file as system include file */
+#endif
+
+#ifndef __CMSIS_VERSION_H
+#define __CMSIS_VERSION_H
+
+#include "./../../Core/cmsis_generic_version.h"
+
+#endif