Default the definition of portASSERT_IF_IN_ISR() to nothing if it is not defined.

[freertos] / FreeRTOS / Source / include / task.h

diff --git a/FreeRTOS/Source/include/task.h b/FreeRTOS/Source/include/task.h
index ae279e1d6000905f9963571fb59b30618e8f4ed1..e8fc4559aec00788dfdea55a92ad4743038cd947 100644 (file)
--- a/FreeRTOS/Source/include/task.h
+++ b/FreeRTOS/Source/include/task.h
@@ -1507,7 +1507,7 @@ void vTaskPriorityInherit( TaskHandle_t const pxMutexHolder ) PRIVILEGED_FUNCTIO
  * Set the priority of a task back to its proper priority in the case that it\r
  * inherited a higher priority while it was holding a semaphore.\r
  */\r
-void vTaskPriorityDisinherit( TaskHandle_t const pxMutexHolder ) PRIVILEGED_FUNCTION;\r
+BaseType_t xTaskPriorityDisinherit( TaskHandle_t const pxMutexHolder ) PRIVILEGED_FUNCTION;\r
 \r
 /*\r
  * Generic version of the task creation function which is in turn called by the\r
@@ -1552,6 +1552,15 @@ void vTaskStepTick( const TickType_t xTicksToJump ) PRIVILEGED_FUNCTION;
  */\r
 eSleepModeStatus eTaskConfirmSleepModeStatus( void ) PRIVILEGED_FUNCTION;\r
 \r
+/*\r
+ * For internal use only.  Increment the mutex held count when a mutex is\r
+ * taken and decrement the mutex held count when the mutex is given back\r
+ * respectively.  The mutex held count is used to know when it is safe to\r
+ * disinherit a priority.\r
+ */\r
+void vTaskIncrementMutexHeldCount( void );\r
+void vTaskDecrementMutexHeldCount( void );\r
+\r
 #ifdef __cplusplus\r
 }\r
 #endif\r