Skip to content

Commit 5c70028

Browse files
vanvughtvanvught
committed
Moved latest CMSIS
1 parent 1cf1264 commit 5c70028

13 files changed

+14
-26
lines changed

‎lib-arm/.settings/language.settings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
8-
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1522357966463138799" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="952649484323753915" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>
@@ -17,7 +17,7 @@
1717
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
1818
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
1919
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
20-
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1923199820554977812" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
20+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1923326226878881812" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
2121
<language-scope id="org.eclipse.cdt.core.gcc"/>
2222
<language-scope id="org.eclipse.cdt.core.g++"/>
2323
</provider>

‎lib-arm/include/arm/arm.h

-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ typedef enum arm_vector {
4646
# define ARM_VECTOR(x) (unsigned *)(x)
4747
#endif
4848

49-
#define __enable_irq() asm volatile ("cpsie i")
50-
#define __disable_irq() asm volatile ("cpsid i")
5149
#define __enable_fiq() asm volatile ("cpsie f")
5250
#define __disable_fiq() asm volatile ("cpsid f")
5351

‎lib-h3/.cproject

+7-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</extensions>
1515
</storageModule>
1616
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
17-
<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.cross.base.2012143185" name="H3" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="org.eclipse.cdt.build.core.emptycfg">
17+
<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.cross.base.2012143185" name="H3" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.dockerdpath=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="org.eclipse.cdt.build.core.emptycfg">
1818
<folderInfo id="cdt.managedbuild.toolchain.gnu.cross.base.2012143185.2130186503" name="/" resourcePath="">
1919
<toolChain id="cdt.managedbuild.toolchain.gnu.cross.base.101583066" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.base">
2020
<option id="cdt.managedbuild.option.gnu.cross.prefix.2136602983" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix"/>
@@ -32,13 +32,19 @@
3232
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.preprocessor.def.symbols.2140420932" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
3333
<listOptionValue builtIn="false" value="H3"/>
3434
<listOptionValue builtIn="false" value="ORANGE_PI"/>
35+
<listOptionValue builtIn="false" value="__GIC_PRESENT=1"/>
36+
<listOptionValue builtIn="false" value="__FPU_PRESENT=1"/>
3537
</option>
3638
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.2135408322" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
3739
</tool>
3840
<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.1584641997" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
3941
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.include.paths.525349535" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
4042
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-debug/include}&quot;"/>
4143
</option>
44+
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.cpp.compiler.option.preprocessor.def.512003948" name="Defined symbols (-D)" superClass="gnu.cpp.compiler.option.preprocessor.def" useByScannerDiscovery="false" valueType="definedSymbols">
45+
<listOptionValue builtIn="false" value="__GIC_PRESENT=1"/>
46+
<listOptionValue builtIn="false" value="__FPU_PRESENT=1"/>
47+
</option>
4248
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1382531490" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
4349
</tool>
4450
<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.1802861959" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker">

‎lib-h3/.settings/language.settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="([^/\\\\]*)((g?cc)|([gc]\+\+)|(clang))" prefer-non-shared="true"/>
8-
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1522357966463138799" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="952649484323753915" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>

‎lib-h3/CMSIS/Include/cmsis_armcc.h ‎lib-h3/CMSIS/Core_A/Include/cmsis_armcc.h

File renamed without changes.

‎lib-h3/CMSIS/Include/cmsis_armclang.h ‎lib-h3/CMSIS/Core_A/Include/cmsis_armclang.h

File renamed without changes.

‎lib-h3/CMSIS/Include/cmsis_compiler.h ‎lib-h3/CMSIS/Core_A/Include/cmsis_compiler.h

File renamed without changes.

‎lib-h3/CMSIS/Include/cmsis_cp15.h ‎lib-h3/CMSIS/Core_A/Include/cmsis_cp15.h

File renamed without changes.

‎lib-h3/CMSIS/Include/cmsis_gcc.h ‎lib-h3/CMSIS/Core_A/Include/cmsis_gcc.h

+3-19
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/**************************************************************************//**
22
* @file cmsis_gcc.h
33
* @brief CMSIS compiler specific macros, functions, instructions
4-
* @version V1.3.1
5-
* @date 05. May 2021
4+
* @version V1.3.2
5+
* @date 24. March 2022
66
******************************************************************************/
77
/*
8-
* Copyright (c) 2009-2021 Arm Limited. All rights reserved.
8+
* Copyright (c) 2009-2022 Arm Limited. All rights reserved.
99
*
1010
* SPDX-License-Identifier: Apache-2.0
1111
*
@@ -459,23 +459,7 @@ __STATIC_FORCEINLINE uint32_t __ROR(uint32_t op1, uint32_t op2)
459459
__STATIC_FORCEINLINE uint32_t __RBIT(uint32_t value)
460460
{
461461
uint32_t result;
462-
463-
#if ((defined (__ARM_ARCH_7M__ ) && (__ARM_ARCH_7M__ == 1)) || \
464-
(defined (__ARM_ARCH_7EM__ ) && (__ARM_ARCH_7EM__ == 1)) || \
465-
(defined (__ARM_ARCH_8M_MAIN__ ) && (__ARM_ARCH_8M_MAIN__ == 1)) )
466462
__ASM ("rbit %0, %1" : "=r" (result) : "r" (value) );
467-
#else
468-
int32_t s = (4U /*sizeof(v)*/ * 8U) - 1U; /* extra shift needed at end */
469-
470-
result = value; /* r will be reversed bits of v; first get LSB of v */
471-
for (value >>= 1U; value; value >>= 1U)
472-
{
473-
result <<= 1U;
474-
result |= value & 1U;
475-
s--;
476-
}
477-
result <<= s; /* shift when v's highest bits are zero */
478-
#endif
479463
return result;
480464
}
481465

‎lib-h3/CMSIS/Include/cmsis_iccarm.h ‎lib-h3/CMSIS/Core_A/Include/cmsis_iccarm.h

File renamed without changes.

‎lib-h3/CMSIS/Include/core_ca.h ‎lib-h3/CMSIS/Core_A/Include/core_ca.h

File renamed without changes.

‎lib-h3/CMSIS/Include/irq_ctrl.h ‎lib-h3/CMSIS/Core_A/Include/irq_ctrl.h

File renamed without changes.

‎lib-h3/CMSIS/Source/irq_ctrl_gic.c ‎lib-h3/CMSIS/Core_A/Source/irq_ctrl_gic.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include <stddef.h>
2626

27-
#include "RTE_Components.h"
27+
// #include "RTE_Components.h"
2828
#include CMSIS_device_header
2929

3030
#include "irq_ctrl.h"

0 commit comments

Comments
 (0)