/*\r
- FreeRTOS.org V5.0.4 - Copyright (C) 2003-2008 Richard Barry.\r
+ FreeRTOS.org V5.1.1 - Copyright (C) 2003-2008 Richard Barry.\r
\r
This file is part of the FreeRTOS.org distribution.\r
\r
\r
/* Demo app includes. */\r
#include "BlockQ.h"\r
-#include "death.h"\r
-#include "flash.h"\r
+#include "crflash.h"\r
#include "partest.h"\r
#include "semtest.h"\r
-#include "PollQ.h"\r
#include "GenQTest.h"\r
#include "QPeek.h"\r
-#include "recmutex.h"\r
+#include "comtest2.h"\r
\r
/*-----------------------------------------------------------*/\r
\r
\r
/* Task priorities. */\r
#define mainCOM_TEST_PRIORITY ( tskIDLE_PRIORITY + 2 )\r
-#define mainQUEUE_POLL_PRIORITY ( tskIDLE_PRIORITY + 2 )\r
#define mainCHECK_TASK_PRIORITY ( tskIDLE_PRIORITY + 3 )\r
#define mainSEM_TEST_PRIORITY ( tskIDLE_PRIORITY + 1 )\r
#define mainBLOCK_Q_PRIORITY ( tskIDLE_PRIORITY + 2 )\r
-#define mainCREATOR_TASK_PRIORITY ( tskIDLE_PRIORITY + 2 )\r
-#define mainINTEGER_TASK_PRIORITY ( tskIDLE_PRIORITY )\r
#define mainGEN_QUEUE_TASK_PRIORITY ( tskIDLE_PRIORITY )\r
-#define mainWEB_TASK_PRIORITY ( tskIDLE_PRIORITY + 2 )\r
+\r
+/* Co-routines are used to flash the LEDs. */\r
+#define mainNUM_FLASH_CO_ROUTINES ( 3 )\r
+\r
+/* The baud rate used by the comtest tasks. */\r
+#define mainBAUD_RATE ( 38400 )\r
+\r
+/* There is no spare LED for the comtest tasks, so this is set to an invalid\r
+number. */\r
+#define mainCOM_LED ( 4 )\r
\r
/*\r
* Configure the hardware for the demo.\r
prvSetupHardware();\r
\r
/* Start the standard demo tasks. */\r
- vStartLEDFlashTasks( tskIDLE_PRIORITY );\r
vStartSemaphoreTasks( mainSEM_TEST_PRIORITY );\r
- vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );\r
vStartGenericQueueTasks( mainGEN_QUEUE_TASK_PRIORITY );\r
vStartQueuePeekTasks();\r
- vStartRecursiveMutexTasks();\r
vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY );\r
+ vAltStartComTestTasks( mainCOM_TEST_PRIORITY, mainBAUD_RATE, mainCOM_LED );\r
\r
- /* Start the reg test tasks - defined in this file. */\r
- xTaskCreate( vRegTest1Task, ( signed portCHAR * ) "Reg1", configMINIMAL_STACK_SIZE, ( void * ) &ulRegTest1Counter, tskIDLE_PRIORITY, NULL );\r
- xTaskCreate( vRegTest2Task, ( signed portCHAR * ) "Reg2", configMINIMAL_STACK_SIZE, ( void * ) &ulRegTest2Counter, tskIDLE_PRIORITY, NULL );\r
+ /* For demo purposes use some co-routines to flash the LEDs. */\r
+ vStartFlashCoRoutines( mainNUM_FLASH_CO_ROUTINES );\r
\r
/* Create the check task. */\r
xTaskCreate( prvCheckTask, ( signed portCHAR * ) "Check", configMINIMAL_STACK_SIZE, NULL, mainCHECK_TASK_PRIORITY, NULL );\r
\r
- /* The suicide tasks must be created last as they need to know how many\r
- tasks were running prior to their creation in order to ascertain whether\r
- or not the correct/expected number of tasks are running at any given time. */\r
- vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY );\r
+\r
+ /* Start the reg test tasks - defined in this file. */\r
+ xTaskCreate( vRegTest1Task, ( signed portCHAR * ) "Reg1", configMINIMAL_STACK_SIZE, ( void * ) &ulRegTest1Counter, tskIDLE_PRIORITY, NULL );\r
+ xTaskCreate( vRegTest2Task, ( signed portCHAR * ) "Reg2", configMINIMAL_STACK_SIZE, ( void * ) &ulRegTest2Counter, tskIDLE_PRIORITY, NULL );\r
\r
/* Start the scheduler. */\r
vTaskStartScheduler();\r
\r
static void prvCheckTask( void *pvParameters )\r
{\r
-unsigned ulTicksToWait = mainNO_ERROR_PERIOD, ulError = 0, ulLastRegTest1Count = 0, ulLastRegTest2Count = 0;\r
+unsigned portLONG ulTicksToWait = mainNO_ERROR_PERIOD, ulError = 0, ulLastRegTest1Count = 0, ulLastRegTest2Count = 0;\r
portTickType xLastExecutionTime;\r
+volatile unsigned portBASE_TYPE uxUnusedStack;\r
\r
( void ) pvParameters;\r
\r
{\r
ulError |= 0x20UL;\r
}\r
-\r
- if( xArePollingQueuesStillRunning() != pdTRUE )\r
+ \r
+ if( xAreComTestTasksStillRunning() != pdTRUE )\r
{\r
ulError |= 0x40UL;\r
}\r
\r
- if( xIsCreateTaskStillRunning() != pdTRUE )\r
- {\r
- ulError |= 0x80UL;\r
- }\r
-\r
- if( xAreRecursiveMutexTasksStillRunning() != pdTRUE )\r
- {\r
- ulError |= 0x200UL;\r
- }\r
-\r
if( ulLastRegTest1Count == ulRegTest1Counter )\r
{\r
ulError |= 0x1000UL;\r
ulLastRegTest2Count = ulRegTest2Counter;\r
\r
/* If an error has been found then increase our cycle rate, and in so\r
- going increase the rate at which the check task LED toggles. */\r
+ doing increase the rate at which the check task LED toggles. */\r
if( ulError != 0 )\r
{\r
ulTicksToWait = mainERROR_PERIOD;\r
\r
/* Toggle the LED each itteration. */\r
vParTestToggleLED( mainCHECK_LED );\r
+ \r
+ /* For demo only - how much unused stack does this task have? */\r
+ uxUnusedStack = uxTaskGetStackHighWaterMark( NULL );\r
}\r
}\r
/*-----------------------------------------------------------*/\r
}\r
/*-----------------------------------------------------------*/\r
\r
+void vApplicationIdleHook( void );\r
+void vApplicationIdleHook( void )\r
+{\r
+ /* The co-routines run in the idle task. */\r
+ vCoRoutineSchedule();\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+void exit( int n )\r
+{\r
+ /* To keep the linker happy only as the libraries have been removed from\r
+ the build. */\r
+ ( void ) n;\r
+ for( ;; ) {}\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
static void vRegTest1Task( void *pvParameters )\r
{\r
/* Sanity check - did we receive the parameter expected? */\r
}\r
/*-----------------------------------------------------------*/\r
\r
-/* To keep the linker happy. */\r
-void exit( int n )\r
-{\r
- ( void ) n;\r
- for( ;; ) {}\r
-}\r
\r
\r
projects / freertos / blobdiff