made a copy

2025-12-01 05:05:24 +00:00 · 2008-02-03 20:01:23 +00:00
2485 changed files with 24612 additions and 616299 deletions
--- a/Demo/ARM7_AT91FR40008_GCC/FreeRTOSConfig.h
+++ b/Demo/ARM7_AT91FR40008_GCC/FreeRTOSConfig.h
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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
@@ -60,12 +55,7 @@
 *
 * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
 * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
- *
- * See http://www.freertos.org/a00110.html.
- */
-
-/*----------------------------------------------------------*/
-
+ *----------------------------------------------------------*/

 #define configUSE_PREEMPTION		1
 #define configUSE_IDLE_HOOK			0
--- a/Demo/ARM7_AT91FR40008_GCC/Makefile
+++ b/Demo/ARM7_AT91FR40008_GCC/Makefile
@@ -1,49 +1,32 @@
-#/*
-#	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+#	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.
 #
-#	This file is part of the FreeRTOS distribution.
+#	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+#	it under the terms of the GNU General Public License as published by
+#	the Free Software Foundation; either version 2 of the License, or
+#	(at your option) any later version.
 #
-#	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-#	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.org is distributed in the hope that it will be useful,
+#	but WITHOUT 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.org; if not, write to the Free Software
+#	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
+#	A special exception to the GPL can be applied should you wish to distribute
+#	a combined work that includes FreeRTOS.org, without being obliged to provide
+#	the source code for any proprietary components.  See the licensing section 
+#	of http://www.FreeRTOS.org for full details of how and when the exception
+#	can be applied.
 #
 #	***************************************************************************
-#	*                                                                         *
-#	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *
-#	* See http://www.FreeRTOS.org/Documentation for details                   *
-#	*                                                                         *
+#	See http://www.FreeRTOS.org for documentation, latest information, license 
+#	and contact details.  Please ensure to read the configuration and relevant 
+#	port sections of the online documentation.
 #	***************************************************************************
-#
-#	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.
-#*/

 CC=arm-elf-gcc
 OBJCOPY=arm-elf-objcopy
@@ -55,7 +38,7 @@ CRT0=boot.s
 #
 CFLAGS=-Wall -D $(RUN_MODE) -D GCC_AT91FR40008 -I. -I../../Source/include \
 		-I../Common/include $(DEBUG) -mcpu=arm7tdmi -T$(LDSCRIPT) \
-		-Wcast-align $(OPTIM) -fomit-frame-pointer -fno-strict-aliasing
+		-Wcast-align $(OPTIM) -fomit-frame-pointer

 ifeq ($(USE_THUMB_MODE),YES)
 	CFLAGS += -mthumb-interwork -D THUMB_INTERWORK
--- a/Demo/ARM7_AT91FR40008_GCC/ParTest/ParTest.c
+++ b/Demo/ARM7_AT91FR40008_GCC/ParTest/ParTest.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /* Scheduler includes. */
--- a/Demo/ARM7_AT91FR40008_GCC/main.c
+++ b/Demo/ARM7_AT91FR40008_GCC/main.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /* 
--- a/Demo/ARM7_AT91FR40008_GCC/serial/serial.c
+++ b/Demo/ARM7_AT91FR40008_GCC/serial/serial.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /* 
--- a/Demo/ARM7_AT91FR40008_GCC/serial/serialISR.c
+++ b/Demo/ARM7_AT91FR40008_GCC/serial/serialISR.c
@@ -1,48 +1,33 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+  FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+  This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+  but WITHOUT 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.org; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+  A special exception to the GPL can be applied should you wish to distribute
+  a combined work that includes FreeRTOS.org, without being obliged to provide
+  the source code for any proprietary components.  See the licensing section 
+  of http://www.FreeRTOS.org for full details of how and when the exception
+  can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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.
+  ***************************************************************************
+  See http://www.FreeRTOS.org for documentation, latest information, license 
+  and contact details.  Please ensure to read the configuration and relevant 
+  port sections of the online documentation.
+  ***************************************************************************
 */


@@ -127,7 +112,7 @@ void vUART_ISR_Handler( void )
 {
 /* Now we can declare the local variables.   These must be static. */
 signed portCHAR cChar;
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
+portBASE_TYPE xTaskWokenByTx = pdFALSE, xTaskWokenByRx = pdFALSE;
 unsigned portLONG ulStatus;

 	/* What caused the interrupt? */
@@ -137,7 +122,7 @@ unsigned portLONG ulStatus;
 	{
 		/* The interrupt was caused by the THR becoming empty.  Are there any
 		more characters to transmit? */
-		if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xHigherPriorityTaskWoken ) == pdTRUE )
+		if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xTaskWokenByTx ) == pdTRUE )
 		{
 			/* A character was retrieved from the queue so can be sent to the
 			THR now. */
@@ -155,7 +140,10 @@ unsigned portLONG ulStatus;
 		/* The interrupt was caused by the receiver getting data. */
 		cChar = AT91C_BASE_US0->US_RHR;

-		xQueueSendFromISR(xRxedChars, &cChar, &xHigherPriorityTaskWoken);
+		if (xQueueSendFromISR(xRxedChars, &cChar, pdFALSE))
+		{
+			xTaskWokenByRx = pdTRUE;
+		}
 	}

 	/* Acknowledge the interrupt at AIC level... */
@@ -165,7 +153,7 @@ unsigned portLONG ulStatus;
 	ensure that the unblocked task is the task that executes when the interrupt
 	completes if the unblocked task has a priority higher than the interrupted
 	task. */
-	if( xHigherPriorityTaskWoken )
+	if( xTaskWokenByTx || xTaskWokenByRx )
 	{
 		portYIELD_FROM_ISR();
 	}
--- a/Demo/ARM7_AT91SAM7S64_IAR/FreeRTOSConfig.h
+++ b/Demo/ARM7_AT91SAM7S64_IAR/FreeRTOSConfig.h
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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
@@ -58,10 +53,8 @@
 * application requirements.
 *
 * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
- *
- * See http://www.freertos.org/a00110.html.
- -----------------------------------------------------------*/
+ * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
+ *----------------------------------------------------------*/

 #define configUSE_PREEMPTION		1
 #define configUSE_IDLE_HOOK			0
--- a/Demo/ARM7_AT91SAM7S64_IAR/ParTest/ParTest.c
+++ b/Demo/ARM7_AT91SAM7S64_IAR/ParTest/ParTest.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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"
--- a/Demo/ARM7_AT91SAM7S64_IAR/USB/USBSample.c
+++ b/Demo/ARM7_AT91SAM7S64_IAR/USB/USBSample.c
@@ -1,60 +1,55 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /*
-	Sample interrupt driven USB device driver.  This is a minimal implementation
+	Sample interrupt driven USB device driver.  This is a minimal implementation 
 	for demonstration only.  Although functional, it is not a full and compliant
-	implementation.
+	implementation.  
 	
 	The USB device enumerates as a simple 3 axis joystick, and once configured
 	transmits 3 axis of data which can be viewed from the USB host machine.

-	This file implements the USB interrupt service routine, and a demo FreeRTOS
-	task.  The interrupt service routine handles the USB hardware - taking a
+	This file implements the USB interrupt service routine, and a demo FreeRTOS 
+	task.  The interrupt service routine handles the USB hardware - taking a 
 	snapshot of the USB status at the point of the interrupt.  The task receives
 	the status information from the interrupt for processing at the task level.
 	
@@ -65,7 +60,7 @@
 	Changes from V2.5.5
 	
 	+ Descriptors that have a length that is an exact multiple of usbFIFO_LENGTH
-	  can now be transmitted.  To this end an extra parameter has been
+	  can now be transmitted.  To this end an extra parameter has been 
 	  added to the prvSendControlData() function, and the state
 	  eSENDING_EVEN_DESCRIPTOR has been introduced.  Thanks to Scott Miller for
 	  assisting with this contribution.
@@ -125,7 +120,7 @@
 #define usbINTERFACE_STRING					( 4 )

 /* Data indexes for reading the request from the xISRStatus.ucFifoData[]
-into xUSB_REQUEST.  The data order is designed for speed - so looks a
+into xUSB_REQUEST.  The data order is designed for speed - so looks a 
 little odd. */
 #define usbREQUEST_TYPE_INDEX				( 7 )
 #define usbREQUEST_INDEX					( 6 )
@@ -174,7 +169,7 @@ typedef struct X_ISR_STATUS
 } xISRStatus;

 /* Structure used to hold the received requests. */
-typedef struct
+typedef struct 
 {
 	unsigned portCHAR ucReqType;
 	unsigned portCHAR ucRequest;
@@ -203,7 +198,7 @@ typedef struct

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

-/*
+/* 
 * The USB interrupt service routine.  This takes a snapshot of the USB
 * device at the time of the interrupt, clears the interrupts, and posts
 * the data to the USB processing task.
@@ -217,7 +212,7 @@ __arm void vUSB_ISR( void );
 static void prvResetEndPoints( void );

 /*
- * Setup the USB hardware, install the interrupt service routine and
+ * Setup the USB hardware, install the interrupt service routine and 
 * initialise all the state variables.
 */
 static void vInitUSBInterface( void );
@@ -227,17 +222,17 @@ static void vInitUSBInterface( void );
 */
 static void prvProcessEndPoint0Interrupt( xISRStatus *pxMessage );

-/*
- * For simplicity requests are separated into device, interface, class
+/* 
+ * For simplicity requests are separated into device, interface, class 
 * interface and end point requests.
 *
 * Decode and handle standard device requests originating on the control
- * end point.
+ * end point. 
 */
 static void prvHandleStandardDeviceRequest( xUSB_REQUEST *pxRequest );

 /*
- * For simplicity requests are separated into device, interface, class
+ * For simplicity requests are separated into device, interface, class 
 * interface and end point requests.
 *
 * Decode and handle standard interface requests originating on the control
@@ -246,7 +241,7 @@ static void prvHandleStandardDeviceRequest( xUSB_REQUEST *pxRequest );
 static void prvHandleStandardInterfaceRequest( xUSB_REQUEST *pxRequest );

 /*
- * For simplicity requests are separated into device, interface, class
+ * For simplicity requests are separated into device, interface, class 
 * interface and end point requests.
 *
 * Decode and handle standard end point requests originating on the control
@@ -255,7 +250,7 @@ static void prvHandleStandardInterfaceRequest( xUSB_REQUEST *pxRequest );
 static void prvHandleStandardEndPointRequest( xUSB_REQUEST *pxRequest );

 /*
- * For simplicity requests are separated into device, interface, class
+ * For simplicity requests are separated into device, interface, class 
 * interface and end point requests.
 *
 * Decode and handle the class interface requests.
@@ -275,7 +270,7 @@ static void prvSendControlData( unsigned portCHAR *pucData, unsigned portSHORT u

 /*
 * Examine the Tx buffer to see if there is any more data to be transmitted.
- *
+ * 
 * If there is data to be transmitted then send the next segment.  A segment
 * can have a maximum of 8 bytes (this is defined as the maximum for the end
 * point by the descriptor).  The final segment may be less than 8 bytes if
@@ -286,36 +281,36 @@ static void prvSendNextSegment( void );
 /*
 * A stall condition is forced each time the host makes a request that is not
 * supported by this minimal implementation.
- *
+ * 
 * A stall is forced by setting the appropriate bit in the end points control
- * and status register.
+ * and status register. 
 */
 static void prvSendStall( void );

 /*
- * A NULL (or zero length packet) is transmitted in acknowledge the reception
+ * A NULL (or zero length packet) is transmitted in acknowledge the reception 
 * of certain events from the host.
 */
 static void prvUSBTransmitNull( void );

-/*
- * When the host requests a descriptor this function is called to determine
+/* 
+ * When the host requests a descriptor this function is called to determine 
 * which descriptor is being requested and start its transmission.
 */
 static void prvGetStandardInterfaceDescriptor( xUSB_REQUEST *pxRequest );

 /*
- * This demo USB device enumerates as a simple 3 axis joystick.  Once
+ * This demo USB device enumerates as a simple 3 axis joystick.  Once 
 * configured this function is periodically called to generate some sample
 * joystick data.
 *
- * The x and y axis are made to move in a square.  The z axis is made to
+ * The x and y axis are made to move in a square.  The z axis is made to 
 * repeatedly increment up to its maximum.
 */
 static void prvTransmitSampleValues( void );

 /*
- * The created task to handle the USB demo functionality.
+ * The created task to handle the USB demo functionality. 
 */
 void vUSBDemoTask( void *pvParameters );

@@ -341,7 +336,7 @@ const portCHAR pxLanguageStringDescriptor[] =
 	0x09, 0x04
 };

-const portCHAR pxManufacturerStringDescriptor[] =
+const portCHAR pxManufacturerStringDescriptor[] = 
 {
 	18,
 	usbDESCRIPTOR_TYPE_STRING,
@@ -356,7 +351,7 @@ const portCHAR pxManufacturerStringDescriptor[] =
 	'S', 0x00	
 };

-const portCHAR pxProductStringDescriptor[] =
+const portCHAR pxProductStringDescriptor[] = 
 {
 	44,
 	usbDESCRIPTOR_TYPE_STRING,
@@ -384,7 +379,7 @@ const portCHAR pxProductStringDescriptor[] =
 	'k', 0x00
 };

-const portCHAR pxConfigurationStringDescriptor[] =
+const portCHAR pxConfigurationStringDescriptor[] = 
 {
 	38,
 	usbDESCRIPTOR_TYPE_STRING,
@@ -409,7 +404,7 @@ const portCHAR pxConfigurationStringDescriptor[] =
 	'e', 0x00
 };

-const portCHAR pxInterfaceStringDescriptor[] =
+const portCHAR pxInterfaceStringDescriptor[] = 
 {
 	30,
 	usbDESCRIPTOR_TYPE_STRING,
@@ -451,7 +446,7 @@ const portCHAR pxReportDescriptor[] =
 	 0xc0			/* END_COLLECTION					*/
 };

-const char pxDeviceDescriptor[] =
+const char pxDeviceDescriptor[] = 
 {
 	/* Device descriptor */
 	0x12,								/* bLength				*/
@@ -524,7 +519,7 @@ static xISRStatus xISRMessages[ usbQUEUE_LENGTH + 1 ];
 static xTX_MESSAGE pxCharsForTx;

 /* Queue used to pass messages between the ISR and the task. */
-static xQueueHandle xUSBInterruptQueue;
+static xQueueHandle xUSBInterruptQueue; 

 /* ISR entry has to be written in the asm file as we want a context switch
 to occur from within the ISR.  See the port documentation on the FreeRTOS.org
@@ -533,9 +528,9 @@ extern void vUSBISREntry( void );

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

-/* Macros to manipulate the control and status registers.  These registers
-cannot be accessed using a direct read modify write operation outside of the
-ISR as some bits are left unchanged by writing with a 0, and some are left
+/* Macros to manipulate the control and status registers.  These registers 
+cannot be accessed using a direct read modify write operation outside of the 
+ISR as some bits are left unchanged by writing with a 0, and some are left 
 unchanged by writing with a 1. */

 #define usbINT_CLEAR_MASK	(AT91C_UDP_TXCOMP | AT91C_UDP_STALLSENT | AT91C_UDP_RXSETUP | AT91C_UDP_RX_DATA_BK0 | AT91C_UDP_RX_DATA_BK1 )
@@ -574,7 +569,7 @@ unchanged by writing with a 1. */

 __arm void vUSB_ISR( void )
 {
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
+portBASE_TYPE xTaskWokenByPost = pdFALSE; 
 static volatile unsigned portLONG ulNextMessage = 0;
 xISRStatus *pxMessage;
 unsigned portLONG ulTemp, ulRxBytes;
@@ -593,7 +588,7 @@ unsigned portLONG ulTemp, ulRxBytes;
 	cleared separately as it does not appear in the mask register. */
 	AT91C_BASE_UDP->UDP_ICR = AT91C_BASE_UDP->UDP_IMR | AT91C_UDP_ENDBUSRES;
 	
-	/* If there are bytes in the FIFO then we have to retrieve them here.
+	/* If there are bytes in the FIFO then we have to retrieve them here.  
 	Ideally this would be done at the task level.  However we need to clear the
 	RXSETUP interrupt before leaving the ISR, and this may cause the data in
 	the FIFO to be overwritten.  Also the DIR bit has to be changed before the
@@ -604,7 +599,7 @@ unsigned portLONG ulTemp, ulRxBytes;
 	ulRxBytes = ulTemp >> 16;
 	ulRxBytes &= usbRX_COUNT_MASK;
 	
-	/* With this minimal implementation we are only interested in receiving
+	/* With this minimal implementation we are only interested in receiving 
 	setup bytes on the control end point. */
 	if( ( ulRxBytes > 0 ) && ( ulTemp & AT91C_UDP_RXSETUP ) )
 	{
@@ -633,11 +628,11 @@ unsigned portLONG ulTemp, ulRxBytes;
 	/* The message now contains the entire state and optional data from
 	the USB interrupt.  This can now be posted on the Rx queue ready for
 	processing at the task level. */
-	xQueueSendFromISR( xUSBInterruptQueue, &pxMessage, &xHigherPriorityTaskWoken );
+	xTaskWokenByPost = xQueueSendFromISR( xUSBInterruptQueue, &pxMessage, xTaskWokenByPost );

 	/* We may want to switch to the USB task, if this message has made
 	it the highest priority task that is ready to execute. */
-	portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );
+	portEND_SWITCHING_ISR( xTaskWokenByPost );

 	/* Clear the AIC ready for the next interrupt. */		
 	AT91C_BASE_AIC->AIC_EOICR = 0;
@@ -656,7 +651,7 @@ xISRStatus *pxMessage;
 	    vInitUSBInterface();
    portEXIT_CRITICAL();

-	/* Process interrupts as they arrive.   The ISR takes a snapshot of the
+	/* Process interrupts as they arrive.   The ISR takes a snapshot of the 
 	interrupt status then posts the information on this queue for processing
 	at the task level.  This simple demo implementation only processes
 	a few interrupt sources. */
@@ -823,7 +818,7 @@ static void prvProcessEndPoint0Interrupt( xISRStatus *pxMessage )
 {
 	if( pxMessage->ulCSR0 & AT91C_UDP_RX_DATA_BK0 )
 	{		
-		/* We only expect to receive zero length data here as ACK's.
+		/* We only expect to receive zero length data here as ACK's. 
 		Set the data pointer to the end of the current Tx packet to
 		ensure we don't send out any more data. */	
 		pxCharsForTx.ulNextCharIndex = pxCharsForTx.ulTotalDataLength;
@@ -908,9 +903,9 @@ static void prvProcessEndPoint0Interrupt( xISRStatus *pxMessage )
 			xRequest.usLength <<= 8;
 			xRequest.usLength |= pxMessage->ucFifoData[ usbLENGTH_LOW_BYTE ];
 	
-			/* Manipulate the ucRequestType and the ucRequest parameters to
-			generate a zero based request selection.  This is just done to
-			break up the requests into subsections for clarity.  The
+			/* Manipulate the ucRequestType and the ucRequest parameters to 
+			generate a zero based request selection.  This is just done to 
+			break up the requests into subsections for clarity.  The 
 			alternative would be to have more huge switch statement that would
 			be difficult to optimise. */
 			ucRequest = ( ( xRequest.ucReqType & 0x60 ) >> 3 );
@@ -1038,8 +1033,8 @@ unsigned portSHORT usStatus = 0;

 	    case usbSET_CONFIGURATION_REQUEST:

-			/* Acknowledge the SET_CONFIGURATION, but (according to the manual)
-			we cannot actually move to the configured state until we get a
+			/* Acknowledge the SET_CONFIGURATION, but (according to the manual) 
+			we cannot actually move to the configured state until we get a 
 			TXCOMP interrupt from this NULL packet.  Therefore we just remember the
 			config and set our state so we know we have received the go ahead. */			
 			ucUSBConfig = ( unsigned portCHAR ) ( pxRequest->usValue & 0xff );
@@ -1107,7 +1102,7 @@ unsigned portSHORT usStatus = 0;
 			break;

 	    case usbGET_DESCRIPTOR_REQUEST:
-			prvGetStandardInterfaceDescriptor( pxRequest );
+			prvGetStandardInterfaceDescriptor( pxRequest ); 
 			break;

 		/* This minimal implementation does not respond to these. */
@@ -1128,7 +1123,7 @@ static void prvHandleStandardEndPointRequest( xUSB_REQUEST *pxRequest )
 	{
 		/* This minimal implementation does not expect to respond to these. */
 	    case usbGET_STATUS_REQUEST:
-	    case usbCLEAR_FEATURE_REQUEST:
+	    case usbCLEAR_FEATURE_REQUEST: 
 	    case usbSET_FEATURE_REQUEST:

 	    default:			
@@ -1162,7 +1157,7 @@ volatile unsigned portLONG ulTemp;
    /* Setup the PIO for the USB pull up resistor. */
    AT91F_PIO_CfgOutput(AT91C_BASE_PIOA,AT91C_PIO_PA16);

-    /* Start without the pullup - this will get set at the end of this
+    /* Start without the pullup - this will get set at the end of this 
 	function. */
    AT91F_PIO_SetOutput( AT91C_BASE_PIOA, AT91C_PIO_PA16 );

@@ -1179,7 +1174,7 @@ volatile unsigned portLONG ulTemp;
 	/* Enable the transceiver. */
 	AT91C_UDP_TRANSCEIVER_ENABLE = 0;

-	/* Enable the USB interrupts - other interrupts get enabled as the
+	/* Enable the USB interrupts - other interrupts get enabled as the 
 	enumeration process progresses. */
 	AT91F_AIC_ConfigureIt( AT91C_BASE_AIC, AT91C_ID_UDP, usbINTERRUPT_PRIORITY, AT91C_AIC_SRCTYPE_INT_LEVEL_SENSITIVE, ( void (*)( void ) ) vUSBISREntry );
 	AT91F_AIC_EnableIt( AT91C_BASE_AIC, AT91C_ID_UDP );
@@ -1199,7 +1194,7 @@ static void prvSendControlData( unsigned portCHAR *pucData, unsigned portSHORT u
 	}
 	else if( ( ulLengthToSend < ( unsigned portLONG ) usRequestedLength ) && lSendingDescriptor )
 	{
-		/* We are sending a descriptor.  If the descriptor is an exact
+		/* We are sending a descriptor.  If the descriptor is an exact 
 		multiple of the FIFO length then it will have to be terminated
 		with a NULL packet.  Set the state to indicate this if
 		necessary. */
@@ -1216,12 +1211,12 @@ static void prvSendControlData( unsigned portCHAR *pucData, unsigned portSHORT u
 	(if it is greater than 8 bytes in length). */
 	memcpy( pxCharsForTx.ucTxBuffer, pucData, ulLengthToSend );

-	/* Reinitialise the buffer index so we start sending from the start of
+	/* Reinitialise the buffer index so we start sending from the start of 
 	the data. */
 	pxCharsForTx.ulTotalDataLength = ulLengthToSend;
 	pxCharsForTx.ulNextCharIndex = ( unsigned portLONG ) 0;

-	/* Send the first 8 bytes now.  The rest will get sent in response to
+	/* Send the first 8 bytes now.  The rest will get sent in response to 
 	TXCOMP interrupts. */
 	prvSendNextSegment();
 }
@@ -1273,7 +1268,7 @@ volatile unsigned portLONG ulNextLength, ulStatus, ulLengthLeftToSend;
 	}
 	else
 	{
-		/* There is no data to send.  If we were sending a descriptor and the
+		/* There is no data to send.  If we were sending a descriptor and the 
 		descriptor was an exact multiple of the max packet size then we need
 		to send a null to terminate the transmission. */
 		if( eDriverState == eSENDING_EVEN_DESCRIPTOR )
--- a/Demo/ARM7_AT91SAM7S64_IAR/main.c
+++ b/Demo/ARM7_AT91SAM7S64_IAR/main.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /* 
--- a/Demo/ARM7_AT91SAM7S64_IAR/serial/serial.c
+++ b/Demo/ARM7_AT91SAM7S64_IAR/serial/serial.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /* 
@@ -216,7 +211,7 @@ __arm void vSerialISR( void )
 {
 unsigned portLONG ulStatus;
 signed portCHAR cChar;
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
+portBASE_TYPE xTaskWokenByTx = pdFALSE, xTaskWokenByPost = pdFALSE;

 	/* What caused the interrupt? */
 	ulStatus = serCOM0->US_CSR &= serCOM0->US_IMR;
@@ -225,7 +220,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 	{
 		/* The interrupt was caused by the THR becoming empty.  Are there any
 		more characters to transmit? */
-		if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xHigherPriorityTaskWoken ) == pdTRUE )
+		if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xTaskWokenByTx ) == pdTRUE )
 		{
 			/* A character was retrieved from the queue so can be sent to the
 			THR now. */
@@ -244,12 +239,12 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 		character from the RHR and place it in the queue or received 
 		characters. */
 		cChar = serCOM0->US_RHR;
-		xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );
+		xTaskWokenByPost = xQueueSendFromISR( xRxedChars, &cChar, xTaskWokenByPost );
 	}

 	/* If a task was woken by either a character being received or a character 
 	being transmitted then we may need to switch to another task. */
-	portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );
+	portEND_SWITCHING_ISR( ( xTaskWokenByPost || xTaskWokenByTx ) );

 	/* End the interrupt in the AIC. */
 	AT91C_BASE_AIC->AIC_EOICR = 0;
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/FreeRTOSConfig.h
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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
@@ -50,7 +45,6 @@

 #include <stdio.h>
 #include "AT91SAM7X256.h"
-
 /*-----------------------------------------------------------
 * Application specific definitions.
 *
@@ -59,8 +53,6 @@
 *
 * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
 * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
- *
- * See http://www.freertos.org/a00110.html.
 *----------------------------------------------------------*/

 #define configUSE_PREEMPTION		1
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/Makefile
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/Makefile
@@ -1,49 +1,32 @@
-#/*
-#	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+#	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.
 #
-#	This file is part of the FreeRTOS distribution.
+#	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+#	it under the terms of the GNU General Public License as published by
+#	the Free Software Foundation; either version 2 of the License, or
+#	(at your option) any later version.
 #
-#	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-#	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.org is distributed in the hope that it will be useful,
+#	but WITHOUT 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.org; if not, write to the Free Software
+#	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
+#	A special exception to the GPL can be applied should you wish to distribute
+#	a combined work that includes FreeRTOS.org, without being obliged to provide
+#	the source code for any proprietary components.  See the licensing section 
+#	of http://www.FreeRTOS.org for full details of how and when the exception
+#	can be applied.
 #
 #	***************************************************************************
-#	*                                                                         *
-#	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *
-#	* See http://www.FreeRTOS.org/Documentation for details                   *
-#	*                                                                         *
+#	See http://www.FreeRTOS.org for documentation, latest information, license 
+#	and contact details.  Please ensure to read the configuration and relevant 
+#	port sections of the online documentation.
 #	***************************************************************************
-#
-#	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.
-#*/


 RTOS_SOURCE_DIR=../../../Source
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/ParTest/ParTest.c
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/ParTest/ParTest.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /* Scheduler includes. */
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.c
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /*
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.h
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.h
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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 USB_DEMO_H
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USB_ISR.c
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USB_ISR.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /* Scheduler includes. */
@@ -97,7 +92,7 @@ extern xQueueHandle xUSBInterruptQueue;

 void vUSB_ISR_Handler( void )
 {
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE; 
+portBASE_TYPE xTaskWokenByPost = pdFALSE; 
 static volatile unsigned portLONG ulNextMessage = 0;
 xISRStatus *pxMessage;
 unsigned portLONG ulTemp, ulRxBytes;
@@ -161,11 +156,11 @@ unsigned portLONG ulTemp, ulRxBytes;
 	/* The message now contains the entire state and optional data from
 	the USB interrupt.  This can now be posted on the Rx queue ready for
 	processing at the task level. */
-	xQueueSendFromISR( xUSBInterruptQueue, &pxMessage, &xHigherPriorityTaskWoken );
+	xTaskWokenByPost = xQueueSendFromISR( xUSBInterruptQueue, &pxMessage, xTaskWokenByPost );

 	/* We may want to switch to the USB task, if this message has made
 	it the highest priority task that is ready to execute. */
-	if( xHigherPriorityTaskWoken )
+	if( xTaskWokenByPost )
 	{
 		portYIELD_FROM_ISR();
 	}
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/main.c
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/main.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /*
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/EMAC_ISR.c
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/EMAC_ISR.c
@@ -1,53 +1,48 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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"
-#include "semphr.h"
-#include "task.h"
+#include "Semphr.h"
+#include "Task.h"

 /* Wrapper for the EMAC interrupt. */
 void vEMACISR_Wrapper( void ) __attribute__((naked));
@@ -69,7 +64,7 @@ void vPassEMACSemaphore( xSemaphoreHandle xSemaphore )
 void vEMACISR_Handler( void )
 {
 volatile unsigned portLONG ulIntStatus, ulRxStatus;
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
+portBASE_TYPE xSwitchRequired = pdFALSE;

 	ulIntStatus = AT91C_BASE_EMAC->EMAC_ISR;
 	ulRxStatus = AT91C_BASE_EMAC->EMAC_RSR;
@@ -78,7 +73,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 	{
 		/* A frame has been received, signal the uIP task so it can process
 		the Rx descriptors. */
-		xSemaphoreGiveFromISR( xEMACSemaphore, &xHigherPriorityTaskWoken );
+		xSwitchRequired = xSemaphoreGiveFromISR( xEMACSemaphore, pdFALSE );
 		AT91C_BASE_EMAC->EMAC_RSR = AT91C_EMAC_REC;
 	}

@@ -86,7 +81,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 	AT91C_BASE_AIC->AIC_EOICR = 0;
 	
    /* Switch to the uIP task. */
-    if( xHigherPriorityTaskWoken )
+    if( xSwitchRequired )
    {
    	/* If a task of higher priority than the interrupted task was
    	unblocked by the ISR then this call will ensure that the 
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.c
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /* Standard includes. */
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.h
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.h
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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 SAM_7_EMAC_H
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/uIP_Task.h
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/uIP_Task.h
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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 UIP_TASK_H
--- a/Demo/ARM7_LPC2106_GCC/FreeRTOSConfig.h
+++ b/Demo/ARM7_LPC2106_GCC/FreeRTOSConfig.h
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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,8 +54,6 @@
 *
 * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
 * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
- *
- * See http://www.freertos.org/a00110.html.
 *----------------------------------------------------------*/

 #define configUSE_PREEMPTION		1
@@ -75,7 +68,6 @@
 #define configUSE_TRACE_FACILITY	0
 #define configUSE_16_BIT_TICKS		0
 #define configIDLE_SHOULD_YIELD		1
-#define configQUEUE_REGISTRY_SIZE	0

 /* Co-routine definitions. */
 #define configUSE_CO_ROUTINES 		0
--- a/Demo/ARM7_LPC2106_GCC/Makefile
+++ b/Demo/ARM7_LPC2106_GCC/Makefile
@@ -1,49 +1,32 @@
-#/*
-#	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+#	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.
 #
-#	This file is part of the FreeRTOS distribution.
+#	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+#	it under the terms of the GNU General Public License as published by
+#	the Free Software Foundation; either version 2 of the License, or
+#	(at your option) any later version.
 #
-#	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-#	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.org is distributed in the hope that it will be useful,
+#	but WITHOUT 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.org; if not, write to the Free Software
+#	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
+#	A special exception to the GPL can be applied should you wish to distribute
+#	a combined work that includes FreeRTOS.org, without being obliged to provide
+#	the source code for any proprietary components.  See the licensing section 
+#	of http://www.FreeRTOS.org for full details of how and when the exception
+#	can be applied.
 #
 #	***************************************************************************
-#	*                                                                         *
-#	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *
-#	* See http://www.FreeRTOS.org/Documentation for details                   *
-#	*                                                                         *
+#	See http://www.FreeRTOS.org for documentation, latest information, license 
+#	and contact details.  Please ensure to read the configuration and relevant 
+#	port sections of the online documentation.
 #	***************************************************************************
-#
-#	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 V2.4.2
 #
@@ -61,7 +44,7 @@ WARNINGS=-Wall -Wextra -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align
 #
 CFLAGS=$(WARNINGS) -D $(RUN_MODE) -D GCC_ARM7 -I. -I../../Source/include \
 		-I../Common/include $(DEBUG) -mcpu=arm7tdmi -T$(LDSCRIPT) \
-		 $(OPTIM) -fomit-frame-pointer -fno-strict-aliasing
+		 $(OPTIM) -fomit-frame-pointer

 ifeq ($(USE_THUMB_MODE),YES)
 	CFLAGS += -mthumb-interwork -D THUMB_INTERWORK
@@ -120,7 +103,6 @@ $(ARM_OBJ) : %.o : %.c $(LDSCRIPT) Makefile
 	$(CC) -c $(CFLAGS) $< -o $@

 clean :
-	rm -rf $(ARM_OBJ) $(THUMB_OBJ)
 	touch Makefile


--- a/Demo/ARM7_LPC2106_GCC/ParTest/ParTest.c
+++ b/Demo/ARM7_LPC2106_GCC/ParTest/ParTest.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /*
--- a/Demo/ARM7_LPC2106_GCC/boot.s
+++ b/Demo/ARM7_LPC2106_GCC/boot.s
@@ -47,7 +47,7 @@ _mainCRTStartup:
 	for system/user, SWI and IRQ modes.   Also each mode is setup with
 	interrupts initially disabled. */
    ldr   r0, .LC6
-    msr   CPSR_c, #MODE_UND|I_BIT|F_BIT /* Undefined Instruction Mode */
+    msr   CPSR_c, #MODE_UND|I_BIT|F_BIT /* Undefined Instruction Mode
    mov   sp, r0
    sub   r0, r0, #UND_STACK_SIZE
    msr   CPSR_c, #MODE_ABT|I_BIT|F_BIT /* Abort Mode */
--- a/Demo/ARM7_LPC2106_GCC/main.c
+++ b/Demo/ARM7_LPC2106_GCC/main.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /* 
--- a/Demo/ARM7_LPC2106_GCC/serial/serial.c
+++ b/Demo/ARM7_LPC2106_GCC/serial/serial.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /*
--- a/Demo/ARM7_LPC2106_GCC/serial/serialISR.c
+++ b/Demo/ARM7_LPC2106_GCC/serial/serialISR.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */


@@ -134,7 +129,7 @@ void vUART_ISR_Wrapper( void )
 void vUART_ISR_Handler( void )
 {
 signed portCHAR cChar;
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
+portBASE_TYPE xTaskWokenByTx = pdFALSE, xTaskWokenByRx = pdFALSE;

 	/* What caused the interrupt? */
 	switch( UART0_IIR & serINTERRUPT_SOURCE_MASK )
@@ -145,7 +140,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;

 		case serSOURCE_THRE	:	/* The THRE is empty.  If there is another
 								character in the Tx queue, send it now. */
-								if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xHigherPriorityTaskWoken ) == pdTRUE )
+								if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xTaskWokenByTx ) == pdTRUE )
 								{
 									UART0_THR = cChar;
 								}
@@ -162,14 +157,17 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 		case serSOURCE_RX	:	/* A character was received.  Place it in 
 								the queue of received characters. */
 								cChar = UART0_RBR;
-								xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );
+								if( xQueueSendFromISR( xRxedChars, &cChar, ( portBASE_TYPE ) pdFALSE ) ) 
+								{
+									xTaskWokenByRx = pdTRUE;
+								}
 								break;

 		default				:	/* There is nothing to do, leave the ISR. */
 								break;
 	}

