Remove unnecessary use of portLONG, portCHAR and portSHORT.

Change version number in headers.
diff --git a/Demo/Common/Full/BlockQ.c b/Demo/Common/Full/BlockQ.c
index d6e77bf..fd8fbc6 100644
--- a/Demo/Common/Full/BlockQ.c
+++ b/Demo/Common/Full/BlockQ.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /**

@@ -81,7 +82,7 @@
 Changes from V2.0.0

 

 	+ Delay periods are now specified using variables and constants of

-	  portTickType rather than unsigned portLONG.

+	  portTickType rather than unsigned long.

 

 Changes from V4.0.2

 

@@ -101,7 +102,7 @@
 #include "BlockQ.h"

 #include "print.h"

 

-#define blckqSTACK_SIZE		( ( unsigned portSHORT ) configMINIMAL_STACK_SIZE )

+#define blckqSTACK_SIZE		( ( unsigned short ) configMINIMAL_STACK_SIZE )

 #define blckqNUM_TASK_SETS	( 3 )

 

 /* Structure used to pass parameters to the blocking queue tasks. */

@@ -109,7 +110,7 @@
 {

 	xQueueHandle xQueue;					/*< The queue to be used by the task. */

 	portTickType xBlockTime;			/*< The block time to use on queue reads/writes. */

-	volatile portSHORT *psCheckVariable;	/*< Incremented on each successful cycle to check the task is still running. */

+	volatile short *psCheckVariable;	/*< Incremented on each successful cycle to check the task is still running. */

 } xBlockingQueueParameters;

 

 /* Task function that creates an incrementing number and posts it on a queue. */

@@ -122,11 +123,11 @@
 /* Variables which are incremented each time an item is removed from a queue, and 

 found to be the expected value. 

 These are used to check that the tasks are still running. */

-static volatile portSHORT sBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( portSHORT ) 0, ( portSHORT ) 0, ( portSHORT ) 0 };

+static volatile short sBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( short ) 0, ( short ) 0, ( short ) 0 };

 

 /* Variable which are incremented each time an item is posted on a queue.   These 

 are used to check that the tasks are still running. */

-static volatile portSHORT sBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( portSHORT ) 0, ( portSHORT ) 0, ( portSHORT ) 0 };

+static volatile short sBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( short ) 0, ( short ) 0, ( short ) 0 };

 

 /*-----------------------------------------------------------*/

 

@@ -146,7 +147,7 @@
 

 	/* Create the queue used by the first two tasks to pass the incrementing number.  

 	Pass a pointer to the queue in the parameter structure. */

-	pxQueueParameters1->xQueue = xQueueCreate( uxQueueSize1, ( unsigned portBASE_TYPE ) sizeof( unsigned portSHORT ) );

+	pxQueueParameters1->xQueue = xQueueCreate( uxQueueSize1, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) );

 

 	/* The consumer is created first so gets a block time as described above. */

 	pxQueueParameters1->xBlockTime = xBlockTime;

@@ -181,7 +182,7 @@
 	the same mechanism but reverses the task priorities. */

 

 	pxQueueParameters3 = ( xBlockingQueueParameters * ) pvPortMalloc( sizeof( xBlockingQueueParameters ) );

-	pxQueueParameters3->xQueue = xQueueCreate( uxQueueSize1, ( unsigned portBASE_TYPE ) sizeof( unsigned portSHORT ) );

+	pxQueueParameters3->xQueue = xQueueCreate( uxQueueSize1, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) );

 	pxQueueParameters3->xBlockTime = xDontBlock;

 	pxQueueParameters3->psCheckVariable = &( sBlockingProducerCount[ 1 ] );

 

@@ -198,7 +199,7 @@
 	/* Create the last two tasks as described above.  The mechanism is again just 

 	the same.  This time both parameter structures are given a block time. */

 	pxQueueParameters5 = ( xBlockingQueueParameters * ) pvPortMalloc( sizeof( xBlockingQueueParameters ) );

-	pxQueueParameters5->xQueue = xQueueCreate( uxQueueSize5, ( unsigned portBASE_TYPE ) sizeof( unsigned portSHORT ) );

+	pxQueueParameters5->xQueue = xQueueCreate( uxQueueSize5, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) );

 	pxQueueParameters5->xBlockTime = xBlockTime;

 	pxQueueParameters5->psCheckVariable = &( sBlockingProducerCount[ 2 ] );

 

@@ -214,11 +215,11 @@
 

 static void vBlockingQueueProducer( void *pvParameters )

 {

-unsigned portSHORT usValue = 0;

+unsigned short usValue = 0;

 xBlockingQueueParameters *pxQueueParameters;

-const portCHAR * const pcTaskStartMsg = "Blocking queue producer started.\r\n";

-const portCHAR * const pcTaskErrorMsg = "Could not post on blocking queue\r\n";

-portSHORT sErrorEverOccurred = pdFALSE;

+const char * const pcTaskStartMsg = "Blocking queue producer started.\r\n";

+const char * const pcTaskErrorMsg = "Could not post on blocking queue\r\n";

+short sErrorEverOccurred = pdFALSE;

 

 	pxQueueParameters = ( xBlockingQueueParameters * ) pvParameters;

 

@@ -251,11 +252,11 @@
 

 static void vBlockingQueueConsumer( void *pvParameters )

 {

-unsigned portSHORT usData, usExpectedValue = 0;

+unsigned short usData, usExpectedValue = 0;

 xBlockingQueueParameters *pxQueueParameters;

-const portCHAR * const pcTaskStartMsg = "Blocking queue consumer started.\r\n";

-const portCHAR * const pcTaskErrorMsg = "Incorrect value received on blocking queue.\r\n";

-portSHORT sErrorEverOccurred = pdFALSE;

+const char * const pcTaskStartMsg = "Blocking queue consumer started.\r\n";

+const char * const pcTaskErrorMsg = "Incorrect value received on blocking queue.\r\n";

+short sErrorEverOccurred = pdFALSE;

 

 	/* Queue a message for printing to say the task has started. */

 	vPrintDisplayMessage( &pcTaskStartMsg );

@@ -296,8 +297,8 @@
 /* This is called to check that all the created tasks are still running. */

 portBASE_TYPE xAreBlockingQueuesStillRunning( void )

 {

-static portSHORT sLastBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( portSHORT ) 0, ( portSHORT ) 0, ( portSHORT ) 0 };

-static portSHORT sLastBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( portSHORT ) 0, ( portSHORT ) 0, ( portSHORT ) 0 };

+static short sLastBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( short ) 0, ( short ) 0, ( short ) 0 };

+static short sLastBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( short ) 0, ( short ) 0, ( short ) 0 };

 portBASE_TYPE xReturn = pdPASS, xTasks;

 

 	/* Not too worried about mutual exclusion on these variables as they are 16 

diff --git a/Demo/Common/Full/PollQ.c b/Demo/Common/Full/PollQ.c
index 3bc9fc2..161c8af 100644
--- a/Demo/Common/Full/PollQ.c
+++ b/Demo/Common/Full/PollQ.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 

@@ -76,7 +77,7 @@
 Changes from V2.0.0

 

 	+ Delay periods are now specified using variables and constants of

-	  portTickType rather than unsigned portLONG.

+	  portTickType rather than unsigned long.

 */

 

 #include <stdlib.h>

@@ -90,7 +91,7 @@
 /* Demo program include files. */

 #include "PollQ.h"

 

-#define pollqSTACK_SIZE		( ( unsigned portSHORT ) configMINIMAL_STACK_SIZE )

+#define pollqSTACK_SIZE		( ( unsigned short ) configMINIMAL_STACK_SIZE )

 

 /* The task that posts the incrementing number onto the queue. */

 static void vPolledQueueProducer( void *pvParameters );

@@ -99,7 +100,7 @@
 static void vPolledQueueConsumer( void *pvParameters );

 

 /* Variables that are used to check that the tasks are still running with no errors. */

-static volatile portSHORT sPollingConsumerCount = 0, sPollingProducerCount = 0;

+static volatile short sPollingConsumerCount = 0, sPollingProducerCount = 0;

 /*-----------------------------------------------------------*/

 

 void vStartPolledQueueTasks( unsigned portBASE_TYPE uxPriority )

@@ -108,7 +109,7 @@
 const unsigned portBASE_TYPE uxQueueSize = 10;

 

 	/* Create the queue used by the producer and consumer. */

-	xPolledQueue = xQueueCreate( uxQueueSize, ( unsigned portBASE_TYPE ) sizeof( unsigned portSHORT ) );

+	xPolledQueue = xQueueCreate( uxQueueSize, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) );

 

 	/* Spawn the producer and consumer. */

 	xTaskCreate( vPolledQueueConsumer, "QConsNB", pollqSTACK_SIZE, ( void * ) &xPolledQueue, uxPriority, NULL );

