diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2021-11-09 16:57:01 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-18 04:50:54 +0000 |
| commit | 9c04fe1d0cf71d23d6418bd5767a67963ac749f8 (patch) | |
| tree | eddd6ce9ab2e4c9457c1ed9ee2d733c3797bdfff /common/console_output.c | |
| parent | 6d50393656f34ab9ca22fdaedfa9c9c93ed16d61 (diff) | |
| download | chrome-ec-9c04fe1d0cf71d23d6418bd5767a67963ac749f8.tar.gz | |
Revert "console_output: Add option to disable console channels"
This reverts commit 35e278bb41dc9f54e1317b0225c371b4c939eb12.
BUG=b:200823466
TEST=make buildall -j
Change-Id: I1af86919d833fd383350f55b2fb7cbd61d010a78
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3273425
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Diffstat (limited to 'common/console_output.c')
| -rw-r--r-- | common/console_output.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/common/console_output.c b/common/console_output.c index 4b0c4ef71e..03bb9d6914 100644 --- a/common/console_output.c +++ b/common/console_output.c @@ -10,7 +10,6 @@ #include "usb_console.h" #include "util.h" -#ifdef CONFIG_CONSOLE_CHANNEL /* Default to all channels active */ #ifndef CC_DEFAULT #define CC_DEFAULT CC_ALL @@ -46,7 +45,6 @@ static const char * const channel_names[] = { BUILD_ASSERT(ARRAY_SIZE(channel_names) == CC_CHANNEL_COUNT); /* ensure that we are not silently masking additional channels */ BUILD_ASSERT(CC_CHANNEL_COUNT <= 8*sizeof(uint32_t)); -#endif /* CONFIG_CONSOLE_CHANNEL */ #ifndef CONFIG_EXTRACT_PRINTF_STRINGS @@ -57,11 +55,9 @@ int cputs(enum console_channel channel, const char *outstr) { int rv1, rv2; -#ifdef CONFIG_CONSOLE_CHANNEL /* Filter out inactive channels */ if (!(CC_MASK(channel) & channel_mask)) return EC_SUCCESS; -#endif rv1 = usb_puts(outstr); rv2 = uart_puts(outstr); @@ -74,11 +70,9 @@ int cprintf(enum console_channel channel, const char *format, ...) int rv1, rv2; va_list args; -#ifdef CONFIG_CONSOLE_CHANNEL /* Filter out inactive channels */ if (!(CC_MASK(channel) & channel_mask)) return EC_SUCCESS; -#endif usb_va_start(args, format); rv1 = usb_vprintf(format, args); @@ -96,11 +90,9 @@ int cprints(enum console_channel channel, const char *format, ...) int r, rv; va_list args; -#ifdef CONFIG_CONSOLE_CHANNEL /* Filter out inactive channels */ if (!(CC_MASK(channel) & channel_mask)) return EC_SUCCESS; -#endif rv = cprintf(channel, "[%pT ", PRINTF_TIMESTAMP_NOW); @@ -129,7 +121,6 @@ void cflush(void) /*****************************************************************************/ /* Console commands */ -#ifdef CONFIG_CONSOLE_CHANNEL /* Set active channels */ static int command_ch(int argc, char **argv) { @@ -172,4 +163,3 @@ static int command_ch(int argc, char **argv) DECLARE_SAFE_CONSOLE_COMMAND(chan, command_ch, "[ save | restore | <mask> ]", "Save, restore, get or set console channel mask"); -#endif /* CONFIG_CONSOLE_CHANNEL */ |