From 003ec08f8c67845ae8481d3fb4124555213b04c4 Mon Sep 17 00:00:00 2001 From: Abe Levkoy Date: Fri, 27 Aug 2021 15:21:39 -0600 Subject: TCPM: Rename enum tcpm_sop_type and its constants As a followup to CL:3104290, give the TCPCI TRANSMIT and RX_BUF_FRAME_TYPE types more consistent names. Most of them can be used for receiving, not just transmitting. Fix lint errors thus revealed. BUG=b:155476419 TEST=make buildall BRANCH=none Signed-off-by: Abe Levkoy Change-Id: I399ec479eacc18622fc4d3f55f8bdabf4560fcff Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3125995 Reviewed-by: Keith Short --- board/coffeecake/usb_pd_policy.c | 4 ++-- board/dingdong/usb_pd_policy.c | 4 ++-- board/hoho/usb_pd_policy.c | 4 ++-- board/pdeval-stm32f072/usb_pd_policy.c | 2 +- board/plankton/usb_pd_policy.c | 2 +- board/servo_v4/board.c | 4 ++-- board/servo_v4/usb_pd_policy.c | 4 ++-- board/servo_v4p1/board.c | 4 ++-- board/servo_v4p1/usb_pd_policy.c | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) (limited to 'board') diff --git a/board/coffeecake/usb_pd_policy.c b/board/coffeecake/usb_pd_policy.c index 6d9210895a..dc19207a0e 100644 --- a/board/coffeecake/usb_pd_policy.c +++ b/board/coffeecake/usb_pd_policy.c @@ -267,9 +267,9 @@ static int svdm_enter_mode(int port, uint32_t *payload) return rv; } -int pd_alt_mode(int port, enum tcpm_sop_type type, uint16_t svid) +int pd_alt_mode(int port, enum tcpci_msg_type type, uint16_t svid) { - if (type != TCPC_TX_SOP) + if (type != TCPCI_MSG_SOP) return 0; if (svid == USB_SID_DISPLAYPORT) diff --git a/board/dingdong/usb_pd_policy.c b/board/dingdong/usb_pd_policy.c index d7af654689..50700f8a62 100644 --- a/board/dingdong/usb_pd_policy.c +++ b/board/dingdong/usb_pd_policy.c @@ -220,9 +220,9 @@ static int svdm_enter_mode(int port, uint32_t *payload) return rv; } -int pd_alt_mode(int port, enum tcpm_sop_type type, uint16_t svid) +int pd_alt_mode(int port, enum tcpci_msg_type type, uint16_t svid) { - if (type != TCPC_TX_SOP) + if (type != TCPCI_MSG_SOP) return 0; if (svid == USB_SID_DISPLAYPORT) diff --git a/board/hoho/usb_pd_policy.c b/board/hoho/usb_pd_policy.c index 994989bdd7..2ee83d32aa 100644 --- a/board/hoho/usb_pd_policy.c +++ b/board/hoho/usb_pd_policy.c @@ -195,9 +195,9 @@ static int svdm_enter_mode(int port, uint32_t *payload) return rv; } -int pd_alt_mode(int port, enum tcpm_sop_type type, uint16_t svid) +int pd_alt_mode(int port, enum tcpci_msg_type type, uint16_t svid) { - if (type != TCPC_TX_SOP) + if (type != TCPCI_MSG_SOP) return 0; if (svid == USB_SID_DISPLAYPORT) diff --git a/board/pdeval-stm32f072/usb_pd_policy.c b/board/pdeval-stm32f072/usb_pd_policy.c index 45a0aa44ff..2f7941321b 100644 --- a/board/pdeval-stm32f072/usb_pd_policy.c +++ b/board/pdeval-stm32f072/usb_pd_policy.c @@ -202,7 +202,7 @@ __override void svdm_safe_dp_mode(int port) __override int svdm_dp_config(int port, uint32_t *payload) { - int opos = pd_alt_mode(port, TCPC_TX_SOP, USB_SID_DISPLAYPORT); + int opos = pd_alt_mode(port, TCPCI_MSG_SOP, USB_SID_DISPLAYPORT); int pin_mode = pd_dfp_dp_get_pin_mode(port, dp_status[port]); bool unused; #if defined(CONFIG_USB_PD_TCPM_MUX) && defined(CONFIG_USB_PD_TCPM_ANX7447) diff --git a/board/plankton/usb_pd_policy.c b/board/plankton/usb_pd_policy.c index 769c4b298c..8cb24372a0 100644 --- a/board/plankton/usb_pd_policy.c +++ b/board/plankton/usb_pd_policy.c @@ -237,7 +237,7 @@ int svdm_enter_mode(int port, uint32_t *payload) return 1; } -int pd_alt_mode(int port, enum tcpm_sop_type type, uint16_t svid) +int pd_alt_mode(int port, enum tcpci_msg_type type, uint16_t svid) { return alt_mode; } diff --git a/board/servo_v4/board.c b/board/servo_v4/board.c index f4723b91f7..8540de710f 100644 --- a/board/servo_v4/board.c +++ b/board/servo_v4/board.c @@ -77,7 +77,7 @@ static volatile int hpd_prev_level; void hpd_irq_deferred(void) { - int dp_mode = pd_alt_mode(1, TCPC_TX_SOP, USB_SID_DISPLAYPORT); + int dp_mode = pd_alt_mode(1, TCPCI_MSG_SOP, USB_SID_DISPLAYPORT); if (dp_mode) { pd_send_hpd(DUT, hpd_irq); @@ -89,7 +89,7 @@ DECLARE_DEFERRED(hpd_irq_deferred); void hpd_lvl_deferred(void) { int level = gpio_get_level(GPIO_DP_HPD); - int dp_mode = pd_alt_mode(1, TCPC_TX_SOP, USB_SID_DISPLAYPORT); + int dp_mode = pd_alt_mode(1, TCPCI_MSG_SOP, USB_SID_DISPLAYPORT); if (level != hpd_prev_level) { /* It's a glitch while in deferred or canceled action */ diff --git a/board/servo_v4/usb_pd_policy.c b/board/servo_v4/usb_pd_policy.c index 82c0cf7f27..00eaa1e628 100644 --- a/board/servo_v4/usb_pd_policy.c +++ b/board/servo_v4/usb_pd_policy.c @@ -965,9 +965,9 @@ static int svdm_enter_mode(int port, uint32_t *payload) return 1; } -int pd_alt_mode(int port, enum tcpm_sop_type type, uint16_t svid) +int pd_alt_mode(int port, enum tcpci_msg_type type, uint16_t svid) { - if (type == TCPC_TX_SOP && svid == USB_SID_DISPLAYPORT) + if (type == TCPCI_MSG_SOP && svid == USB_SID_DISPLAYPORT) return alt_mode; return 0; diff --git a/board/servo_v4p1/board.c b/board/servo_v4p1/board.c index 82bc97f091..d8616ce340 100644 --- a/board/servo_v4p1/board.c +++ b/board/servo_v4p1/board.c @@ -102,7 +102,7 @@ static volatile int hpd_prev_level; void hpd_irq_deferred(void) { - int dp_mode = pd_alt_mode(1, TCPC_TX_SOP, USB_SID_DISPLAYPORT); + int dp_mode = pd_alt_mode(1, TCPCI_MSG_SOP, USB_SID_DISPLAYPORT); if (dp_mode) { pd_send_hpd(DUT, hpd_irq); @@ -114,7 +114,7 @@ DECLARE_DEFERRED(hpd_irq_deferred); void hpd_lvl_deferred(void) { int level = gpio_get_level(GPIO_DP_HPD); - int dp_mode = pd_alt_mode(1, TCPC_TX_SOP, USB_SID_DISPLAYPORT); + int dp_mode = pd_alt_mode(1, TCPCI_MSG_SOP, USB_SID_DISPLAYPORT); if (level != hpd_prev_level) { /* It's a glitch while in deferred or canceled action */ diff --git a/board/servo_v4p1/usb_pd_policy.c b/board/servo_v4p1/usb_pd_policy.c index 645d326074..c4d7c239a1 100644 --- a/board/servo_v4p1/usb_pd_policy.c +++ b/board/servo_v4p1/usb_pd_policy.c @@ -1044,9 +1044,9 @@ static int svdm_enter_mode(int port, uint32_t *payload) return 1; } -int pd_alt_mode(int port, enum tcpm_sop_type type, uint16_t svid) +int pd_alt_mode(int port, enum tcpci_msg_type type, uint16_t svid) { - if (type != TCPC_TX_SOP) + if (type != TCPCI_MSG_SOP) return 0; if (svid == USB_SID_DISPLAYPORT) -- cgit v1.2.1