diff options
| author | Sam Hurst <shurst@google.com> | 2020-05-04 12:15:52 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-05-05 02:29:53 +0000 |
| commit | c6626fa92e91e2195a2757435f2765e4b8232d55 (patch) | |
| tree | 82510d1852be505bd2113b2132bcc534f775d351 | |
| parent | 5c131a077453f96510cf88a2400d1e1f74bc6685 (diff) | |
| download | chrome-ec-c6626fa92e91e2195a2757435f2765e4b8232d55.tar.gz | |
TCPMv2: Limit tc_is_vconn_src function to returning 0 or 1
BUG=b:155653950
BRANCH=none
TEST=make -j buildall
Signed-off-by: Sam Hurst <shurst@google.com>
Change-Id: I0154175024f0f87fe217836a6e66720830f3e5d8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2180924
| -rw-r--r-- | common/usbc/usb_tc_drp_acc_trysrc_sm.c | 6 | ||||
| -rw-r--r-- | include/usb_tc_sm.h | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c index 182307ee41..ab387ab48a 100644 --- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c +++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c @@ -1404,11 +1404,7 @@ void pd_request_vconn_swap(int port) #ifdef CONFIG_USBC_VCONN int tc_is_vconn_src(int port) { - if (get_state_tc(port) == TC_ATTACHED_SRC || - get_state_tc(port) == TC_ATTACHED_SNK) - return TC_CHK_FLAG(port, TC_FLAGS_VCONN_ON); - else - return -1; + return TC_CHK_FLAG(port, TC_FLAGS_VCONN_ON); } #endif diff --git a/include/usb_tc_sm.h b/include/usb_tc_sm.h index 47f65d430a..7f5ae8bde7 100644 --- a/include/usb_tc_sm.h +++ b/include/usb_tc_sm.h @@ -237,9 +237,7 @@ int tc_check_vconn_swap(int port); * Checks if VCONN is being sourced. * * @param port USB_C port number - * @return 1 if vconn is being sourced, 0 if it's not, and -1 if - * can't answer at this time. -1 is returned if the current - * Type-C state is not Attached.SRC or Attached.SNK. + * @return 1 if vconn is being sourced, 0 if it's not. */ int tc_is_vconn_src(int port); |