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

2009-05-22 Pavel Roskin <proski@gnu.org>

Browse source 
* include/grub/i386/pc/kernel.h (grub_boot_drive): Change type
	to grub_uint8_t.
	(grub_root_drive): Likewise.
	* kern/i386/pc/startup.S (grub_boot_drive): Change size to byte,
	remove alignment.
	(grub_root_drive): Change size to byte.
	(grub_start_addr): Remove.
	(grub_end_addr): Likewise.
	(grub_apm_bios_info): Likewise.
This commit is contained in:
proski 2009-05-22 19:52:43 +00:00
parent b729776bfc
commit 96b1619a75
3 changed files with 16 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2009-05-22 Pavel Roskin <proski@gnu.org>
* include/grub/i386/pc/kernel.h (grub_boot_drive): Change type
to grub_uint8_t.
(grub_root_drive): Likewise.
* kern/i386/pc/startup.S (grub_boot_drive): Change size to byte,
remove alignment.
(grub_root_drive): Change size to byte.
(grub_start_addr): Remove.
(grub_end_addr): Likewise.
(grub_apm_bios_info): Likewise.
2009-05-21 Felix Zielcke <fzielcke@z-51.de> 2009-05-21 Felix Zielcke <fzielcke@z-51.de>
* normal/i386: Remove. * normal/i386: Remove.

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

@ -69,13 +69,10 @@ extern grub_int32_t grub_install_bsd_part;
extern char grub_prefix[]; extern char grub_prefix[];
/* The boot BIOS drive number. */ /* The boot BIOS drive number. */
extern grub_int32_t EXPORT_VAR(grub_boot_drive); extern grub_uint8_t EXPORT_VAR(grub_boot_drive);
/* The root BIOS drive number. */ /* The root BIOS drive number. */
extern grub_int32_t grub_root_drive; extern grub_uint8_t grub_root_drive;
/* The end address of the kernel. */
extern grub_addr_t grub_end_addr;
#endif /* ! ASM_FILE */ #endif /* ! ASM_FILE */

22
kern/i386/pc/startup.S
View file

@ -273,30 +273,12 @@ codestart:
* This is the area for all of the special variables. * This is the area for all of the special variables.
*/ */
.p2align 2 /* force 4-byte alignment */
VARIABLE(grub_boot_drive) VARIABLE(grub_boot_drive)
.long 0 .byte 0
VARIABLE(grub_root_drive) VARIABLE(grub_root_drive)
.long 0 .byte 0
VARIABLE(grub_start_addr)
.long _start
VARIABLE(grub_end_addr)
.long END_SYMBOL
VARIABLE(grub_apm_bios_info)
.word 0 /* version */
.word 0 /* cseg */
.long 0 /* offset */
.word 0 /* cseg_16 */
.word 0 /* dseg_16 */
.word 0 /* cseg_len */
.word 0 /* cseg_16_len */
.word 0 /* dseg_16_len */
.p2align 2 /* force 4-byte alignment */ .p2align 2 /* force 4-byte alignment */
/* /*