Remove unnecessary use of portLONG, portCHAR and portSHORT.

Change version number in headers.
diff --git a/Demo/MB91460_Softune/SRC/FreeRTOSConfig.h b/Demo/MB91460_Softune/SRC/FreeRTOSConfig.h
index 17cc0f1..d1bd2eb 100644
--- a/Demo/MB91460_Softune/SRC/FreeRTOSConfig.h
+++ b/Demo/MB91460_Softune/SRC/FreeRTOSConfig.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 FREERTOS_CONFIG_H

@@ -64,10 +65,10 @@
 #define configUSE_IDLE_HOOK			1

 #define configUSE_TICK_HOOK			0

 #define configTICK_RATE_HZ			( ( portTickType ) 1000 )

-#define configCPU_CLOCK_HZ			( ( unsigned portLONG ) 64000000 )  /* Clock setup from start91460.asm in the demo application. */

-#define configPER_CLOCK_HZ			( ( unsigned portLONG ) 16000000 )  /* Clock setup from start91460.asm in the demo application. */

+#define configCPU_CLOCK_HZ			( ( unsigned long ) 64000000 )  /* Clock setup from start91460.asm in the demo application. */

+#define configPER_CLOCK_HZ			( ( unsigned long ) 16000000 )  /* Clock setup from start91460.asm in the demo application. */

 #define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 6 )

-#define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 100 )

+#define configMINIMAL_STACK_SIZE	( ( unsigned short ) 100 )

 #define configTOTAL_HEAP_SIZE		( ( size_t ) ( 32768 - 4192 ) )

 #define configMAX_TASK_NAME_LEN		( 20 )

 #define configUSE_TRACE_FACILITY	1

diff --git a/Demo/MB91460_Softune/SRC/crflash_modified.c b/Demo/MB91460_Softune/SRC/crflash_modified.c
index 4dc6146..3bd49bf 100644
--- a/Demo/MB91460_Softune/SRC/crflash_modified.c
+++ b/Demo/MB91460_Softune/SRC/crflash_modified.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

 /*

diff --git a/Demo/MB91460_Softune/SRC/main.c b/Demo/MB91460_Softune/SRC/main.c
index 85c9e18..ce2e117 100644
--- a/Demo/MB91460_Softune/SRC/main.c
+++ b/Demo/MB91460_Softune/SRC/main.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

 

diff --git a/Demo/MB91460_Softune/SRC/partest/partest.c b/Demo/MB91460_Softune/SRC/partest/partest.c
index 1ecbfdc..484a548 100644
--- a/Demo/MB91460_Softune/SRC/partest/partest.c
+++ b/Demo/MB91460_Softune/SRC/partest/partest.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

 

diff --git a/Demo/MB91460_Softune/SRC/serial/serial.c b/Demo/MB91460_Softune/SRC/serial/serial.c
index 1679193..7ce371e 100644
--- a/Demo/MB91460_Softune/SRC/serial/serial.c
+++ b/Demo/MB91460_Softune/SRC/serial/serial.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

 

diff --git a/Demo/MB91460_Softune/SRC/watchdog/watchdog.h b/Demo/MB91460_Softune/SRC/watchdog/watchdog.h
index e99e64e..d36c0c6 100644
--- a/Demo/MB91460_Softune/SRC/watchdog/watchdog.h
+++ b/Demo/MB91460_Softune/SRC/watchdog/watchdog.h
@@ -46,7 +46,7 @@
  * Watchdog function declarations 

  */

 void InitWatchdog (void);

-void vStartWatchdogTask(unsigned portSHORT);

+void vStartWatchdogTask(unsigned short);

 

 #endif

 

diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.h b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.h
index 384c42e..d8dc542 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.h
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.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 FREERTOS_CONFIG_H

@@ -81,9 +82,9 @@
 #define configUSE_PREEMPTION		1

 #define configUSE_IDLE_HOOK			1

 #define configUSE_TICK_HOOK			0

-#define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 180 ) /* This can be greatly reduced when using the small or medium memory model. */

-#define configCPU_CLOCK_HZ			( ( unsigned portLONG ) 56000000 )	/* Clock setup from start.asm in the demo application. */

-#define configCLKP1_CLOCK_HZ		( ( unsigned portLONG ) 56000000 )	/* Clock setup from start.asm in the demo application. */

+#define configMINIMAL_STACK_SIZE	( ( unsigned short ) 180 ) /* This can be greatly reduced when using the small or medium memory model. */

+#define configCPU_CLOCK_HZ			( ( unsigned long ) 56000000 )	/* Clock setup from start.asm in the demo application. */

+#define configCLKP1_CLOCK_HZ		( ( unsigned long ) 56000000 )	/* Clock setup from start.asm in the demo application. */

 #define configTICK_RATE_HZ			( (portTickType) 1000 )

 #define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 6 )

 #define configTOTAL_HEAP_SIZE		( (size_t) (20000) )

diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c
index 4dc6146..3bd49bf 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

 /*

diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/main.c b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/main.c
index 08632c8..a66f061 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/main.c
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/main.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

 /*

@@ -109,7 +110,7 @@
 #define mainGENERIC_QUEUE_PRIORITY	( tskIDLE_PRIORITY )

 

 /* Baud rate used by the COM test tasks. */

-#define mainCOM_TEST_BAUD_RATE	( ( unsigned portLONG ) 19200 )

+#define mainCOM_TEST_BAUD_RATE	( ( unsigned long ) 19200 )

 

 /* The frequency at which the 'Check' tasks executes.  See the comments at the 

 top of the page.  When the system is operating error free the 'Check' task

@@ -136,7 +137,7 @@
  * Called by the Check task.  Returns pdPASS if all the other tasks are found

  * to be operating without error - otherwise returns pdFAIL.

  */

-static portSHORT prvCheckOtherTasksAreStillRunning( void );

+static short prvCheckOtherTasksAreStillRunning( void );

 

 /*

  * Perform any hardware setup necessary for the demo.

@@ -175,7 +176,7 @@
 	#endif

 

 	/* Start the 'Check' task which is defined in this file. */

-	xTaskCreate( vErrorChecks, (signed portCHAR *) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );

+	xTaskCreate( vErrorChecks, (signed char *) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );

 

 	/* The suicide tasks must be started last as they record the number of other

 	tasks that exist within the system.  The value is then used to ensure at run

@@ -235,9 +236,9 @@
 }

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

 

-static portSHORT prvCheckOtherTasksAreStillRunning( void )

+static short prvCheckOtherTasksAreStillRunning( void )

 {

-	static portSHORT	sNoErrorFound = pdTRUE;

+	static short	sNoErrorFound = pdTRUE;

 

 	/* The demo tasks maintain a count that increments every cycle of the task

 	provided that the task has never encountered an error.  This function 

diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/partest/partest.c b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/partest/partest.c
index 5339460..3cf4cd1 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/partest/partest.c
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/partest/partest.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

 

diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c
index f732e64..85ef42c 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

 /* BASIC INTERRUPT DRIVEN SERIAL PORT DRIVER.   

diff --git a/Demo/MB96350_Softune_Dice_Kit/DiceTask.c b/Demo/MB96350_Softune_Dice_Kit/DiceTask.c
index b244822..d68f0d3 100644
--- a/Demo/MB96350_Softune_Dice_Kit/DiceTask.c
+++ b/Demo/MB96350_Softune_Dice_Kit/DiceTask.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

 

diff --git a/Demo/MB96350_Softune_Dice_Kit/DiceTask.h b/Demo/MB96350_Softune_Dice_Kit/DiceTask.h
index 292d7d6..d0cc79e 100644
--- a/Demo/MB96350_Softune_Dice_Kit/DiceTask.h
+++ b/Demo/MB96350_Softune_Dice_Kit/DiceTask.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 DICE_TASK_H

diff --git a/Demo/MB96350_Softune_Dice_Kit/FreeRTOSConfig.h b/Demo/MB96350_Softune_Dice_Kit/FreeRTOSConfig.h
index c699a42..197d57a 100644
--- a/Demo/MB96350_Softune_Dice_Kit/FreeRTOSConfig.h
+++ b/Demo/MB96350_Softune_Dice_Kit/FreeRTOSConfig.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 FREERTOS_CONFIG_H

@@ -80,9 +81,9 @@
 #define configUSE_PREEMPTION			1

 #define configUSE_IDLE_HOOK				0

 #define configUSE_TICK_HOOK				0

-#define configMINIMAL_STACK_SIZE		( ( unsigned portSHORT ) 180 ) /* This can be greatly reduced when using the small or medium memory model. */

-#define configCPU_CLOCK_HZ				( ( unsigned portLONG ) 56000000 )	/* Clock setup from start.asm in the demo application. */

-#define configCLKP1_CLOCK_HZ			( ( unsigned portLONG ) 56000000 )	/* Clock setup from start.asm in the demo application. */

+#define configMINIMAL_STACK_SIZE		( ( unsigned short ) 180 ) /* This can be greatly reduced when using the small or medium memory model. */

+#define configCPU_CLOCK_HZ				( ( unsigned long ) 56000000 )	/* Clock setup from start.asm in the demo application. */

+#define configCLKP1_CLOCK_HZ			( ( unsigned long ) 56000000 )	/* Clock setup from start.asm in the demo application. */

 #define configTICK_RATE_HZ				( (portTickType) 1000 )

 #define configMAX_PRIORITIES			( ( unsigned portBASE_TYPE ) 6 )

 #define configTOTAL_HEAP_SIZE			( (size_t) (5000) )

diff --git a/Demo/MB96350_Softune_Dice_Kit/ParTest/ParTest.c b/Demo/MB96350_Softune_Dice_Kit/ParTest/ParTest.c
index ed3d032..0784c79 100644
--- a/Demo/MB96350_Softune_Dice_Kit/ParTest/ParTest.c
+++ b/Demo/MB96350_Softune_Dice_Kit/ParTest/ParTest.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

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

diff --git a/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c b/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c
index 0a97af1..fa7d469 100644
--- a/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c
+++ b/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

 /**

diff --git a/Demo/MB96350_Softune_Dice_Kit/main.c b/Demo/MB96350_Softune_Dice_Kit/main.c
index d47539f..3403502 100644
--- a/Demo/MB96350_Softune_Dice_Kit/main.c
+++ b/Demo/MB96350_Softune_Dice_Kit/main.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

 

diff --git a/Demo/MCF5235_GCC/FreeRTOSConfig.h b/Demo/MCF5235_GCC/FreeRTOSConfig.h
index 9960898..d7d24c1 100644
--- a/Demo/MCF5235_GCC/FreeRTOSConfig.h
+++ b/Demo/MCF5235_GCC/FreeRTOSConfig.h
@@ -69,10 +69,10 @@
 #define configUSE_PREEMPTION        1

 #define configUSE_IDLE_HOOK         0

 #define configUSE_TICK_HOOK         0

-#define configCPU_CLOCK_HZ          ( ( unsigned portLONG ) 25000000 )

+#define configCPU_CLOCK_HZ          ( ( unsigned long ) 25000000 )

 #define configTICK_RATE_HZ          ( ( portTickType ) 1000 )

 #define configMAX_PRIORITIES        ( ( unsigned portBASE_TYPE ) 7 )

-#define configMINIMAL_STACK_SIZE    ( ( unsigned portSHORT ) 256 )

+#define configMINIMAL_STACK_SIZE    ( ( unsigned short ) 256 )

 #define configMAX_TASK_NAME_LEN     ( 16 )

 #define configUSE_TRACE_FACILITY    1

 #define configUSE_16_BIT_TICKS      0

diff --git a/Demo/MCF5235_GCC/demo.c b/Demo/MCF5235_GCC/demo.c
index 460593b..e4c4f86 100644
--- a/Demo/MCF5235_GCC/demo.c
+++ b/Demo/MCF5235_GCC/demo.c
@@ -73,7 +73,7 @@
 

 /* ------------------------ Defines --------------------------------------- */

 /* Constants for the ComTest tasks. */

-#define mainCOM_TEST_BAUD_RATE  ( ( unsigned portLONG ) 38400 )

+#define mainCOM_TEST_BAUD_RATE  ( ( unsigned long ) 38400 )

 #define mainCOM_TEST_LED        ( -1 )

 

 /* Priorities for the demo application tasks. */

@@ -88,7 +88,7 @@
 #define mainCHECK_PERIOD            ( ( portTickType ) 2000 / portTICK_RATE_MS  )

 

 /* Constants used by the vMemCheckTask() task. */

-#define mainCOUNT_INITIAL_VALUE     ( ( unsigned portLONG ) 0 )

+#define mainCOUNT_INITIAL_VALUE     ( ( unsigned long ) 0 )

 #define mainNO_TASK                 ( 0 )

 

 /* The size of the memory blocks allocated by the vMemCheckTask() task. */

@@ -101,7 +101,7 @@
 

 /* ------------------------ Static functions ------------------------------ */

 static          portTASK_FUNCTION( vErrorChecks, pvParameters );

