diff options
author | Daisuke Nojiri <dnojiri@chromium.org> | 2020-05-07 15:59:49 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-05-08 06:21:08 +0000 |
commit | 4e8f9dbb8f7a1800fedec13cf8cfd0bc5f3b6225 (patch) | |
tree | b33c7000e1e5f1e173fc3a7c413594b9161ad46e | |
parent | 2bd83ad7c1cef3808572ff4a6d90c92e571c6446 (diff) | |
download | chrome-ec-4e8f9dbb8f7a1800fedec13cf8cfd0bc5f3b6225.tar.gz |
Rename CONFIG_ macros to CONF_*
CONFIG_ name space is reserved for configuration macros, which all
live in config.h.
This patch renames the regular macros, which happened to be prefixed
with CONFIG_, to avoid the presubmit errors.
BUG=b/155996358
BRANCH=none
TEST=buildall
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Change-Id: Ic87a23a34c7d36d65f210dd51fed109443ef71ce
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2189174
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
-rw-r--r-- | board/servo_v4/usb_pd_policy.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/board/servo_v4/usb_pd_policy.c b/board/servo_v4/usb_pd_policy.c index 0e3658f618..15096d7fd0 100644 --- a/board/servo_v4/usb_pd_policy.c +++ b/board/servo_v4/usb_pd_policy.c @@ -38,30 +38,30 @@ #define VBUS_UNCHANGED(curr, pend, new) (curr == new && pend == new) /* Macros to config the PD role */ -#define CONFIG_SET_CLEAR(c, set, clear) ((c | (set)) & ~(clear)) -#define CONFIG_SRC(c) CONFIG_SET_CLEAR(c, \ +#define CONF_SET_CLEAR(c, set, clear) ((c | (set)) & ~(clear)) +#define CONF_SRC(c) CONF_SET_CLEAR(c, \ CC_DISABLE_DTS | CC_ALLOW_SRC, \ CC_ENABLE_DRP | CC_SNK_WITH_PD) -#define CONFIG_SNK(c) CONFIG_SET_CLEAR(c, \ +#define CONF_SNK(c) CONF_SET_CLEAR(c, \ CC_DISABLE_DTS, \ CC_ALLOW_SRC | CC_ENABLE_DRP | CC_SNK_WITH_PD) -#define CONFIG_PDSNK(c) CONFIG_SET_CLEAR(c, \ +#define CONF_PDSNK(c) CONF_SET_CLEAR(c, \ CC_DISABLE_DTS | CC_SNK_WITH_PD, \ CC_ALLOW_SRC | CC_ENABLE_DRP) -#define CONFIG_DRP(c) CONFIG_SET_CLEAR(c, \ +#define CONF_DRP(c) CONF_SET_CLEAR(c, \ CC_DISABLE_DTS | CC_ALLOW_SRC | CC_ENABLE_DRP, \ CC_SNK_WITH_PD) -#define CONFIG_SRCDTS(c) CONFIG_SET_CLEAR(c, \ +#define CONF_SRCDTS(c) CONF_SET_CLEAR(c, \ CC_ALLOW_SRC, \ CC_ENABLE_DRP | CC_DISABLE_DTS | CC_SNK_WITH_PD) -#define CONFIG_SNKDTS(c) CONFIG_SET_CLEAR(c, \ +#define CONF_SNKDTS(c) CONF_SET_CLEAR(c, \ 0, \ CC_ALLOW_SRC | CC_ENABLE_DRP | \ CC_DISABLE_DTS | CC_SNK_WITH_PD) -#define CONFIG_PDSNKDTS(c) CONFIG_SET_CLEAR(c, \ +#define CONF_PDSNKDTS(c) CONF_SET_CLEAR(c, \ CC_SNK_WITH_PD, \ CC_ALLOW_SRC | CC_ENABLE_DRP | CC_DISABLE_DTS) -#define CONFIG_DRPDTS(c) CONFIG_SET_CLEAR(c, \ +#define CONF_DRPDTS(c) CONF_SET_CLEAR(c, \ CC_ALLOW_SRC | CC_ENABLE_DRP, \ CC_DISABLE_DTS | CC_SNK_WITH_PD) @@ -1108,21 +1108,21 @@ static int command_cc(int argc, char **argv) } else { cc_config_new &= ~CC_DETACH; if (!strcasecmp(argv[1], "src")) - cc_config_new = CONFIG_SRC(cc_config_new); + cc_config_new = CONF_SRC(cc_config_new); else if (!strcasecmp(argv[1], "snk")) - cc_config_new = CONFIG_SNK(cc_config_new); + cc_config_new = CONF_SNK(cc_config_new); else if (!strcasecmp(argv[1], "pdsnk")) - cc_config_new = CONFIG_PDSNK(cc_config_new); + cc_config_new = CONF_PDSNK(cc_config_new); else if (!strcasecmp(argv[1], "drp")) - cc_config_new = CONFIG_DRP(cc_config_new); + cc_config_new = CONF_DRP(cc_config_new); else if (!strcasecmp(argv[1], "srcdts")) - cc_config_new = CONFIG_SRCDTS(cc_config_new); + cc_config_new = CONF_SRCDTS(cc_config_new); else if (!strcasecmp(argv[1], "snkdts")) - cc_config_new = CONFIG_SNKDTS(cc_config_new); + cc_config_new = CONF_SNKDTS(cc_config_new); else if (!strcasecmp(argv[1], "pdsnkdts")) - cc_config_new = CONFIG_PDSNKDTS(cc_config_new); + cc_config_new = CONF_PDSNKDTS(cc_config_new); else if (!strcasecmp(argv[1], "drpdts")) - cc_config_new = CONFIG_DRPDTS(cc_config_new); + cc_config_new = CONF_DRPDTS(cc_config_new); else return EC_ERROR_PARAM2; } @@ -1323,21 +1323,21 @@ static int cmd_usbc_action(int argc, char *argv[]) /* TODO(b:140256624): drop *v command if we migrate to chg cmd. */ if (!strcasecmp(argv[1], "5v")) { - do_cc(CONFIG_SRC(cc_config)); + do_cc(CONF_SRC(cc_config)); user_limited_max_mv = 5000; update_ports(); } else if (!strcasecmp(argv[1], "12v")) { - do_cc(CONFIG_SRC(cc_config)); + do_cc(CONF_SRC(cc_config)); user_limited_max_mv = 12000; update_ports(); } else if (!strcasecmp(argv[1], "20v")) { - do_cc(CONFIG_SRC(cc_config)); + do_cc(CONF_SRC(cc_config)); user_limited_max_mv = 20000; update_ports(); } else if (!strcasecmp(argv[1], "dev")) { /* Set the limit back to original */ user_limited_max_mv = 20000; - do_cc(CONFIG_PDSNK(cc_config)); + do_cc(CONF_PDSNK(cc_config)); } else if (!strcasecmp(argv[1], "pol0")) { do_cc(cc_config & ~CC_POLARITY); } else if (!strcasecmp(argv[1], "pol1")) { @@ -1359,7 +1359,7 @@ static int cmd_usbc_action(int argc, char *argv[]) return EC_ERROR_PARAM2; user_limited_max_mv = sink_v * 1000; - do_cc(CONFIG_SRC(cc_config)); + do_cc(CONF_SRC(cc_config)); update_ports(); /* * TODO(b:140256624): servod captures 'chg SRC' keyword to |