Adjust memspeed()

3 files changed, 27 insertions, 31 deletions

diff --git a/efi_memtest/memtest86+/efi/display.c b/efi_memtest/memtest86+/efi/display.c
index 23b445d..75b116c 100644
--- a/efi_memtest/memtest86+/efi/display.c
+++ b/efi_memtest/memtest86+/efi/display.c
@@ -56,7 +56,9 @@ int print_mainscreen() {
 
     clear_screen();
 
-    // frame
+    /*
+     * Frame
+     */
     cprint(5, 60, "| Time:   0:00:00");
     cprint(1, COL_MID,"Pass   %");
     cprint(2, COL_MID,"Test   %");
@@ -77,8 +79,9 @@ int print_mainscreen() {
     cprint(7, 39, "| Chipset : Unknown");
     cprint(8, 39, "| Memory Type : Unknown");
 
-
-    // specific information
+    /*
+     * specific information
+     */
     cprint(0, COL_MID, cpu_type_s);
 
     int off = 4;
@@ -94,6 +97,18 @@ int print_mainscreen() {
     for(int i=0; i < 6; i++) {
         cprint(i, COL_MID-2, "| ");
     }
+
+    // Print out cache information
+    cprint(2, 0, "L1 Cache:     K  ");
+    dprint(2, 11, l1_cache, 3, 0);
+
+    cprint(3, 0, "L2 Cache:     K  ");
+    dprint(3, 10, l2_cache, 4, 0);
+
+
+    cprint(4, 0, "L3 Cache:     K  ");
+    aprint(4, 10, l3_cache/4);
+    //dprint(4, 10, l3_cache, 4, 0);
   
     footer();
 
@@ -112,17 +127,7 @@ int print_mainscreen() {
         cprint(LINE_RAM,9, "Running...");
     }
 
-    // Print out cache information
-    cprint(2, 0, "L1 Cache:     K  ");
-    dprint(2, 11, l1_cache, 3, 0);
 
-    cprint(3, 0, "L2 Cache:     K  ");
-    dprint(3, 10, l2_cache, 4, 0);
-
-
-    cprint(4, 0, "L3 Cache:     K  ");
-    aprint(4, 10, l3_cache/4);
-    //dprint(4, 10, l3_cache, 4, 0);
     
 
     /*
diff --git a/efi_memtest/memtest86+/efi/init.c b/efi_memtest/memtest86+/efi/init.c
index 458db26..e13b5ce 100644
--- a/efi_memtest/memtest86+/efi/init.c
+++ b/efi_memtest/memtest86+/efi/init.c
@@ -1074,13 +1074,6 @@ void cpu_cache_speed() {
 		}
 	}
 
-    if (logflag && log_memspeed) {
-        char log[38] = "cpu__mem_speed(): speed = ";
-        int length = 27;
-        int_to_charr(extclock, log, &length);
-        print_log(log, length);
-    }
-
 	/* We measure the L2 cache speed by using a block size that is */
 	/* the size of the L1 cache.  We have to fudge if the L1 */
 	/* cache is bigger than the L2 */
@@ -1099,16 +1092,14 @@ void cpu_cache_speed() {
 	/* We measure the L3 cache speed by using a block size that is */
 	/* 2X the size of the L2 cache. */
 
-	if (l3_cache) 
-	{
+	if (l3_cache) {
+    	i = l2_cache*2;
     
-    		i = l2_cache*2;
-    
-    		if ((speed=memspeed(STEST_ADDR, i*1024, 150))) {
-    			cprint(4, 16, "       MB/s");
-    			dprint(4, 16, speed, 6, 0);
-    		}
-   }
+    	if ((speed=memspeed(STEST_ADDR, i*1024, 150))) {
+    		cprint(4, 16, "       MB/s");
+    		dprint(4, 16, speed, 6, 0);
+    	}
+    }
 }
 
 /* Measure and display memory speed, multitasked using all CPUs */
diff --git a/efi_memtest/memtest86+/main.c b/efi_memtest/memtest86+/main.c
index 64a9428..8865873 100644
--- a/efi_memtest/memtest86+/main.c
+++ b/efi_memtest/memtest86+/main.c
@@ -441,7 +441,7 @@ void test_start(void)
 
             /* Draw the screen and get system information */
             /*
-             * WARNING: do not print anything different than btrace before this statement.
+             * WARNING: do not print anything except btrace before this statement.
              * Otherwise it will be overwritten.
              */
             init();
@@ -565,7 +565,7 @@ void test_start(void)
         setup_mm_modes();
 
         /* Get the memory Speed with all CPUs */
-        //get_mem_speed(my_cpu_num, num_cpus);
+        get_mem_speed(my_cpu_num, num_cpus);
     }
 
     /* Set the initialized flag only after all of the CPU's have