This patch splits the i386-generic part of i386/pc/loader.h into i386/loader.h.
Comments? -- Robert Millan <GPLv2> I know my rights; I want my phone call! <DRM> What use is a phone call, if you are unable to speak? (as seen on /.)
2007-10-17 Robert Millan <[EMAIL PROTECTED]> * include/grub/i386/loader.h: New file. * include/grub/i386/pc/loader.h (grub_linux_prot_size): Moved to ... * include/grub/i386/loader.h (grub_linux_prot_size): ... here. * include/grub/i386/pc/loader.h (grub_linux_tmp_addr): Moved to ... * include/grub/i386/loader.h (grub_linux_tmp_addr): ... here. * include/grub/i386/pc/loader.h (grub_linux_real_addr): Moved to ... * include/grub/i386/loader.h (grub_linux_real_addr): ... here. * include/grub/i386/pc/loader.h (grub_os_area_addr): Moved to ... * include/grub/i386/loader.h (grub_os_area_addr): ... here. * include/grub/i386/pc/loader.h (grub_os_area_size): Moved to ... * include/grub/i386/loader.h (grub_os_area_size): ... here. * include/grub/i386/pc/loader.h (grub_linux_boot_zimage): Moved to ... * include/grub/i386/loader.h (grub_linux_boot_zimage): ... here. * include/grub/i386/pc/loader.h (grub_linux_boot_bzimage): Moved to ... * include/grub/i386/loader.h (grub_linux_boot_bzimage): ... here. * include/grub/i386/pc/loader.h (grub_multiboot_real_boot): Moved to ... * include/grub/i386/loader.h (grub_multiboot_real_boot): ... here. * include/grub/i386/pc/loader.h (grub_multiboot2_real_boot): Moved to ... * include/grub/i386/loader.h (grub_multiboot2_real_boot): ... here. * include/grub/i386/pc/loader.h (grub_rescue_cmd_linux): Moved to ... * include/grub/i386/loader.h (grub_rescue_cmd_linux): ... here. * include/grub/i386/pc/loader.h (grub_rescue_cmd_initrd): Moved to ... * include/grub/i386/loader.h (grub_rescue_cmd_initrd): ... here. * include/grub/i386/pc/loader.h: Include `grub/cpu/loader.h'. diff -Nurp grub2/include/grub/i386/loader.h grub2.loader_h/include/grub/i386/loader.h --- grub2/include/grub/i386/loader.h 1970-01-01 01:00:00.000000000 +0100 +++ grub2.loader_h/include/grub/i386/loader.h 2007-10-17 10:27:32.000000000 +0200 @@ -0,0 +1,48 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2002,2003,2004,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/>. + */ + +#ifndef GRUB_LOADER_CPU_HEADER +#define GRUB_LOADER_CPU_HEADER 1 + +#include <grub/types.h> +#include <grub/symbol.h> +#include <grub/multiboot.h> + +extern grub_uint32_t EXPORT_VAR(grub_linux_prot_size); +extern char *EXPORT_VAR(grub_linux_tmp_addr); +extern char *EXPORT_VAR(grub_linux_real_addr); +extern grub_addr_t EXPORT_VAR(grub_os_area_addr); +extern grub_size_t EXPORT_VAR(grub_os_area_size); + +void EXPORT_FUNC(grub_linux_boot_zimage) (void) __attribute__ ((noreturn)); +void EXPORT_FUNC(grub_linux_boot_bzimage) (void) __attribute__ ((noreturn)); + +/* The asm part of the multiboot loader. */ +void EXPORT_FUNC(grub_multiboot_real_boot) (grub_addr_t entry, + struct grub_multiboot_info *mbi) + __attribute__ ((noreturn)); +void EXPORT_FUNC(grub_multiboot2_real_boot) (grub_addr_t entry, + struct grub_multiboot_info *mbi) + __attribute__ ((noreturn)); + +/* It is necessary to export these functions, because normal mode commands + reuse rescue mode commands. */ +void grub_rescue_cmd_linux (int argc, char *argv[]); +void grub_rescue_cmd_initrd (int argc, char *argv[]); + +#endif /* ! GRUB_LOADER_CPU_HEADER */ diff -Nurp grub2/include/grub/i386/pc/loader.h grub2.loader_h/include/grub/i386/pc/loader.h --- grub2/include/grub/i386/pc/loader.h 2007-07-25 21:29:23.000000000 +0200 +++ grub2.loader_h/include/grub/i386/pc/loader.h 2007-10-17 10:31:06.000000000 +0200 @@ -19,33 +19,10 @@ #ifndef GRUB_LOADER_MACHINE_HEADER #define GRUB_LOADER_MACHINE_HEADER 1 -#include <grub/types.h> #include <grub/symbol.h> -#include <grub/multiboot.h> - -extern grub_uint32_t EXPORT_VAR(grub_linux_prot_size); -extern char *EXPORT_VAR(grub_linux_tmp_addr); -extern char *EXPORT_VAR(grub_linux_real_addr); -extern grub_addr_t EXPORT_VAR(grub_os_area_addr); -extern grub_size_t EXPORT_VAR(grub_os_area_size); - -void EXPORT_FUNC(grub_linux_boot_zimage) (void) __attribute__ ((noreturn)); -void EXPORT_FUNC(grub_linux_boot_bzimage) (void) __attribute__ ((noreturn)); +#include <grub/cpu/loader.h> /* This is an asm part of the chainloader. */ void EXPORT_FUNC(grub_chainloader_real_boot) (int drive, void *part_addr) __attribute__ ((noreturn)); -/* The asm part of the multiboot loader. */ -void EXPORT_FUNC(grub_multiboot_real_boot) (grub_addr_t entry, - struct grub_multiboot_info *mbi) - __attribute__ ((noreturn)); -void EXPORT_FUNC(grub_multiboot2_real_boot) (grub_addr_t entry, - struct grub_multiboot_info *mbi) - __attribute__ ((noreturn)); - -/* It is necessary to export these functions, because normal mode commands - reuse rescue mode commands. */ -void grub_rescue_cmd_linux (int argc, char *argv[]); -void grub_rescue_cmd_initrd (int argc, char *argv[]); - #endif /* ! GRUB_LOADER_MACHINE_HEADER */
_______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel
