Changeset a0e1b48 in mainline

Timestamp:

2009-03-12T17:53:17Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

3c79afe

Parents:

b6f2ebc

Message:

chardev_t → outdev_t
small fixes and cleanups

Location:

kernel/genarch/src

Files:

• drivers/ega/ega.c (modified) (4 diffs)
• fb/fb.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;
+#define SPACE  0x20
+#define STYLE  0x07
+
+#define EMPTY_CHAR  (STYLE << 8 | SPACE)
 
 /*
@@ -124 +125 @@
 {
         backbuf[ega_cursor * 2] = ch;
-        
-        if (!silent)
+        backbuf[ega_cursor * 2 + 1] = STYLE;
+        
+        if (!silent) {
                 videoram[ega_cursor * 2] = ch;
-}
-
-static void ega_putchar(chardev_t *dev __attribute__((unused)), const char ch, bool silent)
+                videoram[ega_cursor * 2 + 1] = STYLE;
+        }
+}
+
+static void ega_putchar(outdev_t *dev __attribute__((unused)), const char ch, bool silent)
 {
         ipl_t ipl;
@@ -161 +165 @@
 }
 
-static chardev_operations_t ega_ops = {
+static outdev_t ega_console;
+static outdev_operations_t ega_ops = {
         .write = ega_putchar
 };
@@ -180 +185 @@
         ega_sync_cursor();
         
-        chardev_initialize("ega_out", &ega_console, &ega_ops);
+        outdev_initialize("ega", &ega_console, &ega_ops);
         stdout = &ega_console;
         

kernel/genarch/src/fb/fb.c

@@ -284 +284 @@
  *
  */
-static void fb_putchar(chardev_t *dev, char ch, bool silent)
+static void fb_putchar(outdev_t *dev, char ch, bool silent)
 {
         spinlock_lock(&fb_lock);
@@ -327 +327 @@
 }
 
-static chardev_t framebuffer;
-static chardev_operations_t fb_ops = {
-        .write = fb_putchar,
+static outdev_t fb_console;
+static outdev_operations_t fb_ops = {
+        .write = fb_putchar
 };
 
@@ -424 +424 @@
 
 
-/** Initialize framebuffer as a chardev output device
+/** Initialize framebuffer as a output character device
  *
  * @param addr   Physical address of the framebuffer
@@ -527 +527 @@
         fb_redraw();
         
-        chardev_initialize("fb", &framebuffer, &fb_ops);
-        stdout = &framebuffer;
+        outdev_initialize("fb", &fb_console, &fb_ops);
+        stdout = &fb_console;
 }