From 8ea179b79b2accb7aba46e6088eaf4715e25e7bb Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 18 Jun 2011 19:41:01 +0000
Subject: [PATCH] [FREELDR] Fix syntax for ML

svn path=/trunk/; revision=52347
---
 reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc | 7 ++++---
 reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc     | 8 ++++----
 reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc     | 6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc b/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc
index fea9e6c787e..1825fbe96a6 100644
--- a/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc
+++ b/reactos/boot/freeldr/freeldr/arch/realmode/fathelp.inc
@@ -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 @@ IsFat12_Done:
     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
diff --git a/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc b/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc
index 14ca2e93472..19d8f30d073 100644
--- a/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc
+++ b/reactos/boot/freeldr/freeldr/arch/realmode/pnp.inc
@@ -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 @@ PnpBiosGetDeviceNodeCount:
 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) */
diff --git a/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc b/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc
index f254fe5f268..335604857e5 100644
--- a/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc
+++ b/reactos/boot/freeldr/freeldr/arch/realmode/pxe.inc
@@ -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