Changeset 5d9d9a9 in mainline

Timestamp:

2009-03-02T13:58:09Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a212307

Parents:

2e079b70

Message:

make sure the EGA framebuffer is initialized with proper attributes

File:

• kernel/genarch/src/drivers/ega/ega.c (modified) (4 diffs)

kernel/genarch/src/drivers/ega/ega.c

@@ -61 +61 @@
 static ioport8_t *ega_base;
 
+#define EMPTY_CHAR  0x0720
+
 chardev_t ega_console;
 
@@ -70 +72 @@
         if (ega_cursor < EGA_SCREEN)
                 return;
-
+        
         memmove((void *) videoram, (void *) (videoram + EGA_COLS * 2),
             (EGA_SCREEN - EGA_COLS) * 2);
         memmove((void *) backbuf, (void *) (backbuf + EGA_COLS * 2),
             (EGA_SCREEN - EGA_COLS) * 2);
-        memsetw(videoram + (EGA_SCREEN - EGA_COLS) * 2, EGA_COLS, 0x0720);
-        memsetw(backbuf + (EGA_SCREEN - EGA_COLS) * 2, EGA_COLS, 0x0720);
+        memsetw(videoram + (EGA_SCREEN - EGA_COLS) * 2, EGA_COLS, EMPTY_CHAR);
+        memsetw(backbuf + (EGA_SCREEN - EGA_COLS) * 2, EGA_COLS, EMPTY_CHAR);
         ega_cursor = ega_cursor - EGA_COLS;
 }
@@ -104 +106 @@
         
         ega_cursor = (hi << 8) | lo;
+        
+        if (ega_cursor >= EGA_SCREEN)
+                ega_cursor = 0;
+        
         if ((ega_cursor % EGA_COLS) != 0)
                 ega_cursor = (ega_cursor + EGA_COLS) - ega_cursor % EGA_COLS;
+        
+        memsetw(videoram + ega_cursor * 2, EGA_SCREEN - ega_cursor, EMPTY_CHAR);
+        memsetw(backbuf + ega_cursor * 2, EGA_SCREEN - ega_cursor, EMPTY_CHAR);
         
         ega_check_cursor();
@@ -120 +129 @@
 }
 
-static void ega_putchar(chardev_t *d __attribute__((unused)), const char ch, bool silent)
+static void ega_putchar(chardev_t *dev __attribute__((unused)), const char ch, bool silent)
 {
         ipl_t ipl;