diff options
| author | Peter Jones <pjones@redhat.com> | 2017-10-19 14:43:18 -0400 |
|---|---|---|
| committer | Peter Jones <pmjones@gmail.com> | 2018-03-12 16:21:43 -0400 |
| commit | b953468e91eac48d2e3817f18cd604e20f39c56b (patch) | |
| tree | 89a6bf338b4dc3202a6d1cf283cd9beb1c97a02b /lib/console.c | |
| parent | 4d70f104818b947873698b5d9ba79e374e5b7586 (diff) | |
| download | efi-boot-shim-b953468e91eac48d2e3817f18cd604e20f39c56b.tar.gz efi-boot-shim-b953468e91eac48d2e3817f18cd604e20f39c56b.zip | |
Don't have tons of local guid definitions for no reason at all.
Signed-off-by: Peter Jones <pjones@redhat.com>
Diffstat (limited to 'lib/console.c')
| -rw-r--r-- | lib/console.c | 15 |
1 files changed, 6 insertions, 9 deletions
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 <efilib.h> #include <stdarg.h> #include <stdbool.h> -#include <console.h> -#include <variables.h> -#include <errors.h> + +#include "shim.h" + #include <Library/BaseCryptLib.h> #include <openssl/err.h> #include <openssl/crypto.h> -#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; |