summaryrefslogtreecommitdiff
path: root/zephyr
diff options
context:
space:
mode:
Diffstat (limited to 'zephyr')
-rw-r--r--zephyr/shim/src/tasks.c3
-rw-r--r--zephyr/test/tasks/main.c12
2 files changed, 7 insertions, 8 deletions
diff --git a/zephyr/shim/src/tasks.c b/zephyr/shim/src/tasks.c
index 78bee0a69a..45450076ee 100644
--- a/zephyr/shim/src/tasks.c
+++ b/zephyr/shim/src/tasks.c
@@ -69,14 +69,13 @@ task_id_t task_get_current(void)
return 0;
}
-uint32_t task_set_event(task_id_t cros_task_id, uint32_t event, int wait)
+uint32_t task_set_event(task_id_t cros_task_id, uint32_t event)
{
struct task_ctx *const ctx = &shimmed_tasks[cros_task_id];
atomic_or(&ctx->event_mask, event);
k_poll_signal_raise(&ctx->new_event, 0);
- /* TODO(b/172360521): Remove wait parameter from EC. No one uses it */
return 0;
}
diff --git a/zephyr/test/tasks/main.c b/zephyr/test/tasks/main.c
index dc0661cf95..7137b88531 100644
--- a/zephyr/test/tasks/main.c
+++ b/zephyr/test/tasks/main.c
@@ -63,7 +63,7 @@ static void set_event_before_task_start2(void)
static void test_set_event_before_task_start(void)
{
/* Send event before tasks start */
- task_set_event(TASK_ID_TASK_1, 0xAAAA, 0);
+ task_set_event(TASK_ID_TASK_1, 0xAAAA);
start_ec_tasks();
@@ -121,7 +121,7 @@ static void event_delivered2(void)
{
k_sleep(K_SECONDS(5));
- task_set_event(TASK_ID_TASK_1, 0x1234, 0);
+ task_set_event(TASK_ID_TASK_1, 0x1234);
}
static void test_event_delivered(void)
@@ -132,7 +132,7 @@ static void test_event_delivered(void)
static void event_mask_not_delivered1(void)
{
- task_set_event(TASK_ID_TASK_2, 0x007F, 0);
+ task_set_event(TASK_ID_TASK_2, 0x007F);
}
static void event_mask_not_delivered2(void)
@@ -159,7 +159,7 @@ static void event_mask_extra1(void)
{
k_sleep(K_SECONDS(1));
- task_set_event(TASK_ID_TASK_2, 0x00FF, 0);
+ task_set_event(TASK_ID_TASK_2, 0x00FF);
}
static void event_mask_extra2(void)
@@ -189,9 +189,9 @@ static void empty_set_mask1(void)
* It is generally invalid to set a 0 event, but this simulates a race
* condition and exercises fallback code in task_wait_event
*/
- task_set_event(TASK_ID_TASK_2, 0, 0);
+ task_set_event(TASK_ID_TASK_2, 0);
k_sleep(K_SECONDS(1));
- task_set_event(TASK_ID_TASK_2, 0x1234, 0);
+ task_set_event(TASK_ID_TASK_2, 0x1234);
}
static void empty_set_mask2(void)