V4.2.1 files.

[freertos] / Demo / AVR_ATMega323_WinAVR / main.c

diff --git a/Demo/AVR_ATMega323_WinAVR/main.c b/Demo/AVR_ATMega323_WinAVR/main.c
index 3cedbc603f0d81fc6f85ca56ab0ee92857896999..faa5d2aa4f83a8e0287b1613c2264faf3a8b4a61 100644 (file)
--- a/Demo/AVR_ATMega323_WinAVR/main.c
+++ b/Demo/AVR_ATMega323_WinAVR/main.c
@@ -1,24 +1,24 @@
 /*\r
-       FreeRTOS V4.0.1 - Copyright (C) 2003-2006 Richard Barry.\r
+       FreeRTOS.org V4.2.1 - Copyright (C) 2003-2007 Richard Barry.\r
 \r
-       This file is part of the FreeRTOS distribution.\r
+       This file is part of the FreeRTOS.org distribution.\r
 \r
-       FreeRTOS is free software; you can redistribute it and/or modify\r
+       FreeRTOS.org is free software; you can redistribute it and/or modify\r
        it under the terms of the GNU General Public License as published by\r
        the Free Software Foundation; either version 2 of the License, or\r
        (at your option) any later version.\r
 \r
-       FreeRTOS is distributed in the hope that it will be useful,\r
+       FreeRTOS.org is distributed in the hope that it will be useful,\r
        but WITHOUT ANY WARRANTY; without even the implied warranty of\r
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
        GNU General Public License for more details.\r
 \r
        You should have received a copy of the GNU General Public License\r
-       along with FreeRTOS; if not, write to the Free Software\r
+       along with FreeRTOS.org; if not, write to the Free Software\r
        Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA\r
 \r
        A special exception to the GPL can be applied should you wish to distribute\r
-       a combined work that includes FreeRTOS, without being obliged to provide\r
+       a combined work that includes FreeRTOS.org, without being obliged to provide\r
        the source code for any proprietary components.  See the licensing section \r
        of http://www.FreeRTOS.org for full details of how and when the exception\r
        can be applied.\r
@@ -27,6 +27,9 @@
        See http://www.FreeRTOS.org for documentation, latest information, license \r
        and contact details.  Please ensure to read the configuration and relevant \r
        port sections of the online documentation.\r
+\r
+       Also see http://www.SafeRTOS.com for an IEC 61508 compliant version along\r
+       with commercial development and support options.\r
        ***************************************************************************\r
 */\r
 \r
@@ -73,6 +76,11 @@ Changes from V2.0.0
 Changes from V2.6.1\r
 \r
        + The IAR and WinAVR AVR ports are now maintained separately.\r
+\r
+Changes from V4.0.5\r
+\r
+       + Modified to demonstrate the use of co-routines.\r
+\r
 */\r
 \r
 #include <stdlib.h>\r
@@ -86,15 +94,17 @@ Changes from V2.6.1
 /* Scheduler include files. */\r
 #include "FreeRTOS.h"\r
 #include "task.h"\r
+#include "croutine.h"\r
 \r
 /* Demo file headers. */\r
 #include "PollQ.h"\r
 #include "integer.h"\r
 #include "serial.h"\r
 #include "comtest.h"\r
-#include "flash.h"\r
+#include "crflash.h"\r
 #include "print.h"\r
 #include "partest.h"\r
+#include "regtest.h"\r
 \r
 /* Priority definitions for most of the tasks in the demo application.  Some\r
 tasks just use the idle priority. */\r
@@ -123,6 +133,9 @@ again. */
 the demo application is not unexpectedly resetting. */\r
 #define mainRESET_COUNT_ADDRESS                        ( ( void * ) 0x50 )\r
 \r
+/* The number of coroutines to create. */\r
+#define mainNUM_FLASH_COROUTINES               ( 3 )\r
+\r
 /*\r
  * The task function for the "Check" task.\r
  */\r
@@ -140,6 +153,13 @@ static void prvCheckOtherTasksAreStillRunning( void );
  */\r
 static void prvIncrementResetCount( void );\r
 \r
+/*\r
+ * The idle hook is used to scheduler co-routines.\r
+ */\r
+void vApplicationIdleHook( void );\r
+\r
+/*-----------------------------------------------------------*/\r
+\r
 portSHORT main( void )\r
 {\r
        prvIncrementResetCount();\r
@@ -147,13 +167,18 @@ portSHORT main( void )
        /* Setup the LED's for output. */\r
        vParTestInitialise();\r
 \r
+       /* Create the standard demo tasks. */\r
        vStartIntegerMathTasks( tskIDLE_PRIORITY );\r
        vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainCOM_TEST_BAUD_RATE, mainCOM_TEST_LED );\r
-       vStartLEDFlashTasks( mainLED_TASK_PRIORITY );\r
        vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );\r
-\r
+       vStartRegTestTasks();\r
+       \r
+       /* Create the tasks defined within this file. */\r
        xTaskCreate( vErrorChecks, "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r
 \r
+       /* Create the co-routines that flash the LED's. */\r
+       vStartFlashCoRoutines( mainNUM_FLASH_COROUTINES );\r
+       \r
        /* In this port, to use preemptive scheduler define configUSE_PREEMPTION \r
        as 1 in portmacro.h.  To use the cooperative scheduler define \r
        configUSE_PREEMPTION as 0. */\r
@@ -205,6 +230,11 @@ static portBASE_TYPE xErrorHasOccurred = pdFALSE;
                xErrorHasOccurred = pdTRUE;\r
        }\r
 \r
+       if( xAreRegTestTasksStillRunning() != pdTRUE )\r
+       {\r
+               xErrorHasOccurred = pdTRUE;\r
+       }\r
+       \r
        if( xErrorHasOccurred == pdFALSE )\r
        {\r
                /* Toggle the LED if everything is okay so we know if an error occurs even if not\r
@@ -222,4 +252,10 @@ unsigned portCHAR ucCount;
        ucCount++;\r
        eeprom_write_byte( mainRESET_COUNT_ADDRESS, ucCount );\r
 }\r
+/*-----------------------------------------------------------*/\r
+\r
+void vApplicationIdleHook( void )\r
+{\r
+       vCoRoutineSchedule();\r
+}\r
 \r