-	if( xHigherPriorityTaskWoken )
+	if( xTaskWokenByTx || xTaskWokenByRx )
 	{
 		portYIELD_FROM_ISR();
 	}
--- a/Demo/ARM7_LPC2129_IAR/FreeRTOSConfig.h
+++ b/Demo/ARM7_LPC2129_IAR/FreeRTOSConfig.h
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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
@@ -58,9 +53,7 @@
 * application requirements.
 *
 * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
- *
- * See http://www.freertos.org/a00110.html.
+ * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
 *----------------------------------------------------------*/

 #define configUSE_PREEMPTION		1
--- a/Demo/ARM7_LPC2129_IAR/ParTest/ParTest.c
+++ b/Demo/ARM7_LPC2129_IAR/ParTest/ParTest.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /*-----------------------------------------------------------
--- a/Demo/ARM7_LPC2129_IAR/main.c
+++ b/Demo/ARM7_LPC2129_IAR/main.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */


@@ -110,7 +105,7 @@
 #define mainRX_ENABLE				( ( unsigned portLONG ) 0x0004 )

 /* Constants to setup the PLL. */
-#define mainPLL_MUL_5				( ( unsigned portCHAR ) 0x0004 )
+#define mainPLL_MUL_4				( ( unsigned portCHAR ) 0x0003 )
 #define mainPLL_DIV_1				( ( unsigned portCHAR ) 0x0000 )
 #define mainPLL_ENABLE				( ( unsigned portCHAR ) 0x0001 )
 #define mainPLL_CONNECT				( ( unsigned portCHAR ) 0x0003 )
@@ -186,8 +181,8 @@ void main( void )

 static void prvSetupHardware( void )
 {
-	/* Setup the PLL to multiply the XTAL input by 5. */
-	PLLCFG = ( mainPLL_MUL_5 | mainPLL_DIV_1 );
+	/* Setup the PLL to multiply the XTAL input by 4. */
+	PLLCFG = ( mainPLL_MUL_4 | mainPLL_DIV_1 );

 	/* Activate the PLL by turning it on then feeding the correct sequence of
 	bytes. */
@@ -210,7 +205,7 @@ static void prvSetupHardware( void )
 	MAMCR = mainMAM_MODE_FULL;

 	/* Setup the peripheral bus to be the same as the PLL output. */
-	APBDIV = mainBUS_CLK_FULL;
+	VPBDIV = mainBUS_CLK_FULL;
 	
 	/* Configure the RS2332 pins.  All other pins remain at their default of 0. */
 	PINSEL0 |= mainTX_ENABLE;
@@ -220,7 +215,7 @@ static void prvSetupHardware( void )
 	IO1DIR = mainLED_TO_OUTPUT;

 	/* Setup the peripheral bus to be the same as the PLL output. */
-	APBDIV = mainBUS_CLK_FULL;
+	VPBDIV = mainBUS_CLK_FULL;
 }
 /*-----------------------------------------------------------*/

--- a/Demo/ARM7_LPC2129_IAR/serial/serial.c
+++ b/Demo/ARM7_LPC2129_IAR/serial/serial.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */


@@ -255,7 +250,7 @@ signed portBASE_TYPE xReturn;
 __arm void vSerialISR( void )
 {
 signed portCHAR cChar;
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
+portBASE_TYPE xTaskWokenByRx = pdFALSE, xTaskWokenByTx = pdFALSE;

 	/* What caused the interrupt? */
 	switch( U0IIR & serINTERRUPT_SOURCE_MASK )
@@ -266,7 +261,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;

 		case serSOURCE_THRE	:	/* The THRE is empty.  If there is another
 								character in the Tx queue, send it now. */
-								if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xHigherPriorityTaskWoken ) == pdTRUE )
+								if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xTaskWokenByTx ) == pdTRUE )
 								{
 									U0THR = cChar;
 								}
@@ -283,7 +278,10 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 		case serSOURCE_RX	:	/* A character was received.  Place it in
 								the queue of received characters. */
 								cChar = U0RBR;
-								xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );
+								if( xQueueSendFromISR( xRxedChars, &cChar, pdFALSE ) )
+								{
+									xTaskWokenByRx = pdTRUE;
+								}
 								break;

 		default				:	/* There is nothing to do, leave the ISR. */
@@ -292,7 +290,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;

 	/* Exit the ISR.  If a task was woken by either a character being received
 	or transmitted then a context switch will occur. */
-	portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );
+	portEND_SWITCHING_ISR( ( xTaskWokenByTx || xTaskWokenByRx ) );

 	/* Clear the ISR in the VIC. */
 	VICVectAddr = serCLEAR_VIC_INTERRUPT;
