Changeset 67a88c3 in mainline for kernel/generic/src/lib/func.c

Timestamp:

2009-03-12T17:47:21Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a02e383

Parents:

ac8e7a9

Message:

do not create last resort console if there is no polling input device
cleanup

File:

• kernel/generic/src/lib/func.c (modified) (4 diffs)

kernel/generic/src/lib/func.c

@@ -48 +48 @@
 /** Halt wrapper
  *
- * Set halt flag and halt the cpu.
+ * Set halt flag and halt the CPU.
  *
  */
@@ -55 +55 @@
 #ifdef CONFIG_DEBUG
         bool rundebugger = false;
-
+        
         if (!atomic_get(&haltstate)) {
                 atomic_set(&haltstate, 1);
@@ -63 +63 @@
         atomic_set(&haltstate, 1);
 #endif
-
+        
         interrupts_disable();
         
 #if (defined(CONFIG_DEBUG)) && (defined(CONFIG_KCONSOLE))
-        if (rundebugger)
-                kconsole("panic", "\nLast resort kernel console ready\n", false);
+        if ((rundebugger) && (kconsole_check_poll()))
+                kconsole("panic", "\nLast resort kernel console ready.\n", false);
 #endif
         
@@ -75 +75 @@
         else
                 printf("cpu: halted\n");
+        
         cpu_halt();
 }