diff options
author | Firas Sammoura <fsammoura@google.com> | 2022-06-17 16:40:54 +0000 |
---|---|---|
committer | Firas Sammoura <fsammoura@google.com> | 2022-06-17 16:40:54 +0000 |
commit | e5fb0b9ba488614b5684e640530f00821ab7b943 (patch) | |
tree | 9a15b4a98d7987870a1805a33883d0cf9123fc05 /zephyr/test/drivers/src/integration/usbc/usb_alt_mode.c | |
parent | ad46fafb27c419bd416bfecc76df6c6426a99b32 (diff) | |
parent | a46d3f3feaac0d69012f61b66f652bff991d05a7 (diff) | |
download | chrome-ec-e5fb0b9ba488614b5684e640530f00821ab7b943.tar.gz |
Merge remote-tracking branch cros/main into firmware-fpmcu-bloonchipper-release
Generated by: ./util/update_release_branch.py --board bloonchipper --relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-fpmcu-bloonchipper-release
Relevant changes:
git log --oneline ad46fafb27..a46d3f3fea -- board/hatch_fp
board/bloonchipper common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh
981fb88cf8 docs/fingerprint: Resolve contradictory FPMCU factory flashing instructions
38ef6b7306 tree: Files should end with single newline
60032a8828 docs/fingerprint: Clean up formatting in fingerprint-factory-quick-guide.md
f49eb6f894 docs/fingerprint: Run mdformat
64aa5fc7bb docs/fingerprint: Add links to info on fuzz testing
8bd99cc434 fpsensor: Use correct return type
2b2d7a991d fpsensor: Use correct return type
BRANCH=None
BUG=b:234772776 b:234181908 b:172020503 b:234181908
TEST=`make -j buildall`
Cq-Include-Trybots: chromeos/cq:cq-orchestrator
Signed-off-by: Firas Sammoura <fsammoura@google.com>
Change-Id: I18b58de542c8b439d0f9327a7d4f0ec897da080f
Diffstat (limited to 'zephyr/test/drivers/src/integration/usbc/usb_alt_mode.c')
-rw-r--r-- | zephyr/test/drivers/src/integration/usbc/usb_alt_mode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/zephyr/test/drivers/src/integration/usbc/usb_alt_mode.c b/zephyr/test/drivers/src/integration/usbc/usb_alt_mode.c index 472c57d978..fadb595e4b 100644 --- a/zephyr/test/drivers/src/integration/usbc/usb_alt_mode.c +++ b/zephyr/test/drivers/src/integration/usbc/usb_alt_mode.c @@ -20,6 +20,8 @@ #include "test/drivers/utils.h" #include "test/drivers/test_state.h" +#define TEST_PORT USBC_PORT_C0 + struct usbc_alt_mode_fixture { const struct emul *tcpci_emul; const struct emul *charger_emul; @@ -66,7 +68,7 @@ static void *usbc_alt_mode_setup(void) fixture.tcpci_emul = emul_get_binding(DT_LABEL(DT_NODELABEL(tcpci_emul))); /* The configured TCPCI rev must match the emulator's supported rev. */ - tcpc_config[0].flags |= TCPC_FLAGS_TCPCI_REV2_0; + tcpc_config[TEST_PORT].flags |= TCPC_FLAGS_TCPCI_REV2_0; tcpci_emul_set_rev(fixture.tcpci_emul, TCPCI_EMUL_REV2_0_VER1_1); fixture.charger_emul = emul_get_binding(DT_LABEL(DT_NODELABEL(isl923x_emul))); @@ -127,7 +129,7 @@ ZTEST_F(usbc_alt_mode, verify_discovery) uint8_t response_buffer[EC_LPC_HOST_PACKET_SIZE]; struct ec_response_typec_discovery *discovery = (struct ec_response_typec_discovery *)response_buffer; - host_cmd_typec_discovery(USBC_PORT_C0, TYPEC_PARTNER_SOP, + host_cmd_typec_discovery(TEST_PORT, TYPEC_PARTNER_SOP, response_buffer, sizeof(response_buffer)); /* The host command does not count the VDM header in identity_count. */ |