Added or modified utility version and usage display.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2159 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/CCode/Source/CreateMtFile/CreateMtFile.c b/Tools/CCode/Source/CreateMtFile/CreateMtFile.c
index 7d6d2d95bd8ac93e814c5d510eebe83b8b3f28dc..8bb07293e3707d4bc707743948914d82163df881 100644 (file)
--- a/Tools/CCode/Source/CreateMtFile/CreateMtFile.c
+++ b/Tools/CCode/Source/CreateMtFile/CreateMtFile.c
@@ -46,13 +46,13 @@ ProcessArgs (
 \r
 static\r
 void\r
-CMFUsage (\r
+Usage (\r
   VOID\r
   );\r
 \r
 static\r
 void\r
-CMFVersion (\r
+Version (\r
   VOID\r
   );\r
 \r
@@ -157,30 +157,30 @@ Returns:
   Argc--;\r
   \r
   if (Argc < 1) {\r
-    CMFUsage();\r
+    Usage();\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   \r
   if ((strcmp(Argv[0], "-h") == 0) || (strcmp(Argv[0], "--help") == 0) ||\r
       (strcmp(Argv[0], "-?") == 0) || (strcmp(Argv[0], "/?") == 0)) {\r
-    CMFUsage();\r
+    Usage();\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   \r
   if ((strcmp(Argv[0], "-V") == 0) || (strcmp(Argv[0], "--version") == 0)) {\r
-    CMFVersion();\r
+    Version();\r
     return EFI_INVALID_PARAMETER;\r
   }\r
  \r
   if (Argc < 2) {\r
-    CMFUsage ();\r
+    Usage ();\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   //\r
   // If first arg is dash-option, then print usage.\r
   //\r
   if (Argv[0][0] == '-') {\r
-    CMFUsage ();\r
+    Usage ();\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   //\r
@@ -212,7 +212,7 @@ Returns:
   if ((Argv[0][0] == '0') && ((Argv[0][1] == 'x') || (Argv[0][1] == 'X'))) {\r
     if (sscanf (Argv[0], "%x", &Options->FileSize) != 1) {\r
       printf ("ERROR: Invalid file size '%s'\n", Argv[0]);\r
-      CMFUsage ();\r
+      Usage ();\r
       return EFI_INVALID_PARAMETER;\r
     }\r
     //\r
@@ -221,7 +221,7 @@ Returns:
   } else {\r
     if (sscanf (Argv[0], "%d", &Options->FileSize) != 1) {\r
       printf ("ERROR: Invalid file size '%s'\n", Argv[0]);\r
-      CMFUsage ();\r
+      Usage ();\r
       return EFI_INVALID_PARAMETER;\r
     }\r
   }\r
@@ -237,14 +237,14 @@ Returns:
 \r
 static\r
 void \r
-CMFVersion(\r
+Version(\r
   void\r
   )\r
 /*++\r
 \r
 Routine Description:\r
 \r
-  Print out version information for Strip.\r
+  Print out version information for this utility.\r
 \r
 Arguments:\r
 \r
@@ -265,7 +265,7 @@ Returns:
 //\r
 static\r
 void\r
-CMFUsage (\r
+Usage (\r
   VOID\r
   )\r
 /*++\r
@@ -284,14 +284,14 @@ Returns:
 \r
 --*/\r
 { \r
-  CMFVersion();\r
+  Version();\r
   \r
-  printf ("\n  Usage: %s OutFileName FileSize \n\\r
-      where: \n\\r
-        OutFileName is the name of the output file to generate \n\\r
-        FileSize is the size of the file to create \n\\r
-      Examples: \n\\r
-        %s OutFile.bin 32K \n\\r
-        %s OutFile.bin 0x1000 \n",UTILITY_NAME, UTILITY_NAME, UTILITY_NAME);\r
+  printf ("\nUsage: %s OutFileName FileSize \n\\r
+   where: \n\\r
+      OutFileName is the name of the output file to generate \n\\r
+      FileSize is the size of the file to create \n\\r
+   Examples: \n\\r
+      %s OutFile.bin 32K \n\\r
+      %s OutFile.bin 0x1000 \n",UTILITY_NAME, UTILITY_NAME, UTILITY_NAME);\r
 } \r
 \r

diff --git a/Tools/CCode/Source/EfiCompress/EfiCompressMain.c b/Tools/CCode/Source/EfiCompress/EfiCompressMain.c
index b07f62990d10a6996662ec73e8cea2291f01e9f0..360b7355cb2a87e5d553e21d4f6464ee470d35bd 100644 (file)
--- a/Tools/CCode/Source/EfiCompress/EfiCompressMain.c
+++ b/Tools/CCode/Source/EfiCompress/EfiCompressMain.c
@@ -34,7 +34,7 @@ Abstract:
 #define UTILITY_MINOR_VERSION 1\r
 \r
 void \r
-ECVersion(\r
+Version(\r
   void\r
   )\r
 /*++\r
@@ -58,7 +58,7 @@ Returns:
 }\r
 \r
 void \r
-ECUsage(\r
+Usage(\r
   void\r
   )\r
 /*++\r
@@ -77,8 +77,8 @@ Returns:
   \r
 --*/ \r
 {\r
-  ECVersion();\r
-  printf ("\n  Usage: %s Inputfile Outputfile\n", UTILITY_NAME);\r
+  Version();\r
+  printf ("\nUsage: %s Inputfile Outputfile\n", UTILITY_NAME);\r
 }\r
 \r
 \r
@@ -122,23 +122,23 @@ Returns:
   infile                = outfile = NULL;\r
 \r
   if (argc < 1) {\r
-    ECUsage();\r
+    Usage();\r
     goto Done;\r
   }\r
   \r
   if ((strcmp(argv[1], "-h") == 0) || (strcmp(argv[1], "--help") == 0) ||\r
       (strcmp(argv[1], "-?") == 0) || (strcmp(argv[1], "/?") == 0)) {\r
-    ECUsage();\r
+    Usage();\r
     goto Done;\r
   }\r
   \r
   if ((strcmp(argv[1], "-V") == 0) || (strcmp(argv[1], "--version") == 0)) {\r
-    ECVersion();\r
+    Version();\r
     goto Done;\r
   }\r
   \r
   if (argc != 3) {\r
-    ECUsage();\r
+    Usage();\r
     goto Done;\r
   }\r
 \r

diff --git a/Tools/CCode/Source/EfiRom/EfiRom.c b/Tools/CCode/Source/EfiRom/EfiRom.c
index 5aca23fe80e986efd5dff80923ca045010f9ab42..4041c5078daeed41b8197e195a5fe594795abd07 100644 (file)
--- a/Tools/CCode/Source/EfiRom/EfiRom.c
+++ b/Tools/CCode/Source/EfiRom/EfiRom.c
@@ -37,7 +37,9 @@ Abstract:
 //\r
 // Version of this utility\r
 //\r
-#define UTILITY_VERSION "v2.5"\r
+#define UTILITY_NAME "EfiRom"\r
+#define UTILITY_MAJOR_VERSION 2\r
+#define UTILITY_MINOR_VERSION 5\r
 \r
 //\r
 // Define some status return values\r
@@ -132,6 +134,12 @@ static STRING_LOOKUP  mSubsystemTypes[] = {
 //\r
 //  Function prototypes\r
 //\r
+static\r
+void\r
+Version (\r
+  VOID\r
+  );\r
+\r
 static\r
 void\r
 Usage (\r
@@ -978,6 +986,18 @@ Returns:
     Usage ();\r
     return STATUS_ERROR;\r
   }\r
+  \r
+  if ((strcmp(Argv[0], "-h") == 0) || (strcmp(Argv[0], "--help") == 0) ||\r
+      (strcmp(Argv[0], "-?") == 0) || (strcmp(Argv[0], "/?") == 0)) {\r
+    Usage();\r
+    return STATUS_ERROR;\r
+  }\r
+  \r
+  if ((strcmp(Argv[0], "-V") == 0) || (strcmp(Argv[0], "--version") == 0)) {\r
+    Version();\r
+    return STATUS_ERROR;\r
+  }\r
+ \r
   //\r
   // Process until no more arguments\r
   //\r
@@ -1224,6 +1244,30 @@ Returns:
   return 0;\r
 }\r
 \r
+static\r
+void\r
+Version (\r
+  VOID\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+  \r
+  Print version information for this utility.\r
+\r
+Arguments:\r
+\r
+  None.\r
+\r
+Returns:\r
+\r
+  Nothing.\r
+--*/\r
+{\r
+  printf ("%s v%d.%d -EDK utility to create an option ROM image from a list of input files\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION);\r
+  printf ("Copyright (c) 1999-2006 Intel Corporation. All rights reserved.\n");\r
+}\r
+   \r
 static\r
 void\r
 Usage (\r
@@ -1247,12 +1291,9 @@ Returns:
 {\r
   int               Index;\r
   static const char *Msg[] = {\r
-    "EfiRom "UTILITY_VERSION " - Intel EFI Make Option ROM utility",\r
-    "  Copyright (C), 1999-2002 Intel Coproration\n",\r
-    "  Create an option ROM image from a list of input files",\r
-    "  Usage: efirom {-p} [-v VendorId] [-d DeviceId] {-o OutFileName} ",\r
+    "\nUsage: efirom {-p} [-v VendorId] [-d DeviceId] {-o OutFileName} ",\r
     "                [-e|-b] [FileName(s)]",\r
-    "    where:",\r
+    "   where:",\r
     "      VendorId       - required hex PCI Vendor ID for the device",\r
     "      DeviceId       - required hex PCI Device ID for the device",\r
     "      OutFileName    - optional output file name. Default is the first input",\r
@@ -1270,12 +1311,15 @@ Returns:
     "      -rev Revision  - to use hex Revision in the PCI data structure header for",\r
     "                       the following FileName",\r
     "      -dump          - to dump the headers of an existing option ROM image",\r
+    "      -h,--help,-?,/? - to display help messages",\r
+    "      -V,--version   - to display version information",\r
     "",\r
     "Example usage: EfiRom -v 0xABCD -d 0x1234 -b File1.bin File2.bin -e File1.efi File2.efi ",\r
     "",\r
     NULL\r
   };\r
 \r
+  Version();\r
   for (Index = 0; Msg[Index] != NULL; Index++) {\r
     fprintf (stdout, "%s\n", Msg[Index]);\r
   }\r

diff --git a/Tools/CCode/Source/FlashMap/FlashMap.c b/Tools/CCode/Source/FlashMap/FlashMap.c
index 88f5003d2d1571275025c2184b68c0305ef54ec0..41f6de40253eef4210426720de5f4319baf81e19 100644 (file)
--- a/Tools/CCode/Source/FlashMap/FlashMap.c
+++ b/Tools/CCode/Source/FlashMap/FlashMap.c
@@ -32,7 +32,13 @@ Abstract:
 #include "FlashDefFile.h"\r
 #include "Symbols.h"\r
 \r
-#define UTILITY_NAME  "FlashMap"\r
+//\r
+// Version of this utility\r
+//\r
+#define UTILITY_NAME "FlashMap"\r
+#define UTILITY_MAJOR_VERSION 1\r
+#define UTILITY_MINOR_VERSION 0\r
+\r
 \r
 typedef struct _STRING_LIST {\r
   struct _STRING_LIST *Next;\r
@@ -81,6 +87,12 @@ MergeMicrocodeFiles (
   char            PadByteValue\r
   );\r
 \r
+static\r
+void\r
+Version (\r
+  VOID\r
+  );\r
+\r
 static\r
 void\r
 Usage (\r
@@ -346,6 +358,18 @@ Returns:
     Usage ();\r
     return STATUS_ERROR;\r
   }\r
+  \r
+  if ((strcmp(argv[0], "-h") == 0) || (strcmp(argv[0], "--help") == 0) ||\r
+      (strcmp(argv[0], "-?") == 0) || (strcmp(argv[0], "/?") == 0)) {\r
+    Usage();\r
+    return STATUS_ERROR;\r
+  }\r
+  \r
+  if ((strcmp(argv[0], "-V") == 0) || (strcmp(argv[0], "--version") == 0)) {\r
+    Version();\r
+    return STATUS_ERROR;\r
+  }\r
+ \r
   //\r
   // Clear out our globals, then start walking the arguments\r
   //\r
@@ -695,6 +719,30 @@ Returns:
   return STATUS_SUCCESS;\r
 }\r
 \r
+static\r
+void\r
+Version (\r
+  VOID\r
+  )\r
+/*++\r
+\r
+Routine Description:\r
+  \r
+  Print version information for this utility.\r
+\r
+Arguments:\r
+\r
+  None.\r
+\r
+Returns:\r
+\r
+  Nothing.\r
+--*/\r
+{\r
+  printf ("%s v%d.%d -EDK Utility for flash management for EFI build environment.\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION);\r
+  printf ("Copyright (c) 1999-2006 Intel Corporation. All rights reserved.\n");\r
+}\r
+ \r
 static\r
 void\r
 Usage (\r
@@ -715,12 +763,14 @@ Returns:
 {\r
   int   i;\r
   char  *Msg[] = {\r
-    "Usage: FlashTool -fdf FlashDefFile -flashdevice FlashDevice",\r
+    "\nUsage: FlashTool -fdf FlashDefFile -flashdevice FlashDevice",\r
     "                 -flashdeviceimage FlashDeviceImage -mci MCIFile -mco MCOFile",\r
     "                 -discover FDImage -dsc DscFile -asmincfile AsmIncFile",\r
     "                 -imageOut ImageOutFile -hfile HFile -strsub InStrFile OutStrFile",\r
     "                 -baseaddr BaseAddr -align Alignment -padvalue PadValue",\r
     "                 -mcmerge MCIFile(s)",\r
+    "                 -h,--help,-?,/? - to display help messages",\r
+    "                 -V,--version   - to display version information",\r
     "  where",\r
     "    FlashDefFile     - input Flash Definition File",\r
     "    FlashDevice      - flash device to use (from flash definition file)",\r
@@ -737,9 +787,10 @@ Returns:
     "    Alignment        - alignment to use when merging microcode binaries",\r
     "    PadValue         - byte value to use as pad value when aligning microcode binaries",\r
     "    MCIFile(s)       - one or more microcode binary files to merge/concatenate",\r
-    "",\r
     NULL\r
   };\r
+  \r
+  Version();\r
   for (i = 0; Msg[i] != NULL; i++) {\r
     fprintf (stdout, "%s\n", Msg[i]);\r
   }\r

diff --git a/Tools/CCode/Source/FwImage/fwimage.c b/Tools/CCode/Source/FwImage/fwimage.c
index 92bfd16a6fd2dd5a5bce069c9ff79f183831d1af..0f231488a3482ddffeaa68200ae4dc96840a5297 100644 (file)
--- a/Tools/CCode/Source/FwImage/fwimage.c
+++ b/Tools/CCode/Source/FwImage/fwimage.c
@@ -35,7 +35,12 @@ Abstract:
 #include "CommonLib.h"\r
 #include "EfiUtilityMsgs.c"\r
 \r
-#define UTILITY_NAME  "FwImage"\r
+//\r
+// Version of this utility\r
+//\r
+#define UTILITY_NAME "FwImage"\r
+#define UTILITY_MAJOR_VERSION 1\r
+#define UTILITY_MINOR_VERSION 0\r
 \r
 #ifdef __GNUC__\r
 typedef unsigned long ULONG;\r
@@ -44,12 +49,27 @@ typedef unsigned char *PUCHAR;
 typedef unsigned short USHORT;\r
 #endif\r
 \r
+static\r
+void\r
+Version (\r
+  VOID\r
+  )\r
+{\r
+  printf ("%s v%d.%d -EDK Utility for Converting a pe32+ image to an FW image type.\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION);\r
+  printf ("Copyright (c) 1999-2006 Intel Corporation. All rights reserved.\n");\r
+}\r
+\r
+\r
 VOID\r
 Usage (\r
   VOID\r
   )\r
 {\r
-  printf ("Usage: " UTILITY_NAME "  {-t time-date} [BASE|SEC|PEI_CORE|PEIM|DXE_CORE|DXE_DRIVER|DXE_RUNTIME_DRIVER|DXE_SAL_DRIVER|DXE_SMM_DRIVER|TOOL|UEFI_DRIVER|UEFI_APPLICATION|USER_DEFINED] peimage [outimage]");\r
+  Version();\r
+  printf ("\nUsage: " UTILITY_NAME "  {-t time-date} {-h|--help|-?|/?|-V|--version} \n\\r
+         [BASE|SEC|PEI_CORE|PEIM|DXE_CORE|DXE_DRIVER|DXE_RUNTIME_DRIVER|\n\\r
+         DXE_SAL_DRIVER|DXE_SMM_DRIVER|TOOL|UEFI_DRIVER|UEFI_APPLICATION|\n\\r
+         USER_DEFINED] peimage [outimage]");\r
 }\r
 \r
 static\r
@@ -185,6 +205,22 @@ Returns:
   TimeStamp         = 0;\r
   TimeStampPresent  = FALSE;\r
 \r
+  if (argc < 1) {\r
+    Usage();\r
+    return STATUS_ERROR;\r
+  }\r
+  \r
+  if ((strcmp(argv[1], "-h") == 0) || (strcmp(argv[1], "--help") == 0) ||\r
+      (strcmp(argv[1], "-?") == 0) || (strcmp(argv[1], "/?") == 0)) {\r
+    Usage();\r
+    return STATUS_ERROR;\r
+  }\r
+  \r
+  if ((strcmp(argv[1], "-V") == 0) || (strcmp(argv[1], "--version") == 0)) {\r
+    Version();\r
+    return STATUS_ERROR;\r
+  }\r
+ \r
   //\r
   // Look for -t time-date option first. If the time is "0", then\r
   // skip it.\r

diff --git a/Tools/CCode/Source/GenAcpiTable/GenAcpiTable.c b/Tools/CCode/Source/GenAcpiTable/GenAcpiTable.c
index f1efa3c302843363d4a1fc234a4764421cd3591b..457ac65fef0fa7403d1767fb2d8d59014ef2625a 100644 (file)
--- a/Tools/CCode/Source/GenAcpiTable/GenAcpiTable.c
+++ b/Tools/CCode/Source/GenAcpiTable/GenAcpiTable.c
@@ -32,8 +32,9 @@ Abstract:
 //\r
 // Version of this utility\r
 //\r
-#define UTILITY_NAME    "GenAcpiTable"\r
-#define UTILITY_VERSION "v0.11"\r
+#define UTILITY_NAME  "GenAcpiTable"\r
+#define UTILITY_MAJOR_VERSION 0\r
+#define UTILITY_MINOR_VERSION 11\r
 \r
 //\r
 // Define the max length of a filename\r
@@ -81,6 +82,12 @@ static STRING_LOOKUP  mSubsystemTypes[] = {
 //\r
 //  Function prototypes\r
 //\r
+static\r
+void\r
+Version (\r
+  VOID\r
+  );\r
+\r
 static\r
 void\r
 Usage (\r
@@ -489,6 +496,22 @@ Returns:
   Argc--;\r
   Argv++;\r
 \r
+  if (Argc < 1) {\r
+    Usage();\r
+    return STATUS_ERROR;\r
+  }\r
+  \r
+  if ((strcmp(Argv[0], "-h") == 0) || (strcmp(Argv[0], "--help") == 0) ||\r
+      (strcmp(Argv[0], "-?") == 0) || (strcmp(Argv[0], "/?") == 0)) {\r
+    Usage();\r
+    return STATUS_ERROR;\r
+  }\r
+  \r
+  if ((strcmp(Argv[0], "-V") == 0) || (strcmp(Argv[0], "--version") == 0)) {\r
+    Version();\r
+    return STATUS_ERROR;\r
+  }\r
+\r
   if (Argc != 2) {\r
     Usage ();\r
     return STATUS_ERROR;\r
@@ -506,6 +529,17 @@ Returns:
   return STATUS_SUCCESS;\r
 }\r
 \r
+static\r
+void\r
+Version (\r
+  VOID\r
+  )\r
+{\r
+  printf ("%s v%d.%d -EDK Utility for generating ACPI Table image from an EFI PE32 image.\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION);\r
+  printf ("Copyright (c) 1999-2006 Intel Corporation. All rights reserved.\n");\r
+}\r
+\r
+\r
 static\r
 void\r
 Usage (\r
@@ -529,15 +563,14 @@ Returns:
 {\r
   int               Index;\r
   static const char *Msg[] = {\r
-    UTILITY_NAME " version "UTILITY_VERSION " - Generate ACPI Table image utility",\r
-    "  Generate an ACPI Table image from an EFI PE32 image",\r
-    "  Usage: "UTILITY_NAME " InFileName OutFileName",\r
-    "    where:",\r
-    "      InFileName     - name of the input PE32 file",\r
-    "      OutFileName    - to write output to OutFileName rather than InFileName"DEFAULT_OUTPUT_EXTENSION,\r
-    "",\r
+    "\nUsage: "UTILITY_NAME " {-h|--help|-?|/?|-V|--version} InFileName OutFileName",\r
+    "  where:",\r
+    "    InFileName  - name of the input PE32 file",\r
+    "    OutFileName - to write output to OutFileName rather than InFileName"DEFAULT_OUTPUT_EXTENSION,\r
     NULL\r
   };\r
+  \r
+  Version();\r
   for (Index = 0; Msg[Index] != NULL; Index++) {\r
     fprintf (stdout, "%s\n", Msg[Index]);\r
   }\r

diff --git a/Tools/CCode/Source/GenBsfFixup/GenBsfFixup.c b/Tools/CCode/Source/GenBsfFixup/GenBsfFixup.c
index 462f97fa83d63c318d77d6662480d054b2f40153..1cc1e83389e13203276b1b209d8a9e4bed004aa0 100644 (file)
--- a/Tools/CCode/Source/GenBsfFixup/GenBsfFixup.c
+++ b/Tools/CCode/Source/GenBsfFixup/GenBsfFixup.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c)  1999 - 2002 Intel Corporation. All rights reserved\r
+Copyright (c)  1999 - 2006 Intel Corporation. All rights reserved\r
 This software and associated documentation (if any) is furnished\r
 under a license and may only be used or copied in accordance\r
 with the terms of the license. Except as permitted by such\r
@@ -42,7 +42,10 @@ Abstract:
 //           A lot of the file-header stuff has been ported, but\r
 //           not the section information.\r
 //\r
-#define TOOLVERSION "0.1"\r
+\r
+#define UTILITY_NAME "GenBsfFixup"\r
+#define UTILITY_MAJOR_VERSION 0\r
+#define UTILITY_MINOR_VERSION 1\r
 \r
 UINT32  gFixup;\r
 \r
@@ -78,6 +81,26 @@ Returns:
   return OccupiedSize;\r
 }\r
 \r
+static\r
+void\r
+Version (\r
+  VOID\r
+  )\r
+{\r
+  printf ("%s v%d.%d -EDK Utility to Fixup the SEC component for IA32.\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION);\r
+  printf ("Copyright (c) 1999-2006 Intel Corporation. All rights reserved.\n");\r
+}\r
+\r
+\r
+VOID\r
+Usage (\r
+  VOID\r
+  )\r
+{\r
+  Version();\r
+  printf ("\nUsage: " UTILITY_NAME " FvVolumeImageFile AddressOfFvInMemory OffsetOfFixup OutputFileName \n");\r
+}\r
+\r
 int\r
 ReadHeader (\r
   FILE    *In,\r
@@ -370,14 +393,25 @@ Returns:
 \r
   Index   = 0;\r
   Invert  = 0;\r
-  printf (\r
-    "GenBsfFixup EFI 2.0.  Version %s, %s\n""Copyright (c) 2000-2001, Intel Corporation\n\n",\r
-    TOOLVERSION,\r
-    __DATE__\r
-    );\r
-\r
+ \r
+  if (argc < 1) {\r
+    Usage();\r
+    return -1;\r
+  }\r
+  \r
+  if ((strcmp(argv[1], "-h") == 0) || (strcmp(argv[1], "--help") == 0) ||\r
+      (strcmp(argv[1], "-?") == 0) || (strcmp(argv[1], "/?") == 0)) {\r
+    Usage();\r
+    return -1;\r
+  }\r
+  \r
+  if ((strcmp(argv[1], "-V") == 0) || (strcmp(argv[1], "--version") == 0)) {\r
+    Version();\r
+    return -1;\r
+  }\r
+ \r
   if (argc != 5) {\r
-    printf ("Usage:\n""  GenBsfFixup FvVolumeImageFile AddressOfFvInMemory OffsetOfFixup OutputFileName\n");\r
+    Usage();\r
     return -1;\r
   }\r
 \r

diff --git a/Tools/CCode/Source/GenBsfImage/GenBsfImage.c b/Tools/CCode/Source/GenBsfImage/GenBsfImage.c
index 494f3495c638e954e102269634ae4f75646a8620..1c9dff92584696b727074384c367a73be22a6a4c 100644 (file)
--- a/Tools/CCode/Source/GenBsfImage/GenBsfImage.c
+++ b/Tools/CCode/Source/GenBsfImage/GenBsfImage.c
@@ -2357,7 +2357,7 @@ Returns:
 }\r
 \r
 VOID\r
-PrintUtilityInfo (\r
+Version (\r
   VOID\r
   )\r
 /*++\r
@@ -2377,16 +2377,15 @@ Returns:
 --*/\r
 {\r
   printf (\r
-    "%s, EFI 2.0 BootStrap File Generation Utility. Version %i.%i, %s.\n\n",\r
+    "%s, EFI 2.0 BootStrap File Generation Utility. Version %i.%i.\n",\r
     UTILITY_NAME,\r
     UTILITY_MAJOR_VERSION,\r
-    UTILITY_MINOR_VERSION,\r
-    UTILITY_DATE\r
+    UTILITY_MINOR_VERSION\r
     );\r
 }\r
 \r
 VOID\r
-PrintUsage (\r
+Usage (\r
   VOID\r
   )\r
 /*++\r
@@ -2405,13 +2404,16 @@ Returns:
 \r
 --*/\r
 {\r
+  Version();\r
+  \r
   printf (\r
-    "Usage: %s -B BaseAddress -S FwVolumeSize\n",\r
+    "\nUsage: %s -B BaseAddress -S FwVolumeSize\n",\r
     UTILITY_NAME\r
     );\r
   printf ("  Where:\n");\r
-  printf ("\tBaseAddress is the starting address of Firmware Volume where\n\tBoot Strapped Image will reside.\n\n");\r
-  printf ("\tFwVolumeSize is the size of Firmware Volume.\n\n");\r
+  printf ("     BaseAddress is the starting address of Firmware Volume where Boot\n");\r
+  printf ("              Strapped Image will reside.\n");\r
+  printf ("     FwVolumeSize is the size of Firmware Volume.\n");\r
 }\r
 \r
 EFI_STATUS\r
@@ -2454,11 +2456,6 @@ Returns:
   EFI_STATUS  Status;\r
   BOOLEAN     IsIA32;\r
 \r
-  //\r
-  // Display utility information\r
-  //\r
-  PrintUtilityInfo ();\r
-\r
   //\r
   // Verify the correct number of IA32 arguments\r
   //\r
@@ -2486,7 +2483,7 @@ Returns:
       // Make sure argument pair begin with - or /\r
       //\r
       if (argv[Index][0] != '-' && argv[Index][0] != '/') {\r
-        PrintUsage ();\r
+        Usage ();\r
         printf ("ERROR: Argument pair must begin with \"-\" or \"/\"\n");\r
         return 1;\r
       }\r
@@ -2495,7 +2492,7 @@ Returns:
       // Make sure argument specifier is only one letter\r
       //\r
       if (argv[Index][2] != 0) {\r
-        PrintUsage ();\r
+        Usage ();\r
         printf ("ERROR: Unrecognized argument \"%s\".\n", argv[Index]);\r
         return 1;\r
       }\r
@@ -2515,7 +2512,7 @@ Returns:
         break;\r
 \r
       default:\r
-        PrintUsage ();\r
+        Usage ();\r
         printf ("Unrecognized IA32 argument \"%s\".\n", argv[Index]);\r
         IsIA32 = FALSE;\r
         break;\r
@@ -2562,8 +2559,24 @@ Returns:
   //\r
   // Verify the correct number of arguments\r
   //\r
+  if (argc < 1) {\r
+    Usage();\r
+    return -1;\r
+  }\r
+  \r
+  if ((strcmp(argv[1], "-h") == 0) || (strcmp(argv[1], "--help") == 0) ||\r
+      (strcmp(argv[1], "-?") == 0) || (strcmp(argv[1], "/?") == 0)) {\r
+    Usage();\r
+    return -1;\r
+  }\r
+  \r
+  if ((strcmp(argv[1], "-V") == 0) || (strcmp(argv[1], "--version") == 0)) {\r
+    Version();\r
+    return -1;\r
+  }\r
+ \r
   if (argc != ONE_BSF_ARGS && argc != TWO_BSF_ARGS) {\r
-    PrintUsage ();\r
+    Usage ();\r
     return 1;\r
   }\r
 \r
@@ -2586,7 +2599,7 @@ Returns:
     // Make sure argument pair begin with - or /\r
     //\r
     if (argv[Index][0] != '-' && argv[Index][0] != '/') {\r
-      PrintUsage ();\r
+      Usage ();\r
       printf ("ERROR: Argument pair must begin with \"-\" or \"/\"\n");\r
       return 1;\r
     }\r
@@ -2595,7 +2608,7 @@ Returns:
     // Make sure argument specifier is only one letter\r
     //\r
     if (argv[Index][2] != 0) {\r
-      PrintUsage ();\r
+      Usage ();\r
       printf ("ERROR: Unrecognized argument \"%s\".\n", argv[Index]);\r
       return 1;\r
     }\r
@@ -2636,7 +2649,7 @@ Returns:
       break;\r
 \r
     default:\r
-      PrintUsage ();\r
+      Usage ();\r
       printf ("ERROR: Unrecognized argument \"%s\".\n", argv[Index]);\r
       return 1;\r
       break;\r

diff --git a/Tools/CCode/Source/GenBsfImage/GenBsfImage.h b/Tools/CCode/Source/GenBsfImage/GenBsfImage.h
index 63db1218d56de86a7af5ab03682d9db62c12d59a..4b6e6ea7b5d45af20d4cb606b25ff4826b0479e8 100644 (file)
--- a/Tools/CCode/Source/GenBsfImage/GenBsfImage.h
+++ b/Tools/CCode/Source/GenBsfImage/GenBsfImage.h
@@ -128,7 +128,7 @@ Abstract:
 // Utility version information\r
 //\r
 #define UTILITY_MAJOR_VERSION   0\r
-#define UTILITY_MINOR_VERSION   0\r
+#define UTILITY_MINOR_VERSION   1\r
 #define UTILITY_DATE            __DATE__\r
 \r
 //\r

diff --git a/Tools/CCode/Source/GenDepex/GenDepex.c b/Tools/CCode/Source/GenDepex/GenDepex.c
index b010102e260c99b3735d7bf74157e3e5f2b3bf34..e8481b518b5616e8b03f0cac15789569dab684d1 100644 (file)
--- a/Tools/CCode/Source/GenDepex/GenDepex.c
+++ b/Tools/CCode/Source/GenDepex/GenDepex.c
@@ -86,7 +86,7 @@ ParseDepex (
   );\r
 \r
 VOID\r
-GDVersion (\r
+Version (\r
   VOID\r
   )\r
 /*++\r
@@ -115,7 +115,7 @@ Returns:
 }\r
 \r
 VOID\r
-GDUsage (\r
+Usage (\r
   VOID\r
   )\r
 /*++\r
@@ -134,9 +134,9 @@ Returns:
 \r
 --*/\r
 {\r
-  GDVersion();\r
+  Version();\r
   printf (\r
-    "\n  Usage: %s -I InputFile -O OutputFile [-P <Optional Boundary for padding up>] \n",\r
+    "\nUsage: %s -I InputFile -O OutputFile [-P <Optional Boundary for padding up>] \n",\r
     UTILITY_NAME\r
     );\r
   printf ("  Where:\n");\r
@@ -857,24 +857,24 @@ Returns:
   Pad_Flag    = FALSE;\r
 \r
   if (argc < 1) {\r
-    GDUsage();\r
+    Usage();\r
     return -1;\r
   }\r
   \r
   if ((strcmp(argv[1], "-h") == 0) || (strcmp(argv[1], "--help") == 0) ||\r
       (strcmp(argv[1], "-?") == 0) || (strcmp(argv[1], "/?") == 0)) {\r
-    GDUsage();\r
+    Usage();\r
     return 0;\r
   }\r
   \r
   if ((strcmp(argv[1], "-V") == 0) || (strcmp(argv[1], "--version") == 0)) {\r
-    GDVersion();\r
+    Version();\r
     return 0;\r
   }\r
   \r
   if (argc < 5) {\r
     printf ("Not enough arguments\n");\r
-    GDUsage();\r
+    Usage();\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -920,13 +920,13 @@ Returns:
 \r
   if (InFile == NULL) {\r
     printf ("Can not open <INFILE> for reading.\n");\r
-    GDUsage();\r
+    Usage();\r
     return EFI_ABORTED;\r
   }\r
 \r
   if (OutFile == NULL) {\r
     printf ("Can not open <OUTFILE> for writting.\n");\r
-    GDUsage();\r
+    Usage();\r
     return EFI_ABORTED;\r
   }\r
 \r

diff --git a/Tools/CCode/Source/ModifyInf/ModifyInf.c b/Tools/CCode/Source/ModifyInf/ModifyInf.c
index 5e3d17ddf431d6af19c5a3d92538f5b5fa392570..1b1a9e29a16cf869bc381b317db10c42e5f7aa95 100755 (executable)
--- a/Tools/CCode/Source/ModifyInf/ModifyInf.c
+++ b/Tools/CCode/Source/ModifyInf/ModifyInf.c
@@ -271,7 +271,7 @@ Returns:
 }\r
 \r
 void \r
-MIUsage(\r
+Usage(\r
   void\r
   )\r
 /*++\r
@@ -291,7 +291,7 @@ Returns:
 --*/ \r
 {\r
   MIVersion();\r
-  printf ("\n Usage: %s InputFile OutputFile Pattern_String [Pattern_String ¡­]\n\\r
+  printf ("\nUsage: %s InputFile OutputFile Pattern_String [Pattern_String ¡­]\n\\r
    Where: \n\\r
      Pattern_String is of the format (note that the section name must be \n\\r
      enclosed within square brackets):\n\\r
@@ -334,13 +334,13 @@ Returns:
   FILE  *fpout;\r
 \r
   if (argc < 1) {\r
-    MIUsage();\r
+    Usage();\r
     return -1;\r
   }\r
   \r
   if ((strcmp(argv[1], "-h") == 0) || (strcmp(argv[1], "--help") == 0) ||\r
       (strcmp(argv[1], "-?") == 0) || (strcmp(argv[1], "/?") == 0)) {\r
-    MIUsage();\r
+    Usage();\r
     return 0;\r
   }\r
   \r
@@ -350,7 +350,7 @@ Returns:
   }\r
   \r
   if (argc < 3) {\r
-    MIUsage();\r
+    Usage();\r
     return -1;\r
   }\r
 \r

diff --git a/Tools/CCode/Source/Strip/Strip.c b/Tools/CCode/Source/Strip/Strip.c
index a89bcf9a8ab1a9bae67fa6b7678f9cbc6b0c5968..6215ca8fc4a491292ed22d13cf6943b0a2f847d8 100644 (file)
--- a/Tools/CCode/Source/Strip/Strip.c
+++ b/Tools/CCode/Source/Strip/Strip.c
@@ -31,7 +31,7 @@ Abstract:
 \r
 \r
 void \r
-StripVersion(\r
+Version(\r
   void\r
   )\r
 /*++\r
@@ -55,7 +55,7 @@ Returns:
 }\r
 \r
 void \r
-StripUsage(\r
+Usage(\r
   void\r
   )\r
 /*++\r
@@ -74,8 +74,8 @@ Returns:
   \r
 --*/ \r
 {\r
-  StripVersion();\r
-  printf ("\n  Usage: %s InputFile OutputFile\n", UTILITY_NAME);\r
+  Version();\r
+  printf ("\nUsage: %s InputFile OutputFile\n", UTILITY_NAME);\r
 }\r
 \r
 int\r
@@ -109,23 +109,23 @@ Returns:
   char  *Ptrx;\r
   \r
   if (argc < 1) {\r
-    StripUsage();\r
+    Usage();\r
     return -1;\r
   }\r
   \r
   if ((strcmp(argv[1], "-h") == 0) || (strcmp(argv[1], "--help") == 0) ||\r
       (strcmp(argv[1], "-?") == 0) || (strcmp(argv[1], "/?") == 0)) {\r
-    StripUsage();\r
+    Usage();\r
     return 0;\r
   }\r
   \r
   if ((strcmp(argv[1], "-V") == 0) || (strcmp(argv[1], "--version") == 0)) {\r
-    StripVersion();\r
+    Version();\r
     return 0;\r
   }\r
   \r
   if (argc < 3) {\r
-    StripUsage();\r
+    Usage();\r
     return -1;\r
   }\r
 \r