diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2019-01-31 23:24:01 +0000 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2019-02-01 18:35:33 +0000 |
| commit | 70f9acb0159b41f48a4f6e5f329c8504e4dc3fab (patch) | |
| tree | de60ca398fe9c7fedbb1ec91beadffcb1aa64b4b | |
| parent | 945afdc0e94faa331fd1439abb707b29906aa3bb (diff) | |
| download | chrome-ec-70f9acb0159b41f48a4f6e5f329c8504e4dc3fab.tar.gz | |
Revert "USB-PD: Debounce when trying try.src"
This reverts commit 7ad2c6b1aed61142350fba303e04ea628ced33d0.
Reason for revert: b/123173719.
Original change's description:
> USB-PD: Debounce when trying try.src
>
> Currently, if try.src is enabled, the TCPM doesn't debounce for
> SNK connection.
>
> This patch makes the TCPM wait for tPDDebounce when detecting
> SNK connection after switching from SNK to SRC for try.src.
>
> BUG=b:115464001
> BRANCH=none
> TEST=On Sona, verify picture is shown on HP s240.via USB-C
> TEST=On Sona, verify picture is shown on HP s240 via Hoho.
>
> Change-Id: I4f91bfca4f829f051d1c33f88f3664fad9b83e9f
> Reviewed-on: https://chromium-review.googlesource.com/1297035
> Commit-Ready: Daisuke Nojiri <dnojiri@chromium.org>
> Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
> Reviewed-by: Jett Rink <jettrink@chromium.org>
> (cherry picked from commit 8641a3876fb60bec2faf548c7baa53a562943c56)
> Reviewed-on: https://chromium-review.googlesource.com/c/1297033
> Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
> Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Bug: b:115464001
Change-Id: I25838989d411fcd3383cff13d35d28cfba024444
Reviewed-on: https://chromium-review.googlesource.com/c/1448814
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Commit-Queue: Daisuke Nojiri <dnojiri@chromium.org>
Tested-by: Daisuke Nojiri <dnojiri@chromium.org>
| -rw-r--r-- | common/usb_pd_protocol.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c index bc87ec1b62..d7a215aa3b 100644 --- a/common/usb_pd_protocol.c +++ b/common/usb_pd_protocol.c @@ -2537,21 +2537,22 @@ void pd_task(void *u) timeout = 5*MSEC; break; } - - /* Set debounce timer */ - if (new_cc_state != pd[port].cc_state) { - pd[port].cc_debounce = get_time().val + - (pd[port].flags & PD_FLAGS_TRY_SRC) ? - PD_T_DEBOUNCE : PD_T_CC_DEBOUNCE; - pd[port].cc_state = new_cc_state; - break; + /* If in Try.SRC state, then don't need to debounce */ + if (!(pd[port].flags & PD_FLAGS_TRY_SRC)) { + /* Debounce the cc state */ + if (new_cc_state != pd[port].cc_state) { + pd[port].cc_debounce = get_time().val + + PD_T_CC_DEBOUNCE; + pd[port].cc_state = new_cc_state; + break; + } else if (get_time().val < + pd[port].cc_debounce) { + break; + } } - /* Debounce the cc state */ - if (get_time().val < pd[port].cc_debounce) - break; - - /* Debounce complete. UFP is attached */ + /* Debounce complete */ + /* UFP is attached */ if (new_cc_state == PD_CC_UFP_ATTACHED || new_cc_state == PD_CC_DEBUG_ACC) { pd[port].polarity = (cc1 != TYPEC_CC_VOLT_RD); |