From 5fc69d4e3b67b9b886c2ad8c35562073e7c7fcbe Mon Sep 17 00:00:00 2001 From: richardbarry Date: Sun, 29 Aug 2010 18:05:06 +0000 Subject: [PATCH] Some changes to the RX/Renesas main-full.c file to tidy up a bit. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1073 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../RTOSDemo/main-full.c | 249 +++++++++--------- 1 file changed, 130 insertions(+), 119 deletions(-) diff --git a/Demo/RX600_RX62N-MDK_Renesas/RTOSDemo/main-full.c b/Demo/RX600_RX62N-MDK_Renesas/RTOSDemo/main-full.c index 03ccf241c..7e0f49c70 100644 --- a/Demo/RX600_RX62N-MDK_Renesas/RTOSDemo/main-full.c +++ b/Demo/RX600_RX62N-MDK_Renesas/RTOSDemo/main-full.c @@ -33,9 +33,9 @@ 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 and the FreeRTOS license exception along with FreeRTOS; if not it - can be viewed here: http://www.freertos.org/a00114.html and also obtained + more details. You should have received a copy of the GNU General Public + License and the FreeRTOS license exception along with FreeRTOS; if not it + can be viewed here: http://www.freertos.org/a00114.html and also obtained by writing to Richard Barry, contact details for whom are available on the FreeRTOS WEB site. @@ -51,32 +51,31 @@ licensing and training services. */ -/* +/* * This project includes a lot of tasks and tests and is therefore complex. * If you would prefer a much simpler project to get started with then select * the 'Blinky' build configuration within the HEW IDE. * - * Creates all the demo application tasks, then starts the scheduler. The WEB + * Creates all the demo application tasks, then starts the scheduler. The web * documentation provides more details of the standard demo application tasks, * which provide no particular functionality but do provide a good example of * how to use the FreeRTOS API. The tasks defined in flop.c are included in the * set of standard demo tasks to ensure the floating point unit gets some - * exercise. + * exercise. * - * In addition to the standard demo tasks, the following tasks and tests are + * In addition to the standard demo tasks, the following tasks and tests are * defined and/or created within this file: * * "Reg test" tasks - These fill the registers with known values, then check * that each register still contains its expected value. Each task uses - * different values. The tasks run with very low priority so get preempted very - * frequently. A register containing an unexpected value is indicative of an - * error in the context switching mechanism and will result in interrupts being - * disabled and a branch to a null loop. This has the effect of stopping - * execution of all the tests and tasks, which in turn results in all LED - * activity stopping too. The nature of the reg test tasks necessitates that - * they are written in assembly code. The check task (described below) checks - * that the reg test tasks are still executing and will indicate an error if - * either reg test task is found to have stalled. + * different values. The tasks run with very low priority so get preempted + * very frequently. A check variable is incremented on each iteration of the + * test loop. A register containing an unexpected value is indicative of an + * error in the context switching mechanism and will result in a branch to a + * null loop - which in turn will prevent the check variable from incrementing + * any further and allow the check task (described below) to determine that an + * error has occurred. The nature of the reg test tasks necessitates that they + * are written in assembly code. * * "Check" task - This only executes every five seconds but has a high priority * to ensure it gets processor time. Its main function is to check that all the @@ -85,24 +84,24 @@ * rate increasing to 200ms being a visual indication that at least one task has * reported unexpected behaviour. * - * "High frequency timer test" - A high frequency periodic interrupt is - * generated using a timer - the interrupt is assigned a priority above + * "High frequency timer test" - A high frequency periodic interrupt is + * generated using a timer - the interrupt is assigned a priority above * configMAX_SYSCALL_INTERRUPT_PRIORITY so should not be effected by anything - * the kernel is doing. The interrupt service routine measures the number of - * counts a separate timer performs between each interrupt to determine the + * the kernel is doing. The interrupt service routine measures the number of + * counts a separate timer performs between each interrupt to determine the * jitter in the interrupt timing. * * *NOTE 1* If LED5 is toggling every 5 seconds then all the demo application - * tasks are executing as expected and no errors have been reported in any + * tasks are executing as expected and no errors have been reported in any * tasks. The toggle rate increasing to 200ms indicates that at least one task * has reported unexpected behaviour. - * + * * *NOTE 2* vApplicationSetupTimerInterrupt() is called by the kernel to let * the application set up a timer to generate the tick interrupt. In this - * example a compare match timer is used for this purpose. + * example a compare match timer is used for this purpose. * * *NOTE 3* The CPU must be in Supervisor mode when the scheduler is started. - * The PowerON_Reset_PC() supplied in resetprg.c with this demo has + * The PowerON_Reset_PC() supplied in resetprg.c with this demo has * Change_PSW_PM_to_UserMode() commented out to ensure this is the case. * * *NOTE 4* The IntQueue common demo tasks test interrupt nesting and make use @@ -131,7 +130,7 @@ #include "recmutex.h" #include "flop.h" -/* Values that are passed into the reg test tasks using the task parameter. The +/* Values that are passed into the reg test tasks using the task parameter. The tasks check that the values are passed in correctly. */ #define mainREG_TEST_1_PARAMETER ( 0x12121212UL ) #define mainREG_TEST_2_PARAMETER ( 0x12345678UL ) @@ -149,22 +148,22 @@ tasks check that the values are passed in correctly. */ #define mainFLOP_TASK_PRIORITY ( tskIDLE_PRIORITY ) /* The LED toggled by the check task. */ -#define mainCHECK_LED ( 5 ) +#define mainCHECK_LED ( 5 ) /* The rate at which mainCHECK_LED will toggle when all the tasks are running without error. Controlled by the check task as described at the top of this file. */ -#define mainNO_ERROR_CYCLE_TIME ( 5000 / portTICK_RATE_MS ) +#define mainNO_ERROR_CYCLE_TIME ( 5000 / portTICK_RATE_MS ) /* The rate at which mainCHECK_LED will toggle when an error has been reported -by at least one task. Controlled by the check task as described at the top of +by at least one task. Controlled by the check task as described at the top of this file. */ -#define mainERROR_CYCLE_TIME ( 200 / portTICK_RATE_MS ) +#define mainERROR_CYCLE_TIME ( 200 / portTICK_RATE_MS ) /* The period of the peripheral clock in nano seconds. This is used to calculate the jitter time in nano seconds as part of the high frequency timer test. The clock driving the timer is divided by 8. */ -#define mainNS_PER_CLOCK ( ( unsigned long ) ( ( 1.0 / ( ( double ) configPERIPHERAL_CLOCK_HZ ) / 8.0 ) * 1000000000.0 ) ) +#define mainNS_PER_CLOCK ( ( unsigned long ) ( ( 1.0 / ( ( double ) configPERIPHERAL_CLOCK_HZ ) / 8.0 ) * 1000000000.0 ) ) /* * vApplicationMallocFailedHook() will only be called if @@ -172,7 +171,7 @@ clock driving the timer is divided by 8. */ * function that will execute if a call to pvPortMalloc() fails. * pvPortMalloc() is called internally by the kernel whenever a task, queue or * semaphore is created. It is also called by various parts of the demo - * application. + * application. */ void vApplicationMallocFailedHook( void ); @@ -190,8 +189,8 @@ void vApplicationMallocFailedHook( void ); void vApplicationIdleHook( void ); /* - * vApplicationStackOverflowHook() will only be called if - * configCHECK_FOR_STACK_OVERFLOW is set to a non-zero value. The handle and + * vApplicationStackOverflowHook() will only be called if + * configCHECK_FOR_STACK_OVERFLOW is set to a non-zero value. The handle and * name of the offending task should be passed in the function parameters, but * it is possible that the stack overflow will have corrupted these - in which * case pxCurrentTCB can be inspected to find the same information. @@ -216,9 +215,9 @@ static void prvRegTest2Implementation( void ); */ static void prvCheckTask( void *pvParameters ); -/* Variables that are incremented on each iteration of the reg test tasks - +/* Variables that are incremented on each iteration of the reg test tasks - provided the tasks have not reported any errors. The check task inspects these -variables to ensure they are still incrementing as expected. If a variable +variables to ensure they are still incrementing as expected. If a variable stops incrementing then it is likely that its associate task has stalled. */ unsigned long ulRegTest1CycleCount = 0UL, ulRegTest2CycleCount = 0UL; @@ -231,10 +230,10 @@ extern void HardwareSetup( void ); /* Renesas provided CPU configuration routine. The clocks are configured in here. */ HardwareSetup(); - + /* Turn all LEDs off. */ vParTestInitialise(); - + /* Start the reg test tasks which test the context switching mechanism. */ xTaskCreate( prvRegTest1Task, "RegTst1", configMINIMAL_STACK_SIZE, ( void * ) mainREG_TEST_1_PARAMETER, tskIDLE_PRIORITY, NULL ); xTaskCreate( prvRegTest2Task, "RegTst2", configMINIMAL_STACK_SIZE, ( void * ) mainREG_TEST_2_PARAMETER, tskIDLE_PRIORITY, NULL ); @@ -245,12 +244,12 @@ extern void HardwareSetup( void ); /* Create the standard demo tasks. */ vStartBlockingQueueTasks( mainBLOCK_Q_PRIORITY ); vCreateBlockTimeTasks(); - vStartSemaphoreTasks( mainSEM_TEST_PRIORITY ); - vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY ); - vStartIntegerMathTasks( mainINTEGER_TASK_PRIORITY ); - vStartGenericQueueTasks( mainGEN_QUEUE_TASK_PRIORITY ); + vStartSemaphoreTasks( mainSEM_TEST_PRIORITY ); + vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY ); + vStartIntegerMathTasks( mainINTEGER_TASK_PRIORITY ); + vStartGenericQueueTasks( mainGEN_QUEUE_TASK_PRIORITY ); vStartLEDFlashTasks( mainFLASH_TASK_PRIORITY ); - vStartQueuePeekTasks(); + vStartQueuePeekTasks(); vStartRecursiveMutexTasks(); vStartInterruptQueueTasks(); vStartMathTasks( mainFLOP_TASK_PRIORITY ); @@ -258,11 +257,11 @@ extern void HardwareSetup( void ); /* 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 ); + vCreateSuicidalTasks( mainCREATOR_TASK_PRIORITY ); /* Start the tasks running. */ vTaskStartScheduler(); - + /* If all is well we will never reach here as the scheduler will now be running. If we do reach here then it is likely that there was insufficient heap available for the idle task to be created. */ @@ -277,9 +276,10 @@ portTickType xNextWakeTime, xCycleFrequency = mainNO_ERROR_CYCLE_TIME; extern void vSetupHighFrequencyTimer( void ); extern volatile unsigned short usMaxJitter; volatile unsigned long ulActualJitter = 0; +static char cErrorText[ 100 ]; /* If this is being executed then the kernel has been started. Start the high - frequency timer test as described at the top of this file. This is only + frequency timer test as described at the top of this file. This is only included in the optimised build configuration - otherwise it takes up too much CPU time. */ #ifdef INCLUDE_HIGH_FREQUENCY_TIMER_TEST @@ -301,46 +301,57 @@ volatile unsigned long ulActualJitter = 0; rate at which mainCHECK_LED flashes to give visual feedback that an error has occurred. */ xCycleFrequency = mainERROR_CYCLE_TIME; + strcpy( cErrorText, "Error: GenQueue" ); } else if( xAreQueuePeekTasksStillRunning() != pdTRUE ) { xCycleFrequency = mainERROR_CYCLE_TIME; + strcpy( cErrorText, "Error: QueuePeek" ); } else if( xAreBlockingQueuesStillRunning() != pdTRUE ) { xCycleFrequency = mainERROR_CYCLE_TIME; + strcpy( cErrorText, "Error: BlockQueue" ); } else if( xAreBlockTimeTestTasksStillRunning() != pdTRUE ) { xCycleFrequency = mainERROR_CYCLE_TIME; + strcpy( cErrorText, "Error: BlockTime" ); + } + else if( xAreSemaphoreTasksStillRunning() != pdTRUE ) + { + xCycleFrequency = mainERROR_CYCLE_TIME; + strcpy( cErrorText, "Error: SemTest" ); + } + else if( xArePollingQueuesStillRunning() != pdTRUE ) + { + xCycleFrequency = mainERROR_CYCLE_TIME; + strcpy( cErrorText, "Error: PollQueue" ); + } + else if( xIsCreateTaskStillRunning() != pdTRUE ) + { + xCycleFrequency = mainERROR_CYCLE_TIME; + strcpy( cErrorText, "Error: Death" ); + } + else if( xAreIntegerMathsTaskStillRunning() != pdTRUE ) + { + xCycleFrequency = mainERROR_CYCLE_TIME; + strcpy( cErrorText, "Error: IntMath" ); + } + else if( xAreRecursiveMutexTasksStillRunning() != pdTRUE ) + { + xCycleFrequency = mainERROR_CYCLE_TIME; + strcpy( cErrorText, "Error: RecMutex" ); } - else if( xAreSemaphoreTasksStillRunning() != pdTRUE ) - { - xCycleFrequency = mainERROR_CYCLE_TIME; - } - else if( xArePollingQueuesStillRunning() != pdTRUE ) - { - xCycleFrequency = mainERROR_CYCLE_TIME; - } - else if( xIsCreateTaskStillRunning() != pdTRUE ) - { - xCycleFrequency = mainERROR_CYCLE_TIME; - } - else if( xAreIntegerMathsTaskStillRunning() != pdTRUE ) - { - xCycleFrequency = mainERROR_CYCLE_TIME; - } - else if( xAreRecursiveMutexTasksStillRunning() != pdTRUE ) - { - xCycleFrequency = mainERROR_CYCLE_TIME; - } else if( xAreIntQueueTasksStillRunning() != pdPASS ) { xCycleFrequency = mainERROR_CYCLE_TIME; + strcpy( cErrorText, "Error: IntQueue" ); } else if( xAreMathsTaskStillRunning() != pdPASS ) { xCycleFrequency = mainERROR_CYCLE_TIME; + strcpy( cErrorText, "Error: Flop" ); } /* Check the reg test tasks are still cycling. They will stop incrementing @@ -348,23 +359,25 @@ volatile unsigned long ulActualJitter = 0; if( ulRegTest1CycleCount == ulLastRegTest1CycleCount ) { xCycleFrequency = mainERROR_CYCLE_TIME; + strcpy( cErrorText, "Error: RegTest1" ); } if( ulRegTest2CycleCount == ulLastRegTest2CycleCount ) { xCycleFrequency = mainERROR_CYCLE_TIME; + strcpy( cErrorText, "Error: RegTest2" ); } - + ulLastRegTest1CycleCount = ulRegTest1CycleCount; ulLastRegTest2CycleCount = ulRegTest2CycleCount; - - /* Toggle the check LED to give an indication of the system status. If - the LED toggles every 5 seconds then everything is ok. A faster toggle + + /* Toggle the check LED to give an indication of the system status. If + the LED toggles every 5 seconds then everything is ok. A faster toggle indicates an error. */ vParTestToggleLED( mainCHECK_LED ); - - /* Calculate the maximum jitter experienced by the high frequency timer - test and print it out. It is ok to use printf without worrying about + + /* Calculate the maximum jitter experienced by the high frequency timer + test and print it out. It is ok to use printf without worrying about mutual exclusion as it is not used anywhere else in this demo. */ //sprintf( cTempBuf, "%s [%fns]\n", "Max Jitter = ", ( ( float ) usMaxJitter ) * mainNS_PER_CLOCK ); ulActualJitter = ( ( unsigned long ) usMaxJitter ) * mainNS_PER_CLOCK; @@ -372,28 +385,28 @@ volatile unsigned long ulActualJitter = 0; } /*-----------------------------------------------------------*/ -/* The RX port uses this callback function to configure its tick interrupt. +/* The RX port uses this callback function to configure its tick interrupt. This allows the application to choose the tick interrupt source. */ void vApplicationSetupTimerInterrupt( void ) { /* Enable compare match timer 0. */ MSTP( CMT0 ) = 0; - + /* Interrupt on compare match. */ CMT0.CMCR.BIT.CMIE = 1; - + /* Set the compare match value. */ CMT0.CMCOR = ( unsigned short ) ( ( ( configPERIPHERAL_CLOCK_HZ / configTICK_RATE_HZ ) -1 ) / 8 ); - + /* Divide the PCLK by 8. */ CMT0.CMCR.BIT.CKS = 0; - + /* Enable the interrupt... */ _IEN( _CMT0_CMI0 ) = 1; - + /* ...and set its priority to the application defined kernel priority. */ _IPR( _CMT0_CMI0 ) = configKERNEL_INTERRUPT_PRIORITY; - + /* Start the timer. */ CMT.CMSTR0.BIT.STR0 = 1; } @@ -434,9 +447,9 @@ static void prvRegTest1Task( void *pvParameters ) taskDISABLE_INTERRUPTS(); } } - + /* This is an inline asm function that never returns. */ - prvRegTest1Implementation(); + prvRegTest1Implementation(); } /*-----------------------------------------------------------*/ @@ -452,9 +465,9 @@ static void prvRegTest2Task( void *pvParameters ) taskDISABLE_INTERRUPTS(); } } - + /* This is an inline asm function that never returns. */ - prvRegTest2Implementation(); + prvRegTest2Implementation(); } /*-----------------------------------------------------------*/ @@ -478,70 +491,69 @@ static void prvRegTest1Implementation( void ) MOV.L #13, R13 MOV.L #14, R14 MOV.L #15, R15 - + ; Loop, checking each itteration that each register still contains the ; expected value. -TestLoop1: +TestLoop1: ; Push the registers that are going to get clobbered. PUSHM R14-R15 - + ; Increment the loop counter to show this task is still getting CPU time. MOV.L #_ulRegTest1CycleCount, R14 MOV.L [ R14 ], R15 ADD #1, R15 MOV.L R15, [ R14 ] - + ; Yield to extend the text coverage. Set the bit in the ITU SWINTR register. MOV.L #1, R14 MOV.L #0872E0H, R15 MOV.B R14, [R15] NOP NOP - + ; Restore the clobbered registers. POPM R14-R15 - + ; Now compare each register to ensure it still contains the value that was ; set before this loop was entered. CMP #1, R1 - BNE RegTest2Error + BNE RegTest1Error CMP #2, R2 - BNE RegTest2Error + BNE RegTest1Error CMP #3, R3 - BNE RegTest2Error + BNE RegTest1Error CMP #4, R4 - BNE RegTest2Error + BNE RegTest1Error CMP #5, R5 - BNE RegTest2Error + BNE RegTest1Error CMP #6, R6 - BNE RegTest2Error + BNE RegTest1Error CMP #7, R7 - BNE RegTest2Error + BNE RegTest1Error CMP #8, R8 - BNE RegTest2Error + BNE RegTest1Error CMP #9, R9 - BNE RegTest2Error + BNE RegTest1Error CMP #10, R10 - BNE RegTest2Error + BNE RegTest1Error CMP #11, R11 - BNE RegTest2Error + BNE RegTest1Error CMP #12, R12 - BNE RegTest2Error + BNE RegTest1Error CMP #13, R13 - BNE RegTest2Error + BNE RegTest1Error CMP #14, R14 - BNE RegTest2Error + BNE RegTest1Error CMP #15, R15 - BNE RegTest2Error + BNE RegTest1Error ; All comparisons passed, start a new itteratio of this loop. BRA TestLoop1 - + RegTest1Error: - ; A compare failed, something has gone wrong. Stop the tick and any other - ; interrupts to make it obvious that things have halted. - CLRPSW I + ; A compare failed, just loop here so the loop counter stops incrementing + ; causing the check task to indicate the error. BRA RegTest1Error } /*-----------------------------------------------------------*/ @@ -566,23 +578,23 @@ static void prvRegTest2Implementation( void ) MOV.L #130, R13 MOV.L #140, R14 MOV.L #150, R15 - + ; Loop, checking on each itteration that each register still contains the ; expected value. -TestLoop2: - +TestLoop2: + ; Push the registers that are going to get clobbered. PUSHM R14-R15 - + ; Increment the loop counter to show this task is still getting CPU time. MOV.L #_ulRegTest2CycleCount, R14 MOV.L [ R14 ], R15 ADD #1, R15 MOV.L R15, [ R14 ] - + ; Restore the clobbered registers. - POPM R14-R15 - + POPM R14-R15 + CMP #10, R1 BNE RegTest2Error CMP #20, R2 @@ -616,11 +628,10 @@ TestLoop2: ; All comparisons passed, start a new itteratio of this loop. BRA TestLoop2 - + RegTest2Error: - ; A compare failed, something went wrong. Stop the tick and any other - ; interrupts to make it obvious that things have halted. - CLRPSW I + ; A compare failed, just loop here so the loop counter stops incrementing + ; - causing the check task to indicate the error. BRA RegTest2Error } -- 2.39.5