From bd4012d9abbb7b79f537e7adba9627bcd4a50a72 Mon Sep 17 00:00:00 2001 From: Jett Rink Date: Tue, 16 Apr 2019 12:43:58 -0600 Subject: tasks: convert TASK_EVENT_CUSTOM macro to bit We should ensure that all custom task definition are non-zero and fit with the globally defined events. Add compile time check and change semantics to specify bit number (instead of making all callers use the BIT macro). This also fixes an error with TASK_EVENT_PHY_TX_DONE for ITE being 0. The bug that made that happen hasn't landed on any firmware branches that use it though. BRANCH=none BUG=none TEST=builds Cq-Depend:chrome-internal:1178968,chrome-internal:1178952 Change-Id: I5e1d1312382d200280c548e9128e53f4eddd3e61 Signed-off-by: Jett Rink Reviewed-on: https://chromium-review.googlesource.com/1570607 Commit-Ready: ChromeOS CL Exonerator Bot --- fuzz/host_command_fuzz.c | 4 ++-- fuzz/usb_pd_fuzz.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'fuzz') diff --git a/fuzz/host_command_fuzz.c b/fuzz/host_command_fuzz.c index 7f0bfad7a5..9ac7955aed 100644 --- a/fuzz/host_command_fuzz.c +++ b/fuzz/host_command_fuzz.c @@ -20,8 +20,8 @@ /* Only test requests with valid size and checksum (makes fuzzing faster) */ #define VALID_REQUEST_ONLY -#define TASK_EVENT_FUZZ TASK_EVENT_CUSTOM(1) -#define TASK_EVENT_HOSTCMD_DONE TASK_EVENT_CUSTOM(2) +#define TASK_EVENT_FUZZ TASK_EVENT_CUSTOM_BIT(0) +#define TASK_EVENT_HOSTCMD_DONE TASK_EVENT_CUSTOM_BIT(1) /* Request/response buffer size (and maximum command length) */ #define BUFFER_SIZE 128 diff --git a/fuzz/usb_pd_fuzz.c b/fuzz/usb_pd_fuzz.c index f7563bb405..ead94e9fac 100644 --- a/fuzz/usb_pd_fuzz.c +++ b/fuzz/usb_pd_fuzz.c @@ -18,7 +18,7 @@ #include #include -#define TASK_EVENT_FUZZ TASK_EVENT_CUSTOM(1) +#define TASK_EVENT_FUZZ TASK_EVENT_CUSTOM_BIT(0) #define PORT0 0 -- cgit v1.2.1