enable -q/-v/-d interface for EfiRom, GenVtf and TianoCompress tool and use the commo...

[efi/basetools/.git] / Source / C / EfiRom / EfiRom.c

diff --git a/Source/C/EfiRom/EfiRom.c b/Source/C/EfiRom/EfiRom.c
index 1fe65b7..5044f67 100644 (file)
--- a/Source/C/EfiRom/EfiRom.c
+++ b/Source/C/EfiRom/EfiRom.c
@@ -88,7 +88,7 @@ Returns:
   }\r
   \r
   if (mOptions.Verbose) {\r
-    fprintf (stdout, "%s tool start.\n", UTILITY_NAME);\r
+    VerboseMsg("%s tool start.\n", UTILITY_NAME);\r
     }  \r
   //\r
   // If dumping an image, then do that and quit\r
@@ -153,13 +153,13 @@ Returns:
     Size = 0;\r
     if (FList->FileFlags & FILE_FLAG_EFI) {\r
       if (mOptions.Verbose) {\r
-        fprintf (stdout, "Processing EFI file    %s\n", FList->FileName);\r
+        VerboseMsg("Processing EFI file    %s\n", FList->FileName);\r
       }\r
 \r
       Status = ProcessEfiFile (FptrOut, FList, mOptions.VendId, mOptions.DevId, &Size);\r
     } else if (FList->FileFlags & FILE_FLAG_BINARY) {\r
       if (mOptions.Verbose) {\r
-        fprintf (stdout, "Processing binary file %s\n", FList->FileName);\r
+        VerboseMsg("Processing binary file %s\n", FList->FileName);\r
       }\r
 \r
       Status = ProcessBinFile (FptrOut, FList, &Size);\r
@@ -169,7 +169,7 @@ Returns:
     }\r
 \r
     if (mOptions.Verbose) {\r
-      fprintf (stdout, "  Output size = 0x%X\n", Size);\r
+      VerboseMsg("  Output size = 0x%X\n", Size);\r
     }\r
 \r
     if (Status != STATUS_SUCCESS) {\r
@@ -206,7 +206,7 @@ BailOut:
   }\r
   }\r
   if (mOptions.Verbose) {\r
-    fprintf (stdout, "%s tool done with return code is 0x%x.\n", UTILITY_NAME, GetUtilityStatus ());  \r
+    VerboseMsg("%s tool done with return code is 0x%x.\n", UTILITY_NAME, GetUtilityStatus ());\r
   }\r
 \r
   return GetUtilityStatus (); \r
@@ -265,7 +265,7 @@ Returns:
   fseek (InFptr, 0, SEEK_END);\r
   FileSize = ftell (InFptr);\r
   if (mOptions.Verbose) {\r
-    fprintf (stdout, "  File size   = 0x%X\n", FileSize);\r
+    VerboseMsg("  File size   = 0x%X\n", FileSize);\r
   }\r
 \r
   fseek (InFptr, 0, SEEK_SET);\r
@@ -366,7 +366,9 @@ Returns:
   }\r
 \r
   Buffer[FileSize - 1] = (UINT8) ((~ByteCheckSum) + 1);\r
-  fprintf (stdout, "Checksum = %02x\n", (UINT32) Buffer[FileSize - 1]);\r
+  if (mOptions.Verbose) {\r
+    VerboseMsg("  Checksum = %02x\n\n", (UINT32) Buffer[FileSize - 1]);\r
+  }\r
 \r
   //\r
   // Now copy the input file contents out to the output file\r
@@ -487,7 +489,7 @@ Returns:
 \r
   HeaderSize = sizeof (PCI_DATA_STRUCTURE) + HeaderPadBytes + sizeof (EFI_PCI_EXPANSION_ROM_HEADER);\r
   if (mOptions.Verbose) {\r
-    fprintf (stdout, "  File size   = 0x%X\n", FileSize);\r
+    VerboseMsg("  File size   = 0x%X\n", FileSize);\r
   }\r
   //\r
   // Allocate memory for the entire file (in case we have to compress), then\r
