diff options
| author | Michael Brown | 2012-03-27 01:51:10 +0200 |
|---|---|---|
| committer | Michael Brown | 2012-03-27 01:51:50 +0200 |
| commit | 82ecaaac9178566533f738d041f5c4fc578d9348 (patch) | |
| tree | 6fdb93092df28f9f18d6d98377c00eda64f232bc | |
| parent | [downloader] Use a more meaningful error message when out of memory (diff) | |
| download | ipxe-82ecaaac9178566533f738d041f5c4fc578d9348.tar.gz ipxe-82ecaaac9178566533f738d041f5c4fc578d9348.tar.xz ipxe-82ecaaac9178566533f738d041f5c4fc578d9348.zip | |
[console] Remove "log message" usage from interactive console defaults
Signed-off-by: Michael Brown <mcb30@ipxe.org>
| -rw-r--r-- | src/arch/i386/core/video_subr.c | 2 | ||||
| -rw-r--r-- | src/arch/i386/firmware/pcbios/bios_console.c | 2 | ||||
| -rw-r--r-- | src/core/serial_console.c | 2 | ||||
| -rw-r--r-- | src/interface/efi/efi_console.c | 2 | ||||
| -rw-r--r-- | src/interface/linux/linux_console.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/arch/i386/core/video_subr.c b/src/arch/i386/core/video_subr.c index 7dd99e71..306c6d56 100644 --- a/src/arch/i386/core/video_subr.c +++ b/src/arch/i386/core/video_subr.c @@ -17,7 +17,7 @@ #if ! ( defined ( CONSOLE_DIRECT_VGA ) && \ CONSOLE_EXPLICIT ( CONSOLE_DIRECT_VGA ) ) #undef CONSOLE_DIRECT_VGA -#define CONSOLE_DIRECT_VGA CONSOLE_USAGE_ALL +#define CONSOLE_DIRECT_VGA ( CONSOLE_USAGE_ALL & ~CONSOLE_USAGE_LOG ) #endif struct console_driver vga_console __console_driver; diff --git a/src/arch/i386/firmware/pcbios/bios_console.c b/src/arch/i386/firmware/pcbios/bios_console.c index 8a8795d7..097de2b8 100644 --- a/src/arch/i386/firmware/pcbios/bios_console.c +++ b/src/arch/i386/firmware/pcbios/bios_console.c @@ -52,7 +52,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); /* Set default console usage if applicable */ #if ! ( defined ( CONSOLE_PCBIOS ) && CONSOLE_EXPLICIT ( CONSOLE_PCBIOS ) ) #undef CONSOLE_PCBIOS -#define CONSOLE_PCBIOS CONSOLE_USAGE_ALL +#define CONSOLE_PCBIOS ( CONSOLE_USAGE_ALL & ~CONSOLE_USAGE_LOG ) #endif /** Current character attribute */ diff --git a/src/core/serial_console.c b/src/core/serial_console.c index 52bd5376..bbddd6b2 100644 --- a/src/core/serial_console.c +++ b/src/core/serial_console.c @@ -12,7 +12,7 @@ /* Set default console usage if applicable */ #if ! ( defined ( CONSOLE_SERIAL ) && CONSOLE_EXPLICIT ( CONSOLE_SERIAL ) ) #undef CONSOLE_SERIAL -#define CONSOLE_SERIAL CONSOLE_USAGE_ALL +#define CONSOLE_SERIAL ( CONSOLE_USAGE_ALL & ~CONSOLE_USAGE_LOG ) #endif struct console_driver serial_console __console_driver; diff --git a/src/interface/efi/efi_console.c b/src/interface/efi/efi_console.c index 54b0c080..6b612438 100644 --- a/src/interface/efi/efi_console.c +++ b/src/interface/efi/efi_console.c @@ -52,7 +52,7 @@ FILE_LICENCE ( GPL2_OR_LATER ); /* Set default console usage if applicable */ #if ! ( defined ( CONSOLE_EFI ) && CONSOLE_EXPLICIT ( CONSOLE_EFI ) ) #undef CONSOLE_EFI -#define CONSOLE_EFI CONSOLE_USAGE_ALL +#define CONSOLE_EFI ( CONSOLE_USAGE_ALL & ~CONSOLE_USAGE_LOG ) #endif /** Current character attribute */ diff --git a/src/interface/linux/linux_console.c b/src/interface/linux/linux_console.c index c79e5263..5105eaa9 100644 --- a/src/interface/linux/linux_console.c +++ b/src/interface/linux/linux_console.c @@ -38,7 +38,7 @@ FILE_LICENCE(GPL2_OR_LATER); /* Set default console usage if applicable */ #if ! ( defined ( CONSOLE_LINUX ) && CONSOLE_EXPLICIT ( CONSOLE_LINUX ) ) #undef CONSOLE_LINUX -#define CONSOLE_LINUX CONSOLE_USAGE_ALL +#define CONSOLE_LINUX ( CONSOLE_USAGE_ALL & ~CONSOLE_USAGE_LOG ) #endif static void linux_console_putchar(int c) |