diff --git a/CMSIS/Core_A/Include/armv7a.h b/CMSIS/Core/Include/armv7a.h similarity index 99% rename from CMSIS/Core_A/Include/armv7a.h rename to CMSIS/Core/Include/armv7a.h index 4da3df0a7..6d0bd9b68 100644 --- a/CMSIS/Core_A/Include/armv7a.h +++ b/CMSIS/Core/Include/armv7a.h @@ -738,7 +738,7 @@ typedef struct #endif #if (__GIC_PRESENT == 1U) || defined(DOXYGEN) - #include "../../Core/gic_v20.h" + #include "gic_v20.h" #endif /* (__GIC_PRESENT == 1U) || defined(DOXYGEN) */ #if (__TIM_PRESENT == 1U) || defined(DOXYGEN) diff --git a/CMSIS/Core_A/Include/cmsis_cp15.h b/CMSIS/Core/Include/armv7a_cp15.h similarity index 99% rename from CMSIS/Core_A/Include/cmsis_cp15.h rename to CMSIS/Core/Include/armv7a_cp15.h index 4e8aae5c8..201bb9685 100644 --- a/CMSIS/Core_A/Include/cmsis_cp15.h +++ b/CMSIS/Core/Include/armv7a_cp15.h @@ -1,5 +1,5 @@ /**************************************************************************//** - * @file cmsis_cp15.h + * @file armv7a_cp15.h * @brief CMSIS compiler specific macros, functions, instructions * @version V1.0.2 * @date 19. December 2022 diff --git a/CMSIS/Core_R/Include/armv7r.h b/CMSIS/Core/Include/armv7r.h similarity index 98% rename from CMSIS/Core_R/Include/armv7r.h rename to CMSIS/Core/Include/armv7r.h index ba8dfc806..ac62493f5 100644 --- a/CMSIS/Core_R/Include/armv7r.h +++ b/CMSIS/Core/Include/armv7r.h @@ -147,6 +147,15 @@ #warning "__VIC_PRESENT not defined in device header file; using default!" #endif + #ifndef __GIC_PRESENT + #define __GIC_PRESENT 1U + #warning "__GIC_PRESENT not defined in device header file; using default!" + #endif + + #if (__GIC_PRESENT == 1U) && (__VIC_PRESENT == 1U) + #error "Only one Interrupt Controller can be used" + #endif + #ifndef __MPU_PRESENT #define __MPU_PRESENT 0U #warning "__MPU_PRESENT not defined in device header file; using default!" @@ -450,13 +459,9 @@ typedef union #endif /* (__VIC_PRESENT == 1U) || defined(DOXYGEN) */ #if (__GIC_PRESENT == 1U) || defined(DOXYGEN) - #include "../../Core/gic_v20.h" + #include "gic_v20.h" #endif /* (__GIC_PRESENT == 1U) || defined(DOXYGEN) */ -#if (__GIC_PRESENT == 1U) && (__VIC_PRESENT == 1U) - #error "Only one Interrupt Controller can be used" -#endif - #ifdef __cplusplus } #endif diff --git a/CMSIS/Core_A/Include/armv8a.h b/CMSIS/Core/Include/armv8a.h similarity index 100% rename from CMSIS/Core_A/Include/armv8a.h rename to CMSIS/Core/Include/armv8a.h diff --git a/CMSIS/Core_R/Include/armv8r.h b/CMSIS/Core/Include/armv8r.h similarity index 100% rename from CMSIS/Core_R/Include/armv8r.h rename to CMSIS/Core/Include/armv8r.h diff --git a/CMSIS/Core_M/Include/cachel1_armv7.h b/CMSIS/Core/Include/cachel1_armv7.h similarity index 100% rename from CMSIS/Core_M/Include/cachel1_armv7.h rename to CMSIS/Core/Include/cachel1_armv7.h diff --git a/CMSIS/Core/cmsis_generic_compiler.h b/CMSIS/Core/Include/cmsis_compiler.h similarity index 87% rename from CMSIS/Core/cmsis_generic_compiler.h rename to CMSIS/Core/Include/cmsis_compiler.h index c897a0c6e..64103b32f 100644 --- a/CMSIS/Core/cmsis_generic_compiler.h +++ b/CMSIS/Core/Include/cmsis_compiler.h @@ -31,38 +31,86 @@ * Arm Compiler 4/5 */ #if defined ( __CC_ARM ) - #include "cmsis_armcc.h" + #if defined __CORTEX_A + #include "cmsis_cortexa_armcc.h" + #elif defined __CORTEX_R + #include "cmsis_cortexr_armcc.h" + #elif defined __CORTEX_M + #include "cmsis_cortexm_armcc.h" + #else + #error "Unknown architecture" + #endif /* * Arm Compiler 6.6 LTM (armclang) */ #elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) && (__ARMCC_VERSION < 6100100) - #include "cmsis_armclang_ltm.h" + #if defined __CORTEX_A + #error "Core-R is not supported for this compiler" + #elif defined __CORTEX_R + #error "Core-R is not supported for this compiler" + #elif defined __CORTEX_M + #include "cmsis_corem_armclang_ltm.h" + #else + #error "Unknown architecture" + #endif /* * Arm Compiler above 6.10.1 (armclang) */ #elif defined (__ARMCC_VERSION) && (__ARMCC_VERSION >= 6100100) - #include "cmsis_armclang.h" + #if defined __CORTEX_A + #include "cmsis_corema_armclang.h" + #elif defined __CORTEX_R + #include "cmsis_corer_armclang.h" + #elif defined __CORTEX_M + #include "cmsis_corem_armclang.h" + #else + #error "Unknown architecture" + #endif /* * TI Arm Clang Compiler (tiarmclang) */ #elif defined (__ti__) - #include "cmsis_tiarmclang.h" + #if defined __CORTEX_A + #error "Core-R is not supported for this compiler" + #elif defined __CORTEX_R + #error "Core-R is not supported for this compiler" + #elif defined __CORTEX_M + #include "cmsis_corem_tiarmclang.h" + #else + #error "Unknown architecture" + #endif /* * GNU Compiler */ #elif defined ( __GNUC__ ) - #include "cmsis_gcc.h" + #if defined __CORTEX_A + #include "cmsis_corea_gcc.h" + #elif defined __CORTEX_R + #include "cmsis_corer_gcc.h" + #elif defined __CORTEX_M + #include "cmsis_corem_gcc.h" + #else + #error "Unknown architecture" + #endif /* * IAR Compiler */ #elif defined ( __ICCARM__ ) - #include + #if defined __CORTEX_A + #include "cmsis_corea_iccarm.h" + #elif defined __CORTEX_R + #include "cmsis_corer_iccarm.h" + #elif defined __CORTEX_M + #include "cmsis_corem_iccarm.h" + #else + #error "Unknown architecture" + #endif /* diff --git a/CMSIS/Core_A/Include/cmsis_armcc.h b/CMSIS/Core/Include/cmsis_corea_armcc.h similarity index 98% rename from CMSIS/Core_A/Include/cmsis_armcc.h rename to CMSIS/Core/Include/cmsis_corea_armcc.h index 1e1a9b56c..925ec2a18 100644 --- a/CMSIS/Core_A/Include/cmsis_armcc.h +++ b/CMSIS/Core/Include/cmsis_corea_armcc.h @@ -26,7 +26,7 @@ #define __CMSIS_ARMCC_H // Include the generic settigs: -#include "../../Core/cmsis_generic_armcc.h" +#include "cmsis_generic_armcc.h" /** \brief Get CPSR (Current Program Status Register) @@ -162,7 +162,7 @@ __STATIC_INLINE void __set_FPEXC(uint32_t fpexc) __ASM volatile("MCRR p" # cp ", " # op1 ", ltmp, htmp, c" # CRm); \ } while(0) -#include "cmsis_cp15.h" +#include "armv7a_cp15.h" /** \brief Enable Floating Point Unit diff --git a/CMSIS/Core_A/Include/cmsis_armclang.h b/CMSIS/Core/Include/cmsis_corea_armclang.h similarity index 99% rename from CMSIS/Core_A/Include/cmsis_armclang.h rename to CMSIS/Core/Include/cmsis_corea_armclang.h index 5d91e4cbf..f9ac6f294 100644 --- a/CMSIS/Core_A/Include/cmsis_armclang.h +++ b/CMSIS/Core/Include/cmsis_corea_armclang.h @@ -30,7 +30,7 @@ #pragma clang system_header /* treat file as system include file */ // Include the generic settigs: -#include "../../Core/cmsis_generic_armclang.h" +#include "cmsis_generic_armclang.h" /* ########################### Core Function Access ########################### */ @@ -157,7 +157,7 @@ __STATIC_FORCEINLINE void __set_FPEXC(uint32_t fpexc) #define __get_CP64(cp, op1, Rt, CRm) __ASM volatile("MRRC p" # cp ", " # op1 ", %Q0, %R0, c" # CRm : "=r" (Rt) : : "memory" ) #define __set_CP64(cp, op1, Rt, CRm) __ASM volatile("MCRR p" # cp ", " # op1 ", %Q0, %R0, c" # CRm : : "r" (Rt) : "memory" ) -#include "cmsis_cp15.h" +#include "armv7a_cp15.h" /** \brief Enable Floating Point Unit diff --git a/CMSIS/Core_A/Include/cmsis_gcc.h b/CMSIS/Core/Include/cmsis_corea_gcc.h similarity index 99% rename from CMSIS/Core_A/Include/cmsis_gcc.h rename to CMSIS/Core/Include/cmsis_corea_gcc.h index fc3a76b36..a093c8f52 100644 --- a/CMSIS/Core_A/Include/cmsis_gcc.h +++ b/CMSIS/Core/Include/cmsis_corea_gcc.h @@ -26,7 +26,7 @@ #define __CMSIS_GCC_H // Include the generic settigs: -#include "../../Core/cmsis_generic_gcc.h" +#include "cmsis_generic_gcc.h" /* ignore some GCC warnings */ #pragma GCC diagnostic push @@ -266,7 +266,7 @@ __STATIC_FORCEINLINE void __set_FPEXC(uint32_t fpexc) #define __get_CP64(cp, op1, Rt, CRm) __ASM volatile("MRRC p" # cp ", " # op1 ", %Q0, %R0, c" # CRm : "=r" (Rt) : : "memory" ) #define __set_CP64(cp, op1, Rt, CRm) __ASM volatile("MCRR p" # cp ", " # op1 ", %Q0, %R0, c" # CRm : : "r" (Rt) : "memory" ) -#include "cmsis_cp15.h" +#include "armv7a_cp15.h" /** \brief Enable Floating Point Unit diff --git a/CMSIS/Core_A/Include/cmsis_iccarm.h b/CMSIS/Core/Include/cmsis_corea_iccarm.h similarity index 98% rename from CMSIS/Core_A/Include/cmsis_iccarm.h rename to CMSIS/Core/Include/cmsis_corea_iccarm.h index dee43c605..d221c285a 100644 --- a/CMSIS/Core_A/Include/cmsis_iccarm.h +++ b/CMSIS/Core/Include/cmsis_corea_iccarm.h @@ -30,7 +30,7 @@ #define __CMSIS_ICCARM_H__ // Include the generic settigs: -#include "../../Core/cmsis_generic_iccarm.h" +#include "cmsis_generic_iccarm.h" #ifndef __ICCARM__ #error This file should only be compiled by ICCARM @@ -75,7 +75,7 @@ #define __set_CP64(cp, op1, Rt, CRm) \ __ASM volatile("MCRR p" # cp ", " # op1 ", %Q0, %R0, c" # CRm : : "r" (Rt) : "memory" ) - #include "cmsis_cp15.h" + #include "armv7a_cp15.h" #if !((defined (__FPU_PRESENT) && (__FPU_PRESENT == 1U))) @@ -160,7 +160,7 @@ #define __set_CP64(cp, op1, Rt, CRm) \ __ASM volatile("MCRR p" # cp ", " # op1 ", %Q0, %R0, c" # CRm : : "r" (Rt) : "memory" ) - #include "cmsis_cp15.h" + #include "armv7a_cp15.h" #endif /* __ICCARM_INTRINSICS_VERSION__ == 2 */ diff --git a/CMSIS/Core_M/Include/cmsis_armcc.h b/CMSIS/Core/Include/cmsis_corem_armcc.h similarity index 99% rename from CMSIS/Core_M/Include/cmsis_armcc.h rename to CMSIS/Core/Include/cmsis_corem_armcc.h index 97ec457dc..18c0f7dbc 100644 --- a/CMSIS/Core_M/Include/cmsis_armcc.h +++ b/CMSIS/Core/Include/cmsis_corem_armcc.h @@ -26,7 +26,7 @@ #define __CMSIS_ARMCC_H // Include the generic settigs: -#include "../../Core/cmsis_generic_armcc.h" +#include "cmsis_generic_armcc.h" /* ######################### Startup and Lowlevel Init ######################## */ diff --git a/CMSIS/Core_M/Include/cmsis_armclang.h b/CMSIS/Core/Include/cmsis_corem_armclang.h similarity index 99% rename from CMSIS/Core_M/Include/cmsis_armclang.h rename to CMSIS/Core/Include/cmsis_corem_armclang.h index 75eb34e9b..e32b12fb7 100644 --- a/CMSIS/Core_M/Include/cmsis_armclang.h +++ b/CMSIS/Core/Include/cmsis_corem_armclang.h @@ -30,7 +30,7 @@ #pragma clang system_header /* treat file as system include file */ // Include the generic settigs: -#include "../../Core/cmsis_generic_armclang.h" +#include "cmsis_generic_armclang.h" /* ######################### Startup and Lowlevel Init ######################## */ diff --git a/CMSIS/Core_M/Include/cmsis_armclang_ltm.h b/CMSIS/Core/Include/cmsis_corem_armclang_ltm.h similarity index 99% rename from CMSIS/Core_M/Include/cmsis_armclang_ltm.h rename to CMSIS/Core/Include/cmsis_corem_armclang_ltm.h index a8f405c01..a1ce92403 100644 --- a/CMSIS/Core_M/Include/cmsis_armclang_ltm.h +++ b/CMSIS/Core/Include/cmsis_corem_armclang_ltm.h @@ -30,7 +30,7 @@ #pragma clang system_header /* treat file as system include file */ // Include the generic settigs: -#include "../../Core/cmsis_generic_armclang_ltm.h" +#include "cmsis_generic_armclang_ltm.h" /* ######################### Startup and Lowlevel Init ######################## */ diff --git a/CMSIS/Core_M/Include/cmsis_gcc.h b/CMSIS/Core/Include/cmsis_corem_gcc.h similarity index 99% rename from CMSIS/Core_M/Include/cmsis_gcc.h rename to CMSIS/Core/Include/cmsis_corem_gcc.h index 197826069..4d3d3b544 100644 --- a/CMSIS/Core_M/Include/cmsis_gcc.h +++ b/CMSIS/Core/Include/cmsis_corem_gcc.h @@ -26,7 +26,7 @@ #define __CMSIS_GCC_H // Include the generic settigs: -#include "../../Core/cmsis_generic_gcc.h" +#include "cmsis_generic_gcc.h" /* ignore some GCC warnings */ #pragma GCC diagnostic push diff --git a/CMSIS/Core_M/Include/cmsis_iccarm.h b/CMSIS/Core/Include/cmsis_corem_iccarm.h similarity index 99% rename from CMSIS/Core_M/Include/cmsis_iccarm.h rename to CMSIS/Core/Include/cmsis_corem_iccarm.h index 44211c261..b64a259b6 100644 --- a/CMSIS/Core_M/Include/cmsis_iccarm.h +++ b/CMSIS/Core/Include/cmsis_corem_iccarm.h @@ -30,7 +30,7 @@ #define __CMSIS_ICCARM_H__ // Include the generic settigs: -#include "../../Core/cmsis_generic_iccarm.h" +#include "cmsis_generic_iccarm.h" #ifndef __ICCARM__ #error This file should only be compiled by ICCARM diff --git a/CMSIS/Core_M/Include/cmsis_tiarmclang.h b/CMSIS/Core/Include/cmsis_corem_tiarmclang.h similarity index 100% rename from CMSIS/Core_M/Include/cmsis_tiarmclang.h rename to CMSIS/Core/Include/cmsis_corem_tiarmclang.h diff --git a/CMSIS/Core_R/Include/cmsis_armcc.h b/CMSIS/Core/Include/cmsis_corer_armcc.h similarity index 76% rename from CMSIS/Core_R/Include/cmsis_armcc.h rename to CMSIS/Core/Include/cmsis_corer_armcc.h index 358ed9c79..96c14d40c 100644 --- a/CMSIS/Core_R/Include/cmsis_armcc.h +++ b/CMSIS/Core/Include/cmsis_corer_armcc.h @@ -26,8 +26,26 @@ #define __CMSIS_ARMCC_H // Include the generic settigs: -#include "../../Core/cmsis_generic_armcc.h" +#include "cmsis_generic_armcc.h" +/** \brief Get Stack Pointer + \return Stack Pointer + */ +__STATIC_INLINE __ASM uint32_t __get_SP(void) +{ + MOV r0, sp + BX lr +} + +/** \brief Set Stack Pointer + \param [in] stack Stack Pointer value to set + */ +__STATIC_INLINE __ASM void __set_SP(uint32_t stack) +{ + MOV sp, r0 + BX lr +} + #endif /* __CMSIS_ARMCC_H */ diff --git a/CMSIS/Core_R/Include/cmsis_armclang.h b/CMSIS/Core/Include/cmsis_corer_armclang.h similarity index 71% rename from CMSIS/Core_R/Include/cmsis_armclang.h rename to CMSIS/Core/Include/cmsis_corer_armclang.h index 34efbd48d..8865340db 100644 --- a/CMSIS/Core_R/Include/cmsis_armclang.h +++ b/CMSIS/Core/Include/cmsis_corer_armclang.h @@ -28,6 +28,26 @@ #pragma clang system_header /* treat file as system include file */ // Include the generic settigs: -#include "../../Core/cmsis_generic_armclang.h" +#include "cmsis_generic_armclang.h" + + +/** \brief Get Stack Pointer + \return Stack Pointer value + */ +__STATIC_FORCEINLINE uint32_t __get_SP(void) +{ + uint32_t result; + __ASM volatile("MOV %0, sp" : "=r" (result) : : "memory"); + return result; +} + +/** \brief Set Stack Pointer + \param [in] stack Stack Pointer value to set + */ +__STATIC_FORCEINLINE void __set_SP(uint32_t stack) +{ + __ASM volatile("MOV sp, %0" : : "r" (stack) : "memory"); +} + #endif /* __CMSIS_ARMCLANG_H */ diff --git a/CMSIS/Core/Include/cmsis_corer_gcc.h b/CMSIS/Core/Include/cmsis_corer_gcc.h new file mode 100644 index 000000000..6bda9b87c --- /dev/null +++ b/CMSIS/Core/Include/cmsis_corer_gcc.h @@ -0,0 +1,99 @@ +/**************************************************************************//** + * @file cmsis_gcc.h + * @brief CMSIS compiler GCC header file + * @version V5.0.0 + * @date 04. December 2022 + ******************************************************************************/ +/* + * Copyright (c) 2009-2023 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. + */ + +#ifndef __CMSIS_GCC_H +#define __CMSIS_GCC_H + +// Include the generic settigs: +#include "cmsis_generic_gcc.h" + +/* ignore some GCC warnings */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wsign-conversion" +#pragma GCC diagnostic ignored "-Wconversion" +#pragma GCC diagnostic ignored "-Wunused-parameter" + + +/** \defgroup CMSIS_Core_intrinsics CMSIS Core Intrinsics + Access to dedicated SIMD instructions + @{ +*/ +/** \brief Get CPSR Register + \return CPSR Register value + */ +__STATIC_FORCEINLINE uint32_t __get_CPSR(void) +{ + uint32_t result; + __ASM volatile("MRS %0, cpsr" : "=r" (result) ); + return(result); +} + +/** \brief Set CPSR Register + \param [in] cpsr CPSR value to set + */ +__STATIC_FORCEINLINE void __set_CPSR(uint32_t cpsr) +{ + __ASM volatile ("MSR cpsr, %0" : : "r" (cpsr) : "cc", "memory"); +} + +/** \brief Get Mode + \return Processor Mode + */ +__STATIC_FORCEINLINE uint32_t __get_mode(void) +{ + return (__get_CPSR() & 0x1FU); +} + +/** \brief Set Mode + \param [in] mode Mode value to set + */ +__STATIC_FORCEINLINE void __set_mode(uint32_t mode) +{ + __ASM volatile("MSR cpsr_c, %0" : : "r" (mode) : "memory"); +} + +/** \brief Get Stack Pointer + \return Stack Pointer value + */ +__STATIC_FORCEINLINE uint32_t __get_SP(void) +{ + uint32_t result; + __ASM volatile("MOV %0, sp" : "=r" (result) : : "memory"); + return result; +} + +/** \brief Set Stack Pointer + \param [in] stack Stack Pointer value to set + */ +__STATIC_FORCEINLINE void __set_SP(uint32_t stack) +{ + __ASM volatile("MOV sp, %0" : : "r" (stack) : "memory"); +} + + +/*@} end of group CMSIS_Core_intrinsics */ + +#pragma GCC diagnostic pop + +#endif /* __CMSIS_GCC_H */ diff --git a/CMSIS/Core_R/Include/cmsis_iccarm.h b/CMSIS/Core/Include/cmsis_corer_iccarm.h similarity index 96% rename from CMSIS/Core_R/Include/cmsis_iccarm.h rename to CMSIS/Core/Include/cmsis_corer_iccarm.h index 1975e1f3e..5f32ce16b 100644 --- a/CMSIS/Core_R/Include/cmsis_iccarm.h +++ b/CMSIS/Core/Include/cmsis_corer_iccarm.h @@ -29,6 +29,6 @@ #define __CMSIS_ICCARM_H__ // Include the generic settigs: -#include "../../Core/cmsis_generic_iccarm.h" +#include "cmsis_generic_iccarm.h" #endif /* __CMSIS_ICCARM_H__ */ diff --git a/CMSIS/Core/cmsis_generic_armcc.h b/CMSIS/Core/Include/cmsis_generic_armcc.h similarity index 100% rename from CMSIS/Core/cmsis_generic_armcc.h rename to CMSIS/Core/Include/cmsis_generic_armcc.h diff --git a/CMSIS/Core/cmsis_generic_armclang.h b/CMSIS/Core/Include/cmsis_generic_armclang.h similarity index 100% rename from CMSIS/Core/cmsis_generic_armclang.h rename to CMSIS/Core/Include/cmsis_generic_armclang.h diff --git a/CMSIS/Core/cmsis_generic_armclang_ltm.h b/CMSIS/Core/Include/cmsis_generic_armclang_ltm.h similarity index 100% rename from CMSIS/Core/cmsis_generic_armclang_ltm.h rename to CMSIS/Core/Include/cmsis_generic_armclang_ltm.h diff --git a/CMSIS/Core/cmsis_generic_gcc.h b/CMSIS/Core/Include/cmsis_generic_gcc.h similarity index 100% rename from CMSIS/Core/cmsis_generic_gcc.h rename to CMSIS/Core/Include/cmsis_generic_gcc.h diff --git a/CMSIS/Core/cmsis_generic_iccarm.h b/CMSIS/Core/Include/cmsis_generic_iccarm.h similarity index 100% rename from CMSIS/Core/cmsis_generic_iccarm.h rename to CMSIS/Core/Include/cmsis_generic_iccarm.h diff --git a/CMSIS/Core/cmsis_version.h b/CMSIS/Core/Include/cmsis_version.h similarity index 100% rename from CMSIS/Core/cmsis_version.h rename to CMSIS/Core/Include/cmsis_version.h diff --git a/CMSIS/Core_M/Include/core_armv81mml.h b/CMSIS/Core/Include/core_armv81mml.h similarity index 100% rename from CMSIS/Core_M/Include/core_armv81mml.h rename to CMSIS/Core/Include/core_armv81mml.h diff --git a/CMSIS/Core_M/Include/core_armv8mbl.h b/CMSIS/Core/Include/core_armv8mbl.h similarity index 100% rename from CMSIS/Core_M/Include/core_armv8mbl.h rename to CMSIS/Core/Include/core_armv8mbl.h diff --git a/CMSIS/Core_M/Include/core_armv8mml.h b/CMSIS/Core/Include/core_armv8mml.h similarity index 100% rename from CMSIS/Core_M/Include/core_armv8mml.h rename to CMSIS/Core/Include/core_armv8mml.h diff --git a/CMSIS/Core_A/Include/core_ca.h b/CMSIS/Core/Include/core_ca.h similarity index 100% rename from CMSIS/Core_A/Include/core_ca.h rename to CMSIS/Core/Include/core_ca.h diff --git a/CMSIS/Core_A/Include/core_ca35.h b/CMSIS/Core/Include/core_ca35.h similarity index 100% rename from CMSIS/Core_A/Include/core_ca35.h rename to CMSIS/Core/Include/core_ca35.h diff --git a/CMSIS/Core_A/Include/core_ca5.h b/CMSIS/Core/Include/core_ca5.h similarity index 100% rename from CMSIS/Core_A/Include/core_ca5.h rename to CMSIS/Core/Include/core_ca5.h diff --git a/CMSIS/Core_A/Include/core_ca53.h b/CMSIS/Core/Include/core_ca53.h similarity index 100% rename from CMSIS/Core_A/Include/core_ca53.h rename to CMSIS/Core/Include/core_ca53.h diff --git a/CMSIS/Core_A/Include/core_ca57.h b/CMSIS/Core/Include/core_ca57.h similarity index 100% rename from CMSIS/Core_A/Include/core_ca57.h rename to CMSIS/Core/Include/core_ca57.h diff --git a/CMSIS/Core_A/Include/core_ca7.h b/CMSIS/Core/Include/core_ca7.h similarity index 100% rename from CMSIS/Core_A/Include/core_ca7.h rename to CMSIS/Core/Include/core_ca7.h diff --git a/CMSIS/Core_A/Include/core_ca9.h b/CMSIS/Core/Include/core_ca9.h similarity index 100% rename from CMSIS/Core_A/Include/core_ca9.h rename to CMSIS/Core/Include/core_ca9.h diff --git a/CMSIS/Core_M/Include/core_cm0.h b/CMSIS/Core/Include/core_cm0.h similarity index 100% rename from CMSIS/Core_M/Include/core_cm0.h rename to CMSIS/Core/Include/core_cm0.h diff --git a/CMSIS/Core_M/Include/core_cm0plus.h b/CMSIS/Core/Include/core_cm0plus.h similarity index 100% rename from CMSIS/Core_M/Include/core_cm0plus.h rename to CMSIS/Core/Include/core_cm0plus.h diff --git a/CMSIS/Core_M/Include/core_cm1.h b/CMSIS/Core/Include/core_cm1.h similarity index 100% rename from CMSIS/Core_M/Include/core_cm1.h rename to CMSIS/Core/Include/core_cm1.h diff --git a/CMSIS/Core_M/Include/core_cm23.h b/CMSIS/Core/Include/core_cm23.h similarity index 100% rename from CMSIS/Core_M/Include/core_cm23.h rename to CMSIS/Core/Include/core_cm23.h diff --git a/CMSIS/Core_M/Include/core_cm3.h b/CMSIS/Core/Include/core_cm3.h similarity index 100% rename from CMSIS/Core_M/Include/core_cm3.h rename to CMSIS/Core/Include/core_cm3.h diff --git a/CMSIS/Core_M/Include/core_cm33.h b/CMSIS/Core/Include/core_cm33.h similarity index 100% rename from CMSIS/Core_M/Include/core_cm33.h rename to CMSIS/Core/Include/core_cm33.h diff --git a/CMSIS/Core_M/Include/core_cm35p.h b/CMSIS/Core/Include/core_cm35p.h similarity index 100% rename from CMSIS/Core_M/Include/core_cm35p.h rename to CMSIS/Core/Include/core_cm35p.h diff --git a/CMSIS/Core_M/Include/core_cm4.h b/CMSIS/Core/Include/core_cm4.h similarity index 100% rename from CMSIS/Core_M/Include/core_cm4.h rename to CMSIS/Core/Include/core_cm4.h diff --git a/CMSIS/Core_M/Include/core_cm55.h b/CMSIS/Core/Include/core_cm55.h similarity index 100% rename from CMSIS/Core_M/Include/core_cm55.h rename to CMSIS/Core/Include/core_cm55.h diff --git a/CMSIS/Core_M/Include/core_cm7.h b/CMSIS/Core/Include/core_cm7.h similarity index 100% rename from CMSIS/Core_M/Include/core_cm7.h rename to CMSIS/Core/Include/core_cm7.h diff --git a/CMSIS/Core_M/Include/core_cm85.h b/CMSIS/Core/Include/core_cm85.h similarity index 100% rename from CMSIS/Core_M/Include/core_cm85.h rename to CMSIS/Core/Include/core_cm85.h diff --git a/CMSIS/Core_R/Include/core_cr4.h b/CMSIS/Core/Include/core_cr4.h similarity index 100% rename from CMSIS/Core_R/Include/core_cr4.h rename to CMSIS/Core/Include/core_cr4.h diff --git a/CMSIS/Core_R/Include/core_cr5.h b/CMSIS/Core/Include/core_cr5.h similarity index 100% rename from CMSIS/Core_R/Include/core_cr5.h rename to CMSIS/Core/Include/core_cr5.h diff --git a/CMSIS/Core_R/Include/core_cr52.h b/CMSIS/Core/Include/core_cr52.h similarity index 100% rename from CMSIS/Core_R/Include/core_cr52.h rename to CMSIS/Core/Include/core_cr52.h diff --git a/CMSIS/Core_R/Include/core_cr7.h b/CMSIS/Core/Include/core_cr7.h similarity index 100% rename from CMSIS/Core_R/Include/core_cr7.h rename to CMSIS/Core/Include/core_cr7.h diff --git a/CMSIS/Core_R/Include/core_cr8.h b/CMSIS/Core/Include/core_cr8.h similarity index 100% rename from CMSIS/Core_R/Include/core_cr8.h rename to CMSIS/Core/Include/core_cr8.h diff --git a/CMSIS/Core_M/Include/core_sc000.h b/CMSIS/Core/Include/core_sc000.h similarity index 100% rename from CMSIS/Core_M/Include/core_sc000.h rename to CMSIS/Core/Include/core_sc000.h diff --git a/CMSIS/Core_M/Include/core_sc300.h b/CMSIS/Core/Include/core_sc300.h similarity index 100% rename from CMSIS/Core_M/Include/core_sc300.h rename to CMSIS/Core/Include/core_sc300.h diff --git a/CMSIS/Core_M/Include/core_starmc1.h b/CMSIS/Core/Include/core_starmc1.h similarity index 100% rename from CMSIS/Core_M/Include/core_starmc1.h rename to CMSIS/Core/Include/core_starmc1.h diff --git a/CMSIS/Core/gic_v20.h b/CMSIS/Core/Include/gic_v20.h similarity index 99% rename from CMSIS/Core/gic_v20.h rename to CMSIS/Core/Include/gic_v20.h index 13b31097b..ab4d427b2 100644 --- a/CMSIS/Core/gic_v20.h +++ b/CMSIS/Core/Include/gic_v20.h @@ -31,6 +31,8 @@ #ifndef ARM_GIC_V20_H #define ARM_GIC_V20_H +#include + /** \brief Structure type to access the Generic Interrupt Controller Distributor (GICD) */ typedef struct diff --git a/CMSIS/Core_A/Include/irq_ctrl.h b/CMSIS/Core/Include/irq_ctrl.h similarity index 100% rename from CMSIS/Core_A/Include/irq_ctrl.h rename to CMSIS/Core/Include/irq_ctrl.h diff --git a/CMSIS/Core_M/Include/mpu_armv7.h b/CMSIS/Core/Include/mpu_armv7.h similarity index 100% rename from CMSIS/Core_M/Include/mpu_armv7.h rename to CMSIS/Core/Include/mpu_armv7.h diff --git a/CMSIS/Core_M/Include/mpu_armv8.h b/CMSIS/Core/Include/mpu_armv8.h similarity index 100% rename from CMSIS/Core_M/Include/mpu_armv8.h rename to CMSIS/Core/Include/mpu_armv8.h diff --git a/CMSIS/Core_M/Include/pac_armv81.h b/CMSIS/Core/Include/pac_armv81.h similarity index 100% rename from CMSIS/Core_M/Include/pac_armv81.h rename to CMSIS/Core/Include/pac_armv81.h diff --git a/CMSIS/Core_M/Include/pmu_armv8.h b/CMSIS/Core/Include/pmu_armv8.h similarity index 100% rename from CMSIS/Core_M/Include/pmu_armv8.h rename to CMSIS/Core/Include/pmu_armv8.h diff --git a/CMSIS/Core_M/Include/tz_context.h b/CMSIS/Core/Include/tz_context.h similarity index 100% rename from CMSIS/Core_M/Include/tz_context.h rename to CMSIS/Core/Include/tz_context.h diff --git a/CMSIS/Core_A/Source/irq_ctrl_gic.c b/CMSIS/Core/Source/irq_ctrl_gic.c similarity index 100% rename from CMSIS/Core_A/Source/irq_ctrl_gic.c rename to CMSIS/Core/Source/irq_ctrl_gic.c diff --git a/CMSIS/Core_M/Template/ARMv8-M/main_s.c b/CMSIS/Core/Template/ARMv8-M/main_s.c similarity index 100% rename from CMSIS/Core_M/Template/ARMv8-M/main_s.c rename to CMSIS/Core/Template/ARMv8-M/main_s.c diff --git a/CMSIS/Core_M/Template/ARMv8-M/tz_context.c b/CMSIS/Core/Template/ARMv8-M/tz_context.c similarity index 100% rename from CMSIS/Core_M/Template/ARMv8-M/tz_context.c rename to CMSIS/Core/Template/ARMv8-M/tz_context.c diff --git a/CMSIS/Core_A/Include/cmsis_compiler.h b/CMSIS/Core_A/Include/cmsis_compiler.h deleted file mode 100644 index 088d3411f..000000000 --- a/CMSIS/Core_A/Include/cmsis_compiler.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************//** - * @file cmsis_compiler.h - * @brief CMSIS compiler generic header file - * @version V5.2.0 - * @date 04. December 2022 - ******************************************************************************/ -/* - * Copyright (c) 2009-2023 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. - */ - -#ifndef __CMSIS_COMPILER_H -#define __CMSIS_COMPILER_H - -#include "../../Core/cmsis_generic_compiler.h" - -#endif /* __CMSIS_COMPILER_H */ - diff --git a/CMSIS/Core_M/Include/cmsis_compiler.h b/CMSIS/Core_M/Include/cmsis_compiler.h deleted file mode 100644 index 088d3411f..000000000 --- a/CMSIS/Core_M/Include/cmsis_compiler.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************//** - * @file cmsis_compiler.h - * @brief CMSIS compiler generic header file - * @version V5.2.0 - * @date 04. December 2022 - ******************************************************************************/ -/* - * Copyright (c) 2009-2023 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. - */ - -#ifndef __CMSIS_COMPILER_H -#define __CMSIS_COMPILER_H - -#include "../../Core/cmsis_generic_compiler.h" - -#endif /* __CMSIS_COMPILER_H */ - diff --git a/CMSIS/Core_R/Include/cmsis_compiler.h b/CMSIS/Core_R/Include/cmsis_compiler.h deleted file mode 100644 index db4e8c58f..000000000 --- a/CMSIS/Core_R/Include/cmsis_compiler.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************//** - * @file cmsis_compiler.h - * @brief CMSIS compiler generic header file - * @version V5.0.0 - * @date 04. December 2022 - ******************************************************************************/ -/* - * Copyright (c) 2009-2023 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. - */ - -#ifndef __CMSIS_COMPILER_H -#define __CMSIS_COMPILER_H - -#include "../../Core/cmsis_generic_compiler.h" - -#endif /* __CMSIS_COMPILER_H */ - diff --git a/CMSIS/Core_R/Include/cmsis_gcc.h b/CMSIS/Core_R/Include/cmsis_gcc.h deleted file mode 100644 index ec8523a68..000000000 --- a/CMSIS/Core_R/Include/cmsis_gcc.h +++ /dev/null @@ -1,31 +0,0 @@ -/**************************************************************************//** - * @file cmsis_gcc.h - * @brief CMSIS compiler GCC header file - * @version V5.0.0 - * @date 04. December 2022 - ******************************************************************************/ -/* - * Copyright (c) 2009-2023 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. - */ - -#ifndef __CMSIS_GCC_H -#define __CMSIS_GCC_H - -// Include the generic settigs: -#include "../../Core/cmsis_generic_gcc.h" - -#endif /* __CMSIS_GCC_H */