Merge pull request #216 from cw2/issue-186-cmsis-update

Update CMSIS to 4.3.0

Author: smaillet-ms

.gitignore

@@ -7,10 +7,9 @@
 
 # CMSIS and CMSIS_RTX
 /CMSIS/CMSIS/
-/CMSIS/CMSIS_RTX/*
 /CMSIS/Device/*
 /CMSIS/ARM.CMSIS.pdsc
-!/CMSIS/CMSIS_RTX/dotNetMF.proj
+!/CMSIS/CMSIS/RTOS/RTX/dotNetMF.proj
 
 # Visual Studio
 *.aps

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

@@ -8,7 +8,7 @@
         <Description>CMSIS-RTX OS</Description>
         <Level>HAL</Level>
         <LibraryFile>CMSIS_RTX.$(LIB_EXT)</LibraryFile>
-        <ProjectPath>$(SPOCLIENT)\CMSIS\CMSIS_RTX\dotNetMF.proj</ProjectPath>
+        <ProjectPath>$(SPOCLIENT)\CMSIS\CMSIS\RTOS\RTX\dotNetMF.proj</ProjectPath>
         <ManifestFile>CMSIS_RTX.$(LIB_EXT).manifest</ManifestFile>
         <Groups>OS\CMSIS_RTOS</Groups>
         <LibraryCategory>
@@ -31,8 +31,8 @@
     </PropertyGroup>
     <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Settings" />
     <ItemGroup>
-        <IncludePaths Include="CMSIS\CMSIS_RTX\INC" />
-        <IncludePaths Include="CMSIS\CMSIS_RTX\SRC" />
+        <IncludePaths Include="CMSIS\CMSIS\RTOS\RTX\INC" />
+        <IncludePaths Include="CMSIS\CMSIS\RTOS\RTX\SRC" />
         <IncludePaths Include="CMSIS\CMSIS\Include" />
         <IncludePaths Include="CMSIS\CMSIS\Driver\Include" />
     </ItemGroup>

CMSIS/CMSIS_RTX/dotNetMF.proj CMSIS/CMSIS/RTOS/RTX/dotNetMF.projCMSIS/CMSIS_RTX/dotNetMF.proj renamed to CMSIS/CMSIS/RTOS/RTX/dotNetMF.proj

@@ -2,6 +2,6 @@
 This folder is a placeholder for the CMSIS source code installation. CMSIS is available from ARM on
 the [ARM web site](http://www.arm.com/products/processors/cortex-m/cortex-microcontroller-software-interface-standard.php)
 
-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)_**
+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)_**
 Extract the contents of the zip file into the same directory as this readme.md file. The build system will look for the 
 CMSIS support files here.

CMSIS/ReadMe.md

@@ -15,15 +15,15 @@
     <TARGETCODEBASE>CMSIS_RTOS</TARGETCODEBASE>
     <TARGETCODEBASETYPE>OS</TARGETCODEBASETYPE>
     <IsSolutionWizardVisible>false</IsSolutionWizardVisible>
+    <CMSIS_RequiredVersion>4.3.0</CMSIS_RequiredVersion>
   </PropertyGroup>
   <ItemGroup>
     <CC_CPP_Defines Include="__CMSIS_RTOS" />
-	<CC_CPP_Defines Include="PLATFORM_ARM_OS_PORT" />
+    <CC_CPP_Defines Include="PLATFORM_ARM_OS_PORT" />
   </ItemGroup>
   <ItemGroup>
     <IncludePaths Include="CMSIS\CMSIS\Include" />
-    <IncludePaths Include="CMSIS\CMSIS_RTX" />
-    <IncludePaths Include="CMSIS\CMSIS_RTX\INC" />
+    <IncludePaths Include="CMSIS\CMSIS\RTOS\RTX\INC" />
   </ItemGroup>
   <ItemGroup Condition="'$(TCP_IP_STACK)'=='LWIP_1_4_1_OS'">
     <IncludePaths Include="DeviceCode\Targets\OS\CMSIS_RTOS\DeviceCode\lwip_1_4_1_os"/>
@@ -33,5 +33,15 @@
                Condition="!EXISTS('$(SPOCLIENT)\CMSIS\ARM.CMSIS.pdsc')"
                Text="Missing CMSIS installation at: $(SPOCLIENT)\CMSIS\*"
                />
+        <!-- Check CMSIS version -->
+        <XmlPeek XmlInputPath="$(SPOCLIENT)\CMSIS\ARM.CMSIS.pdsc"
+                 Query="/package/releases/release[1]/@version"
+                >
+          <Output TaskParameter="Result" PropertyName="CMSIS_CurrentVersion" />
+        </XmlPeek>
+        <Error Code="NETMFBLD"
+               Condition="'$(CMSIS_RequiredVersion)'!='$(CMSIS_CurrentVersion)'"
+               Text="Required CMSIS version $(CMSIS_RequiredVersion) (detected $(CMSIS_CurrentVersion))"
+               />
     </Target>
 </Project>

DeviceCode/Targets/OS/CMSIS_RTOS/CMSIS_RTOS.settings

@@ -56,7 +56,6 @@
     <Compile Include="tinyhal.cpp" />
     <Compile Include="SystemState.cpp" />
     <IncludePaths Include="DeviceCode\Targets\Native\STM32F4\DeviceCode" />
-    <IncludePaths Include="DeviceCode\Cores\arm\CMSIS\Include" />
   </ItemGroup>
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Targets" />
 </Project>

Solutions/MCBSTM32F400/DeviceCode/Initialization/dotNetMF.proj

@@ -58,7 +58,6 @@
     <Compile Include="tinyhal.cpp" />
     <Compile Include="SystemState.cpp" />
     <IncludePaths Include="DeviceCode\Targets\Native\STM32F4\DeviceCode" />
-    <IncludePaths Include="DeviceCode\Cores\arm\CMSIS\Include" />
   </ItemGroup>
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Targets" />
 </Project>

Solutions/MCBSTM32F400/DeviceCode/Initialization/dotNetMF_loader.proj

@@ -426,7 +426,7 @@
         <RequiredProjects Include="$(SPOCLIENT)\CLR\libraries\spot_net\dotNetMF.proj" />
     </ItemGroup>
     <ItemGroup>
-        <RequiredProjects Include="$(SPOCLIENT)\CMSIS\CMSIS_RTX\dotnetmf.proj" />
+        <RequiredProjects Include="$(SPOCLIENT)\CMSIS\CMSIS\RTOS\RTX\dotnetmf.proj" />
         <DriverLibs Include="CMSIS_RTX.$(LIB_EXT)" />
     </ItemGroup>
     <ItemGroup>

Solutions/MCBSTM32F400/TinyCLR/TinyCLR.proj

@@ -56,7 +56,6 @@
     <Compile Include="tinyhal.cpp" />
     <Compile Include="SystemState.cpp" />
     <IncludePaths Include="DeviceCode\Targets\Native\STM32F4\DeviceCode" />
-    <IncludePaths Include="DeviceCode\Cores\arm\CMSIS\Include" />
   </ItemGroup>
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Targets" />
 </Project>

Solutions/STM32F4DISCOVERY/DeviceCode/Initialization/dotNetMF.proj

@@ -58,7 +58,6 @@
     <Compile Include="tinyhal.cpp" />
     <Compile Include="SystemState.cpp" />
     <IncludePaths Include="DeviceCode\Targets\Native\STM32F4\DeviceCode" />
-    <IncludePaths Include="DeviceCode\Cores\arm\CMSIS\Include" />
   </ItemGroup>
   <Import Project="$(SPOCLIENT)\tools\targets\Microsoft.SPOT.System.Targets" />
 </Project>