vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2009-12-24 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
For consistency with [multiboot]/docs/boot.S.
	
	* include/multiboot.h (MULTIBOOT_MAGIC): Rename from this ...
	(MULTIBOOT_HEADER_MAGIC): ... to this.  Update all users.
	(MULTIBOOT_MAGIC2): Rename from this ...
	(MULTIBOOT_BOOTLOADER_MAGIC): ... to this.  Update all users.
This commit is contained in:
Robert Millan 2009-12-24 14:09:06 +00:00
parent a0b70bda6c
commit e4d47d8d64
6 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
For consistency with [multiboot]/docs/boot.S.
* include/multiboot.h (MULTIBOOT_MAGIC): Rename from this ...
(MULTIBOOT_HEADER_MAGIC): ... to this. Update all users.
(MULTIBOOT_MAGIC2): Rename from this ...
(MULTIBOOT_BOOTLOADER_MAGIC): ... to this. Update all users.
2009-12-24 Robert Millan <rmh.grub@aybabtu.com> 2009-12-24 Robert Millan <rmh.grub@aybabtu.com>
* include/multiboot.h: Remove `<grub/types.h>'. * include/multiboot.h: Remove `<grub/types.h>'.

2
boot/i386/pc/lnxboot.S
View file

@ -185,7 +185,7 @@ real_code_2:
call LOCAL(move_memory) call LOCAL(move_memory)
/* Check for multiboot signature. */ /* Check for multiboot signature. */
cmpl $MULTIBOOT_MAGIC, %ss:(DATA_ADDR + GRUB_KERNEL_MACHINE_DATA_END) cmpl $MULTIBOOT_HEADER_MAGIC, %ss:(DATA_ADDR + GRUB_KERNEL_MACHINE_DATA_END)
jz 1f jz 1f
movl (ramdisk_image - start), %esi movl (ramdisk_image - start), %esi

4
include/multiboot.h
View file

@ -27,10 +27,10 @@
#define MULTIBOOT_SEARCH 8192 #define MULTIBOOT_SEARCH 8192
/* The magic field should contain this. */ /* The magic field should contain this. */
#define MULTIBOOT_MAGIC 0x1BADB002 #define MULTIBOOT_HEADER_MAGIC 0x1BADB002
/* This should be in %eax. */ /* This should be in %eax. */
#define MULTIBOOT_MAGIC2 0x2BADB002 #define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002
/* The bits in the required part of flags field we don't support. */ /* The bits in the required part of flags field we don't support. */
#define MULTIBOOT_UNSUPPORTED 0x0000fffc #define MULTIBOOT_UNSUPPORTED 0x0000fffc

2
kern/i386/coreboot/startup.S
View file

@ -66,7 +66,7 @@ multiboot_header:
.long -0x1BADB002 - MULTIBOOT_MEMORY_INFO .long -0x1BADB002 - MULTIBOOT_MEMORY_INFO
codestart: codestart:
cmpl $MULTIBOOT_MAGIC2, %eax cmpl $MULTIBOOT_BOOTLOADER_MAGIC, %eax
jne 0f jne 0f
movl %ebx, EXT_C(startup_multiboot_info) movl %ebx, EXT_C(startup_multiboot_info)
0: 0:

4
loader/i386/multiboot.c
View file

@ -65,7 +65,7 @@ grub_multiboot_boot (void)
{ {
struct grub_relocator32_state state = struct grub_relocator32_state state =
{ {
.eax = MULTIBOOT_MAGIC2, .eax = MULTIBOOT_BOOTLOADER_MAGIC,
.ebx = PTR_TO_UINT32 (mbi_dest), .ebx = PTR_TO_UINT32 (mbi_dest),
.ecx = 0, .ecx = 0,
.edx = 0, .edx = 0,
@ -250,7 +250,7 @@ grub_multiboot (int argc, char *argv[])
((char *) header <= buffer + len - 12) || (header = 0); ((char *) header <= buffer + len - 12) || (header = 0);
header = (struct multiboot_header *) ((char *) header + 4)) header = (struct multiboot_header *) ((char *) header + 4))
{ {
if (header->magic == MULTIBOOT_MAGIC if (header->magic == MULTIBOOT_HEADER_MAGIC
&& !(header->magic + header->flags + header->checksum)) && !(header->magic + header->flags + header->checksum))
break; break;
} }

2
loader/multiboot_loader.c
View file

@ -58,7 +58,7 @@ find_multi_boot1_header (grub_file_t file)
((char *) header <= buffer + len - 12) || (header = 0); ((char *) header <= buffer + len - 12) || (header = 0);
header = (struct multiboot_header *) ((char *) header + 4)) header = (struct multiboot_header *) ((char *) header + 4))
{ {
if (header->magic == MULTIBOOT_MAGIC if (header->magic == MULTIBOOT_HEADER_MAGIC
&& !(header->magic + header->flags + header->checksum)) && !(header->magic + header->flags + header->checksum))
{ {
found_status = 1; found_status = 1;