summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRegia König2022-02-28 16:53:26 +0100
committerRegia König2022-02-28 16:53:26 +0100
commit72ae09e7200e08e18e1988bdcf09792b22ab8c21 (patch)
tree7f4503013a94b76df53e3e9f839fb45a4020623f
parentOutcommented EFI functions (diff)
downloadmemtest86-72ae09e7200e08e18e1988bdcf09792b22ab8c21.tar.gz
memtest86-72ae09e7200e08e18e1988bdcf09792b22ab8c21.tar.xz
memtest86-72ae09e7200e08e18e1988bdcf09792b22ab8c21.zip
Introduce new flag efi_activate to turn all error causing functions off
-rw-r--r--efi_memtest/MemtestEfi.c1
-rw-r--r--efi_memtest/efi_activate.h8
-rw-r--r--efi_memtest/memtest86+/efi/test.c3
3 files changed, 11 insertions, 1 deletions
diff --git a/efi_memtest/MemtestEfi.c b/efi_memtest/MemtestEfi.c
index 82438b0..c2ed3de 100644
--- a/efi_memtest/MemtestEfi.c
+++ b/efi_memtest/MemtestEfi.c
@@ -8,6 +8,7 @@
#include "memtest86+/logger.h"
#include "memtest86+/display.h"
#include "logger_config.h"
+#include "efi_activate.h"
extern EFI_SYSTEM_TABLE *gST;
diff --git a/efi_memtest/efi_activate.h b/efi_memtest/efi_activate.h
new file mode 100644
index 0000000..8417ea9
--- /dev/null
+++ b/efi_memtest/efi_activate.h
@@ -0,0 +1,8 @@
+/*
+ * This file is only for debugging purposes.
+ * Its intent is to comfortably turn on/off the EFI-functions which cause the
+ * errors in tst2 (see ticket #1599 - Remove UEFI functions and refactor).
+ * Delete this and all references to it after the bug is resolved.
+ */
+
+short efi_activate = 0; \ No newline at end of file
diff --git a/efi_memtest/memtest86+/efi/test.c b/efi_memtest/memtest86+/efi/test.c
index 84c2ae8..65ae8c3 100644
--- a/efi_memtest/memtest86+/efi/test.c
+++ b/efi_memtest/memtest86+/efi/test.c
@@ -25,6 +25,7 @@
extern short logflag;
extern short log_fine;
extern short log_tst2;
+extern short efi_activate;
// TODO remove. Just for debugging
/*int addr_written = 0;
@@ -133,7 +134,7 @@ void foreach_segment
print_log("foreach_segment(): do_tick", 26);
}*/
- // do_tick(me); TODO add it again
+ if(efi_activate) do_tick(me);
{ BAILR }
// ensure no overflow