From a089537b0210206bf6e6a6d39286b08a45ff14c0 Mon Sep 17 00:00:00 2001
From: Richard Barry <ribarry@amazon.com>
Date: Mon, 11 Jul 2011 12:06:57 +0000
Subject: [PATCH] Comment K60 demo code, ready for release.

---
 .../FreeRTOSConfig.h                          |  35 ++-
 Demo/CORTEX_Kinetis_K60_Tower_IAR/ParTest.c   |   3 +-
 .../CORTEX_Kinetis_K60_Tower_IAR/RTOSDemo.ewd |   2 +-
 .../CORTEX_Kinetis_K60_Tower_IAR/RTOSDemo.ewp |   6 +-
 Demo/CORTEX_Kinetis_K60_Tower_IAR/main-full.c | 262 +++++++++---------
 .../main_blinky.c                             |  73 +++--
 Demo/CORTEX_Kinetis_K60_Tower_IAR/uIP_Task.c  |  13 +-
 .../webserver/EMAC.c                          |  34 +--
 8 files changed, 217 insertions(+), 211 deletions(-)

diff --git a/Demo/CORTEX_Kinetis_K60_Tower_IAR/FreeRTOSConfig.h b/Demo/CORTEX_Kinetis_K60_Tower_IAR/FreeRTOSConfig.h
index 2b54877c8..0a346017e 100644
--- a/Demo/CORTEX_Kinetis_K60_Tower_IAR/FreeRTOSConfig.h
+++ b/Demo/CORTEX_Kinetis_K60_Tower_IAR/FreeRTOSConfig.h
@@ -80,14 +80,13 @@
 #define configTICK_RATE_HZ				( ( portTickType ) 1000 )
 #define configMAX_PRIORITIES			( ( unsigned portBASE_TYPE ) 5 )
 #define configMINIMAL_STACK_SIZE		( ( unsigned short ) 90 )
-#define configTOTAL_HEAP_SIZE			( ( size_t ) ( 60 * 1024 ) )
+#define configTOTAL_HEAP_SIZE			( ( size_t ) ( 30 * 1024 ) )
 #define configMAX_TASK_NAME_LEN			( 10 )
 #define configUSE_TRACE_FACILITY		1
 #define configUSE_16_BIT_TICKS			0
 #define configIDLE_SHOULD_YIELD			1
 #define configUSE_MUTEXES				1
-#define configQUEUE_REGISTRY_SIZE		0
-#define configGENERATE_RUN_TIME_STATS	1
+#define configQUEUE_REGISTRY_SIZE		8
 #define configCHECK_FOR_STACK_OVERFLOW	2
 #define configUSE_RECURSIVE_MUTEXES		1
 #define configUSE_MALLOC_FAILED_HOOK	1
@@ -114,34 +113,54 @@ to exclude the API function. */
 #define INCLUDE_vTaskDelayUntil			1
 #define INCLUDE_vTaskDelay				1
 
-#ifdef __ICCARM__ /* Stop these prototypes being included in the asm files. */
+/* Run time stats gathering definitions. */
+#ifdef __ICCARM__
+	/* The #ifdef just prevents this C specific syntax from being included in
+	assembly files. */
 	void vMainConfigureTimerForRunTimeStats( void );
 	unsigned long ulMainGetRunTimeCounterValue( void );
 #endif
+#define configGENERATE_RUN_TIME_STATS	1
 #define portCONFIGURE_TIMER_FOR_RUN_TIME_STATS() vMainConfigureTimerForRunTimeStats()
 #define portGET_RUN_TIME_COUNTER_VALUE() ulMainGetRunTimeCounterValue()
 
-/* Use the system definition, if there is one */
+/* Cortex-M specific definitions. */
 #ifdef __NVIC_PRIO_BITS
+	/* __BVIC_PRIO_BITS will be specified when CMSIS is being used. */
 	#define configPRIO_BITS       		__NVIC_PRIO_BITS
 #else
 	#define configPRIO_BITS       		4        /* 15 priority levels */
 #endif
 
+/* The lowest interrupt priority that can be used in a call to a "set priority"
+function. */
 #define configLIBRARY_LOWEST_INTERRUPT_PRIORITY			0xf
+
+/* The highest interrupt priority that can be used by any interrupt service
+routine that makes calls to interrupt safe FreeRTOS API functions.  DO NOT CALL
+INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A HIGHER
+PRIORITY THAN THIS! (higher priorities are lower numeric values. */
 #define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY	5
 
-/* The lowest priority. */
-#define configKERNEL_INTERRUPT_PRIORITY 	( configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
-/* Priority 5, or 160 as only the top three bits are implemented. */
+/* Interrupt priorities used by the kernel port layer itself.  These are generic
+to all Cortex-M ports, and do not rely on any particular library functions. */
+#define configKERNEL_INTERRUPT_PRIORITY 		( configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
 #define configMAX_SYSCALL_INTERRUPT_PRIORITY 	( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
 	
+/* Normal assert() semantics without relying on the provision of an assert.h
+header file. */
 #define configASSERT( x ) if( ( x ) == 0 ) { taskDISABLE_INTERRUPTS(); for( ;; ); }	
 	
+/* Definitions that map the FreeRTOS port interrupt handlers to their CMSIS
+standard names. */
 #define vPortSVCHandler SVC_Handler
 #define xPortPendSVHandler PendSV_Handler
 #define xPortSysTickHandler SysTick_Handler
 
+/******************************************************************************
+ * Network configuration constants follow from here.
+ *****************************************************************************/
+
 /* MAC address configuration. */
 #define configMAC_ADDR0	0x00
 #define configMAC_ADDR1	0x12
