Update CMSIS to 4.5

CMSIS/ReadMe.md

@@ -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.3 (CMSIS-SP-00300-r4p3-00rel0.zip)_**
+CMSIS comes as a ZIP file, **_the version this code base is validated and tested with is v4.5 (CMSIS-SP-00300-r4p5-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.

DeviceCode/Targets/OS/CMSIS_RTOS/CMSIS_RTOS.settings

@@ -1,4 +1,5 @@
-<Project ToolsVersion="4.0" InitialTargets="CheckPreRquisitesInstalled" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" InitialTargets="CheckPreRquisitesInstalled" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Name>CMSIS_RTOS</Name>
     <DefaultISA>Thumb2</DefaultISA>
@@ -15,11 +16,12 @@
     <TARGETCODEBASE>CMSIS_RTOS</TARGETCODEBASE>
     <TARGETCODEBASETYPE>OS</TARGETCODEBASETYPE>
     <IsSolutionWizardVisible>false</IsSolutionWizardVisible>
-    <CMSIS_RequiredVersion>4.3.0</CMSIS_RequiredVersion>
+    <CMSIS_RequiredVersion>4.5.0</CMSIS_RequiredVersion>
   </PropertyGroup>
   <ItemGroup>
     <CC_CPP_Defines Include="__CMSIS_RTOS" />
     <CC_CPP_Defines Include="PLATFORM_ARM_OS_PORT" />
+    <CC_CPP_Defines Include="__FPU_PRESENT" />
   </ItemGroup>
   <ItemGroup>
     <IncludePaths Include="CMSIS\CMSIS\Include" />

DeviceCode/Targets/OS/CMSIS_RTOS/cmsis_os_cpp.h

@@ -9,14 +9,14 @@
 #error "Unsupported CMSIS version: This header requires a CMSIS-RTOS API implementation with at least version 1.2"
 #endif
 
-#if !defined(osCMSIS_RTX) || osCMSIS_RTX != CMSIS_VERSION(4, 78)
+#if !defined(osCMSIS_RTX) || osCMSIS_RTX != CMSIS_VERSION(4, 80)
 // unfortunately the implementation of the osXxxxDef and other similar macros
 // are implementation defined and, at least for CMSIS-RTX cannot be used to
 // declare a C++ data member. Thus, this header is specific to a particular 
 // version of CMSIS-RTX and requires re-evaluation and verification on any
 // other versions. The structures can and have changed even on minor version
 // changes, so the check here is for an exact match on the supported version.
-#error "Unsupported CMSIS-RTOS implementation: This header requires the CMSIS-RTX v4.78 implementation of the CMSIS-RTOS API"
+#error "Unsupported CMSIS-RTOS implementation: This header requires the CMSIS-RTX v4.80 implementation of the CMSIS-RTOS API"
 #endif
 
 // The following two fields are culled from the CMSIS-RTX header implementation