brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-27 23:20:26 +09:00
Code Issues Projects Releases Wiki Activity

stdio: Tidy up use of CONFIG_SYS_DEVICE_NULLDEV

Browse Source 
Now that this is in Kconfig we can move the logic at the top of the file
to Kconfig, and use if() instead of #if. Update the file with these
changes.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-08-11 11:23:37 -06:00 committed by Tom Rini
parent 7e15638d60
commit 3ca0609adc
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/Kconfig
View File

@ -646,6 +646,7 @@ config SPL_SYS_STDIO_DEREGISTER
config SYS_DEVICE_NULLDEV config SYS_DEVICE_NULLDEV
bool "Enable a null device for stdio" bool "Enable a null device for stdio"
default y if SPLASH_SCREEN || SYS_STDIO_DEREGISTER
help help
Enable creation of a "nulldev" stdio device. This allows silent Enable creation of a "nulldev" stdio device. This allows silent
operation of the console by setting stdout to "nulldev". Enable operation of the console by setting stdout to "nulldev". Enable

30
common/stdio.c
View File

@ -31,15 +31,6 @@ static struct stdio_dev devs;
struct stdio_dev *stdio_devices[] = { NULL, NULL, NULL }; struct stdio_dev *stdio_devices[] = { NULL, NULL, NULL };
char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" }; char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" };
#if defined(CONFIG_SPLASH_SCREEN) && !defined(CONFIG_SYS_DEVICE_NULLDEV)
#define CONFIG_SYS_DEVICE_NULLDEV 1
#endif
#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
#define CONFIG_SYS_DEVICE_NULLDEV 1
#endif
#ifdef CONFIG_SYS_DEVICE_NULLDEV
static void nulldev_putc(struct stdio_dev *dev, const char c) static void nulldev_putc(struct stdio_dev *dev, const char c)
{ {
/* nulldev is empty! */ /* nulldev is empty! */
@ -55,7 +46,6 @@ static int nulldev_input(struct stdio_dev *dev)
/* nulldev is empty! */ /* nulldev is empty! */
return 0; return 0;
} }
#endif
static void stdio_serial_putc(struct stdio_dev *dev, const char c) static void stdio_serial_putc(struct stdio_dev *dev, const char c)
{ {
@ -96,18 +86,18 @@ static void drv_system_init (void)
dev.tstc = stdio_serial_tstc; dev.tstc = stdio_serial_tstc;
stdio_register (&dev); stdio_register (&dev);
#ifdef CONFIG_SYS_DEVICE_NULLDEV if (CONFIG_IS_ENABLED(SYS_DEVICE_NULLDEV)) {
memset (&dev, 0, sizeof (dev)); memset(&dev, '\0', sizeof(dev));
strcpy (dev.name, "nulldev"); strcpy(dev.name, "nulldev");
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT; dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
dev.putc = nulldev_putc; dev.putc = nulldev_putc;
dev.puts = nulldev_puts; dev.puts = nulldev_puts;
dev.getc = nulldev_input; dev.getc = nulldev_input;
dev.tstc = nulldev_input; dev.tstc = nulldev_input;
stdio_register (&dev); stdio_register(&dev);
#endif }
} }
/************************************************************************** /**************************************************************************