Re: [PATCH] get rid of util/$(target_cpu)/$(platform)/misc.c

[Robert Millan]

Committed.

On Mon, Jun 29, 2009 at 03:19:02PM +0200, Robert Millan wrote:
> 
> This patch gets rid of util/$(target_cpu)/$(platform)/misc.c by integrating
> them into util/misc.c.
> 
> It paves the way for unification of grub-emu.
> 
> -- 
> Robert Millan
> 
>   The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
>   how) you may access your data; but nobody's threatening your freedom: we
>   still allow you to remove your data and not access it at all."

> 2009-06-29  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.
> 
> Index: conf/i386-pc.rmk
> ===================================================================
> --- conf/i386-pc.rmk  (revision 2371)
> +++ conf/i386-pc.rmk  (working copy)
> @@ -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             \
> Index: conf/i386-efi.rmk
> ===================================================================
> --- conf/i386-efi.rmk (revision 2371)
> +++ conf/i386-efi.rmk (working copy)
> @@ -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             \
> Index: conf/i386-ieee1275.rmk
> ===================================================================
> --- conf/i386-ieee1275.rmk    (revision 2371)
> +++ conf/i386-ieee1275.rmk    (working copy)
> @@ -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             \
> Index: conf/x86_64-efi.rmk
> ===================================================================
> --- conf/x86_64-efi.rmk       (revision 2371)
> +++ conf/x86_64-efi.rmk       (working copy)
> @@ -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             \
> Index: conf/powerpc-ieee1275.rmk
> ===================================================================
> --- conf/powerpc-ieee1275.rmk (revision 2371)
> +++ conf/powerpc-ieee1275.rmk (working copy)
> @@ -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             \
> Index: conf/i386-coreboot.rmk
> ===================================================================
> --- conf/i386-coreboot.rmk    (revision 2371)
> +++ conf/i386-coreboot.rmk    (working copy)
> @@ -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             \
> Index: conf/sparc64-ieee1275.rmk
> ===================================================================
> --- conf/sparc64-ieee1275.rmk (revision 2371)
> +++ conf/sparc64-ieee1275.rmk (working copy)
> @@ -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             \
> Index: util/powerpc/ieee1275/misc.c
> ===================================================================
> --- util/powerpc/ieee1275/misc.c      (revision 2371)
> +++ util/powerpc/ieee1275/misc.c      (working copy)
> @@ -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 ();
> -}
> Index: util/sparc64/ieee1275/misc.c
> ===================================================================
> --- util/sparc64/ieee1275/misc.c      (revision 2371)
> +++ util/sparc64/ieee1275/misc.c      (working copy)
> @@ -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 ();
> -}
> Index: util/i386/pc/misc.c
> ===================================================================
> --- util/i386/pc/misc.c       (revision 2371)
> +++ util/i386/pc/misc.c       (working copy)
> @@ -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 ();
> -}
> Index: util/misc.c
> ===================================================================
> --- util/misc.c       (revision 2371)
> +++ util/misc.c       (working copy)
> @@ -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 ();
> +}

> _______________________________________________
> Grub-devel mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/grub-devel


-- 
Robert Millan

  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
  how) you may access your data; but nobody's threatening your freedom: we
  still allow you to remove your data and not access it at all."