diff options
| author | Abe Levkoy <alevkoy@chromium.org> | 2021-01-13 16:20:55 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-01-22 05:00:48 +0000 |
| commit | c5caae72ddbf106660bb82b463b5027d1ad0e880 (patch) | |
| tree | 18b5865a3c2d87e1d292465c289f78cc8d8c3561 /common/usb_pd_protocol.c | |
| parent | 326814921dd1f93991cb5b49eba9cc9240f4770a (diff) | |
| download | chrome-ec-c5caae72ddbf106660bb82b463b5027d1ad0e880.tar.gz | |
config: Make VCONN Swap delay a documented option
Replace PD_VCONN_SWAP_DELAY with CONFIG_USBC_VCONN_SWAP_DELAY_US. This
is the approximate result of the following command, run from
platform/ec:
find . -type f -\( -name '*.c' -o -name '*.h' -\) | \
xargs sed -iE 's/PD_VCONN_SWAP_DELAY/CONFIG_USBC_VCONN_SWAP_DELAY/g'
Fix some latent formatting errors in usb_pd_protocol.c, because they
were preventing pre-upload hooks from passing.
BUG=b:144165680
TEST=make buildall
BRANCH=none
Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
Change-Id: Icaf3b309c08fdcd162e960cf5dc88185016b5d2d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2628131
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'common/usb_pd_protocol.c')
| -rw-r--r-- | common/usb_pd_protocol.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c index 2460902330..43db22664b 100644 --- a/common/usb_pd_protocol.c +++ b/common/usb_pd_protocol.c @@ -4446,12 +4446,14 @@ void pd_task(void *u) /* Turn VCONN on and wait for it */ set_vconn(port, 1); set_state_timeout(port, - get_time().val + PD_VCONN_SWAP_DELAY, - PD_STATE_VCONN_SWAP_READY); + get_time().val + + CONFIG_USBC_VCONN_SWAP_DELAY_US, + PD_STATE_VCONN_SWAP_READY); } else { set_state_timeout(port, - get_time().val + PD_T_VCONN_SOURCE_ON, - READY_RETURN_STATE(port)); + get_time().val + + PD_T_VCONN_SOURCE_ON, + READY_RETURN_STATE(port)); } } break; @@ -4460,9 +4462,9 @@ void pd_task(void *u) if (!(pd[port].flags & PD_FLAGS_VCONN_ON)) { /* VCONN is now on, send PS_RDY */ pd_set_vconn_role(port, - PD_ROLE_VCONN_ON); + PD_ROLE_VCONN_ON); res = send_control(port, - PD_CTRL_PS_RDY); + PD_CTRL_PS_RDY); if (res == -1) { timeout = 10*MSEC; /* @@ -4470,19 +4472,20 @@ void pd_task(void *u) * send soft reset */ set_state(port, - PD_STATE_SOFT_RESET); + PD_STATE_SOFT_RESET); break; } set_state(port, - READY_RETURN_STATE(port)); + READY_RETURN_STATE(port)); } else { /* Turn VCONN off and wait for it */ set_vconn(port, 0); pd_set_vconn_role(port, - PD_ROLE_VCONN_OFF); + PD_ROLE_VCONN_OFF); set_state_timeout(port, - get_time().val + PD_VCONN_SWAP_DELAY, - READY_RETURN_STATE(port)); + get_time().val + + CONFIG_USBC_VCONN_SWAP_DELAY_US, + READY_RETURN_STATE(port)); } } break; |