stdvga: Rename stdvga_get_vde() to stdvga_get_vertical_size()

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/vgasrc/stdvga.c b/vgasrc/stdvga.c
index a5972baa56394a6971d1f14fcfa1186b5646d99e..4bfa101a52a48b2ba82ea6d08d33feacd81160f4 100644 (file)
--- a/vgasrc/stdvga.c
+++ b/vgasrc/stdvga.c
@@ -275,15 +275,15 @@ stdvga_set_character_height(u8 lines)
     stdvga_crtc_mask(stdvga_get_crtc(), 0x09, 0x1f, lines - 1);
 }
 
-// Get vertical display end
+// Get vertical screen size (number of horizontal lines in the display)
 u16
-stdvga_get_vde(void)
+stdvga_get_vertical_size(void)
 {
     u16 crtc_addr = stdvga_get_crtc();
     u16 vde = stdvga_crtc_read(crtc_addr, 0x12);
     u8 ovl = stdvga_crtc_read(crtc_addr, 0x07);
-    vde += (((ovl & 0x02) << 7) + ((ovl & 0x40) << 3) + 1);
-    return vde;
+    vde += ((ovl & 0x02) << 7) + ((ovl & 0x40) << 3);
+    return vde + 1;
 }
 
 // Get offset into framebuffer accessible from real-mode 64K segment

diff --git a/vgasrc/stdvga.h b/vgasrc/stdvga.h
index 439930a3ed40c17bd930070eaa0f00c2f5397041..1828585295708605fcbe215d524c37bfcaa3901b 100644 (file)
--- a/vgasrc/stdvga.h
+++ b/vgasrc/stdvga.h
@@ -66,7 +66,7 @@ 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_character_height(u8 lines);
-u16 stdvga_get_vde(void);
+u16 stdvga_get_vertical_size(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);
 int stdvga_minimum_linelength(struct vgamode_s *vmode_g);

diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c
index a68cae1face6da1f7d3a17d12c0c9fb637917432..3659f01ec2c8456dfa3570d62f97239436ce3c8e 100644 (file)
--- a/vgasrc/vgabios.c
+++ b/vgasrc/vgabios.c
@@ -138,8 +138,8 @@ set_character_height(u8 lines)
 {
     stdvga_set_character_height(lines);
     SET_BDA(char_height, lines);
-    u16 vde = stdvga_get_vde();
-    u8 rows = vde / lines;
+    u16 vertical_size = stdvga_get_vertical_size();
+    u8 rows = vertical_size / lines;
     SET_BDA(video_rows, rows - 1);
     u16 cols = GET_BDA(video_cols);
     SET_BDA(video_pagesize, calc_page_size(MM_TEXT, cols, rows));