Skip to content

Commit c3472d4

Browse files
Masmiseim36Masmiseim36
committed
Rename compiler specific files according to code review
1 parent f9507ab commit c3472d4

21 files changed

Lines changed: 122 additions & 130 deletions

‎ARM.CMSIS.pdsc‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -648,24 +648,16 @@
648648

649649
<components>
650650
<!-- CMSIS-Core component -->
651-
<component Cclass="CMSIS" Cgroup="CORE" Cversion="5.7.0" condition="ARMv6_7_8-M Device" >
652-
<description>CMSIS-CORE for Cortex-A/R/M</description>
653-
<files>
654-
<!-- CPU independent -->
655-
<file category="include" name="CMSIS/Core/"/>
656-
</files>
657-
</component>
658-
659651
<component Cclass="CMSIS" Cgroup="CORE" Cversion="5.6.0" condition="ARMv6_7_8-M Device" >
660652
<description>CMSIS-CORE for Cortex-M, SC000, SC300, Star-MC1, ARMv8-M, ARMv8.1-M</description>
661653
<files>
662654
<!-- CPU independent -->
663655
<file category="doc" name="CMSIS/Documentation/Core/html/index.html"/>
664-
<file category="include" name="CMSIS/Core_M/Include/"/>
665-
<file category="header" name="CMSIS/Core_M/Include/tz_context.h" condition="TrustZone"/>
656+
<file category="include" name="CMSIS/Core/Include/"/>
657+
<file category="header" name="CMSIS/Core/Include/tz_context.h" condition="TrustZone"/>
666658
<!-- Code template -->
667-
<file category="sourceC" attr="template" condition="TZ Secure" name="CMSIS/Core_M/Template/ARMv8-M/main_s.c" version="1.1.1" select="Secure mode 'main' module for ARMv8-M"/>
668-
<file category="sourceC" attr="template" condition="TZ Secure" name="CMSIS/Core_M/Template/ARMv8-M/tz_context.c" version="1.1.1" select="RTOS Context Management (TrustZone for ARMv8-M)" />
659+
<file category="sourceC" attr="template" condition="TZ Secure" name="CMSIS/Core/Template/ARMv8-M/main_s.c" version="1.1.1" select="Secure mode 'main' module for ARMv8-M"/>
660+
<file category="sourceC" attr="template" condition="TZ Secure" name="CMSIS/Core/Template/ARMv8-M/tz_context.c" version="1.1.1" select="RTOS Context Management (TrustZone for ARMv8-M)" />
669661
</files>
670662
</component>
671663

@@ -674,15 +666,15 @@
674666
<files>
675667
<!-- CPU independent -->
676668
<file category="doc" name="CMSIS/Documentation/Core_A/html/index.html"/>
677-
<file category="include" name="CMSIS/Core_A/Include/"/>
669+
<file category="include" name="CMSIS/Core/Include/"/>
678670
</files>
679671
</component>
680672

681673
<!-- IRQ Controller -->
682674
<component Cclass="Device" Cgroup="IRQ Controller" Csub="GIC" Capiversion="1.0.0" Cversion="1.2.0" condition="ARMv7-A Device">
683675
<description>IRQ Controller implementation using GIC</description>
684676
<files>
685-
<file category="sourceC" name="CMSIS/Core_A/Source/irq_ctrl_gic.c"/>
677+
<file category="sourceC" name="CMSIS/Core/Source/irq_ctrl_gic.c"/>
686678
</files>
687679
</component>
688680

CMSIS/Core/Include/cmsis_generic_armcc.h renamed to CMSIS/Core/Include/cmsis_armcc.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**************************************************************************//**
2-
* @file cmsis_generic_armcc.h
2+
* @file cmsis_armcc.h
33
* @brief CMSIS compiler ARMCC (Arm Compiler 5) header file
44
* @version V5.0.0
55
* @date 04. December 2022
@@ -22,8 +22,8 @@
2222
* limitations under the License.
2323
*/
2424

