Changeset ac0cb2a in mainline

Timestamp:

2005-12-08T00:29:53Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

944b15c

Parents:

9d5e23c

Message:

Added simple support for arc keyboards on mips.

Files:

• arch/mips32/include/drivers/arc.h (modified) (2 diffs)
• arch/mips32/include/drivers/keyboard.h (modified) (1 diff)
• arch/mips32/src/drivers/arc.c (modified) (1 diff)
• arch/mips32/src/drivers/keyboard.c (modified) (2 diffs)
• arch/mips32/src/interrupt.c (modified) (1 diff)
• tools/config.py (modified) (1 diff)

arch/mips32/include/drivers/arc.h

@@ -178 +178 @@
         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 +213 @@
 extern void arc_putchar(char ch);
 extern void arc_print_devices(void);
-
+extern int arc_getchar(void);
 #endif

arch/mips32/include/drivers/keyboard.h

@@ -38 +38 @@
 extern void keyboard_init(void);
 extern void keyboard(void);
-
+extern void keyboard_poll(void);
 
 #endif

arch/mips32/src/drivers/arc.c

@@ -184 +184 @@
         
 }
+
+/** 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;
+}

arch/mips32/src/drivers/keyboard.c

@@ -36 +36 @@
 #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 +90 @@
         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;
+}

arch/mips32/src/interrupt.c

@@ -126 +126 @@
                                         cp0_compare_write(cp0_count_read() + cp0_compare_value); 
                                         clock();
+                                        keyboard_poll();
                                         break;
                         }

tools/config.py

@@ -189 +189 @@
         if defopt:
             kw['default-item'] = choices[defopt][0] 
-        res,data = self.calldlg('--extra-label',button[1],
+        res,data = self.calldlg('--ok-label','Change',
+                                '--extra-label',button[1],
                                 '--extra-button',
                                 '--menu',text,height,width,