Author: andrew
Date: Wed Jun 8 22:36:55 2016
New Revision: 301702
URL: https://svnweb.freebsd.org/changeset/base/301702
Log:
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
Modified:
head/sys/boot/efi/libefi/efi_console.c
Modified: head/sys/boot/efi/libefi/efi_console.c
==============================================================================
--- head/sys/boot/efi/libefi/efi_console.c Wed Jun 8 22:30:21 2016
(r301701)
+++ head/sys/boot/efi/libefi/efi_console.c Wed Jun 8 22:36:55 2016
(r301702)
@@ -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)
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
