git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2822 1d2547de-c912-0410...

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

diff --git a/FreeRTOS/Source/include/task.h b/FreeRTOS/Source/include/task.h
index 40e1e533ddf8a7ff3e7be2ac3a0dcb8bfa35d4a5..b861483d042010b97b35f553becae8edd3804f50 100644 (file)
--- a/FreeRTOS/Source/include/task.h
+++ b/FreeRTOS/Source/include/task.h
@@ -1,6 +1,6 @@
 /*\r
- * FreeRTOS Kernel V10.2.1\r
- * Copyright (C) 2019 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\r
+ * FreeRTOS Kernel V10.3.0\r
+ * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\r
  *\r
  * Permission is hereby granted, free of charge, to any person obtaining a copy of\r
  * this software and associated documentation files (the "Software"), to deal in\r
@@ -43,10 +43,10 @@ extern "C" {
  * MACROS AND DEFINITIONS\r
  *----------------------------------------------------------*/\r
 \r
-#define tskKERNEL_VERSION_NUMBER "V10.2.1"\r
+#define tskKERNEL_VERSION_NUMBER "V10.3.0"\r
 #define tskKERNEL_VERSION_MAJOR 10\r
-#define tskKERNEL_VERSION_MINOR 2\r
-#define tskKERNEL_VERSION_BUILD 1\r
+#define tskKERNEL_VERSION_MINOR 3\r
+#define tskKERNEL_VERSION_BUILD 0\r
 \r
 /* MPU region parameters passed in ulParameters\r
  * of MemoryRegion_t struct. */\r
@@ -831,6 +831,11 @@ void vTaskDelayUntil( TickType_t * const pxPreviousWakeTime, const TickType_t xT
  * task will leave the Blocked state, and return from whichever function call\r
  * placed the task into the Blocked state.\r
  *\r
+ * There is no 'FromISR' version of this function as an interrupt would need to\r
+ * know which object a task was blocked on in order to know which actions to\r
+ * take.  For example, if the task was blocked on a queue the interrupt handler\r
+ * would then need to know if the queue was locked.\r
+ *\r
  * @param xTask The handle of the task to remove from the Blocked state.\r
  *\r
  * @return If the task referenced by xTask was not in the Blocked state then\r
@@ -841,39 +846,6 @@ void vTaskDelayUntil( TickType_t * const pxPreviousWakeTime, const TickType_t xT
  */\r
 BaseType_t xTaskAbortDelay( TaskHandle_t xTask ) PRIVILEGED_FUNCTION;\r
 \r
-/**\r
-* task. h\r
-* <pre>BaseType_t xTaskAbortDelayFromISR( TaskHandle_t xTask, BaseType_t * const pxHigherPriorityTaskWoken )</pre>\r
-*\r
-* INCLUDE_xTaskAbortDelay must be defined as 1 in FreeRTOSConfig.h for this\r
-* function to be available.\r
-*\r
-* A version of xTaskAbortDelay() that can be used from an interrupt service routine.\r
-*\r
-* A task will enter the Blocked state when it is waiting for an event.  The\r
-* event it is waiting for can be a temporal event (waiting for a time), such\r
-* as when vTaskDelay() is called, or an event on an object, such as when\r
-* xQueueReceive() or ulTaskNotifyTake() is called.  If the handle of a task\r
-* that is in the Blocked state is used in a call to xTaskAbortDelay() then the\r
-* task will leave the Blocked state, and return from whichever function call\r
-* placed the task into the Blocked state.\r
-*\r
-* @param xTask The handle of the task to remove from the Blocked state.\r
-*\r
-* @param pxHigherPriorityTaskWoken xTaskAbortDelayFromISR() will set\r
-* *pxHigherPriorityTaskWoken to pdTRUE if a task was removed from the Blocked state,\r
-* and the task that was removed from the Blocked state has a priority higher than the\r
-* currently running task.  If xTaskAbortDelayFromISR() sets this value to pdTRUE then\r
-* a context switch should be requested before the interrupt is exited.\r
-*\r
-* @return If the task referenced by xTask was not in the Blocked state then\r
-* pdFAIL is returned.  Otherwise pdPASS is returned.\r
-*\r
-* \defgroup xTaskAbortDelay xTaskAbortDelayFromISR\r
-* \ingroup TaskCtrl\r
-*/\r
-BaseType_t xTaskAbortDelayFromISR( TaskHandle_t xTask, BaseType_t * const pxHigherPriorityTaskWoken ) PRIVILEGED_FUNCTION;\r
-\r
 /**\r
  * task. h\r
  * <pre>UBaseType_t uxTaskPriorityGet( const TaskHandle_t xTask );</pre>\r
@@ -2241,7 +2213,7 @@ BaseType_t xTaskNotifyStateClear( TaskHandle_t xTask );
 * Clears the bits specified by the ulBitsToClear bit mask in the notification\r
 * value of the task referenced by xTask.\r
 *\r
-* Set ulBitsToClear to to 0xffffffff (UINT_MAX on 32-bit architectures) to clear\r
+* Set ulBitsToClear to 0xffffffff (UINT_MAX on 32-bit architectures) to clear\r
 * the notification value to 0.  Set ulBitsToClear to 0 to query the task's\r
 * notification value without clearing any bits.\r
 *\r