Sync EDKII BaseTools to BaseTools project r1971

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

diff --git a/BaseTools/Source/C/EfiRom/EfiRom.c b/BaseTools/Source/C/EfiRom/EfiRom.c
index d9c2e7c1c145618e39e0881b7ac4a348375ffca4..4642f441b487e8ccfce6ee84d7c0f8b628a25596 100644 (file)
--- a/BaseTools/Source/C/EfiRom/EfiRom.c
+++ b/BaseTools/Source/C/EfiRom/EfiRom.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-Copyright (c)  1999-2008 Intel Corporation. All rights reserved\r
+Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials are licensed and made available \r
 under the terms and conditions of the BSD License which accompanies this \r
 distribution.  The full text of the license may be found at\r
@@ -88,8 +88,8 @@ Returns:
   // If dumping an image, then do that and quit\r
   //\r
   if (mOptions.DumpOption == 1) {\r
-    for (FList = mOptions.FileList; FList != NULL; FList = FList->Next) {\r
-      if ((Ptr0 = strstr ((CONST CHAR8 *)FList->FileName, DEFAULT_OUTPUT_EXTENSION)) != NULL) {\r
+    if (mOptions.FileList != NULL) {\r
+      if ((Ptr0 = strstr ((CONST CHAR8 *) mOptions.FileList->FileName, DEFAULT_OUTPUT_EXTENSION)) != NULL) {\r
         DumpImage (mOptions.FileList);\r
         goto BailOut;\r
       } else {\r
@@ -163,7 +163,7 @@ Returns:
     }\r
 \r
     if (mOptions.Verbose) {\r
-      VerboseMsg("  Output size = 0x%X\n", Size);\r
+      VerboseMsg("  Output size = 0x%X\n", (unsigned) Size);\r
     }\r
 \r
     if (Status != STATUS_SUCCESS) {\r
@@ -238,7 +238,8 @@ Returns:
   UINT32                    Index;\r
   UINT8                     ByteCheckSum;\r
  \r
-\r
+  PciDs23 = NULL;\r
+  PciDs30 = NULL;\r
   Status = STATUS_SUCCESS;\r
 \r
   //\r
@@ -255,7 +256,7 @@ Returns:
   fseek (InFptr, 0, SEEK_END);\r
   FileSize = ftell (InFptr);\r
   if (mOptions.Verbose) {\r
-    VerboseMsg("  File size   = 0x%X\n", FileSize);\r
+    VerboseMsg("  File size   = 0x%X\n", (unsigned) FileSize);\r
   }\r
 \r
   fseek (InFptr, 0, SEEK_SET);\r
@@ -365,7 +366,7 @@ Returns:
 \r
   Buffer[FileSize - 1] = (UINT8) ((~ByteCheckSum) + 1);\r
   if (mOptions.Verbose) {\r
-    VerboseMsg("  Checksum = %02x\n\n", (UINT32) Buffer[FileSize - 1]);\r
+    VerboseMsg("  Checksum = %02x\n\n", Buffer[FileSize - 1]);\r
   }\r
 \r
   //\r
@@ -495,7 +496,7 @@ Returns:
   }\r
 \r
   if (mOptions.Verbose) {\r
-    VerboseMsg("  File size   = 0x%X\n", FileSize);\r
+    VerboseMsg("  File size   = 0x%X\n", (unsigned) FileSize);\r
   }\r
   //\r
   // Allocate memory for the entire file (in case we have to compress), then\r
@@ -540,7 +541,7 @@ Returns:
     // Now compute the size, then swap buffer pointers.\r
     //\r
     if (mOptions.Verbose) {\r
-      VerboseMsg("  Comp size   = 0x%X\n", CompressedFileSize);\r
+      VerboseMsg("  Comp size   = 0x%X\n", (unsigned) CompressedFileSize);\r
     }\r
 \r
     TotalSize         = CompressedFileSize + HeaderSize;\r
@@ -820,7 +821,7 @@ Returns:
   }\r
 \r
   if (mOptions.Verbose) {\r
-    VerboseMsg("  Got subsystem = 0x%X from image\n", (int) *SubSystem);\r
+    VerboseMsg("  Got subsystem = 0x%X from image\n", *SubSystem);\r
   }\r
 \r
   //\r
@@ -999,7 +1000,7 @@ Returns:
           return 1;\r
         }\r
         if (DebugLevel > 9)  {\r
-          Error (NULL, 0, 2000, "Invalid option value", "Debug Level range is 0-9, currnt input level is %d", Argv[1]);\r
+          Error (NULL, 0, 2000, "Invalid option value", "Debug Level range is 0-9, current input level is %d", Argv[1]);\r
           return 1;\r
         }\r
         if (DebugLevel>=5 && DebugLevel<=9) {\r
@@ -1204,7 +1205,7 @@ Returns:
   //\r
   // Copyright declaration\r
   // \r
-  fprintf (stdout, "Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.\n\n");\r
+  fprintf (stdout, "Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.\n\n");\r
 \r
   //\r
   // Details Option\r
@@ -1301,10 +1302,10 @@ Returns:
     //\r
     // Dump the contents of the header\r
     //\r
-    fprintf (stdout, "Image %d -- Offset 0x%X\n", ImageCount, ImageStart);\r
+    fprintf (stdout, "Image %u -- Offset 0x%X\n", (unsigned) ImageCount, (unsigned) ImageStart);\r
     fprintf (stdout, "  ROM header contents\n");\r
-    fprintf (stdout, "    Signature              0x%04X\n", (UINT32) PciRomHdr.Signature);\r
-    fprintf (stdout, "    PCIR offset            0x%04X\n", (UINT32) PciRomHdr.PcirOffset);\r
+    fprintf (stdout, "    Signature              0x%04X\n", PciRomHdr.Signature);\r
+    fprintf (stdout, "    PCIR offset            0x%04X\n", PciRomHdr.PcirOffset);\r
     //\r
     // Find PCI data structure\r
     //\r
@@ -1349,11 +1350,11 @@ Returns:
     fprintf (\r
       stdout,\r
       "    Class Code             0x%06X\n",\r
-      (UINT32) (PciDs23.ClassCode[0] | (PciDs23.ClassCode[1] << 8) | (PciDs23.ClassCode[2] << 16))\r
+      (unsigned) (PciDs23.ClassCode[0] | (PciDs23.ClassCode[1] << 8) | (PciDs23.ClassCode[2] << 16))\r
       );\r
-    fprintf (stdout, "    Image size             0x%X\n", PciDs23.ImageLength * 512);\r
+    fprintf (stdout, "    Image size             0x%X\n", (unsigned) PciDs23.ImageLength * 512);\r
     fprintf (stdout, "    Code revision:         0x%04X\n", PciDs23.CodeRevision);\r
-    fprintf (stdout, "    Indicator              0x%02X", (UINT32) PciDs23.Indicator);\r
+    fprintf (stdout, "    Indicator              0x%02X", PciDs23.Indicator);\r
     } else {\r
     fprintf (\r
       stdout,\r
@@ -1367,18 +1368,18 @@ Returns:
     fprintf (stdout, "    Device ID               0x%04X\n", PciDs30.DeviceId);\r
     fprintf (stdout, "    Length                  0x%04X\n", PciDs30.Length);\r
     fprintf (stdout, "    Revision                0x%04X\n", PciDs30.Revision);\r
-    fprintf (stdout, "    DeviceListOffset        0x%02X\n", (UINT32) PciDs30.DeviceListOffset);    \r
+    fprintf (stdout, "    DeviceListOffset        0x%02X\n", PciDs30.DeviceListOffset);    \r
     fprintf (\r
       stdout,\r
       "    Class Code              0x%06X\n",\r
-      (UINT32) (PciDs30.ClassCode[0] | (PciDs30.ClassCode[1] << 8) | (PciDs30.ClassCode[2] << 16))\r
+      (unsigned) (PciDs30.ClassCode[0] | (PciDs30.ClassCode[1] << 8) | (PciDs30.ClassCode[2] << 16))\r
       );\r
-    fprintf (stdout, "    Image size              0x%X\n", PciDs30.ImageLength * 512);\r
+    fprintf (stdout, "    Image size              0x%X\n", (unsigned) PciDs30.ImageLength * 512);\r
     fprintf (stdout, "    Code revision:          0x%04X\n", PciDs30.CodeRevision);\r
-    fprintf (stdout, "    MaxRuntimeImageLength   0x%02X\n", (UINT32) PciDs30.MaxRuntimeImageLength);\r
-    fprintf (stdout, "    ConfigUtilityCodeHeaderOffset 0x%02X\n", (UINT32) PciDs30.ConfigUtilityCodeHeaderOffset);\r
-    fprintf (stdout, "    DMTFCLPEntryPointOffset 0x%02X\n", (UINT32) PciDs30.DMTFCLPEntryPointOffset);   \r
-    fprintf (stdout, "    Indicator               0x%02X", (UINT32) PciDs30.Indicator);    \r
+    fprintf (stdout, "    MaxRuntimeImageLength   0x%02X\n", PciDs30.MaxRuntimeImageLength);\r
+    fprintf (stdout, "    ConfigUtilityCodeHeaderOffset 0x%02X\n", PciDs30.ConfigUtilityCodeHeaderOffset);\r
+    fprintf (stdout, "    DMTFCLPEntryPointOffset 0x%02X\n", PciDs30.DMTFCLPEntryPointOffset);   \r
+    fprintf (stdout, "    Indicator               0x%02X", PciDs30.Indicator);    \r
     }\r
     //\r
     // Print the indicator, used to flag the last image\r
@@ -1392,9 +1393,9 @@ Returns:
     // Print the code type. If EFI code, then we can provide more info.\r
     //\r
     if (mOptions.Pci23 == 1) {\r
-      fprintf (stdout, "    Code type              0x%02X", (UINT32) PciDs23.CodeType);\r
+      fprintf (stdout, "    Code type              0x%02X", PciDs23.CodeType);\r
     } else {\r
-      fprintf (stdout, "    Code type               0x%02X", (UINT32) PciDs30.CodeType); \r
+      fprintf (stdout, "    Code type               0x%02X", PciDs30.CodeType); \r
     }\r
     if (PciDs23.CodeType == PCI_CODE_TYPE_EFI_IMAGE || PciDs30.CodeType == PCI_CODE_TYPE_EFI_IMAGE) {\r
       fprintf (stdout, "   (EFI image)\n");\r
@@ -1414,11 +1415,11 @@ Returns:
       //\r
       // Now dump more info\r
       //\r
-      fprintf (stdout, "    EFI Signature          0x%04X\n", EfiRomHdr.EfiSignature);\r
+      fprintf (stdout, "    EFI Signature          0x%04X\n", (unsigned) EfiRomHdr.EfiSignature);\r
       fprintf (\r
         stdout,\r
         "    Compression Type       0x%04X ",\r
-        (UINT32) EfiRomHdr.CompressionType\r
+        EfiRomHdr.CompressionType\r
         );\r
       if (EfiRomHdr.CompressionType == EFI_PCI_EXPANSION_ROM_HEADER_COMPRESSED) {\r
         fprintf (stdout, "(compressed)\n");\r
@@ -1441,8 +1442,8 @@ Returns:
       fprintf (\r
         stdout,\r
         "    EFI image offset       0x%04X (@0x%X)\n",\r
-        (UINT32) EfiRomHdr.EfiImageHeaderOffset,\r
-        (UINT32) (EfiRomHdr.EfiImageHeaderOffset + ImageStart)\r
+        EfiRomHdr.EfiImageHeaderOffset,\r
+        EfiRomHdr.EfiImageHeaderOffset + (unsigned) ImageStart\r
         );\r
 \r
     } else {\r