Index: arch/mips32/include/drivers/arc.h
===================================================================
--- arch/mips32/include/drivers/arc.h	(revision 9371c301116efcd366e21f4bc55ae2528b3fbbec)
+++ arch/mips32/include/drivers/arc.h	(revision ac0cb2ac8774922acaa210b75ea25715e04c97fe)
@@ -178,5 +178,5 @@
 	long (*close)(__u32 fileid);
 	long (*read)(__u32 fileid,void *buf,__u32 n,__u32 *cnt);
-	long (*getreadstatus)();
+	long (*getreadstatus)(__u32 fileid);
 	long (*write)(__u32 fileid, void *buf,__u32 n,__u32 *cnt);
 	long (*seek)(void); /* ... */
@@ -213,4 +213,4 @@
 extern void arc_putchar(char ch);
 extern void arc_print_devices(void);
-
+extern int arc_getchar(void);
 #endif
Index: arch/mips32/include/drivers/keyboard.h
===================================================================
--- arch/mips32/include/drivers/keyboard.h	(revision 9371c301116efcd366e21f4bc55ae2528b3fbbec)
+++ arch/mips32/include/drivers/keyboard.h	(revision ac0cb2ac8774922acaa210b75ea25715e04c97fe)
@@ -38,5 +38,5 @@
 extern void keyboard_init(void);
 extern void keyboard(void);
-
+extern void keyboard_poll(void);
 
 #endif
Index: arch/mips32/src/drivers/arc.c
===================================================================
--- arch/mips32/src/drivers/arc.c	(revision 9371c301116efcd366e21f4bc55ae2528b3fbbec)
+++ arch/mips32/src/drivers/arc.c	(revision ac0cb2ac8774922acaa210b75ea25715e04c97fe)
@@ -184,2 +184,21 @@
 	
 }
+
+/** Try to get character, return character or -1 if not available */
+int arc_getchar(void)
+{
+	char ch;
+	__u32 count;
+	long result;
+
+	if (arc_entry->getreadstatus(0))
+		return -1;
+	result = arc_entry->read(0, &ch, 1, &count);
+	if (result || count!=1) {
+		cpu_halt();
+		return -1;
+	}
+	if (ch == '\r')
+		return '\n';
+	return ch;
+}
Index: arch/mips32/src/drivers/keyboard.c
===================================================================
--- arch/mips32/src/drivers/keyboard.c	(revision 9371c301116efcd366e21f4bc55ae2528b3fbbec)
+++ arch/mips32/src/drivers/keyboard.c	(revision ac0cb2ac8774922acaa210b75ea25715e04c97fe)
@@ -36,19 +36,35 @@
 #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 kbrd;
-static chardev_operations_t ops = {
+
+static chardev_operations_t arc_ops = {
+	.resume = arc_kb_enable,
+	.suspend = arc_kb_disable
+};
+
+static chardev_operations_t msim_ops = {
 	.resume = keyboard_enable,
 	.suspend = keyboard_disable
 };
 
+static int arc_kb_enabled;
+
 /** Initialize keyboard subsystem. */
 void keyboard_init(void)
 {
-	cp0_unmask_int(KEYBOARD_IRQ);
-	chardev_initialize(&kbrd, &ops);
+	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;
 }
@@ -74,2 +90,26 @@
 	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;
+}
Index: arch/mips32/src/interrupt.c
===================================================================
--- arch/mips32/src/interrupt.c	(revision 9371c301116efcd366e21f4bc55ae2528b3fbbec)
+++ arch/mips32/src/interrupt.c	(revision ac0cb2ac8774922acaa210b75ea25715e04c97fe)
@@ -126,4 +126,5 @@
 					cp0_compare_write(cp0_count_read() + cp0_compare_value); 
 					clock();
+					keyboard_poll();
 					break;
 			}
