diff options
| author | Sam Hurst <shurst@google.com> | 2020-02-21 09:00:29 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-22 03:14:27 +0000 |
| commit | aebb58b99064567f25b1c407aeb5d193dc4042c3 (patch) | |
| tree | cfd594c639b80659c4831bfe65b525859e9bb1b4 /common/usb_pd_tcpc.c | |
| parent | a9666e310606cbd1a54d32fa0cb200f16cf1d451 (diff) | |
| download | chrome-ec-aebb58b99064567f25b1c407aeb5d193dc4042c3.tar.gz | |
TCPMV1/2: Make the PD Config Flags more consistent
The current use of the PD Config Flags are a bit confusing and
has been changed to the following:
The CONFIG_USB_POWER_DELIVERY flag is used to enable and disable
the TCPMv1 and TCPMv2 stacks. And when CONFIG_USB_POWER_DELIVERY
is enabled, one of the following must be enabled:
CONFIG_USB_PD_TCPMV1 - legacy power delivery state machine
CONFIG_USB_PD_TCPMV2 - current power delivery state machine
BUG=b:149993808
BRANCH=none
TEST=make -j buildall
Change-Id: Ie3f8615a75b15b4f1c703f57f3db9e152a471238
Signed-off-by: Sam Hurst <shurst@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2068519
Reviewed-by: Diana Z <dzigterman@chromium.org>
Diffstat (limited to 'common/usb_pd_tcpc.c')
| -rw-r--r-- | common/usb_pd_tcpc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/usb_pd_tcpc.c b/common/usb_pd_tcpc.c index 2e1cbf73d7..2fabd8454c 100644 --- a/common/usb_pd_tcpc.c +++ b/common/usb_pd_tcpc.c @@ -722,9 +722,9 @@ int pd_analyze_rx(int port, uint32_t *payload) if (val == PD_SOP) { phs.head |= PD_HEADER_SOP(PD_MSG_SOP); } else if (val == PD_SOP_PRIME) { - phs.head |= PD_HEADER_SOP(PD_MSG_SOPP); + phs.head |= PD_HEADER_SOP(PD_MSG_SOP_PRIME); } else if (val == PD_SOP_PRIME_PRIME) { - phs.head |= PD_HEADER_SOP(PD_MSG_SOPPP); + phs.head |= PD_HEADER_SOP(PD_MSG_SOP_PRIME_PRIME); } else { msg = "SOP*"; goto packet_err; @@ -932,7 +932,7 @@ int tcpc_run(int port, int evt) #endif } -#if !defined(CONFIG_USB_POWER_DELIVERY) && !defined(CONFIG_USB_SM_FRAMEWORK) +#if !defined(CONFIG_USB_POWER_DELIVERY) void pd_task(void *u) { int port = TASK_ID_TO_PD_PORT(task_get_current()); |