diff --git a/Demo/CORTEX_Kinetis_K60_Tower_IAR/ParTest.c b/Demo/CORTEX_Kinetis_K60_Tower_IAR/ParTest.c
index 2e2d96275..7ae69bcac 100644
--- a/Demo/CORTEX_Kinetis_K60_Tower_IAR/ParTest.c
+++ b/Demo/CORTEX_Kinetis_K60_Tower_IAR/ParTest.c
@@ -52,7 +52,7 @@
 */
 
 /*-----------------------------------------------------------
- * Simple parallel port IO routines.
+ * Simple GPIO (parallel port) IO routines.
  *-----------------------------------------------------------*/
 
 /* Kernel includes. */
@@ -68,6 +68,7 @@
 /* Only the LEDs on one of the two seven segment displays are used. */
 #define partstMAX_LEDS		4
 
+/* The bits used to control the LEDs on the TWR-K60N512. */
 const unsigned long ulLEDs[ partstMAX_LEDS ] = { ( 1UL << 10UL ), ( 1UL << 29UL ), ( 1UL << 28UL ), ( 1UL << 11UL ) };
 
 /*-----------------------------------------------------------*/
diff --git a/Demo/CORTEX_Kinetis_K60_Tower_IAR/RTOSDemo.ewd b/Demo/CORTEX_Kinetis_K60_Tower_IAR/RTOSDemo.ewd
index 377fbfad8..999e00c69 100644
--- a/Demo/CORTEX_Kinetis_K60_Tower_IAR/RTOSDemo.ewd
+++ b/Demo/CORTEX_Kinetis_K60_Tower_IAR/RTOSDemo.ewd
@@ -839,7 +839,7 @@
       </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>
-        <loadFlag>0</loadFlag>
+        <loadFlag>1</loadFlag>
       </plugin>
       <plugin>
         <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>
diff --git a/Demo/CORTEX_Kinetis_K60_Tower_IAR/RTOSDemo.ewp b/Demo/CORTEX_Kinetis_K60_Tower_IAR/RTOSDemo.ewp
index 7c5e038e1..884a29c5d 100644
--- a/Demo/CORTEX_Kinetis_K60_Tower_IAR/RTOSDemo.ewp
+++ b/Demo/CORTEX_Kinetis_K60_Tower_IAR/RTOSDemo.ewp
@@ -226,7 +226,7 @@
         <option>
           <name>CCAllowList</name>
           <version>1</version>
-          <state>0000000</state>
+          <state>1111111</state>
         </option>
         <option>
           <name>CCDebugInfo</name>
@@ -326,7 +326,7 @@
         </option>
         <option>
           <name>CCOptLevel</name>
-          <state>1</state>
+          <state>3</state>
         </option>
         <option>
           <name>CCOptStrategy</name>
@@ -335,7 +335,7 @@
         </option>
         <option>
           <name>CCOptLevelSlave</name>
-          <state>1</state>
+          <state>3</state>
         </option>
         <option>
           <name>CompilerMisraRules98</name>
diff --git a/Demo/CORTEX_Kinetis_K60_Tower_IAR/main-full.c b/Demo/CORTEX_Kinetis_K60_Tower_IAR/main-full.c
index aca6483b6..16a98174f 100644
--- a/Demo/CORTEX_Kinetis_K60_Tower_IAR/main-full.c
+++ b/Demo/CORTEX_Kinetis_K60_Tower_IAR/main-full.c
@@ -63,47 +63,70 @@
  *
  * main-full.c (this file) defines a comprehensive demo that creates many
  * tasks, queues, semaphores and timers.  It also demonstrates how Cortex-M3
- * interrupts can interact with FreeRTOS tasks/timers.
+ * interrupts can interact with FreeRTOS tasks/timers, a simple web server, and
+ * run time statistics gathering functionality.  ***IF YOU ARE LOOKING FOR A 
+ * SIMPLER STARTING POINT THEN USE THE "BLINKY" BUILD CONFIGURATION FIRST.***
  *
- * This project runs on the SK-FM3-100PMC evaluation board, which is populated
- * with an MB9BF5006N Cortex-M3 based microcontroller.
+ * If the Ethernet functionality is excluded, then this demo will run 'stand 
+ * alone' (without the rest of the tower system) on the TWR-K60N512 tower 
+ * module.  If the Ethernet functionality is included, then the full Freescale
+ * K60 tower kit, including both the TWR-K60N512 and TWR-SER modules, is 
+ * required (as the Ethernet connector is on the TWR-SER).  The TWR-K60N512 is 
+ * populated with a K60N512 Cortex-M4 microcontroller.
  *
  * The main() Function:
- * main() creates three demo specific software timers, one demo specific queue,
- * and two demo specific tasks.  It then creates a whole host of 'standard
- * demo' tasks/queues/semaphores, before starting the scheduler.  The demo
- * specific tasks and timers are described in the comments here.  The standard
- * demo tasks are described on the FreeRTOS.org web site.
+ * main() creates four demo specific software timers, and one demo specific
+ * task (the web server task).  It also creates a whole host of 'standard
+ * demo' tasks/queues/semaphores/timers, before starting the scheduler.  The 
+ * demo specific tasks and timers are described in the comments here.  The 
+ * standard demo tasks are described on the FreeRTOS.org web site.
  *
  * The standard demo tasks provide no specific functionality.  They are
  * included to both test the FreeRTOS port, and provide examples of how the
  * various FreeRTOS API functions can be used.
  *
- * This demo creates 43 tasks in total.  If you want a simpler demo, use the
- * Blinky build configuration.
+ * This demo creates 37 persistent tasks, then dynamically creates and destroys
+ * another two tasks as the demo executes.
  *
- * The Demo Specific LED Software Timer and the Button Interrupt:
+ *
+ * The Demo Specific "LED" Timers and Callback Function:
+ * Two very simple LED timers are created.  All they do is toggle and LED timer
+ * callback function is executed.  The two timers share a callback function, so 
+ * the callback function parameter is used to determine which timer actually 
+ * expired, and therefore, which LED to toggle.  Both timers use a different 
+ * frequency, one toggles the blue LED and the other the green LED.
+ *
+ * The LED/Button Software Timer and the Button Interrupt:
  * The user button SW2 is configured to generate an interrupt each time it is
