From 994f65b8a2af086993193582c1dc15a628d39c85 Mon Sep 17 00:00:00 2001 From: RichardBarry <3073890+RichardBarry@users.noreply.github.com> Date: Sat, 17 Apr 2021 15:46:12 -0700 Subject: Revert "Add test for timer start delayed past expiration (#557)" This reverts commit 9c911990164abb4939d08fc3ebeccc5f2199c6cb. --- FreeRTOS/Demo/Common/Minimal/TimerDemo.c | 51 -------------------------------- 1 file changed, 51 deletions(-) diff --git a/FreeRTOS/Demo/Common/Minimal/TimerDemo.c b/FreeRTOS/Demo/Common/Minimal/TimerDemo.c index aaf814763..70a1eec30 100644 --- a/FreeRTOS/Demo/Common/Minimal/TimerDemo.c +++ b/FreeRTOS/Demo/Common/Minimal/TimerDemo.c @@ -686,8 +686,6 @@ uint8_t ucTimer; static void prvTest7_CheckBacklogBehaviour( void ) { -UBaseType_t uxOriginalPriority; - /* Use the first auto-reload timer to test stopping a timer from a backlogged callback. */ @@ -736,55 +734,6 @@ UBaseType_t uxOriginalPriority; /* Clear the reload count for the timer used in this test. */ ucAutoReloadTimerCounters[ 0 ] = ( uint8_t ) 0; - - /* Verify a one-shot timer is marked as inactive if the timer task processes - the start or reset request after the expiration time has passed. */ - - /* The timer has not been started yet! */ - if( xTimerIsTimerActive( xOneShotTimer ) != pdFALSE ) - { - xTestStatus = pdFAIL; - configASSERT( xTestStatus ); - } - - /* Use the timer period specific to backlogged timers because it reduces - the impact on other tests that might be running when xTaskCatchUpTicks() - creates the backlog, below. */ - xTimerChangePeriod( xOneShotTimer, tmrdemoBACKLOG_TIMER_PERIOD, tmrdemoDONT_BLOCK ); - - /* Temporarily give this task maximum priority so it can cause the timer - task to delay its processing of the reset request below. */ - uxOriginalPriority = uxTaskPriorityGet( NULL ); - vTaskPrioritySet( NULL, ( configMAX_PRIORITIES - 1 ) ); - - /* Reset the timer. The timer service won't process this request right - away as noted above. */ - xTimerReset( xOneShotTimer, tmrdemoDONT_BLOCK ); - - /* Cause the timer period to elapse without giving an opportunity for the - timer service task to process the reset request. */ - xTaskCatchUpTicks( tmrdemoBACKLOG_TIMER_PERIOD ); - - /* Return this task to its original priority. The timer service task will - process the reset request immediately. The timer task must handle the reset - request as if it were processed at the time of the request even though in - this test the processing occurs after the intended expiration time. */ - vTaskPrioritySet( NULL, uxOriginalPriority ); - - /* The timer should now be inactive. */ - if( xTimerIsTimerActive( xOneShotTimer ) != pdFALSE ) - { - xTestStatus = pdFAIL; - configASSERT( xTestStatus ); - } - - /* Restore the standard timer period, and leave the timer inactive. */ - xTimerChangePeriod( xOneShotTimer, tmrdemoONE_SHOT_TIMER_PERIOD, tmrdemoDONT_BLOCK ); - xTimerStop( xOneShotTimer, tmrdemoDONT_BLOCK ); - - /* Clear the counter for the timer used in this test. */ - ucOneShotTimerCounter = ( uint8_t ) 0; - if( xTestStatus == pdPASS ) { /* No errors have been reported so increment the loop counter so the check -- cgit v1.2.1