-static portLONG prvCheckOtherTasksAreStillRunning( unsigned portLONG

+static long prvCheckOtherTasksAreStillRunning( unsigned long

                                                    ulMemCheckTaskCount );

 static          portTASK_FUNCTION( vMemCheckTask, pvParameters );

 

@@ -122,7 +122,7 @@
     vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );

 

     /* Start the check task - which is defined in this file. */

-    xTaskCreate( vErrorChecks, ( signed portCHAR * )"Check", 512, NULL,

+    xTaskCreate( vErrorChecks, ( signed char * )"Check", 512, NULL,

                  mainCHECK_TASK_PRIORITY, NULL );

 

     /* Now all the tasks have been started - start the scheduler. */

@@ -137,7 +137,7 @@
 static

 portTASK_FUNCTION( vErrorChecks, pvParameters )

 {

-    unsigned portLONG ulMemCheckTaskRunningCount;

+    unsigned long ulMemCheckTaskRunningCount;

     xTaskHandle     xCreatedTask;

 

     /* The parameters are not used in this function. */

@@ -151,7 +151,7 @@
         xCreatedTask = mainNO_TASK;

 

         if( xTaskCreate

-            ( vMemCheckTask, ( signed portCHAR * )"MEM_CHECK",

+            ( vMemCheckTask, ( signed char * )"MEM_CHECK",

               configMINIMAL_STACK_SIZE, ( void * )&ulMemCheckTaskRunningCount,

               tskIDLE_PRIORITY, &xCreatedTask ) != pdPASS )

         {

@@ -179,10 +179,10 @@
     }

 }

 

-static portLONG

-prvCheckOtherTasksAreStillRunning( unsigned portLONG ulMemCheckTaskCount )

+static long

+prvCheckOtherTasksAreStillRunning( unsigned long ulMemCheckTaskCount )

 {

-    portLONG        lReturn = ( portLONG ) pdPASS;

+    long        lReturn = ( long ) pdPASS;

 

     /* Check all the demo tasks (other than the flash tasks) to ensure

      * that they are all still running, and that none of them have detected

@@ -191,38 +191,38 @@
 

     if( xAreIntegerMathsTaskStillRunning(  ) != pdTRUE )

     {

-        lReturn = ( portLONG ) pdFAIL;

+        lReturn = ( long ) pdFAIL;

     }

 

     if( xArePollingQueuesStillRunning(  ) != pdTRUE )

     {

-        lReturn = ( portLONG ) pdFAIL;

+        lReturn = ( long ) pdFAIL;

     }

 

     if( xAreMathsTaskStillRunning(  ) != pdTRUE )

     {

-        lReturn = ( portLONG ) pdFAIL;

+        lReturn = ( long ) pdFAIL;

     }

 

     if( xAreSemaphoreTasksStillRunning(  ) != pdTRUE )

     {

-        lReturn = ( portLONG ) pdFAIL;

+        lReturn = ( long ) pdFAIL;

     }

 

     if( xAreDynamicPriorityTasksStillRunning(  ) != pdTRUE )

     {

-        lReturn = ( portLONG ) pdFAIL;

+        lReturn = ( long ) pdFAIL;

     }

 

     if( xAreBlockingQueuesStillRunning(  ) != pdTRUE )

     {

-        lReturn = ( portLONG ) pdFAIL;

+        lReturn = ( long ) pdFAIL;

     }

     if( ulMemCheckTaskCount == mainCOUNT_INITIAL_VALUE )

     {

         // The vMemCheckTask did not increment the counter - it must

         // have failed.

-        lReturn = ( portLONG ) pdFAIL;

+        lReturn = ( long ) pdFAIL;

     }

     return lReturn;

 }

@@ -230,9 +230,9 @@
 static void

 vMemCheckTask( void *pvParameters )

 {

-    unsigned portLONG *pulMemCheckTaskRunningCounter;

+    unsigned long *pulMemCheckTaskRunningCounter;

     void           *pvMem1, *pvMem2, *pvMem3;

-    static portLONG lErrorOccurred = pdFALSE;

+    static long lErrorOccurred = pdFALSE;

 

     /* This task is dynamically created then deleted during each cycle of the

        vErrorChecks task to check the operation of the memory allocator.  Each time

@@ -245,7 +245,7 @@
        pulMemCheckTaskRunningCounter is incremented each cycle to indicate to the

        vErrorChecks() task that this task is still executing without error. */

 

-    pulMemCheckTaskRunningCounter = ( unsigned portLONG * )pvParameters;

+    pulMemCheckTaskRunningCounter = ( unsigned long * )pvParameters;

 

     for( ;; )

     {

diff --git a/Demo/MCF5235_GCC/system/newlib.c b/Demo/MCF5235_GCC/system/newlib.c
index db2ba17..422ad61 100644
--- a/Demo/MCF5235_GCC/system/newlib.c
+++ b/Demo/MCF5235_GCC/system/newlib.c
@@ -62,8 +62,8 @@
 

 /* ------------------------ Prototypes ------------------------------------ */

 void vSerialPutStringNOISR( xComPortHandle pxPort,

-                            const signed portCHAR * const pcString,

-                            unsigned portSHORT usStringLength );

+                            const signed char * const pcString,

+                            unsigned short usStringLength );

 

 /* ------------------------ Start implementation -------------------------- */

 void

@@ -109,13 +109,13 @@
     {

         case STDERR_FILENO:

             vSerialPutStringNOISR( xSTDComPort,

-                                   ( const signed portCHAR * const )buf,

-                                   ( unsigned portSHORT )nbytes );

+                                   ( const signed char * const )buf,

+                                   ( unsigned short )nbytes );

             break;

         case STDOUT_FILENO:

             vSerialPutString( xSTDComPort,

-                              ( const signed portCHAR * const)buf,

-                              ( unsigned portSHORT )nbytes );

+                              ( const signed char * const)buf,

+                              ( unsigned short )nbytes );

             break;

         default:

             errno = EIO;

diff --git a/Demo/MCF5235_GCC/system/serial.c b/Demo/MCF5235_GCC/system/serial.c
index 0d79c5f..32edb34 100644
--- a/Demo/MCF5235_GCC/system/serial.c
+++ b/Demo/MCF5235_GCC/system/serial.c
@@ -82,7 +82,7 @@
 

 /* ------------------------ Begin implementation -------------------------- */

 xComPortHandle

-xSerialPortInitMinimal( unsigned portLONG ulWantedBaud,

+xSerialPortInitMinimal( unsigned long ulWantedBaud,

                         unsigned portBASE_TYPE uxQueueLength )

 {

     extern void     ( *__RAMVEC[] ) (  );

@@ -91,9 +91,9 @@
 

     /* Create the queues used to hold Rx and Tx characters. */

     xComPortIF[ 0 ].xRXChars =

-        xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE )sizeof( signed portCHAR ) );

+        xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE )sizeof( signed char ) );

     xComPortIF[ 0 ].xTXChars =

-        xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE )sizeof( signed portCHAR ) );

+        xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE )sizeof( signed char ) );

 

     /* If the queues were created correctly then setup the serial port hardware. */

     if( ( xComPortIF[ 0 ].xRXChars != 0 ) && ( xComPortIF[ 0 ].xTXChars != 0 ) )

@@ -144,7 +144,7 @@
 }

 

 signed          portBASE_TYPE

-xSerialGetChar( xComPortHandle pxPort, signed portCHAR * pcRxedChar,

+xSerialGetChar( xComPortHandle pxPort, signed char * pcRxedChar,

                 portTickType xBlockTime )

 {

     int i;

@@ -172,14 +172,14 @@
 }

 

 void

-vSerialPutString( xComPortHandle pxPort, const signed portCHAR *

-                  const pcString, unsigned portSHORT usStringLength )

+vSerialPutString( xComPortHandle pxPort, const signed char *

+                  const pcString, unsigned short usStringLength )

 {

     int i;

-    signed portCHAR *pChNext;

+    signed char *pChNext;

 

     /* Send each character in the string, one at a time. */

-    pChNext = ( signed portCHAR * )pcString;

+    pChNext = ( signed char * )pcString;

     for( i = 0; i < usStringLength; i++ )

     {

         /* Block until character has been transmitted. */

@@ -188,7 +188,7 @@
 }

 

 signed          portBASE_TYPE

-xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar,

+xSerialPutChar( xComPortHandle pxPort, signed char cOutChar,

                 portTickType xBlockTime )

 {

     int i;

@@ -218,7 +218,7 @@
 }

 

 signed          portBASE_TYPE

-xSerialPutCharNOISR( xComPortHandle pxPort, signed portCHAR cOutChar )

+xSerialPutCharNOISR( xComPortHandle pxPort, signed char cOutChar )

 {

     int i;

     portBASE_TYPE xResult = pdFALSE;

@@ -245,15 +245,15 @@
 }

 

 void

-vSerialPutStringNOISR( xComPortHandle pxPort, const signed portCHAR *

-                       const pcString, unsigned portSHORT usStringLength )

+vSerialPutStringNOISR( xComPortHandle pxPort, const signed char *

+                       const pcString, unsigned short usStringLength )

 {

     int i;

-    signed portCHAR *pChNext;

+    signed char *pChNext;

     portBASE_TYPE xOldIPL = portSET_IPL( portIPL_MAX );

 

     /* Send each character in the string, one at a time. */

-    pChNext = ( signed portCHAR * )pcString;

+    pChNext = ( signed char * )pcString;

     for( i = 0; i < usStringLength; i++ )

     {

         /* Block until character has been transmitted. */

@@ -272,7 +272,7 @@
 void

 prvSerialISR( void )

 {

-    static signed portCHAR cChar;

+    static signed char cChar;

     static portBASE_TYPE xHigherPriorityTaskWoken;

 

     /* We have to remvoe the effect of the GCC. Please note that the

diff --git a/Demo/MicroBlaze/FreeRTOSConfig.h b/Demo/MicroBlaze/FreeRTOSConfig.h
index 83f3e37..7dab7e1 100644
--- a/Demo/MicroBlaze/FreeRTOSConfig.h
+++ b/Demo/MicroBlaze/FreeRTOSConfig.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 FREERTOS_CONFIG_H

@@ -65,10 +66,10 @@
 #define configUSE_PREEMPTION		1

 #define configUSE_IDLE_HOOK			0

 #define configUSE_TICK_HOOK			0

-#define configCPU_CLOCK_HZ			( ( unsigned portLONG ) 100000000 )

+#define configCPU_CLOCK_HZ			( ( unsigned long ) 100000000 )

 #define configTICK_RATE_HZ			( ( portTickType ) 1000 )

 #define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 4 )

-#define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 120 )

+#define configMINIMAL_STACK_SIZE	( ( unsigned short ) 120 )

 #define configTOTAL_HEAP_SIZE		( ( size_t ) ( 18 * 1024 ) )

 #define configMAX_TASK_NAME_LEN		( 5 )

 #define configUSE_TRACE_FACILITY	0

diff --git a/Demo/MicroBlaze/ParTest/ParTest.c b/Demo/MicroBlaze/ParTest/ParTest.c
index 4d2993c..deedcb2 100644
--- a/Demo/MicroBlaze/ParTest/ParTest.c
+++ b/Demo/MicroBlaze/ParTest/ParTest.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

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

diff --git a/Demo/MicroBlaze/main.c b/Demo/MicroBlaze/main.c
index 90a1d5f..e7cdd28 100644
--- a/Demo/MicroBlaze/main.c
+++ b/Demo/MicroBlaze/main.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

 /*

@@ -143,8 +144,8 @@
 static void prvSetupHardware( void );

 

 /* Set to pdFAIL should an error be discovered in the register test tasks. */

-static unsigned portLONG ulRegisterTestStatus = pdPASS;

-const unsigned portLONG *pulStatusAddr = &ulRegisterTestStatus;

+static unsigned long ulRegisterTestStatus = pdPASS;

+const unsigned long *pulStatusAddr = &ulRegisterTestStatus;

 

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

 

@@ -243,12 +244,12 @@
 

 	if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )

 	{

-		xAllTestsPass = ( portLONG ) pdFAIL;

+		xAllTestsPass = ( long ) pdFAIL;

 	}

 

 	if( xArePollingQueuesStillRunning() != pdTRUE )

 	{

-		xAllTestsPass = ( portLONG ) pdFAIL;

+		xAllTestsPass = ( long ) pdFAIL;

 	}

 

 	/* Mutual exclusion on this variable is not necessary as we only read it. */

diff --git a/Demo/MicroBlaze/serial/serial.c b/Demo/MicroBlaze/serial/serial.c
index a31d063..8c75a44 100644
--- a/Demo/MicroBlaze/serial/serial.c
+++ b/Demo/MicroBlaze/serial/serial.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

 

@@ -71,17 +72,17 @@
 

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

 

-xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )

+xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )

 {

-unsigned portLONG ulControlReg, ulMask;

+unsigned long ulControlReg, ulMask;

 

 	/* NOTE: The baud rate used by this driver is determined by the hardware

 	parameterization of the UART Lite peripheral, and the baud value passed to

 	this function has no effect. */

 

 	/* Create the queues used to hold Rx and Tx characters. */

-	xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );

-	xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );

+	xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );

