diff options
author | Mary Ruthven <mruthven@chromium.org> | 2021-11-17 12:16:21 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:56:32 +0000 |
commit | df2aa2c2d3c251e50ba6a7fc2c5f71dff9a4c326 (patch) | |
tree | 8f87c77fa44394520e7a074f3029dfd761dc45dc /include | |
parent | bb112fc19e67b92c3ac8eddf533dbdc16c4723da (diff) | |
download | chrome-ec-df2aa2c2d3c251e50ba6a7fc2c5f71dff9a4c326.tar.gz |
Revert "ec: Add a task_reset function."
This reverts commit 9cb1b936e76809cb68419c3ff3612e17fec81e9c.
BUG=b:200823466
TEST=make buildall -j
Change-Id: I82d322106022d70f9df3b7b618526ce8adf7e846
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3289991
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/config.h | 22 | ||||
-rw-r--r-- | include/task.h | 51 |
2 files changed, 0 insertions, 73 deletions
diff --git a/include/config.h b/include/config.h index 620c484466..9fd63f81d2 100644 --- a/include/config.h +++ b/include/config.h @@ -1134,7 +1134,6 @@ #define CONFIG_CMD_SYSJUMP #define CONFIG_CMD_SYSLOCK #define CONFIG_CMD_SYSRST -#undef CONFIG_CMD_TASK_RESET #undef CONFIG_CMD_TASKREADY #define CONFIG_CMD_TEMP_SENSOR #define CONFIG_CMD_TIMERINFO @@ -3096,27 +3095,6 @@ #undef CONFIG_CTS_TASK_LIST /* - * List of tasks that support reset. Tasks listed here must also be included in - * CONFIG_TASK_LIST. - * - * For each task, use macro ENABLE_RESET(n) to enable resets. The parameter n - * must match the value passed to TASK_{ALWAYS,NOTEST} in CONFIG_TASK_LIST. - * - * Tasks that enable resets *must* call task_reset_cleanup() once at the - * beginning of their main function, and perform task-specific cleanup if - * necessary. - * - * By default, tasks can be reset at any time. To change this behavior, call - * task_disable_resets() immediately after task_reset_cleanup(), and then enable - * resets where appropriate. - * - * Tasks that predominantly have resets disabled are expected to periodically - * enable resets, and should always ensure to do so before waiting for long - * periods (eg when waiting for an event to process). - */ -#undef CONFIG_TASK_RESET_LIST - -/* * Enable task profiling. * * Boards may #undef this to reduce image size and RAM usage. diff --git a/include/task.h b/include/task.h index 1cc49246b7..6f6136dbbf 100644 --- a/include/task.h +++ b/include/task.h @@ -34,8 +34,6 @@ #define TASK_EVENT_DMA_TC BIT(26) /* ADC interrupt handler event */ #define TASK_EVENT_ADC_DONE BIT(27) -/* task_reset() that was requested has been completed */ -#define TASK_EVENT_RESET_DONE BIT(28) /* task_wake() called on task */ #define TASK_EVENT_WAKE BIT(29) /* Mutex unlocking */ @@ -231,55 +229,6 @@ void task_disable_irq(int irq); */ void task_trigger_irq(int irq); -/* - * A task that supports resets may call this to indicate that it may be reset - * at any point between this call and the next call to task_disable_resets(). - * - * Calling this function will trigger any resets that were requested while - * resets were disabled. - * - * It is not expected for this to be called if resets are already enabled. - */ -void task_enable_resets(void); - -/* - * A task that supports resets may call this to indicate that it may not be - * reset until the next call to task_enable_resets(). Any calls to task_reset() - * during this time will cause a reset request to be queued, and executed - * the next time task_enable_resets() is called. - * - * Must not be called if resets are already disabled. - */ -void task_disable_resets(void); - -/* - * If the current task was reset, completes the reset operation. - * - * Returns a non-zero value if the task was reset; tasks with state outside - * of the stack should perform any necessary cleanup immediately after calling - * this function. - * - * Tasks that support reset must call this function once at startup before - * doing anything else. - * - * Must only be called once at task startup. - */ -int task_reset_cleanup(void); - -/* - * Resets the specified task, which must not be the current task, - * to initial state. - * - * Returns EC_SUCCESS, or EC_ERROR_INVAL if the specified task does - * not support resets. - * - * If wait is true, blocks until the task has been reset. Otherwise, - * returns immediately - in this case the task reset may be delayed until - * that task can be safely reset. The duration of this delay depends on the - * task implementation. - */ -int task_reset(task_id_t id, int wait); - /** * Clear a pending interrupt. * |