Skip to content
This repository was archived by the owner on Jun 5, 2019. It is now read-only.

Commit 98be9ff

Browse files
committed
Update CMSIS 4.3.0 (it now includes RTX)
1 parent abb6a64 commit 98be9ff

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@
77

88
# CMSIS and CMSIS_RTX
99
/CMSIS/CMSIS/
10-
/CMSIS/CMSIS_RTX/*
1110
/CMSIS/Device/*
1211
/CMSIS/ARM.CMSIS.pdsc
13-
!/CMSIS/CMSIS_RTX/dotNetMF.proj
12+
!/CMSIS/CMSIS/RTOS/RTX/dotNetMF.proj
1413

1514
# Visual Studio
1615
*.aps

CMSIS/CMSIS-SP-00300-r4p2-00rel0.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Description>CMSIS-RTX OS</Description>
99
<Level>HAL</Level>
1010
<LibraryFile>CMSIS_RTX.$(LIB_EXT)</LibraryFile>
11-
<ProjectPath>$(SPOCLIENT)\CMSIS\CMSIS_RTX\dotNetMF.proj</ProjectPath>
11+
<ProjectPath>$(SPOCLIENT)\CMSIS\CMSIS\RTOS\RTX\dotNetMF.proj</ProjectPath>
1212
<ManifestFile>CMSIS_RTX.$(LIB_EXT).manifest</ManifestFile>
1313
<Groups>OS\CMSIS_RTOS</Groups>
1414
<LibraryCategory>
@@ -31,8 +31,8 @@
3131
</PropertyGroup>
3232
<Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
3333
<ItemGroup>
34-
<IncludePaths Include="CMSIS\CMSIS_RTX\INC" />
35-
<IncludePaths Include="CMSIS\CMSIS_RTX\SRC" />
34+
<IncludePaths Include="CMSIS\CMSIS\RTOS\RTX\INC" />
35+
<IncludePaths Include="CMSIS\CMSIS\RTOS\RTX\SRC" />
3636
<IncludePaths Include="CMSIS\CMSIS\Include" />
3737
<IncludePaths Include="CMSIS\CMSIS\Driver\Include" />
3838
</ItemGroup>

CMSIS/ReadMe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
This folder is a placeholder for the CMSIS source code installation. CMSIS is available from ARM on
33
the [ARM web site](http://www.arm.com/products/processors/cortex-m/cortex-microcontroller-software-interface-standard.php)
44

5-
CMSIS comes as a ZIP file, **_the version this code base is validated and tested with is v4.2 (CMSIS-SP-00300-r4p2-00rel0.zip)_**
5+
CMSIS comes as a ZIP file, **_the version this code base is validated and tested with is v4.3 (CMSIS-SP-00300-r4p3-00rel0.zip)_**
66
Extract the contents of the zip file into the same directory as this readme.md file. The build system will look for the
77
CMSIS support files here.

Solutions/MCBSTM32F400/TinyCLR/TinyCLR.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@
426426
<RequiredProjects Include="$(SPOCLIENT)\CLR\libraries\spot_net\dotNetMF.proj" />
427427
</ItemGroup>
428428
<ItemGroup>
429-
<RequiredProjects Include="$(SPOCLIENT)\CMSIS\CMSIS_RTX\dotnetmf.proj" />
429+
<RequiredProjects Include="$(SPOCLIENT)\CMSIS\CMSIS\RTOS\RTX\dotnetmf.proj" />
430430
<DriverLibs Include="CMSIS_RTX.$(LIB_EXT)" />
431431
</ItemGroup>
432432
<ItemGroup>

0 commit comments

Comments
 (0)