- * pressed.  The interrupt service routine switches an LED on, and resets the
- * LED software timer.  The LED timer has a 5000 millisecond (5 second) period,
- * and uses a callback function that is defined to just turn the LED off again.
- * Therefore, pressing the user button will turn the LED on, and the LED will
- * remain on until a full five seconds pass without the button being pressed.
- * See the documentation page for this demo on the FreeRTOS.org web site to see
- * which LED is used.
+ * pressed.  The interrupt service routine switches the orange/yellow LED on, 
+ * and resets the LED software timer.  The LED timer has a 5000 millisecond (5 
+ * second) period, and uses a callback function that is defined to just turn the 
+ * LED off again.  Therefore, pressing the user button will turn the LED on, and 
+ * the LED will remain on until a full five seconds pass without the button 
+ * being pressed.
  *
- * The Demo Specific "Check" Callback Function:
- * This is called each time the 'check' timer expires.  The check timer
- * callback function inspects all the standard demo tasks to see if they are
- * all executing as expected.  The check timer is initially configured to
- * expire every three seconds, but will shorted this to every 500ms if an error
- * is ever discovered.  The check timer callback toggles the LED defined by
- * the mainCHECK_LED definition each time it executes.  Therefore, if LED
- * mainCHECK_LED is toggling every three seconds, then no error have been found.
- * If LED mainCHECK_LED is toggling every 500ms, then at least one errors has
- * been found.  The variable pcStatusMessage is set to a string that indicates
- * which task reported an error.  See the documentation page for this demo on
- * the FreeRTOS.org web site to see which LED in the 7 segment display is used.
+ * The Demo Specific "Check" Timer and Callback Function:
+ * The check timer period is initially set to three seconds.  The check timer 
+ * callback function checks that all the standard demo tasks are not only still 
+ * executing, but are executing without reporting any errors.  If the check 
+ * timer discovers that a task has either stalled, or reported an error, then it 
+ * changes its own period from the initial three seconds, to just 200ms.  The 
+ * check timer callback function also toggles the orange/red LED each time it is 
+ * called.  This provides a visual indication of the system status:  If the LED 
+ * toggles every three seconds, then no issues have been discovered.  If the LED 
+ * toggles every 200ms, then an issue has been discovered with at least one 
+ * task.  The last reported issue is latched into the pcStatusMessage variable, 
+ * and displayed at the bottom of the "task stats" web page served by the 
+ * embedded web server task.
+ *
+ * The web server task:
+ * The web server task implements a simple embedded web server that includes
+ * CGI scripting.  Pages are provided that allow task statistics, network
+ * statistics and run time statistics to be viewed.  In addition, an IO page is
+ * served that allows the orange/yellow LED to be turned on and off.  Finally,
+ * a page is included that serves a large jpg file.  See the documentation page
+ * for this demo on the http://www.FreeRTOS.org web site for web server
+ * configuration and usage instructions.
  *
  * The Demo Specific Idle Hook Function:
  * The idle hook function demonstrates how to query the amount of FreeRTOS heap
@@ -112,6 +135,7 @@
  * The Demo Specific Tick Hook Function:
  * The tick hook function is used to test the interrupt safe software timer
  * functionality.
+ * 
  */
 
 /* Kernel includes. */
@@ -138,15 +162,6 @@
 #include "countsem.h"
 #include "dynamic.h"
 
-/* The rate at which data is sent to the queue, specified in milliseconds, and
-converted to ticks using the portTICK_RATE_MS constant. */
-#define mainQUEUE_SEND_FREQUENCY_MS	( 200 / portTICK_RATE_MS )
-
-/* The number of items the queue can hold.  This is 1 as the receive task
-will remove items as they are added, meaning the send task should always find
-the queue empty. */
-#define mainQUEUE_LENGTH			( 1 )
-
 /* The LED toggled by the check timer callback function.  */
 #define mainCHECK_LED				3UL
 
@@ -161,24 +176,17 @@ the queue empty. */
 #define mainTIMER_TEST_PERIOD		( 50 )
 
 /* Priorities used by the various different standard demo tasks. */
-#define mainCHECK_TASK_PRIORITY		( configMAX_PRIORITIES - 1 )
 #define mainQUEUE_POLL_PRIORITY		( tskIDLE_PRIORITY + 1 )
 #define mainSEM_TEST_PRIORITY		( tskIDLE_PRIORITY + 1 )
 #define mainBLOCK_Q_PRIORITY		( tskIDLE_PRIORITY + 2 )
 #define mainCREATOR_TASK_PRIORITY   ( tskIDLE_PRIORITY + 3 )
-#define mainINTEGER_TASK_PRIORITY   ( tskIDLE_PRIORITY )
 #define mainGEN_QUEUE_TASK_PRIORITY	( tskIDLE_PRIORITY )
-#define mainCOM_TEST_PRIORITY		( tskIDLE_PRIORITY + 2 )
 #define mainuIP_TASK_PRIORITY		( tskIDLE_PRIORITY + 2 )
 
 /* The WEB server uses string handling functions, which in turn use a bit more
 stack than most of the other tasks. */
 #define mainuIP_STACK_SIZE			( configMINIMAL_STACK_SIZE * 3 )
 
-/* Priorities defined in this main-full.c file. */
-#define mainQUEUE_RECEIVE_TASK_PRIORITY		( tskIDLE_PRIORITY + 2 )
-#define	mainQUEUE_SEND_TASK_PRIORITY		( tskIDLE_PRIORITY + 1 )
-
 /* The period at which the check timer will expire, in ms, provided no errors
 have been reported by any of the standard demo tasks.  ms are converted to the
 equivalent in ticks using the portTICK_RATE_MS constant. */
