Try to get controller-name

5 files changed, 21 insertions, 14 deletions

diff --git a/efi_memtest/MemtestEfi.c b/efi_memtest/MemtestEfi.c
index dcde760..558aa33 100644
--- a/efi_memtest/MemtestEfi.c
+++ b/efi_memtest/MemtestEfi.c
@@ -14,7 +14,7 @@ short logflag = 1;
 short log_fine = 0;
 short log_cpuspeed = 0;
 short log_memspeed = 0;
-short log_mem_tbl = 1;
+short log_mem_tbl = 0;
 short log_comp_seg = 0;
 short log_print_pmap = 0;
 
diff --git a/efi_memtest/memtest86+/controller.c b/efi_memtest/memtest86+/controller.c
index b4683b6..ce41e61 100644
--- a/efi_memtest/memtest86+/controller.c
+++ b/efi_memtest/memtest86+/controller.c
@@ -4204,20 +4204,26 @@ void find_controller(void)
     print_log(log, length);
     }
 
-  /*  {
-    char log[70] = "find_controller(): pci_memory_controller.name = ";
+    {
+    char log[70] = "find_controller(): pci_memory_controller.name = XXXXXXXXXXXXXXXXXXXX";
     int length = 48;
     string_to_charr(controllers[ctrl.index].name, log, &length);
     print_log(log, length);
     }
-	*/
-    controllers[ctrl.index].setup_ecc();
+
+    print_log(controllers[ctrl.index].name, 10);
+
+    {
+        char log[49] = "find_controller(): controller length = ";
+        int length = 39;
+        int ctrl_size = sizeof(controllers) / sizeof(controllers[0]);
+        int_to_charr(ctrl_size, log, &length);
+        print_log(log, length);
+    }
+	
+    //controllers[ctrl.index].setup_ecc();
     
     print_log("4m.bm", 5);
-        print_log("4m.bm", 5);
-    print_log("4m.bm", 5);
-    print_log("4m.bm", 5);
-    print_log("4m.bm", 5);
 
 
     /* Don't enable ECC polling by default unless it has
diff --git a/efi_memtest/memtest86+/efi/init.c b/efi_memtest/memtest86+/efi/init.c
index cd9a851..ffaab78 100644
--- a/efi_memtest/memtest86+/efi/init.c
+++ b/efi_memtest/memtest86+/efi/init.c
@@ -297,7 +297,7 @@ void init(void) {
         cprint(LINE_CPU, COL_SPEC, " **** FAIL SAFE **** FAIL SAFE **** ");
         cprint(LINE_RAM, COL_SPEC, "   No detection, same reliability   ");
     } else {
-        // find_controller();
+        find_controller();
         // get_spd_spec();
         if(num_cpus <= 16 && !(vv->fail_safe & 4)) { 
             //coretemp(); 
diff --git a/efi_memtest/memtest86+/efi/logger.c b/efi_memtest/memtest86+/efi/logger.c
index e9c1385..ca82561 100644
--- a/efi_memtest/memtest86+/efi/logger.c
+++ b/efi_memtest/memtest86+/efi/logger.c
@@ -261,14 +261,15 @@ void int_to_charr(unsigned long num, char* arr, int *length) { // TODO test corn
   *length = pos2-1;
 }
 
-/*void string_to_charr(char *add, char *output, int *length) {
+void string_to_charr(char *add, char *output, int *length) {
   for (int i = 0; add[i]; i++) {
-    (*length)++;
+    
     output[*length] = add[i];
+    (*length)++;
   }  
   (*length)++;
   output[*length] = '\0';
-}*/
+}
 
 /*void hex_to_charr(unsigned long num, char* arr, int *length) {
 
diff --git a/efi_memtest/memtest86+/logger.h b/efi_memtest/memtest86+/logger.h
index e6d5f00..9c8d6e2 100644
--- a/efi_memtest/memtest86+/logger.h
+++ b/efi_memtest/memtest86+/logger.h
@@ -4,7 +4,7 @@ void init_logger();
 
 void int_to_charr(unsigned long num, char* buffer, int* length);
 
-//void string_to_charr(char *add, char *output, int *length);
+void string_to_charr(char *add, char *output, int *length);
 
 //void hex_to_charr(unsigned long num, char* arr, int *length);