stdvga: Rename stdvga_set_scan_lines() to stdvga_set_character_height()

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/vgasrc/stdvga.c b/vgasrc/stdvga.c
index ed88edc8a4fd4f4b3b6533065c893590b0ddbfe1..a5972baa56394a6971d1f14fcfa1186b5646d99e 100644 (file)
--- a/vgasrc/stdvga.c
+++ b/vgasrc/stdvga.c
@@ -270,7 +270,7 @@ stdvga_set_cursor_pos(int address)
 
 // Set the character height (when in text mode)
 void
-stdvga_set_scan_lines(u8 lines)
+stdvga_set_character_height(u8 lines)
 {
     stdvga_crtc_mask(stdvga_get_crtc(), 0x09, 0x1f, lines - 1);
 }

diff --git a/vgasrc/stdvga.h b/vgasrc/stdvga.h
index 87604869ac65c9cc5342c7a7d2644d001b052290..439930a3ed40c17bd930070eaa0f00c2f5397041 100644 (file)
--- a/vgasrc/stdvga.h
+++ b/vgasrc/stdvga.h
@@ -65,7 +65,7 @@ struct vgamode_s;
 int stdvga_vram_ratio(struct vgamode_s *vmode_g);
 void stdvga_set_cursor_shape(u16 cursor_type);
 void stdvga_set_cursor_pos(int address);
-void stdvga_set_scan_lines(u8 lines);
+void stdvga_set_character_height(u8 lines);
 u16 stdvga_get_vde(void);
 int stdvga_get_window(struct vgamode_s *curmode_g, int window);
 int stdvga_set_window(struct vgamode_s *curmode_g, int window, int val);

diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c
index 22c026120d8ffec4cdad31393895f752fdee205d..a68cae1face6da1f7d3a17d12c0c9fb637917432 100644 (file)
--- a/vgasrc/vgabios.c
+++ b/vgasrc/vgabios.c
@@ -134,9 +134,9 @@ set_active_page(u8 page)
 }
 
 static void
-set_scan_lines(u8 lines)
+set_character_height(u8 lines)
 {
-    stdvga_set_scan_lines(lines);
+    stdvga_set_character_height(lines);
     SET_BDA(char_height, lines);
     u16 vde = stdvga_get_vde();
     u8 rows = vde / lines;
@@ -700,28 +700,28 @@ handle_101110(struct bregs *regs)
 {
     stdvga_load_font(regs->es, (void*)(regs->bp+0), regs->cx
                      , regs->dx, regs->bl, regs->bh);
-    set_scan_lines(regs->bh);
+    set_character_height(regs->bh);
 }
 
 static void
 handle_101111(struct bregs *regs)
 {
     stdvga_load_font(get_global_seg(), vgafont14, 0x100, 0, regs->bl, 14);
-    set_scan_lines(14);
+    set_character_height(14);
 }
 
 static void
 handle_101112(struct bregs *regs)
 {
     stdvga_load_font(get_global_seg(), vgafont8, 0x100, 0, regs->bl, 8);
-    set_scan_lines(8);
+    set_character_height(8);
 }
 
 static void
 handle_101114(struct bregs *regs)
 {
     stdvga_load_font(get_global_seg(), vgafont16, 0x100, 0, regs->bl, 16);
-    set_scan_lines(16);
+    set_character_height(16);
 }
 
 static void