@@ -187,23 +195,23 @@ equivalent in ticks using the portTICK_RATE_MS constant. */
 /* The period at which the check timer will expire, in ms, if an error has been
 reported in one of the standard demo tasks.  ms are converted to the equivalent
 in ticks using the portTICK_RATE_MS constant. */
-#define mainERROR_CHECK_TIMER_PERIOD_MS 	( 500UL / portTICK_RATE_MS )
+#define mainERROR_CHECK_TIMER_PERIOD_MS 	( 200UL / portTICK_RATE_MS )
 
-/* The LED will remain on until the button has not been pushed for a full
-5000ms. */
+/* The LED that is turned on by pressing SW2 remains on until the button has not 
+been pushed for a full 5000ms. */
 #define mainBUTTON_LED_TIMER_PERIOD_MS		( 5000UL / portTICK_RATE_MS )
 
 /* The period at which the two simple LED flash timers will execute their
 callback functions. */
-#define mainLED1_TIMER_PERIOD_MS			( 200 / portTICK_RATE_MS )
-#define mainLED2_TIMER_PERIOD_MS			( 600 / portTICK_RATE_MS )
+#define mainLED1_TIMER_PERIOD_MS			( 200UL / portTICK_RATE_MS )
+#define mainLED2_TIMER_PERIOD_MS			( 600UL / portTICK_RATE_MS )
 
 /* A block time of zero simply means "don't block". */
 #define mainDONT_BLOCK						( 0UL )
 
 /* The vector used by the GPIO port E.  Button SW2 is configured to generate
-an interrput on this port. */
-#define mainGPIO_E_VECTOR					( 107 - 16 )
+an interrupt on this port. */
+#define mainGPIO_E_VECTOR					( 91 )
 
 /*-----------------------------------------------------------*/
 
@@ -219,14 +227,15 @@ static void prvSetupHardware( void );
 static void prvCreateDemoSpecificTimers( void );
 
 /*
- * The LED timer callback function.  This does nothing but switch an LED off.
+ * The LED/button timer callback function.  This does nothing but switch an LED 
+ * off.
  */
 static void prvButtonLEDTimerCallback( xTimerHandle xTimer );
 
 /*
  * The callback function used by both simple LED flash timers.  Both timers use
  * the same callback, so the function parameter is used to determine which LED
- * should be flashed (effectively to determine which timer has expired.
+ * should be flashed (effectively to determine which timer has expired).
  */
 static void prvLEDTimerCallback( xTimerHandle xTimer );
 
@@ -236,30 +245,22 @@ static void prvLEDTimerCallback( xTimerHandle xTimer );
 static void prvCheckTimerCallback( xTimerHandle xTimer );
 
 /*
- * This is not a 'standard' partest function, so the prototype is not in
- * partest.h, and is instead included here.
- */
-void vParTestSetLEDFromISR( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue );
-
-/*
- * Contains the implementation of the WEB server.
+ * Contains the implementation of the web server.
  */
 extern void vuIP_Task( void *pvParameters );
 
 /*-----------------------------------------------------------*/
 
-/* The queue used by both application specific demo tasks defined in this file. */
-static xQueueHandle xQueue = NULL;
-
-/* The LED software timer.  This uses prvButtonLEDTimerCallback() as it's callback
-function. */
-static xTimerHandle xLEDTimer = NULL;
+/* The LED/Button software timer.  This uses prvButtonLEDTimerCallback() as it's 
+callback function. */
+static xTimerHandle xLEDButtonTimer = NULL;
 
 /* The check timer.  This uses prvCheckTimerCallback() as its callback
 function. */
 static xTimerHandle xCheckTimer = NULL;
 
-/* LED timers - these simply flash LEDs, each using a different frequency. */
+/* LED timers - these simply flash LEDs, each using a different frequency.  Both
+use the same prvLEDTimerCallback() callback function. */
 static xTimerHandle xLED1Timer = NULL, xLED2Timer = NULL;
 
 /* If an error is detected in a standard demo task, then pcStatusMessage will
@@ -267,8 +268,9 @@ be set to point to a string that identifies the offending task.  This is just
 to make debugging easier. */
 static const char *pcStatusMessage = NULL;
 
-/* Used in the run time stats calculation. */
+/* Used in the run time stats calculations. */
 static unsigned long ulClocksPer10thOfAMilliSecond = 0UL;
+
 /*-----------------------------------------------------------*/
 
 void main( void )
@@ -276,41 +278,35 @@ void main( void )
 	/* Configure the NVIC, LED outputs and button inputs. */
 	prvSetupHardware();
 
-	/* Create the queue. */
-	xQueue = xQueueCreate( mainQUEUE_LENGTH, sizeof( unsigned long ) );
+	/* Create the timers that are specific to this demo - other timers are
+	created as part of the standard demo within vStartTimerDemoTask. */
+	prvCreateDemoSpecificTimers();
 
-	if( xQueue != NULL )
-	{
-		/* Create the timers that are specific to this demo - other timers are
-		created as part of the standard demo within vStartTimerDemoTask. */
-		prvCreateDemoSpecificTimers();
+	/* Create a lot of 'standard demo' tasks.  Nearly 40 tasks are created in
+	this demo.  For a much simpler demo, select the 'blinky' build
+	configuration. */
+	vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
+	vCreateBlockTimeTasks();
+	vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );
+	vStartGenericQueueTasks( mainGEN_QUEUE_TASK_PRIORITY );
+	vStartQueuePeekTasks();
+	vStartRecursiveMutexTasks();
+	vStartTimerDemoTask( mainTIMER_TEST_PERIOD );
+	vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
+	vStartCountingSemaphoreTasks();
+	vStartDynamicPriorityTasks();
+	
+	/* The web server task. */
+	xTaskCreate( vuIP_Task, "uIP", mainuIP_STACK_SIZE, NULL, mainuIP_TASK_PRIORITY, NULL );
 
