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

change boot messages.

Browse source
This commit is contained in:
okuji 2000-09-10 08:46:52 +00:00
parent 4a1f0661d6
commit b5381c0919
3 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2000-09-09 Alessandro Rubini <rubini@morgana.systemy.it>
* stage1/stage1.S (notification_string): Print "GRUB " instead
of "stage1 ".
* stage2/start.S [STAGE1_5] (notification_string): Print
"Loading stage1.5" instead of "stage1.5 ".
[!STAGE1_5] (notification_string): Print "Loading stage2"
instead of "stage2 ".
(notification_step): New label, followed by a string ".".
(notification_done): New label, followed by a string "\r\n".
(copy_buffer): Print NOTIFICATION_STEP after copying the buffer.
(bootit): Print NOTIFICATION_DONE before restoring %dx.
2000-09-09 OKUJI Yoshinori <okuji@gnu.org> 2000-09-09 OKUJI Yoshinori <okuji@gnu.org>
From Alessandro Rubini: From Alessandro Rubini:

2
stage1/stage1.S
View file

@ -397,7 +397,7 @@ general_error:
/* go here when you need to stop the machine hard after an error condition */ /* go here when you need to stop the machine hard after an error condition */
stop: jmp stop stop: jmp stop
notification_string: .string "stage1 " notification_string: .string "GRUB "
geometry_error_string: .string "Geom" geometry_error_string: .string "Geom"
hd_probe_error_string: .string "Hard Disk" hd_probe_error_string: .string "Hard Disk"
read_error_string: .string "Read" read_error_string: .string "Read"

17
stage2/start.S
View file

@ -284,9 +284,9 @@ copy_buffer:
movw %ax, %cx movw %ax, %cx
/* save addressing regs */ /* save addressing regs */
pushw %ds
pushw %si pushw %si
pushw %di pushw %di
pushw %ds
xorw %di, %di /* zero offset of destination addresses */ xorw %di, %di /* zero offset of destination addresses */
xorw %si, %si /* zero offset of source addresses */ xorw %si, %si /* zero offset of source addresses */
@ -298,10 +298,12 @@ copy_buffer:
rep /* sets a repeat */ rep /* sets a repeat */
movsb /* this runs the actual copy */ movsb /* this runs the actual copy */
/* restore addressing regs */ /* restore addressing regs and print a dot with correct DS
(MSG modifies SI, which is saved, and unused AX and BX) */
popw %ds
MSG(notification_step)
popw %di popw %di
popw %si popw %si
popw %ds
/* check if finished with this dataset */ /* check if finished with this dataset */
cmpw $0, 4(%di) cmpw $0, 4(%di)
@ -316,6 +318,8 @@ copy_buffer:
/* END OF MAIN LOOP */ /* END OF MAIN LOOP */
bootit: bootit:
/* print a newline */
MSG(notification_done)
popw %dx /* this makes sure %dl is our "boot" drive */ popw %dx /* this makes sure %dl is our "boot" drive */
#ifdef STAGE1_5 #ifdef STAGE1_5
ljmp $0, $0x2200 ljmp $0, $0x2200
@ -344,10 +348,13 @@ general_error:
stop: jmp stop stop: jmp stop
#ifdef STAGE1_5 #ifdef STAGE1_5
notification_string: .string "stage1.5 " notification_string: .string "Loading stage1.5"
#else #else
notification_string: .string "stage2 " notification_string: .string "Loading stage2"
#endif #endif
notification_step: .string "."
notification_done: .string "\r\n"
geometry_error_string: .string "Geom" geometry_error_string: .string "Geom"
read_error_string: .string "Read" read_error_string: .string "Read"