diff options
| author | Sam Hurst <shurst@google.com> | 2021-03-04 14:59:44 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-03-12 20:11:41 +0000 |
| commit | 1dee3ef51fb66a139f2dbb98f8b923199366467d (patch) | |
| tree | c037057665bb3891645d55e4e67203e661732ef3 /test | |
| parent | 1de6b4fbda2bdc60c010c8136bfc02697a3839bb (diff) | |
| download | chrome-ec-1dee3ef51fb66a139f2dbb98f8b923199366467d.tar.gz | |
TCPMV2: Add explicit setting of VPD VDO CT Current
Add the capablility to explicity set a CTVPDs VDO
current.
BUG=b:165934405
BRANCH=none
TEST=make runtests
Verified that returned VDO from chocodile_vpdmcu was correct.
Signed-off-by: Sam Hurst <shurst@google.com>
Change-Id: I2292024986fa89b228b56678d61d1aef2866c817
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2748427
Tested-by: Sam Hurst <shurst@google.com>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Commit-Queue: Sam Hurst <shurst@google.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_config.h | 2 | ||||
| -rw-r--r-- | test/usb_typec_ctvpd.c | 32 |
2 files changed, 21 insertions, 13 deletions
diff --git a/test/test_config.h b/test/test_config.h index 562be47ca9..eb78fa1995 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -427,7 +427,7 @@ int ncp15wb_calculate_temp(uint16_t adc); #define VPD_HW_VERSION 0x0001 #define VPD_FW_VERSION 0x0001 #define USB_BCD_DEVICE 0 - +#define VPD_CT_CURRENT VPD_CT_CURRENT_3A /* Vbus impedance in milliohms */ #define VPD_VBUS_IMPEDANCE 65 diff --git a/test/usb_typec_ctvpd.c b/test/usb_typec_ctvpd.c index d46e68e40d..52c8be0639 100644 --- a/test/usb_typec_ctvpd.c +++ b/test/usb_typec_ctvpd.c @@ -557,14 +557,16 @@ static int test_vpd_host_src_detection_message_reception(void) VPD_HW_VERSION, VPD_FW_VERSION, VPD_MAX_VBUS_20V, - VPD_VBUS_IMP(VPD_VBUS_IMPEDANCE), - VPD_GND_IMP(VPD_GND_IMPEDANCE), -#ifdef CONFIG_USB_CTVPD - VPD_CTS_SUPPORTED -#else - VPD_CTS_NOT_SUPPORTED -#endif - ); + IS_ENABLED(CONFIG_USB_CTVPD) ? VPD_CT_CURRENT + : 0, + IS_ENABLED(CONFIG_USB_CTVPD) ? VPD_VBUS_IMP( + VPD_VBUS_IMPEDANCE) + : 0, + IS_ENABLED(CONFIG_USB_CTVPD) ? VPD_GND_IMP( + VPD_GND_IMPEDANCE) + : 0, + IS_ENABLED(CONFIG_USB_CTVPD) ? VPD_CTS_SUPPORTED + : VPD_CTS_NOT_SUPPORTED); mock_set_vconn(VCONN_0); host_disconnect_source(); @@ -1009,10 +1011,16 @@ static int test_ctvpd_behavior_case4(void) VPD_HW_VERSION, VPD_FW_VERSION, VPD_MAX_VBUS_20V, - VPD_VBUS_IMP(VPD_VBUS_IMPEDANCE), - VPD_GND_IMP(VPD_GND_IMPEDANCE), - VPD_CTS_SUPPORTED - ); + IS_ENABLED(CONFIG_USB_CTVPD) ? VPD_CT_CURRENT + : 0, + IS_ENABLED(CONFIG_USB_CTVPD) ? VPD_VBUS_IMP( + VPD_VBUS_IMPEDANCE) + : 0, + IS_ENABLED(CONFIG_USB_CTVPD) ? VPD_GND_IMP( + VPD_GND_IMPEDANCE) + : 0, + IS_ENABLED(CONFIG_USB_CTVPD) ? VPD_CTS_SUPPORTED + : VPD_CTS_NOT_SUPPORTED); init_port(port); mock_set_vconn(VCONN_0); |