DuetPkg BootSector: fix bugs in .S files so that 32-bit and 64-bit DUET can boot...

[mirror_edk2.git] / DuetPkg / BootSector / bs32.asm

diff --git a/DuetPkg/BootSector/bs32.asm b/DuetPkg/BootSector/bs32.asm
index f26668982e8aab11e4a9ecd8e10da1c9f0fdc3db..d23ba071b2ddeed33eefcf8801513d83f2bd488f 100644 (file)
--- a/DuetPkg/BootSector/bs32.asm
+++ b/DuetPkg/BootSector/bs32.asm
@@ -1,6 +1,6 @@
 ;------------------------------------------------------------------------------\r
 ;*\r
-;*   Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>\r
+;*   Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
 ;*   This program and the accompanying materials                          \r
 ;*   are licensed and made available under the terms and conditions of the BSD License         \r
 ;*   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -78,7 +78,7 @@ BootSectorEntryPoint:
 ; ****************************************************************************\r
 ; Start Print\r
 ; ****************************************************************************\r
-  lea  si, cs:[StartString]\r
+  mov  si, offset StartString\r
   call PrintString\r
 \r
 ; ****************************************************************************\r
@@ -206,7 +206,7 @@ PrintString:
   mov  es,ax\r
   mov  ax, 07c0h\r
   mov  ds, ax\r
-  mov  cx, 7\r
+  mov  cx, 6\r
   mov  di, 160\r
   rep  movsw\r
   ret\r
@@ -280,15 +280,15 @@ NotFoundAll:
   jne  FoundEFILDR\r
 BadBootSector:\r
 DiskError:\r
-  lea  si, cs:[ErrorString]\r
+  mov  si, offset ErrorString\r
   call PrintString\r
 Halt:\r
   jmp   Halt\r
 \r
 StartString:\r
-  db 'B', 0ch, 'S', 0ch, 't', 0ch, 'a', 0ch, 'r', 0ch, 't', 0ch, '!', 0ch\r
+  db 'B', 0ch, 'S', 0ch, 't', 0ch, 'a', 0ch, 'r', 0ch, 't', 0ch\r
 ErrorString:\r
-  db 'B', 0ch, 'E', 0ch, 'r', 0ch, 'r', 0ch, 'o', 0ch, 'r', 0ch, '!', 0ch\r
+  db 'B', 0ch, 'E', 0ch, 'r', 0ch, 'r', 0ch, 'o', 0ch, 'r', 0ch\r
 \r
 ; ****************************************************************************\r
 ; LBA Offset for BootSector, need patched by tool for HD boot.\r