From 9abd2628cb776e37b57d34a3de77568a4ba47309 Mon Sep 17 00:00:00 2001 From: Abe Levkoy Date: Sun, 3 May 2020 15:37:58 -0600 Subject: TCPMv2: Use CMD_DISCOVER_IDENT during discovery enum vdm_cmd is redundant with the CMD_DISCOVER_* macros in usb_pd.h and will no longer be needed after pe_do_port_discovery is replaced. Remove uses of enum vdm_cmd from the new VDM request states. BUG=none TEST=make buildall BRANCH=none Change-Id: I068fa3a1f9208953b18b1bf765a0adfa54ad8df0 Signed-off-by: Abe Levkoy Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2178092 Reviewed-by: Keith Short Reviewed-by: Diana Z --- common/usbc/usb_pe_drp_sm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/usbc/usb_pe_drp_sm.c b/common/usbc/usb_pe_drp_sm.c index b7d5bf2b5c..6c8c1f3356 100644 --- a/common/usbc/usb_pe_drp_sm.c +++ b/common/usbc/usb_pe_drp_sm.c @@ -4204,7 +4204,7 @@ static void pe_vdm_identity_request_cbl_entry(int port) msg[0] = VDO(USB_SID_PD, 1, VDO_SVDM_VERS(pd_get_vdo_ver(port, TCPC_TX_SOP_PRIME)) | - DISCOVER_IDENTITY); + CMD_DISCOVER_IDENT); tx_emsg[port].len = sizeof(uint32_t); prl_send_data_msg(port, TCPC_TX_SOP_PRIME, PD_DATA_VENDOR_DEF); @@ -4363,9 +4363,9 @@ static void pe_init_port_vdm_identity_request_entry(int port) print_current_state(port); - msg[0] = VDO(USB_SID_PD, 1, VDO_SVDM_VERS(pd_get_vdo_ver(port, - TCPC_TX_SOP)) - | DISCOVER_IDENTITY); + msg[0] = VDO(USB_SID_PD, 1, + VDO_SVDM_VERS(pd_get_vdo_ver(port, TCPC_TX_SOP)) | + CMD_DISCOVER_IDENT); tx_emsg[port].len = sizeof(uint32_t); prl_send_data_msg(port, TCPC_TX_SOP, PD_DATA_VENDOR_DEF); -- cgit v1.2.1