2009-07-15 Pavel Roskin <proski@gnu.org>

	* include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_BPB_END):
	Increase to 0x5a to accommodate FAT32.  Adjust other offsets
	accordingly.
	Original patch by Yves Blusseau <yves.grub-devel@zetam.org>

diff --git a/ChangeLog b/ChangeLog
index 889bbd3caee4e4d956b62725935d01339d4a5ce1..fd9b9e41e9f9fbb59f111abe9d4c2633463dda71 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-07-15  Pavel Roskin  <proski@gnu.org>
 
+       * include/grub/i386/pc/boot.h (GRUB_BOOT_MACHINE_BPB_END):
+       Increase to 0x5a to accommodate FAT32.  Adjust other offsets
+       accordingly.
+       Original patch by Yves Blusseau <yves.grub-devel@zetam.org>
+
        * boot/i386/pc/boot.S (general_error_string): Add DOS newline at
        the end of "Error" to make the message more readable.
 

diff --git a/include/grub/i386/pc/boot.h b/include/grub/i386/pc/boot.h
index a91f55abb5ed23e2a5f7da8ae10430f466af1870..f45fe6da0825d732ab6d955c3a41a5313d9e3b01 100644 (file)
--- a/include/grub/i386/pc/boot.h
+++ b/include/grub/i386/pc/boot.h
@@ -26,16 +26,16 @@
 #define GRUB_BOOT_MACHINE_BPB_START    0x3
 
 /* The offset of the end of BPB (BIOS Parameter Block).  */
-#define GRUB_BOOT_MACHINE_BPB_END      0x3e
+#define GRUB_BOOT_MACHINE_BPB_END      0x5a
 
 /* The offset of KERNEL_SECTOR.  */
-#define GRUB_BOOT_MACHINE_KERNEL_SECTOR        0x44
+#define GRUB_BOOT_MACHINE_KERNEL_SECTOR        0x5c
 
 /* The offset of BOOT_DRIVE.  */
-#define GRUB_BOOT_MACHINE_BOOT_DRIVE   0x4c
+#define GRUB_BOOT_MACHINE_BOOT_DRIVE   0x64
 
 /* The offset of BOOT_DRIVE_CHECK.  */
-#define GRUB_BOOT_MACHINE_DRIVE_CHECK  0x4e
+#define GRUB_BOOT_MACHINE_DRIVE_CHECK  0x66
 
 /* The offset of a magic number used by Windows NT.  */
 #define GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC     0x1b8