Changeset 973be64e in mainline for arch/mips32/src/drivers/msim.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/mips32/src/drivers/msim.c (moved) (moved from arch/mips32/src/drivers/keyboard.c ) (2 diffs)

arch/mips32/src/drivers/msim.c

@@ -1 +1 @@
 /*
- * Copyright (C) 2003 Josef Cejka
- * Copyright (C) 2005 Jakub Jermar
+ * Copyright (C) 2005 Ondrej Palkovsky
  * All rights reserved.
  *
@@ -28 +27 @@
  */
 
-#include <arch/drivers/keyboard.h>
+#include <interrupt.h>
 #include <console/chardev.h>
-#include <console/console.h>
+#include <arch/drivers/msim.h>
 #include <arch/cp0.h>
-#include <putchar.h>
-#include <synch/spinlock.h>
-#include <synch/waitq.h>
-#include <typedefs.h>
-#include <arch/drivers/arc.h>
 
-static void keyboard_enable(void);
-static void keyboard_disable(void);
-static void arc_kb_disable(void);
-static void arc_kb_enable(void);
+static chardev_t console;
 
-static chardev_t kbrd;
+static void msim_write(chardev_t *dev, const char ch);
+static void msim_enable(chardev_t *dev);
+static void msim_disable(chardev_t *dev);
 
-static chardev_operations_t arc_ops = {
-        .resume = arc_kb_enable,
-        .suspend = arc_kb_disable
+static chardev_operations_t msim_ops = {
+        .resume = msim_enable,
+        .suspend = msim_disable,
+        .write = msim_write
 };
 
-static chardev_operations_t msim_ops = {
-        .resume = keyboard_enable,
-        .suspend = keyboard_disable
-};
+/** Putchar that works with MSIM & gxemul */
+void msim_write(chardev_t *dev, const char ch)
+{
+        *((char *) MSIM_VIDEORAM) = ch;
+}
 
-static int arc_kb_enabled;
+/* Called from getc(). */
+void msim_enable(chardev_t *dev)
+{
+        cp0_unmask_int(MSIM_KBD_IRQ);
+}
 
-/** Initialize keyboard subsystem. */
-void keyboard_init(void)
+/* Called from getc(). */
+void msim_disable(chardev_t *dev)
 {
-        if (arc_enabled()) {
-                chardev_initialize(&kbrd, &arc_ops);
-                arc_kb_enabled = 1;
-        } else {
-                cp0_unmask_int(KEYBOARD_IRQ);
-                chardev_initialize(&kbrd, &msim_ops);
-        }
-        stdin = &kbrd;
+        cp0_mask_int(MSIM_KBD_IRQ);
 }
 
 /** Process keyboard interrupt. */
-void keyboard(void)
+static void msim_interrupt(int n, void *stack)
 {
         char ch;
 
-        ch = *((char *) KEYBOARD_ADDRESS);
+        ch = *((char *) MSIM_KBD_ADDRESS);
         if (ch =='\r')
                 ch = '\n';
-        chardev_push_character(&kbrd, ch);
+        chardev_push_character(&console, ch);
 }
 
-/* Called from getc(). */
-void keyboard_enable(void)
+
+/* Return console object representing msim console */
+chardev_t * msim_console(void)
 {
-        cp0_unmask_int(KEYBOARD_IRQ);
+        chardev_initialize("msim_console", &console, &msim_ops);
+
+        exc_register(MSIM_KBD_IRQ, "msim_kbd", msim_interrupt);
+
+        cp0_unmask_int(MSIM_KBD_IRQ);
+
+        return &console;
 }
-
-/* Called from getc(). */
-void keyboard_disable(void)
-{
-        cp0_mask_int(KEYBOARD_IRQ);
-}
-
-/*****************************/
-/* Arc keyboard */
-
-void keyboard_poll(void)
-{
-        int ch;
-
-        if (!arc_enabled() || !arc_kb_enabled)
-                return;
-        while ((ch = arc_getchar()) != -1)
-                chardev_push_character(&kbrd, ch);              
-}
-
-static void arc_kb_enable(void)
-{
-        arc_kb_enabled = 1;
-}
-
-/* Called from getc(). */
-static void arc_kb_disable(void)
-{
-        arc_kb_enabled = 0;
-}