Changeset 30ab05f in mainline

Timestamp:

2006-02-27T20:33:36Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d87c3f3

Parents:

02f441c0

Message:

sparc64 work.
Very raw and fragile preliminary standalone keyboard support - polling mode only.
Because of a workaround in Simics, the scan codes are the same as on ia32.

Files:

• arch/amd64/include/drivers/i8042.h (added)
• arch/amd64/include/i8042.h (deleted)
• arch/sparc64/Makefile.inc (modified) (1 diff)
• arch/sparc64/include/console.h (modified) (1 diff)
• arch/sparc64/include/drivers/i8042.h (moved) (moved from arch/sparc64/include/drivers/keyboard.h ) (1 diff)
• arch/sparc64/include/interrupt.h (modified) (1 diff)
• arch/sparc64/src/console.c (modified) (4 diffs)
• arch/sparc64/src/mm/tlb.c (modified) (1 diff)
• arch/sparc64/src/sparc64.c (modified) (1 diff)
• arch/sparc64/src/start.S (modified) (1 diff)
• genarch/include/i8042/i8042.h (modified) (1 diff)
• genarch/src/i8042/i8042.c (modified) (6 diffs)

arch/sparc64/Makefile.inc

@@ -58 +58 @@
 CONFIG_ASID_FIFO = y
 
+## Compile with support for framebuffer.
+#
+
 CONFIG_FB = y
+
+## Compile with support for i8042 controller.
+#
+
+CONFIG_I8042 = y
 
 ARCH_SOURCES = \

arch/sparc64/include/console.h

@@ -31 +31 @@
 
 extern void kofwinput(void *arg);
+extern void kkbdpoll(void *arg);
 extern void ofw_sparc64_console_init(void);
 extern void standalone_sparc64_console_init(void);

arch/sparc64/include/drivers/i8042.h

@@ -27 +27 @@
  */
 
-#ifndef __sparc64_KEYBOARD_H__
-#define __sparc64_KEYBOARD_H__
+#ifndef __sparc64_I8042_H__
+#define __sparc64_I8042_H__
+
+#include <arch/types.h>
 
 #define KBD_PHYS_ADDRESS        0x1fff8904000ULL
 #define KBD_VIRT_ADDRESS        0x00000d00000ULL
 
+#define STATUS_REG      4
+#define COMMAND_REG     4
+#define DATA_REG        6
+
+static inline void i8042_data_write(__u8 data)
+{
+        ((__u8 *)(KBD_VIRT_ADDRESS))[DATA_REG] = data;
+}
+
+static inline __u8 i8042_data_read(void)
+{
+        return ((volatile __u8 *)(KBD_VIRT_ADDRESS))[DATA_REG];
+}
+
+static inline __u8 i8042_status_read(void)
+{
+        return ((volatile __u8 *)(KBD_VIRT_ADDRESS))[STATUS_REG];
+}
+
+static inline void i8042_command_write(__u8 command)
+{
+        ((__u8 *)(KBD_VIRT_ADDRESS))[COMMAND_REG] = command;
+}
+
 #endif

arch/sparc64/include/interrupt.h

@@ -35 +35 @@
 #define IVT_FIRST       1
 
+/* Dummy macros. */
+#define IRQ_KBD         2
+#define VECTOR_KBD      IRQ_KBD
+
+#define trap_virtual_enable_irqs(x)
+#define trap_virtual_eoi()
+
 extern void interrupt_register(int n, const char *name, iroutine f);
 

arch/sparc64/src/console.c

@@ -32 +32 @@
 #include <genarch/fb/fb.h>
 #include <arch/drivers/fb.h>
-#include <arch/drivers/keyboard.h>
+#include <arch/drivers/i8042.h>
+#include <genarch/i8042/i8042.h>
 #include <genarch/ofw/ofw.h>
 #include <console/chardev.h>
@@ -40 +41 @@
 #include <proc/thread.h>
 #include <synch/mutex.h>
+
+#define KEYBOARD_POLL_PAUSE     50000   /* 50ms */
 
 static void ofw_sparc64_putchar(chardev_t *d, const char ch);
@@ -74 +77 @@
         stdin = NULL;
         fb_init(FB_VIRT_ADDRESS, FB_X_RES, FB_Y_RES, FB_COLOR_DEPTH/8);
