diff --git a/app/display.c b/app/display.c index ce23f7a..4607f2a 100644 --- a/app/display.c +++ b/app/display.c @@ -89,15 +89,15 @@ void display_init(void) set_foreground_colour(WHITE); set_background_colour(BLUE); prints(0,28, "| "); - prints(1, 0, "CLK/Temp: N/A | Pass % "); - prints(2, 0, "L1 Cache: N/A | Test % "); - prints(3, 0, "L2 Cache: N/A | Test # "); - prints(4, 0, "L3 Cache: N/A | Testing: "); - prints(5, 0, "Memory : N/A | Pattern: "); - prints(6, 0, "-------------------------------------------------------------------------------"); - prints(7, 0, "CPU: SMP: N/A | Time: Status: Init. "); - prints(8, 0, "Using: | Pass: Errors: "); - prints(9, 0, "-------------------------------------------------------------------------------"); + prints(1, 0, "CLK/Temp: N/A | Pass % "); + prints(2, 0, "L1 Cache: N/A | Test % "); + prints(3, 0, "L2 Cache: N/A | Test # "); + prints(4, 0, "L3 Cache: N/A | Testing: "); + prints(5, 0, "Memory : N/A | Pattern: "); + prints(6, 0, "--------------------------------------------------------------------------------"); + prints(7, 0, "CPU: SMP: N/A | Time: Status: Init. "); + prints(8, 0, "Using: | Pass: Errors: "); + prints(9, 0, "--------------------------------------------------------------------------------"); // Redraw lines using box drawing characters. // Disable if TTY is enabled to avoid VT100 char replacements @@ -110,11 +110,11 @@ void display_init(void) print_char(i, 28, 0xb3); } for (int i = 7; i < 10; i++) { - print_char(i, 41, 0xb3); + print_char(i, 42, 0xb3); } print_char(6, 28, 0xc1); - print_char(6, 41, 0xc2); - print_char(9, 41, 0xc1); + print_char(6, 42, 0xc2); + print_char(9, 42, 0xc1); } set_foreground_colour(BLUE); diff --git a/app/display.h b/app/display.h index fa415e8..83bdbb7 100644 --- a/app/display.h +++ b/app/display.h @@ -36,7 +36,7 @@ prints(0, 30, str) #define display_cpu_clk(freq) \ - printf(1, 10, "%i MHz", freq) + printf(1, 10, "%iMHz", freq) #define display_l1_cache_size(size) \ printf(2, 9, "%6kB", (uintptr_t)(size)); @@ -63,7 +63,7 @@ printf(5, 18, "%S6kB/s", (uintptr_t)(size)) #define display_status(status) \ - prints(7, 67, status) + prints(7, 68, status) #define display_dmi_mb(sys_ma, sys_sku) \ dmicol = prints(23, dmicol, sys_man); \ @@ -77,7 +77,7 @@ prints(8, 7, "All Cores") #define display_spinner(spin_state) \ - printc(7, 76, spin_state) + printc(7, 77, spin_state) #define display_pass_percentage(pct) \ printi(1, 34, pct, 3, false, false) @@ -134,16 +134,16 @@ } #define display_run_time(hours, mins, secs) \ - printf(7, 50, "%i:%02i:%02i", hours, mins, secs) + printf(7, 51, "%i:%02i:%02i", hours, mins, secs) #define display_temperature(temp, maxtemp) \ printf(1, 20, "%2i/%2i%cC", temp, maxtemp, 0xf8) #define display_pass_count(count) \ - printi(8, 50, count, 0, false, true) + printi(8, 51, count, 0, false, true) #define display_error_count(count) \ - printi(8, 67, count, 0, false, true); + printi(8, 68, count, 0, false, true); #define clear_message_area() \ { \