Skip to content

Commit

Permalink
ARM CMSIS 4.5.0
Browse files Browse the repository at this point in the history
Signed-off-by: Joachim Krech <[email protected]>
  • Loading branch information
jkrech committed Nov 3, 2015
1 parent 9e59e69 commit f25cf2c
Show file tree
Hide file tree
Showing 1,416 changed files with 8,744 additions and 12,505 deletions.
17 changes: 13 additions & 4 deletions ARM.CMSIS.pdsc
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,24 @@
</taxonomy>

<releases>
<release version="4.5.0" date="2015-10-28">
- CMSIS-Core 4.30.0 (see revision history for details)
- CMSIS-DAP 1.1.0 (unchanged)
- CMSIS-Driver 2.04.0 (see revision history for details)
- CMSIS-DSP 1.4.7 (no source code change [still labeled 1.4.5], see revision history for details)
- CMSIS-PACK 1.4.1 (see revision history for details)
- CMSIS-RTOS 4.80.0 Restored time delay parameter 'millisec' old behavior (prior V4.79) for software compatibility. (see revision history for details)
- CMSIS-SVD 1.3.1 (see revision history for details)
</release>
<release version="4.4.0" date="2015-09-11">
- CMSIS-Core 4.20 (see revision history for details)
- CMSIS-DSP 1.4.6 (no source code change [still labeled 1.4.5], see revision history for details)
- CMSIS-PACK 1.4.0 (adding memory attributes, algorithm style)
- CMSIS-Driver 2.03 (adding CAN [Controller Area Network] API)
- CMSIS-Driver 2.03.0 (adding CAN [Controller Area Network] API)
- CMSIS-RTOS
-- API 1.02 (unchanged)
-- RTX 4.79 (see revision history for details)
- CMSIS-SVD 1.2 (unchanged)
- CMSIS-SVD 1.3.0 (see revision history for details)
- CMSIS-DAP 1.1.0 (extended with SWO support)
</release>
<release version="4.3.0" date="2015-03-20">
Expand Down Expand Up @@ -891,7 +900,7 @@ The ARM SC300 processor is an entry-level 32-bit ARM Cortex processor designed f

<components>
<!-- CMSIS-Core component -->
<component Cclass="CMSIS" Cgroup="CORE" Cversion="4.2.0" condition="Cortex-M Device">
<component Cclass="CMSIS" Cgroup="CORE" Cversion="4.3.0" condition="Cortex-M Device">
<description>CMSIS-CORE for Cortex-M, SC000, and SC300</description>
<files>
<!-- CPU independent -->
Expand Down Expand Up @@ -1119,7 +1128,7 @@ The ARM SC300 processor is an entry-level 32-bit ARM Cortex processor designed f
</component>

<!-- CMSIS-RTOS Keil RTX component -->
<component Cclass="CMSIS" Cgroup="RTOS" Csub="Keil RTX" Cversion="4.79.0" condition="Cortex-M Device Startup">
<component Cclass="CMSIS" Cgroup="RTOS" Csub="Keil RTX" Cversion="4.80.0" condition="Cortex-M Device Startup">
<description>CMSIS-RTOS RTX implementation for Cortex-M, SC000, and SC300</description>
<RTE_Components_h>
<!-- the following content goes into file 'RTE_Components.h' -->
Expand Down
2 changes: 1 addition & 1 deletion CMSIS/DSP_Lib/Source/ARM/arm_cortexM_math.uvoptx
Original file line number Diff line number Diff line change
Expand Up @@ -1913,7 +1913,7 @@