-		/* Create a lot of 'standard demo' tasks.  Over 40 tasks are created in
-		this demo.  For a much simpler demo, select the 'blinky' build
-		configuration. */
-		vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );
-		vCreateBlockTimeTasks();
-		vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );
-		vStartGenericQueueTasks( mainGEN_QUEUE_TASK_PRIORITY );
-		vStartQueuePeekTasks();
-		vStartRecursiveMutexTasks();
-		vStartTimerDemoTask( mainTIMER_TEST_PERIOD );
-		vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );
-		vStartCountingSemaphoreTasks();
-		vStartDynamicPriorityTasks();
-		
-		/* The web server task. */
-		xTaskCreate( vuIP_Task, "uIP", mainuIP_STACK_SIZE, NULL, mainuIP_TASK_PRIORITY, NULL );
+	/* The suicide tasks must be created last, as they need to know how many
+	tasks were running prior to their creation in order to ascertain whether
+	or not the correct/expected number of tasks are running at any given
+	time. */
+	vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY );
 
-		/* The suicide tasks must be created last, as they need to know how many
-		tasks were running prior to their creation in order to ascertain whether
-		or not the correct/expected number of tasks are running at any given
-		time. */
-		vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY );
-
-		/* Start the tasks and timer running. */
-		vTaskStartScheduler();
-	}
+	/* Start the tasks and timers running. */
+	vTaskStartScheduler();
 
 	/* If all is well, the scheduler will now be running, and the following line
 	will never be reached.  If the following line does execute, then there was
@@ -326,7 +322,9 @@ static void prvCheckTimerCallback( xTimerHandle xTimer )
 static long lChangedTimerPeriodAlready = pdFALSE;
 
 	/* Check the standard demo tasks are running without error.   Latch the
-	latest reported error in the pcStatusMessage character pointer. */
+	latest reported error in the pcStatusMessage character pointer.  The latched
+	string can be viewed using the embedded web server - it is displayed at
+	the bottom of the served "task stats" page. */
 	if( xAreGenericQueueTasksStillRunning() != pdTRUE )
 	{
 		pcStatusMessage = "Error: GenQueue";
@@ -398,9 +396,9 @@ static long lChangedTimerPeriodAlready = pdFALSE;
 			lChangedTimerPeriodAlready = pdTRUE;
 			printf( "%s", pcStatusMessage );
 			
-			/* This call to xTimerChangePeriod() uses a zero block time.  Functions
-			called from inside of a timer callback function must *never* attempt
-			to block. */
+			/* This call to xTimerChangePeriod() uses a zero block time.  
+			Functions called from inside of a timer callback function must 
+			*never* attempt	to block. */
 			xTimerChangePeriod( xCheckTimer, ( mainERROR_CHECK_TIMER_PERIOD_MS ), mainDONT_BLOCK );
 		}
 	}
@@ -438,12 +436,11 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 	vParTestSetLED( mainTIMER_CONTROLLED_LED, pdTRUE );
 
 	/* This interrupt safe FreeRTOS function can be called from this interrupt
-	because the interrupt priority is below the
-	configMAX_SYSCALL_INTERRUPT_PRIORITY setting in FreeRTOSConfig.h. */
-	xTimerResetFromISR( xLEDTimer, &xHigherPriorityTaskWoken );
+	because the interrupt priority is equal to or below the
+	configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY setting in FreeRTOSConfig.h. */
+	xTimerResetFromISR( xLEDButtonTimer, &xHigherPriorityTaskWoken );
 
-	/* Clear the interrupt before leaving.  This just clears all the interrupts
-	for simplicity, as only one is actually used in this simple demo anyway. */
+	/* Clear the interrupt before leaving.  */
 	PORTE_ISFR = 0xFFFFFFFFUL;
 
 	/* If calling xTimerResetFromISR() caused a task (in this case the timer
@@ -461,6 +458,9 @@ static void prvSetupHardware( void )
 	taskDISABLE_INTERRUPTS();
 	PORTE_PCR26 = PORT_PCR_MUX( 1 ) | PORT_PCR_IRQC( 0xA ) | PORT_PCR_PE_MASK | PORT_PCR_PS_MASK;
 	enable_irq( mainGPIO_E_VECTOR );
+	
+	/* The interrupt calls an interrupt safe API function - so its priority must
+	be equal to or lower than configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY. */
 	set_irq_priority( mainGPIO_E_VECTOR, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY );
 	
 	/* Configure the LED outputs. */
