From c04abe19751fa36d5e71bc5fcf4f320ccdb3fb45 Mon Sep 17 00:00:00 2001
From: Regia König
Date: Wed, 23 Jun 2021 10:16:57 +0200
Subject: Do not print inside tst2 initialization phase

---
 efi_memtest/OUTPUT/MemtestEfi.lib | Bin 2574938 -> 2574266 bytes
 efi_memtest/memtest86+/efi/test.c |   4 ++--
 efi_memtest/memtest86+/error.c    |  18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/efi_memtest/OUTPUT/MemtestEfi.lib b/efi_memtest/OUTPUT/MemtestEfi.lib
index ebea205..348d225 100644
Binary files a/efi_memtest/OUTPUT/MemtestEfi.lib and b/efi_memtest/OUTPUT/MemtestEfi.lib differ
diff --git a/efi_memtest/memtest86+/efi/test.c b/efi_memtest/memtest86+/efi/test.c
index 43e25d9..94832a4 100644
--- a/efi_memtest/memtest86+/efi/test.c
+++ b/efi_memtest/memtest86+/efi/test.c
@@ -333,10 +333,10 @@ STATIC void addr_tst2_init_segment(ulong* p,
                     if ((ulong)p == bad_addr) {
                         addr_written = 1;
                         ulong *px = (ulong *)bad_addr;
-                        char log[35] = "content of p = ";
+/*                        char log[35] = "content of p = ";
                         int length = 15;
                         int_to_charr(*px, log, &length);
-                        print_log(log, length);
+                        print_log(log, length);*/
                     }
 
                     if (addr_written && (*(ulong *) bad_addr != bad_addr)) {
diff --git a/efi_memtest/memtest86+/error.c b/efi_memtest/memtest86+/error.c
index f256e5d..221a7c5 100644
--- a/efi_memtest/memtest86+/error.c
+++ b/efi_memtest/memtest86+/error.c
@@ -127,7 +127,7 @@ void ad_err2(ulong *adr, ulong bad)
         print_log(log, length);
     }
 
-    while(1);
+    //while(1);
 
     //query_memory_table(); // TODO remove
     //print_pmap(); // TODO remove
@@ -511,12 +511,12 @@ void do_tick(int me)
     if (++spin_idx[me] > 3) {
         spin_idx[me] = 0;
     }
-    //cplace(8, me+7, spin[spin_idx[me]]);
+    // TODO cplace(8, me+7, spin[spin_idx[me]]);
 	
 	
     /* Check for keyboard input */
     if (me == mstr_cpu) {
-        check_input();
+        // TODO check_input();
     }
     /* A barrier here holds the other CPUs until the configuration
      * changes are done */
@@ -529,7 +529,7 @@ void do_tick(int me)
 
     /* FIXME only print serial error messages from the tick handler */
     if (vv->ecount) {
-        print_err_counts();
+        // TODO print_err_counts();
     }
 	
     nticks++;
@@ -543,13 +543,13 @@ void do_tick(int me)
     } else {
         pct = 0;
     }
-    dprint(2, COL_MID+4, pct, 3, 0);
+    // dprint(2, COL_MID+4, pct, 3, 0);
     i = (BAR_SIZE * pct) / 100;
     while (i > vv->tptr) {
         if (vv->tptr >= BAR_SIZE) {
             break;
         }
-        cprint(2, COL_MID+9+vv->tptr, "#");
+        // cprint(2, COL_MID+9+vv->tptr, "#");
         vv->tptr++;
     }
 	
@@ -561,13 +561,13 @@ void do_tick(int me)
     } else {
         pct = 0;
     }
-    dprint(1, COL_MID+4, pct, 3, 0);
+    // TODO dprint(1, COL_MID+4, pct, 3, 0);
     i = (BAR_SIZE * pct) / 100;
     while (i > vv->pptr) {
         if (vv->pptr >= BAR_SIZE) {
             break;
         }
-        cprint(1, COL_MID+9+vv->pptr, "#");
+        // TODO cprint(1, COL_MID+9+vv->pptr, "#");
         vv->pptr++;
     }
 
@@ -619,7 +619,7 @@ void do_tick(int me)
           pct = 100;
           }
         
-        dprint(LINE_HEADER+0, 25, pct, 3, 1);
+        // TODO dprint(LINE_HEADER+0, 25, pct, 3, 1);
     }
 		
 
-- 
cgit v1.2.3-55-g7522