diff options
| author | Alec Berg <alecaberg@chromium.org> | 2015-01-13 18:41:06 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-01-16 18:12:21 +0000 |
| commit | 7893715cb7ef471002893ed128c241a8e8dfdacb (patch) | |
| tree | e5c3e1929b2612b6d1991ab3d0294469e3d89866 /include | |
| parent | 7627bd21d0b6ed8a176439ab0240b9fb75a903bf (diff) | |
| download | chrome-ec-7893715cb7ef471002893ed128c241a8e8dfdacb.tar.gz | |
pd: updates to new connection state machine
More updates to connection state machine. Adds CONFIG option
for backwards compatible DFP (used on zinger), and change UFP
state machine to debounce CC while VBUS is not present.
BUG=chrome-os-partner:33680
BRANCH=samus
TEST=load on samus and zinger and connect a bunch of times. also
test samus to samus connection.
Change-Id: Ia967eb6a17b10aa0c05a30686235fbf8a24e9a7b
Signed-off-by: Alec Berg <alecaberg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/240587
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/config.h | 3 | ||||
| -rw-r--r-- | include/usb_pd.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/config.h b/include/config.h index 7d2bca04d9..88369b427c 100644 --- a/include/config.h +++ b/include/config.h @@ -1209,6 +1209,9 @@ /* Support for USB type-c superspeed mux */ #undef CONFIG_USBC_SS_MUX +/* Support v1.1 type-C connection state machine */ +#undef CONFIG_USBC_BACKWARDS_COMPATIBLE_DFP + /* Support for USB type-c vconn. Not needed for captive cables. */ #undef CONFIG_USBC_VCONN diff --git a/include/usb_pd.h b/include/usb_pd.h index 51f23fba39..72206dc54f 100644 --- a/include/usb_pd.h +++ b/include/usb_pd.h @@ -605,7 +605,6 @@ enum pd_states { PD_STATE_SRC_SWAP_SNK_DISABLE, PD_STATE_SRC_SWAP_SRC_DISABLE, PD_STATE_SRC_SWAP_STANDBY, - PD_STATE_SRC_TO_FORCE_SINK, #endif /* CONFIG_USB_PD_DUAL_ROLE */ PD_STATE_SOFT_RESET, @@ -629,7 +628,6 @@ enum pd_cc_states { PD_CC_UFP_ATTACHED, /* From UFP perspective */ - PD_CC_ACC_PRESENT, PD_CC_DFP_ATTACHED }; |