[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2378] 2009-07-01 Robert Millan <address@hidden>
|
From: |
Robert Millan |
|
Subject: |
[2378] 2009-07-01 Robert Millan <address@hidden> |
|
Date: |
Wed, 01 Jul 2009 13:01:34 +0000 |
Revision: 2378
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2378
Author: robertmh
Date: 2009-07-01 13:01:33 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
2009-07-01 Robert Millan <address@hidden>
* 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.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/conf/i386-coreboot.rmk
trunk/grub2/conf/i386-efi.rmk
trunk/grub2/conf/i386-ieee1275.rmk
trunk/grub2/conf/i386-pc.rmk
trunk/grub2/conf/powerpc-ieee1275.rmk
trunk/grub2/conf/sparc64-ieee1275.rmk
trunk/grub2/conf/x86_64-efi.rmk
trunk/grub2/util/misc.c
Removed Paths:
-------------
trunk/grub2/util/i386/pc/misc.c
trunk/grub2/util/powerpc/ieee1275/misc.c
trunk/grub2/util/sparc64/ieee1275/misc.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-07-01 12:59:47 UTC (rev 2377)
+++ trunk/grub2/ChangeLog 2009-07-01 13:01:33 UTC (rev 2378)
@@ -1,5 +1,14 @@
2009-07-01 Robert Millan <address@hidden>
+ * 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 <address@hidden>
+
* conf/i386.rmk (setjmp_mod_SOURCES)
(setjmp_mod_ASFLAGS, setjmp_mod_LDFLAGS): Move to ...
* conf/common.rmk (setjmp_mod_SOURCES)
Modified: trunk/grub2/conf/i386-coreboot.rmk
===================================================================
--- trunk/grub2/conf/i386-coreboot.rmk 2009-07-01 12:59:47 UTC (rev 2377)
+++ trunk/grub2/conf/i386-coreboot.rmk 2009-07-01 13:01:33 UTC (rev 2378)
@@ -138,7 +138,6 @@
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 \
Modified: trunk/grub2/conf/i386-efi.rmk
===================================================================
--- trunk/grub2/conf/i386-efi.rmk 2009-07-01 12:59:47 UTC (rev 2377)
+++ trunk/grub2/conf/i386-efi.rmk 2009-07-01 13:01:33 UTC (rev 2378)
@@ -65,7 +65,6 @@
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 \
Modified: trunk/grub2/conf/i386-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/i386-ieee1275.rmk 2009-07-01 12:59:47 UTC (rev 2377)
+++ trunk/grub2/conf/i386-ieee1275.rmk 2009-07-01 13:01:33 UTC (rev 2378)
@@ -92,7 +92,6 @@
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 \
Modified: trunk/grub2/conf/i386-pc.rmk
===================================================================
--- trunk/grub2/conf/i386-pc.rmk 2009-07-01 12:59:47 UTC (rev 2377)
+++ trunk/grub2/conf/i386-pc.rmk 2009-07-01 13:01:33 UTC (rev 2378)
@@ -158,7 +158,6 @@
\
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 \
Modified: trunk/grub2/conf/powerpc-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/powerpc-ieee1275.rmk 2009-07-01 12:59:47 UTC (rev
2377)
+++ trunk/grub2/conf/powerpc-ieee1275.rmk 2009-07-01 13:01:33 UTC (rev
2378)
@@ -73,7 +73,6 @@
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 \
Modified: trunk/grub2/conf/sparc64-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/sparc64-ieee1275.rmk 2009-07-01 12:59:47 UTC (rev
2377)
+++ trunk/grub2/conf/sparc64-ieee1275.rmk 2009-07-01 13:01:33 UTC (rev
2378)
@@ -129,7 +129,6 @@
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 \
Modified: trunk/grub2/conf/x86_64-efi.rmk
===================================================================
--- trunk/grub2/conf/x86_64-efi.rmk 2009-07-01 12:59:47 UTC (rev 2377)
+++ trunk/grub2/conf/x86_64-efi.rmk 2009-07-01 13:01:33 UTC (rev 2378)
@@ -62,7 +62,6 @@
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 \
Deleted: trunk/grub2/util/i386/pc/misc.c
===================================================================
--- trunk/grub2/util/i386/pc/misc.c 2009-07-01 12:59:47 UTC (rev 2377)
+++ trunk/grub2/util/i386/pc/misc.c 2009-07-01 13:01:33 UTC (rev 2378)
@@ -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 ();
-}
Modified: trunk/grub2/util/misc.c
===================================================================
--- trunk/grub2/util/misc.c 2009-07-01 12:59:47 UTC (rev 2377)
+++ trunk/grub2/util/misc.c 2009-07-01 13:01:33 UTC (rev 2378)
@@ -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 @@
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 ();
+}
Deleted: trunk/grub2/util/powerpc/ieee1275/misc.c
===================================================================
--- trunk/grub2/util/powerpc/ieee1275/misc.c 2009-07-01 12:59:47 UTC (rev
2377)
+++ trunk/grub2/util/powerpc/ieee1275/misc.c 2009-07-01 13:01:33 UTC (rev
2378)
@@ -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 ();
-}
Deleted: trunk/grub2/util/sparc64/ieee1275/misc.c
===================================================================
--- trunk/grub2/util/sparc64/ieee1275/misc.c 2009-07-01 12:59:47 UTC (rev
2377)
+++ trunk/grub2/util/sparc64/ieee1275/misc.c 2009-07-01 13:01:33 UTC (rev
2378)
@@ -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 ();
-}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2378] 2009-07-01 Robert Millan <address@hidden>,
Robert Millan <=