From 9bd134e9731a3dbaebe26319cf915c9a7e73f1cc Mon Sep 17 00:00:00 2001
From: Regia König
Date: Wed, 23 Jun 2021 11:16:20 +0200
Subject: Save version where no test errors occur

---
 efi_memtest/OUTPUT/MemtestEfi.lib           | Bin 2574266 -> 2570386 bytes
 efi_memtest/memtest86+/efi/page_allocator.c |   2 +-
 efi_memtest/memtest86+/efi/test.c           |   8 ++++----
 efi_memtest/memtest86+/main.c               |  11 +++++------
 test_code/erase_memtest_log.sh              |   4 ++--
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/efi_memtest/OUTPUT/MemtestEfi.lib b/efi_memtest/OUTPUT/MemtestEfi.lib
index 348d225..20223f6 100644
Binary files a/efi_memtest/OUTPUT/MemtestEfi.lib and b/efi_memtest/OUTPUT/MemtestEfi.lib differ
diff --git a/efi_memtest/memtest86+/efi/page_allocator.c b/efi_memtest/memtest86+/efi/page_allocator.c
index 8ab3a7e..22230a4 100644
--- a/efi_memtest/memtest86+/efi/page_allocator.c
+++ b/efi_memtest/memtest86+/efi/page_allocator.c
@@ -128,7 +128,7 @@ void divide_n_conquer_allocation(int page_no, unsigned long *p) {
 
 	} else {
 
-		if (logflag) {
+		if (logflag && log_page_alloc) {
 
 			alloc_map->entry[alloc_map->length].start = p;
 			alloc_map->entry[alloc_map->length].no_of_pages = page_no;
diff --git a/efi_memtest/memtest86+/efi/test.c b/efi_memtest/memtest86+/efi/test.c
index 94832a4..0c5ce5b 100644
--- a/efi_memtest/memtest86+/efi/test.c
+++ b/efi_memtest/memtest86+/efi/test.c
@@ -294,7 +294,7 @@ STATIC void addr_tst2_init_segment(ulong* p,
                                    ulong len_dw, const void* unused) {
     ulong* pe = p + ((len_dw - 1) >> 1);
 
-    if (logflag && log_tst2) {
+/*    if (logflag && log_tst2) {
         char log[27] = "Number of pages: ";
         int length = 17;
         int_to_charr((ulong)(pe - p)>>9, log, &length);
@@ -322,7 +322,7 @@ STATIC void addr_tst2_init_segment(ulong* p,
         print_log(log, length);
     }
 
-    stack_addr();
+    stack_addr();*/
 
     //Original C code replaced with hand tuned assembly code
 
@@ -332,8 +332,8 @@ STATIC void addr_tst2_init_segment(ulong* p,
      				*p = (ulong)p;
                     if ((ulong)p == bad_addr) {
                         addr_written = 1;
-                        ulong *px = (ulong *)bad_addr;
-/*                        char log[35] = "content of p = ";
+/*                        ulong *px = (ulong *)bad_addr;
+                        char log[35] = "content of p = ";
                         int length = 15;
                         int_to_charr(*px, log, &length);
                         print_log(log, length);*/
diff --git a/efi_memtest/memtest86+/main.c b/efi_memtest/memtest86+/main.c
index f02f2c3..ad050e9 100644
--- a/efi_memtest/memtest86+/main.c
+++ b/efi_memtest/memtest86+/main.c
@@ -931,7 +931,7 @@ void test_start(void)
                         int_to_charr(no_of_tests, log, &length);
                         print_log(log, length);
                     }
-                    if (logflag) {
+      /*              if (logflag) {
                         char log[63] = "test_start(): No of tested segments (#2) = ";
                         int length = 43;
                         int_to_charr(no_of_segment_tests, log, &length);
@@ -942,12 +942,11 @@ void test_start(void)
                         int length = 33;
                         int_to_charr(no_of_ticks, log, &length);
                         print_log(log, length);
-                    }
+                    }*/
                     if (logflag) {
-                        print_log("test_start(): Reboot\n", 21);
+                        print_log("test_start(): Reboot because no failurs detected\n", 48);
                     }
-                    while(1); // TODO remove and set reboot
-                    //reboot();
+                    reboot();
                 }
                 if (!btflag)
                     cprint(LINE_MSG, COL_MSG-8,
@@ -1080,7 +1079,7 @@ int do_test(int my_ord)
         print_log(log, length);
     }
 
-    if (1 /*pages_allocated == 1*/) {
+    if (0 /*pages_allocated == 1*/) {
 
         if (logflag && log_print_pmap) print_pmap();
 
diff --git a/test_code/erase_memtest_log.sh b/test_code/erase_memtest_log.sh
index 68d8a6c..e1bb70f 100755
--- a/test_code/erase_memtest_log.sh
+++ b/test_code/erase_memtest_log.sh
@@ -2,7 +2,7 @@
 
 rm hda-contents/memtest_log
 
-for i in {1..30}
+for i in {1..400}
 do
-  echo "XXXXXXXXXX" >> hda-contents/memtest_log
+  echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" >> hda-contents/memtest_log
 done
-- 
cgit v1.2.3-55-g7522