commit d3b381514a57a3c77dd05753ea9852fa6e80996c
author Kevin O'Connor <kevin@koconnor.net> Tue May 26 00:05:37 2009 -0400
committer Kevin O'Connor <kevin@koconnor.net> Tue May 26 00:05:37 2009 -0400
tree 50d1ca7e9f6ccf3d46a895759bb3374a5975c611
parent e4f220fa2e46dbf81ef2a6e5536f914dc5902767

VGA: Simplify vgafb_write/read_char.

Pass cursor position into vgafb_write_char and vgafb_read_char.
Don't pass count into vgafb_write_char.
Break text writing into separate function.

vgasrc/vga.c

diff --git a/vgasrc/vga.c b/vgasrc/vga.c
index 9d7ca30..53e8dd8 100644
--- a/vgasrc/vga.c
+++ b/vgasrc/vga.c
@@ -218,7 +218,7 @@
         break;
 
     default:
-        vgafb_write_char(cp.page, ca, 1);
+        vgafb_write_char(cp, ca);
         cp.x++;
     }
 
@@ -513,23 +513,33 @@
 static void
 handle_1008(struct bregs *regs)
 {
-    struct carattr ca = vgafb_read_char(regs->bh);
+    struct carattr ca = vgafb_read_char(get_cursor_pos(regs->bh));
     regs->al = ca.car;
     regs->ah = ca.attr;
 }
 
 static void
+write_chars(u8 page, struct carattr ca, u16 count)
+{
+    struct cursorpos cp = get_cursor_pos(page);
+    while (count--) {
+        vgafb_write_char(cp, ca);
+        cp.x++;
+    }
+}
+
+static void
 handle_1009(struct bregs *regs)
 {
     struct carattr ca = {regs->al, regs->bl, 1};
-    vgafb_write_char(regs->bh, ca, regs->cx);
+    write_chars(regs->bh, ca, regs->cx);
 }
 
 static void
 handle_100a(struct bregs *regs)
 {
     struct carattr ca = {regs->al, regs->bl, 0};
-    vgafb_write_char(regs->bh, ca, regs->cx);
+    write_chars(regs->bh, ca, regs->cx);
 }