Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:42:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR]

Browse source 
- "ReactOS Medium" isn't a trademark or anything, no need to capitalize it

svn path=/trunk/; revision=74077
This commit is contained in:
Thomas Faber 2017-03-05 11:24:31 +00:00
parent 504b19f120
commit f59a44447a
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/boot/freeldr/bootsect/isoboot.S
View file

@ -141,7 +141,7 @@ relocated:
.read_mbr: .read_mbr:
// Read the first sector (MBR) from the first hard disk (drive 80h) to 7C00h. // Read the first sector (MBR) from the first hard disk (drive 80h) to 7C00h.
// If we then decide to boot from HDD, we already have it at the right place. // If we then decide to boot from HDD, we already have it at the right place.
// In case of an error (indicated by the Carry Flag), just boot SETUPLDR from our ReactOS Medium. // In case of an error (indicated by the Carry Flag), just boot SETUPLDR from our ReactOS medium.
mov ax, HEX(0201) mov ax, HEX(0201)
mov dx, HEX(0080) mov dx, HEX(0080)
mov cx, HEX(0001) mov cx, HEX(0001)
@ -150,13 +150,13 @@ relocated:
jc .boot_setupldr jc .boot_setupldr
// Verify the signature of the read MBR. // Verify the signature of the read MBR.
// If it's invalid, there is probably no OS installed and we just boot SETUPLDR from our ReactOS Medium. // If it's invalid, there is probably no OS installed and we just boot SETUPLDR from our ReactOS medium.
mov ax, word ptr ds:[HEX(7C00)+510] mov ax, word ptr ds:[HEX(7C00)+510]
cmp ax, HEX(AA55) cmp ax, HEX(AA55)
jne .boot_setupldr jne .boot_setupldr
#ifdef WAIT_FOR_KEY #ifdef WAIT_FOR_KEY
// We could either boot from the ReactOS Medium or from hard disk. Let the user decide! // We could either boot from the ReactOS medium or from hard disk. Let the user decide!
// Display the 'Press key' message. // Display the 'Press key' message.
call crlf_early call crlf_early
mov si, offset presskey_msg mov si, offset presskey_msg
@ -172,7 +172,7 @@ relocated:
add eax, 19 add eax, 19
.poll_again: .poll_again:
// Check for a keypress, boot SETUPLDR from our ReactOS Medium if a key was pressed. // Check for a keypress, boot SETUPLDR from our ReactOS medium if a key was pressed.
call pollchar_and_empty call pollchar_and_empty
jnz .boot_setupldr jnz .boot_setupldr
@ -1071,7 +1071,7 @@ pollchar_and_empty:
/* INITIALIZED VARIABLES *****************************************************/ /* INITIALIZED VARIABLES *****************************************************/
presskey_msg: presskey_msg:
.ascii "Press any key to boot from the ReactOS Medium", NUL .ascii "Press any key to boot from the ReactOS medium", NUL
dot_msg: dot_msg:
.ascii ".", NUL .ascii ".", NUL
isoboot_str: isoboot_str: