Remove unnecessary use of portLONG, portCHAR and portSHORT.

Change version number in headers.
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 );