25-
#ifndef __CMSIS_GENERIC_ARMCC_H
26-
#define __CMSIS_GENERIC_ARMCC_H
25+
#ifndef __CMSIS_ARMCC_H
26+
#define __CMSIS_ARMCC_H
2727

2828
#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION < 400677)
2929
#error "Please use Arm Compiler Toolchain V4.0.677 or later!"
@@ -655,4 +655,4 @@ __STATIC_INLINE void __set_FPSCR(uint32_t fpscr)
655655
#endif /* ((defined (__ARM_ARCH_7EM__) && (__ARM_ARCH_7EM__ == 1)) ) */
656656
/*@} end of group CMSIS_SIMD_intrinsics */
657657

658-
#endif /* __CMSIS_GENERIC_ARMCC_H */
658+
#endif /* __CMSIS_ARMCC_H */

CMSIS/Core/Include/cmsis_corea_armcc.h renamed to CMSIS/Core/Include/cmsis_armcc_corea.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**************************************************************************//**
2-
* @file cmsis_armcc.h
2+
* @file cmsis_armcc_corea.h
33
* @brief CMSIS compiler ARMCC (Arm Compiler 5) header file
44
* @version V5.4.0
55
* @date 04. December 2022
@@ -22,11 +22,11 @@
2222
* limitations under the License.
2323
*/
2424

25-
#ifndef __CMSIS_ARMCC_H
26-
#define __CMSIS_ARMCC_H
25+
#ifndef __CMSIS_ARMCC_COREA_H
26+
#define __CMSIS_ARMCC_COREA_H
2727

28-
// Include the generic settigs:
29-
#include "cmsis_generic_armcc.h"
28+
// Include the generic settings:
29+
#include "cmsis_armcc.h"
3030

3131

3232
/** \brief Get CPSR (Current Program Status Register)
@@ -235,4 +235,4 @@ __STATIC_INLINE __ASM void __FPU_Enable(void)
235235
BX LR
236236
}
237237

238-
#endif /* __CMSIS_ARMCC_H */
238+
#endif /* __CMSIS_ARMCC_COREA_H */

CMSIS/Core/Include/cmsis_corem_armcc.h renamed to CMSIS/Core/Include/cmsis_armcc_corem.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**************************************************************************//**
2-
* @file cmsis_armcc.h
2+
* @file cmsis_armcc_corem.h
33
* @brief CMSIS compiler ARMCC (Arm Compiler 5) header file
44
* @version V5.4.0
55
* @date 04. December 2022
@@ -22,11 +22,11 @@
2222
* limitations under the License.
2323
*/
2424

25-
#ifndef __CMSIS_ARMCC_H
26-
#define __CMSIS_ARMCC_H
25+
#ifndef __CMSIS_ARMCC_COREM_H
26+
#define __CMSIS_ARMCC_COREM_H
2727

28-
// Include the generic settigs:
29-
#include "cmsis_generic_armcc.h"
28+
// Include the generic settings:
29+
#include "cmsis_armcc.h"
3030

3131
/* ######################### Startup and Lowlevel Init ######################## */
3232

@@ -255,4 +255,4 @@ __STATIC_INLINE void __set_PRIMASK(uint32_t priMask)
255255
/*@} end of CMSIS_Core_RegAccFunctions */
256256

257257

258-
#endif /* __CMSIS_ARMCC_H */
258+
#endif /* __CMSIS_ARMCC_COREM_H */

CMSIS/Core/Include/cmsis_corer_armcc.h renamed to CMSIS/Core/Include/cmsis_armcc_corer.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**************************************************************************//**
2-
* @file cmsis_armcc.h
2+
* @file cmsis_armcc_corer.h
33
* @brief CMSIS compiler ARMCC (Arm Compiler 5) header file
44
* @version V5.0.0
55
* @date 04. December 2022
@@ -22,11 +22,11 @@
2222
* limitations under the License.
2323
*/
2424

