From 1fe31ee1b4ebf2f177d512d0301e11de0689a275 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 12 Mar 2018 16:03:38 +0100 Subject: console: Add console_print and console_print_at helpers This is a preparation commit for removing the setup_console(1) calls from MokManager and shim so that we don't force the EFI console to switch to text-mode. This commit replaces all direct calls to Print / PrintAt with calls to the new helpers (no functional changes) so that we can delay calling setup_console(1) till the first Print call in a follow-up patch. Signed-off-by: Hans de Goede --- netboot.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'netboot.c') diff --git a/netboot.c b/netboot.c index ea9e150b..58babfb4 100644 --- a/netboot.c +++ b/netboot.c @@ -195,12 +195,12 @@ static BOOLEAN extract_tftp_info(CHAR8 *url) memset(ip6inv, 0, sizeof(ip6inv)); if (strncmp((UINT8 *)url, (UINT8 *)"tftp://", 7)) { - Print(L"URLS MUST START WITH tftp://\n"); + console_print(L"URLS MUST START WITH tftp://\n"); return FALSE; } start = url + 7; if (*start != '[') { - Print(L"TFTP SERVER MUST BE ENCLOSED IN [..]\n"); + console_print(L"TFTP SERVER MUST BE ENCLOSED IN [..]\n"); return FALSE; } @@ -209,12 +209,12 @@ static BOOLEAN extract_tftp_info(CHAR8 *url) while ((*end != '\0') && (*end != ']')) { end++; if (end - start >= (int)sizeof(ip6str)) { - Print(L"TFTP URL includes malformed IPv6 address\n"); + console_print(L"TFTP URL includes malformed IPv6 address\n"); return FALSE; } } if (*end == '\0') { - Print(L"TFTP SERVER MUST BE ENCLOSED IN [..]\n"); + console_print(L"TFTP SERVER MUST BE ENCLOSED IN [..]\n"); return FALSE; } memset(ip6str, 0, sizeof(ip6str)); @@ -324,7 +324,7 @@ EFI_STATUS FetchNetbootimage(EFI_HANDLE image_handle, VOID **buffer, UINT64 *buf BOOLEAN nobuffer = FALSE; UINTN blksz = 512; - Print(L"Fetching Netboot Image\n"); + console_print(L"Fetching Netboot Image\n"); if (*buffer == NULL) { *buffer = AllocatePool(4096 * 1024); if (!*buffer) -- cgit v1.2.3