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 /common/usb_pd_tcpc.c | |
| 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>
Diffstat (limited to 'common/usb_pd_tcpc.c')
| -rw-r--r-- | common/usb_pd_tcpc.c | 10 |
1 files changed, 5 insertions, 5 deletions
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: |