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

2009-06-16 Pavel Roskin <proski@gnu.org>

Browse source 
* boot/i386/pc/boot.S: Remove root_drive.  Assert offset of
	boot_drive_check by using GRUB_BOOT_MACHINE_DRIVE_CHECK.  Don't
	save %dx, we only need %dl and we never change it.
	* boot/i386/pc/cdboot.S: Don't set the root drive.
	* boot/i386/pc/pxeboot.S: Likewise.
	* include/grub/i386/pc/boot.h: Remove
	GRUB_BOOT_MACHINE_ROOT_DRIVE, adjust
	GRUB_BOOT_MACHINE_DRIVE_CHECK.
	* include/grub/i386/pc/kernel.h: Remove grub_root_drive.
	* kern/i386/pc/init.c (make_install_device): Remove references
	to grub_root_drive.
	* kern/i386/pc/startup.S: Likewise.
	* util/i386/pc/grub-setup.c (setup): Don't set root_drive.
This commit is contained in:
proski 2009-06-15 23:25:38 +00:00
parent 693fe63766
commit 3ef17a2ebf
9 changed files with 27 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/grub/i386/pc/boot.h
View file

@ -34,9 +34,6 @@
/* The offset of BOOT_DRIVE. */
#define GRUB_BOOT_MACHINE_BOOT_DRIVE 0x4c
/* The offset of ROOT_DRIVE. */
#define GRUB_BOOT_MACHINE_ROOT_DRIVE 0x4d
/* The offset of KERNEL_ADDRESS. */
#define GRUB_BOOT_MACHINE_KERNEL_ADDRESS 0x40
@ -47,7 +44,7 @@
#define GRUB_BOOT_MACHINE_KERNEL_SEGMENT 0x42
/* The offset of BOOT_DRIVE_CHECK. */
#define GRUB_BOOT_MACHINE_DRIVE_CHECK 0x4f
#define GRUB_BOOT_MACHINE_DRIVE_CHECK 0x4e
/* The offset of a magic number used by Windows NT. */
#define GRUB_BOOT_MACHINE_WINDOWS_NT_MAGIC 0x1b8

3
include/grub/i386/pc/kernel.h
View file

@ -71,9 +71,6 @@ extern char grub_prefix[];
/* The boot BIOS drive number. */
extern grub_uint8_t EXPORT_VAR(grub_boot_drive);
/* The root BIOS drive number. */
extern grub_uint8_t grub_root_drive;
#endif /* ! ASM_FILE */
#endif /* ! KERNEL_MACHINE_HEADER */