Changeset 93b84b3 in mainline for generic/src/console/console.c

Timestamp:

2005-12-12T16:30:07Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

ebbdb8f

Parents:

af9a7c5

Message:

Fixed weird simics panic.
Run kconsole, if we panic. This currently works in gxemul,
simics. In mips we need to modify the simulator.
On ia32 we need a function, that would speak directly to the chip
and fetch the character using polling.

File:

• generic/src/console/console.c (modified) (3 diffs)

generic/src/console/console.c

@@ -35 +35 @@
 #include <typedefs.h>
 #include <arch.h>
+#include <func.h>
+#include <print.h>
 
 /** Standard input character device. */
@@ -50 +52 @@
         __u8 ch;
         ipl_t ipl;
+
+        if (haltstate) {
+                /* If we are here, we are hopefully on the processor, that 
+                 * issued the 'halt' command, so proceed to read the character
+                 * directly from input
+                 */
+                if (chardev->op->read)
+                        return chardev->op->read(chardev);
+                /* no other way of interacting with user, halt */
+                printf("cpu: halted - no kconsole\n");
+                cpu_halt();
+        }
 
         waitq_sleep(&chardev->wq);
@@ -115 +129 @@
 void putchar(char c)
 {
-        stdout->op->write(stdout, c);
+        if (stdout->op->write)
+                stdout->op->write(stdout, c);
 }