+	xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed char ) );

 

 	if( ( xRxedChars ) && ( xCharsForTx ) )

 	{

@@ -109,7 +110,7 @@
 }

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

 

-signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime )

+signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime )

 {

 	/* The port handle is not required as this driver only supports one UART. */

 	( void ) pxPort;

@@ -127,7 +128,7 @@
 }

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

 

-signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime )

+signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime )

 {

 portBASE_TYPE xReturn = pdTRUE;

 

@@ -175,9 +176,9 @@
 

 void vSerialISR( void *pvBaseAddress )

 {

-unsigned portLONG ulISRStatus;

+unsigned long ulISRStatus;

 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;

-portCHAR cChar;

+char cChar;

 

 	/* Determine the cause of the interrupt. */

     ulISRStatus = XIo_In32( XPAR_RS232_UART_BASEADDR + XUL_STATUS_REG_OFFSET );

@@ -187,7 +188,7 @@
 		/* A character is available - place it in the queue of received

 		characters.  This might wake a task that was blocked waiting for 

 		data. */

-		cChar = ( portCHAR )XIo_In32( XPAR_RS232_UART_BASEADDR + XUL_RX_FIFO_OFFSET );

+		cChar = ( char )XIo_In32( XPAR_RS232_UART_BASEADDR + XUL_RX_FIFO_OFFSET );

 		xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );

     }

 

diff --git a/Demo/NEC_78K0R_IAR/ButtonISR.s26 b/Demo/NEC_78K0R_IAR/ButtonISR.s26
index 3ab99a1..8451705 100644
--- a/Demo/NEC_78K0R_IAR/ButtonISR.s26
+++ b/Demo/NEC_78K0R_IAR/ButtonISR.s26
@@ -1,48 +1,49 @@
 ;/*

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

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

 ;

-;	This file is part of the FreeRTOS distribution.

+;    This file is part of the FreeRTOS distribution.

 ;

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

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

-;	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-;	Alternative commercial license and support terms are also available upon 

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

-;	license details.

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

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

+;    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+;    Alternative commercial license and support terms are also available upon

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

+;    license details.

 ;

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

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

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

-;	more details.

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

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

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

+;    more details.

 ;

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

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

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

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

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

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

 ;

 ;

-;	***************************************************************************

-;	*                                                                         *

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

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

-;	*                                                                         *

-;	***************************************************************************

+;    ***************************************************************************

+;    *                                                                         *

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

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

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

+;    *                                                                         *

+;    ***************************************************************************

 ;

-;	1 tab == 4 spaces!

+;    1 tab == 4 spaces!

 ;

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

-;	online documentation.

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

+;    online documentation.

 ;

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

-;	contact details.

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

+;    contact details.

 ;

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

-;	critical systems.

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

+;    critical systems.

 ;

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

-;	licensing and training services.

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

+;    licensing and training services.

 ;*/

 

 ;

diff --git a/Demo/NEC_78K0R_IAR/ButtonTask.c b/Demo/NEC_78K0R_IAR/ButtonTask.c
index 7b1bef6..d799358 100644
--- a/Demo/NEC_78K0R_IAR/ButtonTask.c
+++ b/Demo/NEC_78K0R_IAR/ButtonTask.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

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

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

-	*                                                                         *

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

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

+    *                                                                         *

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

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

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

+    *                                                                         *

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

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

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

-	online documentation.

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

+    online documentation.

 

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

-	contact details.

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

+    contact details.

 

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

-	critical systems.

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

+    critical systems.

 

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

-	licensing and training services.

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

+    licensing and training services.

 */

 

 /*

diff --git a/Demo/NEC_78K0R_IAR/FreeRTOSConfig.h b/Demo/NEC_78K0R_IAR/FreeRTOSConfig.h
index f303f89..82d0dad 100644
--- a/Demo/NEC_78K0R_IAR/FreeRTOSConfig.h
+++ b/Demo/NEC_78K0R_IAR/FreeRTOSConfig.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 FREERTOS_CONFIG_H

@@ -88,7 +89,7 @@
 		#define configUSE_TICK_HOOK				0

 		#define configTICK_RATE_HZ				( ( portTickType ) 1000 )

 		#define configMAX_PRIORITIES			( ( unsigned portBASE_TYPE ) 4 )

-		#define configMINIMAL_STACK_SIZE		( ( unsigned portSHORT ) 100 )

+		#define configMINIMAL_STACK_SIZE		( ( unsigned short ) 100 )

 		#define configMAX_TASK_NAME_LEN			( 10 )

 		#define configUSE_TRACE_FACILITY		0

 		#define configUSE_16_BIT_TICKS			1

@@ -111,9 +112,9 @@
 		#define INCLUDE_vTaskDelay				1

 	

 		#if configCLOCK_SOURCE == 0

-			#define configCPU_CLOCK_HZ			( ( unsigned portLONG ) 20000000 )  /* using the external clock source */

+			#define configCPU_CLOCK_HZ			( ( unsigned long ) 20000000 )  /* using the external clock source */

 		#else

-			#define configCPU_CLOCK_HZ			( ( unsigned portLONG ) 8000000 )   /* using the internal high speed clock */

+			#define configCPU_CLOCK_HZ			( ( unsigned long ) 8000000 )   /* using the internal high speed clock */

 		#endif /* configCLOCK_SOURCE */

 	

 		/* Definitions that are specific to the project being used. */

diff --git a/Demo/NEC_78K0R_IAR/RegTest.s26 b/Demo/NEC_78K0R_IAR/RegTest.s26
index bf73bac..e5358d1 100644
--- a/Demo/NEC_78K0R_IAR/RegTest.s26
+++ b/Demo/NEC_78K0R_IAR/RegTest.s26
@@ -1,48 +1,49 @@
 ;/*

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

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

 ;

-;	This file is part of the FreeRTOS distribution.

+;    This file is part of the FreeRTOS distribution.

 ;

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

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

-;	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-;	Alternative commercial license and support terms are also available upon 

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

-;	license details.

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

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

+;    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+;    Alternative commercial license and support terms are also available upon

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

+;    license details.

 ;

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

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

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

-;	more details.

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

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

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

+;    more details.

 ;

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

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

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

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

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

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

 ;

 ;

-;	***************************************************************************

-;	*                                                                         *

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

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

-;	*                                                                         *

-;	***************************************************************************

+;    ***************************************************************************

+;    *                                                                         *

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

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

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

+;    *                                                                         *

+;    ***************************************************************************

 ;

-;	1 tab == 4 spaces!

+;    1 tab == 4 spaces!

 ;

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

-;	online documentation.

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

+;    online documentation.

 ;

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

-;	contact details.

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

+;    contact details.

 ;

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

-;	critical systems.

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

+;    critical systems.

 ;

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

-;	licensing and training services.

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

+;    licensing and training services.

 ;*/

 

 

diff --git a/Demo/NEC_78K0R_IAR/main.c b/Demo/NEC_78K0R_IAR/main.c
index a4234c5..1ea8112 100644
--- a/Demo/NEC_78K0R_IAR/main.c
+++ b/Demo/NEC_78K0R_IAR/main.c
@@ -1,48 +1,49 @@
 /*

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

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

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

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

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

-	Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

-	Alternative commercial license and support terms are also available upon 

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

-	license details.

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

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

+    Free Software Foundation and modified by the FreeRTOS exception.

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

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

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

+    Alternative commercial license and support terms are also available upon

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

+    license details.

 

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

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

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

-	more details.

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

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

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

+    more details.

 

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

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

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

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

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

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

 

 

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

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

diff --git a/Demo/NEC_V850ES_IAR/FreeRTOSConfig.h b/Demo/NEC_V850ES_IAR/FreeRTOSConfig.h
index fc10fb1..5f3d721 100644
--- a/Demo/NEC_V850ES_IAR/FreeRTOSConfig.h
+++ b/Demo/NEC_V850ES_IAR/FreeRTOSConfig.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 FREERTOS_CONFIG_H

@@ -81,7 +82,7 @@
 	#define configUSE_TICK_HOOK				0

 	#define configTICK_RATE_HZ				( ( portTickType ) 1000 )

 	#define configMAX_PRIORITIES			( ( unsigned portBASE_TYPE ) 4 )

-	#define configMINIMAL_STACK_SIZE		( ( unsigned portSHORT ) 85 )

+	#define configMINIMAL_STACK_SIZE		( ( unsigned short ) 85 )

 	#define configMAX_TASK_NAME_LEN			( 10 )

 	#define configUSE_TRACE_FACILITY		0

 	#define configUSE_16_BIT_TICKS			0

@@ -113,31 +114,31 @@
 	#ifdef __IAR_V850ES_Fx3__

 		#include "io70f3385.h"

 		#define configTOTAL_HEAP_SIZE			( (size_t ) ( 20000 ) )

-		#define configCPU_CLOCK_HZ				( ( unsigned portLONG ) 48000000 )

+		#define configCPU_CLOCK_HZ				( ( unsigned long ) 48000000 )

 	#endif

 

 	#ifdef __IAR_V850ES_Jx3__

 		#include "io70f3746.h"

 		#define configTOTAL_HEAP_SIZE			( (size_t ) ( 9000 ) )

-		#define configCPU_CLOCK_HZ				( ( unsigned portLONG ) 16000000 )

+		#define configCPU_CLOCK_HZ				( ( unsigned long ) 16000000 )

 	#endif

 

 	#ifdef __IAR_V850ES_Jx3_L__

 		#include "io70f3738.h"

 		#define configTOTAL_HEAP_SIZE			( (size_t ) ( 9000 ) )

-		#define configCPU_CLOCK_HZ				( ( unsigned portLONG ) 20000000 )

+		#define configCPU_CLOCK_HZ				( ( unsigned long ) 20000000 )

 	#endif

 

 	#ifdef __IAR_V850ES_Jx2__

 		#include "io70f3717.h"

 		#define configTOTAL_HEAP_SIZE			( (size_t ) ( 9000 ) )

-		#define configCPU_CLOCK_HZ				( ( unsigned portLONG ) 20000000 )

+		#define configCPU_CLOCK_HZ				( ( unsigned long ) 20000000 )

 	#endif

 

 	#ifdef __IAR_V850ES_Hx2__

 		#include "io70f3707.h"

 		#define configTOTAL_HEAP_SIZE			( (size_t ) ( 9000 ) )

-		#define configCPU_CLOCK_HZ				( ( unsigned portLONG ) 20000000 )

+		#define configCPU_CLOCK_HZ				( ( unsigned long ) 20000000 )

 	#endif

 

 #endif /* __IAR_SYSTEMS_ICC__ */

diff --git a/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit.c b/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit.c
index 6e6d030..0e4db10 100644
--- a/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit.c
+++ b/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #include "FreeRTOS.h"

diff --git a/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Fx3.c b/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Fx3.c
index e37101b..1a3e770 100644
--- a/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Fx3.c
+++ b/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Fx3.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #include "FreeRTOS.h"

diff --git a/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Hx2.c b/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Hx2.c
index be1c632..25fe4a6 100644
--- a/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Hx2.c
+++ b/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Hx2.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #include "FreeRTOS.h"

diff --git a/Demo/NEC_V850ES_IAR/ParTest/ParTest_Fx3_App_Board.c b/Demo/NEC_V850ES_IAR/ParTest/ParTest_Fx3_App_Board.c
index 4b030ef..fd96c86 100644
--- a/Demo/NEC_V850ES_IAR/ParTest/ParTest_Fx3_App_Board.c
+++ b/Demo/NEC_V850ES_IAR/ParTest/ParTest_Fx3_App_Board.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*-----------------------------------------------------------

diff --git a/Demo/NEC_V850ES_IAR/ParTest/ParTest_Generic_Target_Board.c b/Demo/NEC_V850ES_IAR/ParTest/ParTest_Generic_Target_Board.c
index 958f8f3..19a140a 100644
--- a/Demo/NEC_V850ES_IAR/ParTest/ParTest_Generic_Target_Board.c
+++ b/Demo/NEC_V850ES_IAR/ParTest/ParTest_Generic_Target_Board.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*-----------------------------------------------------------

diff --git a/Demo/NEC_V850ES_IAR/RegTest.s85 b/Demo/NEC_V850ES_IAR/RegTest.s85
index cc39cf6..fcf6fea 100644
--- a/Demo/NEC_V850ES_IAR/RegTest.s85
+++ b/Demo/NEC_V850ES_IAR/RegTest.s85
@@ -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.

 ;*/

 ; Note: Select the correct include files for the device used by the application.

 

diff --git a/Demo/NEC_V850ES_IAR/main.c b/Demo/NEC_V850ES_IAR/main.c
index 3d06e7c..00eaa9c 100644
--- a/Demo/NEC_V850ES_IAR/main.c
+++ b/Demo/NEC_V850ES_IAR/main.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

diff --git a/Demo/NEC_V850ES_IAR/serial/serial.c b/Demo/NEC_V850ES_IAR/serial/serial.c
index 5822106..f580167 100644
--- a/Demo/NEC_V850ES_IAR/serial/serial.c
+++ b/Demo/NEC_V850ES_IAR/serial/serial.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

