Changeset 0ffa3ef5 in mainline for arch/sparc64/src/console.c

Timestamp:

2006-07-10T20:57:30Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

11675207

Parents:

7f1c620

Message:

Sync OpenFirmware functionality with boot.
Random cleanup.

File:

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

arch/sparc64/src/console.c

@@ -52 +52 @@
 
 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;
@@ -63 +58 @@
 static chardev_operations_t ofw_sparc64_console_ops = {
         .write = ofw_sparc64_putchar,
-        .read = ofw_sparc64_getchar,
-        .resume = ofw_sparc64_resume,
-        .suspend = ofw_sparc64_suspend
 };
 
@@ -72 +64 @@
 {
         chardev_initialize("ofw_sparc64_console", &ofw_sparc64_console, &ofw_sparc64_console_ops);
-        stdin = &ofw_sparc64_console;
+        stdin = NULL;
         stdout = &ofw_sparc64_console;
-        mutex_initialize(&canwork);
         ofw_console_active = 1;
 }
@@ -95 +86 @@
 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(KEYBOARD_POLL_PAUSE);
-        }
 }