Revert last patch about "Modal form" opcode support.

[mirror_edk2.git] / BaseTools / Source / C / GenBootSector / GenBootSector.c

diff --git a/BaseTools/Source/C/GenBootSector/GenBootSector.c b/BaseTools/Source/C/GenBootSector/GenBootSector.c
index 47b5c5c67a040e48069f14286dae95659a013beb..4a9a0e1b57d472f3f7dfa7fbcb20766ab8549868 100644 (file)
--- a/BaseTools/Source/C/GenBootSector/GenBootSector.c
+++ b/BaseTools/Source/C/GenBootSector/GenBootSector.c
@@ -1,7 +1,7 @@
 /** @file\r
 \r
-Copyright 2006 - 2008, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2006 - 2010, 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
 http://opensource.org/licenses/bsd-license.php                                            \r
@@ -26,6 +26,9 @@ Abstract:
 #include <string.h>\r
 #include <Common/UefiBaseTypes.h>\r
 \r
+#include "ParseInf.h"\r
+#include "EfiUtilityMsgs.h"\r
+\r
 //\r
 // Utility Name\r
 //\r
@@ -259,9 +262,9 @@ Routine Description:
         } else {\r
           fprintf (\r
             stdout,\r
-            "%c: - DiskNum: %d, Type: %s\n", \r
+            "%c: - DiskNum: %u, Type: %s\n", \r
             DriveInfo.VolumeLetter,\r
-            DriveInfo.DiskNumber, \r
+            (unsigned) DriveInfo.DiskNumber, \r
             DriveInfo.DriveType->Description\r
             );\r
         }\r
@@ -438,11 +441,9 @@ ProcessBsOrMbr (
   BYTE              DiskPartition[0x200] = {0};\r
   BYTE              DiskPartitionBackup[0x200] = {0};\r
   DWORD             BytesReturn;\r
-  DWORD             DbrOffset;\r
   INT               DrvNumOffset;\r
   HANDLE            InputHandle;\r
   HANDLE            OutputHandle;\r
-  BOOL              WriteToDisk;\r
   ERROR_STATUS      Status;\r
   DWORD             InputDbrOffset;\r
   DWORD             OutputDbrOffset;\r
@@ -541,7 +542,7 @@ Returns:
 --*/\r
 {\r
   printf ("%s v%d.%d -Utility to retrieve and update the boot sector or MBR.\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION);\r
-  printf ("Copyright (c) 2009 Intel Corporation. All rights reserved.\n");\r
+  printf ("Copyright (c) 2009 - 2010 Intel Corporation. All rights reserved.\n");\r
 }\r
 \r
 VOID\r
@@ -731,7 +732,7 @@ main (
         return 1;\r
       }\r
       if (LogLevel > 9) {\r
-        Error (NULL, 0, 1003, "Invalid option value", "Debug Level range is 0-9, currnt input level is %d", LogLevel);\r
+        Error (NULL, 0, 1003, "Invalid option value", "Debug Level range is 0-9, currnt input level is %d", (int) LogLevel);\r
         return 1;\r
       }\r
       SetPrintLevel (LogLevel);\r