[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2232] 2009-05-22 Pavel Roskin <address@hidden>
From: |
Pavel Roskin |
Subject: |
[2232] 2009-05-22 Pavel Roskin <address@hidden> |
Date: |
Fri, 22 May 2009 19:52:43 +0000 |
Revision: 2232
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2232
Author: proski
Date: 2009-05-22 19:52:43 +0000 (Fri, 22 May 2009)
Log Message:
-----------
2009-05-22 Pavel Roskin <address@hidden>
* 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.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/include/grub/i386/pc/kernel.h
trunk/grub2/kern/i386/pc/startup.S
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-05-21 20:36:52 UTC (rev 2231)
+++ trunk/grub2/ChangeLog 2009-05-22 19:52:43 UTC (rev 2232)
@@ -1,3 +1,15 @@
+2009-05-22 Pavel Roskin <address@hidden>
+
+ * 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 <address@hidden>
* normal/i386: Remove.
Modified: trunk/grub2/include/grub/i386/pc/kernel.h
===================================================================
--- trunk/grub2/include/grub/i386/pc/kernel.h 2009-05-21 20:36:52 UTC (rev
2231)
+++ trunk/grub2/include/grub/i386/pc/kernel.h 2009-05-22 19:52:43 UTC (rev
2232)
@@ -69,14 +69,11 @@
extern char grub_prefix[];
/* 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. */
-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 /* ! KERNEL_MACHINE_HEADER */
Modified: trunk/grub2/kern/i386/pc/startup.S
===================================================================
--- trunk/grub2/kern/i386/pc/startup.S 2009-05-21 20:36:52 UTC (rev 2231)
+++ trunk/grub2/kern/i386/pc/startup.S 2009-05-22 19:52:43 UTC (rev 2232)
@@ -273,30 +273,12 @@
* This is the area for all of the special variables.
*/
- .p2align 2 /* force 4-byte alignment */
-
VARIABLE(grub_boot_drive)
- .long 0
+ .byte 0
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 */
/*
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2232] 2009-05-22 Pavel Roskin <address@hidden>,
Pavel Roskin <=