Changeset 973be64e in mainline for arch/mips32/src/console.c

Timestamp:

2005-12-10T00:19:57Z (20 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/mips32/src/console.c (modified) (1 diff)

arch/mips32/src/console.c

@@ -27 +27 @@
  */
 
-#include <putchar.h>
-#include <arch/types.h>
-#include <arch/cp0.h>
+#include <console/console.h>
 #include <arch/console.h>
-#include <arch.h>
 #include <arch/drivers/arc.h>
-#include <arch/arch.h>
-
-/** Putchar that works with MSIM & gxemul */
-static void cons_putchar(const char ch)
-{
-        *((char *) VIDEORAM) = ch;
-}
-
-/** Putchar that works with simics */
-static void serial_putchar(const char ch)
-{
-        int i;
-
-        if (ch=='\n')
-                putchar('\r');
-
-        /* Wait until transmit buffer empty */
-        while (! ((*SERIAL_LSR) & (1<<TRANSMIT_EMPTY_BIT)))
-                ;
-        *(SERIAL_PORT_BASE) = ch;
-}
-
-static void (*putchar_func)(const char ch) = cons_putchar;
+#include <arch/drivers/serial.h>
+#include <arch/drivers/msim.h>
 
 void console_init(void)
 {
-        if (arc_enabled()) 
-                putchar_func = arc_putchar;
-        /* The LSR on the start usually contains this value */
-        else if (*SERIAL_LSR == 0x60)
-                putchar_func = serial_putchar;
-        else
-                putchar_func = cons_putchar;
+        chardev_t *console;
+
+        if (arc_enabled()) {
+                console = arc_console();
+        } else if (serial_init()) {
+                console = serial_console();
+        } else
+                console = msim_console();
+
+        stdin = console;
+        stdout = console;
 }
-
-void putchar(const char ch)
-{
-        putchar_func(ch);
-}