From b953468e91eac48d2e3817f18cd604e20f39c56b Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 19 Oct 2017 14:43:18 -0400 Subject: Don't have tons of local guid definitions for no reason at all. Signed-off-by: Peter Jones --- lib/console.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'lib/console.c') diff --git a/lib/console.c b/lib/console.c index b647dd1f..358c78bf 100644 --- a/lib/console.c +++ b/lib/console.c @@ -8,15 +8,13 @@ #include #include #include -#include -#include -#include + +#include "shim.h" + #include #include #include -#include "shim.h" - static int count_lines(CHAR16 *str_arr[]) { @@ -417,13 +415,12 @@ VOID setup_verbosity(VOID) { EFI_STATUS status; - EFI_GUID guid = SHIM_LOCK_GUID; UINT8 verbose_check; UINTN verbose_check_size; verbose_check_size = 1; status = get_variable(L"SHIM_VERBOSE", (void *)&verbose_check, - &verbose_check_size, guid); + &verbose_check_size, SHIM_LOCK_GUID); verbose = 0; if (!EFI_ERROR(status)) verbose = verbose_check; @@ -432,13 +429,13 @@ setup_verbosity(VOID) VOID setup_console (int text) { EFI_STATUS status; - EFI_GUID console_control_guid = EFI_CONSOLE_CONTROL_PROTOCOL_GUID; EFI_CONSOLE_CONTROL_PROTOCOL *concon; static EFI_CONSOLE_CONTROL_SCREEN_MODE mode = EfiConsoleControlScreenGraphics; EFI_CONSOLE_CONTROL_SCREEN_MODE new_mode; - status = LibLocateProtocol(&console_control_guid, (VOID **)&concon); + status = LibLocateProtocol(&EFI_CONSOLE_CONTROL_GUID, + (VOID **)&concon); if (status != EFI_SUCCESS) return; -- cgit v1.2.3