From 2def23d5f1ce5ab0bdbc7142bf5a562506c720d5 Mon Sep 17 00:00:00 2001 From: Regia König Date: Mon, 14 Jun 2021 12:46:12 +0200 Subject: Create dedicated file for logger configuration --- efi_memtest/MemtestEfi.c | 12 +----------- efi_memtest/memtest86+/efi/memory_tables.c | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/efi_memtest/MemtestEfi.c b/efi_memtest/MemtestEfi.c index 764279d..a464cba 100644 --- a/efi_memtest/MemtestEfi.c +++ b/efi_memtest/MemtestEfi.c @@ -7,20 +7,10 @@ #include "main.h" // TODO move into main dir #include "memtest86+/logger.h" #include "memtest86+/display.h" +#include "logger_config.h" extern EFI_SYSTEM_TABLE *gST; -short logflag = 1; -short log_fine = 0; -short log_cpuspeed = 0; -short log_memspeed = 0; -short log_mem_tbl = 0; -short log_comp_seg = 0; -short log_print_pmap = 1; -short log_mem_ctrl = 0; -short log_pmap = 1; -short log_pci_conf = 0; -short log_dmi = 0; EFI_STATUS EFIAPI diff --git a/efi_memtest/memtest86+/efi/memory_tables.c b/efi_memtest/memtest86+/efi/memory_tables.c index 7087bbc..25d209f 100644 --- a/efi_memtest/memtest86+/efi/memory_tables.c +++ b/efi_memtest/memtest86+/efi/memory_tables.c @@ -180,7 +180,7 @@ void get_mem_size(int flag, short e820_nr, struct e820entry *e820) { } end = e820[i].addr; end += e820[i].size * 4096; - // >> 12 = /4096 + // >> 12 = /4096 vv->pmap[n].start = (e820[i].addr + 4095) >> 12; vv->pmap[n].end = end >> 12; vv->test_pages += vv->pmap[n].end - vv->pmap[n].start; -- cgit v1.2.3-55-g7522