diff --git a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/FreeRTOSConfig.h b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/FreeRTOSConfig.h
index db1896d..c0a44bb 100644
--- a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/FreeRTOSConfig.h
@@ -1,19 +1,19 @@
 /*

-    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.

 

-    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 

+    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 

+    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

+    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.

@@ -25,8 +25,9 @@
 

     ***************************************************************************

     *                                                                         *

-    * 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 *

     *                                                                         *

     ***************************************************************************

 

@@ -64,7 +65,7 @@
 #define configUSE_IDLE_HOOK				0

 #define configUSE_TICK_HOOK				0

 #define configTICK_RATE_HZ				( ( portTickType ) 1000 )

-#define configCPU_CLOCK_HZ				( ( unsigned portLONG ) SYS_CLK_FREQ )  

+#define configCPU_CLOCK_HZ				( ( unsigned long ) SYS_CLK_FREQ )  

 #define configMAX_PRIORITIES			( ( unsigned portBASE_TYPE ) 5 )

 #define configMINIMAL_STACK_SIZE		( 1024 )

 #define configISR_STACK_SIZE			configMINIMAL_STACK_SIZE

diff --git a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/ParTest/ParTest.c b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/ParTest/ParTest.c
index 331ce52..62f8126 100644
--- a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/ParTest/ParTest.c
+++ b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/ParTest/ParTest.c
@@ -1,19 +1,19 @@
 /*

-    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.

 

-    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 

+    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 

+    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

+    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.

@@ -25,8 +25,9 @@
 

     ***************************************************************************

     *                                                                         *

-    * 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 *

     *                                                                         *

     ***************************************************************************

 

@@ -65,7 +66,7 @@
 

 /*---------------------------------------------------------------------------*/

 

-static unsigned portLONG ulLedStates;

+static unsigned long ulLedStates;

 

 /*---------------------------------------------------------------------------*/

 

diff --git a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c
index b2eaf78..815fe9f 100644
--- a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c
+++ b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c
@@ -1,19 +1,19 @@
 /*

-    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.

 

-    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 

+    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 

+    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

+    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.

@@ -25,8 +25,9 @@
 

     ***************************************************************************

     *                                                                         *

-    * 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 *

     *                                                                         *

     ***************************************************************************

 

@@ -222,7 +223,7 @@
 }

 /*-----------------------------------------------------------*/

 

-void _general_exception_handler( unsigned portLONG ulCause, unsigned portLONG ulStatus )

+void _general_exception_handler( unsigned long ulCause, unsigned long ulStatus )

 {

 	/* This overrides the definition provided by the kernel.  Other exceptions 

 	should be handled here. */

@@ -237,7 +238,7 @@
 {

 portTickType xLastExecutionTime, ulTicksToWait = mainNO_ERROR_PERIOD;

 unsigned long ulLastRegTest1 = 0UL, ulLastRegTest2 = 0UL;

-const portCHAR * pcMessage;

+const char * pcMessage;

 

 	/* Initialise the variable used to control our iteration rate prior to

 	its first use. */

diff --git a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/serial.c b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/serial.c
index 0942045..d48fa4f 100644
--- a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/serial.c
+++ b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/serial.c
@@ -1,19 +1,19 @@
 /*

-    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.

 

-    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 

+    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 

+    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

+    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.

@@ -25,8 +25,9 @@
 

     ***************************************************************************

     *                                                                         *

-    * 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 *

     *                                                                         *

     ***************************************************************************

 

@@ -73,11 +74,11 @@
 static void vUARTTransmitHandler( alt_u32 status );

 /*---------------------------------------------------------------------------*/

 

-xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )

+xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )

 {

 	/* Create the queues used to hold Rx and Tx characters. */

-	xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );

-	xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );

+	xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );

+	xCharsForTx = xQueueCreate( uxQueueLength + 1, ( unsigned portBASE_TYPE ) sizeof( signed char ) );

 

 	/* If the queues were created correctly then setup the serial port hardware. */

 	if( ( xRxedChars != serINVALID_QUEUE ) && ( xCharsForTx != serINVALID_QUEUE ) )

@@ -106,7 +107,7 @@
 }

 /*---------------------------------------------------------------------------*/

 

-signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime )

+signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime )

 {

 	/* The port handle is not required as this driver only supports one port. */

 	( void ) pxPort;

@@ -127,7 +128,7 @@
 }

 /*---------------------------------------------------------------------------*/

 

-signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime )

+signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime )

 {

 signed portBASE_TYPE lReturn = pdPASS;

 

@@ -147,9 +148,9 @@
 }

 /*---------------------------------------------------------------------------*/

 

-void vSerialPutString( xComPortHandle pxPort, const signed portCHAR * const pcString, unsigned portSHORT usStringLength )

