diff options
author | Michael Brown | 2012-03-26 18:25:08 +0200 |
---|---|---|
committer | Michael Brown | 2012-03-26 18:40:01 +0200 |
commit | e024cd39a877ea1b37b9004dbd8f33448418cb36 (patch) | |
tree | 8bc44239bc5920d06b8381edef5aa37a4784aaf3 /src/arch/i386/firmware/pcbios/bios_console.c | |
parent | [console] Remove unused "btext" console (diff) | |
download | ipxe-e024cd39a877ea1b37b9004dbd8f33448418cb36.tar.gz ipxe-e024cd39a877ea1b37b9004dbd8f33448418cb36.tar.xz ipxe-e024cd39a877ea1b37b9004dbd8f33448418cb36.zip |
[console] Allow usage to be defined independently for each console
Add the concept of a "console usage", such as "standard output" or
"debug messages". Allow usages to be associated with each console
independently. For example, to send debugging output via the serial
port, while preventing it from appearing on the local console:
#define CONSOLE_SERIAL CONSOLE_USAGE_ALL
#define CONSOLE_PCBIOS ( CONSOLE_USAGE_ALL & ~CONSOLE_USAGE_DEBUG )
If no usages are explicitly specified, then a default set of usages
will be applied. For example:
#define CONSOLE_SERIAL
will have the same affect as
#define CONSOLE_SERIAL CONSOLE_USAGE_ALL
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/i386/firmware/pcbios/bios_console.c')
-rw-r--r-- | src/arch/i386/firmware/pcbios/bios_console.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/arch/i386/firmware/pcbios/bios_console.c b/src/arch/i386/firmware/pcbios/bios_console.c index e489971f..8a8795d7 100644 --- a/src/arch/i386/firmware/pcbios/bios_console.c +++ b/src/arch/i386/firmware/pcbios/bios_console.c @@ -23,6 +23,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); #include <ipxe/console.h> #include <ipxe/ansiesc.h> #include <ipxe/keymap.h> +#include <config/console.h> #define ATTR_BOLD 0x08 @@ -48,6 +49,12 @@ FILE_LICENCE ( GPL2_OR_LATER ); #define ATTR_DEFAULT ATTR_FCOL_WHITE +/* Set default console usage if applicable */ +#if ! ( defined ( CONSOLE_PCBIOS ) && CONSOLE_EXPLICIT ( CONSOLE_PCBIOS ) ) +#undef CONSOLE_PCBIOS +#define CONSOLE_PCBIOS CONSOLE_USAGE_ALL +#endif + /** Current character attribute */ static unsigned int bios_attr = ATTR_DEFAULT; @@ -319,4 +326,5 @@ struct console_driver bios_console __console_driver = { .putchar = bios_putchar, .getchar = bios_getchar, .iskey = bios_iskey, + .usage = CONSOLE_PCBIOS, }; |