25-
#ifndef __CMSIS_ARMCC_H
26-
#define __CMSIS_ARMCC_H
25+
#ifndef __CMSIS_ARMCC_CORER_H
26+
#define __CMSIS_ARMCC_CORER_H
2727

28-
// Include the generic settigs:
29-
#include "cmsis_generic_armcc.h"
28+
// Include the generic settings:
29+
#include "cmsis_armcc.h"
3030

3131

3232
/** \brief Get Stack Pointer
@@ -48,4 +48,4 @@ __STATIC_INLINE __ASM void __set_SP(uint32_t stack)
4848
}
4949

5050

51-
#endif /* __CMSIS_ARMCC_H */
51+
#endif /* __CMSIS_ARMCC_CORER_H */

CMSIS/Core/Include/cmsis_generic_armclang.h renamed to CMSIS/Core/Include/cmsis_armclang.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**************************************************************************//**
2-
* @file cmsis_generic_armclang.h
2+
* @file cmsis_armclang.h
33
* @brief CMSIS compiler armclang (Arm Compiler 6) header file
44
* @version V5.0.0
55
* @date 04. December 2022
@@ -24,8 +24,8 @@
2424

2525
/*lint -esym(9058, IRQn)*/ /* disable MISRA 2012 Rule 2.4 for IRQn */
2626

27-
#ifndef __CMSIS_GENERIC_ARMCLANG_H
28-
#define __CMSIS_GENERIC_ARMCLANG_H
27+
#ifndef __CMSIS_ARMCLANG_H
28+
#define __CMSIS_ARMCLANG_H
2929

3030
#pragma clang system_header /* treat file as system include file */
3131

@@ -832,4 +832,4 @@ __STATIC_FORCEINLINE uint8_t __CLZ(uint32_t value)
832832
#endif /* (defined (__arm__) || (defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1))) */
833833
/** @} end of group CMSIS_SIMD_intrinsics */
834834

835-
#endif /* __CMSIS_GENERIC_ARMCLANG_H */*/
835+
#endif /* __CMSIS_ARMCLANG_H */*/

CMSIS/Core/Include/cmsis_corea_armclang.h renamed to CMSIS/Core/Include/cmsis_armclang_corea.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**************************************************************************//**
2-
* @file cmsis_armclang.h
2+
* @file cmsis_armclang_corea.h
33
* @brief CMSIS compiler armclang (Arm Compiler 6) header file
44
* @version V5.5.0
55
* @date 04. December 2022
@@ -24,13 +24,13 @@
2424

2525
/*lint -esym(9058, IRQn)*/ /* disable MISRA 2012 Rule 2.4 for IRQn */
2626

27-
#ifndef __CMSIS_ARMCLANG_H
28-
#define __CMSIS_ARMCLANG_H
27+
#ifndef __CMSIS_ARMCLANG_COREA_H
28+
#define __CMSIS_ARMCLANG_COREA_H
2929

3030
#pragma clang system_header /* treat file as system include file */
3131

32-
// Include the generic settigs:
33-
#include "cmsis_generic_armclang.h"
32+
// Include the generic settings:
33+
#include "cmsis_armclang.h"
3434

3535

3636
/* ########################### Core Function Access ########################### */
@@ -229,4 +229,4 @@ __STATIC_INLINE void __FPU_Enable(void)
229229
);
230230
}
231231

232-
#endif /* __CMSIS_ARMCLANG_H */
232+
#endif /* __CMSIS_ARMCLANG_COREA_H */

CMSIS/Core/Include/cmsis_corem_armclang.h renamed to CMSIS/Core/Include/cmsis_armclang_corem.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**************************************************************************//**
2-
* @file cmsis_armclang.h
2+
* @file cmsis_armclang_corem.h
33
* @brief CMSIS compiler armclang (Arm Compiler 6) header file
44
* @version V5.5.0
55
* @date 04. December 2022
@@ -24,13 +24,13 @@
2424

