Changeset 40043e8 in mainline for kernel/generic/include

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.

Location:

kernel/generic/include

Files:

• arch.h (modified) (2 diffs)
• shutdown.h (moved) (moved from kernel/generic/include/halt.h ) (2 diffs)

kernel/generic/include/arch.h

@@ -38 +38 @@
 #include <arch/asm.h>   /* get_stack_base() */
 #include <config.h>
+#include <shutdown.h>
 
 /*
@@ -96 +97 @@
 extern void calibrate_delay_loop(void);
 
-extern void reboot(void);
-extern void arch_reboot(void);
 extern void *arch_construct_function(fncptr_t *, void *, void *);
 

kernel/generic/include/shutdown.h

@@ -33 +33 @@
  */
 
-#ifndef KERN_HALT_H_
-#define KERN_HALT_H_
+#ifndef KERN_SHUTDOWN_H_
+#define KERN_SHUTDOWN_H_
 
 #include <atomic.h>
@@ -41 +41 @@
 
 extern void halt(void) __attribute__((noreturn));
+extern void reboot(void);
+extern void arch_reboot(void);
 
 #endif