Mark shutdown_reboot() and shutdown_power_off() as NO_RETURN.

Also, make shutdown_reboot() actually behave that way, by trying to reboot
forever instead of giving up after some number of tries.

diff --git a/src/devices/shutdown.c b/src/devices/shutdown.c
index fbc662b01c095edc25741ea265e5a01fe52e0c78..4c978f970216169d69b34d061ae7c1c3d746f857 100644 (file)
--- a/src/devices/shutdown.c
+++ b/src/devices/shutdown.c
@@ -23,19 +23,17 @@ static void print_stats (void);
 void
 shutdown_reboot (void)
 {
-  int i;
-
   printf ("Rebooting...\n");
 
     /* See [kbd] for details on how to program the keyboard
      * controller. */
-  for (i = 0; i < 100; i++)
+  for (;;)
     {
-      int j;
+      int i;
 
       /* Poll keyboard controller's status byte until
        * 'input buffer empty' is reported. */
-      for (j = 0; j < 0x10000; j++)
+      for (i = 0; i < 0x10000; i++)
         {
           if ((inb (CONTROL_REG) & 0x02) == 0)
             break;

diff --git a/src/devices/shutdown.h b/src/devices/shutdown.h
index 0bc5657b4b8716978827bc513ef9aead9bc1e97e..7bcef19e7759509c7625920785bb1ef1829b22d9 100644 (file)
--- a/src/devices/shutdown.h
+++ b/src/devices/shutdown.h
@@ -1,7 +1,9 @@
 #ifndef DEVICES_SHUTDOWN_H
 #define DEVICES_SHUTDOWN_H
 
-void shutdown_reboot (void);
-void shutdown_power_off (void);
+#include <debug.h>
+
+void shutdown_reboot (void) NO_RETURN;
+void shutdown_power_off (void) NO_RETURN;
 
 #endif /* devices/shutdown.h */