From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Ii4Wa-0000Ks-BD for mharc-grub-devel@gnu.org; Wed, 17 Oct 2007 04:45:08 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ii4WY-0000Ke-23 for grub-devel@gnu.org; Wed, 17 Oct 2007 04:45:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ii4WU-0000IL-B7 for grub-devel@gnu.org; Wed, 17 Oct 2007 04:45:04 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ii4WU-0000I7-3h for grub-devel@gnu.org; Wed, 17 Oct 2007 04:45:02 -0400 Received: from aybabtu.com ([69.60.117.155]) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Ii4WT-0000vW-IJ for grub-devel@gnu.org; Wed, 17 Oct 2007 04:45:01 -0400 Received: from [192.168.10.6] (helo=thorin) by aybabtu.com with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1Ii4WQ-00065C-QQ for grub-devel@gnu.org; Wed, 17 Oct 2007 10:45:00 +0200 Received: from rmh by thorin with local (Exim 4.63) (envelope-from ) id 1Ii4Vz-0004VH-9a for grub-devel@gnu.org; Wed, 17 Oct 2007 10:44:31 +0200 Date: Wed, 17 Oct 2007 10:44:31 +0200 From: Robert Millan To: grub-devel@gnu.org Message-ID: <20071017084431.GA17289@thorin> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="EVF5PPMfhYS0aIcm" Content-Disposition: inline Organization: free as in freedom X-Message-Flag: Microsoft discourages use of Outlook. X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.13 (2006-08-11) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [PATCH] split i386-generic part of i386/pc/loader.h X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Oct 2007 08:45:06 -0000 --EVF5PPMfhYS0aIcm Content-Type: text/plain; charset=us-ascii Content-Disposition: inline This patch splits the i386-generic part of i386/pc/loader.h into i386/loader.h. Comments? -- Robert Millan I know my rights; I want my phone call! What use is a phone call, if you are unable to speak? (as seen on /.) --EVF5PPMfhYS0aIcm Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="loader_h.diff" 2007-10-17 Robert Millan * 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 . + */ + +#ifndef GRUB_LOADER_CPU_HEADER +#define GRUB_LOADER_CPU_HEADER 1 + +#include +#include +#include + +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 #include -#include - -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 /* 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 */ --EVF5PPMfhYS0aIcm--