:: commit d17773852cd450ec89dd4818e0baff72bad4ee27

mintsuki <mintsuki@protonmail.com> — 2022-10-11 02:43

parents: c467e0f238

term: Adjustments for backport

diff --git a/common/protos/stivale.c b/common/protos/stivale.c
index e5372f0a..98d6feae 100644
--- a/common/protos/stivale.c
+++ b/common/protos/stivale.c
@@ -349,8 +349,7 @@ noreturn void stivale_load(char *config, char *cmdline) {
 #if defined (UEFI)
         panic(true, "stivale: Cannot use text mode with UEFI.");
 #elif defined (BIOS)
-        size_t rows, cols;
-        init_vga_textmode(&rows, &cols, false);
+        vga_textmode_init(false);
 #endif
     }
 
diff --git a/common/protos/stivale2.c b/common/protos/stivale2.c
index 060a1a91..ce7bb7b9 100644
--- a/common/protos/stivale2.c
+++ b/common/protos/stivale2.c
@@ -551,7 +551,7 @@ failed_to_load_header_section:
 
 #if defined (BIOS)
         if ((avtag == NULL && hdrtag == NULL) || (avtag != NULL && preference == 1)) {
-            term_textmode();
+            vga_textmode_init(true);
             textmode = true;
         } else {
 #endif
@@ -672,8 +672,7 @@ have_fb_tag:;
         }
     } else {
 #if defined (BIOS)
-        size_t rows, cols;
-        init_vga_textmode(&rows, &cols, false);
+        vga_textmode_init(false);
 
 have_tm_tag:;
         struct stivale2_struct_tag_textmode *tmtag = ext_mem_alloc(sizeof(struct stivale2_struct_tag_textmode));
tab: 248 wrap: offon