@@ -532,7 +534,7 @@ Returns:
     // Now compute the size, then swap buffer pointers.\r
     //\r
     if (mOptions.Verbose) {\r
-      fprintf (stdout, "  Comp size   = 0x%X\n", CompressedFileSize);\r
+      VerboseMsg("  Comp size   = 0x%X\n", CompressedFileSize);\r
     }\r
 \r
     TotalSize         = CompressedFileSize + HeaderSize;\r
@@ -816,7 +818,7 @@ Returns:
 \r
   *SubSystem = OptionalHdr.Subsystem;\r
   if (mOptions.Verbose) {\r
-    fprintf (stdout, "  Got subsystem = 0x%X from image\n", (int) *SubSystem);\r
+    VerboseMsg("  Got subsystem = 0x%X from image\n", (int) *SubSystem);\r
   }\r
   //\r
   // Good to go\r
@@ -902,7 +904,6 @@ Returns:
   //\r
   // Process until no more arguments\r
   //\r
-  //__asm int 3;\r
   while (Argc > 0) {\r
     if ((Argv[0][0] == '-') || (Argv[0][0] == '/')) {\r
       //\r
@@ -917,7 +918,6 @@ Returns:
         //\r
         // Make sure there's another parameter\r
         //\r
-        //printf("\nvendor id specified!\n");\r
         if (Argc > 1) {\r
           Options->VendId       = (UINT16) strtol (Argv[1], NULL, 16);\r
           Options->VendIdValid  = 1;\r
@@ -998,16 +998,14 @@ Returns:
           return 1;\r
         }\r
         if (DebugLevel>=5 && DebugLevel<=9) {\r
-          DebugMode = TRUE;\r
+          Options->Debug = TRUE;\r
         } else {\r
-          DebugMode = FALSE;\r
+          Options->Debug = FALSE;\r
         }\r
-        Argv++;\r
-      } else if ((stricmp (Argv[0], "-quiet") == 0) || (stricmp (Argv[0], "-q") == 0)) {\r
-        QuietMode = TRUE;\r
-        //Argv++;\r
-        //Argc--;\r
-      } else if ((stricmp (Argv[0], "-dump") == 0) || (stricmp (Argv[0], "-d") == 0)) {\r
+        Argc--;\r
+      } else if ((stricmp (Argv[0], "--quiet") == 0) || (stricmp (Argv[0], "-q") == 0)) {\r
+        Options->Quiet = TRUE;\r
+      } else if ((stricmp (Argv[0], "--dump") == 0) || (stricmp (Argv[0], "-d") == 0)) {\r
         //\r
         // -dump for dumping a ROM image. In this case, say that the device id\r
         // and vendor id are valid so we don't have to specify bogus ones on the\r
@@ -1239,7 +1237,7 @@ Returns:
             Show this help message and exit.\n");\r
   fprintf (stdout, "  -q, --quiet\n\\r
             Disable all messages except FATAL ERRORS.\n");\r
-  fprintf (stdout, "  --debug [#]\n\\r
+  fprintf (stdout, "  --debug [#,0-9]\n\\r
             Enable debug messages at level #.\n");  \r
 }\r
 \r
@@ -1322,17 +1320,20 @@ Returns:
     //\r
     if (mOptions.Pci23 == 1) {\r
     if (fread (&PciDs23, sizeof (PciDs23), 1, InFptr) != 1) {\r
-      Error (NULL, 0, 3001, "Not supported", "Failed to read PCI data structure from file");\r
+      Error (NULL, 0, 3001, "Not supported", "Failed to read PCI data structure from file %s", InFile->FileName);\r
       goto BailOut;\r
     }\r
     } else {\r
     if (fread (&PciDs30, sizeof (PciDs30), 1, InFptr) != 1) {\r
-      Error (NULL, 0, 3001, "Not supported", "Failed to read PCI data structure from file");\r
+      Error (NULL, 0, 3001, "Not supported", "Failed to read PCI data structure from file %s", InFile->FileName);\r
       goto BailOut;\r
     }\r
     }\r
+    if (mOptions.Verbose) {\r
+      VerboseMsg("Read PCI data structure from file %s", InFile->FileName);\r
+    }\r
 \r
-    fprintf (stdout, "  PCI Data Structure\n");\r
+    //fprintf (stdout, "  PCI Data Structure\n");\r
     if (mOptions.Pci23 == 1) {\r
     fprintf (\r
       stdout,\r