Changeset 973be64e in mainline for arch/ia32/src/drivers/ega.c

Timestamp:

2005-12-10T00:19:57Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

fcfac420

Parents:

705b4149

Message:

Added generic exc_register/exc_dispatch functions,
copied from ia32 architecture. Currently only mips32 uses them.

The chardev_t can now be both input & output device (was
needed for serial driver).

Broken other architectures - ia64, sparc, powerpc will not compile.

Mips32 supports input on all msim, gxemul, indy(tested emulation
in gxemul, loses characters), simics. Simics serial line
is done using polling, I was unable to make it produce
an interrupt when the key was pressed.

File:

• arch/ia32/src/drivers/ega.c (modified) (5 diffs)

arch/ia32/src/drivers/ega.c

@@ -35 +35 @@
 #include <arch/asm.h>
 #include <memstr.h>
+#include <console/chardev.h>
+#include <console/console.h>
 
 /*
@@ -43 +45 @@
 static spinlock_t egalock;
 static __u32 ega_cursor;
+
+static void ega_putchar(chardev_t *d, const char ch);
+
+chardev_t ega_console;
+static chardev_operations_t ega_ops = {
+        .write = ega_putchar
+};
 
 void ega_move_cursor(void);
@@ -56 +65 @@
         lo = inb(0x3d5);
         ega_cursor = (hi<<8)|lo;
-        ega_putchar('\n');
+
+        chardev_initialize("ega_out", &ega_console, &ega_ops);
+        stdout = &ega_console;
+
+        putchar('\n');
 }
 
@@ -79 +92 @@
 }
 
-void ega_putchar(const char ch)
+void ega_putchar(chardev_t *d, const char ch)
 {
         ipl_t ipl;
@@ -112 +125 @@
         outb(0x3d5,ega_cursor&0xff);    
 }
-
-void putchar(const char ch)
-{
-        ega_putchar(ch);
-}