Remove unused codesection. Add new logflag.

2 files changed, 36 insertions, 110 deletions

diff --git a/efi_memtest/MemtestEfi.c b/efi_memtest/MemtestEfi.c
index 5457a58..764279d 100644
--- a/efi_memtest/MemtestEfi.c
+++ b/efi_memtest/MemtestEfi.c
@@ -16,10 +16,11 @@ short log_cpuspeed = 0;
 short log_memspeed = 0;
 short log_mem_tbl = 0;
 short log_comp_seg = 0;
-short log_print_pmap = 0;
-short log_mem_ctrl = 1;
-short log_pmap = 0;
+short log_print_pmap = 1;
+short log_mem_ctrl = 0;
+short log_pmap = 1;
 short log_pci_conf = 0;
+short log_dmi = 0;
 
 EFI_STATUS
 EFIAPI
diff --git a/efi_memtest/memtest86+/efi/dmi.c b/efi_memtest/memtest86+/efi/dmi.c
index b2d96cb..bb3cacd 100644
--- a/efi_memtest/memtest86+/efi/dmi.c
+++ b/efi_memtest/memtest86+/efi/dmi.c
@@ -22,7 +22,7 @@
 #define round_down(x,y) ((x) & ~((y)-1))
 
 extern short logflag;
-extern short log_mem_ctrl;
+extern short log_dmi;
 
 struct dmi_eps {
 	uint8_t  anchor[4];
@@ -207,9 +207,9 @@ int open_dmi(void) {
   	EFI_CONFIGURATION_TABLE *ct = gST->ConfigurationTable;
   	UINTN NumberOfTableEntries = gST->NumberOfTableEntries;
 
-  	if (logflag && log_mem_ctrl) {
-  		char log[46] = "print_log(): NumberOfTableEntries = ";
-  		int length = 36;
+  	if (logflag && log_dmi) {
+  		char log[45] = "open_dmi(): NumberOfTableEntries = ";
+  		int length = 35;
   		int_to_charr(NumberOfTableEntries, log, &length);
   		print_log(log, length);
   	}
@@ -229,23 +229,23 @@ int open_dmi(void) {
       guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]);*/
 
     	if (abc(&guid, &acpi_20)) {
-      		print_log("EFI_ACPI_20_TABLE_GUID", 22);
+      		if (logflag && log_dmi) print_log("EFI_ACPI_20_TABLE_GUID", 22);
     	} else if (abc(&guid, &smbios)) {
-    		print_log("SMBIOS_TABLE_GUID", 17);
+    		if (log_dmi) print_log("SMBIOS_TABLE_GUID", 17);
     		dmi = ct->VendorTable;
     		found = 1;
     	} else if (abc(&guid, &smbios3)) {
-    		print_log("SMBIOS3_TABLE_GUID", 18);
+    		if (logflag && log_dmi) print_log("SMBIOS3_TABLE_GUID", 18);
     	} else if (abc(&guid, &acpi_10)) {
-    		print_log("ACPI_10_TABLE_GUID", 18);
+    		if (logflag && log_dmi) print_log("ACPI_10_TABLE_GUID", 18);
     	} else {
-    		print_log("Unknown table-GUID.", 19);
+    		if (logflag && log_dmi) print_log("Unknown table-GUID.", 19);
     	}
     	ct++;
   	}
 
   	if (!found) {
-		print_log("open_dmi(): dmi not found", 25);
+		if (logflag && log_dmi) print_log("open_dmi(): dmi not found", 25);
 		return -1;
 	}
 
@@ -260,14 +260,14 @@ int open_dmi(void) {
 		return -1;
 	}
 
-	if (logflag) {
+	if (logflag && log_dmi) {
 		char log[25] = "majorversion = ";
 		int length = 15;
 		int_to_charr(eps->majorversion, log, &length);
 		print_log(log, length);
 	}
 	
-	if (logflag) {
+	if (logflag && log_dmi) {
 		char log[25] = "minorversion = ";
 		int length = 15;
 		int_to_charr(eps->minorversion, log, &length);
@@ -286,7 +286,7 @@ int open_dmi(void) {
 	while(dmi < table_start + eps->tablelength){
 		struct tstruct_header *header = (struct tstruct_header *)dmi;
 		
-		if (logflag) {
+		if (logflag && log_dmi) {
 			char log[24] = "header type = ";
 			int length = 14;
 			int_to_charr(header->type, log, &length);
@@ -323,14 +323,14 @@ int open_dmi(void) {
 			return -1;
 	}
 
-	if(logflag && log_mem_ctrl) {
+	if(logflag && log_dmi) {
 		char log[26] = "tstruct_count = ";
 		int length = 16;
 		int_to_charr(tstruct_count, log, &length);
 		print_log(log, length);
 	}
 
-	if (logflag && log_mem_ctrl) {
+	if (logflag && log_dmi) {
 		char log[43] = "SMBIOS entry point->numstructs = ";
 		int length = 33;
 		int_to_charr(eps->numstructs, log, &length);
@@ -340,81 +340,6 @@ int open_dmi(void) {
 	return 0;
 }
 
-/*int open_dmi(void){
-	char *dmi, *dmi_search_start, *dmi_start;
-	int found=0;
-	struct dmi_eps *eps;
-	char *table_start;
-	int tstruct_count=0;
-	dmi_search_start = (char *)DMI_SEARCH_START;
-
-	//find anchor
-	for(dmi = dmi_search_start; dmi < dmi_search_start + 0xf0000; dmi +=16){
-		if( *dmi == '_' &&
-		    *(dmi+1) == 'S' &&
-		    *(dmi+2) == 'M' &&
-		    *(dmi+3) == '_'){
-			found =1;
-			break;
-		}
-	}
-	if (!found) {
-		print_log("open_dmi(): dmi not found", 25);
-		return -1;
-	}
-	dmi_start=dmi;
-	eps=(struct dmi_eps *)dmi;
-
-	//check checksum
-	int8_t checksum=0;
-	for (; dmi < dmi_start + eps->length; dmi++)
-		checksum += *dmi;
-	if (checksum){
-		return -1;
-	}
-
-	//we need at least revision 2.1 of SMBIOS
-	if ( eps->majorversion < 2 &&
-	     eps->minorversion < 1){
-	    return -1;
-	}
-
-	table_start=(char *)(uintptr_t)eps->tableaddress;
-	dmi=table_start;
-//look at all structs
-	while(dmi < table_start + eps->tablelength){
-		struct tstruct_header *header = (struct tstruct_header *)dmi;
-		
-		if (header->type == 17)
-			mem_devs[mem_devs_count++] = (struct mem_dev *)dmi;
-		
-		// Mem Dev Map
-		if (header->type == 20)
-			md_maps[md_maps_count++] = (struct md_map *)dmi;
-
-		// MB_SPEC
-		if (header->type == 2)
-		{
-			dmi_system_info = (struct system_map *)dmi;
-		}
-
-		// CPU_SPEC
-		if (header->type == 4)
-		{
-			dmi_cpu_info = (struct cpu_map *)dmi;
-		}
-			
-		dmi+=header->length;
-		
-		while( ! (*dmi == 0  && *(dmi+1) == 0 ) )
-			dmi++;
-		dmi+=2;
-
-		if (++tstruct_count > eps->numstructs)
-			return -1;
-	}
-	return 0;
-}*/
 
 int init_dmi(void){
 
@@ -426,7 +351,7 @@ int init_dmi(void){
 
 	int status = open_dmi();
 
-	if (logflag) print_log("Dmi openend.", 12);
+	if (logflag && log_dmi) print_log("Dmi openend.", 12);
 
 	dmi_initialized=1;
 
@@ -449,9 +374,9 @@ void print_dmi_startup_info(void)
 		if (init_dmi() == -1) return;
 	}
 
-	if (logflag) print_log("Dmi initialized.", 16);
+	if (logflag && log_dmi) print_log("Dmi initialized.", 16);
 
-	if (logflag) {
+	if (logflag && log_dmi) {
 		char log[50] = "print_dmi_startup_info(): dmi pointer = ";
 		int length = 40;
 		int_to_charr((ulong)&dmi_system_info, log, &length);
@@ -459,34 +384,34 @@ void print_dmi_startup_info(void)
 	}
 		
 	string1 = get_tstruct_string(&dmi_system_info->header,dmi_system_info->manufacturer);
-		if (logflag) print_log("Dmi initialized.", 16);
+		if (logflag && log_dmi) print_log("Dmi initialized.", 16);
 
 	sl1 = mt86_strlen(string1);
 
-	if (logflag) print_log("Dmi initialized.", 16);
+	if (logflag && log_dmi) print_log("Dmi initialized.", 16);
 
 	string2 = get_tstruct_string(&dmi_system_info->header,dmi_system_info->productname);	
-	if (logflag) print_log("Dmi initialized.", 16);
+	if (logflag && log_dmi) print_log("Dmi initialized.", 16);
 
 
 	sl2 = mt86_strlen(string2);
 
-	if (logflag) print_log("Dmi initialized.", 16);
+	if (logflag && log_dmi) print_log("Dmi initialized.", 16);
 
 	string3 = get_tstruct_string(&dmi_cpu_info->header,dmi_cpu_info->cpu_socket);
 
-	if (logflag) print_log("Dmi initialized.", 16);
+	if (logflag && log_dmi) print_log("Dmi initialized.", 16);
 
 	sl3 = mt86_strlen(string3);
 
-	if (logflag && log_mem_ctrl) {
+	if (logflag && log_dmi) {
 		char log[61] = "print_dmi_startup_info(): manufacturer = ";
 		int length = 41;
 		string_to_charr(string1, log, &length);
 		print_log(log, length);
 	}
 
-	if (logflag && log_mem_ctrl) {
+	if (logflag && lg_dmi) {
 		char log[16] = "sl1 = ";
 		int length = 6;
 		int_to_charr(sl1, log, &length);
@@ -500,21 +425,21 @@ void print_dmi_startup_info(void)
 		print_log(log, length);
 	}
 
-	if (logflag && log_mem_ctrl) {
+	if (logflag && log_dmi) {
 		char log[16] = "sl2 = ";
 		int length = 6;
 		int_to_charr(sl2, log, &length);
 		print_log(log, length);
 	}
 
-	if (logflag && log_mem_ctrl) {
+	if (logflag && log_dmi) {
 		char log[59] = "print_dmi_startup_info(): cpu_socket = ";
 		int length = 39;
 		string_to_charr(string3, log, &length);
 		print_log(log, length);
 	}
 
-	if (logflag && log_mem_ctrl) {
+	if (logflag && log_dmi) {
 		char log[16] = "sl3 = ";
 		int length = 6;
 		int_to_charr(sl3, log, &length);
@@ -523,15 +448,15 @@ void print_dmi_startup_info(void)
 
 	slength = sl1 + sl2;
 
-	print_log("test1", 5);
+	if (logflag && log_dmi) print_log("test1", 5);
 
 	if(sl3 > 2) { slength += sl3 + 4; } else { slength++; }
 	
-	print_log("test2", 5);
+	if (logflag && log_dmi) print_log("test2", 5);
 
 	if(sl1 && sl2) {
 
-		print_log("Printing CPU information.", 25);
+		if (logflag && log_dmi) print_log("Printing CPU information.", 25);
 
 
 		//dmicol -= slength; // right align
@@ -550,7 +475,7 @@ void print_dmi_startup_info(void)
 		}
 	}
 
-	print_log("test3", 5);
+	if (logflag && log_dmi) print_log("test3", 5);
 
 }