2009-07-01 Robert Millan <rmh.grub@aybabtu.com>

        * util/misc.c: Include `<setjmp.h>' and `<grub/machine/machine.h>'.
        (grub_reboot, grub_halt): New functions.

        * util/i386/pc/misc.c: Delete.  Update all users.
        * util/sparc64/ieee1275/misc.c: Likewise.
        * util/powerpc/ieee1275/misc.c: Likewise.

diff --git a/ChangeLog b/ChangeLog
index cf230ba258dbcaf0bef48149b851c48908dc8ccb..6e6b598a83d533a2dbfa0720389b50e96320cd9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-07-01  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * util/misc.c: Include `<setjmp.h>' and `<grub/machine/machine.h>'.
+       (grub_reboot, grub_halt): New functions.
+
+       * util/i386/pc/misc.c: Delete.  Update all users.
+       * util/sparc64/ieee1275/misc.c: Likewise.
+       * util/powerpc/ieee1275/misc.c: Likewise.
+
 2009-07-01  Robert Millan  <rmh.grub@aybabtu.com>
 
        * conf/i386.rmk (setjmp_mod_SOURCES)

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index fb65322fce70bfbcacca274aece629e26d2d631b..c70f7d2a0f5a695d0b84b8e5e4bb41f73530554f 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -138,7 +138,6 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c \
        partmap/acorn.c partmap/gpt.c                                   \
        util/console.c util/hostfs.c util/grub-emu.c util/misc.c        \
        util/hostdisk.c util/getroot.c                                  \
-       util/i386/pc/misc.c                                             \
        \
        disk/raid.c disk/raid5_recover.c disk/raid6_recover.c           \
        disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c             \

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index 4e898068d4b989cef89a9ff22e46150742a6c898..75aa611e741451f92d4f69e00e1b3d9e16044c34 100644 (file)
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -65,7 +65,6 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c   \
        partmap/acorn.c partmap/gpt.c                                   \
        util/console.c util/hostfs.c util/grub-emu.c util/misc.c        \
        util/hostdisk.c util/getroot.c                                  \
-       util/i386/pc/misc.c                                             \
        \
        disk/raid.c disk/raid5_recover.c disk/raid6_recover.c           \
        disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c             \

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index a7b8e07f8731d80851e228f3374aeb66b108b292..513e1b7bc19386efd08eec70baee6c747cf10c40 100644 (file)
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -92,7 +92,6 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c   \
        partmap/acorn.c partmap/gpt.c                                   \
        util/console.c util/hostfs.c util/grub-emu.c util/misc.c        \
        util/hostdisk.c util/getroot.c                                  \
-       util/i386/pc/misc.c                                             \
        \
        disk/raid.c disk/raid5_recover.c disk/raid6_recover.c           \
        disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c             \

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 6ae167c6d4a53f25cc9c44d63f2ab2ab015e048d..f1915b64653323618968ba8dfb9a5ee9699a2020 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -158,7 +158,6 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c \
        \
        util/console.c util/hostfs.c util/grub-emu.c util/misc.c        \
        util/hostdisk.c util/getroot.c                                  \
-       util/i386/pc/misc.c                                             \
        \
        disk/raid.c disk/raid5_recover.c disk/raid6_recover.c           \
        disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c             \

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index b424b0a3c5de40eb94cebb0bb4635605ca7c6673..b12635ebdeb0d44739cfc93a0615665102ba5e70 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -73,7 +73,6 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c   \
        partmap/acorn.c                                                 \
        util/console.c util/hostfs.c util/grub-emu.c util/misc.c        \
        util/hostdisk.c util/getroot.c                                  \
-       util/powerpc/ieee1275/misc.c                                    \
        \
        disk/raid.c disk/raid5_recover.c disk/raid6_recover.c           \
        disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c             \

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 4a2fb6698fef8ad331ea6a82e04e76356bcbee2d..c3c10ef2e39cec49b46087ff8b1efce59e63a326 100644 (file)
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -129,7 +129,6 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c    \
        partmap/acorn.c                                                 \
        util/console.c util/hostfs.c util/grub-emu.c util/misc.c        \
        util/hostdisk.c util/getroot.c                                  \
-       util/sparc64/ieee1275/misc.c                                    \
        \
        disk/raid.c disk/raid5_recover.c disk/raid6_recover.c           \
        disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c             \

diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 95e5ac610e757044a1d12976bf0fd6272a4099b9..21da0e1cfa6af5aadb837c315b2b2d398613d68d 100644 (file)
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -62,7 +62,6 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c   \
        partmap/acorn.c partmap/gpt.c                                   \
        util/console.c util/hostfs.c util/grub-emu.c util/misc.c        \
        util/hostdisk.c util/getroot.c                                  \
-       util/i386/pc/misc.c                                             \
        \
        disk/raid.c disk/raid5_recover.c disk/raid6_recover.c           \
        disk/mdraid_linux.c disk/dmraid_nvidia.c disk/lvm.c             \

diff --git a/util/i386/pc/misc.c b/util/i386/pc/misc.c
deleted file mode 100644 (file)
index 8490fbf..0000000
--- a/util/i386/pc/misc.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <setjmp.h>
-
-#include <grub/util/misc.h>
-
-void
-grub_reboot (void)
-{
-  longjmp (main_env, 1);
-}
-
-void
-grub_halt (int no_apm __attribute__ ((unused)))
-{
-  grub_reboot ();
-}

diff --git a/util/misc.c b/util/misc.c
index 939867b7f181ffe7d6943a356e0f606814ab08e8..2d0039028340aa7419a1bbf5874ed5d6ed4b6c2f 100644 (file)
--- a/util/misc.c
+++ b/util/misc.c
@@ -18,6 +18,7 @@
 
 #include <config.h>
 
+#include <setjmp.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
@@ -36,6 +37,7 @@
 #include <grub/term.h>
 #include <grub/time.h>
 #include <grub/machine/time.h>
+#include <grub/machine/machine.h>
 
 /* Include malloc.h, only if memalign is available. It is known that
    memalign is declared in malloc.h in all systems, if present.  */
@@ -436,4 +438,20 @@ fail:
   return size;
 }
 
+#endif /* __MINGW32__ */
+
+void
+grub_reboot (void)
+{
+  longjmp (main_env, 1);
+}
+
+void
+grub_halt (
+#ifdef GRUB_MACHINE_PCBIOS
+          int no_apm __attribute__ ((unused))
 #endif
+          )
+{
+  grub_reboot ();
+}

diff --git a/util/powerpc/ieee1275/misc.c b/util/powerpc/ieee1275/misc.c
deleted file mode 100644 (file)
index b0ce83b..0000000
--- a/util/powerpc/ieee1275/misc.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2005,2007  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <setjmp.h>
-
-#include <grub/util/misc.h>
-
-void
-grub_reboot (void)
-{
-  longjmp (main_env, 1);
-}
-
-void
-grub_halt (void)
-{
-  grub_reboot ();
-}

diff --git a/util/sparc64/ieee1275/misc.c b/util/sparc64/ieee1275/misc.c
deleted file mode 100644 (file)
index 99b9513..0000000
--- a/util/sparc64/ieee1275/misc.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 2009  Free Software Foundation, Inc.
- *
- *  GRUB is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  GRUB is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <setjmp.h>
-
-#include <grub/util/misc.h>
-
-void
-grub_reboot (void)
-{
-  longjmp (main_env, 1);
-}
-
-void
-grub_halt (void)
-{
-  grub_reboot ();
-}