diff options
| author | Abe Levkoy <alevkoy@chromium.org> | 2021-08-18 12:21:41 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-08-18 23:04:52 +0000 |
| commit | 110f908a498551a9f90d86d8b5dd369acdf98438 (patch) | |
| tree | f192b41790edf592188180d5efe4eb24e0a0ac07 /common | |
| parent | 59e395027ab03c0ca2b5263193b30dff1c063c44 (diff) | |
| download | chrome-ec-110f908a498551a9f90d86d8b5dd369acdf98438.tar.gz | |
TCPM: Remove enum pd_msg_type
Convert usages of this enum to tcpm_sop_type.
BUG=b:155476419
TEST=make buildall
BRANCH=none
Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
Change-Id: I5fed273d72e7ad0e191db0cb0d121b70bdd9ecdb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3104291
Reviewed-by: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/mock/tcpci_i2c_mock.c | 2 | ||||
| -rw-r--r-- | common/usb_pd_tcpc.c | 6 | ||||
| -rw-r--r-- | common/usbc/usb_prl_sm.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/common/mock/tcpci_i2c_mock.c b/common/mock/tcpci_i2c_mock.c index f11d12c7d6..2df24586af 100644 --- a/common/mock/tcpci_i2c_mock.c +++ b/common/mock/tcpci_i2c_mock.c @@ -362,7 +362,7 @@ int verify_tcpci_possible_tx(struct possible_tx possible[], return EC_ERROR_TIMEOUT; } -void mock_tcpci_receive(enum pd_msg_type sop, uint16_t header, +void mock_tcpci_receive(enum tcpm_sop_type sop, uint16_t header, uint32_t *payload) { int i; diff --git a/common/usb_pd_tcpc.c b/common/usb_pd_tcpc.c index 325af57af8..fd933d655e 100644 --- a/common/usb_pd_tcpc.c +++ b/common/usb_pd_tcpc.c @@ -721,11 +721,11 @@ int pd_analyze_rx(int port, uint32_t *payload) #ifdef CONFIG_USB_PD_DECODE_SOP /* Encode message address */ if (val == PD_SOP) { - phs.head |= PD_HEADER_SOP(PD_MSG_SOP); + phs.head |= PD_HEADER_SOP(TCPC_TX_SOP); } else if (val == PD_SOP_PRIME) { - phs.head |= PD_HEADER_SOP(PD_MSG_SOP_PRIME); + phs.head |= PD_HEADER_SOP(TCPC_TX_SOP_PRIME); } else if (val == PD_SOP_PRIME_PRIME) { - phs.head |= PD_HEADER_SOP(PD_MSG_SOP_PRIME_PRIME); + phs.head |= PD_HEADER_SOP(TCPC_TX_SOP_PRIME_PRIME); } else { msg = "SOP*"; goto packet_err; diff --git a/common/usbc/usb_prl_sm.c b/common/usbc/usb_prl_sm.c index c09854bb46..f36248e8ac 100644 --- a/common/usbc/usb_prl_sm.c +++ b/common/usbc/usb_prl_sm.c @@ -2183,7 +2183,7 @@ static void prl_rx_wait_for_phy_message(const int port, int evt) */ if (!IS_ENABLED(CONFIG_USB_CTVPD) && !IS_ENABLED(CONFIG_USB_VPD) && - PD_HEADER_GET_SOP(header) != PD_MSG_SOP && + PD_HEADER_GET_SOP(header) != TCPC_TX_SOP && PD_HEADER_PROLE(header) == PD_PLUG_FROM_DFP_UFP) return; |