Changeset 973be64e in mainline for arch/mips32/src/drivers/arc.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/drivers/arc.c (modified) (5 diffs)

arch/mips32/src/drivers/arc.c

@@ -34 +34 @@
 #include <arch/mm/frame.h>
 #include <mm/frame.h>
+#include <interrupt.h>
 
 /* This is a good joke, SGI HAS different types than NT bioses... */
@@ -98 +99 @@
 static arc_func_vector_t *arc_entry; 
 
-static void _arc_putchar(char ch);
-
-/** Initialize ARC structure
- *
- * @return 0 - ARC OK, -1 - ARC does not exist
- */
-int arc_init(void)
-{
-        if (sbp->signature != ARC_MAGIC) {
-                sbp = NULL;
-                return -1;
-        }
-        arc_entry = sbp->firmwarevector;
-
-        arc_putchar('A');
-        arc_putchar('R');
-        arc_putchar('C');
-        arc_putchar('\n');
-}
+
+static void arc_putchar(char ch);
 
 /** Return true if ARC is available */
@@ -130 +114 @@
         printf("%s: ",ctypes[c->type]);
         for (i=0;i < c->identifier_len;i++)
-                putchar(c->identifier[i]);
-        putchar('\n');
+                arc_putchar(c->identifier[i]);
+        arc_putchar('\n');
 }
 
@@ -175 +159 @@
 
 /** Print charactor to console */
-void arc_putchar(char ch)
+static void arc_putchar(char ch)
 {
         __u32 cnt;
@@ -187 +171 @@
 }
 
+/** Initialize ARC structure
+ *
+ * @return 0 - ARC OK, -1 - ARC does not exist
+ */
+int arc_init(void)
+{
+        if (sbp->signature != ARC_MAGIC) {
+                sbp = NULL;
+                return -1;
+        }
+        arc_entry = sbp->firmwarevector;
+
+        arc_putchar('A');
+        arc_putchar('R');
+        arc_putchar('C');
+        arc_putchar('\n');
+}
+
+static int kbd_polling_enabled;
+static chardev_t console;
+
 /** Try to get character, return character or -1 if not available */
-int arc_getchar(void)
+static void arc_keyboard_poll(void)
 {
         char ch;
         __u32 count;
         long result;
+        
+        if (! kbd_polling_enabled)
+                return;
 
         if (arc_entry->getreadstatus(0))
-                return -1;
+                return;
         result = arc_entry->read(0, &ch, 1, &count);
         if (result || count!=1) {
-                cpu_halt();
-                return -1;
+                return;
         }
         if (ch == '\r')
-                return '\n';
-        return ch;
+                ch = '\n';
+
+        chardev_push_character(&console, ch);
+}
+
+static void arc_write(chardev_t *dev, const char ch)
+{
+        arc_putchar(ch);
+}
+
+static void arc_enable(chardev_t *dev)
+{
+        kbd_polling_enabled = 1;        
+}
+
+static void arc_disable(chardev_t *dev)
+{
+        kbd_polling_enabled = 0;
+}
+
+static chardev_operations_t arc_ops = {
+        .resume = arc_enable,
+        .suspend = arc_disable,
+        .write = arc_write
+};
+
+iroutine old_timer;
+/** Do polling on timer interrupt */
+static void timer_replace(int n, void *stack)
+{
+        arc_keyboard_poll();
+        old_timer(n, stack);
+        arc_keyboard_poll();
+}
+
+
+chardev_t * arc_console(void)
+{
+        kbd_polling_enabled = 1;
+        
+        chardev_initialize("arc_console", &console, &arc_ops);
+        old_timer = exc_register(TIMER_IRQ, "arc_kb_poll", timer_replace);
+        return &console;
 }