Changeset 481c520 in mainline for arch/sparc64/src/console.c

Timestamp:

2006-02-27T12:30:11Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

02f441c0

Parents:

4a2b52f

Message:

sparc64 work.
Revive OFW console code and use it before the kernel switches to standalone console.

ia32 + ia64 cosmetic changes.

File:

• arch/sparc64/src/console.c (modified) (1 diff)

arch/sparc64/src/console.c

@@ -32 +32 @@
 #include <genarch/fb/fb.h>
 #include <arch/drivers/fb.h>
+#include <genarch/ofw/ofw.h>
+#include <console/chardev.h>
+#include <console/console.h>
+#include <arch/asm.h>
+#include <arch/register.h>
+#include <proc/thread.h>
+#include <synch/mutex.h>
 
-void fb_sparc64_console_init(void)
+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 volatile int ofw_console_active;
+
+static chardev_t ofw_sparc64_console;
+static chardev_operations_t ofw_sparc64_console_ops = {
+        .write = ofw_sparc64_putchar,
+        .read = ofw_sparc64_getchar,
+        .resume = ofw_sparc64_resume,
+        .suspend = ofw_sparc64_suspend
+};
+
+/** Initialize kernel console to use OpenFirmware services. */
+void ofw_sparc64_console_init(void)
 {
+        chardev_initialize("ofw_sparc64_console", &ofw_sparc64_console, &ofw_sparc64_console_ops);
+        stdin = &ofw_sparc64_console;
+        stdout = &ofw_sparc64_console;
+        mutex_initialize(&canwork);
+        ofw_console_active = 1;
+}
+
+/** Initialize kernel console to use framebuffer and keyboard directly. */
+void standalone_sparc64_console_init(void)
+{
+        ofw_console_active = 0;
+        stdin = NULL;
         fb_init(FB_VIRT_ADDRESS, FB_X_RES, FB_Y_RES, FB_COLOR_DEPTH/8);
 }
+
+/** Write one character using OpenFirmware.
+ *
+ * @param d Character device (ignored).
+ * @param ch Character to be written.
+ */
+void ofw_sparc64_putchar(chardev_t *d, const 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);
+
+        if (ch == '\n')
+                ofw_putchar('\r');
+        ofw_putchar(ch);
+        
+        pstate.am = false;
+        pstate_write(pstate.value);
+}
+
+/** Read one character using OpenFirmware.
+ *
+ * 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 (ofw_console_active) {
+                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);
+        }
+}