@@ -471,18 +471,18 @@ static void prvSetupHardware( void )
 static void prvCreateDemoSpecificTimers( void )
 {
 	/* This function creates the timers, but does not start them.  This is
-	because the standard demo timer test is started after this function is
-	called.  The standard demo timer test will deliberatly fill the timer
-	command queue - and will fail the test if the command queue already holds
-	start commands for the timers created here.  Instead, the timers created in
-	this function are started from the idle task, at which time, the timer
-	service/daemon task will be running, and will have drained the timer command
-	queue. */
+	because the standard demo timer test is started from main(), after this 
+	function is	called.  The standard demo timer test will deliberately fill the 
+	timer command queue - and will fail the test if the command queue already 
+	holds start commands for the timers created here.  Instead, the timers 
+	created in this function are started from the idle task, at which time, the 
+	timer service/daemon task will be running, and will have drained the timer 
+	command	queue. */
 	
 	/* Create the software timer that is responsible for turning off the LED
 	if the button is not pushed within 5000ms, as described at the top of
 	this file. */
-	xLEDTimer = xTimerCreate( 	( const signed char * ) "ButtonLEDTimer", 	/* A text name, purely to help debugging. */
+	xLEDButtonTimer = xTimerCreate( 	( const signed char * ) "ButtonLEDTimer", 	/* A text name, purely to help debugging. */
 								( mainBUTTON_LED_TIMER_PERIOD_MS ),			/* The timer period, in this case 5000ms (5s). */
 								pdFALSE,									/* This is a one shot timer, so xAutoReload is set to pdFALSE. */
 								( void * ) 0,								/* The ID is not used, so can be set to anything. */
@@ -535,7 +535,7 @@ void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName
 	( void ) pxTask;
 
 	/* Run time stack overflow checking is performed if
-	configconfigCHECK_FOR_STACK_OVERFLOW is defined to 1 or 2.  This hook
+	configCHECK_FOR_STACK_OVERFLOW is defined to 1 or 2.  This hook
 	function is called if a stack overflow is detected. */
 	taskDISABLE_INTERRUPTS();
 	for( ;; );
@@ -555,8 +555,12 @@ volatile size_t xFreeHeapSpace;
 		tasks were created in main() (this is part of the test they perform).
 		Therefore, while the check and LED timers can be created in main(), they
 		cannot be started from main().  Once the scheduler has started, the timer
-		service	task will drain the command queue, and now the check and digit
-		counter timers can be started successfully. */
+		service	task will drain the command queue, and now the check and LED
+		timers can be started successfully.  Normally the idle task must not
+		call a function that could cause it to block in case there are no tasks
+		that are able to run.  In this case, however, it is ok as posting to the
+		timer command queue guarantees that at least the timer service/daemon
+		task will be able to execute. */
 		xTimerStart( xCheckTimer, portMAX_DELAY );
 		xTimerStart( xLED1Timer, portMAX_DELAY );
 		xTimerStart( xLED2Timer, portMAX_DELAY );
@@ -585,9 +589,9 @@ void vApplicationTickHook( void )
 
 char *pcGetTaskStatusMessage( void )
 {
-	/* Not bothered about a critical section here although technically because
-	of the task priorities the pointer could change it will be atomic if not
-	near atomic and its not critical. */
+	/* A simple GET function used by a CGI script so it can display the 
+	execution status at the bottom of the task stats web page served by the
+	embedded web server. */
 	if( pcStatusMessage == NULL )
 	{
 		return "All tasks running without error";
@@ -614,8 +618,9 @@ volatile unsigned long * const pulCurrentSysTickCount = ( ( volatile unsigned lo
 volatile unsigned long * const pulInterruptCTRLState = ( ( volatile unsigned long *) 0xe000ed04 );
 const unsigned long ulSysTickPendingBit = 0x04000000UL;
 
-	/* NOTE: There are potentially race conditions here.  It is ok to keep
-	things simple, without using any additional timer peripherals. */
+	/* NOTE: There are potentially race conditions here.  However, it is used
+	anyway to keep the examples simple, and to avoid reliance on a separate
+	timer peripheral. */
 
 
 	/* The SysTick is a down counter.  How many clocks have passed since it was
@@ -637,7 +642,8 @@ const unsigned long ulSysTickPendingBit = 0x04000000UL;
 		ulSysTickCounts = ulSysTickReloadValue - *pulCurrentSysTickCount;
 	}	
 	
-	/* Convert the tick count into tenths of a millisecond. */
+	/* Convert the tick count into tenths of a millisecond.  THIS ASSUMES
+	configTICK_RATE_HZ is 1000! */
 	ulReturn = ( ulTickCount * 10UL ) ;
 		
 	/* Add on the number of tenths of a millisecond that have passed since the
diff --git a/Demo/CORTEX_Kinetis_K60_Tower_IAR/main_blinky.c b/Demo/CORTEX_Kinetis_K60_Tower_IAR/main_blinky.c
index 22b07f9a3..bf91b4c29 100644
--- a/Demo/CORTEX_Kinetis_K60_Tower_IAR/main_blinky.c
+++ b/Demo/CORTEX_Kinetis_K60_Tower_IAR/main_blinky.c
@@ -65,8 +65,9 @@
  * one queue, and one timer.  It also demonstrates how Cortex-M3 interrupts can
  * interact with FreeRTOS tasks/timers.
  *
- * This simple demo project runs on the SK-FM3-100PMC evaluation board, which
- * is populated with an MB9B500 microcontroller.
+ * This simple demo project runs 'stand alone' (without the rest of the tower
+ * system) on the TWR-K60N512 tower module, which is populated with a K60N512
+ * Cortex-M4 microcontroller.
  *
  * The idle hook function:
  * The idle hook function demonstrates how to query the amount of FreeRTOS heap
@@ -88,23 +89,23 @@
  * in this file.  prvQueueReceiveTask() sits in a loop that causes it to
  * repeatedly attempt to read data from the queue that was created within
  * main().  When data is received, the task checks the value of the data, and
- * if the value equals the expected 100, toggles an LED on the 7 segment
- * display.  The 'block time' parameter passed to the queue receive function
- * specifies that the task should be held in the Blocked state indefinitely to
- * wait for data to be available on the queue.  The queue receive task will only
- * leave the Blocked state when the queue send task writes to the queue.  As the
- * queue send task writes to the queue every 200 milliseconds, the queue receive
- * task leaves the Blocked state every 200 milliseconds, and therefore toggles
- * the LED every 200 milliseconds.
+ * if the value equals the expected 100, toggles the blue LED.  The 'block 
+ * time' parameter passed to the queue receive function specifies that the task 
+ * should be held in the Blocked state indefinitely to wait for data to be 
+ * available on the queue.  The queue receive task will only leave the Blocked 
+ * state when the queue send task writes to the queue.  As the queue send task 
+ * writes to the queue every 200 milliseconds, the queue receive task leaves the 
+ * Blocked state every 200 milliseconds, and therefore toggles the blue LED 
+ * every 200 milliseconds.
  *
  * The LED Software Timer and the Button Interrupt:
  * The user button SW2 is configured to generate an interrupt each time it is
- * pressed.  The interrupt service routine switches an LED in the 7 segment
- * display on, and resets the LED software timer.  The LED timer has a 5000
- * millisecond (5 second) period, and uses a callback function that is defined
- * to just turn the LED off again.  Therefore, pressing the user button will
- * turn the LED on, and the LED will remain on until a full five seconds pass
- * without the button being pressed.
+ * pressed.  The interrupt service routine switches the green LED on, and 
+ * resets the LED software timer.  The LED timer has a 5000 millisecond (5 
+ * second) period, and uses a callback function that is defined to just turn the 
+ * LED off again.  Therefore, pressing the user button will turn the LED on, and 
+ * the LED will remain on until a full five seconds pass without the button 
+ * being pressed.
  */
 
 /* Kernel includes. */
@@ -136,12 +137,13 @@ the queue empty. */
 /* The LED toggle by the queue receive task (blue). */
 #define mainTASK_CONTROLLED_LED				( 1UL << 10UL )
 
-/* The LED turned on by the button interrupt, and turned off by the LED timer. */
+/* The LED turned on by the button interrupt, and turned off by the LED timer
+(green). */
 #define mainTIMER_CONTROLLED_LED			( 1UL << 29UL )
 
 /* The vector used by the GPIO port E.  Button SW2 is configured to generate
-an interrput on this port. */
-#define mainGPIO_E_VECTOR					( 107 - 16 )
+an interrupt on this port. */
+#define mainGPIO_E_VECTOR					( 91 )
 
 /* A block time of zero simply means "don't block". */
 #define mainDONT_BLOCK						( 0UL )
@@ -217,10 +219,7 @@ void main( void )
 static void prvButtonLEDTimerCallback( xTimerHandle xTimer )
 {
 	/* The timer has expired - so no button pushes have occurred in the last
-	five seconds - turn the LED off.  NOTE - accessing the LED port should use
-	a critical section because it is accessed from multiple tasks, and the
-	button interrupt - in this trivial case, for simplicity, the critical
-	section is omitted. */
+	five seconds - turn the LED off. */
 	GPIOA_PSOR = mainTIMER_CONTROLLED_LED;
 }
 /*-----------------------------------------------------------*/
@@ -237,11 +236,10 @@ portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
 
 	/* This interrupt safe FreeRTOS function can be called from this interrupt
 	because the interrupt priority is below the
-	configMAX_SYSCALL_INTERRUPT_PRIORITY setting in FreeRTOSConfig.h. */
+	configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY setting in FreeRTOSConfig.h. */
 	xTimerResetFromISR( xButtonLEDTimer, &xHigherPriorityTaskWoken );
 
-	/* Clear the interrupt before leaving.  This just clears all the interrupts
-	for simplicity, as only one is actually used in this simple demo anyway. */
+	/* Clear the interrupt before leaving. */
 	PORTE_ISFR = 0xFFFFFFFFUL;
 
 	/* If calling xTimerResetFromISR() caused a task (in this case the timer
@@ -303,8 +301,10 @@ static void prvSetupHardware( void )
 {
 	/* Enable the interrupt on SW1. */
 	PORTE_PCR26 = PORT_PCR_MUX( 1 ) | PORT_PCR_IRQC( 0xA ) | PORT_PCR_PE_MASK | PORT_PCR_PS_MASK;
-
 	enable_irq( mainGPIO_E_VECTOR );
+	
+	/* The interrupt calls an interrupt safe API function - so its priority must
+	be equal to or lower than configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY. */
 	set_irq_priority( mainGPIO_E_VECTOR, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY );
 	
 	/* Set PTA10, PTA11, PTA28, and PTA29 (connected to LED's) for GPIO
@@ -340,22 +340,13 @@ void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName
 	( void ) pxTask;
 
 	/* Run time stack overflow checking is performed if
-	configconfigCHECK_FOR_STACK_OVERFLOW is defined to 1 or 2.  This hook
+	configCHECK_FOR_STACK_OVERFLOW is defined to 1 or 2.  This hook
 	function is called if a stack overflow is detected. */
 	taskDISABLE_INTERRUPTS();
 	for( ;; );
 }
 /*-----------------------------------------------------------*/
 
-void vApplicationTickHook( void )
-{
-	/* A tick hook is used by the "Full" build configuration.  The Full and
-	blinky build configurations share a FreeRTOSConfig.h header file, so this
-	simple build configuration also has to define a tick hook - even though it
-	does not actually use it for anything. */
-}
-/*-----------------------------------------------------------*/
-
 void vApplicationIdleHook( void )
 {
 volatile size_t xFreeHeapSpace;
@@ -390,6 +381,14 @@ linker happy. */
 void vMainConfigureTimerForRunTimeStats( void ) {}
 unsigned long ulMainGetRunTimeCounterValue( void ) { return 0UL; }
 
+/* A tick hook is used by the "Full" build configuration.  The Full and blinky 
+build configurations share a FreeRTOSConfig.h header file, so this simple build 
+configuration also has to define a tick hook - even though it does not actually 
+use it for anything. */
+void vApplicationTickHook( void ) {}
+
+
+
 
 
 
diff --git a/Demo/CORTEX_Kinetis_K60_Tower_IAR/uIP_Task.c b/Demo/CORTEX_Kinetis_K60_Tower_IAR/uIP_Task.c
index f08818b7e..c28c2d33c 100644
--- a/Demo/CORTEX_Kinetis_K60_Tower_IAR/uIP_Task.c
+++ b/Demo/CORTEX_Kinetis_K60_Tower_IAR/uIP_Task.c
@@ -72,7 +72,7 @@
 #include "ParTest.h"
 
 /* The buffer used by the uIP stack to both receive and send.  In this case,
-because the Ethernet driver has been modified to be zero copy - the uip_buf
+because the Ethernet driver is implemented to be zero copy - the uip_buf
 variable is just a pointer to an Ethernet buffer, and not a buffer in its own
 right. */
 extern unsigned char *uip_buf;
@@ -90,15 +90,9 @@ driver to the uIP stack. */
 /* A block time of zero simply means "don't block". */
 #define uipDONT_BLOCK				0UL
 
-/* How long to wait before attempting to connect the MAC again. */
-#define uipINIT_WAIT    ( 100 / portTICK_RATE_MS )
-
 /* Shortcut to the header within the Rx buffer. */
 #define xHeader ((struct uip_eth_hdr *) &uip_buf[ 0 ])
 
-/* Standard constant. */
-#define uipTOTAL_FRAME_HEADER_SIZE	54
-
 /*-----------------------------------------------------------*/
 
 /*
@@ -138,7 +132,7 @@ clock_time_t clock_time( void )
 
 void vuIP_Task( void *pvParameters )
 {
-portBASE_TYPE i;
+long i;
 unsigned long ulNewEvent = 0UL, ulUIP_Events = 0UL;
 unsigned short usPacketLength;
 
@@ -161,7 +155,6 @@ unsigned short usPacketLength;
 		{
 			uip_len = usPacketLength;
 			
-			/* Standard uIP loop taken from the uIP manual. */
 			if( xHeader->type == htons( UIP_ETHTYPE_IP ) )
 			{
 				uip_arp_ipin();
@@ -330,7 +323,7 @@ const unsigned long ulYellowLED = 2UL;
 		c = strstr( pcInputString, "?" );
 	    if( c )
 	    {
-			/* Turn the LED's on or off in accordance with the check box status. */
+			/* Turn the LEDs on or off in accordance with the check box status. */
 			if( strstr( c, "LED0=1" ) != NULL )
 			{
 				/* Turn the LEDs on. */
diff --git a/Demo/CORTEX_Kinetis_K60_Tower_IAR/webserver/EMAC.c b/Demo/CORTEX_Kinetis_K60_Tower_IAR/webserver/EMAC.c
index b58740f6e..cf25d084d 100644
--- a/Demo/CORTEX_Kinetis_K60_Tower_IAR/webserver/EMAC.c
+++ b/Demo/CORTEX_Kinetis_K60_Tower_IAR/webserver/EMAC.c
@@ -60,7 +60,7 @@
 /* FreeRTOS includes. */
 #include "FreeRTOS.h"
 #include "task.h"
-#include "semphr.h"
+#include "queue.h"
 
 /* uIP includes. */
 #include "net/uip.h"
@@ -70,25 +70,26 @@
 
 /* The number of times emacBUFFER_WAIT_DELAY_ms should be waited before giving
 up on attempting to obtain a free buffer all together. */
-#define emacBUFFER_WAIT_ATTEMPTS	( 30 )
+#define emacBUFFER_WAIT_ATTEMPTS		( 30 )
 
 /* The number of Rx descriptors. */
-#define emacNUM_RX_DESCRIPTORS	8
+#define emacNUM_RX_DESCRIPTORS			8
 
 /* The number of Tx descriptors.  When using uIP there is not point in having
 more than two. */
-#define emacNUM_TX_BUFFERS	2
+#define emacNUM_TX_BUFFERS				2
 
 /* The total number of EMAC buffers to allocate. */
-#define emacNUM_BUFFERS		( emacNUM_RX_DESCRIPTORS + emacNUM_TX_BUFFERS )
+#define emacNUM_BUFFERS					( emacNUM_RX_DESCRIPTORS + emacNUM_TX_BUFFERS )
 
 /* The time to wait for the Tx descriptor to become free. */
-#define emacTX_WAIT_DELAY_ms ( 10 / portTICK_RATE_MS )
+#define emacTX_WAIT_DELAY_ms 			( 10 / portTICK_RATE_MS )
 
 /* The total number of times to wait emacTX_WAIT_DELAY_ms for the Tx descriptor to
 become free. */
-#define emacTX_WAIT_ATTEMPTS ( 50 )
+#define emacTX_WAIT_ATTEMPTS 			( 50 )
 
+/* Constants used for set up and initialisation. */
 #define emacTX_INTERRUPT_NO			( 76 )
 #define emacRX_INTERRUPT_NO			( 77 )
 #define emacERROR_INTERRUPT_NO		( 78 )
@@ -154,7 +155,7 @@ one of the Ethernet buffers when its actually in use. */
 unsigned char *uip_buf = NULL;
 
 /*-----------------------------------------------------------*/
-#define ENET_HARDWARE_CHECKSUM 0	//_RB_ for test only
+
 void vEMACInit( void )
 {
 int iData;
@@ -262,19 +263,6 @@ const unsigned portCHAR ucMACAddress[] =
 
     ENET_ECR = ENET_ECR_EN1588_MASK;
 
-#if 0
-//_RB_	
-// Enable Ethernet header alignment for rx
-ENET_RACC |= 0
-					 | ENET_RACC_SHIFT16_MASK
-					 ;
-
-// Enable Ethernet header alignment for tx
-ENET_TACC |= 0
-					 | ENET_TACC_SHIFT16_MASK
-					 ;
-#endif
-	
 	/* Store and forward checksum. */
 	ENET_TFWR = ENET_TFWR_STRFWD_MASK;
 
@@ -293,9 +281,9 @@ ENET_TACC |= 0
 	/* Enable interrupts. */
 	ENET_EIMR = 0
 			/*rx irqs*/
-			| ENET_EIMR_RXF_MASK/*FSL: only for complete frame, not partial buffer descriptor | ENET_EIMR_RXB_MASK*/
+			| ENET_EIMR_RXF_MASK/* only for complete frame, not partial buffer descriptor | ENET_EIMR_RXB_MASK*/
 			/*xmit irqs*/
-			| ENET_EIMR_TXF_MASK/*FSL: only for complete frame, not partial buffer descriptor | ENET_EIMR_TXB_MASK*/
+			| ENET_EIMR_TXF_MASK/* only for complete frame, not partial buffer descriptor | ENET_EIMR_TXB_MASK*/
 			/*enet irqs*/
 			| ENET_EIMR_UN_MASK | ENET_EIMR_RL_MASK | ENET_EIMR_LC_MASK | ENET_EIMR_BABT_MASK | ENET_EIMR_BABR_MASK | ENET_EIMR_EBERR_MASK
 			;