@@ -118,13 +119,13 @@
 

 static void vPolledQueueProducer( void *pvParameters )

 {

-unsigned portSHORT usValue = 0, usLoop;

+unsigned short usValue = 0, usLoop;

 xQueueHandle *pxQueue;

 const portTickType xDelay = ( portTickType ) 200 / portTICK_RATE_MS;

-const unsigned portSHORT usNumToProduce = 3;

-const portCHAR * const pcTaskStartMsg = "Polled queue producer started.\r\n";

-const portCHAR * const pcTaskErrorMsg = "Could not post on polled queue.\r\n";

-portSHORT sError = pdFALSE;

+const unsigned short usNumToProduce = 3;

+const char * const pcTaskStartMsg = "Polled queue producer started.\r\n";

+const char * const pcTaskErrorMsg = "Could not post on polled queue.\r\n";

+short sError = pdFALSE;

 

 	/* Queue a message for printing to say the task has started. */

 	vPrintDisplayMessage( &pcTaskStartMsg );

@@ -166,12 +167,12 @@
 

 static void vPolledQueueConsumer( void *pvParameters )

 {

-unsigned portSHORT usData, usExpectedValue = 0;

+unsigned short usData, usExpectedValue = 0;

 xQueueHandle *pxQueue;

 const portTickType xDelay = ( portTickType ) 200 / portTICK_RATE_MS;

-const portCHAR * const pcTaskStartMsg = "Polled queue consumer started.\r\n";

-const portCHAR * const pcTaskErrorMsg = "Incorrect value received on polled queue.\r\n";

-portSHORT sError = pdFALSE;

+const char * const pcTaskStartMsg = "Polled queue consumer started.\r\n";

+const char * const pcTaskErrorMsg = "Incorrect value received on polled queue.\r\n";

+short sError = pdFALSE;

 

 	/* Queue a message for printing to say the task has started. */

 	vPrintDisplayMessage( &pcTaskStartMsg );

@@ -219,7 +220,7 @@
 /* This is called to check that all the created tasks are still running with no errors. */

 portBASE_TYPE xArePollingQueuesStillRunning( void )

 {

-static portSHORT sLastPollingConsumerCount = 0, sLastPollingProducerCount = 0;

+static short sLastPollingConsumerCount = 0, sLastPollingProducerCount = 0;

 portBASE_TYPE xReturn;

 

 	if( ( sLastPollingConsumerCount == sPollingConsumerCount ) ||

diff --git a/Demo/Common/Full/comtest.c b/Demo/Common/Full/comtest.c
index 0b59cec..2e72e66 100644
--- a/Demo/Common/Full/comtest.c
+++ b/Demo/Common/Full/comtest.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /**

@@ -102,7 +103,7 @@
 Changes from V2.0.0

 

 	+ Delay periods are now specified using variables and constants of

-	  portTickType rather than unsigned portLONG.

+	  portTickType rather than unsigned long.

 	+ Slight modification to task priorities.

 

 */

@@ -126,7 +127,7 @@
 

 #define comMAX_CONSECUTIVE_ERRORS	( 2 )

 

-#define comSTACK_SIZE				( ( unsigned portSHORT ) 256 )

+#define comSTACK_SIZE				( ( unsigned short ) 256 )

 

 #define comRX_RELATIVE_PRIORITY		( 1 )

 

@@ -143,12 +144,12 @@
 static void vSemTestTask( void * pvParameters );

 

 /* The string that is repeatedly transmitted. */

-const portCHAR * const pcMessageToExchange = 	"Send this message over and over again to check communications interrupts. "

+const char * const pcMessageToExchange = 	"Send this message over and over again to check communications interrupts. "

 									   			"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\r\n";

 

 /* Variables that are incremented on each cycle of each task.  These are used to 

 check that both tasks are still executing. */

-volatile portSHORT sTxCount = 0, sRxCount = 0, sSemCount = 0;

+volatile short sTxCount = 0, sRxCount = 0, sSemCount = 0;

 

 /* The handle to the semaphore test task. */

 static xTaskHandle xSemTestTaskHandle = NULL;

@@ -169,7 +170,7 @@
 

 static void vComTxTask( void *pvParameters )

 {

-const portCHAR * const pcTaskStartMsg = "COM Tx task started.\r\n";

+const char * const pcTaskStartMsg = "COM Tx task started.\r\n";

 portTickType xTimeToWait;

 

 	/* Stop warnings. */

@@ -206,15 +207,15 @@
 

 static void vComRxTask( void *pvParameters )

 {

-const portCHAR * const pcTaskStartMsg = "COM Rx task started.\r\n";

-const portCHAR * const pcTaskErrorMsg = "COM read error\r\n";

-const portCHAR * const pcTaskRestartMsg = "COM resynced\r\n";

-const portCHAR * const pcTaskTimeoutMsg = "COM Rx timed out\r\n";

+const char * const pcTaskStartMsg = "COM Rx task started.\r\n";

+const char * const pcTaskErrorMsg = "COM read error\r\n";

+const char * const pcTaskRestartMsg = "COM resynced\r\n";

+const char * const pcTaskTimeoutMsg = "COM Rx timed out\r\n";

 const portTickType xBlockTime = ( portTickType ) 0xffff / portTICK_RATE_MS;

-const portCHAR *pcExpectedChar;

+const char *pcExpectedChar;

 portBASE_TYPE xGotChar;

-portCHAR cRxedChar;

-portSHORT sResyncRequired, sConsecutiveErrors, sLatchedError;

+char cRxedChar;

+short sResyncRequired, sConsecutiveErrors, sLatchedError;

 

 	/* Stop warnings. */

 	( void ) pvParameters;

@@ -303,7 +304,7 @@
 

 static void vSemTestTask( void * pvParameters )

 {

-const portCHAR * const pcTaskStartMsg = "ISR Semaphore test started.\r\n";

+const char * const pcTaskStartMsg = "ISR Semaphore test started.\r\n";

 portBASE_TYPE xError = pdFALSE;

 

  	/* Stop warnings. */

@@ -332,7 +333,7 @@
 /* This is called to check that all the created tasks are still running. */

 portBASE_TYPE xAreComTestTasksStillRunning( void )

 {

-static portSHORT sLastTxCount = 0, sLastRxCount = 0, sLastSemCount = 0;

+static short sLastTxCount = 0, sLastRxCount = 0, sLastSemCount = 0;

 portBASE_TYPE xReturn;

 

 	/* Not too worried about mutual exclusion on these variables as they are 16 

diff --git a/Demo/Common/Full/death.c b/Demo/Common/Full/death.c
index 6230cec..04f63f1 100644
--- a/Demo/Common/Full/death.c
+++ b/Demo/Common/Full/death.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /**

@@ -68,7 +69,7 @@
 Changes from V2.0.0

 

 	+ Delay periods are now specified using variables and constants of

-	  portTickType rather than unsigned portLONG.

+	  portTickType rather than unsigned long.

 */

 

 #include <stdlib.h>

@@ -81,7 +82,7 @@
 #include "death.h"

 #include "print.h"

 

-#define deathSTACK_SIZE		( ( unsigned portSHORT ) 512 )

+#define deathSTACK_SIZE		( ( unsigned short ) 512 )

 

 /* The task originally created which is responsible for periodically dynamically 

 creating another four tasks. */

@@ -92,7 +93,7 @@
 

 /* A variable which is incremented every time the dynamic tasks are created.  This 

 is used to check that the task is still running. */

-static volatile portSHORT sCreationCount = 0;

+static volatile short sCreationCount = 0;

 

 /* Used to store the number of tasks that were originally running so the creator 

 task can tell if any of the suicidal tasks have failed to die. */

@@ -165,7 +166,7 @@
 {

 const portTickType xDelay = ( portTickType ) 1000 / portTICK_RATE_MS;

 unsigned portBASE_TYPE uxPriority;

-const portCHAR * const pcTaskStartMsg = "Create task started.\r\n";

+const char * const pcTaskStartMsg = "Create task started.\r\n";

 

 	/* Queue a message for printing to say the task has started. */

 	vPrintDisplayMessage( &pcTaskStartMsg );

@@ -193,8 +194,8 @@
 are not any more than four extra tasks. */

 portBASE_TYPE xIsCreateTaskStillRunning( void )

 {

-static portSHORT sLastCreationCount = 0;

-portSHORT sReturn = pdTRUE;

+static short sLastCreationCount = 0;

+short sReturn = pdTRUE;

 unsigned portBASE_TYPE uxTasksRunningNow;

 

 	if( sLastCreationCount == sCreationCount )

diff --git a/Demo/Common/Full/dynamic.c b/Demo/Common/Full/dynamic.c
index 761e1e7..be88424 100644
--- a/Demo/Common/Full/dynamic.c
+++ b/Demo/Common/Full/dynamic.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /**

@@ -114,7 +115,7 @@
 Changes from V2.0.0

 

 	+ Delay periods are now specified using variables and constants of

-	  portTickType rather than unsigned portLONG.

+	  portTickType rather than unsigned long.

 	+ Added a second, simple test that uses the functions 

 	  vQueueReceiveWhenSuspendedTask() and vQueueSendWhenSuspendedTask().

 

@@ -158,10 +159,10 @@
 

 

 /* Demo task specific constants. */

-#define priSTACK_SIZE				( ( unsigned portSHORT ) configMINIMAL_STACK_SIZE )

+#define priSTACK_SIZE				( ( unsigned short ) configMINIMAL_STACK_SIZE )

 #define priSLEEP_TIME				( ( portTickType ) 50 )

 #define priLOOPS					( 5 )

-#define priMAX_COUNT				( ( unsigned portLONG ) 0xff )

+#define priMAX_COUNT				( ( unsigned long ) 0xff )

 #define priNO_BLOCK					( ( portTickType ) 0 )

 #define priSUSPENDED_QUEUE_LENGTH	( 1 )

 

@@ -173,17 +174,17 @@
 

 /* The shared counter variable.  This is passed in as a parameter to the two 

 counter variables for demonstration purposes. */

-static unsigned portLONG ulCounter;

+static unsigned long ulCounter;

 

 /* Variable used in a similar way by the test that checks the raising and

 lowering of task priorities while the scheduler is suspended. */

-static unsigned portLONG ulPrioritySetCounter;

+static unsigned long ulPrioritySetCounter;

 

 /* Variables used to check that the tasks are still operating without error.

 Each complete iteration of the controller task increments this variable

 provided no errors have been found.  The variable maintaining the same value

 is therefore indication of an error. */

-static unsigned portSHORT usCheckVariable = ( unsigned portSHORT ) 0;

+static unsigned short usCheckVariable = ( unsigned short ) 0;

 static portBASE_TYPE xSuspendedQueueSendError = pdFALSE;

 static portBASE_TYPE xSuspendedQueueReceiveError = pdFALSE;

 static portBASE_TYPE xPriorityRaiseWhenSuspendedError = pdFALSE;

@@ -198,7 +199,7 @@
  */

 void vStartDynamicPriorityTasks( void )

 {

-	xSuspendedTestQueue = xQueueCreate( priSUSPENDED_QUEUE_LENGTH, sizeof( unsigned portLONG ) );

+	xSuspendedTestQueue = xQueueCreate( priSUSPENDED_QUEUE_LENGTH, sizeof( unsigned long ) );

 	xTaskCreate( vContinuousIncrementTask, "CONT_INC", priSTACK_SIZE, ( void * ) &ulCounter, tskIDLE_PRIORITY, &xContinuousIncrementHandle );

 	xTaskCreate( vLimitedIncrementTask, "LIM_INC", priSTACK_SIZE, ( void * ) &ulCounter, tskIDLE_PRIORITY + 1, &xLimitedIncrementHandle );

 	xTaskCreate( vCounterControlTask, "C_CTRL", priSTACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );

@@ -215,11 +216,11 @@
  */

 static void vLimitedIncrementTask( void * pvParameters )

 {

-unsigned portLONG *pulCounter;

+unsigned long *pulCounter;

 

 	/* Take a pointer to the shared variable from the parameters passed into

 	the task. */

-	pulCounter = ( unsigned portLONG * ) pvParameters;

+	pulCounter = ( unsigned long * ) pvParameters;

 

 	/* This will run before the control task, so the first thing it does is

 	suspend - the control task will resume it when ready. */

@@ -244,12 +245,12 @@
  */

 static void vContinuousIncrementTask( void * pvParameters )

 {

-unsigned portLONG *pulCounter;

+unsigned long *pulCounter;

 unsigned portBASE_TYPE uxOurPriority;

 

 	/* Take a pointer to the shared variable from the parameters passed into

 	the task. */

-	pulCounter = ( unsigned portLONG * ) pvParameters;

+	pulCounter = ( unsigned long * ) pvParameters;

 

 	/* Query our priority so we can raise it when exclusive access to the 

 	shared variable is required. */

@@ -275,11 +276,11 @@
  */

 static void vCounterControlTask( void * pvParameters )

 {

-unsigned portLONG ulLastCounter;

-portSHORT sLoops;

-portSHORT sError = pdFALSE;

-const portCHAR * const pcTaskStartMsg = "Priority manipulation tasks started.\r\n";

-const portCHAR * const pcTaskFailMsg = "Priority manipulation Task Failed\r\n";

+unsigned long ulLastCounter;

+short sLoops;

+short sError = pdFALSE;

+const char * const pcTaskStartMsg = "Priority manipulation tasks started.\r\n";

+const char * const pcTaskFailMsg = "Priority manipulation Task Failed\r\n";

 

 	/* Just to stop warning messages. */

 	( void ) pvParameters;

@@ -290,7 +291,7 @@
 	for( ;; )

 	{

 		/* Start with the counter at zero. */

-		ulCounter = ( unsigned portLONG ) 0;

+		ulCounter = ( unsigned long ) 0;

 

 		/* First section : */

 

@@ -331,7 +332,7 @@
 		vTaskSuspend( xContinuousIncrementHandle );

 

 		/* Reset the variable. */

-		ulCounter = ( unsigned portLONG ) 0;

+		ulCounter = ( unsigned long ) 0;

 

 		/* Resume the limited count task which has a higher priority than us.

 		We should therefore not return from this call until the limited count

@@ -369,9 +370,9 @@
 

 static void vQueueSendWhenSuspendedTask( void *pvParameters )

 {

-static unsigned portLONG ulValueToSend = ( unsigned portLONG ) 0;

-const portCHAR * const pcTaskStartMsg = "Queue send while suspended task started.\r\n";

-const portCHAR * const pcTaskFailMsg = "Queue send while suspended failed.\r\n";

+static unsigned long ulValueToSend = ( unsigned long ) 0;

+const char * const pcTaskStartMsg = "Queue send while suspended task started.\r\n";

+const char * const pcTaskFailMsg = "Queue send while suspended failed.\r\n";

 

 	/* Just to stop warning messages. */

 	( void ) pvParameters;

@@ -407,9 +408,9 @@
 

 static void vQueueReceiveWhenSuspendedTask( void *pvParameters )

 {

-static unsigned portLONG ulExpectedValue = ( unsigned portLONG ) 0, ulReceivedValue;

-const portCHAR * const pcTaskStartMsg = "Queue receive while suspended task started.\r\n";

-const portCHAR * const pcTaskFailMsg = "Queue receive while suspended failed.\r\n";

+static unsigned long ulExpectedValue = ( unsigned long ) 0, ulReceivedValue;

+const char * const pcTaskStartMsg = "Queue receive while suspended task started.\r\n";

+const char * const pcTaskFailMsg = "Queue receive while suspended failed.\r\n";

 portBASE_TYPE xGotValue;

 

 	/* Just to stop warning messages. */

@@ -462,8 +463,8 @@
 

 static void prvChangePriorityWhenSuspendedTask( void *pvParameters )

 {

-const portCHAR * const pcTaskStartMsg = "Priority change when suspended task started.\r\n";

-const portCHAR * const pcTaskFailMsg = "Priority change when suspended task failed.\r\n";

+const char * const pcTaskStartMsg = "Priority change when suspended task started.\r\n";

+const char * const pcTaskFailMsg = "Priority change when suspended task failed.\r\n";

 

 	/* Just to stop warning messages. */

 	( void ) pvParameters;

@@ -475,7 +476,7 @@
 	{

 		/* Start with the counter at 0 so we know what the counter should be

 		when we check it next. */

-		ulPrioritySetCounter = ( unsigned portLONG ) 0;

+		ulPrioritySetCounter = ( unsigned long ) 0;

 

 		/* Resume the helper task.  At this time it has a priority lower than

 		ours so no context switch should occur. */

@@ -484,7 +485,7 @@
 		/* Check to ensure the task just resumed has not executed. */

 		portENTER_CRITICAL();

 		{

-			if( ulPrioritySetCounter != ( unsigned portLONG ) 0 )

+			if( ulPrioritySetCounter != ( unsigned long ) 0 )

 			{

 				xPriorityRaiseWhenSuspendedError = pdTRUE;

 				vPrintDisplayMessage( &pcTaskFailMsg );

@@ -502,7 +503,7 @@
 			suspended. */

 			portENTER_CRITICAL();

 			{

-				if( ulPrioritySetCounter != ( unsigned portLONG ) 0 )

+				if( ulPrioritySetCounter != ( unsigned long ) 0 )

 				{

 					xPriorityRaiseWhenSuspendedError = pdTRUE;

 					vPrintDisplayMessage( &pcTaskFailMsg );

@@ -519,7 +520,7 @@
 		We should now always find the counter set to 1. */

 		portENTER_CRITICAL();

 		{

-			if( ulPrioritySetCounter != ( unsigned portLONG ) 1 )

+			if( ulPrioritySetCounter != ( unsigned long ) 1 )

 			{

 				xPriorityRaiseWhenSuspendedError = pdTRUE;

 				vPrintDisplayMessage( &pcTaskFailMsg );

@@ -562,7 +563,7 @@
 {

 /* Keep a history of the check variables so we know if it has been incremented 

 since the last call. */

-static unsigned portSHORT usLastTaskCheck = ( unsigned portSHORT ) 0;

+static unsigned short usLastTaskCheck = ( unsigned short ) 0;

 portBASE_TYPE xReturn = pdTRUE;

 

 	/* Check the tasks are still running by ensuring the check variable

diff --git a/Demo/Common/Full/events.c b/Demo/Common/Full/events.c
index 4f60b33..6cbf01b 100644
--- a/Demo/Common/Full/events.c
+++ b/Demo/Common/Full/events.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /**

@@ -171,7 +172,7 @@
 {

 portBASE_TYPE *pxCounter;

 unsigned portBASE_TYPE uxDummy;

-const portCHAR * const pcTaskStartMsg = "Multi event task started.\r\n";

+const char * const pcTaskStartMsg = "Multi event task started.\r\n";

 

 	/* The variable this task will increment is passed in as a parameter. */

 	pxCounter = ( portBASE_TYPE * ) pvParameters;

@@ -197,7 +198,7 @@
 

 static void prvEventControllerTask( void *pvParameters )

 {

-const portCHAR * const pcTaskStartMsg = "Multi event controller task started.\r\n";

+const char * const pcTaskStartMsg = "Multi event controller task started.\r\n";

 portBASE_TYPE xDummy = 0;

 

 	/* Just to stop warnings. */

diff --git a/Demo/Common/Full/flash.c b/Demo/Common/Full/flash.c
index aec2462..6689f25 100644
--- a/Demo/Common/Full/flash.c
+++ b/Demo/Common/Full/flash.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 

@@ -65,7 +66,7 @@
 Changes from V2.0.0

 

 	+ Delay periods are now specified using variables and constants of

-	  portTickType rather than unsigned portLONG.

+	  portTickType rather than unsigned long.

 

 Changes from V2.1.1

 

@@ -98,7 +99,7 @@
 static void vLEDFlashTask( void *pvParameters );

 

 /* String to print if USE_STDIO is defined. */

-const portCHAR * const pcTaskStartMsg = "LED flash task started.\r\n";

+const char * const pcTaskStartMsg = "LED flash task started.\r\n";

 

 /*-----------------------------------------------------------*/

 

diff --git a/Demo/Common/Full/flop.c b/Demo/Common/Full/flop.c
index 4a02fb4..1c4f30b 100644
--- a/Demo/Common/Full/flop.c
+++ b/Demo/Common/Full/flop.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

@@ -80,7 +81,7 @@
 /* Demo program include files. */

 #include "flop.h"

 

-#define mathSTACK_SIZE		( ( unsigned portSHORT ) 512 )

+#define mathSTACK_SIZE		( ( unsigned short ) 512 )

 #define mathNUMBER_OF_TASKS  ( 8 )

 

 /* Four tasks, each of which performs a different floating point calculation.  

@@ -93,7 +94,7 @@
 /* These variables are used to check that all the tasks are still running.  If a 

 task gets a calculation wrong it will

 stop incrementing its check variable. */

-static volatile unsigned portSHORT usTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned portSHORT ) 0 };

+static volatile unsigned short usTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned short ) 0 };

 

 /*-----------------------------------------------------------*/

 

@@ -113,18 +114,18 @@
 static void vCompetingMathTask1( void *pvParameters )

 {

 portDOUBLE d1, d2, d3, d4;

-volatile unsigned portSHORT *pusTaskCheckVariable;

+volatile unsigned short *pusTaskCheckVariable;

 const portDOUBLE dAnswer = ( 123.4567 + 2345.6789 ) * -918.222;

-const portCHAR * const pcTaskStartMsg = "Math task 1 started.\r\n";

-const portCHAR * const pcTaskFailMsg = "Math task 1 failed.\r\n";

-portSHORT sError = pdFALSE;

+const char * const pcTaskStartMsg = "Math task 1 started.\r\n";

+const char * const pcTaskFailMsg = "Math task 1 failed.\r\n";

+short sError = pdFALSE;

 

 	/* Queue a message for printing to say the task has started. */

 	vPrintDisplayMessage( &pcTaskStartMsg );

 

 	/* The variable this task increments to show it is still running is passed in 

 	as the parameter. */

-	pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters;

+	pusTaskCheckVariable = ( unsigned short * ) pvParameters;

 

 	/* Keep performing a calculation and checking the result against a constant. */

 	for(;;)

@@ -160,18 +161,18 @@
 static void vCompetingMathTask2( void *pvParameters )

 {

 portDOUBLE d1, d2, d3, d4;

-volatile unsigned portSHORT *pusTaskCheckVariable;

+volatile unsigned short *pusTaskCheckVariable;

 const portDOUBLE dAnswer = ( -389.38 / 32498.2 ) * -2.0001;

-const portCHAR * const pcTaskStartMsg = "Math task 2 started.\r\n";

-const portCHAR * const pcTaskFailMsg = "Math task 2 failed.\r\n";

-portSHORT sError = pdFALSE;

+const char * const pcTaskStartMsg = "Math task 2 started.\r\n";

+const char * const pcTaskFailMsg = "Math task 2 failed.\r\n";

+short sError = pdFALSE;

 

 	/* Queue a message for printing to say the task has started. */

 	vPrintDisplayMessage( &pcTaskStartMsg );

 

 	/* The variable this task increments to show it is still running is passed in 

 	as the parameter. */

-	pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters;

+	pusTaskCheckVariable = ( unsigned short * ) pvParameters;

 

 	/* Keep performing a calculation and checking the result against a constant. */

 	for( ;; )

@@ -208,19 +209,19 @@
 static void vCompetingMathTask3( void *pvParameters )

 {

 portDOUBLE *pdArray, dTotal1, dTotal2, dDifference;

-volatile unsigned portSHORT *pusTaskCheckVariable;

-const unsigned portSHORT usArraySize = 250;

-unsigned portSHORT usPosition;

-const portCHAR * const pcTaskStartMsg = "Math task 3 started.\r\n";

-const portCHAR * const pcTaskFailMsg = "Math task 3 failed.\r\n";

-portSHORT sError = pdFALSE;

+volatile unsigned short *pusTaskCheckVariable;

+const unsigned short usArraySize = 250;

+unsigned short usPosition;

+const char * const pcTaskStartMsg = "Math task 3 started.\r\n";

+const char * const pcTaskFailMsg = "Math task 3 failed.\r\n";

+short sError = pdFALSE;

 

 	/* Queue a message for printing to say the task has started. */

 	vPrintDisplayMessage( &pcTaskStartMsg );

 

 	/* The variable this task increments to show it is still running is passed in 

 	as the parameter. */

-	pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters;

+	pusTaskCheckVariable = ( unsigned short * ) pvParameters;

 

 	pdArray = ( portDOUBLE * ) pvPortMalloc( ( size_t ) 250 * sizeof( portDOUBLE ) );

 

@@ -267,19 +268,19 @@
 static void vCompetingMathTask4( void *pvParameters )

 {

 portDOUBLE *pdArray, dTotal1, dTotal2, dDifference;

-volatile unsigned portSHORT *pusTaskCheckVariable;

-const unsigned portSHORT usArraySize = 250;

-unsigned portSHORT usPosition;

-const portCHAR * const pcTaskStartMsg = "Math task 4 started.\r\n";

-const portCHAR * const pcTaskFailMsg = "Math task 4 failed.\r\n";

-portSHORT sError = pdFALSE;

+volatile unsigned short *pusTaskCheckVariable;

+const unsigned short usArraySize = 250;

+unsigned short usPosition;

+const char * const pcTaskStartMsg = "Math task 4 started.\r\n";

+const char * const pcTaskFailMsg = "Math task 4 failed.\r\n";

+short sError = pdFALSE;

 

 	/* Queue a message for printing to say the task has started. */

 	vPrintDisplayMessage( &pcTaskStartMsg );

 

 	/* The variable this task increments to show it is still running is passed in 

 	as the parameter. */

-	pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters;

+	pusTaskCheckVariable = ( unsigned short * ) pvParameters;

 

 	pdArray = ( portDOUBLE * ) pvPortMalloc( ( size_t ) 250 * sizeof( portDOUBLE ) );

 

@@ -328,7 +329,7 @@
 {

 /* Keep a history of the check variables so we know if they have been incremented 

 since the last call. */

-static unsigned portSHORT usLastTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned portSHORT ) 0 };

+static unsigned short usLastTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned short ) 0 };

 portBASE_TYPE xReturn = pdTRUE, xTask;

 

 	/* Check the maths tasks are still running by ensuring their check variables 

diff --git a/Demo/Common/Full/integer.c b/Demo/Common/Full/integer.c
index 6af19fb..cabbacc 100644
--- a/Demo/Common/Full/integer.c
+++ b/Demo/Common/Full/integer.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

@@ -85,7 +86,7 @@
 /* Demo program include files. */

 #include "integer.h"

 

-#define intgSTACK_SIZE		( ( unsigned portSHORT ) 256 )

+#define intgSTACK_SIZE		( ( unsigned short ) 256 )

 #define intgNUMBER_OF_TASKS  ( 8 )

 

 /* Four tasks, each of which performs a different calculation on four byte 

@@ -97,7 +98,7 @@
 

 /* These variables are used to check that all the tasks are still running.  If a 

 task gets a calculation wrong it will stop incrementing its check variable. */

-static volatile unsigned portSHORT usTaskCheck[ intgNUMBER_OF_TASKS ] = { ( unsigned portSHORT ) 0 };

+static volatile unsigned short usTaskCheck[ intgNUMBER_OF_TASKS ] = { ( unsigned short ) 0 };

 /*-----------------------------------------------------------*/

 

 void vStartIntegerMathTasks( unsigned portBASE_TYPE uxPriority )

@@ -115,26 +116,26 @@
 

 static void vCompeteingIntMathTask1( void *pvParameters )

 {

-portLONG l1, l2, l3, l4;

-portSHORT sError = pdFALSE;

-volatile unsigned portSHORT *pusTaskCheckVariable;

-const portLONG lAnswer = ( ( portLONG ) 74565L + ( portLONG ) 1234567L ) * ( portLONG ) -918L;

-const portCHAR * const pcTaskStartMsg = "Integer math task 1 started.\r\n";

-const portCHAR * const pcTaskFailMsg = "Integer math task 1 failed.\r\n";

+long l1, l2, l3, l4;

+short sError = pdFALSE;

+volatile unsigned short *pusTaskCheckVariable;

+const long lAnswer = ( ( long ) 74565L + ( long ) 1234567L ) * ( long ) -918L;

+const char * const pcTaskStartMsg = "Integer math task 1 started.\r\n";

+const char * const pcTaskFailMsg = "Integer math task 1 failed.\r\n";

 

 	/* Queue a message for printing to say the task has started. */

 	vPrintDisplayMessage( &pcTaskStartMsg );

 

 	/* The variable this task increments to show it is still running is passed in

 	as the parameter. */

-	pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters;

+	pusTaskCheckVariable = ( unsigned short * ) pvParameters;

 

 	/* Keep performing a calculation and checking the result against a constant. */

 	for(;;)

 	{

-		l1 = ( portLONG ) 74565L;

-		l2 = ( portLONG ) 1234567L;

-		l3 = ( portLONG ) -918L;

+		l1 = ( long ) 74565L;

+		l2 = ( long ) 1234567L;

+		l3 = ( long ) -918L;

 

 		l4 = ( l1 + l2 ) * l3;

 

@@ -160,19 +161,19 @@
 

 static void vCompeteingIntMathTask2( void *pvParameters )

 {

-portLONG l1, l2, l3, l4;

-portSHORT sError = pdFALSE;

-volatile unsigned portSHORT *pusTaskCheckVariable;

-const portLONG lAnswer = ( ( portLONG ) -389000L / ( portLONG ) 329999L ) * ( portLONG ) -89L;

-const portCHAR * const pcTaskStartMsg = "Integer math task 2 started.\r\n";

-const portCHAR * const pcTaskFailMsg = "Integer math task 2 failed.\r\n";

+long l1, l2, l3, l4;

+short sError = pdFALSE;

+volatile unsigned short *pusTaskCheckVariable;

+const long lAnswer = ( ( long ) -389000L / ( long ) 329999L ) * ( long ) -89L;

+const char * const pcTaskStartMsg = "Integer math task 2 started.\r\n";

+const char * const pcTaskFailMsg = "Integer math task 2 failed.\r\n";

 

 	/* Queue a message for printing to say the task has started. */

 	vPrintDisplayMessage( &pcTaskStartMsg );

 

 	/* The variable this task increments to show it is still running is passed in

 	as the parameter. */

-	pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters;

+	pusTaskCheckVariable = ( unsigned short * ) pvParameters;

 

 	/* Keep performing a calculation and checking the result against a constant. */

 	for( ;; )

@@ -205,36 +206,36 @@
 

 static void vCompeteingIntMathTask3( void *pvParameters )

 {

-portLONG *plArray, lTotal1, lTotal2;

-portSHORT sError = pdFALSE;

-volatile unsigned portSHORT *pusTaskCheckVariable;

-const unsigned portSHORT usArraySize = ( unsigned portSHORT ) 250;

-unsigned portSHORT usPosition;

-const portCHAR * const pcTaskStartMsg = "Integer math task 3 started.\r\n";

-const portCHAR * const pcTaskFailMsg = "Integer math task 3 failed.\r\n";

+long *plArray, lTotal1, lTotal2;

+short sError = pdFALSE;

+volatile unsigned short *pusTaskCheckVariable;

+const unsigned short usArraySize = ( unsigned short ) 250;

+unsigned short usPosition;

+const char * const pcTaskStartMsg = "Integer math task 3 started.\r\n";

+const char * const pcTaskFailMsg = "Integer math task 3 failed.\r\n";

 

 	/* Queue a message for printing to say the task has started. */

 	vPrintDisplayMessage( &pcTaskStartMsg );

 

 	/* The variable this task increments to show it is still running is passed in

 	as the parameter. */

-	pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters;

+	pusTaskCheckVariable = ( unsigned short * ) pvParameters;

 

 	/* Create the array we are going to use for our check calculation. */

-	plArray = ( portLONG * ) pvPortMalloc( ( size_t ) 250 * sizeof( portLONG ) );

+	plArray = ( long * ) pvPortMalloc( ( size_t ) 250 * sizeof( long ) );

 

 	/* Keep filling the array, keeping a running total of the values placed in the

 	array.  Then run through the array adding up all the values.  If the two totals

 	do not match, stop the check variable from incrementing. */

 	for( ;; )

 	{

-		lTotal1 = ( portLONG ) 0;

-		lTotal2 = ( portLONG ) 0;

+		lTotal1 = ( long ) 0;

+		lTotal2 = ( long ) 0;

 

 		for( usPosition = 0; usPosition < usArraySize; usPosition++ )

 		{

-			plArray[ usPosition ] = ( portLONG ) usPosition + ( portLONG ) 5;

-			lTotal1 += ( portLONG ) usPosition + ( portLONG ) 5;

+			plArray[ usPosition ] = ( long ) usPosition + ( long ) 5;

+			lTotal1 += ( long ) usPosition + ( long ) 5;

 		}

 

 		taskYIELD();

@@ -264,36 +265,36 @@
 

 static void vCompeteingIntMathTask4( void *pvParameters )

 {

-portLONG *plArray, lTotal1, lTotal2;

-portSHORT sError = pdFALSE;

-volatile unsigned portSHORT *pusTaskCheckVariable;

-const unsigned portSHORT usArraySize = 250;

-unsigned portSHORT usPosition;

-const portCHAR * const pcTaskStartMsg = "Integer math task 4 started.\r\n";

-const portCHAR * const pcTaskFailMsg = "Integer math task 4 failed.\r\n";

+long *plArray, lTotal1, lTotal2;

+short sError = pdFALSE;

+volatile unsigned short *pusTaskCheckVariable;

+const unsigned short usArraySize = 250;

+unsigned short usPosition;

+const char * const pcTaskStartMsg = "Integer math task 4 started.\r\n";

+const char * const pcTaskFailMsg = "Integer math task 4 failed.\r\n";

 

 	/* Queue a message for printing to say the task has started. */

 	vPrintDisplayMessage( &pcTaskStartMsg );

 

 	/* The variable this task increments to show it is still running is passed in

 	as the parameter. */

-	pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters;

+	pusTaskCheckVariable = ( unsigned short * ) pvParameters;

 

 	/* Create the array we are going to use for our check calculation. */

-	plArray = ( portLONG * ) pvPortMalloc( ( size_t ) 250 * sizeof( portLONG ) );

+	plArray = ( long * ) pvPortMalloc( ( size_t ) 250 * sizeof( long ) );

 

 	/* Keep filling the array, keeping a running total of the values placed in the 

 	array.  Then run through the array adding up all the values.  If the two totals 

 	do not match, stop the check variable from incrementing. */

 	for( ;; )

 	{

-		lTotal1 = ( portLONG ) 0;

-		lTotal2 = ( portLONG ) 0;

+		lTotal1 = ( long ) 0;

+		lTotal2 = ( long ) 0;

 

 		for( usPosition = 0; usPosition < usArraySize; usPosition++ )

 		{

-			plArray[ usPosition ] = ( portLONG ) usPosition * ( portLONG ) 12;

-			lTotal1 += ( portLONG ) usPosition * ( portLONG ) 12;	

+			plArray[ usPosition ] = ( long ) usPosition * ( long ) 12;

+			lTotal1 += ( long ) usPosition * ( long ) 12;	

 		}

 

 		taskYIELD();

@@ -327,7 +328,7 @@
 {

 /* Keep a history of the check variables so we know if they have been incremented 

 since the last call. */

-static unsigned portSHORT usLastTaskCheck[ intgNUMBER_OF_TASKS ] = { ( unsigned portSHORT ) 0 };

+static unsigned short usLastTaskCheck[ intgNUMBER_OF_TASKS ] = { ( unsigned short ) 0 };

 portBASE_TYPE xReturn = pdTRUE, xTask;

 

 	/* Check the maths tasks are still running by ensuring their check variables 

diff --git a/Demo/Common/Full/print.c b/Demo/Common/Full/print.c
index b421cfb..9e2746e 100644
--- a/Demo/Common/Full/print.c
+++ b/Demo/Common/Full/print.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /**

@@ -73,7 +74,7 @@
 Changes from V2.0.0

 

 	+ Delay periods are now specified using variables and constants of

-	  portTickType rather than unsigned portLONG.

+	  portTickType rather than unsigned long.

 */

 

 #include <stdlib.h>

@@ -94,11 +95,11 @@
 const unsigned portBASE_TYPE uxQueueSize = 20;

 

 	/* Create the queue on which errors will be reported. */

-	xPrintQueue = xQueueCreate( uxQueueSize, ( unsigned portBASE_TYPE ) sizeof( portCHAR * ) );

+	xPrintQueue = xQueueCreate( uxQueueSize, ( unsigned portBASE_TYPE ) sizeof( char * ) );

 }

 /*-----------------------------------------------------------*/

 

-void vPrintDisplayMessage( const portCHAR * const * ppcMessageToSend )

+void vPrintDisplayMessage( const char * const * ppcMessageToSend )

 {

 	#ifdef USE_STDIO

 		xQueueSend( xPrintQueue, ( void * ) ppcMessageToSend, ( portTickType ) 0 );

@@ -109,9 +110,9 @@
 }

 /*-----------------------------------------------------------*/

 

-const portCHAR *pcPrintGetNextMessage( portTickType xPrintRate )

+const char *pcPrintGetNextMessage( portTickType xPrintRate )

 {

-portCHAR *pcMessage;

+char *pcMessage;

 

 	if( xQueueReceive( xPrintQueue, &pcMessage, xPrintRate ) == pdPASS )

 	{

diff --git a/Demo/Common/Full/semtest.c b/Demo/Common/Full/semtest.c
index c6e0c4d..33192da 100644
--- a/Demo/Common/Full/semtest.c
+++ b/Demo/Common/Full/semtest.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /**

@@ -83,7 +84,7 @@
 Changes from V2.0.0

 

 	+ Delay periods are now specified using variables and constants of

-	  portTickType rather than unsigned portLONG.

+	  portTickType rather than unsigned long.

 

 Changes from V2.1.1

 

@@ -103,8 +104,8 @@
 #include "print.h"

 

 /* The value to which the shared variables are counted. */

-#define semtstBLOCKING_EXPECTED_VALUE		( ( unsigned portLONG ) 0xfff )

-#define semtstNON_BLOCKING_EXPECTED_VALUE	( ( unsigned portLONG ) 0xff  )

+#define semtstBLOCKING_EXPECTED_VALUE		( ( unsigned long ) 0xfff )

+#define semtstNON_BLOCKING_EXPECTED_VALUE	( ( unsigned long ) 0xff  )

 

 #define semtstSTACK_SIZE			configMINIMAL_STACK_SIZE

 

@@ -119,17 +120,17 @@
 typedef struct SEMAPHORE_PARAMETERS

 {

 	xSemaphoreHandle xSemaphore;

-	volatile unsigned portLONG *pulSharedVariable;

+	volatile unsigned long *pulSharedVariable;

 	portTickType xBlockTime;

 } xSemaphoreParameters;

 

 /* Variables used to check that all the tasks are still running without errors. */

-static volatile portSHORT sCheckVariables[ semtstNUM_TASKS ] = { 0 };

-static volatile portSHORT sNextCheckVariable = 0;

+static volatile short sCheckVariables[ semtstNUM_TASKS ] = { 0 };

+static volatile short sNextCheckVariable = 0;

 

 /* Strings to print if USE_STDIO is defined. */

-const portCHAR * const pcPollingSemaphoreTaskError = "Guarded shared variable in unexpected state.\r\n";

-const portCHAR * const pcSemaphoreTaskStart = "Guarded shared variable task started.\r\n";

+const char * const pcPollingSemaphoreTaskError = "Guarded shared variable in unexpected state.\r\n";

+const char * const pcSemaphoreTaskStart = "Guarded shared variable task started.\r\n";

 

 /*-----------------------------------------------------------*/

 

@@ -149,7 +150,7 @@
 		if( pxFirstSemaphoreParameters->xSemaphore != NULL )

 		{

 			/* Create the variable which is to be shared by the first two tasks. */

-			pxFirstSemaphoreParameters->pulSharedVariable = ( unsigned portLONG * ) pvPortMalloc( sizeof( unsigned portLONG ) );

+			pxFirstSemaphoreParameters->pulSharedVariable = ( unsigned long * ) pvPortMalloc( sizeof( unsigned long ) );

 

 			/* Initialise the share variable to the value the tasks expect. */

 			*( pxFirstSemaphoreParameters->pulSharedVariable ) = semtstNON_BLOCKING_EXPECTED_VALUE;

@@ -172,7 +173,7 @@
 

 		if( pxSecondSemaphoreParameters->xSemaphore != NULL )

 		{

-			pxSecondSemaphoreParameters->pulSharedVariable = ( unsigned portLONG * ) pvPortMalloc( sizeof( unsigned portLONG ) );

+			pxSecondSemaphoreParameters->pulSharedVariable = ( unsigned long * ) pvPortMalloc( sizeof( unsigned long ) );

 			*( pxSecondSemaphoreParameters->pulSharedVariable ) = semtstBLOCKING_EXPECTED_VALUE;

 			pxSecondSemaphoreParameters->xBlockTime = xBlockTime / portTICK_RATE_MS;

 

@@ -186,9 +187,9 @@
 static void prvSemaphoreTest( void *pvParameters )

 {

 xSemaphoreParameters *pxParameters;

-volatile unsigned portLONG *pulSharedVariable, ulExpectedValue;

-unsigned portLONG ulCounter;

-portSHORT sError = pdFALSE, sCheckVariableToUse;

+volatile unsigned long *pulSharedVariable, ulExpectedValue;

+unsigned long ulCounter;

+short sError = pdFALSE, sCheckVariableToUse;

 

 	/* See which check variable to use.  sNextCheckVariable is not semaphore 

 	protected! */

@@ -233,7 +234,7 @@
 			/* Clear the variable, then count it back up to the expected value

 			before releasing the semaphore.  Would expect a context switch or

 			two during this time. */

-			for( ulCounter = ( unsigned portLONG ) 0; ulCounter <= ulExpectedValue; ulCounter++ )

+			for( ulCounter = ( unsigned long ) 0; ulCounter <= ulExpectedValue; ulCounter++ )

 			{

 				*pulSharedVariable = ulCounter;

 				if( *pulSharedVariable != ulCounter )

@@ -286,7 +287,7 @@
 /* This is called to check that all the created tasks are still running. */

 portBASE_TYPE xAreSemaphoreTasksStillRunning( void )

 {

-static portSHORT sLastCheckVariables[ semtstNUM_TASKS ] = { 0 };

+static short sLastCheckVariables[ semtstNUM_TASKS ] = { 0 };

 portBASE_TYPE xTask, xReturn = pdTRUE;

 

 	for( xTask = 0; xTask < semtstNUM_TASKS; xTask++ )

diff --git a/Demo/Common/Minimal/AltBlckQ.c b/Demo/Common/Minimal/AltBlckQ.c
index d474681..9438abc 100644
--- a/Demo/Common/Minimal/AltBlckQ.c
+++ b/Demo/Common/Minimal/AltBlckQ.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

diff --git a/Demo/Common/Minimal/AltBlock.c b/Demo/Common/Minimal/AltBlock.c
index b0a0104..22d50ce 100644
--- a/Demo/Common/Minimal/AltBlock.c
+++ b/Demo/Common/Minimal/AltBlock.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

diff --git a/Demo/Common/Minimal/AltPollQ.c b/Demo/Common/Minimal/AltPollQ.c
index c4d9f7a..0a5ba12 100644
--- a/Demo/Common/Minimal/AltPollQ.c
+++ b/Demo/Common/Minimal/AltPollQ.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

diff --git a/Demo/Common/Minimal/AltQTest.c b/Demo/Common/Minimal/AltQTest.c
index 800fa76..d716aed 100644
--- a/Demo/Common/Minimal/AltQTest.c
+++ b/Demo/Common/Minimal/AltQTest.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 

diff --git a/Demo/Common/Minimal/BlockQ.c b/Demo/Common/Minimal/BlockQ.c
index 783e2f0..29b74f0 100644
--- a/Demo/Common/Minimal/BlockQ.c
+++ b/Demo/Common/Minimal/BlockQ.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

@@ -96,7 +97,7 @@
 {

 	xQueueHandle xQueue;					/*< The queue to be used by the task. */

 	portTickType xBlockTime;				/*< The block time to use on queue reads/writes. */

-	volatile portSHORT *psCheckVariable;	/*< Incremented on each successful cycle to check the task is still running. */

+	volatile short *psCheckVariable;	/*< Incremented on each successful cycle to check the task is still running. */

 } xBlockingQueueParameters;

 

 /* Task function that creates an incrementing number and posts it on a queue. */

@@ -109,11 +110,11 @@
 /* Variables which are incremented each time an item is removed from a queue, and

 found to be the expected value.

 These are used to check that the tasks are still running. */

-static volatile portSHORT sBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0 };

+static volatile short sBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( unsigned short ) 0, ( unsigned short ) 0, ( unsigned short ) 0 };

 

 /* Variable which are incremented each time an item is posted on a queue.   These

 are used to check that the tasks are still running. */

-static volatile portSHORT sBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0 };

+static volatile short sBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( unsigned short ) 0, ( unsigned short ) 0, ( unsigned short ) 0 };

 

 /*-----------------------------------------------------------*/

 

@@ -133,7 +134,7 @@
 

 	/* Create the queue used by the first two tasks to pass the incrementing number.

 	Pass a pointer to the queue in the parameter structure. */

-	pxQueueParameters1->xQueue = xQueueCreate( uxQueueSize1, ( unsigned portBASE_TYPE ) sizeof( unsigned portSHORT ) );

+	pxQueueParameters1->xQueue = xQueueCreate( uxQueueSize1, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) );

 

 	/* The consumer is created first so gets a block time as described above. */

 	pxQueueParameters1->xBlockTime = xBlockTime;

@@ -159,8 +160,8 @@
 

 	/* Note the producer has a lower priority than the consumer when the tasks are

 	spawned. */

-	xTaskCreate( vBlockingQueueConsumer, ( signed portCHAR * ) "QConsB1", blckqSTACK_SIZE, ( void * ) pxQueueParameters1, uxPriority, NULL );

-	xTaskCreate( vBlockingQueueProducer, ( signed portCHAR * ) "QProdB2", blckqSTACK_SIZE, ( void * ) pxQueueParameters2, tskIDLE_PRIORITY, NULL );

+	xTaskCreate( vBlockingQueueConsumer, ( signed char * ) "QConsB1", blckqSTACK_SIZE, ( void * ) pxQueueParameters1, uxPriority, NULL );

+	xTaskCreate( vBlockingQueueProducer, ( signed char * ) "QProdB2", blckqSTACK_SIZE, ( void * ) pxQueueParameters2, tskIDLE_PRIORITY, NULL );

 

 	

 

@@ -168,7 +169,7 @@
 	the same mechanism but reverses the task priorities. */

 

 	pxQueueParameters3 = ( xBlockingQueueParameters * ) pvPortMalloc( sizeof( xBlockingQueueParameters ) );

-	pxQueueParameters3->xQueue = xQueueCreate( uxQueueSize1, ( unsigned portBASE_TYPE ) sizeof( unsigned portSHORT ) );

+	pxQueueParameters3->xQueue = xQueueCreate( uxQueueSize1, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) );

 	pxQueueParameters3->xBlockTime = xDontBlock;

 	pxQueueParameters3->psCheckVariable = &( sBlockingProducerCount[ 1 ] );

 

@@ -177,15 +178,15 @@
 	pxQueueParameters4->xBlockTime = xBlockTime;

 	pxQueueParameters4->psCheckVariable = &( sBlockingConsumerCount[ 1 ] );

 

-	xTaskCreate( vBlockingQueueConsumer, ( signed portCHAR * ) "QProdB3", blckqSTACK_SIZE, ( void * ) pxQueueParameters3, tskIDLE_PRIORITY, NULL );

-	xTaskCreate( vBlockingQueueProducer, ( signed portCHAR * ) "QConsB4", blckqSTACK_SIZE, ( void * ) pxQueueParameters4, uxPriority, NULL );

+	xTaskCreate( vBlockingQueueConsumer, ( signed char * ) "QProdB3", blckqSTACK_SIZE, ( void * ) pxQueueParameters3, tskIDLE_PRIORITY, NULL );

+	xTaskCreate( vBlockingQueueProducer, ( signed char * ) "QConsB4", blckqSTACK_SIZE, ( void * ) pxQueueParameters4, uxPriority, NULL );

 

 

 

 	/* Create the last two tasks as described above.  The mechanism is again just

 	the same.  This time both parameter structures are given a block time. */

 	pxQueueParameters5 = ( xBlockingQueueParameters * ) pvPortMalloc( sizeof( xBlockingQueueParameters ) );

-	pxQueueParameters5->xQueue = xQueueCreate( uxQueueSize5, ( unsigned portBASE_TYPE ) sizeof( unsigned portSHORT ) );

+	pxQueueParameters5->xQueue = xQueueCreate( uxQueueSize5, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) );

 	pxQueueParameters5->xBlockTime = xBlockTime;

 	pxQueueParameters5->psCheckVariable = &( sBlockingProducerCount[ 2 ] );

 

@@ -194,16 +195,16 @@
 	pxQueueParameters6->xBlockTime = xBlockTime;

 	pxQueueParameters6->psCheckVariable = &( sBlockingConsumerCount[ 2 ] );	

 

-	xTaskCreate( vBlockingQueueProducer, ( signed portCHAR * ) "QProdB5", blckqSTACK_SIZE, ( void * ) pxQueueParameters5, tskIDLE_PRIORITY, NULL );

-	xTaskCreate( vBlockingQueueConsumer, ( signed portCHAR * ) "QConsB6", blckqSTACK_SIZE, ( void * ) pxQueueParameters6, tskIDLE_PRIORITY, NULL );

+	xTaskCreate( vBlockingQueueProducer, ( signed char * ) "QProdB5", blckqSTACK_SIZE, ( void * ) pxQueueParameters5, tskIDLE_PRIORITY, NULL );

+	xTaskCreate( vBlockingQueueConsumer, ( signed char * ) "QConsB6", blckqSTACK_SIZE, ( void * ) pxQueueParameters6, tskIDLE_PRIORITY, NULL );

 }

 /*-----------------------------------------------------------*/

 

 static portTASK_FUNCTION( vBlockingQueueProducer, pvParameters )

 {

-unsigned portSHORT usValue = 0;

+unsigned short usValue = 0;

 xBlockingQueueParameters *pxQueueParameters;

-portSHORT sErrorEverOccurred = pdFALSE;

+short sErrorEverOccurred = pdFALSE;

 

 	pxQueueParameters = ( xBlockingQueueParameters * ) pvParameters;

 

@@ -232,9 +233,9 @@
 

 static portTASK_FUNCTION( vBlockingQueueConsumer, pvParameters )

 {

-unsigned portSHORT usData, usExpectedValue = 0;

+unsigned short usData, usExpectedValue = 0;

 xBlockingQueueParameters *pxQueueParameters;

-portSHORT sErrorEverOccurred = pdFALSE;

+short sErrorEverOccurred = pdFALSE;

 

 	pxQueueParameters = ( xBlockingQueueParameters * ) pvParameters;

 

@@ -270,8 +271,8 @@
 /* This is called to check that all the created tasks are still running. */

 portBASE_TYPE xAreBlockingQueuesStillRunning( void )

 {

-static portSHORT sLastBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0 };

-static portSHORT sLastBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0, ( unsigned portSHORT ) 0 };

+static short sLastBlockingConsumerCount[ blckqNUM_TASK_SETS ] = { ( unsigned short ) 0, ( unsigned short ) 0, ( unsigned short ) 0 };

+static short sLastBlockingProducerCount[ blckqNUM_TASK_SETS ] = { ( unsigned short ) 0, ( unsigned short ) 0, ( unsigned short ) 0 };

 portBASE_TYPE xReturn = pdPASS, xTasks;

 

 	/* Not too worried about mutual exclusion on these variables as they are 16

diff --git a/Demo/Common/Minimal/GenQTest.c b/Demo/Common/Minimal/GenQTest.c
index d8dedf4..84656e4 100644
--- a/Demo/Common/Minimal/GenQTest.c
+++ b/Demo/Common/Minimal/GenQTest.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 

diff --git a/Demo/Common/Minimal/IntQueue.c b/Demo/Common/Minimal/IntQueue.c
index db72d35..c02d2c4 100644
--- a/Demo/Common/Minimal/IntQueue.c
+++ b/Demo/Common/Minimal/IntQueue.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

diff --git a/Demo/Common/Minimal/PollQ.c b/Demo/Common/Minimal/PollQ.c
index 265cfca..3cfb85f 100644
--- a/Demo/Common/Minimal/PollQ.c
+++ b/Demo/Common/Minimal/PollQ.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

@@ -72,7 +73,7 @@
 Changes from V2.0.0

 

 	+ Delay periods are now specified using variables and constants of

-	  portTickType rather than unsigned portLONG.

+	  portTickType rather than unsigned long.

 */

 

 #include <stdlib.h>

@@ -110,7 +111,7 @@
 static xQueueHandle xPolledQueue;

 

 	/* Create the queue used by the producer and consumer. */

-	xPolledQueue = xQueueCreate( pollqQUEUE_SIZE, ( unsigned portBASE_TYPE ) sizeof( unsigned portSHORT ) );

+	xPolledQueue = xQueueCreate( pollqQUEUE_SIZE, ( unsigned portBASE_TYPE ) sizeof( unsigned short ) );

 

 	/* vQueueAddToRegistry() adds the queue to the queue registry, if one is

 	in use.  The queue registry is provided as a means for kernel aware 

@@ -118,17 +119,17 @@
 	is not being used.  The call to vQueueAddToRegistry() will be removed

 	by the pre-processor if configQUEUE_REGISTRY_SIZE is not defined or is 

 	defined to be less than 1. */

-	vQueueAddToRegistry( xPolledQueue, ( signed portCHAR * ) "Poll_Test_Queue" );

+	vQueueAddToRegistry( xPolledQueue, ( signed char * ) "Poll_Test_Queue" );

 

 	/* Spawn the producer and consumer. */

-	xTaskCreate( vPolledQueueConsumer, ( signed portCHAR * ) "QConsNB", pollqSTACK_SIZE, ( void * ) &xPolledQueue, uxPriority, ( xTaskHandle * ) NULL );

-	xTaskCreate( vPolledQueueProducer, ( signed portCHAR * ) "QProdNB", pollqSTACK_SIZE, ( void * ) &xPolledQueue, uxPriority, ( xTaskHandle * ) NULL );

+	xTaskCreate( vPolledQueueConsumer, ( signed char * ) "QConsNB", pollqSTACK_SIZE, ( void * ) &xPolledQueue, uxPriority, ( xTaskHandle * ) NULL );

+	xTaskCreate( vPolledQueueProducer, ( signed char * ) "QProdNB", pollqSTACK_SIZE, ( void * ) &xPolledQueue, uxPriority, ( xTaskHandle * ) NULL );

 }

 /*-----------------------------------------------------------*/

 

 static portTASK_FUNCTION( vPolledQueueProducer, pvParameters )

 {

-unsigned portSHORT usValue = ( unsigned portSHORT ) 0;

+unsigned short usValue = ( unsigned short ) 0;

 signed portBASE_TYPE xError = pdFALSE, xLoop;

 

 	for( ;; )

@@ -167,7 +168,7 @@
 

 static portTASK_FUNCTION( vPolledQueueConsumer, pvParameters )

 {

-unsigned portSHORT usData, usExpectedValue = ( unsigned portSHORT ) 0;

+unsigned short usData, usExpectedValue = ( unsigned short ) 0;

 signed portBASE_TYPE xError = pdFALSE;

 

 	for( ;; )

diff --git a/Demo/Common/Minimal/QPeek.c b/Demo/Common/Minimal/QPeek.c
index dec698b..8de33f6 100644
--- a/Demo/Common/Minimal/QPeek.c
+++ b/Demo/Common/Minimal/QPeek.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 

diff --git a/Demo/Common/Minimal/blocktim.c b/Demo/Common/Minimal/blocktim.c
index c94cbe7..e09c546 100644
--- a/Demo/Common/Minimal/blocktim.c
+++ b/Demo/Common/Minimal/blocktim.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

@@ -109,11 +110,11 @@
 	is not being used.  The call to vQueueAddToRegistry() will be removed

 	by the pre-processor if configQUEUE_REGISTRY_SIZE is not defined or is

 	defined to be less than 1. */

-	vQueueAddToRegistry( xTestQueue, ( signed portCHAR * ) "Block_Time_Queue" );

+	vQueueAddToRegistry( xTestQueue, ( signed char * ) "Block_Time_Queue" );

 

 	/* Create the two test tasks. */

-	xTaskCreate( vPrimaryBlockTimeTestTask, ( signed portCHAR * )"BTest1", configMINIMAL_STACK_SIZE, NULL, bktPRIMARY_PRIORITY, NULL );

-	xTaskCreate( vSecondaryBlockTimeTestTask, ( signed portCHAR * )"BTest2", configMINIMAL_STACK_SIZE, NULL, bktSECONDARY_PRIORITY, &xSecondary );

+	xTaskCreate( vPrimaryBlockTimeTestTask, ( signed char * )"BTest1", configMINIMAL_STACK_SIZE, NULL, bktPRIMARY_PRIORITY, NULL );

+	xTaskCreate( vSecondaryBlockTimeTestTask, ( signed char * )"BTest2", configMINIMAL_STACK_SIZE, NULL, bktSECONDARY_PRIORITY, &xSecondary );

 }

 /*-----------------------------------------------------------*/

 

diff --git a/Demo/Common/Minimal/comtest.c b/Demo/Common/Minimal/comtest.c
index 2d3bffd..258b4a2 100644
--- a/Demo/Common/Minimal/comtest.c
+++ b/Demo/Common/Minimal/comtest.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 

@@ -133,21 +134,21 @@
 

 /*-----------------------------------------------------------*/

 

-void vAltStartComTestTasks( unsigned portBASE_TYPE uxPriority, unsigned portLONG ulBaudRate, unsigned portBASE_TYPE uxLED )

+void vAltStartComTestTasks( unsigned portBASE_TYPE uxPriority, unsigned long ulBaudRate, unsigned portBASE_TYPE uxLED )

 {

 	/* Initialise the com port then spawn the Rx and Tx tasks. */

 	uxBaseLED = uxLED;

 	xSerialPortInitMinimal( ulBaudRate, comBUFFER_LEN );

 

 	/* The Tx task is spawned with a lower priority than the Rx task. */

-	xTaskCreate( vComTxTask, ( signed portCHAR * ) "COMTx", comSTACK_SIZE, NULL, uxPriority - 1, ( xTaskHandle * ) NULL );

-	xTaskCreate( vComRxTask, ( signed portCHAR * ) "COMRx", comSTACK_SIZE, NULL, uxPriority, ( xTaskHandle * ) NULL );

+	xTaskCreate( vComTxTask, ( signed char * ) "COMTx", comSTACK_SIZE, NULL, uxPriority - 1, ( xTaskHandle * ) NULL );

+	xTaskCreate( vComRxTask, ( signed char * ) "COMRx", comSTACK_SIZE, NULL, uxPriority, ( xTaskHandle * ) NULL );

 }

 /*-----------------------------------------------------------*/

 

 static portTASK_FUNCTION( vComTxTask, pvParameters )

 {

-signed portCHAR cByteToSend;

+signed char cByteToSend;

 portTickType xTimeToWait;

 

 	/* Just to stop compiler warnings. */

@@ -189,7 +190,7 @@
 

 static portTASK_FUNCTION( vComRxTask, pvParameters )

 {

-signed portCHAR cExpectedByte, cByteRxed;

+signed char cExpectedByte, cByteRxed;

 portBASE_TYPE xResyncRequired = pdFALSE, xErrorOccurred = pdFALSE;

 

 	/* Just to stop compiler warnings. */

diff --git a/Demo/Common/Minimal/countsem.c b/Demo/Common/Minimal/countsem.c
index 0c87eb2..9eb4bc7 100644
--- a/Demo/Common/Minimal/countsem.c
+++ b/Demo/Common/Minimal/countsem.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 

diff --git a/Demo/Common/Minimal/crflash.c b/Demo/Common/Minimal/crflash.c
index 6aefba2..b219c66 100644
--- a/Demo/Common/Minimal/crflash.c
+++ b/Demo/Common/Minimal/crflash.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

diff --git a/Demo/Common/Minimal/crhook.c b/Demo/Common/Minimal/crhook.c
index 5fdd580..228a0f3 100644
--- a/Demo/Common/Minimal/crhook.c
+++ b/Demo/Common/Minimal/crhook.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

diff --git a/Demo/Common/Minimal/death.c b/Demo/Common/Minimal/death.c
index 105f7a8..f97f293 100644
--- a/Demo/Common/Minimal/death.c
+++ b/Demo/Common/Minimal/death.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /**

@@ -67,7 +68,7 @@
 /*

 Changes from V3.0.0

 	+ CreationCount sizes changed from unsigned portBASE_TYPE to

-	  unsigned portSHORT to minimize the risk of overflowing.

+	  unsigned short to minimize the risk of overflowing.

 	

 	+ Reset of usLastCreationCount added

 	

@@ -98,7 +99,7 @@
 

 /* A variable which is incremented every time the dynamic tasks are created.  This

 is used to check that the task is still running. */

-static volatile unsigned portSHORT usCreationCount = 0;

+static volatile unsigned short usCreationCount = 0;

 

 /* Used to store the number of tasks that were originally running so the creator

 task can tell if any of the suicidal tasks have failed to die.

@@ -125,7 +126,7 @@
 	puxPriority = ( unsigned portBASE_TYPE * ) pvPortMalloc( sizeof( unsigned portBASE_TYPE ) );

 	*puxPriority = uxPriority;

 

-	xTaskCreate( vCreateTasks, ( signed portCHAR * ) "CREATOR", deathSTACK_SIZE, ( void * ) puxPriority, uxPriority, NULL );

+	xTaskCreate( vCreateTasks, ( signed char * ) "CREATOR", deathSTACK_SIZE, ( void * ) puxPriority, uxPriority, NULL );

 

 	/* Record the number of tasks that are running now so we know if any of the

 	suicidal tasks have failed to be killed. */

@@ -142,7 +143,7 @@
 					

 static portTASK_FUNCTION( vSuicidalTask, pvParameters )

 {

-volatile portLONG l1, l2;

+volatile long l1, l2;

 xTaskHandle xTaskToKill;

 const portTickType xDelay = ( portTickType ) 200 / portTICK_RATE_MS;

 

@@ -196,8 +197,8 @@
 

 		xCreatedTask = NULL;

 

-		xTaskCreate( vSuicidalTask, ( signed portCHAR * ) "SUICID1", configMINIMAL_STACK_SIZE, NULL, uxPriority, &xCreatedTask );

-		xTaskCreate( vSuicidalTask, ( signed portCHAR * ) "SUICID2", configMINIMAL_STACK_SIZE, &xCreatedTask, uxPriority, NULL );

+		xTaskCreate( vSuicidalTask, ( signed char * ) "SUICID1", configMINIMAL_STACK_SIZE, NULL, uxPriority, &xCreatedTask );

+		xTaskCreate( vSuicidalTask, ( signed char * ) "SUICID2", configMINIMAL_STACK_SIZE, &xCreatedTask, uxPriority, NULL );

 

 		++usCreationCount;

 	}

@@ -208,7 +209,7 @@
 are not any more than four extra tasks. */

 portBASE_TYPE xIsCreateTaskStillRunning( void )

 {

-static unsigned portSHORT usLastCreationCount = 0xfff;

+static unsigned short usLastCreationCount = 0xfff;

 portBASE_TYPE xReturn = pdTRUE;

 static unsigned portBASE_TYPE uxTasksRunningNow;

 

diff --git a/Demo/Common/Minimal/dynamic.c b/Demo/Common/Minimal/dynamic.c
index d2c224e..2b17101 100644
--- a/Demo/Common/Minimal/dynamic.c
+++ b/Demo/Common/Minimal/dynamic.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

@@ -128,7 +129,7 @@
 #define priSTACK_SIZE				( configMINIMAL_STACK_SIZE )

 #define priSLEEP_TIME				( ( portTickType ) 128 / portTICK_RATE_MS )

 #define priLOOPS					( 5 )

-#define priMAX_COUNT				( ( unsigned portLONG ) 0xff )

+#define priMAX_COUNT				( ( unsigned long ) 0xff )

 #define priNO_BLOCK					( ( portTickType ) 0 )

 #define priSUSPENDED_QUEUE_LENGTH	( 1 )

 

@@ -140,13 +141,13 @@
 

 /* The shared counter variable.  This is passed in as a parameter to the two 

 counter variables for demonstration purposes. */

-static unsigned portLONG ulCounter;

+static unsigned long ulCounter;

 

 /* Variables used to check that the tasks are still operating without error.

 Each complete iteration of the controller task increments this variable

 provided no errors have been found.  The variable maintaining the same value

 is therefore indication of an error. */

-static volatile unsigned portSHORT usCheckVariable = ( unsigned portSHORT ) 0;

+static volatile unsigned short usCheckVariable = ( unsigned short ) 0;

 static volatile portBASE_TYPE xSuspendedQueueSendError = pdFALSE;

 static volatile portBASE_TYPE xSuspendedQueueReceiveError = pdFALSE;

 

@@ -160,7 +161,7 @@
  */

 void vStartDynamicPriorityTasks( void )

 {

-	xSuspendedTestQueue = xQueueCreate( priSUSPENDED_QUEUE_LENGTH, sizeof( unsigned portLONG ) );

+	xSuspendedTestQueue = xQueueCreate( priSUSPENDED_QUEUE_LENGTH, sizeof( unsigned long ) );

 

 	/* vQueueAddToRegistry() adds the queue to the queue registry, if one is

 	in use.  The queue registry is provided as a means for kernel aware 

@@ -168,13 +169,13 @@
 	is not being used.  The call to vQueueAddToRegistry() will be removed

 	by the pre-processor if configQUEUE_REGISTRY_SIZE is not defined or is 

 	defined to be less than 1. */

-	vQueueAddToRegistry( xSuspendedTestQueue, ( signed portCHAR * ) "Suspended_Test_Queue" );

+	vQueueAddToRegistry( xSuspendedTestQueue, ( signed char * ) "Suspended_Test_Queue" );

 

-	xTaskCreate( vContinuousIncrementTask, ( signed portCHAR * ) "CNT_INC", priSTACK_SIZE, ( void * ) &ulCounter, tskIDLE_PRIORITY, &xContinousIncrementHandle );

-	xTaskCreate( vLimitedIncrementTask, ( signed portCHAR * ) "LIM_INC", priSTACK_SIZE, ( void * ) &ulCounter, tskIDLE_PRIORITY + 1, &xLimitedIncrementHandle );

-	xTaskCreate( vCounterControlTask, ( signed portCHAR * ) "C_CTRL", priSTACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );

-	xTaskCreate( vQueueSendWhenSuspendedTask, ( signed portCHAR * ) "SUSP_TX", priSTACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );

-	xTaskCreate( vQueueReceiveWhenSuspendedTask, ( signed portCHAR * ) "SUSP_RX", priSTACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );

+	xTaskCreate( vContinuousIncrementTask, ( signed char * ) "CNT_INC", priSTACK_SIZE, ( void * ) &ulCounter, tskIDLE_PRIORITY, &xContinousIncrementHandle );

+	xTaskCreate( vLimitedIncrementTask, ( signed char * ) "LIM_INC", priSTACK_SIZE, ( void * ) &ulCounter, tskIDLE_PRIORITY + 1, &xLimitedIncrementHandle );

+	xTaskCreate( vCounterControlTask, ( signed char * ) "C_CTRL", priSTACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );

+	xTaskCreate( vQueueSendWhenSuspendedTask, ( signed char * ) "SUSP_TX", priSTACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );

+	xTaskCreate( vQueueReceiveWhenSuspendedTask, ( signed char * ) "SUSP_RX", priSTACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );

 }

 /*-----------------------------------------------------------*/

 

@@ -184,11 +185,11 @@
  */

 static portTASK_FUNCTION( vLimitedIncrementTask, pvParameters )

 {

-unsigned portLONG *pulCounter;

+unsigned long *pulCounter;

 

 	/* Take a pointer to the shared variable from the parameters passed into

 	the task. */

-	pulCounter = ( unsigned portLONG * ) pvParameters;

+	pulCounter = ( unsigned long * ) pvParameters;

 

 	/* This will run before the control task, so the first thing it does is

 	suspend - the control task will resume it when ready. */

@@ -213,12 +214,12 @@
  */

 static portTASK_FUNCTION( vContinuousIncrementTask, pvParameters )

 {

-unsigned portLONG *pulCounter;

+unsigned long *pulCounter;

 unsigned portBASE_TYPE uxOurPriority;

 

 	/* Take a pointer to the shared variable from the parameters passed into

 	the task. */

-	pulCounter = ( unsigned portLONG * ) pvParameters;

+	pulCounter = ( unsigned long * ) pvParameters;

 

 	/* Query our priority so we can raise it when exclusive access to the 

 	shared variable is required. */

@@ -240,9 +241,9 @@
  */

 static portTASK_FUNCTION( vCounterControlTask, pvParameters )

 {

-unsigned portLONG ulLastCounter;

-portSHORT sLoops;

-portSHORT sError = pdFALSE;

+unsigned long ulLastCounter;

+short sLoops;

+short sError = pdFALSE;

 

 	/* Just to stop warning messages. */

 	( void ) pvParameters;

@@ -250,7 +251,7 @@
 	for( ;; )

 	{

 		/* Start with the counter at zero. */

-		ulCounter = ( unsigned portLONG ) 0;

+		ulCounter = ( unsigned long ) 0;

 

 		/* First section : */

 

@@ -288,7 +289,7 @@
 		vTaskSuspend( xContinousIncrementHandle );

 

 		/* Reset the variable. */

-		ulCounter = ( unsigned portLONG ) 0;

+		ulCounter = ( unsigned long ) 0;

 

 		/* Resume the limited count task which has a higher priority than us.

 		We should therefore not return from this call until the limited count

@@ -317,7 +318,7 @@
 

 static portTASK_FUNCTION( vQueueSendWhenSuspendedTask, pvParameters )

 {

-static unsigned portLONG ulValueToSend = ( unsigned portLONG ) 0;

+static unsigned long ulValueToSend = ( unsigned long ) 0;

 

 	/* Just to stop warning messages. */

 	( void ) pvParameters;

@@ -343,7 +344,7 @@
 

 static portTASK_FUNCTION( vQueueReceiveWhenSuspendedTask, pvParameters )

 {

-static unsigned portLONG ulExpectedValue = ( unsigned portLONG ) 0, ulReceivedValue;

+static unsigned long ulExpectedValue = ( unsigned long ) 0, ulReceivedValue;

 portBASE_TYPE xGotValue;

 

 	/* Just to stop warning messages. */

@@ -394,7 +395,7 @@
 {

 /* Keep a history of the check variables so we know if it has been incremented 

 since the last call. */

-static unsigned portSHORT usLastTaskCheck = ( unsigned portSHORT ) 0;

+static unsigned short usLastTaskCheck = ( unsigned short ) 0;

 portBASE_TYPE xReturn = pdTRUE;

 

 	/* Check the tasks are still running by ensuring the check variable

diff --git a/Demo/Common/Minimal/flash.c b/Demo/Common/Minimal/flash.c
index 560db43..5d1220a 100644
--- a/Demo/Common/Minimal/flash.c
+++ b/Demo/Common/Minimal/flash.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /**

@@ -90,7 +91,7 @@
 	for( xLEDTask = 0; xLEDTask < ledNUMBER_OF_LEDS; ++xLEDTask )

 	{

 		/* Spawn the task. */

-		xTaskCreate( vLEDFlashTask, ( signed portCHAR * ) "LEDx", ledSTACK_SIZE, NULL, uxPriority, ( xTaskHandle * ) NULL );

+		xTaskCreate( vLEDFlashTask, ( signed char * ) "LEDx", ledSTACK_SIZE, NULL, uxPriority, ( xTaskHandle * ) NULL );

 	}

 }

 /*-----------------------------------------------------------*/

diff --git a/Demo/Common/Minimal/flop.c b/Demo/Common/Minimal/flop.c
index e999b30..a86f1be 100644
--- a/Demo/Common/Minimal/flop.c
+++ b/Demo/Common/Minimal/flop.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

@@ -81,29 +82,29 @@
 /* These variables are used to check that all the tasks are still running.  If a 

 task gets a calculation wrong it will

 stop incrementing its check variable. */

-static volatile unsigned portSHORT usTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned portSHORT ) 0 };

+static volatile unsigned short usTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned short ) 0 };

 

 /*-----------------------------------------------------------*/

 

 void vStartMathTasks( unsigned portBASE_TYPE uxPriority )

 {

-	xTaskCreate( vCompetingMathTask1, ( signed portCHAR * ) "Math1", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 0 ] ), uxPriority, NULL );

-	xTaskCreate( vCompetingMathTask2, ( signed portCHAR * ) "Math2", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 1 ] ), uxPriority, NULL );

-	xTaskCreate( vCompetingMathTask3, ( signed portCHAR * ) "Math3", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 2 ] ), uxPriority, NULL );

-	xTaskCreate( vCompetingMathTask4, ( signed portCHAR * ) "Math4", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 3 ] ), uxPriority, NULL );

-	xTaskCreate( vCompetingMathTask1, ( signed portCHAR * ) "Math5", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 4 ] ), uxPriority, NULL );

-	xTaskCreate( vCompetingMathTask2, ( signed portCHAR * ) "Math6", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 5 ] ), uxPriority, NULL );

-	xTaskCreate( vCompetingMathTask3, ( signed portCHAR * ) "Math7", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 6 ] ), uxPriority, NULL );

-	xTaskCreate( vCompetingMathTask4, ( signed portCHAR * ) "Math8", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 7 ] ), uxPriority, NULL );

+	xTaskCreate( vCompetingMathTask1, ( signed char * ) "Math1", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 0 ] ), uxPriority, NULL );

+	xTaskCreate( vCompetingMathTask2, ( signed char * ) "Math2", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 1 ] ), uxPriority, NULL );

+	xTaskCreate( vCompetingMathTask3, ( signed char * ) "Math3", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 2 ] ), uxPriority, NULL );

+	xTaskCreate( vCompetingMathTask4, ( signed char * ) "Math4", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 3 ] ), uxPriority, NULL );

+	xTaskCreate( vCompetingMathTask1, ( signed char * ) "Math5", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 4 ] ), uxPriority, NULL );

+	xTaskCreate( vCompetingMathTask2, ( signed char * ) "Math6", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 5 ] ), uxPriority, NULL );

+	xTaskCreate( vCompetingMathTask3, ( signed char * ) "Math7", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 6 ] ), uxPriority, NULL );

+	xTaskCreate( vCompetingMathTask4, ( signed char * ) "Math8", mathSTACK_SIZE, ( void * ) &( usTaskCheck[ 7 ] ), uxPriority, NULL );

 }

 /*-----------------------------------------------------------*/

 

 static portTASK_FUNCTION( vCompetingMathTask1, pvParameters )

 {

 volatile portDOUBLE d1, d2, d3, d4;

-volatile unsigned portSHORT *pusTaskCheckVariable;

+volatile unsigned short *pusTaskCheckVariable;

 volatile portDOUBLE dAnswer;

-portSHORT sError = pdFALSE;

+short sError = pdFALSE;

 

 	d1 = 123.4567;

 	d2 = 2345.6789;

@@ -113,7 +114,7 @@
 

 	/* The variable this task increments to show it is still running is passed in 

 	as the parameter. */

-	pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters;

+	pusTaskCheckVariable = ( unsigned short * ) pvParameters;

 

 	/* Keep performing a calculation and checking the result against a constant. */

 	for(;;)

@@ -153,9 +154,9 @@
 static portTASK_FUNCTION( vCompetingMathTask2, pvParameters )

 {

 volatile portDOUBLE d1, d2, d3, d4;

-volatile unsigned portSHORT *pusTaskCheckVariable;

+volatile unsigned short *pusTaskCheckVariable;

 volatile portDOUBLE dAnswer;

-portSHORT sError = pdFALSE;

+short sError = pdFALSE;

 

 	d1 = -389.38;

 	d2 = 32498.2;

@@ -166,7 +167,7 @@
 

 	/* The variable this task increments to show it is still running is passed in 

 	as the parameter. */

-	pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters;

+	pusTaskCheckVariable = ( unsigned short * ) pvParameters;

 

 	/* Keep performing a calculation and checking the result against a constant. */

 	for( ;; )

@@ -206,14 +207,14 @@
 static portTASK_FUNCTION( vCompetingMathTask3, pvParameters )

 {

 volatile portDOUBLE *pdArray, dTotal1, dTotal2, dDifference;

-volatile unsigned portSHORT *pusTaskCheckVariable;

+volatile unsigned short *pusTaskCheckVariable;

 const size_t xArraySize = 10;

 size_t xPosition;

-portSHORT sError = pdFALSE;

+short sError = pdFALSE;

 

 	/* The variable this task increments to show it is still running is passed in 

 	as the parameter. */

-	pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters;

+	pusTaskCheckVariable = ( unsigned short * ) pvParameters;

 

 	pdArray = ( portDOUBLE * ) pvPortMalloc( xArraySize * sizeof( portDOUBLE ) );

 

@@ -263,14 +264,14 @@
 static portTASK_FUNCTION( vCompetingMathTask4, pvParameters )

 {

 volatile portDOUBLE *pdArray, dTotal1, dTotal2, dDifference;

-volatile unsigned portSHORT *pusTaskCheckVariable;

+volatile unsigned short *pusTaskCheckVariable;

 const size_t xArraySize = 10;

 size_t xPosition;

-portSHORT sError = pdFALSE;

+short sError = pdFALSE;

 

 	/* The variable this task increments to show it is still running is passed in 

 	as the parameter. */

-	pusTaskCheckVariable = ( unsigned portSHORT * ) pvParameters;

+	pusTaskCheckVariable = ( unsigned short * ) pvParameters;

 

 	pdArray = ( portDOUBLE * ) pvPortMalloc( xArraySize * sizeof( portDOUBLE ) );

 

@@ -322,7 +323,7 @@
 {

 /* Keep a history of the check variables so we know if they have been incremented 

 since the last call. */

-static unsigned portSHORT usLastTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned portSHORT ) 0 };

+static unsigned short usLastTaskCheck[ mathNUMBER_OF_TASKS ] = { ( unsigned short ) 0 };

 portBASE_TYPE xReturn = pdTRUE, xTask;

 

 	/* Check the maths tasks are still running by ensuring their check variables 

diff --git a/Demo/Common/Minimal/integer.c b/Demo/Common/Minimal/integer.c
index b974919..9dffd7b 100644
--- a/Demo/Common/Minimal/integer.c
+++ b/Demo/Common/Minimal/integer.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

@@ -85,10 +86,10 @@
 #include "integer.h"

 

 /* The constants used in the calculation. */

-#define intgCONST1				( ( portLONG ) 123 )

-#define intgCONST2				( ( portLONG ) 234567 )

-#define intgCONST3				( ( portLONG ) -3 )

-#define intgCONST4				( ( portLONG ) 7 )

+#define intgCONST1				( ( long ) 123 )

+#define intgCONST2				( ( long ) 234567 )

+#define intgCONST3				( ( long ) -3 )

+#define intgCONST4				( ( long ) 7 )

 #define intgEXPECTED_ANSWER		( ( ( intgCONST1 + intgCONST2 ) * intgCONST3 ) / intgCONST4 )

 

 #define intgSTACK_SIZE			configMINIMAL_STACK_SIZE

@@ -111,11 +112,11 @@
 

 void vStartIntegerMathTasks( unsigned portBASE_TYPE uxPriority )

 {

-portSHORT sTask;

+short sTask;

 

 	for( sTask = 0; sTask < intgNUMBER_OF_TASKS; sTask++ )

 	{

-		xTaskCreate( vCompeteingIntMathTask, ( signed portCHAR * ) "IntMath", intgSTACK_SIZE, ( void * ) &( xTaskCheck[ sTask ] ), uxPriority, ( xTaskHandle * ) NULL );

+		xTaskCreate( vCompeteingIntMathTask, ( signed char * ) "IntMath", intgSTACK_SIZE, ( void * ) &( xTaskCheck[ sTask ] ), uxPriority, ( xTaskHandle * ) NULL );

 	}

 }

 /*-----------------------------------------------------------*/

@@ -124,8 +125,8 @@
 {

 /* These variables are all effectively set to constants so they are volatile to

 ensure the compiler does not just get rid of them. */

-volatile portLONG lValue;

-portSHORT sError = pdFALSE;

+volatile long lValue;

+short sError = pdFALSE;

 volatile signed portBASE_TYPE *pxTaskHasExecuted;

 

 	/* Set a pointer to the variable we are going to set to true each

@@ -184,7 +185,7 @@
 portBASE_TYPE xAreIntegerMathsTaskStillRunning( void )

 {

 portBASE_TYPE xReturn = pdTRUE;

-portSHORT sTask;

+short sTask;

 

 	/* Check the maths tasks are still running by ensuring their check variables 

 	are still being set to true. */

diff --git a/Demo/Common/Minimal/recmutex.c b/Demo/Common/Minimal/recmutex.c
index 83887e3..cd7328e 100644
--- a/Demo/Common/Minimal/recmutex.c
+++ b/Demo/Common/Minimal/recmutex.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

diff --git a/Demo/Common/Minimal/semtest.c b/Demo/Common/Minimal/semtest.c
index e463619..a326d2a 100644
--- a/Demo/Common/Minimal/semtest.c
+++ b/Demo/Common/Minimal/semtest.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

@@ -80,8 +81,8 @@
 #include "semtest.h"

 

 /* The value to which the shared variables are counted. */

-#define semtstBLOCKING_EXPECTED_VALUE		( ( unsigned portLONG ) 0xfff )

-#define semtstNON_BLOCKING_EXPECTED_VALUE	( ( unsigned portLONG ) 0xff  )

+#define semtstBLOCKING_EXPECTED_VALUE		( ( unsigned long ) 0xfff )

+#define semtstNON_BLOCKING_EXPECTED_VALUE	( ( unsigned long ) 0xff  )

 

 #define semtstSTACK_SIZE			configMINIMAL_STACK_SIZE

 

@@ -96,13 +97,13 @@
 typedef struct SEMAPHORE_PARAMETERS

 {

 	xSemaphoreHandle xSemaphore;

-	volatile unsigned portLONG *pulSharedVariable;

+	volatile unsigned long *pulSharedVariable;

 	portTickType xBlockTime;

 } xSemaphoreParameters;

 

 /* Variables used to check that all the tasks are still running without errors. */

-static volatile portSHORT sCheckVariables[ semtstNUM_TASKS ] = { 0 };

-static volatile portSHORT sNextCheckVariable = 0;

+static volatile short sCheckVariables[ semtstNUM_TASKS ] = { 0 };

+static volatile short sNextCheckVariable = 0;

 

 /*-----------------------------------------------------------*/

 

@@ -122,7 +123,7 @@
 		if( pxFirstSemaphoreParameters->xSemaphore != NULL )

 		{

 			/* Create the variable which is to be shared by the first two tasks. */

-			pxFirstSemaphoreParameters->pulSharedVariable = ( unsigned portLONG * ) pvPortMalloc( sizeof( unsigned portLONG ) );

+			pxFirstSemaphoreParameters->pulSharedVariable = ( unsigned long * ) pvPortMalloc( sizeof( unsigned long ) );

 

 			/* Initialise the share variable to the value the tasks expect. */

 			*( pxFirstSemaphoreParameters->pulSharedVariable ) = semtstNON_BLOCKING_EXPECTED_VALUE;

@@ -131,8 +132,8 @@
 			pxFirstSemaphoreParameters->xBlockTime = ( portTickType ) 0;

 

 			/* Spawn the first two tasks.  As they poll they operate at the idle priority. */

-			xTaskCreate( prvSemaphoreTest, ( signed portCHAR * ) "PolSEM1", semtstSTACK_SIZE, ( void * ) pxFirstSemaphoreParameters, tskIDLE_PRIORITY, ( xTaskHandle * ) NULL );

-			xTaskCreate( prvSemaphoreTest, ( signed portCHAR * ) "PolSEM2", semtstSTACK_SIZE, ( void * ) pxFirstSemaphoreParameters, tskIDLE_PRIORITY, ( xTaskHandle * ) NULL );

+			xTaskCreate( prvSemaphoreTest, ( signed char * ) "PolSEM1", semtstSTACK_SIZE, ( void * ) pxFirstSemaphoreParameters, tskIDLE_PRIORITY, ( xTaskHandle * ) NULL );

+			xTaskCreate( prvSemaphoreTest, ( signed char * ) "PolSEM2", semtstSTACK_SIZE, ( void * ) pxFirstSemaphoreParameters, tskIDLE_PRIORITY, ( xTaskHandle * ) NULL );

 		}

 	}

 

@@ -145,12 +146,12 @@
 

 		if( pxSecondSemaphoreParameters->xSemaphore != NULL )

 		{

-			pxSecondSemaphoreParameters->pulSharedVariable = ( unsigned portLONG * ) pvPortMalloc( sizeof( unsigned portLONG ) );

+			pxSecondSemaphoreParameters->pulSharedVariable = ( unsigned long * ) pvPortMalloc( sizeof( unsigned long ) );

 			*( pxSecondSemaphoreParameters->pulSharedVariable ) = semtstBLOCKING_EXPECTED_VALUE;

 			pxSecondSemaphoreParameters->xBlockTime = xBlockTime / portTICK_RATE_MS;

 

-			xTaskCreate( prvSemaphoreTest, ( signed portCHAR * ) "BlkSEM1", semtstSTACK_SIZE, ( void * ) pxSecondSemaphoreParameters, uxPriority, ( xTaskHandle * ) NULL );

-			xTaskCreate( prvSemaphoreTest, ( signed portCHAR * ) "BlkSEM2", semtstSTACK_SIZE, ( void * ) pxSecondSemaphoreParameters, uxPriority, ( xTaskHandle * ) NULL );

+			xTaskCreate( prvSemaphoreTest, ( signed char * ) "BlkSEM1", semtstSTACK_SIZE, ( void * ) pxSecondSemaphoreParameters, uxPriority, ( xTaskHandle * ) NULL );

+			xTaskCreate( prvSemaphoreTest, ( signed char * ) "BlkSEM2", semtstSTACK_SIZE, ( void * ) pxSecondSemaphoreParameters, uxPriority, ( xTaskHandle * ) NULL );

 		}

 	}

 

@@ -160,17 +161,17 @@
 	is not being used.  The call to vQueueAddToRegistry() will be removed

 	by the pre-processor if configQUEUE_REGISTRY_SIZE is not defined or is 

 	defined to be less than 1. */

-	vQueueAddToRegistry( ( xQueueHandle ) pxFirstSemaphoreParameters->xSemaphore, ( signed portCHAR * ) "Counting_Sem_1" );

-	vQueueAddToRegistry( ( xQueueHandle ) pxSecondSemaphoreParameters->xSemaphore, ( signed portCHAR * ) "Counting_Sem_2" );

+	vQueueAddToRegistry( ( xQueueHandle ) pxFirstSemaphoreParameters->xSemaphore, ( signed char * ) "Counting_Sem_1" );

+	vQueueAddToRegistry( ( xQueueHandle ) pxSecondSemaphoreParameters->xSemaphore, ( signed char * ) "Counting_Sem_2" );

 }

 /*-----------------------------------------------------------*/

 

 static portTASK_FUNCTION( prvSemaphoreTest, pvParameters )

 {

 xSemaphoreParameters *pxParameters;

-volatile unsigned portLONG *pulSharedVariable, ulExpectedValue;

-unsigned portLONG ulCounter;

-portSHORT sError = pdFALSE, sCheckVariableToUse;

+volatile unsigned long *pulSharedVariable, ulExpectedValue;

+unsigned long ulCounter;

+short sError = pdFALSE, sCheckVariableToUse;

 

 	/* See which check variable to use.  sNextCheckVariable is not semaphore 

 	protected! */

@@ -211,7 +212,7 @@
 			/* Clear the variable, then count it back up to the expected value

 			before releasing the semaphore.  Would expect a context switch or

 			two during this time. */

-			for( ulCounter = ( unsigned portLONG ) 0; ulCounter <= ulExpectedValue; ulCounter++ )

+			for( ulCounter = ( unsigned long ) 0; ulCounter <= ulExpectedValue; ulCounter++ )

 			{

 				*pulSharedVariable = ulCounter;

 				if( *pulSharedVariable != ulCounter )

@@ -259,7 +260,7 @@
 /* This is called to check that all the created tasks are still running. */

 portBASE_TYPE xAreSemaphoreTasksStillRunning( void )

 {

-static portSHORT sLastCheckVariables[ semtstNUM_TASKS ] = { 0 };

+static short sLastCheckVariables[ semtstNUM_TASKS ] = { 0 };

 portBASE_TYPE xTask, xReturn = pdTRUE;

 

 	for( xTask = 0; xTask < semtstNUM_TASKS; xTask++ )

diff --git a/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/MCF5225x_ethernetif.c b/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/MCF5225x_ethernetif.c
index d956903..b6f02b1 100644
--- a/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/MCF5225x_ethernetif.c
+++ b/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/MCF5225x_ethernetif.c
@@ -74,14 +74,14 @@
 /*-----------------------------------------------------------*/

 

 /* The DMA descriptors.  This is a char array to allow us to align it correctly. */

-static unsigned portCHAR xFECTxDescriptors_unaligned[ ( configNUM_FEC_TX_BUFFERS * sizeof( FECBD ) ) + 16 ];

-static unsigned portCHAR xFECRxDescriptors_unaligned[ ( configNUM_FEC_RX_BUFFERS * sizeof( FECBD ) ) + 16 ];

+static unsigned char xFECTxDescriptors_unaligned[ ( configNUM_FEC_TX_BUFFERS * sizeof( FECBD ) ) + 16 ];

+static unsigned char xFECRxDescriptors_unaligned[ ( configNUM_FEC_RX_BUFFERS * sizeof( FECBD ) ) + 16 ];

 static FECBD *xFECTxDescriptors;

 static FECBD *xFECRxDescriptors;

 

 /* The DMA buffers.  These are char arrays to allow them to be alligned correctly. */

-static unsigned portCHAR ucFECTxBuffers[ ( configNUM_FEC_TX_BUFFERS * configFEC_BUFFER_SIZE ) + 16 ];

-static unsigned portCHAR ucFECRxBuffers[ ( configNUM_FEC_RX_BUFFERS * configFEC_BUFFER_SIZE ) + 16 ];

+static unsigned char ucFECTxBuffers[ ( configNUM_FEC_TX_BUFFERS * configFEC_BUFFER_SIZE ) + 16 ];

+static unsigned char ucFECRxBuffers[ ( configNUM_FEC_RX_BUFFERS * configFEC_BUFFER_SIZE ) + 16 ];

 static unsigned portBASE_TYPE uxNextRxBuffer = 0, uxNextTxBuffer = 0;

 

 /* Semaphore used by the FEC interrupt handler to wake the handler task. */

@@ -370,8 +370,8 @@
  */

 static void low_level_init( struct netif *netif )

 {

-unsigned portSHORT usData;

-const unsigned portCHAR ucMACAddress[6] = 

+unsigned short usData;

+const unsigned char ucMACAddress[6] = 

 {

 	configMAC_0, configMAC_1,configMAC_2,configMAC_3,configMAC_4,configMAC_5

 };

@@ -478,10 +478,10 @@
 	MCF_FEC_EMRBR = (uint16)configFEC_BUFFER_SIZE;

 

 	/* Point to the start of the circular Rx buffer descriptor queue */

-	MCF_FEC_ERDSR = ( volatile unsigned portLONG ) &( xFECRxDescriptors[ 0 ] );

+	MCF_FEC_ERDSR = ( volatile unsigned long ) &( xFECRxDescriptors[ 0 ] );

 

 	/* Point to the start of the circular Tx buffer descriptor queue */

-	MCF_FEC_ETSDR = ( volatile unsigned portLONG ) &( xFECTxDescriptors[ 0 ] );

+	MCF_FEC_ETSDR = ( volatile unsigned long ) &( xFECTxDescriptors[ 0 ] );

 

 	/* Mask all FEC interrupts */

 	MCF_FEC_EIMR = MCF_FEC_EIMR_MASK_ALL;

@@ -501,7 +501,7 @@
 	#endif

 

 	/* Create the task that handles the EMAC. */

-	xTaskCreate( ethernetif_input, ( signed portCHAR * ) "ETH_INT", configETHERNET_INPUT_TASK_STACK_SIZE, (void *)netif, configETHERNET_INPUT_TASK_PRIORITY, &xEthIntTask );

+	xTaskCreate( ethernetif_input, ( signed char * ) "ETH_INT", configETHERNET_INPUT_TASK_STACK_SIZE, (void *)netif, configETHERNET_INPUT_TASK_PRIORITY, &xEthIntTask );

 	

 	fec_irq_enable();

 	MCF_FEC_ECR = MCF_FEC_ECR_ETHER_EN;

@@ -527,7 +527,7 @@
 {

 struct pbuf *q;

 u32_t l = 0;

-unsigned portCHAR *pcTxData = NULL;

+unsigned char *pcTxData = NULL;

 portBASE_TYPE i;

 

 	( void ) netif;

@@ -806,10 +806,10 @@
 static void prvInitialiseFECBuffers( void )

 {

 unsigned portBASE_TYPE ux;

-unsigned portCHAR *pcBufPointer;

+unsigned char *pcBufPointer;

 

 	pcBufPointer = &( xFECTxDescriptors_unaligned[ 0 ] );

-	while( ( ( unsigned portLONG ) pcBufPointer & 0x0fUL ) != 0 )

+	while( ( ( unsigned long ) pcBufPointer & 0x0fUL ) != 0 )

 	{

 		pcBufPointer++;

 	}

@@ -817,7 +817,7 @@
 	xFECTxDescriptors = ( FECBD * ) pcBufPointer;

 	

 	pcBufPointer = &( xFECRxDescriptors_unaligned[ 0 ] );

-	while( ( ( unsigned portLONG ) pcBufPointer & 0x0fUL ) != 0 )

+	while( ( ( unsigned long ) pcBufPointer & 0x0fUL ) != 0 )

 	{

 		pcBufPointer++;

 	}

@@ -827,7 +827,7 @@
 

 	/* Setup the buffers and descriptors. */

 	pcBufPointer = &( ucFECTxBuffers[ 0 ] );

-	while( ( ( unsigned portLONG ) pcBufPointer & 0x0fUL ) != 0 )

+	while( ( ( unsigned long ) pcBufPointer & 0x0fUL ) != 0 )

 	{

 		pcBufPointer++;

 	}

@@ -841,7 +841,7 @@
 	}

 

 	pcBufPointer = &( ucFECRxBuffers[ 0 ] );

-	while( ( ( unsigned portLONG ) pcBufPointer & 0x0fUL ) != 0 )

+	while( ( ( unsigned long ) pcBufPointer & 0x0fUL ) != 0 )

 	{

 		pcBufPointer++;

 	}

@@ -865,7 +865,7 @@
 

 __declspec(interrupt:0) void vFECISRHandler( void )

 {

-unsigned portLONG ulEvent;

+unsigned long ulEvent;

 portBASE_TYPE xHighPriorityTaskWoken = pdFALSE;

    

 	ulEvent = MCF_FEC_EIR & MCF_FEC_EIMR;

diff --git a/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/__sys_arch.c b/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/__sys_arch.c
index a4d0f72..54210ef 100644
--- a/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/__sys_arch.c
+++ b/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/__sys_arch.c
@@ -58,7 +58,7 @@
 #define MS_TO_TICKS( ms )           \

     ( portTickType )( ( portTickType ) ( ms ) / portTICK_RATE_MS )

 #define TICKS_TO_MS( ticks )        \

-    ( unsigned portLONG )( ( portTickType ) ( ticks ) * portTICK_RATE_MS )

+    ( unsigned long )( ( portTickType ) ( ticks ) * portTICK_RATE_MS )

 #define THREAD_STACK_SIZE           ( 256 /*FSL:1024*/ )

 #define THREAD_NAME                 "lwIP"

 

diff --git a/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/arch/sys_arch.h b/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/arch/sys_arch.h
index 7b87a9f..9fee9b5 100644
--- a/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/arch/sys_arch.h
+++ b/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/ColdFire/arch/sys_arch.h
@@ -46,6 +46,6 @@
 

 /* Message queue constants. */

 #define archMESG_QUEUE_LENGTH	( 6 )

-#define archPOST_BLOCK_TIME_MS	( ( unsigned portLONG ) 10000 )

+#define archPOST_BLOCK_TIME_MS	( ( unsigned long ) 10000 )

 

 #endif

diff --git a/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/STR91x/arch/sys_arch.h b/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/STR91x/arch/sys_arch.h
index 7cf2963..870bfc8 100644
--- a/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/STR91x/arch/sys_arch.h
+++ b/Demo/Common/ethernet/lwIP_130/contrib/port/FreeRTOS/STR91x/arch/sys_arch.h
@@ -46,7 +46,7 @@
 

 /* Message queue constants. */

 #define archMESG_QUEUE_LENGTH	( 6 )

-#define archPOST_BLOCK_TIME_MS	( ( unsigned portLONG ) 10000 )

+#define archPOST_BLOCK_TIME_MS	( ( unsigned long ) 10000 )

 

 #endif /* __SYS_RTXC_H__ */

 

diff --git a/Demo/Common/include/AltBlckQ.h b/Demo/Common/include/AltBlckQ.h
index acacda8..8d49049 100644
--- a/Demo/Common/include/AltBlckQ.h
+++ b/Demo/Common/include/AltBlckQ.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef ALT_BLOCK_Q_H

diff --git a/Demo/Common/include/AltBlock.h b/Demo/Common/include/AltBlock.h
index 2758c81..119f14f 100644
--- a/Demo/Common/include/AltBlock.h
+++ b/Demo/Common/include/AltBlock.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef FAST_BLOCK_TIME_TEST_H

diff --git a/Demo/Common/include/AltPollQ.h b/Demo/Common/include/AltPollQ.h
index f526789..81b2beb 100644
--- a/Demo/Common/include/AltPollQ.h
+++ b/Demo/Common/include/AltPollQ.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef ALT_POLLED_Q_H

diff --git a/Demo/Common/include/AltQTest.h b/Demo/Common/include/AltQTest.h
index 45f9d06..b511655 100644
--- a/Demo/Common/include/AltQTest.h
+++ b/Demo/Common/include/AltQTest.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef FAST_GEN_Q_TEST_H

diff --git a/Demo/Common/include/BlockQ.h b/Demo/Common/include/BlockQ.h
index d9be37c..3c632bc 100644
--- a/Demo/Common/include/BlockQ.h
+++ b/Demo/Common/include/BlockQ.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef BLOCK_Q_H

diff --git a/Demo/Common/include/GenQTest.h b/Demo/Common/include/GenQTest.h
index bba3afe..66a4958 100644
--- a/Demo/Common/include/GenQTest.h
+++ b/Demo/Common/include/GenQTest.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef GEN_Q_TEST_H

diff --git a/Demo/Common/include/IntQueue.h b/Demo/Common/include/IntQueue.h
index 9a6c2a5..3e6b066 100644
--- a/Demo/Common/include/IntQueue.h
+++ b/Demo/Common/include/IntQueue.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef QUEUE_ACCESS_TEST

diff --git a/Demo/Common/include/PollQ.h b/Demo/Common/include/PollQ.h
index ef628bd..5b15f28 100644
--- a/Demo/Common/include/PollQ.h
+++ b/Demo/Common/include/PollQ.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef POLLED_Q_H

diff --git a/Demo/Common/include/QPeek.h b/Demo/Common/include/QPeek.h
index a171133..3dc1249 100644
--- a/Demo/Common/include/QPeek.h
+++ b/Demo/Common/include/QPeek.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef Q_PEEK_TEST_H

diff --git a/Demo/Common/include/blocktim.h b/Demo/Common/include/blocktim.h
index f061779..0360e42 100644
--- a/Demo/Common/include/blocktim.h
+++ b/Demo/Common/include/blocktim.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef BLOCK_TIME_TEST_H

diff --git a/Demo/Common/include/comtest.h b/Demo/Common/include/comtest.h
index da0f23a..0a936d3 100644
--- a/Demo/Common/include/comtest.h
+++ b/Demo/Common/include/comtest.h
@@ -1,54 +1,55 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef COMTEST_H

 #define COMTEST_H

 

-void vAltStartComTestTasks( unsigned portBASE_TYPE uxPriority, unsigned portLONG ulBaudRate, unsigned portBASE_TYPE uxLED );

+void vAltStartComTestTasks( unsigned portBASE_TYPE uxPriority, unsigned long ulBaudRate, unsigned portBASE_TYPE uxLED );

 void vStartComTestTasks( unsigned portBASE_TYPE uxPriority, eCOMPort ePort, eBaud eBaudRate );

 portBASE_TYPE xAreComTestTasksStillRunning( void );

 void vComTestUnsuspendTask( void );

diff --git a/Demo/Common/include/comtest2.h b/Demo/Common/include/comtest2.h
index b08e7e2..f46ba7d 100644
--- a/Demo/Common/include/comtest2.h
+++ b/Demo/Common/include/comtest2.h
@@ -1,54 +1,55 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef COMTEST_H

 #define COMTEST_H

 

-void vAltStartComTestTasks( unsigned portBASE_TYPE uxPriority, unsigned portLONG ulBaudRate, unsigned portBASE_TYPE uxLED );

+void vAltStartComTestTasks( unsigned portBASE_TYPE uxPriority, unsigned long ulBaudRate, unsigned portBASE_TYPE uxLED );

 portBASE_TYPE xAreComTestTasksStillRunning( void );

 

 #endif

diff --git a/Demo/Common/include/countsem.h b/Demo/Common/include/countsem.h
index 3653fd7..076e45b 100644
--- a/Demo/Common/include/countsem.h
+++ b/Demo/Common/include/countsem.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef COUNT_SEMAPHORE_TEST_H

diff --git a/Demo/Common/include/crflash.h b/Demo/Common/include/crflash.h
index f747f48..5fd6f3e 100644
--- a/Demo/Common/include/crflash.h
+++ b/Demo/Common/include/crflash.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef CRFLASH_LED_H

diff --git a/Demo/Common/include/crhook.h b/Demo/Common/include/crhook.h
index 5c0e5c9..12eb974 100644
--- a/Demo/Common/include/crhook.h
+++ b/Demo/Common/include/crhook.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef CRHOOK_H

diff --git a/Demo/Common/include/death.h b/Demo/Common/include/death.h
index e127bd8..fffe4f4 100644
--- a/Demo/Common/include/death.h
+++ b/Demo/Common/include/death.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef SUICIDE_TASK_H

diff --git a/Demo/Common/include/dynamic.h b/Demo/Common/include/dynamic.h
index 94258b2..dc2fdb4 100644
--- a/Demo/Common/include/dynamic.h
+++ b/Demo/Common/include/dynamic.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef DYNAMIC_MANIPULATION_H

diff --git a/Demo/Common/include/fileIO.h b/Demo/Common/include/fileIO.h
index 5b60947..98e2f4f 100644
--- a/Demo/Common/include/fileIO.h
+++ b/Demo/Common/include/fileIO.h
@@ -1,56 +1,57 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef FILE_IO_H

 #define FILE_OI_H

 

-void vDisplayMessage( const portCHAR * const pcMessageToPrint );

-void vWriteMessageToDisk( const portCHAR * const pcMessage );

-void vWriteBufferToDisk( const portCHAR * const pcBuffer, unsigned portLONG ulBufferLength );

+void vDisplayMessage( const char * const pcMessageToPrint );

+void vWriteMessageToDisk( const char * const pcMessage );

+void vWriteBufferToDisk( const char * const pcBuffer, unsigned long ulBufferLength );

 

 #endif

 

diff --git a/Demo/Common/include/flash.h b/Demo/Common/include/flash.h
index e5eb055..81982be 100644
--- a/Demo/Common/include/flash.h
+++ b/Demo/Common/include/flash.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef FLASH_LED_H

diff --git a/Demo/Common/include/flop.h b/Demo/Common/include/flop.h
index 1588d2a..4f0edf3 100644
--- a/Demo/Common/include/flop.h
+++ b/Demo/Common/include/flop.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef FLOP_TASKS_H

diff --git a/Demo/Common/include/integer.h b/Demo/Common/include/integer.h
index 4524e67..bb1973f 100644
--- a/Demo/Common/include/integer.h
+++ b/Demo/Common/include/integer.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef INTEGER_TASKS_H

diff --git a/Demo/Common/include/mevents.h b/Demo/Common/include/mevents.h
index 08a12ab..301fb91 100644
--- a/Demo/Common/include/mevents.h
+++ b/Demo/Common/include/mevents.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef EVENTS_TEST_H

diff --git a/Demo/Common/include/partest.h b/Demo/Common/include/partest.h
index cd64da2..06a2de8 100644
--- a/Demo/Common/include/partest.h
+++ b/Demo/Common/include/partest.h
@@ -1,54 +1,55 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef PARTEST_H

 #define PARTEST_H

 

-#define partstDEFAULT_PORT_ADDRESS		( ( unsigned portSHORT ) 0x378 )

+#define partstDEFAULT_PORT_ADDRESS		( ( unsigned short ) 0x378 )

 

 void vParTestInitialise( void );

 void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue );

diff --git a/Demo/Common/include/print.h b/Demo/Common/include/print.h
index 8a229b1..0493910 100644
--- a/Demo/Common/include/print.h
+++ b/Demo/Common/include/print.h
@@ -1,56 +1,57 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef PRINT_H

 #define PRINT_H

 

 void vPrintInitialise( void );

-void vPrintDisplayMessage( const portCHAR * const * pcMessageToSend );

-const portCHAR *pcPrintGetNextMessage( portTickType xPrintRate );

+void vPrintDisplayMessage( const char * const * pcMessageToSend );

+const char *pcPrintGetNextMessage( portTickType xPrintRate );

 

 #endif

 

diff --git a/Demo/Common/include/recmutex.h b/Demo/Common/include/recmutex.h
index cf13d98..c24b3f4 100644
--- a/Demo/Common/include/recmutex.h
+++ b/Demo/Common/include/recmutex.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef RECURSIVE_MUTEX_TEST_H

diff --git a/Demo/Common/include/semtest.h b/Demo/Common/include/semtest.h
index cb294da..ac6e74f 100644
--- a/Demo/Common/include/semtest.h
+++ b/Demo/Common/include/semtest.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef SEMAPHORE_TEST_H

diff --git a/Demo/Common/include/serial.h b/Demo/Common/include/serial.h
index 9dd7abf..7b17bec 100644
--- a/Demo/Common/include/serial.h
+++ b/Demo/Common/include/serial.h
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #ifndef SERIAL_COMMS_H

@@ -106,11 +107,11 @@
 	ser115200

 } eBaud;

 

-xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength );

+xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength );

 xComPortHandle xSerialPortInit( eCOMPort ePort, eBaud eWantedBaud, eParity eWantedParity, eDataBits eWantedDataBits, eStopBits eWantedStopBits, unsigned portBASE_TYPE uxBufferLength );

-void vSerialPutString( xComPortHandle pxPort, const signed portCHAR * const pcString, unsigned portSHORT usStringLength );

-signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime );

-signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime );

+void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned short usStringLength );

+signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime );

+signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime );

 portBASE_TYPE xSerialWaitForSemaphore( xComPortHandle xPort );

 void vSerialClose( xComPortHandle xPort );