summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRegina König2021-08-02 20:24:54 +0200
committerRegina König2021-08-02 20:24:54 +0200
commit795aa53386c9ecb68241164198e4fbc6aef3e41f (patch)
tree88524717cd261fffd377ed76ff871eb52c438da6
parentMove display to the right (diff)
downloadmemtest86-795aa53386c9ecb68241164198e4fbc6aef3e41f.tar.gz
memtest86-795aa53386c9ecb68241164198e4fbc6aef3e41f.tar.xz
memtest86-795aa53386c9ecb68241164198e4fbc6aef3e41f.zip
Make some corrections
-rw-r--r--efi_memtest/memtest86+/efi/display.c7
-rw-r--r--efi_memtest/memtest86+/efi/init.c2
2 files changed, 5 insertions, 4 deletions
diff --git a/efi_memtest/memtest86+/efi/display.c b/efi_memtest/memtest86+/efi/display.c
index 15d4f8d..ee2879f 100644
--- a/efi_memtest/memtest86+/efi/display.c
+++ b/efi_memtest/memtest86+/efi/display.c
@@ -12,7 +12,7 @@ extern struct barrier_s *barr;
#define CONSOLE_WIDTH 80
#define X_OFFSET 10
-#define Y_OFFSET 0
+#define Y_OFFSET 2
CHAR16 scroll_buffer[10][79];
int scroll_begin = 0;
@@ -21,7 +21,8 @@ void clear_screen() {
EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL *Console = gST->ConOut;
- Console->SetMode(Console, 2); // TODO set only if it's possible
+ Console->SetMode(Console, 2); // TODO What to do if it is not possible?
+
Console->SetAttribute(Console, EFI_TEXT_ATTR(EFI_BLACK, EFI_CYAN));
Console->ClearScreen(Console);
@@ -326,7 +327,7 @@ void print_popup() {
Console->SetAttribute(Console, EFI_TEXT_ATTR(EFI_BLACK, EFI_CYAN));
for (int i = 0; i < POP_H; i++) {
- Console->SetCursorPosition(Console, POP_X, POP_Y + i);
+ Console->SetCursorPosition(Console, POP_X + X_OFFSET, POP_Y + i + Y_OFFSET);
Console->OutputString(Console, L" "); // width: pop_w=34
}
}
diff --git a/efi_memtest/memtest86+/efi/init.c b/efi_memtest/memtest86+/efi/init.c
index ef09f48..80e9804 100644
--- a/efi_memtest/memtest86+/efi/init.c
+++ b/efi_memtest/memtest86+/efi/init.c
@@ -321,7 +321,7 @@ void init(void) {
/* Find Memory Specs */
if(vv->fail_safe & 1)
{
- cprint(LINE_CPU, COL_SPEC, " **** FAIL SAFE **** FAIL SAFE **** "); // TODO should be printed AFTER prnt_mainscreen
+ cprint(LINE_CPU, COL_SPEC, " **** FAIL SAFE **** FAIL SAFE **** "); // TODO should be printed AFTER print_mainscreen
cprint(LINE_RAM, COL_SPEC, " No detection, same reliability ");
} else {
find_controller();