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.

diff --git a/ChangeLog b/ChangeLog
index ace5185de18a67d9d02421a002dc10c23d625712..125b8af52bbe983cb700ecb2edaa4d89b54c053c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * include/multiboot.h: Remove `<grub/types.h>'.

diff --git a/boot/i386/pc/lnxboot.S b/boot/i386/pc/lnxboot.S
index c51741d42a7b8dc210075ec3d858a9e6ed595a00..43d170c6e4bb7927499c7b288513aa5df8ac6aab 100644 (file)
--- a/boot/i386/pc/lnxboot.S
+++ b/boot/i386/pc/lnxboot.S
@@ -185,7 +185,7 @@ real_code_2:
        call    LOCAL(move_memory)
 
        /* 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
 
        movl    (ramdisk_image - start), %esi

diff --git a/include/multiboot.h b/include/multiboot.h
index 92e00010cad89ae523e327b27a83ef7fa4237ea2..3d93070bb8df76b02272e74756fe220223f605c5 100644 (file)
--- a/include/multiboot.h
+++ b/include/multiboot.h
@@ -27,10 +27,10 @@
 #define MULTIBOOT_SEARCH                 8192
 
 /* The magic field should contain this.  */
-#define MULTIBOOT_MAGIC                  0x1BADB002
+#define MULTIBOOT_HEADER_MAGIC           0x1BADB002
 
 /* 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.  */
 #define MULTIBOOT_UNSUPPORTED            0x0000fffc

diff --git a/kern/i386/coreboot/startup.S b/kern/i386/coreboot/startup.S
index 3f2dd5f50d4b7cc5329878503f551f49ef48c7ea..e94950aaed4715bd2c70f2eceb45a267d87ed103 100644 (file)
--- a/kern/i386/coreboot/startup.S
+++ b/kern/i386/coreboot/startup.S
@@ -66,7 +66,7 @@ multiboot_header:
        .long   -0x1BADB002 - MULTIBOOT_MEMORY_INFO
 
 codestart:
-       cmpl    $MULTIBOOT_MAGIC2, %eax
+       cmpl    $MULTIBOOT_BOOTLOADER_MAGIC, %eax
        jne 0f
        movl    %ebx, EXT_C(startup_multiboot_info)
 0:

diff --git a/loader/i386/multiboot.c b/loader/i386/multiboot.c
index be824e2f4c790712dfadec446edfb18b06a1c5a9..a78ab60b7ae173f3c7fcef09d94090474b8d9940 100644 (file)
--- a/loader/i386/multiboot.c
+++ b/loader/i386/multiboot.c
@@ -65,7 +65,7 @@ grub_multiboot_boot (void)
 {
   struct grub_relocator32_state state =
     {
-      .eax = MULTIBOOT_MAGIC2,
+      .eax = MULTIBOOT_BOOTLOADER_MAGIC,
       .ebx = PTR_TO_UINT32 (mbi_dest),
       .ecx = 0,
       .edx = 0,
@@ -250,7 +250,7 @@ grub_multiboot (int argc, char *argv[])
        ((char *) header <= buffer + len - 12) || (header = 0);
        header = (struct multiboot_header *) ((char *) header + 4))
     {
-      if (header->magic == MULTIBOOT_MAGIC
+      if (header->magic == MULTIBOOT_HEADER_MAGIC
          && !(header->magic + header->flags + header->checksum))
        break;
     }

diff --git a/loader/multiboot_loader.c b/loader/multiboot_loader.c
index 9078d0622df61dc4663d2a69c3316f022042198d..11f2524cc8cdff26c967ce7954e729235454eee7 100644 (file)
--- a/loader/multiboot_loader.c
+++ b/loader/multiboot_loader.c
@@ -58,7 +58,7 @@ find_multi_boot1_header (grub_file_t file)
       ((char *) header <= buffer + len - 12) || (header = 0);
       header = (struct multiboot_header *) ((char *) header + 4))
     {
-      if (header->magic == MULTIBOOT_MAGIC
+      if (header->magic == MULTIBOOT_HEADER_MAGIC
           && !(header->magic + header->flags + header->checksum))
         {
            found_status = 1;