Changeset 65fb232 in mainline for arch/sparc64/src/console.c

Timestamp:

2005-12-30T22:38:23Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6ccb238

Parents:

80bff342

Message:

sparc64 work.
kconsole support.
Add non-blocking ofw_getchar().

File:

• arch/sparc64/src/console.c (modified) (3 diffs)

arch/sparc64/src/console.c

@@ -33 +33 @@
 #include <arch/asm.h>
 #include <arch/register.h>
+#include <arch/types.h>
+#include <typedefs.h>
+#include <proc/thread.h>
+#include <synch/mutex.h>
 
 static void ofw_sparc64_putchar(chardev_t *d, const char ch);
+static char ofw_sparc64_getchar(chardev_t *d);
+static void ofw_sparc64_suspend(chardev_t *d);
+static void ofw_sparc64_resume(chardev_t *d);
+
+mutex_t canwork;
 
 static chardev_t ofw_sparc64_console;
 static chardev_operations_t ofw_sparc64_console_ops = {
-        .write = ofw_sparc64_putchar
+        .write = ofw_sparc64_putchar,
+        .read = ofw_sparc64_getchar,
+        .resume = ofw_sparc64_resume,
+        .suspend = ofw_sparc64_suspend
 };
 
@@ -44 +56 @@
 {
         chardev_initialize("ofw_sparc64_console", &ofw_sparc64_console, &ofw_sparc64_console_ops);
+        stdin = &ofw_sparc64_console;
         stdout = &ofw_sparc64_console;
+        mutex_initialize(&canwork);
 }
 
-/** Print one character.
+/** Write one character.
  *
- * @param ch Character to be printed.
+ * @param d Character device (ignored).
+ * @param ch Character to be written.
  */
 void ofw_sparc64_putchar(chardev_t *d, const char ch)
@@ -69 +84 @@
         pstate_write(pstate.value);
 }
+
+/** Read one character.
+ *
+ * The call is non-blocking.
+ *
+ * @param d Character device (ignored).
+ * @return Character read or zero if no character was read.
+ */
+char ofw_sparc64_getchar(chardev_t *d)
+{
+        char ch;
+        pstate_reg_t pstate;
+
+        /*
+         * 32-bit OpenFirmware depends on PSTATE.AM bit set.
+         */     
+        pstate.value = pstate_read();
+        pstate.am = true;
+        pstate_write(pstate.value);
+
+        ch = ofw_getchar();
+        
+        pstate.am = false;
+        pstate_write(pstate.value);
+        
+        return ch;
+}
+
+void ofw_sparc64_suspend(chardev_t *d)
+{
+        mutex_lock(&canwork);
+}
+
+void ofw_sparc64_resume(chardev_t *d)
+{
+        mutex_unlock(&canwork);
+}
+
+/** Kernel thread for pushing characters read from OFW to input buffer.
+ *
+ * @param arg Ignored.
+ */
+void kofwinput(void *arg)
+{
+
+        while (1) {
+                char ch = 0;
+                
+                mutex_lock(&canwork);
+                mutex_unlock(&canwork);
+                
+                ch = ofw_sparc64_getchar(NULL);
+                if (ch) {
+                        if (ch == '\r')
+                                ch = '\n';
+                        chardev_push_character(&ofw_sparc64_console, ch);
+                }
+                thread_usleep(25000);
+        }
+}