Changeset 30ab05f in mainline for arch/sparc64/src

Timestamp:

2006-02-27T20:33:36Z (20 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.

Location:

arch/sparc64/src

Files:

• console.c (modified) (4 diffs)
• mm/tlb.c (modified) (1 diff)
• sparc64.c (modified) (1 diff)
• start.S (modified) (1 diff)

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