Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 08:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

console: Unify the check for a serial console

Browse source 
Put the check for whether a console is a serial device in a function so
that we can share the code in the two places that use it.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-07-27 09:31:03 -06:00 committed by Tom Rini
parent ef3fc42ded
commit 42f9f915c2
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
common/console.c
View file

@ -146,6 +146,21 @@ static int console_setfile(int file, struct stdio_dev * dev)
return error;
}
/**
* console_dev_is_serial() - Check if a stdio device is a serial device
*
* @sdev: Device to check
* @return true if this device is a serial device
*/
static bool console_dev_is_serial(struct stdio_dev *sdev)
{
bool is_serial;
is_serial = !strcmp(sdev->name, "serial");
return is_serial;
}
#if CONFIG_IS_ENABLED(CONSOLE_MUX)
/** Console I/O multiplexing *******************************************/
@ -210,7 +225,7 @@ static void console_puts_noserial(int file, const char *s)
for (i = 0; i < cd_count[file]; i++) {
dev = console_devices[file][i];
if (dev->puts != NULL && strcmp(dev->name, "serial") != 0)
if (dev->puts != NULL && !console_dev_is_serial(dev))
dev->puts(dev, s);
}
}
@ -249,7 +264,7 @@ static inline void console_putc(int file, const char c)
static inline void console_puts_noserial(int file, const char *s)
{
if (strcmp(stdio_devices[file]->name, "serial") != 0)
if (!console_dev_is_serial(stdio_devices[file]))
stdio_devices[file]->puts(stdio_devices[file], s);
}