+void vSerialPutString( xComPortHandle pxPort, const signed char * const pcString, unsigned short usStringLength )

 {

-signed portCHAR *pxNext;

+signed char *pxNext;

 

 	/* A couple of parameters that this port does not use. */

 	( void ) usStringLength;

@@ -161,7 +162,7 @@
 	( void ) pxPort;

 

 	/* Send each character in the string, one at a time. */

-	pxNext = ( signed portCHAR * ) pcString;

+	pxNext = ( signed char * ) pcString;

 	while( *pxNext )

 	{

 		xSerialPutChar( pxPort, *pxNext, serNO_BLOCK );

@@ -197,7 +198,7 @@
 

 static void vUARTReceiveHandler( alt_u32 status )

 {

-signed portCHAR cChar;

+signed char cChar;

 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;

 

 	/* If there was an error, discard the data */

@@ -223,7 +224,7 @@
 

 static void vUARTTransmitHandler( alt_u32 status )

 {

-signed portCHAR cChar;

+signed char cChar;

 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;

 	/* Transfer data if there is some ready to be transferred */

 	if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xHigherPriorityTaskWoken ) == pdTRUE )

diff --git a/Demo/PC/FRConfig.h b/Demo/PC/FRConfig.h
index fbd5e57..b35cdee 100644
--- a/Demo/PC/FRConfig.h
+++ b/Demo/PC/FRConfig.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 FREERTOS_CONFIG_H

@@ -59,7 +60,7 @@
 #define configUSE_IDLE_HOOK			1

 #define configUSE_TICK_HOOK			1

 #define configTICK_RATE_HZ			( ( portTickType ) 1000 )

-#define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 128 ) /* This can be made smaller if required. */

+#define configMINIMAL_STACK_SIZE	( ( unsigned short ) 128 ) /* This can be made smaller if required. */

 #define configTOTAL_HEAP_SIZE		( ( size_t ) ( 32 * 1024 ) ) 

 #define configMAX_TASK_NAME_LEN		( 16 )

 #define configUSE_TRACE_FACILITY    0

diff --git a/Demo/PC/FileIO/fileIO.c b/Demo/PC/FileIO/fileIO.c
index 358c69c..eb6b717 100644
--- a/Demo/PC/FileIO/fileIO.c
+++ b/Demo/PC/FileIO/fileIO.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 #include <stdio.h>

@@ -55,7 +56,7 @@
 /* Demo program include files. */

 #include "fileio.h"

 

-void vDisplayMessage( const portCHAR * const pcMessageToPrint )

+void vDisplayMessage( const char * const pcMessageToPrint )

 {

 	vTaskSuspendAll();

 	{

@@ -66,10 +67,10 @@
 }

 /*-----------------------------------------------------------*/

 

-void vWriteMessageToDisk( const portCHAR * const pcMessage )

+void vWriteMessageToDisk( const char * const pcMessage )

 {

-const portCHAR * const pcFileName = "a:\\RTOSlog.txt";

-const portCHAR * const pcSeparator = "\r\n-----------------------\r\n";

+const char * const pcFileName = "a:\\RTOSlog.txt";

+const char * const pcSeparator = "\r\n-----------------------\r\n";

 FILE *pf;

 

 	vTaskSuspendAll();

@@ -77,8 +78,8 @@
 		pf = fopen( pcFileName, "a" );

 		if( pf != NULL )

 		{

-			fwrite( pcMessage, strlen( pcMessage ), ( unsigned portSHORT ) 1, pf );

-			fwrite( pcSeparator, strlen( pcSeparator ), ( unsigned portSHORT ) 1, pf );

+			fwrite( pcMessage, strlen( pcMessage ), ( unsigned short ) 1, pf );

+			fwrite( pcSeparator, strlen( pcSeparator ), ( unsigned short ) 1, pf );

 			fclose( pf );

 		}

 	}

@@ -86,9 +87,9 @@
 }

 /*-----------------------------------------------------------*/

 

-void vWriteBufferToDisk( const portCHAR * const pcBuffer, unsigned portLONG ulBufferLength )

+void vWriteBufferToDisk( const char * const pcBuffer, unsigned long ulBufferLength )

 {

-const portCHAR * const pcFileName = "a:\\trace.bin";

+const char * const pcFileName = "a:\\trace.bin";

 FILE *pf;

 

 	vTaskSuspendAll();

@@ -96,7 +97,7 @@
 		pf = fopen( pcFileName, "wb" );

 		if( pf )

 		{

-			fwrite( pcBuffer, ( size_t ) ulBufferLength, ( unsigned portSHORT ) 1, pf );

+			fwrite( pcBuffer, ( size_t ) ulBufferLength, ( unsigned short ) 1, pf );

 			fclose( pf );

 		}

 	}

diff --git a/Demo/PC/FreeRTOSConfig.h b/Demo/PC/FreeRTOSConfig.h
index e1f29fb..e21f490 100644
--- a/Demo/PC/FreeRTOSConfig.h
+++ b/Demo/PC/FreeRTOSConfig.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 FREERTOS_CONFIG_H

@@ -67,7 +68,7 @@
 #define configUSE_IDLE_HOOK				1

 #define configUSE_TICK_HOOK				1

 #define configTICK_RATE_HZ				( ( portTickType ) 1000 )

-#define configMINIMAL_STACK_SIZE		( ( unsigned portSHORT ) 256 ) /* This can be made smaller if required. */

+#define configMINIMAL_STACK_SIZE		( ( unsigned short ) 256 ) /* This can be made smaller if required. */

 #define configTOTAL_HEAP_SIZE			( ( size_t ) ( 32 * 1024 ) ) 

 #define configMAX_TASK_NAME_LEN			( 16 )

 #define configUSE_TRACE_FACILITY    	1

diff --git a/Demo/PC/ParTest/ParTest.c b/Demo/PC/ParTest/ParTest.c
index 7c53b0a..a387702 100644
--- a/Demo/PC/ParTest/ParTest.c
+++ b/Demo/PC/ParTest/ParTest.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

@@ -61,12 +62,12 @@
 #include "partest.h"

 #include "task.h"

 

-#define partstALL_OUTPUTS_OFF			( ( unsigned portCHAR ) 0x00 )

-#define partstMAX_OUTPUT_LED			( ( unsigned portCHAR ) 7 )

+#define partstALL_OUTPUTS_OFF			( ( unsigned char ) 0x00 )

+#define partstMAX_OUTPUT_LED			( ( unsigned char ) 7 )

 

 /*lint -e956 File scope parameters okay here. */

-static unsigned portSHORT usPortAddress = partstDEFAULT_PORT_ADDRESS;

-static volatile unsigned portCHAR ucCurrentOutputValue = partstALL_OUTPUTS_OFF;

+static unsigned short usPortAddress = partstDEFAULT_PORT_ADDRESS;

+static volatile unsigned char ucCurrentOutputValue = partstALL_OUTPUTS_OFF;

 /*lint +e956 */

 

 

@@ -84,7 +85,7 @@
 

 void vParTestSetLED( unsigned portBASE_TYPE uxLED, portBASE_TYPE xValue )

 {

-unsigned portCHAR ucBit = ( unsigned portCHAR ) 1;

+unsigned char ucBit = ( unsigned char ) 1;

 

 	if( uxLED <= partstMAX_OUTPUT_LED )

 	{

@@ -95,7 +96,7 @@
 	{

 		if( xValue == pdTRUE )

 		{

-			ucBit ^= ( unsigned portCHAR ) 0xff;

+			ucBit ^= ( unsigned char ) 0xff;

 			ucCurrentOutputValue &= ucBit;

 		}

 		else

@@ -111,11 +112,11 @@
 

 void vParTestToggleLED( unsigned portBASE_TYPE uxLED )

 {

-unsigned portCHAR ucBit;

+unsigned char ucBit;

 

 	if( uxLED <= partstMAX_OUTPUT_LED )

 	{

-		ucBit = ( ( unsigned portCHAR ) 1 ) << uxLED;

+		ucBit = ( ( unsigned char ) 1 ) << uxLED;

 

 		vTaskSuspendAll();

 		{

diff --git a/Demo/PC/main.c b/Demo/PC/main.c
index 4fb40ae..d7db47d 100644
--- a/Demo/PC/main.c
+++ b/Demo/PC/main.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /**

@@ -118,8 +119,8 @@
 #define mainSEMAPHORE_TASK_PRIORITY	( tskIDLE_PRIORITY + 1 )

 #define mainGENERIC_QUEUE_PRIORITY	( tskIDLE_PRIORITY )

 

-#define mainPRINT_STACK_SIZE		( ( unsigned portSHORT ) 512 )

-#define mainDEBUG_LOG_BUFFER_SIZE	( ( unsigned portSHORT ) 20480 )

+#define mainPRINT_STACK_SIZE		( ( unsigned short ) 512 )

+#define mainDEBUG_LOG_BUFFER_SIZE	( ( unsigned short ) 20480 )

 

 /* The number of flash co-routines to create. */

 #define mainNUM_FLASH_CO_ROUTINES	( 8 )

@@ -138,11 +139,11 @@
 /* Buffer used by the trace visualisation utility so only needed if the trace

 being used. */

 #if configUSE_TRACE_FACILITY == 1

-	static portCHAR pcWriteBuffer[ mainDEBUG_LOG_BUFFER_SIZE ];

+	static char pcWriteBuffer[ mainDEBUG_LOG_BUFFER_SIZE ];

 #endif

 

 /* Constant definition used to turn on/off the pre-emptive scheduler. */

-static const portSHORT sUsingPreemption = configUSE_PREEMPTION;

+static const short sUsingPreemption = configUSE_PREEMPTION;

 

 /* Start the math tasks appropriate to the build.  The Borland port does

 not yet support floating point so uses the integer equivalent. */

@@ -156,12 +157,12 @@
 

 /* Just used to count the number of times the example task callback function is

 called, and the number of times a queue send passes. */

-static unsigned portLONG portLONG uxCheckTaskHookCallCount = 0;

-static unsigned portLONG portLONG uxQueueSendPassedCount = 0;

+static unsigned long long uxCheckTaskHookCallCount = 0;

+static unsigned long long uxQueueSendPassedCount = 0;

 

 /*-----------------------------------------------------------*/

 

-portSHORT main( void )

+short main( void )

 {

 	/* Initialise hardware and utilities. */

 	vParTestInitialise();

@@ -235,12 +236,12 @@
 {

 portTickType xExpectedWakeTime;

 const portTickType xPrintRate = ( portTickType ) 5000 / portTICK_RATE_MS;

-const portLONG lMaxAllowableTimeDifference = ( portLONG ) 0;

+const long lMaxAllowableTimeDifference = ( long ) 0;

 portTickType xWakeTime;

-portLONG lTimeDifference;

-const portCHAR *pcReceivedMessage;

-const portCHAR * const pcTaskBlockedTooLongMsg = "Print task blocked too long!\r\n";

-const portCHAR * const pcUnexpectedHookValueMsg = "Task hook has unexpected value!\r\n";

+long lTimeDifference;

+const char *pcReceivedMessage;

+const char * const pcTaskBlockedTooLongMsg = "Print task blocked too long!\r\n";

+const char * const pcUnexpectedHookValueMsg = "Task hook has unexpected value!\r\n";

 

 	( void ) pvParameters;

 

@@ -279,11 +280,11 @@
 			time we should have unblocked. */

 			if( xWakeTime > xExpectedWakeTime )

 			{

-				lTimeDifference = ( portLONG ) ( xWakeTime - xExpectedWakeTime );

+				lTimeDifference = ( long ) ( xWakeTime - xExpectedWakeTime );

 			}

 			else

 			{

-				lTimeDifference = ( portLONG ) ( xExpectedWakeTime - xWakeTime );

+				lTimeDifference = ( long ) ( xExpectedWakeTime - xWakeTime );

 			}

 

 			if( lTimeDifference > lMaxAllowableTimeDifference )

@@ -317,7 +318,7 @@
 

 static void	prvCheckForKeyPresses( void )

 {

-portSHORT sIn;

+short sIn;

 

 	taskENTER_CRITICAL();

 		#ifdef DEBUG_BUILD

@@ -346,7 +347,7 @@
 							break;

 

 				case 'e' :	{

-								unsigned portLONG ulBufferLength;

+								unsigned long ulBufferLength;

 								ulBufferLength = ulTaskEndTrace();

 								vWriteBufferToDisk( pcWriteBuffer, ulBufferLength );

 							}

@@ -362,8 +363,8 @@
 

 static void prvCheckOtherTasksAreStillRunning( void )

 {

-static portSHORT sErrorHasOccurred = pdFALSE;

-static unsigned portLONG portLONG uxLastHookCallCount = 0, uxLastQueueSendCount = 0;

+static short sErrorHasOccurred = pdFALSE;

+static unsigned long long uxLastHookCallCount = 0, uxLastQueueSendCount = 0;

 

 	if( prvCheckMathTasksAreStillRunning() != pdTRUE )

 	{

diff --git a/Demo/PC/serial/serial.c b/Demo/PC/serial/serial.c
index 5935288..20398ec 100644
--- a/Demo/PC/serial/serial.c
+++ b/Demo/PC/serial/serial.c
@@ -3,77 +3,58 @@
 	simplified it by removing a lot of the functionality (hardware 

 	flow control, etc.).  For more details and the full version see

 	http://dzcomm.sourceforge.net

-

-

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

-

-	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 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.

-

-

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

-

-	1 tab == 4 spaces!

-

-	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.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.

 */

 

 /*

-Changes from V1.00:

-	

-	+ Call to the more efficient portSWITCH_CONTEXT() replaces the call to 

-	  taskYIELD() in the ISR.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-Changes from V1.2.0:

+    This file is part of the FreeRTOS distribution.

 

-	+ Added vSerialPutString().

+    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.

 

-Changes from V1.2.3

+    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.

 

-	+ The function xPortInitMinimal() has been renamed to 

-	  xSerialPortInitMinimal() and the function xPortInit() has been renamed

-	  to xSerialPortInit().

+    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.

 

-Changes From V2.0.0

 

-	+ Use portTickType in place of unsigned pdLONG for delay periods.

-	+ cQueueReieveFromISR() used in place of xQueueReceive() in ISR.

+    ***************************************************************************

+    *                                                                         *

+    * 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!

+

+    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.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.

 */

 

 

+

 #include <stdlib.h>

 #include <dos.h>

 #include "FreeRTOS.h"

@@ -84,16 +65,16 @@
 

 #define serMAX_IRQs						( 16 )

 #define serTRANSMIT_HOLD_EMPTY_INT		( 0x02 )

-#define serCOM1_STANDARD_IRQ			( ( unsigned portCHAR ) 4 )

-#define serCOM2_STANDARD_IRQ			( ( unsigned portCHAR ) 3 )

+#define serCOM1_STANDARD_IRQ			( ( unsigned char ) 4 )

+#define serCOM2_STANDARD_IRQ			( ( unsigned char ) 3 )

 

 

-#define	serIMR_8259_0					( ( unsigned portCHAR ) 0x21 )

-#define	serIMR_8259_1					( ( unsigned portCHAR ) 0xa1 )

-#define	serISR_8259_0					( ( unsigned portCHAR ) 0x20 )

-#define	serISR_8259_1					( ( unsigned portCHAR ) 0xa0 )

-#define	serALL_COMS_INTERRUPTS			( ( unsigned portCHAR ) 0x0f )

-#define	serALL_MODEM_CTRL_INTERRUPTS	( ( unsigned portCHAR ) 0x0f )

+#define	serIMR_8259_0					( ( unsigned char ) 0x21 )

+#define	serIMR_8259_1					( ( unsigned char ) 0xa1 )

+#define	serISR_8259_0					( ( unsigned char ) 0x20 )

+#define	serISR_8259_1					( ( unsigned char ) 0xa0 )

+#define	serALL_COMS_INTERRUPTS			( ( unsigned char ) 0x0f )

+#define	serALL_MODEM_CTRL_INTERRUPTS	( ( unsigned char ) 0x0f )

 

 #define serTRANSMIT_HOLD_OFFSET					( 0 )

 #define serRECEIVE_DATA_OFFSET					( 0 )

@@ -108,13 +89,13 @@
 #define serMODEM_STATUS_OFFSET					( 6 )

 #define serSCR_OFFSET							( 7 )

 

-#define serMAX_BAUD			( ( unsigned portLONG ) 115200UL )

+#define serMAX_BAUD			( ( unsigned long ) 115200UL )

 

 #define serNO_INTERRUPTS	( 0x00 )

 

 #define vInterruptOn( pxPort, ucInterrupt )										\

 {																				\

-	unsigned portCHAR ucIn = portINPUT_BYTE( pxPort->usInterruptEnableReg );	\

+	unsigned char ucIn = portINPUT_BYTE( pxPort->usInterruptEnableReg );	\

 	if( !( ucIn & ucInterrupt ) )												\

 	{																			\

 		portOUTPUT_BYTE( pxPort->usInterruptEnableReg, ucIn | ucInterrupt );	\

@@ -124,7 +105,7 @@
 

 #define vInterruptOff( pxPort, ucInterrupt )									\

 {																				\

-	unsigned portCHAR ucIn = portINPUT_BYTE( pxPort->usInterruptEnableReg );	\

+	unsigned char ucIn = portINPUT_BYTE( pxPort->usInterruptEnableReg );	\

 	if( ucIn & ucInterrupt )													\

 	{																			\

 		portOUTPUT_BYTE( pxPort->usInterruptEnableReg, ucIn & ~ucInterrupt);	\

@@ -189,37 +170,37 @@
 } eBaud;

 

 /* This *MUST* match the order in the eBaud definition. */

-unsigned portLONG ulBaudFromEnum[] = 

+unsigned long ulBaudFromEnum[] = 

 { 

-	( unsigned portLONG ) 50, 

-	( unsigned portLONG ) 75, 

-	( unsigned portLONG ) 110, 

-	( unsigned portLONG ) 134, 

-	( unsigned portLONG ) 150,	

-	( unsigned portLONG ) 200, 

-	( unsigned portLONG ) 300, 

-	( unsigned portLONG ) 600, 

-	( unsigned portLONG ) 1200, 

-	( unsigned portLONG ) 1800, 

-	( unsigned portLONG ) 2400,   

-	( unsigned portLONG ) 4800,   

-	( unsigned portLONG ) 9600,  

-	( unsigned portLONG ) 19200,  

-	( unsigned portLONG ) 38400UL,

-	( unsigned portLONG ) 57600UL,

-	( unsigned portLONG ) 115200UL

+	( unsigned long ) 50, 

+	( unsigned long ) 75, 

+	( unsigned long ) 110, 

+	( unsigned long ) 134, 

+	( unsigned long ) 150,	

+	( unsigned long ) 200, 

+	( unsigned long ) 300, 

+	( unsigned long ) 600, 

+	( unsigned long ) 1200, 

+	( unsigned long ) 1800, 

+	( unsigned long ) 2400,   

+	( unsigned long ) 4800,   

+	( unsigned long ) 9600,  

+	( unsigned long ) 19200,  

+	( unsigned long ) 38400UL,

+	( unsigned long ) 57600UL,

+	( unsigned long ) 115200UL

 };

 

 typedef struct xCOM_PORT

 { 

-	unsigned portSHORT sPort;   /* comm port address eg. 0x3f8    */

-	unsigned portCHAR ucIRQ;    /* comm IRQ eg. 3                 */

+	unsigned short sPort;   /* comm port address eg. 0x3f8    */

+	unsigned char ucIRQ;    /* comm IRQ eg. 3                 */

 

 	/* Next two fields used for setting up the IRQ routine and

 	* (un)masking the interrupt in certain circumstances.

 	*/

-	unsigned portSHORT usIRQVector;

-	unsigned portCHAR ucInterruptEnableMast;

+	unsigned short usIRQVector;

+	unsigned char ucInterruptEnableMast;

 

 	/* Read/Write buffers. */

 	xQueueHandle xRxedChars; 

@@ -228,20 +209,20 @@
 	/* This lot are set up to minimise CPU time where accessing the comm

 	* port's registers.

 	*/

-	unsigned portSHORT usTransmitHoldReg; 

-	unsigned portSHORT usReceiveDataRegister;

-	unsigned portSHORT usBaudRateDivisorLow; 

-	unsigned portSHORT usBaudRateDivisorHigh;

-	unsigned portSHORT usInterruptEnableReg;

-	unsigned portSHORT usInterruptIDReg;

-	unsigned portSHORT usFIFOCtrlReg;

-	unsigned portSHORT usLineCtrlReg;

-	unsigned portSHORT usModemCtrlReg;

-	unsigned portSHORT usLineStatusReg;

-	unsigned portSHORT usModemStatusReg;

-	unsigned portSHORT usSCRReg;

-	unsigned portSHORT us8259InterruptServiceReg;

-	unsigned portSHORT us8259InterruptMaskReg;

+	unsigned short usTransmitHoldReg; 

+	unsigned short usReceiveDataRegister;

+	unsigned short usBaudRateDivisorLow; 

+	unsigned short usBaudRateDivisorHigh;

+	unsigned short usInterruptEnableReg;

+	unsigned short usInterruptIDReg;

+	unsigned short usFIFOCtrlReg;

+	unsigned short usLineCtrlReg;

+	unsigned short usModemCtrlReg;

+	unsigned short usLineStatusReg;

+	unsigned short usModemStatusReg;

+	unsigned short usSCRReg;

+	unsigned short us8259InterruptServiceReg;

+	unsigned short us8259InterruptMaskReg;

 

 	/* This semaphore does nothing useful except test a feature of the

 	scheduler. */

@@ -260,12 +241,12 @@
 /* These prototypes are repeated here so we don't have to include the serial header.  This allows

 the xComPortHandle structure details to be private to this file. */

 xComPortHandle xSerialPortInit( eCOMPort ePort, eBaud eWantedBaud, eParity eWantedParity, eDataBits eWantedDataBits, eStopBits eWantedStopBits, unsigned portBASE_TYPE uxBufferLength );

-portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, portCHAR *pcRxedChar, portTickType xBlockTime );

-portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, portCHAR cOutChar, portTickType xBlockTime );

+portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, char *pcRxedChar, portTickType xBlockTime );

+portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, char cOutChar, portTickType xBlockTime );

 portBASE_TYPE xSerialWaitForSemaphore( xComPortHandle xPort );

 

 static void prvSetupPortHardware( xComPort *pxPort, eCOMPort ePort, eBaud eWantedBaud, eParity eWantedParity, eDataBits eWantedDataBits, eStopBits eWantedStopBits );

-static portSHORT sComPortISR( const xComPort * const pxPort );

+static short sComPortISR( const xComPort * const pxPort );

 

 /*-----------------------------------------------------------*/

 

@@ -333,8 +314,8 @@
 	if( pxPort != NULL )

 	{

 		/* Create the queues used by the comtest task. */

-		pxPort->xRxedChars = xQueueCreate( uxBufferLength, ( unsigned portBASE_TYPE ) sizeof( portCHAR ) );

-		pxPort->xCharsForTx = xQueueCreate( uxBufferLength, ( unsigned portBASE_TYPE ) sizeof( portCHAR ) );

+		pxPort->xRxedChars = xQueueCreate( uxBufferLength, ( unsigned portBASE_TYPE ) sizeof( char ) );

+		pxPort->xCharsForTx = xQueueCreate( uxBufferLength, ( unsigned portBASE_TYPE ) sizeof( char ) );

 

 		/* Create the test semaphore.  This does nothing useful except test a feature of the scheduler. */

 		vSemaphoreCreateBinary( pxPort->xTestSem );

@@ -350,11 +331,11 @@
 

 static void prvSetupPortHardware( xComPort *pxPort, eCOMPort ePort, eBaud eWantedBaud, eParity eWantedParity, eDataBits eWantedDataBits, eStopBits eWantedStopBits )

 {

-portSHORT sIn;

-unsigned portLONG ulDivisor;

-unsigned portCHAR ucDivisorLow;

-unsigned portCHAR ucDivisorHigh;

-unsigned portCHAR ucCommParam;

+short sIn;

+unsigned long ulDivisor;

+unsigned char ucDivisorLow;

+unsigned char ucDivisorHigh;

+unsigned char ucCommParam;

 

 	/* IRQ numbers - standard */

 	if( ( ePort == serCOM1 ) || ( ePort == serCOM3 ) || ( ePort == serCOM5 ) || ( ePort == serCOM7 ) )

@@ -384,8 +365,8 @@
 

 	/* Set communication parameters. */

 	ulDivisor = serMAX_BAUD / ulBaudFromEnum[ eWantedBaud ];

-	ucDivisorLow = ( unsigned portCHAR ) ulDivisor & ( unsigned portCHAR ) 0xff;

-	ucDivisorHigh = ( unsigned portCHAR ) ( ( ( unsigned portSHORT ) ulDivisor >> 8 ) & 0xff );

+	ucDivisorLow = ( unsigned char ) ulDivisor & ( unsigned char ) 0xff;

+	ucDivisorHigh = ( unsigned char ) ( ( ( unsigned short ) ulDivisor >> 8 ) & 0xff );

 	

 	switch( eWantedParity )

 	{	

@@ -507,10 +488,10 @@
 }

 /*-----------------------------------------------------------*/

 

-static portSHORT sComPortISR( const xComPort * const pxPort )

+static short sComPortISR( const xComPort * const pxPort )

 {

-portSHORT sInterruptID;

-portCHAR cIn, cOut;

+short sInterruptID;

+char cIn, cOut;

 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;

 extern void vComTestUnsuspendTask( void );

 

@@ -533,7 +514,7 @@
 						description. */

 						do

 						{

-							cIn = ( portCHAR ) portINPUT_BYTE( pxPort->usReceiveDataRegister );						

+							cIn = ( char ) portINPUT_BYTE( pxPort->usReceiveDataRegister );						

 							xQueueSendFromISR( pxPort->xRxedChars, &cIn, &xHigherPriorityTaskWoken );

 

 							/* Also release the semaphore - this does nothing interesting and is just a test.

@@ -556,7 +537,7 @@
 						must be at least one to read by virtue of having got here.) */

 						do

 						{

-							cIn = ( portCHAR ) portINPUT_BYTE( pxPort->usReceiveDataRegister );						

+							cIn = ( char ) portINPUT_BYTE( pxPort->usReceiveDataRegister );						

 							xQueueSendFromISR( pxPort->xRxedChars, &cIn, &xHigherPriorityTaskWoken );

 

 							/* Also release the semaphore - this does nothing interesting and is just a test.

@@ -576,7 +557,7 @@
 						}																						

 						else																					

 						{																						

-							portOUTPUT_BYTE( pxPort->usTransmitHoldReg, ( portSHORT ) cOut );					

+							portOUTPUT_BYTE( pxPort->usTransmitHoldReg, ( short ) cOut );					

 						}

 						break;

 

@@ -609,7 +590,7 @@
 }

 /*-----------------------------------------------------------*/

 

-portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, portCHAR *pcRxedChar, portTickType xBlockTime )

+portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, char *pcRxedChar, portTickType xBlockTime )

 {

 	/* Get the next character from the buffer, note that this routine is only 

 	called having checked that the is (at least) one to get */

@@ -624,7 +605,7 @@
 }

 /*-----------------------------------------------------------*/

 

-portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, portCHAR cOutChar, portTickType xBlockTime )

+portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, char cOutChar, portTickType xBlockTime )

 {

 	if( xQueueSend( pxPort->xCharsForTx, &cOutChar, xBlockTime ) != pdPASS )

 	{

@@ -637,15 +618,15 @@
 }

 /*-----------------------------------------------------------*/

 

-void vSerialPutString( xComPortHandle pxPort, const portCHAR * const pcString, unsigned portSHORT usStringLength )

+void vSerialPutString( xComPortHandle pxPort, const char * const pcString, unsigned short usStringLength )

 {

-portCHAR * pcNextChar;

+char * pcNextChar;

 const portTickType xNoBlock = ( portTickType ) 0;

 

 	/* Stop warnings. */

 	( void ) usStringLength;

 

-	pcNextChar = ( portCHAR * ) pcString;

+	pcNextChar = ( char * ) pcString;

 	while( *pcNextChar )

 	{

 		xSerialPutChar( pxPort, *pcNextChar, xNoBlock );

diff --git a/Demo/msp430_CrossWorks/FreeRTOSConfig.h b/Demo/msp430_CrossWorks/FreeRTOSConfig.h
index 1fbed72..e47a59c 100644
--- a/Demo/msp430_CrossWorks/FreeRTOSConfig.h
+++ b/Demo/msp430_CrossWorks/FreeRTOSConfig.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 FREERTOS_CONFIG_H

@@ -95,10 +96,10 @@
 #define configUSE_PREEMPTION		1

 #define configUSE_IDLE_HOOK			1

 #define configUSE_TICK_HOOK			0

-#define configCPU_CLOCK_HZ			( ( unsigned portLONG ) 7995392 ) /* Clock setup from main.c in the demo application. */

+#define configCPU_CLOCK_HZ			( ( unsigned long ) 7995392 ) /* Clock setup from main.c in the demo application. */

 #define configTICK_RATE_HZ			( ( portTickType ) 1000 )

 #define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 4 )

-#define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 50 )

+#define configMINIMAL_STACK_SIZE	( ( unsigned short ) 50 )

 #define configTOTAL_HEAP_SIZE		( ( size_t ) ( 1800 ) )

 #define configMAX_TASK_NAME_LEN		( 8 )

 #define configUSE_TRACE_FACILITY	0

diff --git a/Demo/msp430_CrossWorks/ParTest/ParTest.c b/Demo/msp430_CrossWorks/ParTest/ParTest.c
index bac788c..efafbed 100644
--- a/Demo/msp430_CrossWorks/ParTest/ParTest.c
+++ b/Demo/msp430_CrossWorks/ParTest/ParTest.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*-----------------------------------------------------------

@@ -73,28 +74,28 @@
 

 /* Constants required to access the "LED's".  The LED segments are turned on

 and off to generate '*' characters. */

-#define partstNUM_LEDS			( ( unsigned portCHAR ) 6 )

-#define partstSEGMENTS_ON		( ( unsigned portCHAR ) 0x0f )

-#define partstSEGMENTS_OFF		( ( unsigned portCHAR ) 0x00 )

+#define partstNUM_LEDS			( ( unsigned char ) 6 )

+#define partstSEGMENTS_ON		( ( unsigned char ) 0x0f )

+#define partstSEGMENTS_OFF		( ( unsigned char ) 0x00 )

 

 /* The LED number of the real on board LED, rather than a simulated LED. */

 #define partstON_BOARD_LED		( ( unsigned portBASE_TYPE ) 10 )

-#define mainON_BOARD_LED_BIT	( ( unsigned portCHAR ) 0x01 )

+#define mainON_BOARD_LED_BIT	( ( unsigned char ) 0x01 )

 

 /* The LCD segments used to generate the '*' characters for LED's 0 to 5. */

-unsigned portCHAR * const ucRHSSegments[ partstNUM_LEDS ] = {	( unsigned portCHAR * )0xa4, 

-																( unsigned portCHAR * )0xa2, 

-																( unsigned portCHAR * )0xa0, 

-																( unsigned portCHAR * )0x9e,

-																( unsigned portCHAR * )0x9c,

-																( unsigned portCHAR * )0x9a };

+unsigned char * const ucRHSSegments[ partstNUM_LEDS ] = {	( unsigned char * )0xa4, 

+																( unsigned char * )0xa2, 

+																( unsigned char * )0xa0, 

+																( unsigned char * )0x9e,

+																( unsigned char * )0x9c,

+																( unsigned char * )0x9a };

 

-unsigned portCHAR * const ucLHSSegments[ partstNUM_LEDS ] = {	( unsigned portCHAR * )0xa3, 

-																( unsigned portCHAR * )0xa1, 

-																( unsigned portCHAR * )0x9f, 

-																( unsigned portCHAR * )0x9d,

-																( unsigned portCHAR * )0x9b,

-																( unsigned portCHAR * )0x99 };

+unsigned char * const ucLHSSegments[ partstNUM_LEDS ] = {	( unsigned char * )0xa3, 

+																( unsigned char * )0xa1, 

+																( unsigned char * )0x9f, 

+																( unsigned char * )0x9d,

+																( unsigned char * )0x9b,

+																( unsigned char * )0x99 };

 

 /*

  * Toggle the single genuine built in LED.

@@ -206,7 +207,7 @@
 

 static void prvToggleOnBoardLED( void )

 {

-static unsigned portSHORT sState = pdFALSE;

+static unsigned short sState = pdFALSE;

 

 	/* Toggle the state of the single genuine on board LED. */

 	if( sState )	

diff --git a/Demo/msp430_CrossWorks/main.c b/Demo/msp430_CrossWorks/main.c
index c956a88..9ebb3bf 100644
--- a/Demo/msp430_CrossWorks/main.c
+++ b/Demo/msp430_CrossWorks/main.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

@@ -86,8 +87,8 @@
 #include "PollQ.h"

 

 /* Constants required for hardware setup. */

-#define mainALL_BITS_OUTPUT		( ( unsigned portCHAR ) 0xff )

-#define mainMAX_FREQUENCY		( ( unsigned portCHAR ) 121 )

+#define mainALL_BITS_OUTPUT		( ( unsigned char ) 0xff )

+#define mainMAX_FREQUENCY		( ( unsigned char ) 121 )

 

 /* Constants that define the LED's used by the various tasks. [in this case

 the '*' characters on the LCD represent LED's] */

@@ -101,7 +102,7 @@
 #define mainLED_TASK_PRIORITY			( tskIDLE_PRIORITY + 1 )

 

 /* Baud rate used by the COM test tasks. */

-#define mainCOM_TEST_BAUD_RATE			( ( unsigned portLONG ) 19200 )

+#define mainCOM_TEST_BAUD_RATE			( ( unsigned long ) 19200 )

 

 /* The frequency at which the 'Check' tasks executes.  See the comments at the 

 top of the page.  When the system is operating error free the 'Check' task

@@ -112,10 +113,10 @@
 #define mainERROR_CHECK_DELAY			( ( portTickType ) 500 / portTICK_RATE_MS  )

 

 /* The constants used in the calculation. */

-#define intgCONST1				( ( portLONG ) 123 )

-#define intgCONST2				( ( portLONG ) 234567 )

-#define intgCONST3				( ( portLONG ) -3 )

-#define intgCONST4				( ( portLONG ) 7 )

+#define intgCONST1				( ( long ) 123 )

+#define intgCONST2				( ( long ) 234567 )

+#define intgCONST3				( ( long ) -3 )

+#define intgCONST4				( ( long ) 7 )

 #define intgEXPECTED_ANSWER		( ( ( intgCONST1 + intgCONST2 ) * intgCONST3 ) / intgCONST4 )

 

 /* 

@@ -128,7 +129,7 @@
  * Called by the Check task.  Returns pdPASS if all the other tasks are found

  * to be operating without error - otherwise returns pdFAIL.

  */

-static portSHORT prvCheckOtherTasksAreStillRunning( void );

+static short prvCheckOtherTasksAreStillRunning( void );

 

 /* 

  * Perform the hardware setup required by the ES449 in order to run the demo

@@ -138,7 +139,7 @@
 

 

 portBASE_TYPE xLocalError = pdFALSE;

-volatile unsigned portLONG ulIdleLoops = 0UL;

+volatile unsigned long ulIdleLoops = 0UL;

 

 /*-----------------------------------------------------------*/

 

@@ -158,7 +159,7 @@
 	vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );

 

 	/* Start the 'Check' task which is defined in this file. */

-	xTaskCreate( vErrorChecks, ( const signed portCHAR * const ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );	

+	xTaskCreate( vErrorChecks, ( const signed char * const ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );	

 

 	/* Start the scheduler. */

 	vTaskStartScheduler();

@@ -197,10 +198,10 @@
 }

 /*-----------------------------------------------------------*/

 

-static portSHORT prvCheckOtherTasksAreStillRunning( void )

+static short prvCheckOtherTasksAreStillRunning( void )

 {

-static portSHORT sNoErrorFound = pdTRUE;

-static unsigned portLONG ulLastIdleLoopCount = 0UL;

+static short sNoErrorFound = pdTRUE;

+static unsigned long ulLastIdleLoopCount = 0UL;

 

 	/* The demo tasks maintain a count that increments every cycle of the task

 	provided that the task has never encountered an error.  This function 

@@ -273,7 +274,7 @@
 {

 /* These variables are all effectively set to constants so they are volatile to

 ensure the compiler does not just get rid of them. */

-volatile portLONG lValue;

+volatile long lValue;

 volatile signed portBASE_TYPE *pxTaskHasExecuted;

 

 	/* Keep performing a calculation and checking the result against a constant. */

diff --git a/Demo/msp430_CrossWorks/serial/serial.c b/Demo/msp430_CrossWorks/serial/serial.c
index 0787a02..8602e9b 100644
--- a/Demo/msp430_CrossWorks/serial/serial.c
+++ b/Demo/msp430_CrossWorks/serial/serial.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 

@@ -63,7 +64,7 @@
 #include "serial.h"

 

 /* Constants required to setup the hardware. */

-#define serTX_AND_RX			( ( unsigned portCHAR ) 0x03 )

+#define serTX_AND_RX			( ( unsigned char ) 0x03 )

 

 /* Misc. constants. */

 #define serNO_BLOCK				( ( portTickType ) 0 )

@@ -77,13 +78,13 @@
 /* The queue used to hold characters waiting transmission. */

 static xQueueHandle xCharsForTx; 

 

-static volatile portSHORT sTHREEmpty;

+static volatile short sTHREEmpty;

 

 /*-----------------------------------------------------------*/

 

-xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )

+xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )

 {

-unsigned portLONG ulBaudRateCount;

+unsigned long ulBaudRateCount;

 

 	/* Initialise the hardware. */

 

@@ -93,8 +94,8 @@
 	portENTER_CRITICAL();

 	{

 		/* Create the queues used by the com test task. */

-		xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );

-		xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );

+		xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );

+		xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );

 

 		/* Reset UART. */

 		UCTL1 |= SWRST;

@@ -108,11 +109,11 @@
 		U1TCTL |= SSEL1;

 

 		/* Setup baud rate low byte. */

-		U1BR0 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );

+		U1BR0 = ( unsigned char ) ( ulBaudRateCount & ( unsigned long ) 0xff );

 

 		/* Setup baud rate high byte. */

 		ulBaudRateCount >>= 8UL;

-		U1BR1 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );

+		U1BR1 = ( unsigned char ) ( ulBaudRateCount & ( unsigned long ) 0xff );

 

 		/* Enable ports. */

 		ME2 |= UTXE1 + URXE1;

@@ -135,7 +136,7 @@
 }

 /*-----------------------------------------------------------*/

 

-signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime )

+signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime )

 {

 	/* Get the next character from the buffer.  Return false if no characters

 	are available, or arrive before xBlockTime expires. */

@@ -150,7 +151,7 @@
 }

 /*-----------------------------------------------------------*/

 

-signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime )

+signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime )

 {

 signed portBASE_TYPE xReturn;

 

@@ -205,7 +206,7 @@
 	 */

 	void vRxISR( void ) __interrupt[ UART1RX_VECTOR ]

 	{

-	signed portCHAR cChar;

+	signed char cChar;

 	portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;

 	

 		/* Get the character from the UART and post it on the queue of Rxed 

@@ -232,7 +233,7 @@
 	 */

 	void vTxISR( void ) __interrupt[ UART1TX_VECTOR ]

 	{

-	signed portCHAR cChar;

+	signed char cChar;

 	portBASE_TYPE xTaskWoken = pdFALSE;

 	

 		/* The previous character has been transmitted.  See if there are any

@@ -260,7 +261,7 @@
     interrupt entry point. */

 	void vRxISR( void )

 	{

-	signed portCHAR cChar;

+	signed char cChar;

 	portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;

 	

 		/* Get the character from the UART and post it on the queue of Rxed 

@@ -280,7 +281,7 @@
     interrupt entry point. */

 	void vTxISR( void )

 	{

-	signed portCHAR cChar;

+	signed char cChar;

 	portBASE_TYPE xTaskWoken = pdFALSE;

 	

 		/* The previous character has been transmitted.  See if there are any

diff --git a/Demo/msp430_CrossWorks/serial/serialASM.asm b/Demo/msp430_CrossWorks/serial/serialASM.asm
index 16e8def..1c1eba7 100644
--- a/Demo/msp430_CrossWorks/serial/serialASM.asm
+++ b/Demo/msp430_CrossWorks/serial/serialASM.asm
@@ -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.

 */

 

 #include "FreeRTOSConfig.h"

diff --git a/Demo/msp430_GCC/FreeRTOSConfig.h b/Demo/msp430_GCC/FreeRTOSConfig.h
index b90c5e0..6f3398d 100644
--- a/Demo/msp430_GCC/FreeRTOSConfig.h
+++ b/Demo/msp430_GCC/FreeRTOSConfig.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 FREERTOS_CONFIG_H

@@ -65,10 +66,10 @@
 #define configUSE_PREEMPTION		1

 #define configUSE_IDLE_HOOK			1

 #define configUSE_TICK_HOOK			0

-#define configCPU_CLOCK_HZ			( ( unsigned portLONG ) 7995392 ) /* Clock setup from main.c in the demo application. */

+#define configCPU_CLOCK_HZ			( ( unsigned long ) 7995392 ) /* Clock setup from main.c in the demo application. */

 #define configTICK_RATE_HZ			( ( portTickType ) 1000 )

 #define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 4 )

-#define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 50 )

+#define configMINIMAL_STACK_SIZE	( ( unsigned short ) 50 )

 #define configTOTAL_HEAP_SIZE		( ( size_t ) ( 1800 ) )

 #define configMAX_TASK_NAME_LEN		( 8 )

 #define configUSE_TRACE_FACILITY	0

diff --git a/Demo/msp430_GCC/ParTest/ParTest.c b/Demo/msp430_GCC/ParTest/ParTest.c
index fd6fd7e..2af03d3 100644
--- a/Demo/msp430_GCC/ParTest/ParTest.c
+++ b/Demo/msp430_GCC/ParTest/ParTest.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*-----------------------------------------------------------

@@ -75,28 +76,28 @@
 

 /* Constants required to access the "LED's".  The LED segments are turned on

 and off to generate '*' characters. */

-#define partstNUM_LEDS			( ( unsigned portCHAR ) 6 )

-#define partstSEGMENTS_ON		( ( unsigned portCHAR ) 0x0f )

-#define partstSEGMENTS_OFF		( ( unsigned portCHAR ) 0x00 )

+#define partstNUM_LEDS			( ( unsigned char ) 6 )

+#define partstSEGMENTS_ON		( ( unsigned char ) 0x0f )

+#define partstSEGMENTS_OFF		( ( unsigned char ) 0x00 )

 

 /* The LED number of the real on board LED, rather than a simulated LED. */

 #define partstON_BOARD_LED		( ( unsigned portBASE_TYPE ) 10 )

-#define mainON_BOARD_LED_BIT	( ( unsigned portCHAR ) 0x01 )

+#define mainON_BOARD_LED_BIT	( ( unsigned char ) 0x01 )

 

 /* The LCD segments used to generate the '*' characters for LED's 0 to 5. */

-unsigned portCHAR * const ucRHSSegments[ partstNUM_LEDS ] = {	( unsigned portCHAR * )0xa4, 

-																( unsigned portCHAR * )0xa2, 

-																( unsigned portCHAR * )0xa0, 

-																( unsigned portCHAR * )0x9e,

-																( unsigned portCHAR * )0x9c,

-																( unsigned portCHAR * )0x9a };

+unsigned char * const ucRHSSegments[ partstNUM_LEDS ] = {	( unsigned char * )0xa4, 

+																( unsigned char * )0xa2, 

+																( unsigned char * )0xa0, 

+																( unsigned char * )0x9e,

+																( unsigned char * )0x9c,

+																( unsigned char * )0x9a };

 

-unsigned portCHAR * const ucLHSSegments[ partstNUM_LEDS ] = {	( unsigned portCHAR * )0xa3, 

-																( unsigned portCHAR * )0xa1, 

-																( unsigned portCHAR * )0x9f, 

-																( unsigned portCHAR * )0x9d,

-																( unsigned portCHAR * )0x9b,

-																( unsigned portCHAR * )0x99 };

+unsigned char * const ucLHSSegments[ partstNUM_LEDS ] = {	( unsigned char * )0xa3, 

+																( unsigned char * )0xa1, 

+																( unsigned char * )0x9f, 

+																( unsigned char * )0x9d,

+																( unsigned char * )0x9b,

+																( unsigned char * )0x99 };

 

 /*

  * Toggle the single genuine built in LED.

@@ -208,7 +209,7 @@
 

 static void prvToggleOnBoardLED( void )

 {

-static unsigned portSHORT sState = pdFALSE;

+static unsigned short sState = pdFALSE;

 

 	/* Toggle the state of the single genuine on board LED. */

 	if( sState )	

diff --git a/Demo/msp430_GCC/main.c b/Demo/msp430_GCC/main.c
index 4197232..a9deac0 100644
--- a/Demo/msp430_GCC/main.c
+++ b/Demo/msp430_GCC/main.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

@@ -87,8 +88,8 @@
 #include "PollQ.h"

 

 /* Constants required for hardware setup. */

-#define mainALL_BITS_OUTPUT		( ( unsigned portCHAR ) 0xff )

-#define mainMAX_FREQUENCY		( ( unsigned portCHAR ) 121 )

+#define mainALL_BITS_OUTPUT		( ( unsigned char ) 0xff )

+#define mainMAX_FREQUENCY		( ( unsigned char ) 121 )

 

 /* Constants that define the LED's used by the various tasks. [in this case

 the '*' characters on the LCD represent LED's] */

@@ -102,7 +103,7 @@
 #define mainLED_TASK_PRIORITY			( tskIDLE_PRIORITY + 1 )

 

 /* Baud rate used by the COM test tasks. */

-#define mainCOM_TEST_BAUD_RATE			( ( unsigned portLONG ) 19200 )

+#define mainCOM_TEST_BAUD_RATE			( ( unsigned long ) 19200 )

 

 /* The frequency at which the 'Check' tasks executes.  See the comments at the 

 top of the page.  When the system is operating error free the 'Check' task

@@ -122,7 +123,7 @@
  * Called by the Check task.  Returns pdPASS if all the other tasks are found

  * to be operating without error - otherwise returns pdFAIL.

  */

-static portSHORT prvCheckOtherTasksAreStillRunning( void );

+static short prvCheckOtherTasksAreStillRunning( void );

 

 /* 

  * Perform the hardware setup required by the ES449 in order to run the demo

@@ -131,7 +132,7 @@
 static void prvSetupHardware( void );

 

 /* Used to detect the idle hook function stalling. */

-static volatile unsigned portLONG ulIdleLoops = 0UL;

+static volatile unsigned long ulIdleLoops = 0UL;

 

 /*-----------------------------------------------------------*/

 

@@ -164,7 +165,7 @@
 

 static void vErrorChecks( void *pvParameters )

 {

-static volatile unsigned portLONG ulDummyVariable = 3UL;

+static volatile unsigned long ulDummyVariable = 3UL;

 portTickType xDelayPeriod = mainNO_ERROR_CHECK_DELAY;

 

 	/* Cycle for ever, delaying then checking all the other tasks are still

@@ -199,10 +200,10 @@
 }

 /*-----------------------------------------------------------*/

 

-static portSHORT prvCheckOtherTasksAreStillRunning( void )

+static short prvCheckOtherTasksAreStillRunning( void )

 {

-static portSHORT sNoErrorFound = pdTRUE;

-static unsigned portLONG ulLastIdleLoops = 0UL;

+static short sNoErrorFound = pdTRUE;

+static unsigned long ulLastIdleLoops = 0UL;

 

 	/* The demo tasks maintain a count that increments every cycle of the task

 	provided that the task has never encountered an error.  This function 

diff --git a/Demo/msp430_GCC/makefile b/Demo/msp430_GCC/makefile
index 289447c..898df70 100644
--- a/Demo/msp430_GCC/makefile
+++ b/Demo/msp430_GCC/makefile
@@ -1,48 +1,49 @@
 #/*

-#	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+#    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 #

-#	This file is part of the FreeRTOS distribution.

+#    This file is part of the FreeRTOS distribution.

 #

-#	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-#	the terms of the GNU General Public License (version 2) as published by the 

-#	Free Software Foundation and modified by the FreeRTOS exception.

-#	**NOTE** The exception to the GPL is included to allow you to distribute a

-#	combined work that includes FreeRTOS without being obliged to provide the 

-#	source code for proprietary components outside of the FreeRTOS kernel.  

-#	Alternative commercial license and support terms are also available upon 

-#	request.  See the licensing section of http://www.FreeRTOS.org for full 

-#	license details.

+#    FreeRTOS is free software; you can redistribute it and/or modify it    under

+#    the terms of the GNU General Public License (version 2) as published by the

+#    Free Software Foundation and modified by the FreeRTOS exception.

+#    **NOTE** The exception to the GPL is included to allow you to distribute a

+#    combined work that includes FreeRTOS without being obliged to provide the

+#    source code for proprietary components outside of the FreeRTOS kernel.

+#    Alternative commercial license and support terms are also available upon

+#    request.  See the licensing section of http://www.FreeRTOS.org for full

+#    license details.

 #

-#	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-#	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-#	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-#	more details.

+#    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+#    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+#    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+#    more details.

 #

-#	You should have received a copy of the GNU General Public License along

-#	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-#	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+#    You should have received a copy of the GNU General Public License along

+#    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+#    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 #

 #

-#	***************************************************************************

-#	*                                                                         *

-#	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-#	* See http://www.FreeRTOS.org/Documentation for details                   *

-#	*                                                                         *

-#	***************************************************************************

+#    ***************************************************************************

+#    *                                                                         *

+#    * The FreeRTOS eBook and reference manual are available to purchase for a *

+#    * small fee. Help yourself get started quickly while also helping the     *

+#    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+#    *                                                                         *

+#    ***************************************************************************

 #

-#	1 tab == 4 spaces!

+#    1 tab == 4 spaces!

 #

-#	Please ensure to read the configuration and relevant port sections of the

-#	online documentation.

+#    Please ensure to read the configuration and relevant port sections of the

+#    online documentation.

 #

-#	http://www.FreeRTOS.org - Documentation, latest information, license and

-#	contact details.

+#    http://www.FreeRTOS.org - Documentation, latest information, license and

+#    contact details.

 #

-#	http://www.SafeRTOS.com - A version that is certified for use in safety

-#	critical systems.

+#    http://www.SafeRTOS.com - A version that is certified for use in safety

+#    critical systems.

 #

-#	http://www.OpenRTOS.com - Commercial support, development, porting,

-#	licensing and training services.

+#    http://www.OpenRTOS.com - Commercial support, development, porting,

+#    licensing and training services.

 #*/

 

 

diff --git a/Demo/msp430_GCC/serial/serial.c b/Demo/msp430_GCC/serial/serial.c
index 56c4d3f..40570ac 100644
--- a/Demo/msp430_GCC/serial/serial.c
+++ b/Demo/msp430_GCC/serial/serial.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 

@@ -64,7 +65,7 @@
 #include "serial.h"

 

 /* Constants required to setup the hardware. */

-#define serTX_AND_RX			( ( unsigned portCHAR ) 0x03 )

+#define serTX_AND_RX			( ( unsigned char ) 0x03 )

 

 /* Misc. constants. */

 #define serNO_BLOCK				( ( portTickType ) 0 )

@@ -78,7 +79,7 @@
 /* The queue used to hold characters waiting transmission. */

 static xQueueHandle xCharsForTx; 

 

-static volatile portSHORT sTHREEmpty;

+static volatile short sTHREEmpty;

 

 /* Interrupt service routines. */

 interrupt (UART1RX_VECTOR) wakeup vRxISR( void );

@@ -86,9 +87,9 @@
 

 /*-----------------------------------------------------------*/

 

-xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )

+xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )

 {

-unsigned portLONG ulBaudRateCount;

+unsigned long ulBaudRateCount;

 

 	/* Initialise the hardware. */

 

@@ -98,8 +99,8 @@
 	portENTER_CRITICAL();

 	{

 		/* Create the queues used by the com test task. */

-		xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );

-		xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed portCHAR ) );

+		xRxedChars = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );

+		xCharsForTx = xQueueCreate( uxQueueLength, ( unsigned portBASE_TYPE ) sizeof( signed char ) );

 

 		/* Reset UART. */

 		UCTL1 |= SWRST;

@@ -113,11 +114,11 @@
 		U1TCTL |= SSEL1;

 

 		/* Setup baud rate low byte. */

-		U1BR0 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );

+		U1BR0 = ( unsigned char ) ( ulBaudRateCount & ( unsigned long ) 0xff );

 

 		/* Setup baud rate high byte. */

 		ulBaudRateCount >>= 8UL;

-		U1BR1 = ( unsigned portCHAR ) ( ulBaudRateCount & ( unsigned portLONG ) 0xff );

+		U1BR1 = ( unsigned char ) ( ulBaudRateCount & ( unsigned long ) 0xff );

 

 		/* Enable ports. */

 		ME2 |= UTXE1 + URXE1;

@@ -140,7 +141,7 @@
 }

 /*-----------------------------------------------------------*/

 

-signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime )

+signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed char *pcRxedChar, portTickType xBlockTime )

 {

 	/* Get the next character from the buffer.  Return false if no characters

 	are available, or arrive before xBlockTime expires. */

@@ -155,7 +156,7 @@
 }

 /*-----------------------------------------------------------*/

 

-signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime )

+signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed char cOutChar, portTickType xBlockTime )

 {

 signed portBASE_TYPE xReturn;

 

@@ -208,7 +209,7 @@
  */

 interrupt (UART1RX_VECTOR) wakeup vRxISR( void )

 {

-signed portCHAR cChar;

+signed char cChar;

 portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;

 

 	/* Get the character from the UART and post it on the queue of Rxed 

@@ -232,7 +233,7 @@
  */

 interrupt (UART1TX_VECTOR) wakeup vTxISR( void )

 {

-signed portCHAR cChar;

+signed char cChar;

 portBASE_TYPE xTaskWoken = pdFALSE;

 

 	/* The previous character has been transmitted.  See if there are any

diff --git a/Demo/msp430_IAR/FreeRTOSConfig.h b/Demo/msp430_IAR/FreeRTOSConfig.h
index 0837ec1..95cb7e2 100644
--- a/Demo/msp430_IAR/FreeRTOSConfig.h
+++ b/Demo/msp430_IAR/FreeRTOSConfig.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 FREERTOS_CONFIG_H

@@ -95,10 +96,10 @@
 #define configUSE_PREEMPTION		1

 #define configUSE_IDLE_HOOK			1

 #define configUSE_TICK_HOOK			0

-#define configCPU_CLOCK_HZ			( ( unsigned portLONG ) 7995392 ) /* Clock setup from main.c in the demo application. */

+#define configCPU_CLOCK_HZ			( ( unsigned long ) 7995392 ) /* Clock setup from main.c in the demo application. */

 #define configTICK_RATE_HZ			( ( portTickType ) 1000 )

 #define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 4 )

-#define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 50 )

+#define configMINIMAL_STACK_SIZE	( ( unsigned short ) 50 )

 #define configTOTAL_HEAP_SIZE		( ( size_t ) ( 1700 ) )

 #define configMAX_TASK_NAME_LEN		( 8 )

 #define configUSE_TRACE_FACILITY	0

diff --git a/Demo/msp430_IAR/ParTest/ParTest.c b/Demo/msp430_IAR/ParTest/ParTest.c
index bac788c..2883d88 100644
--- a/Demo/msp430_IAR/ParTest/ParTest.c
+++ b/Demo/msp430_IAR/ParTest/ParTest.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*-----------------------------------------------------------

diff --git a/Demo/msp430_IAR/main.c b/Demo/msp430_IAR/main.c
index b4bc7d7..f2e1260 100644
--- a/Demo/msp430_IAR/main.c
+++ b/Demo/msp430_IAR/main.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 /*

diff --git a/Demo/msp430_IAR/serial/serial.c b/Demo/msp430_IAR/serial/serial.c
index aa9ed94..9c80a24 100644
--- a/Demo/msp430_IAR/serial/serial.c
+++ b/Demo/msp430_IAR/serial/serial.c
@@ -1,48 +1,49 @@
 /*

-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.

+    FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.

 

-	This file is part of the FreeRTOS distribution.

+    This file is part of the FreeRTOS distribution.

 

-	FreeRTOS is free software; you can redistribute it and/or modify it	under 

-	the terms of the GNU General Public License (version 2) as published by the 

-	Free Software Foundation and modified by the FreeRTOS exception.

-	**NOTE** The exception to the GPL is included to allow you to distribute a

-	combined work that includes FreeRTOS without being obliged to provide the 

-	source code for proprietary components outside of the FreeRTOS kernel.  

-	Alternative commercial license and support terms are also available upon 

-	request.  See the licensing section of http://www.FreeRTOS.org for full 

-	license details.

+    FreeRTOS is free software; you can redistribute it and/or modify it    under

+    the terms of the GNU General Public License (version 2) as published by the

+    Free Software Foundation and modified by the FreeRTOS exception.

+    **NOTE** The exception to the GPL is included to allow you to distribute a

+    combined work that includes FreeRTOS without being obliged to provide the

+    source code for proprietary components outside of the FreeRTOS kernel.

+    Alternative commercial license and support terms are also available upon

+    request.  See the licensing section of http://www.FreeRTOS.org for full

+    license details.

 

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT

-	ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

-	FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

-	more details.

+    FreeRTOS is distributed in the hope that it will be useful,    but WITHOUT

+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

+    more details.

 

-	You should have received a copy of the GNU General Public License along

-	with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

-	Temple Place, Suite 330, Boston, MA  02111-1307  USA.

+    You should have received a copy of the GNU General Public License along

+    with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59

+    Temple Place, Suite 330, Boston, MA  02111-1307  USA.

 

 

-	***************************************************************************

-	*                                                                         *

-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *

-	* See http://www.FreeRTOS.org/Documentation for details                   *

-	*                                                                         *

-	***************************************************************************

+    ***************************************************************************

+    *                                                                         *

+    * The FreeRTOS eBook and reference manual are available to purchase for a *

+    * small fee. Help yourself get started quickly while also helping the     *

+    * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *

+    *                                                                         *

+    ***************************************************************************

 

-	1 tab == 4 spaces!

+    1 tab == 4 spaces!

 

-	Please ensure to read the configuration and relevant port sections of the

-	online documentation.

+    Please ensure to read the configuration and relevant port sections of the

+    online documentation.

 

-	http://www.FreeRTOS.org - Documentation, latest information, license and

-	contact details.

+    http://www.FreeRTOS.org - Documentation, latest information, license and

+    contact details.

 

-	http://www.SafeRTOS.com - A version that is certified for use in safety

-	critical systems.

+    http://www.SafeRTOS.com - A version that is certified for use in safety

+    critical systems.

 

-	http://www.OpenRTOS.com - Commercial support, development, porting,

-	licensing and training services.

+    http://www.OpenRTOS.com - Commercial support, development, porting,

+    licensing and training services.

 */

 

 

diff --git a/Demo/msp430_IAR/serial/serialASM.s43 b/Demo/msp430_IAR/serial/serialASM.s43
index 7190eee..ec081c2 100644
--- a/Demo/msp430_IAR/serial/serialASM.s43
+++ b/Demo/msp430_IAR/serial/serialASM.s43
@@ -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.

 */

 

 #include "FreeRTOSConfig.h"