Changeset 40043e8 in mainline for kernel/generic/src/main/shutdown.c

Timestamp:

2019-07-18T08:25:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

0116f21

Parents:

2cc569a3

Message:

Restructering halt/reboot files

The function halt() and reboot() used to be stored
in two different c files and two different header
files which were named differently than the c files.
This commit merges those two functions into the
same file and provides an unique header file (shutdown.h)
for accessing them.

File:

• kernel/generic/src/main/shutdown.c (modified) (2 diffs)

kernel/generic/src/main/shutdown.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2007 Martin Decky
+ * Copyright (c) 2001-2004 Jakub Jermar
  * All rights reserved.
  *
@@ -36 +37 @@
  */
 
+#include <shutdown.h>
+#include <log.h>
+#include <cpu.h>
+#include <arch/asm.h>
 #include <arch.h>
+#include <console/kconsole.h>
 #include <proc/task.h>
-#include <halt.h>
-#include <log.h>
+
+/** Halt flag */
+atomic_t haltstate = 0;
+
+/** Halt wrapper
+ *
+ * Set halt flag and halt the CPU.
+ *
+ */
+void halt(void)
+{
+#if (defined(CONFIG_DEBUG)) && (defined(CONFIG_KCONSOLE))
+        bool rundebugger = false;
+
+        if (!atomic_load(&haltstate)) {
+                atomic_store(&haltstate, 1);
+                rundebugger = true;
+        }
+#else
+        atomic_store(&haltstate, 1);
+#endif
+
+        interrupts_disable();
+
+#if (defined(CONFIG_DEBUG)) && (defined(CONFIG_KCONSOLE))
+        if ((rundebugger) && (kconsole_check_poll()))
+                kconsole("panic", "\nLast resort kernel console ready.\n", false);
+#endif
+
+        if (CPU)
+                log(LF_OTHER, LVL_NOTE, "cpu%u: halted", CPU->id);
+        else
+                log(LF_OTHER, LVL_NOTE, "cpu: halted");
+
+        cpu_halt();
+}
 
 void reboot(void)