Author: tkreuzer
Date: Sat Jun 18 19:41:01 2011
New Revision: 52347
URL: http://svn.reactos.org/svn/reactos?rev=52347&view=rev
Log:
[FREELDR]
Fix syntax for ML
Modified:
trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc
trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc
trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc
Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc?rev=52347&r1=52346&r2=52347&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc [iso-8859-1]
(original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc [iso-8859-1]
Sat Jun 18 19:41:01 2011
@@ -49,8 +49,8 @@
PUBLIC start
start:
- // This code is loaded at 0000:8000 so we have to
- // encode a jmp instruction to jump to 0000:8200
+ // This code is loaded at 0000:F800 so we have to
+ // encode a jmp instruction to jump to 0000:FA00
.byte HEX(e9), HEX(fd), HEX(01)
// Now starts the extra boot code that we will store
@@ -217,7 +217,8 @@
ret
-msgLoading: .asciz "Loading FreeLoader...", CR, LF
+msgLoading:
+ .ascii "Loading FreeLoader...", CR, LF, NUL
.org 510 // Pad to 510 bytes
.word HEX(0aa55) // BootSector signature
Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc?rev=52347&r1=52346&r2=52347&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc [iso-8859-1]
(original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc [iso-8859-1] Sat
Jun 18 19:41:01 2011
@@ -2,7 +2,7 @@
PnpBiosGetDeviceNodeCount:
- mov ax, word ptr [BSS_PnpBiosDataSegment]
+ mov ax, word ptr ds:[BSS_PnpBiosDataSegment]
push ax
push cs
@@ -27,16 +27,16 @@
PnpBiosGetDeviceNode:
/* push bios segment */
- mov ax, word ptr [BSS_PnpBiosDataSegment]
+ mov ax, word ptr ds:[BSS_PnpBiosDataSegment]
push ax
/* push control flag */
push 1
/* push pointer to node buffer (segment/offset) */
- mov ax, word ptr [BSS_PnpBiosBufferSegment]
+ mov ax, word ptr ds:[BSS_PnpBiosBufferSegment]
push ax
- mov ax, word ptr [BSS_PnpBiosBufferOffset]
+ mov ax, word ptr ds:[BSS_PnpBiosBufferOffset]
push ax
/* push pointer to node number (segment/offset) */
Modified: trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc?rev=52347&r1=52346&r2=52347&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc [iso-8859-1]
(original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc [iso-8859-1] Sat
Jun 18 19:41:01 2011
@@ -20,11 +20,11 @@
PxeCallApi:
- mov ax, [BSS_PxeBufferSegment]
+ mov ax, word ptr ds:[BSS_PxeBufferSegment]
push ax
- mov ax, [BSS_PxeBufferOffset]
+ mov ax, word ptr ds:[BSS_PxeBufferOffset]
push ax
- mov ax, [BSS_PxeFunction]
+ mov ax, word ptr ds:[BSS_PxeFunction]
push ax
call dword ptr ds:[BSS_PxeEntryPoint]
add esp, 6
