From abd9804bca4271459a38ff34b63a026e3f67b59c Mon Sep 17 00:00:00 2001
From: Regia König
Date: Tue, 8 Jun 2021 19:20:42 +0200
Subject: Print DMI Infos

---
 efi_memtest/memtest86+/controller.c |  4 ++--
 efi_memtest/memtest86+/efi/dmi.c    | 41 ++++++++++++++++++++++---------------
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/efi_memtest/memtest86+/controller.c b/efi_memtest/memtest86+/controller.c
index c81c357..12eb676 100644
--- a/efi_memtest/memtest86+/controller.c
+++ b/efi_memtest/memtest86+/controller.c
@@ -4196,7 +4196,7 @@ static void print_memory_controller(void)
     
     // TODO REMOVE
     /* Print advanced caracteristics  */
-/*    col2 = 0;
+    col2 = 0;
 
     if (logflag && log_mem_ctrl) {
         char log[23] = "ctrl.index = ";
@@ -4211,7 +4211,7 @@ static void print_memory_controller(void)
     poll_fsb_ivb();
     //controllers[127].poll_fsb();
 
-    print_log("print_controller(): 2nd", 23);*/
+    print_log("print_controller(): 2nd", 23);
     // TODO REMOVE UNTIL HERE
 
 
diff --git a/efi_memtest/memtest86+/efi/dmi.c b/efi_memtest/memtest86+/efi/dmi.c
index 9b9db0f..b2d96cb 100644
--- a/efi_memtest/memtest86+/efi/dmi.c
+++ b/efi_memtest/memtest86+/efi/dmi.c
@@ -522,27 +522,36 @@ void print_dmi_startup_info(void)
 	}
 
 	slength = sl1 + sl2;
+
+	print_log("test1", 5);
+
 	if(sl3 > 2) { slength += sl3 + 4; } else { slength++; }
 	
-	if(sl1 && sl2)
-		{
+	print_log("test2", 5);
+
+	if(sl1 && sl2) {
+
+		print_log("Printing CPU information.", 25);
 
-			print_log("Printing CPU information.", 25);
-			//dmicol -= slength; // right align
-			dmicol = 39 - slength/2; // center align
-			cprint(LINE_DMI, dmicol, string1);
-			dmicol += sl1 + 1;
-			cprint(LINE_DMI, dmicol, string2);
-			dmicol += sl2 + 1;
+
+		//dmicol -= slength; // right align
+		dmicol = 39 - slength/2; // center align
+		cprint(LINE_DMI, dmicol, string1);
+		dmicol += sl1 + 1;
+		cprint(LINE_DMI, dmicol, string2);
+		dmicol += sl2 + 1;
 			
-			if(sl3 > 2){
-				cprint(LINE_DMI, dmicol, "(");
-				dmicol++;
-				cprint(LINE_DMI, dmicol, string3);
-				dmicol += sl3;
-				cprint(LINE_DMI, dmicol, ")");
-			}
+		if(sl3 > 2){
+			cprint(LINE_DMI, dmicol, "(");
+			dmicol++;
+			cprint(LINE_DMI, dmicol, string3);
+			dmicol += sl3;
+			cprint(LINE_DMI, dmicol, ")");
 		}
+	}
+
+	print_log("test3", 5);
+
 }
 
 void print_dmi_info(void){
-- 
cgit v1.2.3-55-g7522