summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDawid Niedzwiecki <dn@semihalf.com>2020-11-06 09:20:56 +0100
committerCommit Bot <commit-bot@chromium.org>2020-12-14 19:59:09 +0000
commitf96f176c303a73973d7cf5ddf1abf86f534a6e39 (patch)
treea793c58f008cfa94cc93ea34627fd1b6457e3a1b /test
parenta23ef3d074335f2b6953194671f966117fd1fe60 (diff)
downloadchrome-ec-f96f176c303a73973d7cf5ddf1abf86f534a6e39.tar.gz
task_set_event: remove the wait argument
There is an option in the task_set_event function which force the calling task to wait for an event. However, the option is never used thus remove it. This also will help in the Zephyr migration process. BUG=b:172360521 BRANCH=none TEST=make buildall Signed-off-by: Dawid Niedzwiecki <dn@semihalf.com> Change-Id: Ic152fd3d6862d487bcc0024c48d136556c0b81bc Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2521599 Reviewed-by: Jett Rink <jettrink@chromium.org> Reviewed-by: Tom Hughes <tomhughes@chromium.org> Reviewed-by: Jack Rosenthal <jrosenth@chromium.org> Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'test')
-rw-r--r--test/charge_ramp.c2
-rw-r--r--test/mutex.c3
-rw-r--r--test/pingpong.c3
-rw-r--r--test/usb_pd.c6
-rw-r--r--test/usb_pe_drp.c2
-rw-r--r--test/usb_tcpmv2_tcpci.c2
-rw-r--r--test/usb_typec_drp_acc_trysrc.c56
7 files changed, 38 insertions, 36 deletions
diff --git a/test/charge_ramp.c b/test/charge_ramp.c
index acffdadbf8..84cac57b8e 100644
--- a/test/charge_ramp.c
+++ b/test/charge_ramp.c
@@ -78,7 +78,7 @@ void board_set_charge_limit(int port, int supplier, int limit_ma,
{
charge_limit_ma = limit_ma;
if (charge_limit_ma > overcurrent_current_ma)
- task_set_event(TASK_ID_TEST_RUNNER, TASK_EVENT_OVERCURRENT, 0);
+ task_set_event(TASK_ID_TEST_RUNNER, TASK_EVENT_OVERCURRENT);
}
/* Test utilities */
diff --git a/test/mutex.c b/test/mutex.c
index d5e7e09c51..4fbf7d5cae 100644
--- a/test/mutex.c
+++ b/test/mutex.c
@@ -83,7 +83,8 @@ int mutex_main_task(void *unused)
/* --- Serialization to test simple contention --- */
ccprintf("Simple contention :\n");
/* lock the mutex from the other task */
- task_set_event(TASK_ID_MTX2, TASK_EVENT_WAKE, 1);
+ task_set_event(TASK_ID_MTX2, TASK_EVENT_WAKE);
+ task_wait_event(0);
/* block on the mutex */
ccprintf("MTX1: blocking...\n");
mutex_lock(&mtx);
diff --git a/test/pingpong.c b/test/pingpong.c
index f3ff89341f..9d3a7ed7af 100644
--- a/test/pingpong.c
+++ b/test/pingpong.c
@@ -38,7 +38,8 @@ int task_abc(void *data)
wake_count[0] = wake_count[1] = wake_count[2] = 0;
task_wait_event(-1);
} else {
- task_set_event(next, TASK_EVENT_WAKE, 1);
+ task_set_event(next, TASK_EVENT_WAKE);
+ task_wait_event(-1);
}
}
diff --git a/test/usb_pd.c b/test/usb_pd.c
index f572b5bb21..9fdb439b49 100644
--- a/test/usb_pd.c
+++ b/test/usb_pd.c
@@ -272,7 +272,7 @@ static void plug_in_source(int port, int polarity)
pd_port[port].partner_role = PD_ROLE_SOURCE;
pd_port[port].partner_polarity = polarity;
/* Indicate that the CC lines have changed. */
- task_set_event(PD_PORT_TO_TASK_ID(port), PD_EVENT_CC, 0);
+ task_set_event(PD_PORT_TO_TASK_ID(port), PD_EVENT_CC);
}
static void plug_in_sink(int port, int polarity)
@@ -281,7 +281,7 @@ static void plug_in_sink(int port, int polarity)
pd_port[port].partner_role = PD_ROLE_SINK;
pd_port[port].partner_polarity = polarity;
/* Indicate that the CC lines have changed. */
- task_set_event(PD_PORT_TO_TASK_ID(port), PD_EVENT_CC, 0);
+ task_set_event(PD_PORT_TO_TASK_ID(port), PD_EVENT_CC);
}
static void unplug(int port)
@@ -291,7 +291,7 @@ static void unplug(int port)
pd_port[port].has_vbus = 0;
pd_port[port].partner_role = -1;
/* Indicate that the CC lines have changed. */
- task_set_event(PD_PORT_TO_TASK_ID(port), PD_EVENT_CC, 0);
+ task_set_event(PD_PORT_TO_TASK_ID(port), PD_EVENT_CC);
task_wake(PD_PORT_TO_TASK_ID(port));
usleep(30 * MSEC);
}
diff --git a/test/usb_pe_drp.c b/test/usb_pe_drp.c
index 9f2b8b267d..be040dff0c 100644
--- a/test/usb_pe_drp.c
+++ b/test/usb_pe_drp.c
@@ -45,7 +45,7 @@ void before_test(void)
mock_prl_reset();
/* Restart the PD task and let it settle */
- task_set_event(TASK_ID_PD_C0, TASK_EVENT_RESET_DONE, 0);
+ task_set_event(TASK_ID_PD_C0, TASK_EVENT_RESET_DONE);
task_wait_event(SECOND);
}
diff --git a/test/usb_tcpmv2_tcpci.c b/test/usb_tcpmv2_tcpci.c
index c032c472a2..6dd04ab7d5 100644
--- a/test/usb_tcpmv2_tcpci.c
+++ b/test/usb_tcpmv2_tcpci.c
@@ -385,7 +385,7 @@ void before_test(void)
mock_tcpci_reset();
/* Restart the PD task and let it settle */
- task_set_event(TASK_ID_PD_C0, TASK_EVENT_RESET_DONE, 0);
+ task_set_event(TASK_ID_PD_C0, TASK_EVENT_RESET_DONE);
task_wait_event(SECOND);
}
diff --git a/test/usb_typec_drp_acc_trysrc.c b/test/usb_typec_drp_acc_trysrc.c
index 02bdc6e3c0..605d133934 100644
--- a/test/usb_typec_drp_acc_trysrc.c
+++ b/test/usb_typec_drp_acc_trysrc.c
@@ -71,7 +71,7 @@ __maybe_unused static int test_mux_con_dis_as_src(void)
/* Update CC lines send state machine event to process */
mock_tcpc.cc1 = TYPEC_CC_VOLT_RD;
mock_tcpc.cc2 = TYPEC_CC_VOLT_OPEN;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
pd_set_dual_role(0, PD_DRP_TOGGLE_ON);
/* This wait trainsitions through AttachWait.SRC then Attached.SRC */
@@ -83,7 +83,7 @@ __maybe_unused static int test_mux_con_dis_as_src(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.cc2 = TYPEC_CC_VOLT_OPEN;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* This wait will go through TryWait.SNK then to Unattached.SNK */
task_wait_event(10 * SECOND);
@@ -104,7 +104,7 @@ __maybe_unused static int test_mux_con_dis_as_snk(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_RP_3_0;
mock_tcpc.cc2 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* This wait will go through AttachWait.SNK to Attached.SNK */
task_wait_event(5 * SECOND);
@@ -118,7 +118,7 @@ __maybe_unused static int test_mux_con_dis_as_snk(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.cc2 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.vbus_level = 0;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* This wait will go through TryWait.SNK then to Unattached.SNK */
task_wait_event(10 * SECOND);
@@ -143,7 +143,7 @@ __maybe_unused static int test_power_role_set(void)
/* Update CC lines send state machine event to process */
mock_tcpc.cc1 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.cc2 = TYPEC_CC_VOLT_RD;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
task_wait_event(10 * SECOND);
/* We are in Attached.SRC now */
@@ -175,7 +175,7 @@ __maybe_unused static int test_polarity_cc1_default(void)
*/
mock_tcpc.last.polarity = POLARITY_COUNT;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* Before tCCDebounce elapses, we should SRC */
task_wait_event(PD_T_CC_DEBOUNCE + FUDGE);
@@ -191,7 +191,7 @@ __maybe_unused static int test_polarity_cc1_1A5(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_RP_1_5;
mock_tcpc.cc2 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* Before tCCDebounce elapses, we should SRC */
task_wait_event(PD_T_CC_DEBOUNCE + FUDGE);
@@ -207,7 +207,7 @@ __maybe_unused static int test_polarity_cc1_3A0(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_RP_3_0;
mock_tcpc.cc2 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* Before tCCDebounce elapses, we should SRC */
task_wait_event(PD_T_CC_DEBOUNCE + FUDGE);
@@ -223,7 +223,7 @@ __maybe_unused static int test_polarity_cc2_default(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.cc2 = TYPEC_CC_VOLT_RP_DEF;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* Before tCCDebounce elapses, we should SRC */
task_wait_event(PD_T_CC_DEBOUNCE + FUDGE);
@@ -239,7 +239,7 @@ __maybe_unused static int test_polarity_cc2_1A5(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.cc2 = TYPEC_CC_VOLT_RP_1_5;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* Before tCCDebounce elapses, we should SRC */
task_wait_event(PD_T_CC_DEBOUNCE + FUDGE);
@@ -255,7 +255,7 @@ __maybe_unused static int test_polarity_cc2_3A0(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.cc2 = TYPEC_CC_VOLT_RP_3_0;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* Before tCCDebounce elapses, we should SRC */
task_wait_event(PD_T_CC_DEBOUNCE + FUDGE);
@@ -271,7 +271,7 @@ __maybe_unused static int test_polarity_dts_cc1_default(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_RP_3_0;
mock_tcpc.cc2 = TYPEC_CC_VOLT_RP_1_5;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* Before tCCDebounce elapses, we should SRC */
task_wait_event(PD_T_CC_DEBOUNCE + FUDGE);
@@ -287,7 +287,7 @@ __maybe_unused static int test_polarity_dts_cc1_1A5(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_RP_1_5;
mock_tcpc.cc2 = TYPEC_CC_VOLT_RP_DEF;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* Before tCCDebounce elapses, we should SRC */
task_wait_event(PD_T_CC_DEBOUNCE + FUDGE);
@@ -303,7 +303,7 @@ __maybe_unused static int test_polarity_dts_cc1_3A0(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_RP_3_0;
mock_tcpc.cc2 = TYPEC_CC_VOLT_RP_DEF;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* Before tCCDebounce elapses, we should SRC */
task_wait_event(PD_T_CC_DEBOUNCE + FUDGE);
@@ -319,7 +319,7 @@ __maybe_unused static int test_polarity_dts_cc2_default(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_RP_1_5;
mock_tcpc.cc2 = TYPEC_CC_VOLT_RP_3_0;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* Before tCCDebounce elapses, we should SRC */
task_wait_event(PD_T_CC_DEBOUNCE + FUDGE);
@@ -335,7 +335,7 @@ __maybe_unused static int test_polarity_dts_cc2_1A5(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_RP_DEF;
mock_tcpc.cc2 = TYPEC_CC_VOLT_RP_1_5;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* Before tCCDebounce elapses, we should SRC */
task_wait_event(PD_T_CC_DEBOUNCE + FUDGE);
@@ -351,7 +351,7 @@ __maybe_unused static int test_polarity_dts_cc2_3A0(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_RP_DEF;
mock_tcpc.cc2 = TYPEC_CC_VOLT_RP_3_0;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* Before tCCDebounce elapses, we should SRC */
task_wait_event(PD_T_CC_DEBOUNCE + FUDGE);
@@ -381,7 +381,7 @@ __maybe_unused static int test_try_src_disabled(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.cc2 = TYPEC_CC_VOLT_RP_3_0;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* Wait a long time past many potential transitions */
task_wait_event(10 * SECOND);
@@ -420,7 +420,7 @@ static int switch_to_opposite_role(int port, int pull)
ccprints("[Test] Partner presents SRC with Vbus ON");
}
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
return EC_SUCCESS;
};
@@ -435,7 +435,7 @@ __maybe_unused static int test_try_src_partner_switches(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.cc2 = TYPEC_CC_VOLT_RP_3_0;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* We are in AttachWait.SNK now */
/* Before tCCDebounce elapses, we should still be a SNK */
@@ -481,7 +481,7 @@ static int dumb_src_charger_cc_response(int port, int pull)
ccprints("[Test] Partner presents SRC with Vbus ON");
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
return EC_SUCCESS;
};
@@ -496,7 +496,7 @@ __maybe_unused static int test_try_src_partner_does_not_switch_vbus(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.cc2 = TYPEC_CC_VOLT_RP_3_0;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* We are in AttachWait.SNK now */
/* Before tCCDebounce elapses, we should still be a SNK */
@@ -552,7 +552,7 @@ static int src_charger_drops_vbus_cc_response(int port, int pull)
ccprints("[Test] Partner presents SRC with Vbus ON");
}
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
return EC_SUCCESS;
};
@@ -567,7 +567,7 @@ __maybe_unused static int test_try_src_partner_does_not_switch_no_vbus(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.cc2 = TYPEC_CC_VOLT_RP_3_0;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* We are in AttachWait.SNK now */
/* Before tCCDebounce elapses, we should still be a SNK */
@@ -619,7 +619,7 @@ __maybe_unused static int test_cc_open_on_normal_reset(void)
system_clear_reset_flags(EC_RESET_FLAG_POWER_ON);
- task_set_event(TASK_ID_PD_C0, TASK_EVENT_RESET_DONE, 0);
+ task_set_event(TASK_ID_PD_C0, TASK_EVENT_RESET_DONE);
task_wait_event(SECOND * 10);
/* Ensure that the first CC set call was to open (error recovery). */
@@ -645,7 +645,7 @@ __maybe_unused static int test_cc_rd_on_por_reset(void)
system_set_reset_flags(EC_RESET_FLAG_POWER_ON);
- task_set_event(TASK_ID_PD_C0, TASK_EVENT_RESET_DONE, 0);
+ task_set_event(TASK_ID_PD_C0, TASK_EVENT_RESET_DONE);
task_wait_event(SECOND * 10);
/* Ensure that the first CC set call was to Rd (sink) */
@@ -703,7 +703,7 @@ __maybe_unused static int test_auto_toggle_delay_early_connect(void)
mock_tcpc.cc1 = TYPEC_CC_VOLT_OPEN;
mock_tcpc.cc2 = TYPEC_CC_VOLT_RP_3_0;
mock_tcpc.vbus_level = 1;
- task_set_event(TASK_ID_PD_C0, PD_EVENT_CC, 0);
+ task_set_event(TASK_ID_PD_C0, PD_EVENT_CC);
/* Ensure the auto toggle enable was never called */
task_wait_event(SECOND);
@@ -727,7 +727,7 @@ void before_test(void)
mock_tcpc_reset();
/* Restart the PD task and let it settle */
- task_set_event(TASK_ID_PD_C0, TASK_EVENT_RESET_DONE, 0);
+ task_set_event(TASK_ID_PD_C0, TASK_EVENT_RESET_DONE);
task_wait_event(SECOND);
/* Print out TCPC calls for easier debugging */