diff options
| author | Shawn Nematbakhsh <shawnn@google.com> | 2015-11-10 14:21:56 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-11-11 08:05:40 -0800 |
| commit | b234b9ecc7d23b6f33e452d97158326afaa4de35 (patch) | |
| tree | adc632c66654626ff5844026b90f89e1a00431d3 /include/usb_pd.h | |
| parent | 92386dd91c9967f7c23941e8bc6b415fc37b3f1f (diff) | |
| download | chrome-ec-b234b9ecc7d23b6f33e452d97158326afaa4de35.tar.gz | |
pd: Cleanup PD port-to-task macros
Cleanup our port-to-task and task-to-port macros to allow cleanly adding
a third port.
BUG=chromium:554243
BRANCH=None
TEST=Manual on glados / glados_pd. Verify that both USB-C ports are
functional for charging.
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: Ib833de0dfaa9490f4de8efb08d2cdddd86d57896
Reviewed-on: https://chromium-review.googlesource.com/311785
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'include/usb_pd.h')
| -rw-r--r-- | include/usb_pd.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/include/usb_pd.h b/include/usb_pd.h index 63d20887db..4b7faa9f0a 100644 --- a/include/usb_pd.h +++ b/include/usb_pd.h @@ -16,21 +16,16 @@ #ifdef CONFIG_USB_PD_PORT_COUNT /* * Define PD_PORT_TO_TASK_ID() and TASK_ID_TO_PD_PORT() macros to - * go between PD port number and task ID. + * go between PD port number and task ID. Assume that TASK_ID_PD_C0 is the + * lowest task ID and IDs are on a continuous range. */ -#if CONFIG_USB_PD_PORT_COUNT == 1 -#ifdef HAS_TASK_PD -#define PD_PORT_TO_TASK_ID(port) TASK_ID_PD -#elif defined(HAS_TASK_PD_C0) -#define PD_PORT_TO_TASK_ID(port) TASK_ID_PD_C0 +#ifdef HAS_TASK_PD_C0 +#define PD_PORT_TO_TASK_ID(port) (TASK_ID_PD_C0 + (port)) +#define TASK_ID_TO_PD_PORT(id) ((id) - TASK_ID_PD_C0) #else #define PD_PORT_TO_TASK_ID(port) -1 /* dummy task ID */ -#endif -#define TASK_ID_TO_PD_PORT(id) 0 -#elif CONFIG_USB_PD_PORT_COUNT == 2 -#define PD_PORT_TO_TASK_ID(port) ((port) ? TASK_ID_PD_C1 : TASK_ID_PD_C0) -#define TASK_ID_TO_PD_PORT(id) ((id) == TASK_ID_PD_C0 ? 0 : 1) -#endif +#define TASK_ID_TO_PD_PORT(id) 0 +#endif /* CONFIG_COMMON_RUNTIME */ #endif /* CONFIG_USB_PD_PORT_COUNT */ enum pd_rx_errors { |