diff options
author | Jett Rink <jettrink@chromium.org> | 2020-03-25 13:26:43 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-03-26 00:41:25 +0000 |
commit | 471a3914c32d856610b237bdb9e12ad8790a5ae3 (patch) | |
tree | 89b0bd83e3931634d7b89447227a951ad0311f62 | |
parent | 26900d2e8c76f9b04d560def5aa459fd42742341 (diff) | |
download | chrome-ec-471a3914c32d856610b237bdb9e12ad8790a5ae3.tar.gz |
cleanup: drop the _TYPEC part of USB device config
The three USB device configurations describe more than just the Type-C
layer, so remove the _TYPEC part within the define. This is also in
preparation to change how the usbc build.mk includes files.
This was performed with the following commands:
$ git grep --name-only CONFIG_USB_TYPEC_DRP_ACC_TRYSRC | xargs perl -i
-ple 's/CONFIG_USB_TYPEC_DRP_ACC_TRYSRC/CONFIG_USB_DRP_ACC_TRYSRC/g'
$ git grep --name-only CONFIG_USB_TYPEC_CTVPD | xargs perl -i -ple
's/CONFIG_USB_TYPEC_CTVPD/CONFIG_USB_CTVPD/g'
$ git grep --name-only CONFIG_USB_TYPEC_VPD | xargs perl -i -ple
's/CONFIG_USB_TYPEC_VPD/CONFIG_USB_VPD/g'
BRANCH=none
BUG=none
TEST=builds
Signed-off-by: Jett Rink <jettrink@chromium.org>
Change-Id: I4deab784b7c3479cffd3dee7fb3ea3c8a9d6081c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2121193
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
-rw-r--r-- | baseboard/dedede/baseboard.h | 2 | ||||
-rw-r--r-- | baseboard/volteer/baseboard.h | 2 | ||||
-rw-r--r-- | baseboard/zork/baseboard.h | 2 | ||||
-rw-r--r-- | board/chocodile_vpdmcu/board.h | 2 | ||||
-rw-r--r-- | board/puff/board.h | 2 | ||||
-rw-r--r-- | board/trogdor/board.h | 2 | ||||
-rw-r--r-- | chip/stm32/usb_pd_phy.c | 2 | ||||
-rw-r--r-- | common/usb_pd_host_cmd.c | 4 | ||||
-rw-r--r-- | common/usb_pd_tcpc.c | 10 | ||||
-rw-r--r-- | common/usbc/build.mk | 12 | ||||
-rw-r--r-- | common/usbc/usb_pe_ctvpd_sm.c | 4 | ||||
-rw-r--r-- | common/usbc/usb_prl_sm.c | 16 | ||||
-rw-r--r-- | fuzz/fuzz_config.h | 2 | ||||
-rw-r--r-- | include/config.h | 6 | ||||
-rw-r--r-- | include/usb_tc_sm.h | 4 | ||||
-rw-r--r-- | test/fake_usbc.c | 10 | ||||
-rw-r--r-- | test/test_config.h | 6 | ||||
-rw-r--r-- | test/usb_typec_ctvpd.c | 2 |
18 files changed, 45 insertions, 45 deletions
diff --git a/baseboard/dedede/baseboard.h b/baseboard/dedede/baseboard.h index 40bd6b0224..accd1376c1 100644 --- a/baseboard/dedede/baseboard.h +++ b/baseboard/dedede/baseboard.h @@ -193,7 +193,7 @@ #define CONFIG_USB_PID 0x5042 #define CONFIG_USB_POWER_DELIVERY #define CONFIG_USB_PD_TCPMV2 -#define CONFIG_USB_TYPEC_DRP_ACC_TRYSRC +#define CONFIG_USB_DRP_ACC_TRYSRC /* UART COMMAND */ #define CONFIG_CMD_CHARGEN diff --git a/baseboard/volteer/baseboard.h b/baseboard/volteer/baseboard.h index 0cdd76491c..69aabc845b 100644 --- a/baseboard/volteer/baseboard.h +++ b/baseboard/volteer/baseboard.h @@ -152,7 +152,7 @@ #define CONFIG_USB_TYPEC_SM #define CONFIG_USB_PRL_SM #define CONFIG_USB_PE_SM -#define CONFIG_USB_TYPEC_DRP_ACC_TRYSRC +#define CONFIG_USB_DRP_ACC_TRYSRC #else /* * PD 3.0 is always enabled by the TCPMv2 stack, so it's only explicitly diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h index 6c7872c32e..bff79721bc 100644 --- a/baseboard/zork/baseboard.h +++ b/baseboard/zork/baseboard.h @@ -126,7 +126,7 @@ #define CONFIG_USB_PD_TCPMV1 #else #define CONFIG_USB_PD_DECODE_SOP - #define CONFIG_USB_TYPEC_DRP_ACC_TRYSRC + #define CONFIG_USB_DRP_ACC_TRYSRC /* Enable TCPMv2 Fast Role Swap */ /* Turn off until FRSwap is working */ diff --git a/board/chocodile_vpdmcu/board.h b/board/chocodile_vpdmcu/board.h index d79e8ac20f..962a4935f1 100644 --- a/board/chocodile_vpdmcu/board.h +++ b/board/chocodile_vpdmcu/board.h @@ -65,7 +65,7 @@ #define CONFIG_USB_PD_TCPM_STUB #define CONFIG_USB_POWER_DELIVERY #define CONFIG_USB_PD_TCPMV2 -#define CONFIG_USB_TYPEC_CTVPD +#define CONFIG_USB_CTVPD #define CONFIG_USB_PD_DECODE_SOP #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_INTERNAL_COMP diff --git a/board/puff/board.h b/board/puff/board.h index 728a8c1d2c..8f8bd0314c 100644 --- a/board/puff/board.h +++ b/board/puff/board.h @@ -184,7 +184,7 @@ #define CONFIG_USB_PD_TCPM_TCPCI #define CONFIG_USB_PD_TCPM_ANX7447 #define CONFIG_USB_PD_TRY_SRC -#define CONFIG_USB_TYPEC_DRP_ACC_TRYSRC +#define CONFIG_USB_DRP_ACC_TRYSRC #define CONFIG_USBC_SS_MUX #define CONFIG_USBC_SS_MUX_DFP_ONLY #define CONFIG_USBC_VCONN diff --git a/board/trogdor/board.h b/board/trogdor/board.h index 5890fdebff..61f2dcd5e0 100644 --- a/board/trogdor/board.h +++ b/board/trogdor/board.h @@ -111,7 +111,7 @@ /* USB */ #define CONFIG_USB_POWER_DELIVERY #define CONFIG_USB_PD_TCPMV2 -#define CONFIG_USB_TYPEC_DRP_ACC_TRYSRC +#define CONFIG_USB_DRP_ACC_TRYSRC #define CONFIG_USB_PD_DECODE_SOP #define CONFIG_CMD_PD_CONTROL #define CONFIG_USB_PD_ALT_MODE diff --git a/chip/stm32/usb_pd_phy.c b/chip/stm32/usb_pd_phy.c index 4e845882d9..7f34a1448b 100644 --- a/chip/stm32/usb_pd_phy.c +++ b/chip/stm32/usb_pd_phy.c @@ -453,7 +453,7 @@ void pd_rx_handler(void) int next_idx; pending = STM32_EXTI_PR; -#ifdef CONFIG_USB_TYPEC_CTVPD +#ifdef CONFIG_USB_CTVPD /* Charge-Through Side detach event */ if (pending & EXTI_COMP2_MASK) { task_set_event(PD_PORT_TO_TASK_ID(0), PD_EVENT_SM, 0); diff --git a/common/usb_pd_host_cmd.c b/common/usb_pd_host_cmd.c index 1de3944502..d7106c4625 100644 --- a/common/usb_pd_host_cmd.c +++ b/common/usb_pd_host_cmd.c @@ -405,8 +405,8 @@ static enum ec_status hc_get_pd_port_caps(struct host_cmd_handler_args *args) else r->pd_try_power_role_cap = EC_PD_TRY_POWER_ROLE_NONE; - if (IS_ENABLED(CONFIG_USB_TYPEC_VPD) || - IS_ENABLED(CONFIG_USB_TYPEC_CTVPD)) + if (IS_ENABLED(CONFIG_USB_VPD) || + IS_ENABLED(CONFIG_USB_CTVPD)) r->pd_data_role_cap = EC_PD_DATA_ROLE_UFP; else r->pd_data_role_cap = EC_PD_DATA_ROLE_DUAL; diff --git a/common/usb_pd_tcpc.c b/common/usb_pd_tcpc.c index 2fabd8454c..d8290c49bb 100644 --- a/common/usb_pd_tcpc.c +++ b/common/usb_pd_tcpc.c @@ -314,7 +314,7 @@ int prepare_message(int port, uint16_t header, uint8_t cnt, int off, i; /* 64-bit preamble */ off = pd_write_preamble(port); -#if defined(CONFIG_USB_TYPEC_VPD) || defined(CONFIG_USB_TYPEC_CTVPD) +#if defined(CONFIG_USB_VPD) || defined(CONFIG_USB_CTVPD) /* Start Of Packet Prime: 2x Sync-1 + 2x Sync-3 */ off = pd_write_sym(port, off, BMC(PD_SYNC1)); off = pd_write_sym(port, off, BMC(PD_SYNC1)); @@ -660,7 +660,7 @@ int pd_analyze_rx(int port, uint32_t *payload) /* Find the Start Of Packet sequence */ while (bit > 0) { bit = pd_dequeue_bits(port, bit, 20, &val); -#if defined(CONFIG_USB_TYPEC_VPD) || defined(CONFIG_USB_TYPEC_CTVPD) +#if defined(CONFIG_USB_VPD) || defined(CONFIG_USB_CTVPD) if (val == PD_SOP_PRIME) { break; } else if (val == PD_SOP) { @@ -670,7 +670,7 @@ int pd_analyze_rx(int port, uint32_t *payload) CPRINTF("SOP''\n"); return PD_RX_ERR_UNSUPPORTED_SOP; } -#else /* CONFIG_USB_TYPEC_VPD || CONFIG_USB_TYPEC_CTVPD */ +#else /* CONFIG_USB_VPD || CONFIG_USB_CTVPD */ #ifdef CONFIG_USB_PD_DECODE_SOP if (val == PD_SOP || val == PD_SOP_PRIME || val == PD_SOP_PRIME_PRIME) @@ -686,7 +686,7 @@ int pd_analyze_rx(int port, uint32_t *payload) return PD_RX_ERR_UNSUPPORTED_SOP; } #endif /* CONFIG_USB_PD_DECODE_SOP */ -#endif /* CONFIG_USB_TYPEC_VPD || CONFIG_USB_TYPEC_CTVPD */ +#endif /* CONFIG_USB_VPD || CONFIG_USB_CTVPD */ } if (bit < 0) { #ifdef CONFIG_USB_PD_DECODE_SOP @@ -862,7 +862,7 @@ int tcpc_run(int port, int evt) /* outgoing packet ? */ if ((evt & PD_EVENT_TX) && pd[port].rx_enabled) { switch (pd[port].tx_type) { -#if defined(CONFIG_USB_TYPEC_VPD) || defined(CONFIG_USB_TYPEC_CTVPD) +#if defined(CONFIG_USB_VPD) || defined(CONFIG_USB_CTVPD) case TCPC_TX_SOP_PRIME: #else case TCPC_TX_SOP: diff --git a/common/usbc/build.mk b/common/usbc/build.mk index 781c6a9d10..df86de996f 100644 --- a/common/usbc/build.mk +++ b/common/usbc/build.mk @@ -12,13 +12,13 @@ all-obj-$(CONFIG_USB_PD_TCPMV2)+=$(_usbc_dir)usb_sm.o all-obj-$(CONFIG_USB_TYPEC_SM)+=$(_usbc_dir)usbc_task.o all-obj-$(CONFIG_USB_PRL_SM)+=$(_usbc_dir)usb_prl_sm.o ifneq ($(CONFIG_USB_PE_SM),) -all-obj-$(CONFIG_USB_TYPEC_VPD)+=$(_usbc_dir)usb_pe_ctvpd_sm.o -all-obj-$(CONFIG_USB_TYPEC_CTVPD)+=$(_usbc_dir)usb_pe_ctvpd_sm.o -all-obj-$(CONFIG_USB_TYPEC_DRP_ACC_TRYSRC)+=$(_usbc_dir)usb_pe_drp_sm.o +all-obj-$(CONFIG_USB_VPD)+=$(_usbc_dir)usb_pe_ctvpd_sm.o +all-obj-$(CONFIG_USB_CTVPD)+=$(_usbc_dir)usb_pe_ctvpd_sm.o +all-obj-$(CONFIG_USB_DRP_ACC_TRYSRC)+=$(_usbc_dir)usb_pe_drp_sm.o all-obj-$(CONFIG_TEST_USB_PE_SM)+=$(_usbc_dir)usb_pe_drp_sm.o endif -all-obj-$(CONFIG_USB_TYPEC_VPD)+=$(_usbc_dir)usb_tc_vpd_sm.o -all-obj-$(CONFIG_USB_TYPEC_CTVPD)+=$(_usbc_dir)usb_tc_ctvpd_sm.o -all-obj-$(CONFIG_USB_TYPEC_DRP_ACC_TRYSRC)+=\ +all-obj-$(CONFIG_USB_VPD)+=$(_usbc_dir)usb_tc_vpd_sm.o +all-obj-$(CONFIG_USB_CTVPD)+=$(_usbc_dir)usb_tc_ctvpd_sm.o +all-obj-$(CONFIG_USB_DRP_ACC_TRYSRC)+=\ $(_usbc_dir)usb_tc_drp_acc_trysrc_sm.o endif diff --git a/common/usbc/usb_pe_ctvpd_sm.c b/common/usbc/usb_pe_ctvpd_sm.c index 8f3233e0d7..96afc42f49 100644 --- a/common/usbc/usb_pe_ctvpd_sm.c +++ b/common/usbc/usb_pe_ctvpd_sm.c @@ -139,7 +139,7 @@ static void pe_request_run(const int port) if (PD_VDO_CMD(vdo) != CMD_DISCOVER_IDENT) return; -#ifdef CONFIG_USB_TYPEC_CTVPD +#ifdef CONFIG_USB_CTVPD /* * We have a valid DISCOVER IDENTITY message. * Attempt to reset support timer @@ -179,7 +179,7 @@ static void pe_request_run(const int port) VPD_MAX_VBUS_20V, VPD_VBUS_IMP(VPD_VBUS_IMPEDANCE), VPD_GND_IMP(VPD_GND_IMPEDANCE), -#ifdef CONFIG_USB_TYPEC_CTVPD +#ifdef CONFIG_USB_CTVPD VPD_CTS_SUPPORTED #else VPD_CTS_NOT_SUPPORTED diff --git a/common/usbc/usb_prl_sm.c b/common/usbc/usb_prl_sm.c index 769a103fe5..b946195d05 100644 --- a/common/usbc/usb_prl_sm.c +++ b/common/usbc/usb_prl_sm.c @@ -424,8 +424,8 @@ void prl_run(int port, int evt, int en) case SM_RUN: if (!en) { /* Disable RX */ - if (IS_ENABLED(CONFIG_USB_TYPEC_CTVPD) || - IS_ENABLED(CONFIG_USB_TYPEC_VPD)) + if (IS_ENABLED(CONFIG_USB_CTVPD) || + IS_ENABLED(CONFIG_USB_VPD)) vpd_rx_enable(0); else tcpm_set_rx_enable(port, 0); @@ -465,8 +465,8 @@ enum pd_rev_type prl_get_rev(int port, enum tcpm_transmit_type type) /* Common Protocol Layer Message Transmission */ static void prl_tx_phy_layer_reset_entry(const int port) { - if (IS_ENABLED(CONFIG_USB_TYPEC_CTVPD) - || IS_ENABLED(CONFIG_USB_TYPEC_VPD)) { + if (IS_ENABLED(CONFIG_USB_CTVPD) + || IS_ENABLED(CONFIG_USB_VPD)) { vpd_rx_enable(pd_is_connected(port)); } else { tcpm_clear_pending_messages(port); @@ -852,8 +852,8 @@ static void prl_hr_reset_layer_entry(const int port) } /* Disable RX */ - if (IS_ENABLED(CONFIG_USB_TYPEC_CTVPD) || - IS_ENABLED(CONFIG_USB_TYPEC_VPD)) + if (IS_ENABLED(CONFIG_USB_CTVPD) || + IS_ENABLED(CONFIG_USB_VPD)) vpd_rx_enable(0); else tcpm_set_rx_enable(port, 0); @@ -1552,8 +1552,8 @@ static void prl_rx_wait_for_phy_message(const int port, int evt) * Ignore messages sent to the cable from our * port partner if we aren't Vconn powered device. */ - if (!IS_ENABLED(CONFIG_USB_TYPEC_CTVPD) && - !IS_ENABLED(CONFIG_USB_TYPEC_VPD) && + if (!IS_ENABLED(CONFIG_USB_CTVPD) && + !IS_ENABLED(CONFIG_USB_VPD) && PD_HEADER_GET_SOP(header) != PD_MSG_SOP && PD_HEADER_PROLE(header) == PD_PLUG_FROM_DFP_UFP) return; diff --git a/fuzz/fuzz_config.h b/fuzz/fuzz_config.h index 3e3e1f0872..5e7c819359 100644 --- a/fuzz/fuzz_config.h +++ b/fuzz/fuzz_config.h @@ -50,7 +50,7 @@ #define CONFIG_USB_POWER_DELIVERY #define CONFIG_USB_PRL_SM #define CONFIG_USB_PD_TCPMV2 -#define CONFIG_USB_TYPEC_DRP_ACC_TRYSRC +#define CONFIG_USB_DRP_ACC_TRYSRC #define CONFIG_USBC_VCONN #define CONFIG_USBC_VCONN_SWAP #define PD_VCONN_SWAP_DELAY 5000 diff --git a/include/config.h b/include/config.h index fe23a4880f..e1be5db2ad 100644 --- a/include/config.h +++ b/include/config.h @@ -4003,13 +4003,13 @@ #undef CONFIG_USB_PD_PREFER_MV /* Type-C VCONN Powered Device */ -#undef CONFIG_USB_TYPEC_VPD +#undef CONFIG_USB_VPD /* Type-C Charge Through VCONN Powered Device */ -#undef CONFIG_USB_TYPEC_CTVPD +#undef CONFIG_USB_CTVPD /* Type-C DRP with Accessory and Try.SRC */ -#undef CONFIG_USB_TYPEC_DRP_ACC_TRYSRC +#undef CONFIG_USB_DRP_ACC_TRYSRC /* Type-C Fast Role Swap */ #undef CONFIG_USB_TYPEC_PD_FAST_ROLE_SWAP diff --git a/include/usb_tc_sm.h b/include/usb_tc_sm.h index c3bb080d78..58c33143ad 100644 --- a/include/usb_tc_sm.h +++ b/include/usb_tc_sm.h @@ -374,7 +374,7 @@ uint32_t tc_get_flags(int port); */ void tc_print_dev_info(int port); -#ifdef CONFIG_USB_TYPEC_CTVPD +#ifdef CONFIG_USB_CTVPD /** * Resets the charge-through support timer. This can be @@ -391,6 +391,6 @@ void tc_reset_support_timer(int port); * */ void tc_ctvpd_detected(int port); -#endif /* CONFIG_USB_TYPEC_CTVPD */ +#endif /* CONFIG_USB_CTVPD */ #endif /* __CROS_EC_USB_TC_H */ diff --git a/test/fake_usbc.c b/test/fake_usbc.c index bbc565a14d..0438eaf97f 100644 --- a/test/fake_usbc.c +++ b/test/fake_usbc.c @@ -178,8 +178,8 @@ uint8_t pd_get_src_cap_cnt(int port) } #endif -#if !defined(CONFIG_USB_TYPEC_DRP_ACC_TRYSRC) && \ - !defined(CONFIG_USB_TYPEC_CTVPD) +#if !defined(CONFIG_USB_DRP_ACC_TRYSRC) && \ + !defined(CONFIG_USB_CTVPD) int pd_is_connected(int port) { return true; @@ -189,9 +189,9 @@ bool pd_is_disconnected(int port) { return false; } -#endif /* !CONFIG_USB_TYPEC_DRP_ACC_TRYSRC && !CONFIG_USB_TYPEC_CTVPD */ +#endif /* !CONFIG_USB_DRP_ACC_TRYSRC && !CONFIG_USB_CTVPD */ -#ifndef CONFIG_USB_TYPEC_DRP_ACC_TRYSRC +#ifndef CONFIG_USB_DRP_ACC_TRYSRC void pd_set_dual_role(int port, enum pd_dual_role_states state) { } @@ -230,4 +230,4 @@ const char *pd_get_task_state_name(int port) { return NULL; } -#endif /* CONFIG_USB_TYPEC_DRP_ACC_TRYSRC */ +#endif /* CONFIG_USB_DRP_ACC_TRYSRC */ diff --git a/test/test_config.h b/test/test_config.h index eaf426daef..1461d52874 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -389,15 +389,15 @@ int ncp15wb_calculate_temp(uint16_t adc); #endif /* Common TypeC test defines */ #ifdef TEST_USB_TYPEC_VPD -#define CONFIG_USB_TYPEC_VPD +#define CONFIG_USB_VPD #endif #ifdef TEST_USB_TYPEC_CTVPD -#define CONFIG_USB_TYPEC_CTVPD +#define CONFIG_USB_CTVPD #endif #ifdef TEST_USB_TYPEC_DRP_ACC_TRYSRC -#define CONFIG_USB_TYPEC_DRP_ACC_TRYSRC +#define CONFIG_USB_DRP_ACC_TRYSRC #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_TRY_SRC #define CONFIG_USB_TYPEC_SM diff --git a/test/usb_typec_ctvpd.c b/test/usb_typec_ctvpd.c index 0253bd75d1..d5cd88cbc8 100644 --- a/test/usb_typec_ctvpd.c +++ b/test/usb_typec_ctvpd.c @@ -558,7 +558,7 @@ static int test_vpd_host_src_detection_message_reception(void) VPD_MAX_VBUS_20V, VPD_VBUS_IMP(VPD_VBUS_IMPEDANCE), VPD_GND_IMP(VPD_GND_IMPEDANCE), -#ifdef CONFIG_USB_TYPEC_CTVPD +#ifdef CONFIG_USB_CTVPD VPD_CTS_SUPPORTED #else VPD_CTS_NOT_SUPPORTED |