2525
/*lint -esym(9058, IRQn)*/ /* disable MISRA 2012 Rule 2.4 for IRQn */
2626

27-
#ifndef __CMSIS_ARMCLANG_H
28-
#define __CMSIS_ARMCLANG_H
27+
#ifndef __CMSIS_ARMCLANG_COREM_H
28+
#define __CMSIS_ARMCLANG_COREM_H
2929

3030
#pragma clang system_header /* treat file as system include file */
3131

32-
// Include the generic settigs:
33-
#include "cmsis_generic_armclang.h"
32+
// Include the generic settings:
33+
#include "cmsis_armclang.h"
3434

3535
/* ######################### Startup and Lowlevel Init ######################## */
3636

@@ -690,4 +690,4 @@ __STATIC_FORCEINLINE void __set_PRIMASK(uint32_t priMask)
690690
/** @} end of CMSIS_Core_RegAccFunctions */
691691

692692

693-
#endif /* __CMSIS_ARMCLANG_H */
693+
#endif /* __CMSIS_ARMCLANG_COREM_H */

CMSIS/Core/Include/cmsis_corer_armclang.h renamed to CMSIS/Core/Include/cmsis_armclang_corer.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**************************************************************************//**
2-
* @file cmsis_armclang.h
2+
* @file cmsis_armclang_corer.h
33
* @brief CMSIS compiler armclang (Arm Compiler 6) header file
44
* @version V5.0.0
55
* @date 04. December 2022
@@ -22,13 +22,13 @@
2222
* limitations under the License.
2323
*/
2424

25-
#ifndef __CMSIS_ARMCLANG_H
26-
#define __CMSIS_ARMCLANG_H
25+
#ifndef __CMSIS_ARMCLANG_CORER_H
26+
#define __CMSIS_ARMCLANG_CORER_H
2727

2828
#pragma clang system_header /* treat file as system include file */
2929

30-
// Include the generic settigs:
31-
#include "cmsis_generic_armclang.h"
30+
// Include the generic settings:
31+
#include "cmsis_armclang.h"
3232

3333

3434
/** \brief Get Stack Pointer
@@ -50,4 +50,4 @@ __STATIC_FORCEINLINE void __set_SP(uint32_t stack)
5050
}
5151

5252

53-
#endif /* __CMSIS_ARMCLANG_H */
53+
#endif /* __CMSIS_ARMCLANG_CORER_H */

CMSIS/Core/Include/cmsis_generic_armclang_ltm.h renamed to CMSIS/Core/Include/cmsis_armclang_ltm.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**************************************************************************//**
2-
* @file cmsis_generic_armclang_ltm.h
2+
* @file cmsis_armclang_ltm.h
33
* @brief CMSIS compiler armclang (Arm Compiler 6) header file
44
* @version V5.0.0
55
* @date 04. December 2022
@@ -24,8 +24,8 @@
2424

2525
/*lint -esym(9058, IRQn)*/ /* disable MISRA 2012 Rule 2.4 for IRQn */
2626

27-
#ifndef __CMSIS_GENERIC_ARMCLANG_LTM_H
28-
#define __CMSIS_GENERIC_ARMCLANG_LTM_H
27+
#ifndef __CMSIS_ARMCLANG_LTM_H
28+
#define __CMSIS_ARMCLANG_LTM_H
2929

3030
#pragma clang system_header /* treat file as system include file */
3131

@@ -1287,4 +1287,4 @@ __STATIC_FORCEINLINE int32_t __QSUB( int32_t op1, int32_t op2)
12871287
#endif /* (defined (__ARM_FEATURE_DSP) && (__ARM_FEATURE_DSP == 1)) */
12881288
/** @} end of group CMSIS_SIMD_intrinsics */
12891289

1290-
#endif /* __CMSIS_GENERIC_ARMCLANG_LTM_H */*/
1290+
#endif /* __CMSIS_ARMCLANG_LTM_H */*/

0 commit comments

Comments
 (0)