/*\r
- FreeRTOS V8.2.0 - Copyright (C) 2015 Real Time Engineers Ltd.\r
+ FreeRTOS V8.2.1 - Copyright (C) 2015 Real Time Engineers Ltd.\r
All rights reserved\r
\r
VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
the terms of the GNU General Public License (version 2) as published by the\r
Free Software Foundation >>!AND MODIFIED BY!<< the FreeRTOS exception.\r
\r
- ***************************************************************************\r
+ ***************************************************************************\r
>>! NOTE: The modification to the GPL is included to allow you to !<<\r
>>! distribute a combined work that includes FreeRTOS without being !<<\r
>>! obliged to provide the source code for proprietary components !<<\r
>>! outside of the FreeRTOS kernel. !<<\r
- ***************************************************************************\r
+ ***************************************************************************\r
\r
FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
***************************************************************************\r
\r
http://www.FreeRTOS.org/FAQHelp.html - Having a problem? Start by reading\r
- the FAQ page "My application does not run, what could be wrong?". Have you\r
- defined configASSERT()?\r
+ the FAQ page "My application does not run, what could be wrong?". Have you\r
+ defined configASSERT()?\r
\r
- http://www.FreeRTOS.org/support - In return for receiving this top quality\r
- embedded software for free we request you assist our global community by\r
- participating in the support forum.\r
+ http://www.FreeRTOS.org/support - In return for receiving this top quality\r
+ embedded software for free we request you assist our global community by\r
+ participating in the support forum.\r
\r
- http://www.FreeRTOS.org/training - Investing in training allows your team to\r
- be as productive as possible as early as possible. Now you can receive\r
- FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers\r
- Ltd, and the world's leading authority on the world's leading RTOS.\r
+ http://www.FreeRTOS.org/training - Investing in training allows your team to\r
+ be as productive as possible as early as possible. Now you can receive\r
+ FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers\r
+ Ltd, and the world's leading authority on the world's leading RTOS.\r
\r
http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r
{\r
const TickType_t xTicksToWait = pdMS_TO_TICKS( 100UL );\r
BaseType_t xReturned;\r
-uint32_t ulNotifiedValue, ulLoop, ulNotifyingValue;\r
+uint32_t ulNotifiedValue, ulLoop, ulNotifyingValue, ulPreviousValue, ulExpectedValue;\r
TickType_t xTimeOnEntering;\r
const uint32_t ulFirstNotifiedConst = 100001UL, ulSecondNotifiedValueConst = 5555UL, ulMaxLoops = 5UL;\r
const uint32_t ulBit0 = 0x01UL, ulBit1 = 0x02UL;\r
Check no blocking when notifications are pending. First notify itself -\r
this would not be a normal thing to do and is done here for test purposes\r
only. */\r
- xReturned = xTaskNotify( xTaskToNotify, ulFirstNotifiedConst, eSetValueWithoutOverwrite );\r
+ xReturned = xTaskNotifyAndQuery( xTaskToNotify, ulFirstNotifiedConst, eSetValueWithoutOverwrite, &ulPreviousValue );\r
\r
/* Even through the 'without overwrite' action was used the update should\r
have been successful. */\r
configASSERT( xReturned == pdPASS );\r
\r
+ /* No bits should have been pending previously. */\r
+ configASSERT( ulPreviousValue == 0 );\r
+\r
/* The task should now have a notification pending, and so not time out. */\r
xTimeOnEntering = xTaskGetTickCount();\r
xReturned = xTaskNotifyWait( ULONG_MAX, 0, &ulNotifiedValue, xTicksToWait );\r
\r
\r
\r
+\r
+ /*--------------------------------------------------------------------------\r
+ Now try querying the previus value while notifying a task. */\r
+ xTaskNotifyAndQuery( xTaskToNotify, 0x00, eSetBits, &ulPreviousValue );\r
+ configASSERT( ulNotifiedValue == ( ULONG_MAX & ~( ulBit0 | ulBit1 ) ) );\r
+\r
+ /* Clear all bits. */\r
+ xTaskNotifyWait( 0x00, ULONG_MAX, &ulNotifiedValue, 0 );\r
+ xTaskNotifyAndQuery( xTaskToNotify, 0x00, eSetBits, &ulPreviousValue );\r
+ configASSERT( ulPreviousValue == 0 );\r
+\r
+ ulExpectedValue = 0;\r
+ for( ulLoop = 0x01; ulLoop < 0x80UL; ulLoop <<= 1UL )\r
+ {\r
+ /* Set the next bit up, and expect to receive the last bits set (so\r
+ the previous value will not yet have the bit being set this time\r
+ around). */\r
+ xTaskNotifyAndQuery( xTaskToNotify, ulLoop, eSetBits, &ulPreviousValue );\r
+ configASSERT( ulExpectedValue == ulPreviousValue );\r
+ ulExpectedValue |= ulLoop;\r
+ }\r
+\r
/* Incremented to show the task is still running. */\r
ulNotifyCycleCount++;\r
\r
xPeriod = xMinPeriod;\r
}\r
\r
+ /* Change the timer period and start the timer. */\r
xTimerChangePeriod( xTimer, xPeriod, portMAX_DELAY );\r
- xTimerStart( xTimer, portMAX_DELAY );\r
\r
/* Block waiting for the notification again with a different period.\r
Sometimes the period will be higher than the tasks block time, sometimes\r
\r
/* Check the count of 'takes' from the software timer is keeping track with\r
the amount of 'gives'. */\r
- if( ulTimerNotificationsSent > ulTimerNotificationsSent )\r
+ if( ulTimerNotificationsSent > ulTimerNotificationsReceived )\r
{\r
if( ( ulTimerNotificationsSent - ulTimerNotificationsReceived ) > ulMaxSendReceiveDeviation )\r
{\r
projects / freertos / blobdiff