Refactoring

2 files changed, 14 insertions, 12 deletions

diff --git a/efi_memtest/memtest86+/controller.c b/efi_memtest/memtest86+/controller.c
index 9e94428..561cac6 100644
--- a/efi_memtest/memtest86+/controller.c
+++ b/efi_memtest/memtest86+/controller.c
@@ -4292,7 +4292,7 @@ static void print_memory_controller(void)
 
 void find_controller(void)
 {
-    {
+    if (logflag && log_mem_ctrl) {
     char log[] = "\nfind_controller(): started.";
     print_log(log, sizeof(log) - 1);
     }
@@ -4303,7 +4303,8 @@ void find_controller(void)
     int result;
 
     result = pci_conf_read(ctrl.bus, ctrl.dev, ctrl.fn, PCI_VENDOR_ID, 2, &vendor);
-    {
+    
+    if (logflag && log_mem_ctrl) {
     char log[48] = "find_controller(): vendor = ";
     int length = 28;
     int_to_charr(vendor, log, &length);
@@ -4311,7 +4312,8 @@ void find_controller(void)
     }
 
     result = pci_conf_read(ctrl.bus, ctrl.dev, ctrl.fn, PCI_DEVICE_ID, 2, &device);
-    {
+    
+    if (logflag && log_mem_ctrl) {
     char log[48] = "find_controller(): device = ";
     int length = 28;
     int_to_charr(device, log, &length);
@@ -4322,14 +4324,14 @@ void find_controller(void)
     if(imc_type) { vendor = 0xFFFF; device = imc_type; }
     if(vv->fail_safe & 1) { vendor = 0xFFFF; device = 0xFFFF; }
 
-        {
+    if (logflag && log_mem_ctrl) {
     char log[48] = "find_controller(): vendor = ";
     int length = 28;
     int_to_charr(vendor, log, &length);
     print_log(log, length);
     }
 
-    {
+    if (logflag && log_mem_ctrl) {
     char log[48] = "find_controller(): device = ";
     int length = 28;
     int_to_charr(device, log, &length);
@@ -4348,21 +4350,21 @@ void find_controller(void)
         }
     }
 
-    {
+    if (logflag && log_mem_ctrl) {
     char log[42] = "find_controller(): ctrl.index = ";
     int length = 32;
     int_to_charr(ctrl.index, log, &length);
     print_log(log, length);
     }
 
-    {
+    if (logflag && log_mem_ctrl) {
         char log[30] = "Pointer = ";
         int length = 10;
         int_to_charr((unsigned long int)controllers[ctrl.index].name, log, &length);
         print_log(log, length);
     }
 
-    {
+    if (logflag && log_mem_ctrl) {
     char log[70] = "find_controller(): pci_memory_controller.name = XXXXXXXXXXXXXXXXXXXX";
     int length = 48;
     string_to_charr(controllers[ctrl.index].name, log, &length);
@@ -4372,7 +4374,7 @@ void find_controller(void)
     char* name = controllers[ctrl.index].name;
     print_log(name, 10);
 
-    {
+    if (logflag && log_mem_ctrl) {
         char log[49] = "find_controller(): controller length = ";
         int length = 39;
         int ctrl_size = sizeof(controllers) / sizeof(controllers[0]);
@@ -4382,7 +4384,7 @@ void find_controller(void)
 	
     // controllers[ctrl.index].setup_ecc();
     
-    print_log("4m.bm", 5);
+    if(1) print_log("4m.bm", 5);
 
 
     /* Don't enable ECC polling by default unless it has
@@ -4392,7 +4394,7 @@ void find_controller(void)
     // set_ecc_polling(-1);
     print_memory_controller();
 
-    print_log("5mbm", 4);
+    if(1) print_log("5mbm", 4);
 	
     if(imc_type) { print_dmi_startup_info(); }
 
diff --git a/efi_memtest/memtest86+/efi/init.c b/efi_memtest/memtest86+/efi/init.c
index ffaab78..9ed5e89 100644
--- a/efi_memtest/memtest86+/efi/init.c
+++ b/efi_memtest/memtest86+/efi/init.c
@@ -294,7 +294,7 @@ void init(void) {
     /* Find Memory Specs */
     if(vv->fail_safe & 1) 
     { 	
-        cprint(LINE_CPU, COL_SPEC, " **** FAIL SAFE **** FAIL SAFE **** ");
+        cprint(LINE_CPU, COL_SPEC, " **** FAIL SAFE **** FAIL SAFE **** "); // TODO should be printed AFTER prnt_mainscreen
         cprint(LINE_RAM, COL_SPEC, "   No detection, same reliability   ");
     } else {
         find_controller();