From 9b6b6d0c0266550f42aceed3dd0df2e58d8ba6d9 Mon Sep 17 00:00:00 2001 From: andrew Date: Wed, 8 Jun 2016 22:36:55 +0000 Subject: Allow libefi to be built with TERM_EMU undefined. There were a few places where we assumed TERM_EMU was defined but didn't check. Fix these by also including them under the ifdefs. As HO is called from loader we need a null implementation so loader.efi doesn't need to know which version of libefi it is building against. Sponsored by: ABT Systems Ltd --- sys/boot/efi/libefi/efi_console.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'sys/boot') diff --git a/sys/boot/efi/libefi/efi_console.c b/sys/boot/efi/libefi/efi_console.c index 68c9a6b..f740d4b 100644 --- a/sys/boot/efi/libefi/efi_console.c +++ b/sys/boot/efi/libefi/efi_console.c @@ -111,9 +111,9 @@ efi_cons_probe(struct console *cp) static int efi_cons_init(int arg) { +#ifdef TERM_EMU conout->SetAttribute(conout, EFI_TEXT_ATTR(DEFAULT_FGCOLOR, DEFAULT_BGCOLOR)); -#ifdef TERM_EMU end_term(); get_pos(&curx, &cury); curs_move(&curx, &cury, curx, cury); @@ -178,6 +178,7 @@ efi_cons_rawputchar(int c) } } +#ifdef TERM_EMU /* Gracefully exit ESC-sequence processing in case of misunderstanding. */ static void bail_out(int c) @@ -412,6 +413,12 @@ efi_term_emu(int c) break; } } +#else +void +HO(void) +{ +} +#endif void efi_cons_putchar(int c) -- cgit v1.1