<Group>
<GroupName>BasicMathFunctions</GroupName>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
Expand Down
30 changes: 16 additions & 14 deletions CMSIS/DSP_Lib/Source/ARM/arm_cortexM_math.uvprojx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<TargetCommonOption>
<Device>ARMCM0</Device>
<Vendor>ARM</Vendor>
<PackID>ARM.CMSIS.4.3.0</PackID>
<PackID>ARM.CMSIS.4.4.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IROM(0x00000000,0x40000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M0") CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -1833,7 +1833,7 @@
<TargetCommonOption>
<Device>ARMCM0</Device>
<Vendor>ARM</Vendor>
<PackID>ARM.CMSIS.4.3.0</PackID>
<PackID>ARM.CMSIS.4.4.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IROM(0x00000000,0x40000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M0") CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -3647,11 +3647,12 @@
<TargetName>M3l</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060020::V5.06 (build 20)::ARMCC</pCCUsed>
<TargetOption>
<TargetCommonOption>
<Device>ARMCM3</Device>
<Vendor>ARM</Vendor>
<PackID>ARM.CMSIS.4.3.0</PackID>
<PackID>ARM.CMSIS.4.4.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IROM(0x00000000,0x40000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M3") CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -5469,7 +5470,7 @@
<TargetCommonOption>
<Device>ARMCM3</Device>
<Vendor>ARM</Vendor>
<PackID>ARM.CMSIS.4.3.0</PackID>
<PackID>ARM.CMSIS.4.4.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IROM(0x00000000,0x40000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M3") CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -7287,7 +7288,7 @@
<TargetCommonOption>
<Device>ARMCM4</Device>
<Vendor>ARM</Vendor>
<PackID>ARM.CMSIS.4.3.0</PackID>
<PackID>ARM.CMSIS.4.4.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M4") CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -9105,7 +9106,7 @@
<TargetCommonOption>
<Device>ARMCM4</Device>
<Vendor>ARM</Vendor>
<PackID>ARM.CMSIS.4.3.0</PackID>
<PackID>ARM.CMSIS.4.4.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M4") CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -10919,11 +10920,12 @@
<TargetName>M4lf</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060020::V5.06 (build 20)::ARMCC</pCCUsed>
<TargetOption>
<TargetCommonOption>
<Device>ARMCM4_FP</Device>
<Vendor>ARM</Vendor>
<PackID>ARM.CMSIS.4.3.0</PackID>
<PackID>ARM.CMSIS.4.4.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -12741,7 +12743,7 @@
<TargetCommonOption>
<Device>ARMCM4_FP</Device>
<Vendor>ARM</Vendor>
<PackID>ARM.CMSIS.4.3.0</PackID>
<PackID>ARM.CMSIS.4.4.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -14559,7 +14561,7 @@
<TargetCommonOption>
<Device>ARMCM7</Device>
<Vendor>ARM</Vendor>
<PackID>ARM.CMSIS.4.3.0</PackID>
<PackID>ARM.CMSIS.4.4.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M7") CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -16377,7 +16379,7 @@
<TargetCommonOption>
<Device>ARMCM7</Device>
<Vendor>ARM</Vendor>
<PackID>ARM.CMSIS.4.3.0</PackID>
<PackID>ARM.CMSIS.4.4.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M7") CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -18195,7 +18197,7 @@
<TargetCommonOption>
<Device>ARMCM7_SP</Device>
<Vendor>ARM</Vendor>
<PackID>ARM.CMSIS.4.3.0</PackID>
<PackID>ARM.CMSIS.4.4.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M7") FPU3(SFPU) CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -20013,7 +20015,7 @@
<TargetCommonOption>
<Device>ARMCM7_SP</Device>
<Vendor>ARM</Vendor>
<PackID>ARM.CMSIS.4.3.0</PackID>
<PackID>ARM.CMSIS.4.4.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M7") FPU3(SFPU) CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -21831,7 +21833,7 @@
<TargetCommonOption>
<Device>ARMCM7_DP</Device>
<Vendor>ARM</Vendor>
<PackID>ARM.CMSIS.4.3.0</PackID>
<PackID>ARM.CMSIS.4.4.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M7") FPU3(DFPU) CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down Expand Up @@ -23649,7 +23651,7 @@
<TargetCommonOption>
<Device>ARMCM7_DP</Device>
<Vendor>ARM</Vendor>
<PackID>ARM.CMSIS.4.3.0</PackID>
<PackID>ARM.CMSIS.4.4.0</PackID>
<PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IROM(0x00000000,0x80000) IRAM(0x20000000,0x20000) CPUTYPE("Cortex-M7") FPU3(DFPU) CLOCK(12000000) ESEL ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
Expand Down
2 changes: 1 addition & 1 deletion CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_abs_q7.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ void arm_abs_q7(
/* Run the below code for Cortex-M0 */
blkCnt = blockSize;

#endif // #define ARM_MATH_CM0_FAMILY
#endif /* #define ARM_MATH_CM0_FAMILY */

while(blkCnt > 0u)
{
Expand Down
6 changes: 3 additions & 3 deletions CMSIS/DSP_Lib/Source/BasicMathFunctions/arm_mult_q15.c
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* ----------------------------------------------------------------------
* Copyright (C) 2010-2014 ARM Limited. All rights reserved.
*
* $Date: 19. March 2015
* $Revision: V.1.4.5
* $Date: 19. October 2015
* $Revision: V.1.4.5 a
*
* Project: CMSIS DSP Library
* Title: arm_mult_q15.c
Expand Down Expand Up @@ -118,7 +118,7 @@ void arm_mult_q15(
*__SIMD32(pDst)++ = __PKHBT(out2, out1, 16);
*__SIMD32(pDst)++ = __PKHBT(out4, out3, 16);

#endif // #ifndef ARM_MATH_BIG_ENDIAN
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */

/* Decrement the blockSize loop counter */
blkCnt--;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* ----------------------------------------------------------------------
* Copyright (C) 2010-2014 ARM Limited. All rights reserved.
*
* $Date: 19. March 2015
* $Revision: V.1.4.5
* $Date: 19. October 2015
* $Revision: V.1.4.5 a
*
* Project: CMSIS DSP Library
* Title: arm_cmplx_conj_q15.c
Expand Down Expand Up @@ -103,7 +103,7 @@ void arm_cmplx_conj_q15(
in3 = __QSAX(zero, in3);
in4 = __QSAX(zero, in4);

#endif // #ifndef ARM_MATH_BIG_ENDIAN
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */

in1 = ((uint32_t) in1 >> 16) | ((uint32_t) in1 << 16);
in2 = ((uint32_t) in2 >> 16) | ((uint32_t) in2 << 16);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* ----------------------------------------------------------------------
* Copyright (C) 2010-2014 ARM Limited. All rights reserved.
*
* $Date: 19. March 2015
* $Revision: V.1.4.5
* $Date: 19. October 2015
* $Revision: V.1.4.5 a
*
* Project: CMSIS DSP Library
* Title: arm_cmplx_mult_real_q15.c
Expand Down Expand Up @@ -112,7 +112,7 @@ void arm_cmplx_mult_real_q15(
mul4 = (q31_t) ((q15_t) (inA2 >> 16) * (q15_t) inB1);
mul3 = (q31_t) ((q15_t) inA2 * (q15_t) inB1);

#endif // #ifndef ARM_MATH_BIG_ENDIAN
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */

/* saturate the result */
out1 = (q15_t) __SSAT(mul1 >> 15u, 16);
Expand Down Expand Up @@ -142,7 +142,7 @@ void arm_cmplx_mult_real_q15(
mul4 = (q31_t) ((q15_t) (inA2 >> 16) * (q15_t) inB1);
mul3 = (q31_t) ((q15_t) inA2 * (q15_t) inB1);

#endif // #ifndef ARM_MATH_BIG_ENDIAN
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */

out1 = (q15_t) __SSAT(mul1 >> 15u, 16);
out2 = (q15_t) __SSAT(mul2 >> 15u, 16);
Expand Down
Loading

0 comments on commit f25cf2c

Please sign in to comment.