From: richardbarry Date: Sat, 21 Jan 2012 19:01:04 +0000 (+0000) Subject: In files added a few moments ago: X-Git-Tag: V7.1.1~73 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4f2144c3a37eea2dfad11486c787ef2a6a58b10f;p=freertos In files added a few moments ago: + Correct version number in comments at top of file. + Correct path in batch file. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1673 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/Demo/CORTEX_M0_LPC1114_LPCXpresso/RTOSDemo/CreateProjectDirectoryStructure.bat b/Demo/CORTEX_M0_LPC1114_LPCXpresso/RTOSDemo/CreateProjectDirectoryStructure.bat index 2d7bbd3f8..c4cc9712a 100644 --- a/Demo/CORTEX_M0_LPC1114_LPCXpresso/RTOSDemo/CreateProjectDirectoryStructure.bat +++ b/Demo/CORTEX_M0_LPC1114_LPCXpresso/RTOSDemo/CreateProjectDirectoryStructure.bat @@ -31,7 +31,7 @@ IF EXIST Source\FreeRTOS_Source Goto END copy ..\..\..\Source\include\*.* Source\FreeRTOS_Source\include REM Copy the portable layer files - copy ..\..\..\Source\portable\GCC\ARM_CM3\*.* Source\FreeRTOS_Source\portable\GCC\ARM_CM0 + copy ..\..\..\Source\portable\GCC\ARM_CM0\*.* Source\FreeRTOS_Source\portable\GCC\ARM_CM0 REM Copy the basic memory allocation files copy ..\..\..\Source\portable\MemMang\heap_1.c Source\FreeRTOS_Source\portable\MemMang diff --git a/Demo/CORTEX_M0_LPC1114_LPCXpresso/RTOSDemo/Source/main.c b/Demo/CORTEX_M0_LPC1114_LPCXpresso/RTOSDemo/Source/main.c index ee9c67c66..da6f3ea13 100644 --- a/Demo/CORTEX_M0_LPC1114_LPCXpresso/RTOSDemo/Source/main.c +++ b/Demo/CORTEX_M0_LPC1114_LPCXpresso/RTOSDemo/Source/main.c @@ -67,7 +67,7 @@ * *****************************************************************************/ -//#error The batch file Demo\CORTEX_M0_LPC1114_LPCXpresso\RTOSDemo\CreateProjectDirectoryStructure.bat must be executed before the first build. After executing the batch file hit F5 to refrech the Eclipse project, then delete this line. +#error The batch file Demo\CORTEX_M0_LPC1114_LPCXpresso\RTOSDemo\CreateProjectDirectoryStructure.bat must be executed before the first build. After executing the batch file hit F5 to refrech the Eclipse project, then delete this line. /* Standard includes. */ #include "string.h" diff --git a/Source/portable/GCC/ARM_CM0/portmacro.h b/Source/portable/GCC/ARM_CM0/portmacro.h index 4b0c13780..ee1b1e3b4 100644 --- a/Source/portable/GCC/ARM_CM0/portmacro.h +++ b/Source/portable/GCC/ARM_CM0/portmacro.h @@ -1,7 +1,6 @@ /* - FreeRTOS V7.0.1 - Copyright (C) 2011 Real Time Engineers Ltd. + FreeRTOS V7.1.0 - Copyright (C) 2011 Real Time Engineers Ltd. - Giancarlo version (corrects inappropriate use of BASEPRI) *************************************************************************** * *