+        i8042_init();
 }
 
@@ -156 +160 @@
                         chardev_push_character(&ofw_sparc64_console, ch);
                 }
-                thread_usleep(25000);
+                thread_usleep(KEYBOARD_POLL_PAUSE);
         }
 }
+
+/** Kernel thread for polling keyboard.
+ *
+ * @param arg Ignored.
+ */
+void kkbdpoll(void *arg)
+{
+        while (1) {
+                i8042_poll();           
+                thread_usleep(KEYBOARD_POLL_PAUSE);
+        }
+}

arch/sparc64/src/mm/tlb.c

@@ -43 +43 @@
 
 #include <arch/drivers/fb.h>
-#include <arch/drivers/keyboard.h>
+#include <arch/drivers/i8042.h>
 
 char *context_encoding[] = {

arch/sparc64/src/sparc64.c

@@ -62 +62 @@
                 panic("cannot create kofwinput\n");
         thread_ready(t);
+
+        /*
+         * Create thread that polls keyboard.
+         */
+        t = thread_create(kkbdpoll, NULL, TASK, 0);
+        if (!t)
+                panic("cannot create kkbdpoll\n");
+        thread_ready(t);
 }
 

arch/sparc64/src/start.S

@@ -102 +102 @@
         nop
 
+        wrpr %r0, 0, %pil
+
         call main_bsp
         nop

genarch/include/i8042/i8042.h

@@ -46 +46 @@
 
 extern void i8042_init(void);
+extern void i8042_poll(void);
 
 #endif

genarch/src/i8042/i8042.c

@@ -53 +53 @@
 /*
  * 60  Write 8042 Command Byte: next data byte written to port 60h is
- *     placed in 8042 command register.Format:
+ *     placed in 8042 command register. Format:
  *
  *    |7|6|5|4|3|2|1|0|8042 Command Byte
@@ -74 +74 @@
 #define SPECIAL         '?'
 #define KEY_RELEASE     0x80
+
+/**
+ * These codes read from i8042 data register are silently ignored.
+ */
+#define IGNORE_CODE     0x7f
 
 static void key_released(__u8 sc);
@@ -262 +267 @@
 
 static void i8042_interrupt(int n, void *stack);
+static void i8042_wait(void);
 
 /** Initialize i8042. */
@@ -267 +273 @@
 {
         exc_register(VECTOR_KBD, "i8042_interrupt", i8042_interrupt);
-        while (i8042_status_read() & i8042_WAIT_MASK) {
-                /* wait */
-        }
+        i8042_wait();
         i8042_command_write(i8042_SET_COMMAND);
-        while (i8042_status_read() & i8042_WAIT_MASK) {
-                /* wait */
-        }
+        i8042_wait();
         i8042_data_write(i8042_COMMAND);
+        i8042_wait();
 
         trap_virtual_enable_irqs(1<<IRQ_KBD);
@@ -296 +299 @@
         else
                 key_pressed(x);
+}
+
+/** Wait until the controller reads its data. */
+void i8042_wait(void) {
+        while (i8042_status_read() & i8042_WAIT_MASK) {
+                /* wait */
+        }
 }
 
@@ -503 +513 @@
                         ;
                 x = i8042_data_read();
-                if (x & KEY_RELEASE)
-                        key_released(x ^ KEY_RELEASE);
-                else
-                        active_read_key_pressed(x);
+                if (x != IGNORE_CODE) {
+                        if (x & KEY_RELEASE)
+                                key_released(x ^ KEY_RELEASE);
+                        else
+                                active_read_key_pressed(x);
+                }
         }
         return ch;
 }
+
+/** Poll for key press and release events.
+ *
+ * This function can be used to implement keyboard polling.
+ */
+void i8042_poll(void)
+{
+        __u8 x;
+
+        while (((x = i8042_status_read() & i8042_BUFFER_FULL_MASK))) {
+                x = i8042_data_read();
+                if (x != IGNORE_CODE) {
+                        if (x & KEY_RELEASE)
+                                key_released(x ^ KEY_RELEASE);
+                        else
+                                key_pressed(x);
+                }
+        }
+}