--- a/Demo/ARM7_LPC2129_Keil/FreeRTOSConfig.h
+++ b/Demo/ARM7_LPC2129_Keil/FreeRTOSConfig.h
@@ -0,0 +1,88 @@
+/*
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.
+
+	This file is part of the FreeRTOS.org distribution.
+
+	FreeRTOS.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	FreeRTOS.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.
+
+	***************************************************************************
+
+	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.
+
+	***************************************************************************
+*/
+
+#ifndef FREERTOS_CONFIG_H
+#define FREERTOS_CONFIG_H
+
+#include <lpc21xx.h>
+
+/*-----------------------------------------------------------
+ * Application specific definitions.
+ *
+ * These definitions should be adjusted for your particular hardware and
+ * application requirements.
+ *
+ * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
+ * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
+ *----------------------------------------------------------*/
+
+#define configUSE_PREEMPTION		1
+#define configUSE_IDLE_HOOK			0
+#define configUSE_TICK_HOOK			0
+#define configCPU_CLOCK_HZ			( ( unsigned portLONG ) 60000000 )	/* =12.0MHz xtal multiplied by 5 using the PLL. */
+#define configTICK_RATE_HZ			( ( portTickType ) 1000 )
+#define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 5 )
+#define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 100 )
+#define configTOTAL_HEAP_SIZE		( ( size_t ) 14250 )
+#define configMAX_TASK_NAME_LEN		( 16 )
+#define configUSE_TRACE_FACILITY	0
+#define configUSE_16_BIT_TICKS		0
+#define configIDLE_SHOULD_YIELD		1
+
+/* Co-routine definitions. */
+#define configUSE_CO_ROUTINES 		0
+#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
+
+/* Set the following definitions to 1 to include the API function, or zero
+to exclude the API function. */
+
+#define INCLUDE_vTaskPrioritySet		1
+#define INCLUDE_uxTaskPriorityGet		1
+#define INCLUDE_vTaskDelete				1
+#define INCLUDE_vTaskCleanUpResources	0
+#define INCLUDE_vTaskSuspend			1
+#define INCLUDE_vTaskDelayUntil			1
+#define INCLUDE_vTaskDelay				1
+
+
+
+#endif /* FREERTOS_CONFIG_H */
--- a/Demo/ARM7_LPC2129_Keil/ParTest/ParTest.c
+++ b/Demo/ARM7_LPC2129_Keil/ParTest/ParTest.c
@@ -0,0 +1,107 @@
+/*
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.
+
+	This file is part of the FreeRTOS.org distribution.
+
+	FreeRTOS.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	FreeRTOS.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.
+
+	***************************************************************************
+
+	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 "FreeRTOS.h"
+#include "portable.h"
+#include "partest.h"
+
+#define partstFIRST_IO		( ( unsigned portLONG ) 0x10000 )
+#define partstNUM_LEDS		( 8 )
+
+/*-----------------------------------------------------------
+ * Simple parallel port IO routines.
+ *-----------------------------------------------------------*/
+
+void vParTestInitialise( void )
+{
+	/* This is performed from main() as the io bits are shared with other setup
+	functions. */
+}
+/*-----------------------------------------------------------*/
+
+void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue )
+{
+unsigned portLONG ulLED = partstFIRST_IO;
+
+	if( uxLED < partstNUM_LEDS )
+	{
+		/* Rotate to the wanted bit of port 0.  Only P16 to P23 have an LED
+		attached. */
+		ulLED <<= ( unsigned portLONG ) uxLED;
+
+		/* Set or clear the output. */
+		if( xValue )
+		{
+			IOSET1 = ulLED;
+		}
+		else
+		{
+			IOCLR1 = ulLED;			
+		}
+	}	
+}
+/*-----------------------------------------------------------*/
+
+void vParTestToggleLED( unsigned portBASE_TYPE uxLED )
+{
+unsigned portLONG ulLED = partstFIRST_IO, ulCurrentState;
+
+	if( uxLED < partstNUM_LEDS )
+	{
+		/* Rotate to the wanted bit of port 0.  Only P10 to P13 have an LED
+		attached. */
+		ulLED <<= ( unsigned portLONG ) uxLED;
+
+		/* If this bit is already set, clear it, and visa versa. */
+		ulCurrentState = IOPIN1;
+		if( ulCurrentState & ulLED )
+		{
+			IOCLR1 = ulLED;
+		}
+		else
+		{
+			IOSET1 = ulLED;			
+		}
+	}	
+}
+
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemoSignal.UVL
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemoSignal.UVL
--- a/Demo/ARM7_LPC2129_Keil/Startup.s
+++ b/Demo/ARM7_LPC2129_Keil/Startup.s
@@ -0,0 +1,379 @@
+/***********************************************************************/
+/*  This file is part of the uVision/ARM development tools             */
+/*  Copyright KEIL ELEKTRONIK GmbH 2002-2004                           */
+/***********************************************************************/
+/*                                                                     */
+/*  STARTUP.S:  Startup file for Philips LPC2000 device series         */
+/*                                                                     */
+/***********************************************************************/
+
+
+/* 
+//*** <<< Use Configuration Wizard in Context Menu >>> *** 
+*/
+
+
+// *** Startup Code (executed after Reset) ***
+
+
+// Standard definitions of Mode bits and Interrupt (I & F) flags in PSRs
+
+        Mode_USR  EQU      0x10
+        Mode_FIQ  EQU      0x11
+        Mode_IRQ  EQU      0x12
+        Mode_SVC  EQU      0x13
+        Mode_ABT  EQU      0x17
+        Mode_UND  EQU      0x1B
+        Mode_SYS  EQU      0x1F
+
+        I_Bit     EQU      0x80    /* when I bit is set, IRQ is disabled */
+        F_Bit     EQU      0x40    /* when F bit is set, FIQ is disabled */
+
+
+/*
+// <h> Stack Configuration (Stack Sizes in Bytes)
+//   <o0> Undefined Mode      <0x0-0xFFFFFFFF>
+//   <o1> Supervisor Mode     <0x0-0xFFFFFFFF>
+//   <o2> Abort Mode          <0x0-0xFFFFFFFF>
+//   <o3> Fast Interrupt Mode <0x0-0xFFFFFFFF>
+//   <o4> Interrupt Mode      <0x0-0xFFFFFFFF>
+//   <o5> User/System Mode    <0x0-0xFFFFFFFF>
+// </h>
+*/
+        UND_Stack_Size  EQU     0x00000004
+        SVC_Stack_Size  EQU     0x00000100
+        ABT_Stack_Size  EQU     0x00000004
+        FIQ_Stack_Size  EQU     0x00000004
+        IRQ_Stack_Size  EQU     0x00000300
+        USR_Stack_Size  EQU     0x00000200
+
+AREA   STACK, DATA, READWRITE, ALIGN=2
+        DS   (USR_Stack_Size+3)&~3  ; Stack for User/System Mode 
+        DS   (IRQ_Stack_Size+3)&~3  ; Stack for Interrupt Mode
+        DS   (FIQ_Stack_Size+3)&~3  ; Stack for Fast Interrupt Mode 
+        DS   (ABT_Stack_Size+3)&~3  ; Stack for Abort Mode
+        DS   (SVC_Stack_Size+3)&~3  ; Stack for Supervisor Mode
+        DS   (UND_Stack_Size+3)&~3  ; Stack for Undefined Mode
+Top_Stack:
+
+
+// Phase Locked Loop (PLL) definitions
+        PLL_BASE        EQU     0xE01FC080  /* PLL Base Address */
+        PLLCON_OFS      EQU     0x00        /* PLL Control Offset*/
+        PLLCFG_OFS      EQU     0x04        /* PLL Configuration Offset */
+        PLLSTAT_OFS     EQU     0x08        /* PLL Status Offset */
+        PLLFEED_OFS     EQU     0x0C        /* PLL Feed Offset */
+        PLLCON_PLLE     EQU     (1<<0)      /* PLL Enable */
+        PLLCON_PLLC     EQU     (1<<1)      /* PLL Connect */
+        PLLCFG_MSEL     EQU     (0x1F<<0)   /* PLL Multiplier */
+        PLLCFG_PSEL     EQU     (0x03<<5)   /* PLL Divider */
+        PLLSTAT_PLOCK   EQU     (1<<10)     /* PLL Lock Status */
+
+/*
+// <e> PLL Setup
+// <i> Phase Locked Loop
+//   <o1.0..4>   MSEL: PLL Multiplier Selection
+//               <1-32><#-1>
+//               <i> M Value
+//   <o1.5..6>   PSEL: PLL Divider Selection
+//               <0=> 1   <1=> 2   <2=> 4   <3=> 8
+//               <i> P Value
+// </e>
+*/
+        PLL_SETUP       EQU     1
+        PLLCFG_Val      EQU     0x00000024
+
+
+// Memory Accelerator Module (MAM) definitions
+        MAM_BASE        EQU     0xE01FC000  /* MAM Base Address */
+        MAMCR_OFS       EQU     0x00        /* MAM Control Offset*/
+        MAMTIM_OFS      EQU     0x04        /* MAM Timing Offset */
+
+/*
+// <e> MAM Setup
+// <i> Memory Accelerator Module
+//   <o1.0..1>   MAM Control
+//               <0=> Disabled
+//               <1=> Partially Enabled
+//               <2=> Fully Enabled
+//               <i> Mode
+//   <o2.0..2>   MAM Timing
+//               <0=> Reserved  <1=> 1   <2=> 2   <3=> 3
+//               <4=> 4         <5=> 5   <6=> 6   <7=> 7
+//               <i> Fetch Cycles
+// </e>
+*/
+        MAM_SETUP       EQU     1
+        MAMCR_Val       EQU     0x00000002
+        MAMTIM_Val      EQU     0x00000003
+
+
+// External Memory Controller (EMC) definitions
+        EMC_BASE        EQU     0xFFE00000  /* EMC Base Address */
+        BCFG0_OFS       EQU     0x00        /* BCFG0 Offset */
+        BCFG1_OFS       EQU     0x04        /* BCFG1 Offset */
+        BCFG2_OFS       EQU     0x08        /* BCFG2 Offset */
+        BCFG3_OFS       EQU     0x0C        /* BCFG3 Offset */
+
+/*
+// <e> External Memory Controller (EMC)
+*/
+        EMC_SETUP       EQU     0
+
+/*
+//   <e> Bank Configuration 0 (BCFG0)
+//     <o1.0..3>   IDCY: Idle Cycles <0-15>
+//     <o1.5..9>   WST1: Wait States 1 <0-31>
+//     <o1.11..15> WST2: Wait States 2 <0-31>
+//     <o1.10>     RBLE: Read Byte Lane Enable
+//     <o1.26>     WP: Write Protect
+//     <o1.27>     BM: Burst ROM
+//     <o1.28..29> MW: Memory Width  <0=>  8-bit  <1=> 16-bit
+//                                   <2=> 32-bit  <3=> Reserved
+//   </e>
+*/
+        BCFG0_SETUP EQU         0
+        BCFG0_Val   EQU         0x0000FBEF
+
+/*
+//   <e> Bank Configuration 1 (BCFG1)
+//     <o1.0..3>   IDCY: Idle Cycles <0-15>
+//     <o1.5..9>   WST1: Wait States 1 <0-31>
+//     <o1.11..15> WST2: Wait States 2 <0-31>
+//     <o1.10>     RBLE: Read Byte Lane Enable
+//     <o1.26>     WP: Write Protect
+//     <o1.27>     BM: Burst ROM
+//     <o1.28..29> MW: Memory Width  <0=>  8-bit  <1=> 16-bit
+//                                   <2=> 32-bit  <3=> Reserved
+//   </e>
+*/
+        BCFG1_SETUP EQU         0
+        BCFG1_Val   EQU         0x0000FBEF
+
+/*
+//   <e> Bank Configuration 0 (BCFG2)
+//     <o1.0..3>   IDCY: Idle Cycles <0-15>
+//     <o1.5..9>   WST1: Wait States 1 <0-31>
+//     <o1.11..15> WST2: Wait States 2 <0-31>
+//     <o1.10>     RBLE: Read Byte Lane Enable
+//     <o1.26>     WP: Write Protect
+//     <o1.27>     BM: Burst ROM
+//     <o1.28..29> MW: Memory Width  <0=>  8-bit  <1=> 16-bit
+//                                   <2=> 32-bit  <3=> Reserved
+//   </e>
+*/
+        BCFG2_SETUP EQU         0
+        BCFG2_Val   EQU         0x0000FBEF
+
+/*
+//   <e> Bank Configuration 3 (BCFG3)
+//     <o1.0..3>   IDCY: Idle Cycles <0-15>
+//     <o1.5..9>   WST1: Wait States 1 <0-31>
+//     <o1.11..15> WST2: Wait States 2 <0-31>
+//     <o1.10>     RBLE: Read Byte Lane Enable
+//     <o1.26>     WP: Write Protect
+//     <o1.27>     BM: Burst ROM
+//     <o1.28..29> MW: Memory Width  <0=>  8-bit  <1=> 16-bit
+//                                   <2=> 32-bit  <3=> Reserved
+//   </e>
+*/
+        BCFG3_SETUP EQU         0
+        BCFG3_Val   EQU         0x0000FBEF
+
+/*
+// </e> End of EMC
+*/
+
+
+// External Memory Pins definitions
+        PINSEL2         EQU     0xE002C014  /* PINSEL2 Address */
+        PINSEL2_Val     EQU     0x0E6149E4  /* CS0..3, OE, WE, BLS0..3, 
+                                               D0..31, A2..23, JTAG Pins */
+
+
+// Starupt Code must be linked first at Address at which it expects to run.
+
+$IF (EXTERNAL_MODE)
+        CODE_BASE       EQU     0x80000000
+$ELSE
+        CODE_BASE       EQU     0x00000000
+$ENDIF
+
+AREA   STARTUPCODE, CODE, AT CODE_BASE   // READONLY, ALIGN=4
+       PUBLIC  __startup
+
+       EXTERN  CODE32 (?C?INIT)
+
+__startup       PROC    CODE32
+
+// Pre-defined interrupt handlers that may be directly 
+// overwritten by C interrupt functions
+EXTERN CODE32 (Undef_Handler?A)
+EXTERN CODE32 (vPortYieldProcessor?A)
+EXTERN CODE32 (PAbt_Handler?A)
+EXTERN CODE32 (DAbt_Handler?A)
+EXTERN CODE32 (IRQ_Handler?A)
+EXTERN CODE32 (FIQ_Handler?A)
+
+// Exception Vectors
+// Mapped to Address 0.
+// Absolute addressing mode must be used.
+
+Vectors:        LDR     PC,Reset_Addr         
+                LDR     PC,Undef_Addr
+                LDR     PC,SWI_Addr
+                LDR     PC,PAbt_Addr
+                LDR     PC,DAbt_Addr
+                NOP                            /* Reserved Vector */
+;               LDR     PC,IRQ_Addr
+                LDR     PC,[PC, #-0x0FF0]      /* Vector from VicVectAddr */
+                LDR     PC,FIQ_Addr
+
+Reset_Addr:     DD      Reset_Handler
+Undef_Addr:     DD      Undef_Handler?A
+SWI_Addr:       DD      vPortYieldProcessor?A
+PAbt_Addr:      DD      PAbt_Handler?A
+DAbt_Addr:      DD      DAbt_Handler?A
+                DD      0                      /* Reserved Address */
+IRQ_Addr:       DD      IRQ_Handler?A
+FIQ_Addr:       DD      FIQ_Handler?A
+
+
+// Reset Handler
+
+Reset_Handler:  
+
+
+$IF (EXTERNAL_MODE)
+                LDR     R0, =PINSEL2
+                LDR     R1, =PINSEL2_Val
+                STR     R1, [R0]
+$ENDIF
+
+
+IF (EMC_SETUP != 0)
+                LDR     R0, =EMC_BASE
+
+IF (BCFG0_SETUP != 0)
+                LDR     R1, =BCFG0_Val
+                STR     R1, [R0, #BCFG0_OFS]
+ENDIF
+
+IF (BCFG1_SETUP != 0)
+                LDR     R1, =BCFG1_Val
+                STR     R1, [R0, #BCFG1_OFS]
+ENDIF
+
+IF (BCFG2_SETUP != 0)
+                LDR     R1, =BCFG2_Val
+                STR     R1, [R0, #BCFG2_OFS]
+ENDIF
+
+IF (BCFG3_SETUP != 0)
+                LDR     R1, =BCFG3_Val
+                STR     R1, [R0, #BCFG3_OFS]
+ENDIF
+
+ENDIF
+
+
+IF (PLL_SETUP != 0)
+                LDR     R0, =PLL_BASE
+                MOV     R1, #0xAA
+                MOV     R2, #0x55
+
+// Configure and Enable PLL
+                MOV     R3, #PLLCFG_Val
+                STR     R3, [R0, #PLLCFG_OFS] 
+                MOV     R3, #PLLCON_PLLE
+                STR     R3, [R0, #PLLCON_OFS]
+                STR     R1, [R0, #PLLFEED_OFS]
+                STR     R2, [R0, #PLLFEED_OFS]
+
+// Wait until PLL Locked
+PLL_Loop:       LDR     R3, [R0, #PLLSTAT_OFS]
+                ANDS    R3, R3, #PLLSTAT_PLOCK
+                BEQ     PLL_Loop
+
+// Switch to PLL Clock
+                MOV     R3, #(PLLCON_PLLE | PLLCON_PLLC)
+                STR     R3, [R0, #PLLCON_OFS]
+                STR     R1, [R0, #PLLFEED_OFS]
+                STR     R2, [R0, #PLLFEED_OFS]
+ENDIF
+
+
+IF (MAM_SETUP != 0)
+                LDR     R0, =MAM_BASE
+                MOV     R1, #MAMTIM_Val
+                STR     R1, [R0, #MAMTIM_OFS] 
+                MOV     R1, #MAMCR_Val
+                STR     R1, [R0, #MAMCR_OFS] 
+ENDIF
+
+
+// Memory Mapping (when Interrupt Vectors are in RAM)
+                MEMMAP  EQU  0xE01FC040  /* Memory Mapping Control */
+
+$IF (RAM_INTVEC)
+                LDR     R0, =MEMMAP
+                MOV     R1, #2
+                STR     R1, [R0]
+$ENDIF
+
+
+// Setup Stack for each mode
+                LDR     R0, =Top_Stack
+
+// Enter Undefined Instruction Mode and set its Stack Pointer
+                MSR     CPSR_c, #Mode_UND|I_Bit|F_Bit
+                MOV     SP, R0
+                SUB     R0, R0, #UND_Stack_Size
+
+// Enter Abort Mode and set its Stack Pointer
+                MSR     CPSR_c, #Mode_ABT|I_Bit|F_Bit
+                MOV     SP, R0
+                SUB     R0, R0, #ABT_Stack_Size
+
+// Enter FIQ Mode and set its Stack Pointer
+                MSR     CPSR_c, #Mode_FIQ|I_Bit|F_Bit
+                MOV     SP, R0
+                SUB     R0, R0, #FIQ_Stack_Size
+
+// Enter IRQ Mode and set its Stack Pointer
+                MSR     CPSR_c, #Mode_IRQ|I_Bit|F_Bit
+                MOV     SP, R0
+                SUB     R0, R0, #IRQ_Stack_Size
+
+// Enter Supervisor Mode and set its Stack Pointer
+                MSR     CPSR_c, #Mode_SVC|I_Bit|F_Bit
+                MOV     SP, R0
+                SUB     R0, R0, #SVC_Stack_Size
+
+// Enter S Mode and set its Stack Pointer
+                MSR     CPSR_c, #Mode_SYS
+                MOV     SP, R0
+
+// Start in supervisor mode
+                MSR     CPSR_c, #Mode_SVC|I_Bit|F_Bit
+
+// Enter the C code
+                LDR     R0,=?C?INIT
+                TST     R0,#1       ; Bit-0 set: INIT is Thumb
+                LDREQ   LR,=exit?A  ; ARM Mode
+                LDRNE   LR,=exit?T  ; Thumb Mode
+                BX      R0
+                ENDP
+
+PUBLIC exit?A
+exit?A          PROC    CODE32
+                B       exit?A
+                ENDP
+
+PUBLIC exit?T
+exit?T          PROC    CODE16
+exit:           B       exit?T
+                ENDP
+
+
+                END
--- a/Demo/ARM7_LPC2129_Keil_RVDS/main.c
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/main.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	Please ensure to read the configuration and relevant port sections of the 
 	online documentation.

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

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

-	http://www.OpenRTOS.com - Commercial support, development, porting,
-	licensing and training services.
+	+++ http://www.OpenRTOS.com +++
+	Commercial support, development, porting, licensing and training services.
+
+	***************************************************************************
 */

 /* 
@@ -85,16 +80,25 @@
 #include "integer.h"
 #include "comtest2.h"
 #include "serial.h"
-#include "PollQ.h"
-#include "BlockQ.h"
-#include "semtest.h"
-#include "dynamic.h"
+
+#ifdef KEIL_THUMB_INTERWORK
+	/* 
+		THUMB mode allows more tasks to be created without the executable 
+		binary exceeding the limits allowed by the evaluation version of 
+		uVision3.
+	*/
+	#include "PollQ.h"
+	#include "BlockQ.h"
+	#include "semtest.h"
+	#include "dynamic.h"
+
+#endif

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

 /* Constants to setup I/O and processor. */
-#define mainTX_ENABLE		( ( unsigned portLONG ) 0x00010000 )	/* UART1. */
-#define mainRX_ENABLE		( ( unsigned portLONG ) 0x00040000 ) 	/* UART1. */
+#define mainTX_ENABLE		( ( unsigned portLONG ) 0x0001 )
+#define mainRX_ENABLE		( ( unsigned portLONG ) 0x0004 )
 #define mainBUS_CLK_FULL	( ( unsigned portCHAR ) 0x01 )
 #define mainLED_TO_OUTPUT	( ( unsigned portLONG ) 0xff0000 )

@@ -158,10 +162,15 @@ int main( void )
 	vStartIntegerMathTasks( tskIDLE_PRIORITY );
 	vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED );
 	vStartLEDFlashTasks( mainLED_TASK_PRIORITY );
-	vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
-	vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
-	vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );
-	vStartDynamicPriorityTasks();
+
+	#ifdef KEIL_THUMB_INTERWORK
+		/* When using THUMB mode we can start more tasks without the executable
+		exceeding the size limit imposed by the evaluation version of uVision3. */
+		vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
+		vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
+		vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );
+		vStartDynamicPriorityTasks();
+	#endif

 	/* Start the check task - which is defined in this file.  This is the task
 	that periodically checks to see that all the other tasks are executing 
@@ -177,9 +186,8 @@ int main( void )
 	these demo application projects then ensure Supervisor mode is used here. */
 	vTaskStartScheduler();

-	/* Should never reach here!  If you do then there was not enough heap
-	available for the idle task to be created. */
-	for( ;; );
+	/* Should never reach here! */
+	return 0;
 }
 /*-----------------------------------------------------------*/

@@ -221,7 +229,7 @@ static void prvSetupHardware( void )
 	/* Perform the hardware setup required.  This is minimal as most of the
 	setup is managed by the settings in the project file. */

-	/* Configure the UART1 pins.  All other pins remain at their default of 0. */
+	/* Configure the RS2332 pins.  All other pins remain at their default of 0. */
 	PINSEL0 |= mainTX_ENABLE;
 	PINSEL0 |= mainRX_ENABLE;

@@ -250,25 +258,32 @@ portLONG lReturn = pdPASS;
 		lReturn = pdFAIL;
 	}

-	if( xArePollingQueuesStillRunning() != pdTRUE )
-	{
-		lReturn = pdFAIL;
-	}
+	#ifdef KEIL_THUMB_INTERWORK

-	if( xAreBlockingQueuesStillRunning() != pdTRUE )
-	{
-		lReturn = pdFAIL;
-	}
+		/* When using THUMB mode we can start more tasks without the executable
+		exceeding the size limit imposed by the evaluation version of uVision3. */
+	
+		if( xArePollingQueuesStillRunning() != pdTRUE )
+		{
+			lReturn = pdFAIL;
+		}
+	
+		if( xAreBlockingQueuesStillRunning() != pdTRUE )
+		{
+			lReturn = pdFAIL;
+		}
+	
+		if( xAreSemaphoreTasksStillRunning() != pdTRUE )
+		{
+			lReturn = pdFAIL;
+		}

-	if( xAreSemaphoreTasksStillRunning() != pdTRUE )
-	{
-		lReturn = pdFAIL;
-	}
+		if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )
+		{
+			lReturn = pdFAIL;
+		}

-	if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )
-	{
-		lReturn = pdFAIL;
-	}
+	#endif

 	return lReturn;
 }
--- a/Demo/ARM7_LPC2129_Keil/rtosdemo_ARM.Opt
+++ b/Demo/ARM7_LPC2129_Keil/rtosdemo_ARM.Opt
@@ -0,0 +1,58 @@
+### uVision2 Project, (C) Keil Software
+### Do not modify !
+
+ cExt (*.c)
+ aExt (*.s*; *.src; *.a*)
+ oExt (*.obj)
+ lExt (*.lib)
+ tExt (*.txt; *.h; *.inc)
+ pExt (*.plm)
+ CppX (*.cpp)
+ DaveTm { 0,0,0,0,0,0,0,0 }
+
+Target (FreeRTOS), 0x0005 // Tools: ''
+GRPOPT 1,(ARM_DEMO),1,0,0
+
+OPTFFF 1,1,1,2,0,127,137,0,<.\main.c><main.c> { 44,0,0,0,2,0,0,0,3,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,228,255,255,255,27,0,0,0,27,0,0,0,41,4,0,0,102,2,0,0 }
+OPTFFF 1,2,2,0,0,0,0,0,<.\Startup.s><Startup.s> 
+OPTFFF 1,3,1,0,0,0,0,0,<.\ParTest\ParTest.c><ParTest.c> 
+OPTFFF 1,4,1,0,0,0,0,0,<.\serial\serial.c><serial.c> 
+OPTFFF 1,5,1,0,0,0,0,0,<.\serial\serialISR.c><serialISR.c> 
+OPTFFF 1,6,1,0,0,0,0,0,<..\..\Source\tasks.c><tasks.c> 
+OPTFFF 1,7,1,0,0,0,0,0,<..\..\Source\queue.c><queue.c> 
+OPTFFF 1,8,1,0,0,0,0,0,<..\..\Source\list.c><list.c> 
+OPTFFF 1,9,1,0,0,0,0,0,<..\..\Source\portable\Keil\ARM7\port.c><port.c> 
+OPTFFF 1,10,1,0,0,0,0,0,<..\..\Source\portable\Keil\ARM7\portISR.c><portISR.c> 
+OPTFFF 1,11,1,0,0,0,0,0,<..\Common\Minimal\flash.c><flash.c> 
+OPTFFF 1,12,1,16777216,0,0,0,0,<..\Common\Minimal\comtest.c><comtest.c> 
+OPTFFF 1,13,1,0,0,0,0,0,<..\Common\Minimal\integer.c><integer.c> 
+OPTFFF 1,14,1,0,0,0,0,0,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> 
+
+
+TARGOPT 1, (FreeRTOS)
+ KACLK=12000000
+  OPTTT 1,1,1,0
+  OPTHX 0,65535,0,0,0
+  OPTLX 120,65,8,<.\>
+  OPTOX 16
+  OPTLT 1,1,1,0,1,1,0,1,0,0,0,0
+  OPTXL 1,1,1,1,1,1,1,0,0
+  OPTFL 1,0,1
+  OPTBL 0,(Data Sheet)<DATASHTS\PHILIPS\LPC2119_2129.PDF>
+  OPTBL 1,(User Manual)<DATASHTS\PHILIPS\UM_LPC21XX_LPC22XX.PDF>
+  OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)
+  OPTDBG 44029,-1,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()
+  OPTKEY 0,(DLGTARM)((134=-1,-1,-1,-1,0)(135=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(108=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(80=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(113=-1,-1,-1,-1,0)(112=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)(117=-1,-1,-1,-1,0)(118=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(114=-1,-1,-1,-1,0)(119=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(115=-1,-1,-1,-1,0)(116=-1,-1,-1,-1,0))
+  OPTKEY 0,(UL2ARM)(-U174073036 -O7 -S0 -C0 -N00("ARM7TDMI-S Core") -D00(4F1F0F0F) -L00(4) -FO7 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000)
+  OPTKEY 0,(DLGDARM)((134=-1,-1,-1,-1,0)(135=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(108=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(80=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(113=-1,-1,-1,-1,0)(112=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)(117=-1,-1,-1,-1,0)(118=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(114=-1,-1,-1,-1,0)(119=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(115=-1,-1,-1,-1,0)(116=-1,-1,-1,-1,0))
+  OPTKEY 0,(ARMDBGFLAGS)(-T5F)
+  OPTMM 1,0,(0x40001800)
+  OPTDF 0x1000080
+  OPTLE <>
+  OPTLC <>
+  OPTLA 0,((Port1 & 0x10000) >> 16)(FF00FF000000000000000000000000000000F0BF010000006400000000E8764817000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000020370000)
+  OPTLA 1,((Port1 & 0x20000) >> 17)(FF0000000000000000000000000000000000F0BF010000006400000000E8764817000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000020370000)
+  OPTLA 2,((Port1 & 0x40000) >> 18)(008000000000000000000000000000000000F0BF010000006400000000E8764817000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000020370000)
+  OPTLA 3,((Port1 & 0x80000) >> 19)(0000FF000000000000000000000000000000F0BF010000006400000000E8764817000000506F72743100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000020370000)
+EndOpt
+
--- a/Demo/ARM7_LPC2129_Keil/rtosdemo_ARM.Uv2
+++ b/Demo/ARM7_LPC2129_Keil/rtosdemo_ARM.Uv2
@@ -0,0 +1,106 @@
+### uVision2 Project, (C) Keil Software
+### Do not modify !
+
+Target (FreeRTOS), 0x0005 // Tools: ''
+
+Group (ARM_DEMO)
+
+File 1,1,<.\main.c><main.c> 0x4162D96A 
+File 1,2,<.\Startup.s><Startup.s> 0x415AF382 
+File 1,1,<.\ParTest\ParTest.c><ParTest.c> 0x415AF50E 
+File 1,1,<.\serial\serial.c><serial.c> 0x4162D488 
+File 1,1,<.\serial\serialISR.c><serialISR.c> 0x4162D404 
+File 1,1,<..\..\Source\tasks.c><tasks.c> 0x4162D9E6 
+File 1,1,<..\..\Source\queue.c><queue.c> 0x411B5F14 
+File 1,1,<..\..\Source\list.c><list.c> 0x411B5F24 
+File 1,1,<..\..\Source\portable\Keil\ARM7\port.c><port.c> 0x4162D434 
+File 1,1,<..\..\Source\portable\Keil\ARM7\portISR.c><portISR.c> 0x415A85E0 
+File 1,1,<..\Common\Minimal\flash.c><flash.c> 0x411B5F8E 
+File 1,1,<..\Common\Minimal\comtest.c><comtest.c> 0x413335E6 
+File 1,1,<..\Common\Minimal\integer.c><integer.c> 0x415FB7EE 
+File 1,1,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> 0x0 
+
+
+Options 1,0,0  // Target 'FreeRTOS'
+ Device (LPC2129)
+ Vendor (Philips)
+ Cpu (IRAM(0x40000000-0x40003FFF) IROM(0-0x3FFFF) CLOCK(12000000) CPUTYPE(ARM7TDMI))
+ FlashUt (LPC210x_ISP.EXE ("#H" ^X $D COM1: 9600 1))
+ StupF ("STARTUP\Philips\Startup.s" ("Philips LPC2100 Startup Code"))
+ FlashDR (UL2ARM(-U40296420 -O7 -C0 -FO7 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000))
+ Rgf (LPC21xx.H)
+ Mem ()
+ C ()
+ A ()
+ RL ()
+ OH ()
+ DBC_IFX ()
+ DBC_CMS ()
+ DBC_AMS ()
+ DBC_LMS ()
+ UseEnv=0
+ EnvBin (D:\DevTools\Keil\arm\ARM\BIN\)
+ EnvInc ()
+ EnvLib ()
+ EnvReg (<28>Philips\)
+ OrgReg (<28>Philips\)
+ TgStat=16
+ OutDir (.\)
+ OutName (rtosdemo_ARM)
+ GenApp=1
+ GenLib=0
+ GenHex=0
+ Debug=1
+ Browse=0
+ LstDir (.\)
+ HexSel=0
+ MG32K=0
+ TGMORE=0
+ RunUsr 0 0 <>
+ RunUsr 1 0 <>
+ BrunUsr 0 0 <>
+ BrunUsr 1 0 <>
+ SVCSID <>
+ KACPU (ARM7TDMI)
+ TKAFL { 0,27,183,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ KIROM { 1,0,0,0,0,0,0,4,0 }
+ KIRAM { 0,0,0,0,64,0,64,0,0 }
+ KXRAM { 0,0,0,0,0,0,0,0,0 }
+ KAOCM { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ KCAFLG { 197,132,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ KCAMSC (INTERWORK)
+ KCADEF (KEIL_ARM7)
+ KCAUDF ()
+ KCAINC (..\Common\include\;..\..\Source\include\;..\..\Source\portable\Keil\ARM7\)
+ KAAFLG { 20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ KAAMSC ()
+ KAASET ()
+ KAARST ()
+ KAAINC ()
+ PropFld { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ IncBld=1
+ AlwaysBuild=0
+ GenAsm=0
+ AsmAsm=0
+ PublicsOnly=0
+ StopCode=3
+ CustArgs ()
+ LibMods ()
+ KLAFLG { 44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ KLAMSC ()
+ KLADWN (25)
+ KLACFI ()
+ KLAASN ()
+ KLARES ()
+ KLACCL ()
+ KLAUCL ()
+ KLACSC ()
+ KLAUCS ()
+  OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)
+  OPTDBG 44029,-1,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()
+ FLASH1 { 1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ FLASH2 (BIN\UL2ARM.DLL)
+ FLASH3 ("LPC210x_ISP.EXE" ("#H" ^X $D COM1: 9600 1))
+ FLASH4 ()
+EndOpt
+
--- a/Demo/ARM7_LPC2129_Keil/rtosdemo_THUMB.Opt
+++ b/Demo/ARM7_LPC2129_Keil/rtosdemo_THUMB.Opt
@@ -0,0 +1,63 @@
+### uVision2 Project, (C) Keil Software
+### Do not modify !
+
+ cExt (*.c)
+ aExt (*.s*; *.src; *.a*)
+ oExt (*.obj)
+ lExt (*.lib)
+ tExt (*.txt; *.h; *.inc)
+ pExt (*.plm)
+ CppX (*.cpp)
+ DaveTm { 0,0,0,0,0,0,0,0 }
+
+Target (FreeRTOS), 0x0005 // Tools: ''
+GRPOPT 1,(THUMB_DEMO),1,0,0
+
+OPTFFF 1,1,1,1,0,121,137,0,<.\main.c><main.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,228,255,255,255,0,0,0,0,0,0,0,0,14,4,0,0,75,2,0,0 }
+OPTFFF 1,2,2,0,0,0,0,0,<.\Startup.s><Startup.s> 
+OPTFFF 1,3,1,1040187392,0,0,0,0,<.\ParTest\ParTest.c><ParTest.c> 
+OPTFFF 1,4,1,0,0,0,0,0,<.\serial\serial.c><serial.c> 
+OPTFFF 1,5,1,0,0,0,0,0,<.\serial\serialISR.c><serialISR.c> 
+OPTFFF 1,6,1,0,0,0,0,0,<..\..\Source\tasks.c><tasks.c> 
+OPTFFF 1,7,1,0,0,0,0,0,<..\..\Source\queue.c><queue.c> 
+OPTFFF 1,8,1,0,0,0,0,0,<..\..\Source\list.c><list.c> 
+OPTFFF 1,9,1,553648128,0,0,0,0,<..\..\Source\portable\Keil\ARM7\port.c><port.c> 
+OPTFFF 1,10,1,0,0,0,0,0,<..\..\Source\portable\Keil\ARM7\portISR.c><portISR.c> 
+OPTFFF 1,11,1,0,0,0,0,0,<..\Common\Minimal\BlockQ.c><BlockQ.c> 
+OPTFFF 1,12,1,402653184,0,0,0,0,<..\Common\Minimal\semtest.c><semtest.c> 
+OPTFFF 1,13,1,0,0,0,0,0,<..\Common\Minimal\PollQ.c><PollQ.c> 
+OPTFFF 1,14,1,0,0,0,0,0,<..\Common\Minimal\flash.c><flash.c> 
+OPTFFF 1,15,1,0,0,0,0,0,<..\Common\Minimal\comtest.c><comtest.c> 
+OPTFFF 1,16,1,0,0,0,0,0,<..\Common\Minimal\integer.c><integer.c> 
+OPTFFF 1,17,1,0,0,0,0,0,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> 
+OPTFFF 1,18,1,0,0,0,0,0,<..\Common\Minimal\dynamic.c><dynamic.c> 
+
+ExtF <..\..\SOURCE\PORTABLE\KEIL\ARM7\PORTMACRO.H> 127,127,0,{ 44,0,0,0,2,0,0,0,3,0,0,0,255,255,255,255,255,255,255,255,252,255,255,255,228,255,255,255,27,0,0,0,27,0,0,0,72,4,0,0,33,2,0,0 }
+
+TARGOPT 1, (FreeRTOS)
+ KACLK=12000000
+  OPTTT 1,1,1,0
+  OPTHX 0,65535,0,0,0
+  OPTLX 120,65,8,<.\>
+  OPTOX 16
+  OPTLT 1,1,1,0,1,1,0,1,0,0,0,0
+  OPTXL 1,1,1,1,1,1,1,0,0
+  OPTFL 1,0,1
+  OPTBL 0,(Data Sheet)<DATASHTS\PHILIPS\LPC2119_2129.PDF>
+  OPTBL 1,(User Manual)<DATASHTS\PHILIPS\UM_LPC21XX_LPC22XX.PDF>
+  OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)
+  OPTDBG 44029,-1,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()
+  OPTKEY 0,(DLGTARM)((134=-1,-1,-1,-1,0)(135=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(108=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(80=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(113=-1,-1,-1,-1,0)(112=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)(117=-1,-1,-1,-1,0)(118=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(114=-1,-1,-1,-1,0)(119=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(115=-1,-1,-1,-1,0)(116=-1,-1,-1,-1,0))
+  OPTKEY 0,(UL2ARM)(-U170927308 -O7 -S0 -C0 -N00("ARM7TDMI-S Core") -D00(4F1F0F0F) -L00(4) -FO7 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000)
+  OPTKEY 0,(DLGDARM)((134=-1,-1,-1,-1,0)(135=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(108=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(80=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(113=-1,-1,-1,-1,0)(112=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)(117=-1,-1,-1,-1,0)(118=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(114=-1,-1,-1,-1,0)(119=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(115=-1,-1,-1,-1,0)(116=-1,-1,-1,-1,0))
+  OPTKEY 0,(ARMDBGFLAGS)(-T5F)
+  OPTMM 1,0,(0x40000840)
+  OPTDF 0x1000086
+  OPTLE <>
+  OPTLC <>
+  OPTLA 0,((Port1 & 0x10000) >> 16)(0000FF000000000000000000000000000000F0BF010000006400000000743BA40B000000506F7274310000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000001C030000)
+  OPTLA 1,((Port1 & 0x20000) >> 17)(0000FF000000000000000000000000000000F0BF010000006400000000743BA40B000000506F7274310000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000001C030000)
+  OPTLA 2,((Port1 & 0x40000) >> 18)(0000FF000000000000000000000000000000F0BF010000006400000000743BA40B000000506F7274310000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000001C030000)
+  OPTLA 3,((Port1 & 0x80000) >> 19)(0000FF000000000000000000000000000000F0BF010000006400000000743BA40B000000506F7274310000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000001C030000)
+EndOpt
+
--- a/Demo/ARM7_LPC2129_Keil/rtosdemo_THUMB.Uv2
+++ b/Demo/ARM7_LPC2129_Keil/rtosdemo_THUMB.Uv2
@@ -0,0 +1,110 @@
+### uVision2 Project, (C) Keil Software
+### Do not modify !
+
+Target (FreeRTOS), 0x0005 // Tools: ''
+
+Group (THUMB_DEMO)
+
+File 1,1,<.\main.c><main.c> 0x4162D96A 
+File 1,2,<.\Startup.s><Startup.s> 0x415AF382 
+File 1,1,<.\ParTest\ParTest.c><ParTest.c> 0x415AF50E 
+File 1,1,<.\serial\serial.c><serial.c> 0x4162D488 
+File 1,1,<.\serial\serialISR.c><serialISR.c> 0x4162D404 
+File 1,1,<..\..\Source\tasks.c><tasks.c> 0x4162D9E6 
+File 1,1,<..\..\Source\queue.c><queue.c> 0x411B5F14 
+File 1,1,<..\..\Source\list.c><list.c> 0x411B5F24 
+File 1,1,<..\..\Source\portable\Keil\ARM7\port.c><port.c> 0x4162D434 
+File 1,1,<..\..\Source\portable\Keil\ARM7\portISR.c><portISR.c> 0x415A85E0 
+File 1,1,<..\Common\Minimal\BlockQ.c><BlockQ.c> 0x411B5F8C 
+File 1,1,<..\Common\Minimal\semtest.c><semtest.c> 0x411B5F8C 
+File 1,1,<..\Common\Minimal\PollQ.c><PollQ.c> 0x411B5F8E 
+File 1,1,<..\Common\Minimal\flash.c><flash.c> 0x411B5F8E 
+File 1,1,<..\Common\Minimal\comtest.c><comtest.c> 0x413335E6 
+File 1,1,<..\Common\Minimal\integer.c><integer.c> 0x415FB7EE 
+File 1,1,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> 0x0 
+File 1,1,<..\Common\Minimal\dynamic.c><dynamic.c> 0x0 
+
+
+Options 1,0,0  // Target 'FreeRTOS'
+ Device (LPC2129)
+ Vendor (Philips)
+ Cpu (IRAM(0x40000000-0x40003FFF) IROM(0-0x3FFFF) CLOCK(12000000) CPUTYPE(ARM7TDMI))
+ FlashUt (LPC210x_ISP.EXE ("#H" ^X $D COM1: 9600 1))
+ StupF ("STARTUP\Philips\Startup.s" ("Philips LPC2100 Startup Code"))
+ FlashDR (UL2ARM(-U40296420 -O7 -C0 -FO7 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000))
+ Rgf (LPC21xx.H)
+ Mem ()
+ C ()
+ A ()
+ RL ()
+ OH ()
+ DBC_IFX ()
+ DBC_CMS ()
+ DBC_AMS ()
+ DBC_LMS ()
+ UseEnv=0
+ EnvBin (D:\DevTools\Keil\arm\ARM\BIN\)
+ EnvInc ()
+ EnvLib ()
+ EnvReg (<28>Philips\)
+ OrgReg (<28>Philips\)
+ TgStat=16
+ OutDir (.\)
+ OutName (rtosdemo_THUMB)
+ GenApp=1
+ GenLib=0
+ GenHex=0
+ Debug=1
+ Browse=0
+ LstDir (.\)
+ HexSel=0
+ MG32K=0
+ TGMORE=0
+ RunUsr 0 0 <>
+ RunUsr 1 0 <>
+ BrunUsr 0 0 <>
+ BrunUsr 1 0 <>
+ SVCSID <>
+ KACPU (ARM7TDMI)
+ TKAFL { 0,27,183,0,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ KIROM { 1,0,0,0,0,0,0,4,0 }
+ KIRAM { 0,0,0,0,64,0,64,0,0 }
+ KXRAM { 0,0,0,0,0,0,0,0,0 }
+ KAOCM { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ KCAFLG { 197,156,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ KCAMSC (INTERWORK)
+ KCADEF (KEIL_ARM7 KEIL_THUMB_INTERWORK)
+ KCAUDF ()
+ KCAINC (..\Common\include\;..\..\Source\include\;..\..\Source\portable\Keil\ARM7\)
+ KAAFLG { 20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ KAAMSC ()
+ KAASET ()
+ KAARST ()
+ KAAINC ()
+ PropFld { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ IncBld=1
+ AlwaysBuild=0
+ GenAsm=0
+ AsmAsm=0
+ PublicsOnly=0
+ StopCode=3
+ CustArgs ()
+ LibMods ()
+ KLAFLG { 44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ KLAMSC ()
+ KLADWN (25)
+ KLACFI ()
+ KLAASN ()
+ KLARES ()
+ KLACCL ()
+ KLAUCL ()
+ KLACSC ()
+ KLAUCS ()
+  OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)
+  OPTDBG 44029,-1,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()
+ FLASH1 { 1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+ FLASH2 (BIN\UL2ARM.DLL)
+ FLASH3 ("LPC210x_ISP.EXE" ("#H" ^X $D COM1: 9600 1))
+ FLASH4 ()
+EndOpt
+
--- a/Demo/ARM7_LPC2129_Keil/serial/serial.c
+++ b/Demo/ARM7_LPC2129_Keil/serial/serial.c
@@ -0,0 +1,257 @@
+/*
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.
+
+	This file is part of the FreeRTOS.org distribution.
+
+	FreeRTOS.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	FreeRTOS.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.
+
+	***************************************************************************
+
+	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.
+
+	***************************************************************************
+*/
+
+
+/* 
+	BASIC INTERRUPT DRIVEN SERIAL PORT DRIVER FOR UART0. 
+
+	This file contains all the serial port components that can be compiled to
+	either ARM or THUMB mode.  Components that must be compiled to ARM mode are
+	contained in serialISR.c.
+*/
+
+/* Standard includes. */
+#include <stdlib.h>
+
+/* Scheduler includes. */
+#include "FreeRTOS.h"
+#include "queue.h"
+#include "task.h"
+
+/* Demo application includes. */
+#include "serial.h"
+
+/*-----------------------------------------------------------*/
+
+/* Constants to setup and access the UART. */
+#define serDLAB							( ( unsigned portCHAR ) 0x80 )
+#define serENABLE_INTERRUPTS			( ( unsigned portCHAR ) 0x03 )
+#define serNO_PARITY					( ( unsigned portCHAR ) 0x00 )
+#define ser1_STOP_BIT					( ( unsigned portCHAR ) 0x00 )
+#define ser8_BIT_CHARS					( ( unsigned portCHAR ) 0x03 )
+#define serFIFO_ON						( ( unsigned portCHAR ) 0x01 )
+#define serCLEAR_FIFO					( ( unsigned portCHAR ) 0x06 )
+#define serWANTED_CLOCK_SCALING			( ( unsigned portLONG ) 16 )
+
+/* Constants to setup and access the VIC. */
+#define serU0VIC_CHANNEL				( ( unsigned portLONG ) 0x0006 )
+#define serU0VIC_CHANNEL_BIT			( ( unsigned portLONG ) 0x0040 )
+#define serU0VIC_ENABLE					( ( unsigned portLONG ) 0x0020 )
+
+/* Misc. */
+#define serINVALID_QUEUE				( ( xQueueHandle ) 0 )
+#define serHANDLE						( ( xComPortHandle ) 1 )
+#define serNO_BLOCK						( ( portTickType ) 0 )
+
+/*-----------------------------------------------------------*/
+
+/* Queues used to hold received characters, and characters waiting to be
+transmitted. */
+static xQueueHandle xRxedChars; 
+static xQueueHandle xCharsForTx; 
+
+/*-----------------------------------------------------------*/
+
+/* Communication flag between the interrupt service routine and serial API. */
+static volatile portLONG *plTHREEmpty;
+
+/* 
+ * The queues are created in serialISR.c as they are used from the ISR.
+ * Obtain references to the queues and THRE Empty flag. 
+ */
+extern void vSerialISRCreateQueues(	unsigned portBASE_TYPE uxQueueLength, xQueueHandle *pxRxedChars, xQueueHandle *pxCharsForTx, portLONG volatile **pplTHREEmptyFlag );
+
+/*-----------------------------------------------------------*/
+
+xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )
+{
+unsigned portLONG ulDivisor, ulWantedClock;
+xComPortHandle xReturn = serHANDLE;
+
+	/* The queues are used in the serial ISR routine, so are created from
+	serialISR.c (which is always compiled to ARM mode). */
+	vSerialISRCreateQueues( uxQueueLength, &xRxedChars, &xCharsForTx, &plTHREEmpty );
+
+	if( 
+		( xRxedChars != serINVALID_QUEUE ) && 
+		( xCharsForTx != serINVALID_QUEUE ) && 
+		( ulWantedBaud != ( unsigned portLONG ) 0 ) 
+	  )
+	{
+		portENTER_CRITICAL();
+		{
+			/* The reference to the ISR function is required to load into the 
+			interrupt controller.  The prototype is slightly different 
+			depending on whether in ARM or THUMB mode. */
+			#ifdef KEIL_THUMB_INTERWORK
+				extern void ( vUART_ISR )( void ) __arm __task;
+			#else
+				extern void ( vUART_ISR )( void ) __task;
+			#endif
+
+			/* Setup the baud rate:  Calculate the divisor value. */
+			ulWantedClock = ulWantedBaud * serWANTED_CLOCK_SCALING;
+			ulDivisor = configCPU_CLOCK_HZ / ulWantedClock;
+
+			/* Set the DLAB bit so we can access the divisor. */
+			U0LCR |= serDLAB;
+
+			/* Setup the divisor. */
+			U0DLL = ( unsigned portCHAR ) ( ulDivisor & ( unsigned portLONG ) 0xff );
+			ulDivisor >>= 8;
+			U0DLM = ( unsigned portCHAR ) ( ulDivisor & ( unsigned portLONG ) 0xff );
+
+			/* Turn on the FIFO's and clear the buffers. */
+			U0FCR = ( serFIFO_ON | serCLEAR_FIFO );
+
+			/* Setup transmission format. */
+			U0LCR = serNO_PARITY | ser1_STOP_BIT | ser8_BIT_CHARS;
+
+			/* Setup the VIC for the UART. */
+			VICIntSelect &= ~( serU0VIC_CHANNEL_BIT );
+			VICIntEnable |= serU0VIC_CHANNEL_BIT;
+			VICVectAddr1 = ( unsigned portLONG ) vUART_ISR;
+			VICVectCntl1 = serU0VIC_CHANNEL | serU0VIC_ENABLE;
+
+			/* Enable UART0 interrupts. */
+			U0IER |= serENABLE_INTERRUPTS;
+		}
+		portEXIT_CRITICAL();
+	}
+	else
+	{
+		xReturn = ( xComPortHandle ) 0;
+	}
+
+	return xReturn;
+}
+/*-----------------------------------------------------------*/
+
+signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime )
+{
+	/* The port handle is not required as this driver only supports UART0. */
+	( void ) pxPort;
+
+	/* Get the next character from the buffer.  Return false if no characters
+	are available, or arrive before xBlockTime expires. */
+	if( xQueueReceive( xRxedChars, pcRxedChar, xBlockTime ) )
+	{
+		return pdTRUE;
+	}
+	else
+	{
+		return pdFALSE;
+	}
+}
+/*-----------------------------------------------------------*/
+
+void vSerialPutString( xComPortHandle pxPort, const signed portCHAR * const pcString, unsigned portSHORT usStringLength )
+{
+signed portCHAR *pxNext;
+
+	/* NOTE: This implementation does not handle the queue being full as no
+	block time is used! */
+
+	/* The port handle is not required as this driver only supports UART0. */
+	( void ) pxPort;
+	( void ) usStringLength;
+
+	/* Send each character in the string, one at a time. */
+	pxNext = ( signed portCHAR * ) pcString;
+	while( *pxNext )
+	{
+		xSerialPutChar( pxPort, *pxNext, serNO_BLOCK );
+		pxNext++;
+	}
+}
+/*-----------------------------------------------------------*/
+
+signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime )
+{
+signed portBASE_TYPE xReturn;
+
+	/* The port handle is not required as this driver only supports UART0. */
+	( void ) pxPort;
+
+	portENTER_CRITICAL();
+	{
+		/* Is there space to write directly to the UART? */
+		if( *plTHREEmpty == ( portLONG ) pdTRUE )
+		{
+			/* We wrote the character directly to the UART, so was 
+			successful. */
+			*plTHREEmpty = pdFALSE;
+			U0THR = cOutChar;
+			xReturn = pdPASS;
+		}
+		else 
+		{
+			/* We cannot write directly to the UART, so queue the character.
+			Block for a maximum of xBlockTime if there is no space in the
+			queue.  It is ok to block within a critical section as each
+			task has it's own critical section management. */
+			xReturn = xQueueSend( xCharsForTx, &cOutChar, xBlockTime );
+
+			/* Depending on queue sizing and task prioritisation:  While we 
+			were blocked waiting to post interrupts were not disabled.  It is 
+			possible that the serial ISR has emptied the Tx queue, in which
+			case we need to start the Tx off again. */
+			if( *plTHREEmpty == ( portLONG ) pdTRUE )
+			{
+				xQueueReceive( xCharsForTx, &cOutChar, serNO_BLOCK );
+				*plTHREEmpty = pdFALSE;
+				U0THR = cOutChar;
+			}
+		}
+	}
+	portEXIT_CRITICAL();
+
+	return xReturn;
+}
+/*-----------------------------------------------------------*/
+
+
+
+
+
+
+	
--- a/Demo/ARM7_LPC2129_Keil/serial/serialISR.c
+++ b/Demo/ARM7_LPC2129_Keil/serial/serialISR.c
@@ -0,0 +1,170 @@
+/*
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.
+
+	This file is part of the FreeRTOS.org distribution.
+
+	FreeRTOS.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	FreeRTOS.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.
+
+	***************************************************************************
+
+	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.
+
+	***************************************************************************
+*/
+
+
+/* 
+	BASIC INTERRUPT DRIVEN SERIAL PORT DRIVER FOR UART0. 
+
+	This file contains all the serial port components that must be compiled
+	to ARM mode.  The components that can be compiled to either ARM or THUMB
+	mode are contained in serial.c.
+*/
+
+/* This file must always be compiled to ARM mode as it contains ISR 
+definitions. */
+#pragma ARM
+
+/* Standard includes. */
+#include <stdlib.h>
+
+/* Scheduler includes. */
+#include "FreeRTOS.h"
+#include "queue.h"
+#include "task.h"
+
+/* Demo application includes. */
+#include "serial.h"
+
+/*-----------------------------------------------------------*/
+
+/* Constant to access the VIC. */
+#define serCLEAR_VIC_INTERRUPT			( ( unsigned portLONG ) 0 )
+
+/* Constants to determine the ISR source. */
+#define serSOURCE_THRE					( ( unsigned portCHAR ) 0x02 )
+#define serSOURCE_RX_TIMEOUT			( ( unsigned portCHAR ) 0x0c )
+#define serSOURCE_ERROR					( ( unsigned portCHAR ) 0x06 )
+#define serSOURCE_RX					( ( unsigned portCHAR ) 0x04 )
+#define serINTERRUPT_SOURCE_MASK		( ( unsigned portCHAR ) 0x0f )
+
+/* Queues used to hold received characters, and characters waiting to be
+transmitted. */
+static xQueueHandle xRxedChars; 
+static xQueueHandle xCharsForTx; 
+static volatile portLONG lTHREEmpty;
+
+/*-----------------------------------------------------------*/
+
+/* UART0 interrupt service routine.  This can cause a context switch so MUST
+be declared "naked". */
+void vUART_ISR( void );
+
+/*-----------------------------------------------------------*/
+void vSerialISRCreateQueues(	unsigned portBASE_TYPE uxQueueLength, xQueueHandle *pxRxedChars, 
+								xQueueHandle *pxCharsForTx, portLONG volatile **pplTHREEmptyFlag )
+{
+	/* 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 ) );
+
+	/* Pass back a reference to the queues so the serial API file can 
+	post/receive characters. */
+	*pxRxedChars = xRxedChars;
+	*pxCharsForTx = xCharsForTx;
+
+	/* Initialise the THRE empty flag - and pass back a reference. */
+	lTHREEmpty = pdTRUE;
+	*pplTHREEmptyFlag = &lTHREEmpty;
+}
+/*-----------------------------------------------------------*/
+
+void vUART_ISR( void ) __task
+{
+	portENTER_SWITCHING_ISR()
+
+	/* Now we can declare the local variables. */
+	static signed portCHAR cChar;
+	static portBASE_TYPE xTaskWokenByRx, xTaskWokenByTx;
+
+	xTaskWokenByTx = pdFALSE;
+	xTaskWokenByRx = pdFALSE;
+
+	/* What caused the interrupt? */
+	switch( U0IIR & serINTERRUPT_SOURCE_MASK )
+	{
+		case serSOURCE_ERROR :	/* Not handling this, but clear the interrupt. */
+								cChar = U0LSR;
+								break;
+
+		case serSOURCE_THRE	:	/* The THRE is empty.  If there is another
+								character in the Tx queue, send it now. */
+								if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xTaskWokenByTx ) == pdTRUE )
+								{
+									U0THR = cChar;
+								}
+								else
+								{
+									/* There are no further characters 
+									queued to send so we can indicate 
+									that the THRE is available. */
+									lTHREEmpty = pdTRUE;
+								}
+								break;
+
+		case serSOURCE_RX_TIMEOUT :
+		case serSOURCE_RX	:	/* A character was received.  Place it in 
+								the queue of received characters. */
+								cChar = U0RBR;
+								if( xQueueSendFromISR( xRxedChars, &cChar, pdFALSE ) )
+								{
+									xTaskWokenByRx = pdTRUE;
+								}
+								break;
+
+		default				:	/* There is nothing to do, leave the ISR. */
+								break;
+	}
+
+	/* Clear the ISR in the VIC. */
+	VICVectAddr = serCLEAR_VIC_INTERRUPT;
+
+	/* Exit the ISR.  If a task was woken by either a character being received
+	or transmitted then a context switch will occur. */
+	portEXIT_SWITCHING_ISR( ( xTaskWokenByTx || xTaskWokenByRx ) );
+}
+/*-----------------------------------------------------------*/
+
+
+
+
+
+	
--- a/Demo/ARM7_LPC2129_Keil_RVDS/FreeRTOSConfig.h
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/FreeRTOSConfig.h
@@ -1,97 +0,0 @@
-/*
-	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.
-*/
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-#include <lpc21xx.h>
-
-/*-----------------------------------------------------------
- * Application specific definitions.
- *
- * These definitions should be adjusted for your particular hardware and
- * application requirements.
- *
- * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
- *
- * See http://www.freertos.org/a00110.html.
- *----------------------------------------------------------*/
-
-#define configUSE_PREEMPTION		1
-#define configUSE_IDLE_HOOK			0
-#define configUSE_TICK_HOOK			0
-#define configCPU_CLOCK_HZ			( ( unsigned portLONG ) 60000000 )	/* =12.0MHz xtal multiplied by 5 using the PLL. */
-#define configTICK_RATE_HZ			( ( portTickType ) 1000 )
-#define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 5 )
-#define configMINIMAL_STACK_SIZE	( ( unsigned portSHORT ) 100 )
-#define configTOTAL_HEAP_SIZE		( ( size_t ) 13 * 1024 )
-#define configMAX_TASK_NAME_LEN		( 16 )
-#define configUSE_TRACE_FACILITY	0
-#define configUSE_16_BIT_TICKS		0
-#define configIDLE_SHOULD_YIELD		1
-
-#define configQUEUE_REGISTRY_SIZE 	0
-
-/* Co-routine definitions. */
-#define configUSE_CO_ROUTINES 		0
-#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
-
-/* Set the following definitions to 1 to include the API function, or zero
-to exclude the API function. */
-
-#define INCLUDE_vTaskPrioritySet		1
-#define INCLUDE_uxTaskPriorityGet		1
-#define INCLUDE_vTaskDelete				1
-#define INCLUDE_vTaskCleanUpResources	0
-#define INCLUDE_vTaskSuspend			1
-#define INCLUDE_vTaskDelayUntil			1
-#define INCLUDE_vTaskDelay				1
-
-
-
-#endif /* FREERTOS_CONFIG_H */
--- a/Demo/ARM7_LPC2129_Keil_RVDS/ParTest/ParTest.c
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/ParTest/ParTest.c
@@ -1,112 +0,0 @@
-/*
-	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.
-*/
-
-
-#include "FreeRTOS.h"
-#include "portable.h"
-#include "partest.h"
-
-#define partstFIRST_IO		( ( unsigned portLONG ) 0x10000 )
-#define partstNUM_LEDS		( 8 )
-
-/*-----------------------------------------------------------
- * Simple parallel port IO routines.
- *-----------------------------------------------------------*/
-
-void vParTestInitialise( void )
-{
-	/* This is performed from main() as the io bits are shared with other setup
-	functions. */
-}
-/*-----------------------------------------------------------*/
-
-void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue )
-{
-unsigned portLONG ulLED = partstFIRST_IO;
-
-	if( uxLED < partstNUM_LEDS )
-	{
-		/* Rotate to the wanted bit of port 0.  Only P16 to P23 have an LED
-		attached. */
-		ulLED <<= ( unsigned portLONG ) uxLED;
-
-		/* Set or clear the output. */
-		if( xValue )
-		{
-			IOSET1 = ulLED;
-		}
-		else
-		{
-			IOCLR1 = ulLED;			
-		}
-	}	
-}
-/*-----------------------------------------------------------*/
-
-void vParTestToggleLED( unsigned portBASE_TYPE uxLED )
-{
-unsigned portLONG ulLED = partstFIRST_IO, ulCurrentState;
-
-	if( uxLED < partstNUM_LEDS )
-	{
-		/* Rotate to the wanted bit of port 0.  Only P10 to P13 have an LED
-		attached. */
-		ulLED <<= ( unsigned portLONG ) uxLED;
-
-		/* If this bit is already set, clear it, and visa versa. */
-		ulCurrentState = IOPIN1;
-		if( ulCurrentState & ulLED )
-		{
-			IOCLR1 = ulLED;
-		}
-		else
-		{
-			IOSET1 = ulLED;			
-		}
-	}	
-}
-
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Opt
@@ -1,87 +0,0 @@
-### uVision2 Project, (C) Keil Software
-### Do not modify !
-
- cExt (*.c)
- aExt (*.s*; *.src; *.a*)
- oExt (*.obj)
- lExt (*.lib)
- tExt (*.txt; *.h; *.inc)
- pExt (*.plm)
- CppX (*.cpp)
- DaveTm { 0,0,0,0,0,0,0,0 }
-
-Target (RTOSDemo_ARM), 0x0004 // Tools: 'ARM-ADS'
-Target (RTOSDemo_THUMB), 0x0004 // Tools: 'ARM-ADS'
-GRPOPT 1,(Other),1,0,0
-GRPOPT 2,(FreeRTOS),1,0,0
-GRPOPT 3,(Stadard Demo),0,0,0
-
-OPTFFF 1,1,2,0,0,0,0,0,<.\Startup.s><Startup.s> 
-OPTFFF 1,2,1,503316480,0,0,0,0,<.\ParTest\ParTest.c><ParTest.c> 
-OPTFFF 1,3,1,2,0,1,1,0,<.\main.c><main.c> { 44,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,66,0,0,0,66,0,0,0,135,4,0,0,33,2,0,0 }
-OPTFFF 1,4,1,0,0,0,0,0,<.\serial\serial.c><serial.c> 
-OPTFFF 1,5,2,0,0,0,0,0,<.\serial\serialISR.s><serialISR.s> 
-OPTFFF 2,6,1,301989888,0,0,0,0,<..\..\Source\tasks.c><tasks.c> 
-OPTFFF 2,7,1,0,0,0,0,0,<..\..\Source\list.c><list.c> 
-OPTFFF 2,8,1,754974720,0,0,0,0,<..\..\Source\queue.c><queue.c> 
-OPTFFF 2,9,1,0,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\port.c><port.c> 
-OPTFFF 2,10,1,0,0,0,0,0,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c> 
-OPTFFF 2,11,2,301989888,0,0,0,0,<..\..\Source\portable\RVDS\ARM7_LPC21xx\portASM.s><portASM.s> 
-OPTFFF 3,12,1,0,0,0,0,0,<..\Common\Minimal\flash.c><flash.c> 
-OPTFFF 3,13,1,0,0,0,0,0,<..\Common\Minimal\integer.c><integer.c> 
-OPTFFF 3,14,1,0,0,0,0,0,<..\Common\Minimal\comtest.c><comtest.c> 
-OPTFFF 3,15,1,0,0,0,0,0,<..\Common\Minimal\BlockQ.c><BlockQ.c> 
-OPTFFF 3,16,1,0,0,0,0,0,<..\Common\Minimal\dynamic.c><dynamic.c> 
-OPTFFF 3,17,1,0,0,0,0,0,<..\Common\Minimal\PollQ.c><PollQ.c> 
-OPTFFF 3,18,1,0,0,0,0,0,<..\Common\Minimal\semtest.c><semtest.c> 
-
-
-TARGOPT 1, (RTOSDemo_ARM)
- ADSCLK=12000000
-  OPTTT 1,1,1,0
-  OPTHX 1,65535,0,0,0
-  OPTLX 79,66,8,<.\>
-  OPTOX 16
-  OPTLT 1,1,1,0,1,1,0,1,0,0,0,0
-  OPTXL 1,1,1,1,1,1,1,0,0
-  OPTFL 1,0,0
-  OPTAX 8
-  OPTBL 0,(Data Sheet)<DATASHTS\PHILIPS\LPC2119_2129.PDF>
-  OPTBL 1,(User Manual)<DATASHTS\PHILIPS\user_manual_LPC2119_2129_2194_2292_2294.PDF>
-  OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)
-  OPTDBG 49150,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()
-  OPTKEY 0,(DLGTARM)((134=-1,-1,-1,-1,0)(135=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(108=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(80=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(113=932,102,1307,529,0)(112=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)(117=-1,-1,-1,-1,0)(118=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(114=-1,-1,-1,-1,0)(119=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(115=-1,-1,-1,-1,0)(116=-1,-1,-1,-1,0))
-  OPTKEY 0,(UL2ARM)(-UU0605F6E -O47 -S0 -C0 -N00("ARM7TDMI-S Core") -D00(4F1F0F0F) -L00(4) -FO7 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000)
-  OPTKEY 0,(DLGDARM)((134=-1,-1,-1,-1,0)(135=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(108=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(80=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(113=-1,-1,-1,-1,0)(112=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)(117=-1,-1,-1,-1,0)(118=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(114=-1,-1,-1,-1,0)(119=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(115=-1,-1,-1,-1,0)(116=-1,-1,-1,-1,0))
-  OPTKEY 0,(ARMDBGFLAGS)(-T5F)
-  OPTBB 0,0,303,1,1676,0,0,0,0,1,<serial.c>()()
-  OPTDF 0x86
-  OPTLE <>
-  OPTLC <>
-EndOpt
-
-TARGOPT 2, (RTOSDemo_THUMB)
- ADSCLK=12000000
-  OPTTT 1,1,1,0
-  OPTHX 1,65535,0,0,0
-  OPTLX 79,66,8,<.\>
-  OPTOX 16
-  OPTLT 1,1,1,0,1,1,0,1,0,0,0,0
-  OPTXL 1,1,1,1,1,1,1,0,0
-  OPTFL 1,0,1
-  OPTAX 8
-  OPTBL 0,(Data Sheet)<DATASHTS\PHILIPS\LPC2119_2129.PDF>
-  OPTBL 1,(User Manual)<DATASHTS\PHILIPS\user_manual_LPC2119_2129_2194_2292_2294.PDF>
-  OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)
-  OPTDBG 49149,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()
-  OPTKEY 0,(DLGTARM)((134=-1,-1,-1,-1,0)(135=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(108=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(80=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(113=-1,-1,-1,-1,0)(112=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)(117=-1,-1,-1,-1,0)(118=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(114=-1,-1,-1,-1,0)(119=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(115=-1,-1,-1,-1,0)(116=-1,-1,-1,-1,0))
-  OPTKEY 0,(UL2ARM)(-UU0605F6E -O39 -S0 -C0 -N00("ARM7TDMI-S Core") -D00(4F1F0F0F) -L00(4) -FO19 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000)
-  OPTKEY 0,(DLGDARM)((134=-1,-1,-1,-1,0)(135=-1,-1,-1,-1,0)(107=-1,-1,-1,-1,0)(108=-1,-1,-1,-1,0)(106=-1,-1,-1,-1,0)(105=-1,-1,-1,-1,0)(80=-1,-1,-1,-1,0)(104=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(101=-1,-1,-1,-1,0)(113=-1,-1,-1,-1,0)(112=-1,-1,-1,-1,0)(136=-1,-1,-1,-1,0)(117=-1,-1,-1,-1,0)(118=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(114=-1,-1,-1,-1,0)(119=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(115=-1,-1,-1,-1,0)(116=-1,-1,-1,-1,0))
-  OPTKEY 0,(ARMDBGFLAGS)(-T5F)
-  OPTBB 0,0,218,1,644,0,0,0,0,1,<main.c>()()
-  OPTBB 1,0,207,1,626,0,0,0,0,1,<main.c>()()
-  OPTDF 0x86
-  OPTLE <>
-  OPTLC <>
-EndOpt
-
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.Uv2
@@ -1,210 +0,0 @@
-### uVision2 Project, (C) Keil Software
-### Do not modify !
-
-Target (RTOSDemo_ARM), 0x0004 // Tools: 'ARM-ADS'
-Target (RTOSDemo_THUMB), 0x0004 // Tools: 'ARM-ADS'
-
-Group (Other)
-Group (FreeRTOS)
-Group (Stadard Demo)
-
-File 1,2,<.\Startup.s><Startup.s>
-File 1,1,<.\ParTest\ParTest.c><ParTest.c>
-File 1,1,<.\main.c><main.c>
-File 1,1,<.\serial\serial.c><serial.c>
-File 1,2,<.\serial\serialISR.s><serialISR.s>
-File 2,1,<..\..\Source\tasks.c><tasks.c>
-File 2,1,<..\..\Source\list.c><list.c>
-File 2,1,<..\..\Source\queue.c><queue.c>
-File 2,1,<..\..\Source\portable\RVDS\ARM7_LPC21xx\port.c><port.c>
-File 2,1,<..\..\Source\portable\MemMang\heap_2.c><heap_2.c>
-File 2,2,<..\..\Source\portable\RVDS\ARM7_LPC21xx\portASM.s><portASM.s>
-File 3,1,<..\Common\Minimal\flash.c><flash.c>
-File 3,1,<..\Common\Minimal\integer.c><integer.c>
-File 3,1,<..\Common\Minimal\comtest.c><comtest.c>
-File 3,1,<..\Common\Minimal\BlockQ.c><BlockQ.c>
-File 3,1,<..\Common\Minimal\dynamic.c><dynamic.c>
-File 3,1,<..\Common\Minimal\PollQ.c><PollQ.c>
-File 3,1,<..\Common\Minimal\semtest.c><semtest.c>
-
-
-Options 1,0,0  // Target 'RTOSDemo_ARM'
- Device (LPC2129)
- Vendor (NXP (founded by Philips))
- Cpu (IRAM(0x40000000-0x40003FFF) IROM(0-0x3FFFF) CLOCK(12000000) CPUTYPE(ARM7TDMI))
- FlashUt (LPC210x_ISP.EXE ("#H" ^X $D COM1: 9600 1))
- StupF ("STARTUP\Philips\Startup.s" ("Philips LPC2100 Startup Code"))
- FlashDR (UL2ARM(-U40296420 -O7 -C0 -FO7 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000))
- DevID (3648)
- Rgf (LPC21xx.H)
- Mem ()
- C ()
- A ()
- RL ()
- OH ()
- DBC_IFX ()
- DBC_CMS ()
- DBC_AMS ()
- DBC_LMS ()
- UseEnv=0
- EnvBin ()
- EnvInc ()
- EnvLib ()
- EnvReg (<28>Philips\)
- OrgReg (<28>Philips\)
- TgStat=16
- OutDir (.\)
- OutName (RTOSDemo)
- GenApp=1
- GenLib=0
- GenHex=0
- Debug=1
- Browse=1
- LstDir (.\)
- HexSel=1
- MG32K=0
- TGMORE=0
- RunUsr 0 0 <>
- RunUsr 1 0 <>
- BrunUsr 0 0 <>
- BrunUsr 1 0 <>
- CrunUsr 0 0 <>
- CrunUsr 1 0 <>
- SVCSID <>
- GLFLAGS=1790
- ADSFLGA { 243,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- ACPUTYP (ARM7TDMI)
- RVDEV ()
- ADSTFLGA { 0,12,0,2,99,0,0,66,0,0,0,0,0,0,0,0,0,0,0,0 }
- OCMADSOCM { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- OCMADSIRAM { 0,0,0,0,64,0,64,0,0 }
- OCMADSIROM { 1,0,0,0,0,0,0,4,0 }
- OCMADSXRAM { 0,0,0,0,0,0,0,0,0 }
- OCR_RVCT { 1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,4,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,64,0,0,0,0,0,0,0,0,0,0,0 }
- RV_STAVEC ()
- ADSCCFLG { 5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- ADSCMISC ()
- ADSCDEFN (ARM7_LPC21xx_KEIL_RVDS)
- ADSCUDEF ()
- ADSCINCD (.;..\..\Source\portable\RVDS\ARM7_LPC21xx;..\Common\include;..\..\Source\include)
- ADSASFLG { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- ADSAMISC ()
- ADSADEFN ()
- ADSAUDEF ()
- ADSAINCD (..\..\Source\portable\RVDS\ARM7_LPC21xx)
- PropFld { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- IncBld=1
- AlwaysBuild=0
- GenAsm=0
- AsmAsm=0
- PublicsOnly=0
- StopCode=3
- CustArgs ()
- LibMods ()
- ADSLDFG { 17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- ADSLDTA (0x00000000)
- ADSLDDA (0x40000000)
- ADSLDSC ()
- ADSLDIB ()
- ADSLDIC ()
- ADSLDMC ()
- ADSLDIF ()
- ADSLDDW ()
-  OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)
-  OPTDBG 49150,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()
- FLASH1 { 1,0,0,0,1,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0 }
- FLASH2 (BIN\UL2ARM.DLL)
- FLASH3 ("LPC210x_ISP.EXE" ("#H" ^X $D COM1: 9600 1))
- FLASH4 ()
-EndOpt
-
-Options 2,0,0  // Target 'RTOSDemo_THUMB'
- Device (LPC2129)
- Vendor (NXP (founded by Philips))
- Cpu (IRAM(0x40000000-0x40003FFF) IROM(0-0x3FFFF) CLOCK(12000000) CPUTYPE(ARM7TDMI))
- FlashUt (LPC210x_ISP.EXE ("#H" ^X $D COM1: 9600 1))
- StupF ("STARTUP\Philips\Startup.s" ("Philips LPC2100 Startup Code"))
- FlashDR (UL2ARM(-U40296420 -O7 -C0 -FO7 -FD40000000 -FC800 -FN1 -FF0LPC_IAP_256 -FS00 -FL03E000))
- DevID (3648)
- Rgf (LPC21xx.H)
- Mem ()
- C ()
- A ()
- RL ()
- OH ()
- DBC_IFX ()
- DBC_CMS ()
- DBC_AMS ()
- DBC_LMS ()
- UseEnv=0
- EnvBin ()
- EnvInc ()
- EnvLib ()
- EnvReg (<28>Philips\)
- OrgReg (<28>Philips\)
- TgStat=16
- OutDir (.\bin\)
- OutName (RTOSDemo)
- GenApp=1
- GenLib=0
- GenHex=1
- Debug=1
- Browse=1
- LstDir (.\)
- HexSel=1
- MG32K=0
- TGMORE=0
- RunUsr 0 0 <>
- RunUsr 1 0 <>
- BrunUsr 0 0 <>
- BrunUsr 1 0 <>
- CrunUsr 0 0 <>
- CrunUsr 1 0 <>
- SVCSID <>
- GLFLAGS=1790
- ADSFLGA { 243,31,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- ACPUTYP (ARM7TDMI)
- RVDEV ()
- ADSTFLGA { 0,12,0,2,99,4,0,66,0,0,0,0,0,0,0,0,0,0,0,0 }
- OCMADSOCM { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- OCMADSIRAM { 0,0,0,0,64,0,64,0,0 }
- OCMADSIROM { 1,0,0,0,0,0,0,4,0 }
- OCMADSXRAM { 0,0,0,0,0,0,0,0,0 }
- OCR_RVCT { 1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,4,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,64,0,64,0,0,0,0,0,0,0,0,0,0,0 }
- RV_STAVEC ()
- ADSCCFLG { 5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- ADSCMISC ()
- ADSCDEFN (ARM7_LPC21xx_KEIL_RVDS KEIL_THUMB_INTERWORK)
- ADSCUDEF ()
- ADSCINCD (.;..\..\Source\portable\RVDS\ARM7_LPC21xx;..\Common\include;..\..\Source\include)
- ADSASFLG { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- ADSAMISC ()
- ADSADEFN ()
- ADSAUDEF ()
- ADSAINCD (..\..\Source\portable\RVDS\ARM7_LPC21xx)
- PropFld { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- IncBld=1
- AlwaysBuild=0
- GenAsm=0
- AsmAsm=0
- PublicsOnly=0
- StopCode=3
- CustArgs ()
- LibMods ()
- ADSLDFG { 17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
- ADSLDTA (0x00000000)
- ADSLDDA (0x40000000)
- ADSLDSC ()
- ADSLDIB ()
- ADSLDIC ()
- ADSLDMC ()
- ADSLDIF ()
- ADSLDDW ()
-  OPTDL (SARM.DLL)(-cLPC2100)(DARMP.DLL)(-pLPC21x9)(SARM.DLL)()(TARMP.DLL)(-pLPC21x9)
-  OPTDBG 49149,0,()()()()()()()()()() (BIN\UL2ARM.DLL)()()()
- FLASH1 { 1,0,0,0,1,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0 }
- FLASH2 (BIN\UL2ARM.DLL)
- FLASH3 ("LPC210x_ISP.EXE" ("#H" ^X $D COM1: 9600 1))
- FLASH4 ()
-EndOpt
-
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.sct
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.sct
@@ -1,15 +0,0 @@
-; *************************************************************
-; *** Scatter-Loading Description File generated by uVision ***
-; *************************************************************
-
-LR_IROM1 0x00000000 0x00040000  {    ; load region size_region
-  ER_IROM1 0x00000000 0x00040000  {  ; load address = execution address
-   *.o (RESET, +First)
-   *(InRoot$$Sections)
-   .ANY (+RO)
-  }
-  RW_IRAM1 0x40000000 0x00004000  {  ; RW data
-   .ANY (+RW +ZI)
-  }
-}
-
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo.tra
@@ -1,36 +0,0 @@
-*** Creating Trace Output File 'RTOSDemo.tra' Ok.
-### Preparing for ADS-LD.
-### Creating ADS-LD Command Line
-### List of Objects: adding '"startup.o"'
-### List of Objects: adding '"partest.o"'
-### List of Objects: adding '"main.o"'
-### List of Objects: adding '"serial.o"'
-### List of Objects: adding '"serialisr.o"'
-### List of Objects: adding '"tasks.o"'
-### List of Objects: adding '"list.o"'
-### List of Objects: adding '"queue.o"'
-### List of Objects: adding '"port.o"'
-### List of Objects: adding '"heap_2.o"'
-### List of Objects: adding '".\portasm.o"'
-### List of Objects: adding '"flash.o"'
-### List of Objects: adding '"integer.o"'
-### List of Objects: adding '"comtest.o"'
-### List of Objects: adding '"blockq.o"'
-### List of Objects: adding '"dynamic.o"'
-### List of Objects: adding '"pollq.o"'
-### List of Objects: adding '"semtest.o"'
-### ADS-LD Command completed:
-"startup.o" "partest.o" "main.o" "serial.o" "serialisr.o" "tasks.o" "list.o" "queue.o" "port.o" "heap_2.o" ".\portasm.o" "flash.o" "integer.o" "comtest.o" "blockq.o" "dynamic.o" "pollq.o" "semtest.o" --device DARMP --strict --scatter "RTOSDemo.sct" 
-
--autoat --summary_stderr --info summarysizes --map --xref --callgraph --symbols 
-
--info sizes --info totals --info unused --info veneers 
-
- --list ".\RTOSDemo.map" -o "RTOSDemo.axf"### Preparing Environment (PrepEnvAds)
-### ADS-LD Output File: 'RTOSDemo.axf'
-### ADS-LD Command File: 'RTOSDemo.lnp'
-### Checking for dirty Components...
-### Creating CmdFile 'RTOSDemo.lnp', Handle=0x00000228
-### Writing '.lnp' file
-### ADS-LD Command file 'RTOSDemo.lnp' is ready.
-### ADS-LD: About to start ADS-LD Thread.
--- a/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo_Target
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/RTOSDemo_Target
@@ -1,2 +0,0 @@
-Dependencies for Project 'RTOSDemo', Target 'Target 1': (DO NOT MODIFY !)
-F (.\Startup.s)(0x47F4A5D0)(--device DARMP -g --apcs=interwork -I "C:\Devtools\Keil305_2\ARM\INC\Philips" --list "Startup.lst" --xref -o "Startup.o")
--- a/Demo/ARM7_LPC2129_Keil_RVDS/Startup.s
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/Startup.s
@@ -1,429 +0,0 @@
-;/*****************************************************************************/
-;/* STARTUP.S: Startup file for Philips LPC2000                               */
-;/*****************************************************************************/
-;/* <<< Use Configuration Wizard in Context Menu >>>                          */ 
-;/*****************************************************************************/
-;/* This file is part of the uVision/ARM development tools.                   */
-;/* Copyright (c) 2005-2007 Keil Software. All rights reserved.               */
-;/* This software may only be used under the terms of a valid, current,       */
-;/* end user licence from KEIL for a compatible version of KEIL software      */
-;/* development tools. Nothing else gives you the right to use this software. */
-;/*****************************************************************************/
-
-
-;/*
-; *  The STARTUP.S code is executed after CPU Reset. This file may be 
-; *  translated with the following SET symbols. In uVision these SET 
-; *  symbols are entered under Options - ASM - Define.
-; *
-; *  REMAP: when set the startup code initializes the register MEMMAP 
-; *  which overwrites the settings of the CPU configuration pins. The 
-; *  startup and interrupt vectors are remapped from:
-; *     0x00000000  default setting (not remapped)
-; *     0x80000000  when EXTMEM_MODE is used
-; *     0x40000000  when RAM_MODE is used
-; *
-; *  EXTMEM_MODE: when set the device is configured for code execution
-; *  from external memory starting at address 0x80000000.
-; *
-; *  RAM_MODE: when set the device is configured for code execution
-; *  from on-chip RAM starting at address 0x40000000.
-; *
-; *  EXTERNAL_MODE: when set the PIN2SEL values are written that enable
-; *  the external BUS at startup.
-; */
-
-
-; Standard definitions of Mode bits and Interrupt (I & F) flags in PSRs
-
-Mode_USR        EQU     0x10
-Mode_FIQ        EQU     0x11
-Mode_IRQ        EQU     0x12
-Mode_SVC        EQU     0x13
-Mode_ABT        EQU     0x17
-Mode_UND        EQU     0x1B
-Mode_SYS        EQU     0x1F
-
-I_Bit           EQU     0x80            ; when I bit is set, IRQ is disabled
-F_Bit           EQU     0x40            ; when F bit is set, FIQ is disabled
-
-
-;// <h> Stack Configuration (Stack Sizes in Bytes)
-;//   <o0> Undefined Mode      <0x0-0xFFFFFFFF:8>
-;//   <o1> Supervisor Mode     <0x0-0xFFFFFFFF:8>
-;//   <o2> Abort Mode          <0x0-0xFFFFFFFF:8>
-;//   <o3> Fast Interrupt Mode <0x0-0xFFFFFFFF:8>
-;//   <o4> Interrupt Mode      <0x0-0xFFFFFFFF:8>
-;//   <o5> User/System Mode    <0x0-0xFFFFFFFF:8>
-;// </h>
-
-UND_Stack_Size  EQU     0x00000008
-SVC_Stack_Size  EQU     0x00000400
-ABT_Stack_Size  EQU     0x00000008
-FIQ_Stack_Size  EQU     0x00000008
-IRQ_Stack_Size  EQU     0x00000400
-USR_Stack_Size	EQU		0x00000008
-
-ISR_Stack_Size  EQU     (UND_Stack_Size + SVC_Stack_Size + ABT_Stack_Size + \
-                         FIQ_Stack_Size + IRQ_Stack_Size)
-
-                AREA    STACK, NOINIT, READWRITE, ALIGN=3
-
-Stack_Mem       SPACE   USR_Stack_Size
-__initial_sp    SPACE   ISR_Stack_Size
-
-Stack_Top
-
-
-;// <h> Heap Configuration
-;//   <o>  Heap Size (in Bytes) <0x0-0xFFFFFFFF>
-;// </h>
-
-Heap_Size       EQU     0x00000000
-
-                AREA    HEAP, NOINIT, READWRITE, ALIGN=3
-__heap_base
-Heap_Mem        SPACE   Heap_Size
-__heap_limit
-
-
-; VPBDIV definitions
-VPBDIV          EQU     0xE01FC100      ; VPBDIV Address
-
-;// <e> VPBDIV Setup
-;// <i> Peripheral Bus Clock Rate
-;//   <o1.0..1>   VPBDIV: VPB Clock
-;//               <0=> VPB Clock = CPU Clock / 4
-;//               <1=> VPB Clock = CPU Clock
-;//               <2=> VPB Clock = CPU Clock / 2
-;//   <o1.4..5>   XCLKDIV: XCLK Pin
-;//               <0=> XCLK Pin = CPU Clock / 4
-;//               <1=> XCLK Pin = CPU Clock
-;//               <2=> XCLK Pin = CPU Clock / 2
-;// </e>
-VPBDIV_SETUP    EQU     0
-VPBDIV_Val      EQU     0x00000000
-
-
-; Phase Locked Loop (PLL) definitions
-PLL_BASE        EQU     0xE01FC080      ; PLL Base Address
-PLLCON_OFS      EQU     0x00            ; PLL Control Offset
-PLLCFG_OFS      EQU     0x04            ; PLL Configuration Offset
-PLLSTAT_OFS     EQU     0x08            ; PLL Status Offset
-PLLFEED_OFS     EQU     0x0C            ; PLL Feed Offset
-PLLCON_PLLE     EQU     (1<<0)          ; PLL Enable
-PLLCON_PLLC     EQU     (1<<1)          ; PLL Connect
-PLLCFG_MSEL     EQU     (0x1F<<0)       ; PLL Multiplier
-PLLCFG_PSEL     EQU     (0x03<<5)       ; PLL Divider
-PLLSTAT_PLOCK   EQU     (1<<10)         ; PLL Lock Status
-
-;// <e> PLL Setup
-;//   <o1.0..4>   MSEL: PLL Multiplier Selection
-;//               <1-32><#-1>
-;//               <i> M Value
-;//   <o1.5..6>   PSEL: PLL Divider Selection
-;//               <0=> 1   <1=> 2   <2=> 4   <3=> 8
-;//               <i> P Value
-;// </e>
-PLL_SETUP       EQU     1
-PLLCFG_Val      EQU     0x00000024
-
-
-; Memory Accelerator Module (MAM) definitions
-MAM_BASE        EQU     0xE01FC000      ; MAM Base Address
-MAMCR_OFS       EQU     0x00            ; MAM Control Offset
-MAMTIM_OFS      EQU     0x04            ; MAM Timing Offset
-
-;// <e> MAM Setup
-;//   <o1.0..1>   MAM Control
-;//               <0=> Disabled
-;//               <1=> Partially Enabled
-;//               <2=> Fully Enabled
-;//               <i> Mode
-;//   <o2.0..2>   MAM Timing
-;//               <0=> Reserved  <1=> 1   <2=> 2   <3=> 3
-;//               <4=> 4         <5=> 5   <6=> 6   <7=> 7
-;//               <i> Fetch Cycles
-;// </e>
-MAM_SETUP       EQU     1
-MAMCR_Val       EQU     0x00000002
-MAMTIM_Val      EQU     0x00000004
-
-
-; External Memory Controller (EMC) definitions
-EMC_BASE        EQU     0xFFE00000      ; EMC Base Address
-BCFG0_OFS       EQU     0x00            ; BCFG0 Offset
-BCFG1_OFS       EQU     0x04            ; BCFG1 Offset
-BCFG2_OFS       EQU     0x08            ; BCFG2 Offset
-BCFG3_OFS       EQU     0x0C            ; BCFG3 Offset
-
-;// <e> External Memory Controller (EMC)
-EMC_SETUP       EQU     0
-
-;//   <e> Bank Configuration 0 (BCFG0)
-;//     <o1.0..3>   IDCY: Idle Cycles <0-15>
-;//     <o1.5..9>   WST1: Wait States 1 <0-31>
-;//     <o1.11..15> WST2: Wait States 2 <0-31>
-;//     <o1.10>     RBLE: Read Byte Lane Enable
-;//     <o1.26>     WP: Write Protect
-;//     <o1.27>     BM: Burst ROM
-;//     <o1.28..29> MW: Memory Width  <0=>  8-bit  <1=> 16-bit
-;//                                   <2=> 32-bit  <3=> Reserved
-;//   </e>
-BCFG0_SETUP EQU         0
-BCFG0_Val   EQU         0x0000FBEF
-
-;//   <e> Bank Configuration 1 (BCFG1)
-;//     <o1.0..3>   IDCY: Idle Cycles <0-15>
-;//     <o1.5..9>   WST1: Wait States 1 <0-31>
-;//     <o1.11..15> WST2: Wait States 2 <0-31>
-;//     <o1.10>     RBLE: Read Byte Lane Enable
-;//     <o1.26>     WP: Write Protect
-;//     <o1.27>     BM: Burst ROM
-;//     <o1.28..29> MW: Memory Width  <0=>  8-bit  <1=> 16-bit
-;//                                   <2=> 32-bit  <3=> Reserved
-;//   </e>
-BCFG1_SETUP EQU         0
-BCFG1_Val   EQU         0x0000FBEF
-
-;//   <e> Bank Configuration 2 (BCFG2)
-;//     <o1.0..3>   IDCY: Idle Cycles <0-15>
-;//     <o1.5..9>   WST1: Wait States 1 <0-31>
-;//     <o1.11..15> WST2: Wait States 2 <0-31>
-;//     <o1.10>     RBLE: Read Byte Lane Enable
-;//     <o1.26>     WP: Write Protect
-;//     <o1.27>     BM: Burst ROM
-;//     <o1.28..29> MW: Memory Width  <0=>  8-bit  <1=> 16-bit
-;//                                   <2=> 32-bit  <3=> Reserved
-;//   </e>
-BCFG2_SETUP EQU         0
-BCFG2_Val   EQU         0x0000FBEF
-
-;//   <e> Bank Configuration 3 (BCFG3)
-;//     <o1.0..3>   IDCY: Idle Cycles <0-15>
-;//     <o1.5..9>   WST1: Wait States 1 <0-31>
-;//     <o1.11..15> WST2: Wait States 2 <0-31>
-;//     <o1.10>     RBLE: Read Byte Lane Enable
-;//     <o1.26>     WP: Write Protect
-;//     <o1.27>     BM: Burst ROM
-;//     <o1.28..29> MW: Memory Width  <0=>  8-bit  <1=> 16-bit
-;//                                   <2=> 32-bit  <3=> Reserved
-;//   </e>
-BCFG3_SETUP EQU         0
-BCFG3_Val   EQU         0x0000FBEF
-
-;// </e> End of EMC
-
-
-; External Memory Pins definitions
-PINSEL2         EQU     0xE002C014      ; PINSEL2 Address
-PINSEL2_Val     EQU     0x0E6149E4      ; CS0..3, OE, WE, BLS0..3, 
-                                        ; D0..31, A2..23, JTAG Pins
-
-
-                PRESERVE8
-                
-
-; Area Definition and Entry Point
-;  Startup Code must be linked first at Address at which it expects to run.
-
-                AREA    RESET, CODE, READONLY
-                ARM
-
-
-; Exception Vectors
-;  Mapped to Address 0.
-;  Absolute addressing mode must be used.
-;  Dummy Handlers are implemented as infinite loops which can be modified.
-				IMPORT	vPortYieldProcessor
-
-Vectors         LDR     PC, Reset_Addr         
-                LDR     PC, Undef_Addr
-                LDR     PC, SWI_Addr
-                LDR     PC, PAbt_Addr
-                LDR     PC, DAbt_Addr
-                NOP                            ; Reserved Vector 
-;               LDR     PC, IRQ_Addr
-                LDR     PC, [PC, #-0x0FF0]     ; Vector from VicVectAddr
-                LDR     PC, FIQ_Addr
-
-Reset_Addr      DCD     Reset_Handler
-Undef_Addr      DCD     Undef_Handler
-SWI_Addr        DCD     vPortYieldProcessor
-PAbt_Addr       DCD     PAbt_Handler
-DAbt_Addr       DCD     DAbt_Handler
-                DCD     0                      ; Reserved Address 
-IRQ_Addr        DCD     IRQ_Handler
-FIQ_Addr        DCD     FIQ_Handler
-
-Undef_Handler   B       Undef_Handler
-SWI_Handler     B       SWI_Handler
-PAbt_Handler    B       PAbt_Handler
-DAbt_Handler    B       DAbt_Handler
-IRQ_Handler     B       IRQ_Handler
-FIQ_Handler     B       FIQ_Handler
-
-
-; Reset Handler
-
-                EXPORT  Reset_Handler
-Reset_Handler   
-
-
-; Setup External Memory Pins
-                IF      :DEF:EXTERNAL_MODE
-                LDR     R0, =PINSEL2
-                LDR     R1, =PINSEL2_Val
-                STR     R1, [R0]
-                ENDIF
-
-
-; Setup External Memory Controller
-                IF      EMC_SETUP <> 0
-                LDR     R0, =EMC_BASE
-
-                IF      BCFG0_SETUP <> 0
-                LDR     R1, =BCFG0_Val
-                STR     R1, [R0, #BCFG0_OFS]
-                ENDIF
-
-                IF      BCFG1_SETUP <> 0
-                LDR     R1, =BCFG1_Val
-                STR     R1, [R0, #BCFG1_OFS]
-                ENDIF
-
-                IF      BCFG2_SETUP <> 0
-                LDR     R1, =BCFG2_Val
-                STR     R1, [R0, #BCFG2_OFS]
-                ENDIF
-
-                IF      BCFG3_SETUP <> 0
-                LDR     R1, =BCFG3_Val
-                STR     R1, [R0, #BCFG3_OFS]
-                ENDIF
-
-                ENDIF   ; EMC_SETUP
-
-
-; Setup VPBDIV
-                IF      VPBDIV_SETUP <> 0
-                LDR     R0, =VPBDIV
-                LDR     R1, =VPBDIV_Val
-                STR     R1, [R0]
-                ENDIF
-
-
-; Setup PLL
-                IF      PLL_SETUP <> 0
-                LDR     R0, =PLL_BASE
-                MOV     R1, #0xAA
-                MOV     R2, #0x55
-
-;  Configure and Enable PLL
-                MOV     R3, #PLLCFG_Val
-                STR     R3, [R0, #PLLCFG_OFS] 
-                MOV     R3, #PLLCON_PLLE
-                STR     R3, [R0, #PLLCON_OFS]
-                STR     R1, [R0, #PLLFEED_OFS]
-                STR     R2, [R0, #PLLFEED_OFS]
-
-;  Wait until PLL Locked
-PLL_Loop        LDR     R3, [R0, #PLLSTAT_OFS]
-                ANDS    R3, R3, #PLLSTAT_PLOCK
-                BEQ     PLL_Loop
-
-;  Switch to PLL Clock
-                MOV     R3, #(PLLCON_PLLE:OR:PLLCON_PLLC)
-                STR     R3, [R0, #PLLCON_OFS]
-                STR     R1, [R0, #PLLFEED_OFS]
-                STR     R2, [R0, #PLLFEED_OFS]
-                ENDIF   ; PLL_SETUP
-
-
-; Setup MAM
-                IF      MAM_SETUP <> 0
-                LDR     R0, =MAM_BASE
-                MOV     R1, #MAMTIM_Val
-                STR     R1, [R0, #MAMTIM_OFS] 
-                MOV     R1, #MAMCR_Val
-                STR     R1, [R0, #MAMCR_OFS] 
-                ENDIF   ; MAM_SETUP
-
-
-; Memory Mapping (when Interrupt Vectors are in RAM)
-MEMMAP          EQU     0xE01FC040      ; Memory Mapping Control
-                IF      :DEF:REMAP
-                LDR     R0, =MEMMAP
-                IF      :DEF:EXTMEM_MODE
-                MOV     R1, #3
-                ELIF    :DEF:RAM_MODE
-                MOV     R1, #2
-                ELSE
-                MOV     R1, #1
-                ENDIF
-                STR     R1, [R0]
-                ENDIF
-
-
-; Initialise Interrupt System
-;  ...
-
-
-; Setup Stack for each mode
-
-                LDR     R0, =Stack_Top
-
-;  Enter Undefined Instruction Mode and set its Stack Pointer
-                MSR     CPSR_c, #Mode_UND:OR:I_Bit:OR:F_Bit
-                MOV     SP, R0
-                SUB     R0, R0, #UND_Stack_Size
-
-;  Enter Abort Mode and set its Stack Pointer
-                MSR     CPSR_c, #Mode_ABT:OR:I_Bit:OR:F_Bit
-                MOV     SP, R0
-                SUB     R0, R0, #ABT_Stack_Size
-
-;  Enter FIQ Mode and set its Stack Pointer
-                MSR     CPSR_c, #Mode_FIQ:OR:I_Bit:OR:F_Bit
-                MOV     SP, R0
-                SUB     R0, R0, #FIQ_Stack_Size
-
-;  Enter IRQ Mode and set its Stack Pointer
-                MSR     CPSR_c, #Mode_IRQ:OR:I_Bit:OR:F_Bit
-                MOV     SP, R0
-                SUB     R0, R0, #IRQ_Stack_Size
-
-;  Enter Supervisor Mode and set its Stack Pointer
-                MSR     CPSR_c, #Mode_SVC:OR:I_Bit:OR:F_Bit
-                MOV     SP, R0
-                SUB     R0, R0, #SVC_Stack_Size
-
-; Enter the C code
-
-                IMPORT  __main
-                LDR     R0, =__main
-                BX      R0
-
-
-                IF      :DEF:__MICROLIB
-
-                EXPORT  __heap_base
-                EXPORT  __heap_limit
-
-                ELSE
-; User Initial Stack & Heap
-                AREA    |.text|, CODE, READONLY
-
-                IMPORT  __use_two_region_memory
-                EXPORT  __user_initial_stackheap
-__user_initial_stackheap
-
-                LDR     R0, =  Heap_Mem
-                LDR     R1, =(Stack_Mem + USR_Stack_Size)
-                LDR     R2, = (Heap_Mem +      Heap_Size)
-                LDR     R3, = Stack_Mem
-                BX      LR
-                ENDIF
-
-
-                END
--- a/Demo/ARM7_LPC2129_Keil_RVDS/serial/serial.c
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/serial/serial.c
@@ -1,326 +0,0 @@
-/*
-	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.
-*/
-
-
-/* 
-	BASIC INTERRUPT DRIVEN SERIAL PORT DRIVER FOR UART0. 
-
-	Note this driver is used to test the FreeRTOS port.  It is NOT intended to
-	be an example of an efficient implementation!
-*/
-
-/* Standard includes. */
-#include <stdlib.h>
-
-/* Scheduler includes. */
-#include "FreeRTOS.h"
-#include "queue.h"
-#include "task.h"
-
-/* Demo application includes. */
-#include "serial.h"
-
-/*-----------------------------------------------------------*/
-
-/* Constants to setup and access the UART. */
-#define serDLAB							( ( unsigned portCHAR ) 0x80 )
-#define serENABLE_INTERRUPTS			( ( unsigned portCHAR ) 0x03 )
-#define serNO_PARITY					( ( unsigned portCHAR ) 0x00 )
-#define ser1_STOP_BIT					( ( unsigned portCHAR ) 0x00 )
-#define ser8_BIT_CHARS					( ( unsigned portCHAR ) 0x03 )
-#define serFIFO_ON						( ( unsigned portCHAR ) 0x01 )
-#define serCLEAR_FIFO					( ( unsigned portCHAR ) 0x06 )
-#define serWANTED_CLOCK_SCALING			( ( unsigned portLONG ) 16 )
-
-/* Constants to setup and access the VIC. */
-#define serU1VIC_CHANNEL				( ( unsigned portLONG ) 0x0007 )
-#define serU1VIC_CHANNEL_BIT			( ( unsigned portLONG ) 0x0080 )
-#define serU1VIC_ENABLE					( ( unsigned portLONG ) 0x0020 )
-
-/* Misc. */
-#define serINVALID_QUEUE				( ( xQueueHandle ) 0 )
-#define serHANDLE						( ( xComPortHandle ) 1 )
-#define serNO_BLOCK						( ( portTickType ) 0 )
-
-/* Constant to access the VIC. */
-#define serCLEAR_VIC_INTERRUPT			( ( unsigned portLONG ) 0 )
-
-/* Constants to determine the ISR source. */
-#define serSOURCE_THRE					( ( unsigned portCHAR ) 0x02 )
-#define serSOURCE_RX_TIMEOUT			( ( unsigned portCHAR ) 0x0c )
-#define serSOURCE_ERROR					( ( unsigned portCHAR ) 0x06 )
-#define serSOURCE_RX					( ( unsigned portCHAR ) 0x04 )
-#define serINTERRUPT_SOURCE_MASK		( ( unsigned portCHAR ) 0x0f )
-#define serINTERRUPT_IS_PENDING			( ( unsigned portCHAR ) 0x01 )
-
-/*-----------------------------------------------------------*/
-
-/*
- * The asm wrapper for the interrupt service routine.
- */
-extern void vUART_ISREntry( void );
-
-/* 
- * The C function called from the asm wrapper. 
- */
-void vUART_ISRHandler( void );
-
-/*-----------------------------------------------------------*/
-
-/* Queues used to hold received characters, and characters waiting to be
-transmitted. */
-static xQueueHandle xRxedChars; 
-static xQueueHandle xCharsForTx; 
-
-/* Communication flag between the interrupt service routine and serial API. */
-static volatile portLONG lTHREEmpty;
-
-/*-----------------------------------------------------------*/
-
-xComPortHandle xSerialPortInitMinimal( unsigned portLONG ulWantedBaud, unsigned portBASE_TYPE uxQueueLength )
-{
-unsigned portLONG ulDivisor, ulWantedClock;
-xComPortHandle xReturn = serHANDLE;
-
-	/* 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 ) );
-
-	/* Initialise the THRE empty flag. */
-	lTHREEmpty = pdTRUE;
-
-	if( 
-		( xRxedChars != serINVALID_QUEUE ) && 
-		( xCharsForTx != serINVALID_QUEUE ) && 
-		( ulWantedBaud != ( unsigned portLONG ) 0 ) 
-	  )
-	{
-		portENTER_CRITICAL()
-		{
-			/* Setup the baud rate:  Calculate the divisor value. */
-			ulWantedClock = ulWantedBaud * serWANTED_CLOCK_SCALING;
-			ulDivisor = configCPU_CLOCK_HZ / ulWantedClock;
-
-			/* Set the DLAB bit so we can access the divisor. */
-			U1LCR |= serDLAB;
-
-			/* Setup the divisor. */
-			U1DLL = ( unsigned portCHAR ) ( ulDivisor & ( unsigned portLONG ) 0xff );
-			ulDivisor >>= 8;
-			U1DLM = ( unsigned portCHAR ) ( ulDivisor & ( unsigned portLONG ) 0xff );
-
-			/* Turn on the FIFO's and clear the buffers. */
-			U1FCR = ( serFIFO_ON | serCLEAR_FIFO );
-
-			/* Setup transmission format. */
-			U1LCR = serNO_PARITY | ser1_STOP_BIT | ser8_BIT_CHARS;
-
-			/* Setup the VIC for the UART. */
-			VICIntSelect &= ~( serU1VIC_CHANNEL_BIT );
-			VICIntEnable |= serU1VIC_CHANNEL_BIT;
-			VICVectAddr1 = ( unsigned portLONG ) vUART_ISREntry;
-			VICVectCntl1 = serU1VIC_CHANNEL | serU1VIC_ENABLE;
-
-			/* Enable UART0 interrupts. */
-			U1IER |= serENABLE_INTERRUPTS;
-		}
-		portEXIT_CRITICAL();
-	}
-	else
-	{
-		xReturn = ( xComPortHandle ) 0;
-	}
-
-	return xReturn;
-}
-/*-----------------------------------------------------------*/
-
-signed portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, signed portCHAR *pcRxedChar, portTickType xBlockTime )
-{
-	/* The port handle is not required as this driver only supports UART0. */
-	( void ) pxPort;
-
-	/* Get the next character from the buffer.  Return false if no characters
-	are available, or arrive before xBlockTime expires. */
-	if( xQueueReceive( xRxedChars, pcRxedChar, xBlockTime ) )
-	{
-		return pdTRUE;
-	}
-	else
-	{
-		return pdFALSE;
-	}
-}
-/*-----------------------------------------------------------*/
-
-void vSerialPutString( xComPortHandle pxPort, const signed portCHAR * const pcString, unsigned portSHORT usStringLength )
-{
-signed portCHAR *pxNext;
-
-	/* NOTE: This implementation does not handle the queue being full as no
-	block time is used! */
-
-	/* The port handle is not required as this driver only supports UART0. */
-	( void ) pxPort;
-	( void ) usStringLength;
-
-	/* Send each character in the string, one at a time. */
-	pxNext = ( signed portCHAR * ) pcString;
-	while( *pxNext )
-	{
-		xSerialPutChar( pxPort, *pxNext, serNO_BLOCK );
-		pxNext++;
-	}
-}
-/*-----------------------------------------------------------*/
-
-signed portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, signed portCHAR cOutChar, portTickType xBlockTime )
-{
-signed portBASE_TYPE xReturn;
-
-	/* The port handle is not required as this driver only supports UART0. */
-	( void ) pxPort;
-
-	portENTER_CRITICAL();
-	{
-		/* Is there space to write directly to the UART? */
-		if( lTHREEmpty == ( portLONG ) pdTRUE )
-		{
-			/* We wrote the character directly to the UART, so was 
-			successful. */
-			lTHREEmpty = pdFALSE;
-			U1THR = cOutChar;
-			xReturn = pdPASS;
-		}
-		else 
-		{
-			/* We cannot write directly to the UART, so queue the character.
-			Block for a maximum of xBlockTime if there is no space in the
-			queue.  It is ok to block within a critical section as each
-			task has it's own critical section management. */
-			xReturn = xQueueSend( xCharsForTx, &cOutChar, xBlockTime );
-
-			/* Depending on queue sizing and task prioritisation:  While we 
-			were blocked waiting to post interrupts were not disabled.  It is 
-			possible that the serial ISR has emptied the Tx queue, in which
-			case we need to start the Tx off again. */
-			if( lTHREEmpty == ( portLONG ) pdTRUE )
-			{
-				xQueueReceive( xCharsForTx, &cOutChar, serNO_BLOCK );
-				lTHREEmpty = pdFALSE;
-				U1THR = cOutChar;
-			}
-		}
-	}
-	portEXIT_CRITICAL();
-
-	return xReturn;
-}
-/*-----------------------------------------------------------*/
-
-void vUART_ISRHandler( void )
-{
-signed portCHAR cChar;
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
-unsigned portCHAR ucInterrupt;
-
-	ucInterrupt = U1IIR;
-
-	/* The interrupt pending bit is active low. */
-	while( ( ucInterrupt & serINTERRUPT_IS_PENDING ) == 0 )
-	{
-		/* What caused the interrupt? */
-		switch( ucInterrupt & serINTERRUPT_SOURCE_MASK )
-		{
-			case serSOURCE_ERROR :	/* Not handling this, but clear the interrupt. */
-									cChar = U1LSR;
-									break;
-	
-			case serSOURCE_THRE	:	/* The THRE is empty.  If there is another
-									character in the Tx queue, send it now. */
-									if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xHigherPriorityTaskWoken ) == pdTRUE )
-									{
-										U1THR = cChar;
-									}
-									else
-									{
-										/* There are no further characters 
-										queued to send so we can indicate 
-										that the THRE is available. */
-										lTHREEmpty = pdTRUE;
-									}
-									break;
-	
-			case serSOURCE_RX_TIMEOUT :
-			case serSOURCE_RX	:	/* A character was received.  Place it in 
-									the queue of received characters. */
-									cChar = U1RBR;
-									xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );
-									break;
-	
-			default				:	/* There is nothing to do, leave the ISR. */
-									break;
-		}
-
-		ucInterrupt = U1IIR;
-	}
-
-	/* Clear the ISR in the VIC. */
-	VICVectAddr = serCLEAR_VIC_INTERRUPT;
-
-	/* Exit the ISR.  If a task was woken by either a character being received
-	or transmitted then a context switch will occur. */
-	portEXIT_SWITCHING_ISR( xHigherPriorityTaskWoken );
-}
-/*-----------------------------------------------------------*/
-
-
-
-
-
-
-	
--- a/Demo/ARM7_LPC2129_Keil_RVDS/serial/serialISR.s
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/serial/serialISR.s
@@ -1,83 +0,0 @@
-;/*
-;	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.
-;*/
-		
-	INCLUDE portmacro.inc
-	
-	;The UART interrupt entry point is defined within an assembly wrapper
-	;within this file.  This takes care of the task context saving before it
-	;calls the main handler (vUART_ISRHandler()) which is written in C within
-	;serial.c.  The execution of the handler can unblock tasks that were blocked
-	;waiting for UART events.  Once the handler completes the asm wrapper 
-	;finishes off by	restoring the context of whichever task is now selected to 
-	;enter the RUNNING state (which might now be a different task to that which
-	;was originally interrupted.
-	IMPORT vUART_ISRHandler
-	EXPORT vUART_ISREntry
-
-	;/* Interrupt entry must always be in ARM mode. */
-	ARM
-	AREA	|.text|, CODE, READONLY
-
-
-vUART_ISREntry
-
-	PRESERVE8
-
-	; Save the context of the interrupted task.
-	portSAVE_CONTEXT			
-
-	; Call the C handler function - defined within serial.c.
-	LDR R0, =vUART_ISRHandler
-	MOV LR, PC				
-	BX R0
-
-	; Finish off by restoring the context of the task that has been chosen to 
-	; run next - which might be a different task to that which was originally
-	; interrupted.
-	portRESTORE_CONTEXT
-
-	END
--- a/Demo/ARM7_LPC2138_Rowley/FreeRTOSConfig.h
+++ b/Demo/ARM7_LPC2138_Rowley/FreeRTOSConfig.h
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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,11 +62,8 @@
 *
 * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
 * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
- *
- * See http://www.freertos.org/a00110.html.
 *----------------------------------------------------------*/

-
 #define configUSE_PREEMPTION		1
 #define configUSE_IDLE_HOOK			0
 #define configUSE_TICK_HOOK			0
--- a/Demo/ARM7_LPC2138_Rowley/LPC21xx.h
+++ b/Demo/ARM7_LPC2138_Rowley/LPC21xx.h
--- a/Demo/ARM7_LPC2138_Rowley/main.c
+++ b/Demo/ARM7_LPC2138_Rowley/main.c
@@ -1,78 +1,73 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /*
 * This file contains a demo created to execute on the Rowley Associates
 * LPC2138 CrossFire development board.
 *
- * main() creates all the demo application tasks, then starts the scheduler.
- * The WEB documentation provides more details of the standard demo application
+ * main() creates all the demo application tasks, then starts the scheduler.  
+ * The WEB documentation provides more details of the standard demo application 
 * tasks.
- *
- * Main.c also creates a task called "Check".  This only executes every few
- * seconds but has a high priority so is guaranteed to get processor time.
+ * 
+ * Main.c also creates a task called "Check".  This only executes every few 
+ * seconds but has a high priority so is guaranteed to get processor time.  
 * Its function is to check that all the other tasks are still operational.
- * Each standard demo task maintains a unique count that is incremented each
- * time the task successfully completes its function.  Should any error occur
- * within such a task the count is permanently halted.  The check task inspects
- * the count of each task to ensure it has changed since the last time the
- * check task executed.  If all the count variables have changed all the tasks
+ * Each standard demo task maintains a unique count that is incremented each 
+ * time the task successfully completes its function.  Should any error occur 
+ * within such a task the count is permanently halted.  The check task inspects 
+ * the count of each task to ensure it has changed since the last time the 
+ * check task executed.  If all the count variables have changed all the tasks 
 * are still executing error free, and the check task writes "PASS" to the
- * CrossStudio terminal IO window.  Should any task contain an error at any time
+ * CrossStudio terminal IO window.  Should any task contain an error at any time 
 * the error is latched and "FAIL" written to the terminal IO window.
 *
 * Finally, main() sets up an interrupt service routine and task to handle
 * pushes of the button that is built into the CrossFire board.  When the button
 * is pushed the ISR wakes the button task - which generates a table of task
- * status information which is also displayed on the terminal IO window.
+ * status information which is also displayed on the terminal IO window. 
 *
- * A print task is defined to ensure exclusive and consistent access to the
+ * A print task is defined to ensure exclusive and consistent access to the 
 * terminal IO.  This is the only task that is allowed to access the terminal.
- * The check and button task therefore do not access the terminal directly but
+ * The check and button task therefore do not access the terminal directly but 
 * instead pass a pointer to the message they wish to display to the print task.
 */

@@ -81,7 +76,7 @@

 /* Scheduler includes. */
 #include "FreeRTOS.h"
-#include "task.h"
+#include "Task.h"
 #include "queue.h"
 #include "semphr.h"

@@ -93,7 +88,6 @@
 #include "PollQ.h"
 #include "blocktim.h"
 #include "recmutex.h"
-#include "semtest.h"

 /* Hardware configuration definitions. */
 #define mainBUS_CLK_FULL					( ( unsigned portCHAR ) 0x01 )
@@ -128,7 +122,7 @@
 handler. */
 xSemaphoreHandle xButtonSemaphore;

-/* The queue that is used to send message to vPrintTask for display in the
+/* The queue that is used to send message to vPrintTask for display in the 
 terminal output window. */
 xQueueHandle xPrintQueue;

@@ -190,7 +184,7 @@ int main( void )

 	#if configUSE_PREEMPTION == 1
 	{
-		/* The timing of console output when not using the preemptive
+		/* The timing of console output when not using the preemptive 
 		scheduler causes the block time tests to detect a timing problem. */
 		vCreateBlockTimeTasks();
 	}
@@ -259,22 +253,22 @@ const portCHAR * const pcFailMessage = "FAIL\n";
 		{
 			xErrorOccurred = pdTRUE;
 		}
-
+	
 		if( xArePollingQueuesStillRunning() != pdTRUE )
 		{
 			xErrorOccurred = pdTRUE;
 		}
-
+	
 		if( xAreSemaphoreTasksStillRunning() != pdTRUE )
 		{
 			xErrorOccurred = pdTRUE;
 		}
-
+	
 		if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )
 		{
 			xErrorOccurred = pdTRUE;
 		}
-
+	
 		if( xAreBlockingQueuesStillRunning() != pdTRUE )
 		{
 			xErrorOccurred = pdTRUE;
@@ -282,7 +276,7 @@ const portCHAR * const pcFailMessage = "FAIL\n";

 		#if configUSE_PREEMPTION == 1
 		{
-			/* The timing of console output when not using the preemptive
+			/* The timing of console output when not using the preemptive 
 			scheduler causes the block time tests to detect a timing problem. */
 			if( xAreBlockTimeTestTasksStillRunning() != pdTRUE )
 			{
@@ -336,10 +330,10 @@ const portCHAR * const pcHeader = "\nTask          State  Priority  Stack	#\n***
 extern void (vButtonISRWrapper) ( void );

 	/* Configure the interrupt. */
-	portENTER_CRITICAL();
+	portENTER_CRITICAL();	
 	{
 		/* Configure P0.14 to generate interrupts. */
-		PINSEL0 |= mainP0_14__EINT_1;
+		PINSEL0 |= mainP0_14__EINT_1; 
 		EXTMODE = mainEINT_1_EDGE_SENSITIVE;
 		EXTPOLAR = mainEINT_1_FALLING_EDGE_SENSITIVE;

--- a/Demo/ARM7_LPC2138_Rowley/mainISR.c
+++ b/Demo/ARM7_LPC2138_Rowley/mainISR.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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"
 #include "semphr.h"
@@ -62,11 +57,8 @@ void vButtonHandler( void );
 void vButtonHandler( void )
 {
 extern xSemaphoreHandle xButtonSemaphore;
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;

-	xSemaphoreGiveFromISR( xButtonSemaphore, &xHigherPriorityTaskWoken );
-
-	if( xHigherPriorityTaskWoken )
+	if( xSemaphoreGiveFromISR( xButtonSemaphore, pdFALSE ) )
 	{
 		/* We have woken a task.  Calling "yield from ISR" here will ensure
 		the interrupt returns to the woken task if it has a priority higher
--- a/Demo/ARM7_LPC2138_Rowley/threads.js
+++ b/Demo/ARM7_LPC2138_Rowley/threads.js
@@ -3,8 +3,14 @@ function decode_stack(sp)
  var i;
  var a = new Array();

-  sp += 4; /* skip stored ulCriticalNesting */
+  var current_task;

+  current_task = Debug.evaluate("pxCurrentTCB");
+
+  if( current_task == 0 )
+    return;
+
+  sp += 4; /* skip stored ulCriticalNesting */
  a[16] = Debug.evaluate("*(unsigned long*)" + sp); 

  for (i = 0; i <= 15; i++)
@@ -18,44 +24,42 @@ function decode_stack(sp)

 function add_task(task, state)
 {
-  var tcb, task_name, current_task, regs;
+  var tcb, task_name;
+
+  var current_task;

  current_task = Debug.evaluate("pxCurrentTCB");
+
+  if( current_task == 0 )
+    return;
+
  tcb = Debug.evaluate("*(tskTCB *)" + task);
-
  task_name = Debug.evaluate("(char*)&(*(tskTCB *)" + task + ").pcTaskName[0]");
-  task_name = "#" + tcb.uxTCBNumber + " \"" + task_name + "\"";
-
-  if (task == current_task)
-  {
-    state = "executing";
-    regs = [];
-  }
-  else
-  {
-    regs = decode_stack(tcb.pxTopOfStack);
-  }
-
-  Threads.add(task_name, tcb.uxPriority, state, regs);
+  Threads.add("#" + tcb.uxTCBNumber + " \"" + task_name + "\"", tcb.uxPriority, state, decode_stack(tcb.pxTopOfStack));
 }

-function add_list(list, state)
+function add_list(list, state, current_task)
 {
-  var i, index, item, task;
+  var i, index, item, end;
+  var current_task;

-  if (list && list.uxNumberOfItems>0)
+  current_task = Debug.evaluate("pxCurrentTCB");
+
+  if( current_task == 0 )
+    return;
+
+  if (list.uxNumberOfItems)
  {
-    index = list.xListEnd.pxNext;
-
+    index = list.pxIndex;
+    end = list.xListEnd;
    for (i = 0; i < list.uxNumberOfItems; i++)
    {
      item = Debug.evaluate("*(xListItem *)" + index);
-
-      task = item ? item.pvOwner : 0;
-
-      if (task)
-        add_task(task, state);
-
+      if (index != end)
+      {
+        task = item.pvOwner;
+        if (task) add_task(task, (task == current_task) ? "executing" : state);
+      }
      index = item.pxNext;
    }
  }
@@ -63,43 +67,52 @@ function add_list(list, state)

 function update() 
 {
-  var i, list, lists, max_priority;
+  var i, current_task, list, lists, max_priority;

  Threads.clear();

-  if( Debug.evaluate("pxCurrentTCB") == 0 )
+  current_task = Debug.evaluate("pxCurrentTCB");
+
+  if( current_task == 0 )
    return;

-  max_priority = Debug.evaluate("uxTopUsedPriority");
-
  Threads.newqueue("Ready");
-  for (i = max_priority; i >= 0; i--)
-  {
-     list = Debug.evaluate("pxReadyTasksLists[" + i + "]");
-     add_list(list, "ready");
+  lists = Debug.evaluate("pxReadyTasksLists");
+  if (lists)
+  { 
+    max_priority = Debug.evaluate("uxTopUsedPriority");
+    max_priority = Debug.evaluate("*(long *)" + max_priority);
+
+    for (i = 0; i <= max_priority; i++)
+    {
+      list = Debug.evaluate("((xList*)" + lists + ")[" + (max_priority - i) + "]");
+      add_list(list, "ready", current_task);
+    }
  }

  Threads.newqueue("Blocked");
+
  list = Debug.evaluate("pxDelayedTaskList");
  if (list)
  {
-    list = Debug.evaluate("*(xList *)" + list);
+    list = Debug.evaluate("**(xList **)" + list);
    add_list(list, "blocked");
  }

  list = Debug.evaluate("pxOverflowDelayedTaskList");
  if (list)
  {
-    list = Debug.evaluate("*(xList *)" + list);
+    list = Debug.evaluate("**(xList **)" + list);
    add_list(list, "blocked");
  }

  Threads.newqueue("Suspended");
+
  list = Debug.evaluate("xSuspendedTaskList");
  if (list)
  {
+    list = Debug.evaluate("*(xList *)" + list);
    add_list(list, "suspended");
  }
-
 }

--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/FreeRTOSConfig.h
@@ -1,48 +1,33 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS V4.6.1 - Copyright (C) 2003-2005 Richard Barry.

 	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 as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

 	***************************************************************************
-	*                                                                         *
-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *
-	* See http://www.FreeRTOS.org/Documentation for details                   *
-	*                                                                         *
+	See http://www.FreeRTOS.org for documentation, latest information, license 
+	and contact details.  Please ensure to read the configuration and relevant 
+	port sections of the online documentation.
 	***************************************************************************
-
-	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.
 */

 #ifndef FREERTOS_CONFIG_H
@@ -50,7 +35,6 @@

 #include <stdio.h>
 #include "lpc23xx.h"
-
 /*-----------------------------------------------------------
 * Application specific definitions.
 *
@@ -59,8 +43,6 @@
 *
 * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
 * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
- *
- * See http://www.freertos.org/a00110.html.
 *----------------------------------------------------------*/

 /* Value to use on old rev '-' devices. */
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/LCD/portlcd.c
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/LCD/portlcd.c
@@ -21,7 +21,7 @@

 #include "portlcd.h"
 #include "FreeRTOS.h"
-#include "task.h"
+#include "Task.h"

 /* Please note, on old MCB2300 board, the LCD_E bit is p1.30, on the new board
 it's p1.31, please check the schematic carefully, and change LCD_CTRL and LCD_E 
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/LPC23xx.h
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/LPC23xx.h
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/Makefile
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/Makefile
@@ -1,49 +1,32 @@
-#/*
-#	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+#	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.
 #
-#	This file is part of the FreeRTOS distribution.
+#	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+#	it under the terms of the GNU General Public License as published by
+#	the Free Software Foundation; either version 2 of the License, or
+#	(at your option) any later version.
 #
-#	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-#	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.org is distributed in the hope that it will be useful,
+#	but WITHOUT 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.org; if not, write to the Free Software
+#	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
+#	A special exception to the GPL can be applied should you wish to distribute
+#	a combined work that includes FreeRTOS.org, without being obliged to provide
+#	the source code for any proprietary components.  See the licensing section 
+#	of http://www.FreeRTOS.org for full details of how and when the exception
+#	can be applied.
 #
 #	***************************************************************************
-#	*                                                                         *
-#	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *
-#	* See http://www.FreeRTOS.org/Documentation for details                   *
-#	*                                                                         *
+#	See http://www.FreeRTOS.org for documentation, latest information, license 
+#	and contact details.  Please ensure to read the configuration and relevant 
+#	port sections of the online documentation.
 #	***************************************************************************
-#
-#	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.
-#*/


 RTOS_SOURCE_DIR=../../../Source
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/ParTest/ParTest.c
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/ParTest/ParTest.c
@@ -1,48 +1,33 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

 	***************************************************************************
-	*                                                                         *
-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *
-	* See http://www.FreeRTOS.org/Documentation for details                   *
-	*                                                                         *
+	See http://www.FreeRTOS.org for documentation, latest information, license 
+	and contact details.  Please ensure to read the configuration and relevant 
+	port sections of the online documentation.
 	***************************************************************************
-
-	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.
 */

 /* FreeRTOS.org includes. */
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/boot.s
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/boot.s
@@ -47,7 +47,7 @@ _mainCRTStartup:
 	for system/user, SWI and IRQ modes.   Also each mode is setup with
 	interrupts initially disabled. */
    ldr   r0, .LC6
-    msr   CPSR_c, #MODE_UND|I_BIT|F_BIT /* Undefined Instruction Mode */
+    msr   CPSR_c, #MODE_UND|I_BIT|F_BIT /* Undefined Instruction Mode
    mov   sp, r0
    sub   r0, r0, #UND_STACK_SIZE
    msr   CPSR_c, #MODE_ABT|I_BIT|F_BIT /* Abort Mode */
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/lpc2368.ld
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/lpc2368.ld
@@ -42,7 +42,6 @@ SECTIONS
 	_end.  Align after .bss to ensure correct alignment even if the
 	.bss section disappears because there are no input sections.  */
 	. = ALIGN(32 / 8);
-	_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;

 	.usbram (NOLOAD):
 	{
@@ -62,7 +61,7 @@ SECTIONS
 }
 	. = ALIGN(32 / 8);
 	_end = .;
-	
+	_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
 	PROVIDE (end = .);


--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /*
@@ -70,7 +65,7 @@

 /* Scheduler includes. */
 #include "FreeRTOS.h"
-#include "task.h"
+#include "Task.h"
 #include "queue.h"
 #include "semphr.h"

@@ -174,7 +169,6 @@ void vApplicationTickHook( void )
 unsigned portBASE_TYPE uxColumn = 0;
 static xLCDMessage xMessage = { 0, "PASS" };
 static unsigned portLONG ulTicksSinceLastDisplay = 0;
-static portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;

 	/* Called from every tick interrupt.  Have enough ticks passed to make it
 	time to perform our health status check again? */
@@ -213,8 +207,7 @@ static portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
        xMessage.xColumn++;

 		/* Send the message to the LCD gatekeeper for display. */
-		xHigherPriorityTaskWoken = pdFALSE;
-		xQueueSendToBackFromISR( xLCDQueue, &xMessage, &xHigherPriorityTaskWoken );
+		xQueueSendToBackFromISR( xLCDQueue, &xMessage, pdFALSE );
 	}
 }
 /*-----------------------------------------------------------*/
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/EMAC_ISR.c
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/EMAC_ISR.c
@@ -1,6 +1,6 @@
 #include "FreeRTOS.h"
-#include "semphr.h"
-#include "task.h"
+#include "Semphr.h"
+#include "Task.h"

 /* The interrupt entry point. */
 void vEMAC_ISR_Wrapper( void ) __attribute__((naked));
@@ -13,16 +13,14 @@ extern xSemaphoreHandle xEMACSemaphore;

 void vEMAC_ISR_Handler( void )
 {
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
+portBASE_TYPE xSwitchRequired = pdFALSE;

    /* Clear the interrupt. */
    MAC_INTCLEAR = 0xffff;
    VICVectAddr = 0;

    /* Ensure the uIP task is not blocked as data has arrived. */
-    xSemaphoreGiveFromISR( xEMACSemaphore, &xHigherPriorityTaskWoken );
-
-	if( xHigherPriorityTaskWoken )
+    if( xSemaphoreGiveFromISR( xEMACSemaphore, pdFALSE ) )
    {
    	/* Giving the semaphore woke a task. */
        portYIELD_FROM_ISR();
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/emac.c
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/emac.c
@@ -18,9 +18,9 @@
 /* Adapted from file originally written by Andreas Dannenberg.  Supplied with permission. */

 #include "FreeRTOS.h"
-#include "semphr.h" 
+#include "Semphr.h" 
 #include "task.h"
-#include "emac.h"
+#include "EMAC.h"

 /* The semaphore used to wake the uIP task when data arives. */
 xSemaphoreHandle xEMACSemaphore = NULL;
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/httpd-cgi.c
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/httpd-cgi.c
@@ -235,7 +235,7 @@ extern unsigned long uxParTextGetLED( unsigned long uxLED );

 static unsigned short generate_io_state( void *arg )
 {
-	for( ulString = 0; ulString < 3; ulString++ )
+	for( ulString = 0; ulString < 4; ulString++ )
 	{
 		if( uxParTextGetLED( ulString + 5 ) )
 		{
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/uIP_Task.c
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/uIP_Task.c
@@ -1,48 +1,33 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

 	***************************************************************************
-	*                                                                         *
-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *
-	* See http://www.FreeRTOS.org/Documentation for details                   *
-	*                                                                         *
+	See http://www.FreeRTOS.org for documentation, latest information, license
+	and contact details.  Please ensure to read the configuration and relevant
+	port sections of the online documentation.
 	***************************************************************************
-
-	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.
 */
 /* Standard includes. */
 #include <string.h>
--- a/Demo/ARM7_LPC2368_Rowley/FreeRTOSConfig.h
+++ b/Demo/ARM7_LPC2368_Rowley/FreeRTOSConfig.h
@@ -1,48 +1,33 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS V4.6.1 - Copyright (C) 2003-2005 Richard Barry.

 	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 as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

 	***************************************************************************
-	*                                                                         *
-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *
-	* See http://www.FreeRTOS.org/Documentation for details                   *
-	*                                                                         *
+	See http://www.FreeRTOS.org for documentation, latest information, license 
+	and contact details.  Please ensure to read the configuration and relevant 
+	port sections of the online documentation.
 	***************************************************************************
-
-	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.
 */

 #ifndef FREERTOS_CONFIG_H
@@ -51,7 +36,6 @@
 #include <stdio.h>
 #include <targets/LPC2368.h>
 #define vPortYieldProcessor swi_handler
-
 /*-----------------------------------------------------------
 * Application specific definitions.
 *
@@ -60,11 +44,8 @@
 *
 * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
 * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
- *
- * See http://www.freertos.org/a00110.html.
 *----------------------------------------------------------*/

-
 /* Value to use on old rev '-' devices. */
 //#define configPINSEL2_VALUE	0x50151105

--- a/Demo/ARM7_LPC2368_Rowley/LCD/portlcd.c
+++ b/Demo/ARM7_LPC2368_Rowley/LCD/portlcd.c
@@ -22,7 +22,7 @@
 #include <targets/LPC2368.h>
 #include "portlcd.h"
 #include "FreeRTOS.h"
-#include "task.h"
+#include "Task.h"

 /* Please note, on old MCB2300 board, the LCD_E bit is p1.30, on the new board
 it's p1.31, please check the schematic carefully, and change LCD_CTRL and LCD_E 
--- a/Demo/ARM7_LPC2368_Rowley/ParTest/ParTest.c
+++ b/Demo/ARM7_LPC2368_Rowley/ParTest/ParTest.c
@@ -1,48 +1,33 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

 	***************************************************************************
-	*                                                                         *
-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *
-	* See http://www.FreeRTOS.org/Documentation for details                   *
-	*                                                                         *
+	See http://www.FreeRTOS.org for documentation, latest information, license 
+	and contact details.  Please ensure to read the configuration and relevant 
+	port sections of the online documentation.
 	***************************************************************************
-
-	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.
 */

 /* FreeRTOS.org includes. */
--- a/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs
+++ b/Demo/ARM7_LPC2368_Rowley/RTOSDemo.hzs
@@ -5,21 +5,21 @@
 </Autos>
 <Bookmarks/>
 <Breakpoints>
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="D_Abort" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="FIQ" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="IRQ" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="P_Abort" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="Reset" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="SWI" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="Undef" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="BusFault" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="ExceptionEntryReturnFault" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="HardFault" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="MemManage" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="Reset" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="UsageFault_CheckingError" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="UsageFault_Coprocessor" filename="" />
-  <BreakpointListItem actiontype="0" chainFrom="" line="-1" defaultBreakType="true" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="UsageFault_StateError" filename="" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="D_Abort" filename="" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="FIQ" filename="" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="IRQ" filename="" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="P_Abort" filename="" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="Reset" filename="" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="SWI" filename="" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="Undef" filename="" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="BusFault" filename="" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="ExceptionEntryReturnFault" filename="" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="HardFault" filename="" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="MemManage" filename="" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="Reset" filename="" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="UsageFault_CheckingError" filename="" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="UsageFault_Coprocessor" filename="" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="Cortex-M3 Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="UsageFault_StateError" filename="" />
 </Breakpoints>
 <ExecutionCountWindow/>
 <Memory1>
@@ -34,29 +34,22 @@
 <Memory4>
  <MemoryWindow autoEvaluate="0" addressText="" numColumns="8" sizeText="" dataSize="1" radix="16" addressSpace="" />
 </Memory4>
- <MemoryUsageWindow>
-  <ProjectSessionItem path="RTOSDemo" name="unnamed" />
-  <ProjectSessionItem path="RTOSDemo;RTOSDemo" name="unnamed" />
-  <ProjectSessionItem path="RTOSDemo;RTOSDemo;Demo Source" name="unnamed" />
-  <ProjectSessionItem path="RTOSDemo;RTOSDemo;uIP Source" name="unnamed" />
- </MemoryUsageWindow>
 <Project>
  <ProjectSessionItem path="RTOSDemo" name="unnamed" />
  <ProjectSessionItem path="RTOSDemo;RTOSDemo" name="unnamed" />
  <ProjectSessionItem path="RTOSDemo;RTOSDemo;Demo Source" name="unnamed" />
-  <ProjectSessionItem path="RTOSDemo;RTOSDemo;uIP Source" name="unnamed" />
 </Project>
 <Register1>
-  <RegisterWindow openNodes="" binaryNodes="" unsignedNodes="" visibleGroups="CPU - Current Mode" decimalNodes="" octalNodes="" asciiNodes="" />
+  <RegisterWindow unsignedDisplays="" asciiDisplays="" octalDisplays="" openGroups="CPU - Current Mode" visibleGroups="CPU - Current Mode" decimalDisplays="" binaryDisplays="" />
 </Register1>
 <Register2>
-  <RegisterWindow openNodes="" binaryNodes="" unsignedNodes="" visibleGroups="CPU - Current Mode" decimalNodes="" octalNodes="" asciiNodes="" />
+  <RegisterWindow unsignedDisplays="" asciiDisplays="" octalDisplays="" openGroups="CPU - Current Mode" visibleGroups="CPU - Current Mode" decimalDisplays="" binaryDisplays="" />
 </Register2>
 <Register3>
-  <RegisterWindow openNodes="" binaryNodes="" unsignedNodes="" visibleGroups="" decimalNodes="" octalNodes="" asciiNodes="" />
+  <RegisterWindow unsignedDisplays="" asciiDisplays="" octalDisplays="" openGroups="" visibleGroups="" decimalDisplays="" binaryDisplays="" />
 </Register3>
 <Register4>
-  <RegisterWindow openNodes="" binaryNodes="" unsignedNodes="" visibleGroups="" decimalNodes="" octalNodes="" asciiNodes="" />
+  <RegisterWindow unsignedDisplays="" asciiDisplays="" octalDisplays="" openGroups="" visibleGroups="" decimalDisplays="" binaryDisplays="" />
 </Register4>
 <SourceNavigatorWindow/>
 <TraceWindow>
@@ -76,11 +69,6 @@
   <Watchpoint linenumber="0" radix="-1" name="xStart" expression="xStart" filename="" />
  </Watches>
 </Watch4>
- <Files>
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\FreeRTOSConfig.h" y="72" path="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\FreeRTOSConfig.h" left="0" selected="0" name="unnamed" top="47" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\main.c" y="117" path="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\main.c" left="0" selected="0" name="unnamed" top="80" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="27" debugPath="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\webserver\uIP_Task.c" y="261" path="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\webserver\uIP_Task.c" left="0" selected="0" name="unnamed" top="225" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="33" debugPath="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\webserver\emac.c" y="7" path="C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\ARM7_LPC2368_Rowley\webserver\emac.c" left="0" selected="1" name="unnamed" top="0" />
- </Files>
- <ARMCrossStudioWindow activeProject="RTOSDemo" autoConnectTarget="/USB CrossConnect for ARM-RTCK" debugSearchFileMap="" fileDialogInitialDirectory="C:\E\Dev\FreeRTOS\Demo\ARM7_LPC2368_Rowley\webserver" fileDialogDefaultFilter="*.cpp;*.cxx;*.cc;*.c;*.h;*.hpp;*.hxx" autoConnectCapabilities="1407" debugSearchPath="" buildConfiguration="ARM Flash Debug" />
+ <Files/>
+ <ARMCrossStudioWindow activeProject="RTOSDemo" autoConnectTarget="/USB CrossConnect for ARM" debugSearchFileMap="" fileDialogInitialDirectory="C:\E\Dev\FreeRTOS\Demo\ARM7_LPC2368_Rowley\webserver" fileDialogDefaultFilter="*.cpp;*.cxx;*.cc;*.c;*.h" autoConnectCapabilities="1407" debugSearchPath="" buildConfiguration="ARM Flash Debug" />
 </session>
--- a/Demo/ARM7_LPC2368_Rowley/main.c
+++ b/Demo/ARM7_LPC2368_Rowley/main.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /* Environment includes. */
@@ -50,7 +45,7 @@

 /* Scheduler includes. */
 #include "FreeRTOS.h"
-#include "task.h"
+#include "Task.h"
 #include "queue.h"
 #include "semphr.h"

@@ -63,7 +58,7 @@
 #include "flash.h"
 #include "partest.h"
 #include "semtest.h"
-#include "PollQ.h"
+#include "pollq.h"

 /* Demo application definitions. */
 #define mainQUEUE_SIZE						( 3 )
--- a/Demo/ARM7_LPC2368_Rowley/webserver/EMAC_ISR.c
+++ b/Demo/ARM7_LPC2368_Rowley/webserver/EMAC_ISR.c
@@ -1,6 +1,6 @@
 #include "FreeRTOS.h"
-#include "semphr.h"
-#include "task.h"
+#include "Semphr.h"
+#include "Task.h"

 /* The interrupt entry point. */
 void vEMAC_ISR_Wrapper( void ) __attribute__((naked));
@@ -13,16 +13,12 @@ extern xSemaphoreHandle xEMACSemaphore;

 void vEMAC_ISR_Handler( void )
 {
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
-
    /* Clear the interrupt. */
    IntClear = 0xffff;
    VICVectAddr = 0;

    /* Ensure the uIP task is not blocked as data has arrived. */
-    xSemaphoreGiveFromISR( xEMACSemaphore, &xHigherPriorityTaskWoken );
-
-	if( xHigherPriorityTaskWoken )
+    if( xSemaphoreGiveFromISR( xEMACSemaphore, pdFALSE ) )
    {
 		/* If the uIP task was unblocked then calling "Yield from ISR" here
 		will ensure the interrupt returns directly to the uIP task, if it
--- a/Demo/ARM7_LPC2368_Rowley/webserver/emac.c
+++ b/Demo/ARM7_LPC2368_Rowley/webserver/emac.c
@@ -18,9 +18,9 @@
 /* Adapted from file originally written by Andreas Dannenberg.  Supplied with permission. */

 #include "FreeRTOS.h"
-#include "semphr.h" 
+#include "Semphr.h" 
 #include "task.h"
-#include "emac.h"
+#include "EMAC.h"

 /* The semaphore used to wake the uIP task when data arives. */
 xSemaphoreHandle xEMACSemaphore = NULL;
@@ -133,7 +133,7 @@ static portBASE_TYPE xAttempt = 0;

  /* Power Up the EMAC controller. */
  PCONP |= 0x40000000;
-  vTaskDelay( 10 );
+  vTaskDelay( 1 );

  /* Reset all EMAC internal modules. */
  MAC1 = MAC1_RES_TX | MAC1_RES_MCS_TX | MAC1_RES_RX | MAC1_RES_MCS_RX |
@@ -141,7 +141,7 @@ static portBASE_TYPE xAttempt = 0;
  Command = CR_REG_RES | CR_TX_RES | CR_RX_RES;

  /* A short delay after reset. */
-  vTaskDelay( 10 );
+  vTaskDelay( 1 );

  /* Initialize MAC control registers. */
  MAC1 = MAC1_PASS_ALL;
@@ -163,7 +163,7 @@ static portBASE_TYPE xAttempt = 0;

  /* Wait for hardware reset to end. */
  for (tout = 0; tout < 100; tout++) {
-    vTaskDelay( 200 );
+    vTaskDelay( 10 );
    regv = read_PHY (PHY_REG_BMCR);
    if (!(regv & 0x8000)) {
      /* Reset complete */
@@ -181,7 +181,7 @@ static portBASE_TYPE xAttempt = 0;
    write_PHY (PHY_REG_BMCR, PHY_AUTO_NEG);
    /* Wait to complete Auto_Negotiation. */
    for (tout = 0; tout < 10; tout++) {
-      vTaskDelay( 200 );
+      vTaskDelay( 100 );
      regv = read_PHY (PHY_REG_BMSR);
      if (regv & 0x0020) {
        /* Autonegotiation Complete. */
@@ -199,7 +199,7 @@ static portBASE_TYPE xAttempt = 0;
  {
    xReturn = pdFAIL;
    for (tout = 0; tout < 10; tout++) {
-      vTaskDelay( 200 );
+      vTaskDelay( 100 );
      regv = read_PHY (PHY_REG_STS);
      if (regv & 0x0001) {
        /* Link is on. */
--- a/Demo/ARM7_LPC2368_Rowley/webserver/httpd-fs/image.jpg
+++ b/Demo/ARM7_LPC2368_Rowley/webserver/httpd-fs/image.jpg
--- a/Demo/ARM7_LPC2368_Rowley/webserver/httpd-fs/index.shtml
+++ b/Demo/ARM7_LPC2368_Rowley/webserver/httpd-fs/index.shtml
@@ -3,14 +3,14 @@
  <head>
    <title>FreeRTOS.org uIP WEB server demo</title>
  </head>
-  <BODY onLoad="window.setTimeout(&quot;location.href='index.shtml'&quot;,2000)">
+  <BODY onLoad="window.setTimeout(&quot;location.href='index.shtml'&quot;,2000)"bgcolor="#CCCCff">
 <font face="arial">
-<a href="index.shtml">RTOS Stats</a> <b>|</b> <a href="image.jpg">65K JPG</a> <b>|</b> <a href="tcp.shtml">Connections</a> <b>|</b> <a href="io.shtml">IO</a>
+<a href="index.shtml">RTOS Stats</a> <b>|</b> <a href="stats.shtml">TCP Stats</a> <b>|</b> <a href="tcp.shtml">Connections</a> <b>|</b> <a href="http://www.freertos.org/">FreeRTOS.org Homepage</a> <b>|</b> <a href="io.shtml">IO</a>
 <br><p>
 <hr>
 <br><p>
 <h2>Task statistics</h2>
-This page shows dynamically generated task state information.  The page will refresh evey 2 seconds.<p>
+Page will refresh evey 2 seconds.<p>
 <font face="courier"><pre>Task          State  Priority  Stack	#<br>************************************************<br>
 %! rtos-stats
 </pre></font>
--- a/Demo/ARM7_LPC2368_Rowley/webserver/httpd-fs/io.shtml
+++ b/Demo/ARM7_LPC2368_Rowley/webserver/httpd-fs/io.shtml
@@ -3,15 +3,15 @@
  <head>
    <title>FreeRTOS.org uIP WEB server demo</title>
  </head>
-  <BODY>
+  <BODY bgcolor="#CCCCff">
 <font face="arial">
-<a href="index.shtml">RTOS Stats</a> <b>|</b> <a href="image.jpg">65K JPG</a> <b>|</b> <a href="tcp.shtml">Connections</a> <b>|</b> <a href="io.shtml">IO</a>
+<a href="index.shtml">RTOS Stats</a> <b>|</b> <a href="stats.shtml">TCP Stats</a> <b>|</b> <a href="tcp.shtml">Connections</a> <b>|</b> <a href="http://www.freertos.org/">FreeRTOS.org Homepage</a> <b>|</b> <a href="io.shtml">IO</a>
 <br><p>
 <hr>
 <b>LED and LCD IO</b><br>

 <p>
-This page demonstrates two way communication.  By using the check boxes and text boxes this WEB interface can influence the program execution.<p>
+
 Use the check boxes to select the LED's to turn on or off, enter text to display on the LCD, then click "Update IO".


--- a/Demo/ARM7_LPC2368_Rowley/webserver/httpd-fs/tcp.shtml
+++ b/Demo/ARM7_LPC2368_Rowley/webserver/httpd-fs/tcp.shtml
@@ -3,14 +3,13 @@
  <head>
    <title>FreeRTOS.org uIP WEB server demo</title>
  </head>
-  <BODY>
+  <BODY bgcolor="#CCCCff">
 <font face="arial">
-<a href="index.shtml">RTOS Stats</a> <b>|</b> <a href="image.jpg">65K JPG</a> <b>|</b> <a href="tcp.shtml">Connections</a> <b>|</b> <a href="io.shtml">IO</a>
+<a href="index.shtml">RTOS Stats</a> <b>|</b> <a href="stats.shtml">TCP Stats</a> <b>|</b> <a href="tcp.shtml">Connections</a> <b>|</b> <a href="http://www.freertos.org/">FreeRTOS.org Homepage</a> <b>|</b> <a href="io.shtml">IO</a>
 <br><p>
 <hr>
 <br>
 <h2>Network connections</h2>
-This page displays dynamically generated status information on the TCP/IP connections.
 <p>
 <table>
 <tr><th>Local</th><th>Remote</th><th>State</th><th>Retransmissions</th><th>Timer</th><th>Flags</th></tr>
--- a/Demo/ARM7_LPC2368_Rowley/webserver/httpd-fsdata.c
+++ b/Demo/ARM7_LPC2368_Rowley/webserver/httpd-fsdata.c
--- a/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c
+++ b/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c
@@ -1,48 +1,33 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

 	***************************************************************************
-	*                                                                         *
-	* Looking for a quick start?  Then check out the FreeRTOS eBook!          *
-	* See http://www.FreeRTOS.org/Documentation for details                   *
-	*                                                                         *
+	See http://www.FreeRTOS.org for documentation, latest information, license
+	and contact details.  Please ensure to read the configuration and relevant
+	port sections of the online documentation.
 	***************************************************************************
-
-	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.
 */
 /* Standard includes. */
 #include <string.h>
@@ -74,13 +59,13 @@
 #define uipMAC_ADDR5	0x11

 /* IP address configuration. */
-#define uipIP_ADDR0		192
-#define uipIP_ADDR1		168
-#define uipIP_ADDR2		0
-#define uipIP_ADDR3		200	
+#define uipIP_ADDR0		172
+#define uipIP_ADDR1		25
+#define uipIP_ADDR2		218
+#define uipIP_ADDR3		10	

 /* How long to wait before attempting to connect the MAC again. */
-#define uipINIT_WAIT    200
+#define uipINIT_WAIT    100

 /* Shortcut to the header within the Rx buffer. */
 #define xHeader ((struct uip_eth_hdr *) &uip_buf[ 0 ])
@@ -245,17 +230,6 @@ static void prvENET_Send(void)
    }

    DoSend_EMAC( uip_len );
-
-    RequestSend();
-
-    /* Copy the header into the Tx buffer. */
-    CopyToFrame_EMAC( uip_buf, uipTOTAL_FRAME_HEADER_SIZE );
-    if( uip_len > uipTOTAL_FRAME_HEADER_SIZE )
-    {
-        CopyToFrame_EMAC( uip_appdata, ( uip_len - uipTOTAL_FRAME_HEADER_SIZE ) );
-    }
-
-    DoSend_EMAC( uip_len );
 }
 /*-----------------------------------------------------------*/

--- a/Demo/ARM7_STR71x_IAR/FreeRTOSConfig.h
+++ b/Demo/ARM7_STR71x_IAR/FreeRTOSConfig.h
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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
@@ -55,12 +50,9 @@
 * application requirements.
 *
 * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
- *
- * See http://www.freertos.org/a00110.html.
+ * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
 *----------------------------------------------------------*/

-
 #define configUSE_PREEMPTION		1
 #define configUSE_IDLE_HOOK			0
 #define configUSE_TICK_HOOK			0
--- a/Demo/ARM7_STR71x_IAR/ParTest/ParTest.c
+++ b/Demo/ARM7_STR71x_IAR/ParTest/ParTest.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /* Library includes. */
--- a/Demo/ARM7_STR71x_IAR/main.c
+++ b/Demo/ARM7_STR71x_IAR/main.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /*
--- a/Demo/ARM7_STR71x_IAR/serial/serial.c
+++ b/Demo/ARM7_STR71x_IAR/serial/serial.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /*
@@ -211,7 +206,7 @@ __arm void vSerialISR( void )
 {
 unsigned portSHORT usStatus;
 signed portCHAR cChar;
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
+portBASE_TYPE xTaskWokenByTx = pdFALSE, xTaskWokenByPost = pdFALSE;

 	/* What caused the interrupt? */
 	usStatus = UART_FlagStatus( UART0 );
@@ -220,7 +215,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 	{
 		/* The interrupt was caused by the THR becoming empty.  Are there any
 		more characters to transmit? */
-		if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xHigherPriorityTaskWoken ) == pdTRUE )
+		if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xTaskWokenByTx ) == pdTRUE )
 		{
 			/* A character was retrieved from the queue so can be sent to the
 			THR now. */
@@ -239,12 +234,12 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 		character from the RHR and place it in the queue of received
 		characters. */
 		cChar = UART0->RxBUFR;
-		xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );
+		xTaskWokenByPost = xQueueSendFromISR( xRxedChars, &cChar, xTaskWokenByPost );
 	}

 	/* If a task was woken by either a character being received or a character
 	being transmitted then we may need to switch to another task. */
-	portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );
+	portEND_SWITCHING_ISR( ( xTaskWokenByPost || xTaskWokenByTx ) );

 	/* End the interrupt in the EIC. */
 	portCLEAR_EIC();
--- a/Demo/ARM7_STR75x_GCC/FreeRTOSConfig.h
+++ b/Demo/ARM7_STR75x_GCC/FreeRTOSConfig.h
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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
@@ -57,12 +52,9 @@
 * application requirements.
 *
 * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
- *
- * See http://www.freertos.org/a00110.html.
+ * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
 *----------------------------------------------------------*/

-
 #define configUSE_PREEMPTION		1
 #define configUSE_IDLE_HOOK			0
 #define configUSE_TICK_HOOK			0
--- a/Demo/ARM7_STR75x_GCC/ParTest/ParTest.c
+++ b/Demo/ARM7_STR75x_GCC/ParTest/ParTest.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /* Library includes. */
--- a/Demo/ARM7_STR75x_GCC/main.c
+++ b/Demo/ARM7_STR75x_GCC/main.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /*
@@ -74,11 +69,11 @@

 /* Kernel includes. */
 #include "FreeRTOS.h"
-#include "task.h"
-#include "queue.h"
+#include "Task.h"
+#include "Queue.h"

 /* Demo application includes. */
-#include "partest.h"
+#include "ParTest.h"
 #include "flash.h"
 #include "integer.h"
 #include "blocktim.h"
--- a/Demo/ARM7_STR75x_GCC/serial/serial.c
+++ b/Demo/ARM7_STR75x_GCC/serial/serial.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /*
--- a/Demo/ARM7_STR75x_GCC/serial/serialISR.c
+++ b/Demo/ARM7_STR75x_GCC/serial/serialISR.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section 
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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,7 +70,7 @@ void vConfigureQueues( xQueueHandle xQForRx, xQueueHandle xQForTx, portBASE_TYPE
 void vSerialISR( void )
 {
 signed portCHAR cChar;
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
+portBASE_TYPE xTaskWokenByTx = pdFALSE, xTaskWokenByPost = pdFALSE;

 	do
 	{
@@ -83,7 +78,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 		{
 			/* The interrupt was caused by the THR becoming empty.  Are there any
 			more characters to transmit? */
-			if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xHigherPriorityTaskWoken ) == pdTRUE )
+			if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xTaskWokenByTx ) == pdTRUE )
 			{
 				/* A character was retrieved from the queue so can be sent to the
 				THR now. */
@@ -103,14 +98,14 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 			character from the RHR and place it in the queue of received
 			characters. */
 			cChar = UART0->DR;
-			xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );
+			xTaskWokenByPost = xQueueSendFromISR( xRxedChars, &cChar, xTaskWokenByPost );
 			UART_ClearITPendingBit( UART0, UART_IT_Receive );
 		}
 	} while( UART0->MIS );

 	/* If a task was woken by either a character being received or a character
 	being transmitted then we may need to switch to another task. */
-	portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );
+	portEND_SWITCHING_ISR( ( xTaskWokenByPost || xTaskWokenByTx ) );
 }


--- a/Demo/ARM7_STR75x_IAR/FreeRTOSConfig.h
+++ b/Demo/ARM7_STR75x_IAR/FreeRTOSConfig.h
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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
@@ -55,12 +50,9 @@
 * application requirements.
 *
 * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE. 
- *
- * See http://www.freertos.org/a00110.html.
+ * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
 *----------------------------------------------------------*/

-
 #define configUSE_PREEMPTION		1
 #define configUSE_IDLE_HOOK			0
 #define configUSE_TICK_HOOK			0
--- a/Demo/ARM7_STR75x_IAR/ParTest/ParTest.c
+++ b/Demo/ARM7_STR75x_IAR/ParTest/ParTest.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /* Library includes. */
--- a/Demo/ARM7_STR75x_IAR/main.c
+++ b/Demo/ARM7_STR75x_IAR/main.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /*
@@ -74,11 +69,11 @@

 /* Kernel includes. */
 #include "FreeRTOS.h"
-#include "task.h"
-#include "queue.h"
+#include "Task.h"
+#include "Queue.h"

 /* Demo application includes. */
-#include "partest.h"
+#include "ParTest.h"
 #include "flash.h"
 #include "integer.h"
 #include "blocktim.h"
--- a/Demo/ARM7_STR75x_IAR/serial/serial.c
+++ b/Demo/ARM7_STR75x_IAR/serial/serial.c
@@ -1,48 +1,43 @@
 /*
-	FreeRTOS V5.4.2 - Copyright (C) 2009 Real Time Engineers Ltd.
+	FreeRTOS.org V4.7.1 - Copyright (C) 2003-2008 Richard Barry.

-	This file is part of the FreeRTOS distribution.
+	This file is part of the FreeRTOS.org 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.org is free software; you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.

-	FreeRTOS is distributed in the hope that it will be useful,	but WITHOUT
-	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.org is distributed in the hope that it will be useful,
+	but WITHOUT 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.org; if not, write to the Free Software
+	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+	A special exception to the GPL can be applied should you wish to distribute
+	a combined work that includes FreeRTOS.org, without being obliged to provide
+	the source code for any proprietary components.  See the licensing section
+	of http://www.FreeRTOS.org for full details of how and when the exception
+	can be applied.

-	***************************************************************************
-	*                                                                         *
-	* 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
+	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.
+
+	***************************************************************************
 */

 /*
@@ -233,7 +228,7 @@ void vSerialClose( xComPortHandle xPort )
 __arm void vSerialISR( void )
 {
 signed portCHAR cChar;
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
+portBASE_TYPE xTaskWokenByTx = pdFALSE, xTaskWokenByPost = pdFALSE;

 	do
 	{
@@ -241,7 +236,7 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 		{
 			/* The interrupt was caused by the THR becoming empty.  Are there any
 			more characters to transmit? */
-			if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xHigherPriorityTaskWoken ) == pdTRUE )
+			if( xQueueReceiveFromISR( xCharsForTx, &cChar, &xTaskWokenByTx ) == pdTRUE )
 			{
 				/* A character was retrieved from the queue so can be sent to the
 				THR now. */
@@ -261,14 +256,14 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 			character from the RHR and place it in the queue of received
 			characters. */
 			cChar = UART0->DR;
-			xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );
+			xTaskWokenByPost = xQueueSendFromISR( xRxedChars, &cChar, xTaskWokenByPost );
 			UART_ClearITPendingBit( UART0, UART_IT_Receive );
 		}
 	} while( UART0->MIS );

 	/* If a task was woken by either a character being received or a character
 	being transmitted then we may need to switch to another task. */
-	portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );
+	portEND_SWITCHING_ISR( ( xTaskWokenByPost || xTaskWokenByTx ) );
 }


--- a/Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h
+++ b/Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h
@@ -1,104 +0,0 @@
-/*
-	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.
-*/
-
-#ifndef FREERTOS_CONFIG_H
-#define FREERTOS_CONFIG_H
-
-#include "board.h"
-
-/*-----------------------------------------------------------
- * Application specific definitions.
- *
- * These definitions should be adjusted for your particular hardware and
- * application requirements.
- *
- * THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
- * FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
- *
- * See http://www.freertos.org/a00110.html.
- *----------------------------------------------------------*/
-
-#define configUSE_PREEMPTION			1
-#define configUSE_IDLE_HOOK				0
-#define configUSE_TICK_HOOK				0
-#define configCPU_CLOCK_HZ				( ( unsigned portLONG ) BOARD_MCK )
-#define configTICK_RATE_HZ				( ( portTickType ) 1000 )
-#define configMINIMAL_STACK_SIZE		( ( unsigned portSHORT ) 190 )
-#define configTOTAL_HEAP_SIZE			( ( size_t ) ( 40000 ) )
-#define configMAX_TASK_NAME_LEN			( 12 )
-#define configUSE_TRACE_FACILITY		0
-#define configUSE_16_BIT_TICKS			0
-#define configIDLE_SHOULD_YIELD			0
-#define configUSE_CO_ROUTINES 			0
-#define configUSE_MUTEXES				1
-#define configCHECK_FOR_STACK_OVERFLOW	0
-#define configUSE_RECURSIVE_MUTEXES		1
-#define configQUEUE_REGISTRY_SIZE		10
-#define configUSE_COUNTING_SEMAPHORES	1
-
-#define configMAX_PRIORITIES		( ( unsigned portBASE_TYPE ) 6 )
-#define configMAX_CO_ROUTINE_PRIORITIES ( 2 )
-
-/* Set the following definitions to 1 to include the API function, or zero
-to exclude the API function. */
-
-#define INCLUDE_vTaskPrioritySet			1
-#define INCLUDE_uxTaskPriorityGet			1
-#define INCLUDE_vTaskDelete					1
-#define INCLUDE_vTaskCleanUpResources		0
-#define INCLUDE_vTaskSuspend				1
-#define INCLUDE_vTaskDelayUntil				1
-#define INCLUDE_vTaskDelay					1
-#define INCLUDE_uxTaskGetStackHighWaterMark	1
-
-#define configYIELD_INTERRUPT_VECTOR			16UL
-#define configKERNEL_INTERRUPT_PRIORITY 		1
-#define configMAX_SYSCALL_INTERRUPT_PRIORITY 	4
-
-void vApplicationSetupInterrupts( void );
-
-#endif /* FREERTOS_CONFIG_H */
--- a/Demo/ARM9_AT91SAM9XE_IAR/ParTest/ParTest.c
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ParTest/ParTest.c
@@ -1,94 +0,0 @@
-/*
-	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.
-*/
-
-#include "FreeRTOS.h"
-#include "partest.h"
-#include "led.h"
-
-#define partstNUM_LEDS			( 4 )
-
-/*-----------------------------------------------------------
- * Simple parallel port IO routines for the LED's.
- *-----------------------------------------------------------*/
-
-void vParTestInitialise( void )
-{	
-unsigned long ul;
-
-	for( ul = 0; ul < partstNUM_LEDS; ul++ )
-	{
-		LED_Configure( ul );
-	}
-}
-/*-----------------------------------------------------------*/
-
-void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue )
-{
-	if( uxLED < partstNUM_LEDS )
-	{
-		if( xValue == 0 )
-		{
-			LED_Clear( uxLED );
-		}
-		else
-		{
-			LED_Set( uxLED );
-		}
-	}
-}
-/*-----------------------------------------------------------*/
-
-void vParTestToggleLED( unsigned portBASE_TYPE uxLED )
-{
-	if( uxLED < partstNUM_LEDS )
-	{
-    	LED_Toggle( uxLED );
-	}
-}
-
-
-
--- a/Demo/ARM9_AT91SAM9XE_IAR/RTOSDemo.eww
+++ b/Demo/ARM9_AT91SAM9XE_IAR/RTOSDemo.eww
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<workspace>
-	<project>
-		<path>$WS_DIR$\ewp\at91sam9xe-ek.ewp</path>
-	</project>
-	<batchBuild>
-		<batchDefinition>
-			<name>All</name>>
-			<member>
-				<project>at91sam9xe-ek</project>
-				<configuration>at91sam9xe128_flash</configuration>
-			</member>
-			<member>
-				<project>at91sam9xe-ek</project>
-				<configuration>at91sam9xe128_sdram</configuration>
-			</member>
-			<member>
-				<project>at91sam9xe-ek</project>
-				<configuration>at91sam9xe128_sram</configuration>
-			</member>
-			<member>
-				<project>at91sam9xe-ek</project>
-				<configuration>at91sam9xe256_flash</configuration>
-			</member>
-			<member>
-				<project>at91sam9xe-ek</project>
-				<configuration>at91sam9xe256_sdram</configuration>
-			</member>
-			<member>
-				<project>at91sam9xe-ek</project>
-				<configuration>at91sam9xe256_sram</configuration>
-			</member>
-			<member>
-				<project>at91sam9xe-ek</project>
-				<configuration>at91sam9xe512_flash</configuration>
-			</member>
-			<member>
-				<project>at91sam9xe-ek</project>
-				<configuration>at91sam9xe512_sdram</configuration>
-			</member>
-			<member>
-				<project>at91sam9xe-ek</project>
-				<configuration>at91sam9xe512_sram</configuration>
-			</member>
-		</batchDefinition>
-	</batchBuild>
-</workspace>
--- a/Show More
+++ b/Show More