Changeset 36e7ee98 in mainline for generic/src/console/console.c

Timestamp:

2005-12-15T21:32:12Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

cddc1639

Parents:

49b6d32

Message:

Fixed cpu halting in debug panic mode.

File:

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

generic/src/console/console.c

@@ -37 +37 @@
 #include <func.h>
 #include <print.h>
+#include <arch/atomic.h>
 
 /** Standard input character device. */
@@ -53 +54 @@
         ipl_t ipl;
 
-        if (haltstate) {
+        if (atomic_get(&haltstate)) {
                 /* If we are here, we are hopefully on the processor, that 
                  * issued the 'halt' command, so proceed to read the character
@@ -61 +62 @@
                         return chardev->op->read(chardev);
                 /* no other way of interacting with user, halt */
-                printf("cpu: halted - no kconsole\n");
+                if (CPU)
+                        printf("cpu%d: ", CPU->id);
+                else
+                        printf("cpu: ");
+                printf("halted - no kconsole\n");
                 cpu_halt();
         }