Signed-off-by: Kevin O'Connor kevin@koconnor.net --- vgasrc/stdvga.c | 2 +- vgasrc/stdvga.h | 2 +- vgasrc/vgabios.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/vgasrc/stdvga.c b/vgasrc/stdvga.c index 060e866..839bd06 100644 --- 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 8760486..439930a 100644 --- 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 22c0261..a68cae1 100644 --- 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