Merge branch 'master' into feature/freertos_static_buffers

This commit is contained in:
Ivan Grokhotkov
2016-10-27 12:38:35 +08:00
62 changed files with 1098 additions and 422 deletions
+2 -3
View File
@@ -3913,9 +3913,8 @@ In fact, nothing below this line has/is.
/* Gotcha (which seems to be deliberate in FreeRTOS, according to
http://www.freertos.org/FreeRTOS_Support_Forum_Archive/December_2012/freertos_PIC32_Bug_-_vTaskEnterCritical_6400806.html
) is that calling vTaskEnterCritical followed by vTaskExitCritical will leave the interrupts DISABLED! Re-enabling the
scheduler will re-enable the interrupts instead. */
) is that calling vTaskEnterCritical followed by vTaskExitCritical will leave the interrupts DISABLED when the scheduler
is not running. Re-enabling the scheduler will re-enable the interrupts instead. */
#if ( portCRITICAL_NESTING_IN_TCB == 1 )