ShellPkg/UefiShellAcpiViewCommandLib: Fix ECC issues

1. Separate variable definition and initialization.
2. Make the variable naming following Edk2 rule.

V2: Remove the updates of guard macros in header files.

Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Evan Lloyd <evan.lloyd@arm.com>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c
index 088575d0144becab944b2cfe61e3e0c7f6795f0c..6d3bc451acd6386774f74c21a0554ab1e541b4d9 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiParser.c
@@ -21,6 +21,15 @@ STATIC UINT32   gIndent;
 STATIC UINT32   mTableErrorCount;\r
 STATIC UINT32   mTableWarningCount;\r
 \r
+STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;\r
+\r
+/**\r
+  An ACPI_PARSER array describing the ACPI header.\r
+**/\r
+STATIC CONST ACPI_PARSER AcpiHeaderParser[] = {\r
+  PARSE_ACPI_HEADER (&AcpiHdrInfo)\r
+};\r
+\r
 /**\r
   This function resets the ACPI table error counter to Zero.\r
 **/\r
@@ -114,10 +123,13 @@ VerifyChecksum (
   IN UINT32  Length\r
   )\r
 {\r
-  UINTN ByteCount = 0;\r
-  UINT8 Checksum = 0;\r
+  UINTN ByteCount;\r
+  UINT8 Checksum;\r
   UINTN OriginalAttribute;\r
 \r
+  ByteCount = 0;\r
+  Checksum = 0;\r
+\r
   while (ByteCount < Length) {\r
     Checksum += *(Ptr++);\r
     ByteCount++;\r
@@ -166,11 +178,14 @@ DumpRaw (
   IN UINT32 Length\r
   )\r
 {\r
-  UINTN ByteCount = 0;\r
+  UINTN ByteCount;\r
   UINTN PartLineChars;\r
-  UINTN AsciiBufferIndex = 0;\r
+  UINTN AsciiBufferIndex;\r
   CHAR8 AsciiBuffer[17];\r
 \r
+  ByteCount = 0;\r
+  AsciiBufferIndex = 0;\r
+\r
   Print (L"Address  : 0x%p\n", Ptr);\r
   Print (L"Length   : %d\n", Length);\r
 \r
@@ -277,7 +292,10 @@ DumpUint64 (
   // Some fields are not aligned and this causes alignment faults\r
   // on ARM platforms if the compiler generates LDRD instructions.\r
   // Perform word access so that LDRD instructions are not generated.\r
-  UINT64 Val = *(UINT32*)(Ptr + sizeof (UINT32));\r
+  UINT64 Val;\r
+\r
+  Val = *(UINT32*)(Ptr + sizeof (UINT32));\r
+\r
   Val <<= 32;\r
   Val |= *(UINT32*)Ptr;\r
 \r
@@ -456,13 +474,16 @@ ParseAcpi (
 )\r
 {\r
   UINT32  Index;\r
-  UINT32  Offset = 0;\r
+  UINT32  Offset;\r
+  BOOLEAN HighLight;\r
+\r
+  Offset = 0;\r
 \r
   // Increment the Indent\r
   gIndent += Indent;\r
 \r
   if (Trace && (AsciiName != NULL)){\r
-    BOOLEAN HighLight = GetColourHighlighting ();\r
+    HighLight = GetColourHighlighting ();\r
     UINTN   OriginalAttribute;\r
 \r
     if (HighLight) {\r
@@ -620,11 +641,6 @@ DumpAcpiHeader (
   IN UINT8* Ptr\r
   )\r
 {\r
-  ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;\r
-  ACPI_PARSER AcpiHeaderParser[] = {\r
-    PARSE_ACPI_HEADER (&AcpiHdrInfo)\r
-  };\r
-\r
   return ParseAcpi (\r
            TRUE,\r
            0,\r
@@ -658,10 +674,6 @@ ParseAcpiHeader (
   )\r
 {\r
   UINT32                        BytesParsed;\r
-  ACPI_DESCRIPTION_HEADER_INFO  AcpiHdrInfo;\r
-  ACPI_PARSER AcpiHeaderParser[] = {\r
-    PARSE_ACPI_HEADER (&AcpiHdrInfo)\r
-  };\r
 \r
   BytesParsed = ParseAcpi (\r
                   FALSE,\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.c
index 7b1a02cad3ec0d5021c47ed50da5e4edabdb1d77..fff5757bf58296d650b3ab69c7a47df3cf3a4c55 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiTableParser.c
@@ -45,32 +45,32 @@ RegisterParser (
   IN  PARSE_ACPI_TABLE_PROC   ParserProc\r
   )\r
 {\r
-  UINT32 index;\r
+  UINT32 Index;\r
 \r
   if ((ParserProc == NULL) || (Signature == ACPI_PARSER_SIGNATURE_NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
   // Search if a parser is already installed\r
-  for (index = 0;\r
-       index < (sizeof (mTableParserList) / sizeof (mTableParserList[0]));\r
-       index++)\r
+  for (Index = 0;\r
+       Index < (sizeof (mTableParserList) / sizeof (mTableParserList[0]));\r
+       Index++)\r
   {\r
-    if (Signature == mTableParserList[index].Signature) {\r
-      if (mTableParserList[index].Parser != NULL) {\r
+    if (Signature == mTableParserList[Index].Signature) {\r
+      if (mTableParserList[Index].Parser != NULL) {\r
         return EFI_ALREADY_STARTED;\r
       }\r
     }\r
   }\r
 \r
   // Find the first free slot and register the parser\r
-  for (index = 0;\r
-      index < (sizeof (mTableParserList) / sizeof (mTableParserList[0]));\r
-      index++)\r
+  for (Index = 0;\r
+      Index < (sizeof (mTableParserList) / sizeof (mTableParserList[0]));\r
+      Index++)\r
   {\r
-    if (mTableParserList[index].Signature == ACPI_PARSER_SIGNATURE_NULL) {\r
-      mTableParserList[index].Signature = Signature;\r
-      mTableParserList[index].Parser = ParserProc;\r
+    if (mTableParserList[Index].Signature == ACPI_PARSER_SIGNATURE_NULL) {\r
+      mTableParserList[Index].Signature = Signature;\r
+      mTableParserList[Index].Parser = ParserProc;\r
       return EFI_SUCCESS;\r
     }\r
   }\r
@@ -96,19 +96,19 @@ DeregisterParser (
   IN  UINT32                  Signature\r
   )\r
 {\r
-  UINT32 index;\r
+  UINT32 Index;\r
 \r
   if (Signature == ACPI_PARSER_SIGNATURE_NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  for (index = 0;\r
-       index < (sizeof (mTableParserList) / sizeof (mTableParserList[0]));\r
-       index++)\r
+  for (Index = 0;\r
+       Index < (sizeof (mTableParserList) / sizeof (mTableParserList[0]));\r
+       Index++)\r
   {\r
-    if (Signature == mTableParserList[index].Signature) {\r
-      mTableParserList[index].Signature = ACPI_PARSER_SIGNATURE_NULL;\r
-      mTableParserList[index].Parser = NULL;\r
+    if (Signature == mTableParserList[Index].Signature) {\r
+      mTableParserList[Index].Signature = ACPI_PARSER_SIGNATURE_NULL;\r
+      mTableParserList[Index].Parser = NULL;\r
       return EFI_SUCCESS;\r
     }\r
   }\r
@@ -137,18 +137,18 @@ GetParser (
   OUT PARSE_ACPI_TABLE_PROC *  ParserProc\r
   )\r
 {\r
-  UINT32 index;\r
+  UINT32 Index;\r
 \r
   if ((ParserProc == NULL) || (Signature == ACPI_PARSER_SIGNATURE_NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  for (index = 0;\r
-       index < (sizeof (mTableParserList) / sizeof (mTableParserList[0]));\r
-       index++)\r
+  for (Index = 0;\r
+       Index < (sizeof (mTableParserList) / sizeof (mTableParserList[0]));\r
+       Index++)\r
   {\r
-    if (Signature == mTableParserList[index].Signature) {\r
-      *ParserProc = mTableParserList[index].Parser;\r
+    if (Signature == mTableParserList[Index].Signature) {\r
+      *ParserProc = mTableParserList[Index].Parser;\r
       return EFI_SUCCESS;\r
     }\r
   }\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
index f5602e94291c26f91513d753601d09ddff73a4dd..47ce93f104b024540b3140e3acd92b8a1dccccb1 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.c
@@ -122,8 +122,11 @@ DumpAcpiTableToFile (
 {\r
   EFI_STATUS         Status;\r
   CHAR16             FileNameBuffer[MAX_FILE_NAME_LEN];\r
-  SHELL_FILE_HANDLE  DumpFileHandle = NULL;\r
-  UINTN              TransferBytes = Length;\r
+  SHELL_FILE_HANDLE  DumpFileHandle;\r
+  UINTN              TransferBytes;\r
+\r
+  DumpFileHandle = NULL;\r
+  TransferBytes = Length;\r
 \r
   UnicodeSPrint (\r
     FileNameBuffer,\r
@@ -186,20 +189,25 @@ ProcessTableReportOptions (
   )\r
 {\r
   UINTN   OriginalAttribute;\r
-  UINT8*  SignaturePtr = (UINT8*)(UINTN)&Signature;\r
-  BOOLEAN Log = FALSE;\r
-  BOOLEAN HighLight = GetColourHighlighting ();\r
+  UINT8*  SignaturePtr;\r
+  BOOLEAN Log;\r
+  BOOLEAN HighLight;\r
+\r
+  SignaturePtr = (UINT8*)(UINTN)&Signature;\r
+  Log = FALSE;\r
+  HighLight = GetColourHighlighting ();\r
+\r
   switch (GetReportOption ()) {\r
-    case EREPORT_ALL:\r
+    case ReportAll:\r
       Log = TRUE;\r
       break;\r
-    case EREPORT_SELECTED:\r
+    case ReportSelected:\r
       if (Signature == GetSelectedAcpiTable ()) {\r
         Log = TRUE;\r
         mSelectedAcpiTableFound = TRUE;\r
       }\r
       break;\r
-    case EREPORT_TABLE_LIST:\r
+    case ReportTableList:\r
       if (mTableCount == 0) {\r
         if (HighLight) {\r
           OriginalAttribute = gST->ConOut->Mode->Attribute;\r
@@ -223,13 +231,13 @@ ProcessTableReportOptions (
         SignaturePtr[3]\r
         );\r
       break;\r
-    case EREPORT_DUMP_BIN_FILE:\r
+    case ReportDumpBinFile:\r
       if (Signature == GetSelectedAcpiTable ()) {\r
         mSelectedAcpiTableFound = TRUE;\r
         DumpAcpiTableToFile (TablePtr, Length);\r
       }\r
       break;\r
-    case EREPORT_MAX:\r
+    case ReportMax:\r
       // We should never be here.\r
       // This case is only present to prevent compiler warning.\r
       break;\r
@@ -273,9 +281,11 @@ ConvertStrToAcpiSignature (
   IN  CONST CHAR16* Str\r
   )\r
 {\r
-  UINT8 Index = 0;\r
+  UINT8 Index;\r
   CHAR8 Ptr[4];\r
 \r
+  Index = 0;\r
+\r
   // Convert to Upper case and convert to ASCII\r
   while ((Index < 4) && (Str[Index] != 0)) {\r
     if (Str[Index] >= L'a' && Str[Index] <= L'z') {\r
@@ -371,12 +381,12 @@ AcpiView (
   }\r
 \r
   ReportOption = GetReportOption ();\r
-  if (EREPORT_TABLE_LIST != ReportOption) {\r
-    if (((EREPORT_SELECTED == ReportOption)  ||\r
-         (EREPORT_DUMP_BIN_FILE == ReportOption)) &&\r
+  if (ReportTableList != ReportOption) {\r
+    if (((ReportSelected == ReportOption)  ||\r
+         (ReportDumpBinFile == ReportOption)) &&\r
         (!mSelectedAcpiTableFound)) {\r
       Print (L"\nRequested ACPI Table not found.\n");\r
-    } else if (EREPORT_DUMP_BIN_FILE != ReportOption) {\r
+    } else if (ReportDumpBinFile != ReportOption) {\r
       OriginalAttribute = gST->ConOut->Mode->Attribute;\r
 \r
       Print (L"\nTable Statistics:\n");\r
@@ -426,15 +436,15 @@ ShellCommandRunAcpiView (
   )\r
 {\r
   EFI_STATUS         Status;\r
-  SHELL_STATUS       ShellStatus = SHELL_SUCCESS;\r
-  LIST_ENTRY*        Package = NULL;\r
+  SHELL_STATUS       ShellStatus;\r
+  LIST_ENTRY*        Package;\r
   CHAR16*            ProblemParam;\r
   CONST CHAR16*      Temp;\r
   CHAR8              ColourOption[8];\r
-  SHELL_FILE_HANDLE  TmpDumpFileHandle = NULL;\r
+  SHELL_FILE_HANDLE  TmpDumpFileHandle;\r
 \r
   // Set Defaults\r
-  mReportType = EREPORT_ALL;\r
+  mReportType = ReportAll;\r
   mTableCount = 0;\r
   mBinTableCount = 0;\r
   mSelectedAcpiTable = 0;\r
@@ -443,6 +453,10 @@ ShellCommandRunAcpiView (
   mVerbose = TRUE;\r
   mConsistencyCheck = TRUE;\r
 \r
+  ShellStatus = SHELL_SUCCESS;\r
+  Package = NULL;\r
+  TmpDumpFileHandle = NULL;\r
+\r
   // Reset The error/warning counters\r
   ResetErrorCount ();\r
   ResetWarningCount ();\r
@@ -547,19 +561,19 @@ ShellCommandRunAcpiView (
       }\r
 \r
       if (ShellCommandLineGetFlag (Package, L"-l")) {\r
-        mReportType = EREPORT_TABLE_LIST;\r
+        mReportType = ReportTableList;\r
       } else {\r
         mSelectedAcpiTableName = ShellCommandLineGetValue (Package, L"-s");\r
         if (mSelectedAcpiTableName != NULL) {\r
           mSelectedAcpiTable = (UINT32)ConvertStrToAcpiSignature (\r
                                          mSelectedAcpiTableName\r
                                          );\r
-          mReportType = EREPORT_SELECTED;\r
+          mReportType = ReportSelected;\r
 \r
           if (ShellCommandLineGetFlag (Package, L"-d"))  {\r
             // Create a temporary file to check if the media is writable.\r
             CHAR16 FileNameBuffer[MAX_FILE_NAME_LEN];\r
-            mReportType = EREPORT_DUMP_BIN_FILE;\r
+            mReportType = ReportDumpBinFile;\r
 \r
             UnicodeSPrint (\r
               FileNameBuffer,\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.h b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.h
index b035395a721b80031335a16684fe9d3bbd60cd52..615686dde83cfc47e3506ec70c304bd0f1c54248 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.h
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/AcpiView.h
@@ -33,11 +33,11 @@
   The EREPORT_OPTION enum describes ACPI table Reporting options.\r
 **/\r
 typedef enum ReportOption {\r
-  EREPORT_ALL,            ///< Report All tables.\r
-  EREPORT_SELECTED,       ///< Report Selected table.\r
-  EREPORT_TABLE_LIST,     ///< Report List of tables.\r
-  EREPORT_DUMP_BIN_FILE,  ///< Dump selected table to a file.\r
-  EREPORT_MAX\r
+  ReportAll,            ///< Report All tables.\r
+  ReportSelected,       ///< Report Selected table.\r
+  ReportTableList,      ///< Report List of tables.\r
+  ReportDumpBinFile,    ///< Dump selected table to a file.\r
+  ReportMax,\r
 } EREPORT_OPTION;\r
 \r
 /**\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c
index 7f66bce074e6807932fce288bdc7f351896ee10c..bc8b7b00e38215d18577f48a8d2349a1c6a27f0f 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Dbg2/Dbg2Parser.c
@@ -112,7 +112,10 @@ ValidateNameSpaceStrLen (
   IN VOID*  Context\r
   )\r
 {\r
-  UINT16 NameSpaceStrLen = *(UINT16*)Ptr;\r
+  UINT16 NameSpaceStrLen;\r
+\r
+  NameSpaceStrLen = *(UINT16*)Ptr;\r
+\r
   if (NameSpaceStrLen < 2) {\r
     IncrementErrorCount ();\r
     Print (\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
index 30cf3e14f7e776384d8c1c09d5acd29f7c7459b7..3a3cee948ad8cd35ef3a6e13fec9d44300dbe73f 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Gtdt/GtdtParser.c
@@ -138,7 +138,10 @@ ValidateGtBlockTimerCount (
   IN VOID*  Context\r
   )\r
 {\r
-  UINT32 BlockTimerCount = *(UINT32*)Ptr;\r
+  UINT32 BlockTimerCount;\r
+\r
+  BlockTimerCount = *(UINT32*)Ptr;\r
+\r
   if (BlockTimerCount > 8) {\r
     IncrementErrorCount ();\r
     Print (\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c
index 704dfc407cca00d217e3e7e69fadd6dcbd2c094a..fb0abe3c43b4c6e8df86e38a599f1dfbecaee741 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Iort/IortParser.c
@@ -27,13 +27,13 @@ STATIC ACPI_DESCRIPTION_HEADER_INFO AcpiHdrInfo;
   The EIORT_NODE enum describes the IORT Node types.\r
 **/\r
 typedef enum IortNode {\r
-  EIORT_NODE_ITS_GROUP,        ///< ITS Group node\r
-  EIORT_NODE_NAMED_COMPONENT,  ///< Named Component node\r
-  EIORT_NODE_ROOT_COMPLEX,     ///< Root Complex node\r
-  EIORT_NODE_SMMUV1_V2,        ///< SMMU v1/v2 node\r
-  EIORT_NODE_SMMUV3,           ///< SMMU v3 node\r
-  EIORT_NODE_PMCG,             ///< PMC group node\r
-  EIORT_NODE_MAX\r
+  Iort_Node_ITS_Group,        ///< ITS Group node\r
+  Iort_Node_Named_Component,  ///< Named Component node\r
+  Iort_Node_Root_Complex,     ///< Root Complex node\r
+  Iort_Node_SMMUV1_V2,        ///< SMMU v1/v2 node\r
+  Iort_Node_SMMUV3,           ///< SMMU v3 node\r
+  Iort_Node_PMCG,             ///< PMC group node\r
+  Iort_Node_Max\r
 } EIORT_NODE;\r
 \r
 // Local Variables\r
@@ -665,13 +665,13 @@ ParseAcpiIort (
     Print (L"0x%x\n", Offset);\r
 \r
     switch (*IortNodeType) {\r
-      case EIORT_NODE_ITS_GROUP:\r
+      case Iort_Node_ITS_Group:\r
         DumpIortNodeIts (\r
           NodePtr,\r
           *IortNodeLength\r
           );\r
         break;\r
-      case EIORT_NODE_NAMED_COMPONENT:\r
+      case Iort_Node_Named_Component:\r
         DumpIortNodeNamedComponent (\r
           NodePtr,\r
           *IortNodeLength,\r
@@ -679,7 +679,7 @@ ParseAcpiIort (
           *IortIdMappingOffset\r
           );\r
         break;\r
-      case EIORT_NODE_ROOT_COMPLEX:\r
+      case Iort_Node_Root_Complex:\r
         DumpIortNodeRootComplex (\r
           NodePtr,\r
           *IortNodeLength,\r
@@ -687,7 +687,7 @@ ParseAcpiIort (
           *IortIdMappingOffset\r
           );\r
         break;\r
-      case EIORT_NODE_SMMUV1_V2:\r
+      case Iort_Node_SMMUV1_V2:\r
         DumpIortNodeSmmuV1V2 (\r
           NodePtr,\r
           *IortNodeLength,\r
@@ -695,7 +695,7 @@ ParseAcpiIort (
           *IortIdMappingOffset\r
           );\r
         break;\r
-      case EIORT_NODE_SMMUV3:\r
+      case Iort_Node_SMMUV3:\r
         DumpIortNodeSmmuV3 (\r
           NodePtr,\r
           *IortNodeLength,\r
@@ -703,7 +703,7 @@ ParseAcpiIort (
           *IortIdMappingOffset\r
           );\r
         break;\r
-      case EIORT_NODE_PMCG:\r
+      case Iort_Node_PMCG:\r
         DumpIortNodePmcg (\r
           NodePtr,\r
           *IortNodeLength,\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c
index 3ac27086a6b8a5f0614a58288c43977dff64b838..a704b0c6314d2fa2da1c218f2fc644f464e99a7a 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Madt/MadtParser.c
@@ -197,7 +197,9 @@ ParseAcpiMadt (
 {\r
   UINT32 Offset;\r
   UINT8* InterruptContollerPtr;\r
-  UINT32 GICDCount = 0;\r
+  UINT32 GICDCount;\r
+\r
+  GICDCount = 0;\r
 \r
   if (!Trace) {\r
     return;\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/RsdpParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/RsdpParser.c
index c33bb1e92347234f167a07c77701d6dbc433471a..164cd4620229558cb6a47a427e781f13b5186c00 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/RsdpParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Rsdp/RsdpParser.c
@@ -88,7 +88,10 @@ ValidateRsdtAddress (
   // Root System Description Pointer (RSDP), ACPI ? 5.2.5.\r
   //   - Within the RSDP, the RsdtAddress field must be null (zero) and the\r
   //     XsdtAddresss MUST be a valid, non-null, 64-bit value.\r
-  UINT32 RsdtAddr = *(UINT32*)Ptr;\r
+  UINT32 RsdtAddr;\r
+\r
+  RsdtAddr = *(UINT32*)Ptr;\r
+\r
   if (RsdtAddr != 0) {\r
     IncrementErrorCount ();\r
     Print (\r
@@ -120,7 +123,10 @@ ValidateXsdtAddress (
   // Root System Description Pointer (RSDP), ACPI ? 5.2.5.\r
   //   - Within the RSDP, the RsdtAddress field must be null (zero) and the\r
   //     XsdtAddresss MUST be a valid, non-null, 64-bit value.\r
-  UINT64 XsdtAddr = *(UINT64*)Ptr;\r
+  UINT64 XsdtAddr;\r
+\r
+  XsdtAddr = *(UINT64*)Ptr;\r
+\r
   if (XsdtAddr == 0) {\r
     IncrementErrorCount ();\r
     Print (\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
index a028ae541ca3de5ae6a006082ba54fc2a55adbbd..c38666d2b7f6839f6b860b5931f7c4d66d422d36 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Slit/SlitParser.c
@@ -63,8 +63,8 @@ ParseAcpiSlit (
   )\r
 {\r
   UINT32 Offset;\r
-  UINT64 i;\r
-  UINT64 j;\r
+  UINT64 Count;\r
+  UINT64 Index;\r
   UINT64 LocalityCount;\r
   UINT8* LocalityPtr;\r
   CHAR16 Buffer[80];  // Used for AsciiName param of ParseAcpi\r
@@ -98,46 +98,46 @@ ParseAcpiSlit (
     PrintFieldName (0, Buffer);\r
     Print (L"\n");\r
     Print (L"       ");\r
-    for (j = 0; j < LocalityCount; j++) {\r
-      Print (L" (%3d) ", j);\r
+    for (Index = 0; Index < LocalityCount; Index++) {\r
+      Print (L" (%3d) ", Index);\r
     }\r
     Print (L"\n");\r
-    for (i = 0; i < LocalityCount; i++) {\r
-      Print (L" (%3d) ", i);\r
-      for (j = 0; j < LocalityCount; j++) {\r
-        Print (L"  %3d  ", SLIT_ELEMENT (LocalityPtr, i, j));\r
+    for (Count = 0; Count< LocalityCount; Count++) {\r
+      Print (L" (%3d) ", Count);\r
+      for (Index = 0; Index < LocalityCount; Index++) {\r
+        Print (L"  %3d  ", SLIT_ELEMENT (LocalityPtr, Count, Index));\r
       }\r
       Print (L"\n");\r
     }\r
   }\r
 \r
   // Validate\r
-  for (i = 0; i < LocalityCount; i++) {\r
-    for (j = 0; j < LocalityCount; j++) {\r
+  for (Count = 0; Count < LocalityCount; Count++) {\r
+    for (Index = 0; Index < LocalityCount; Index++) {\r
       // Element[x][x] must be equal to 10\r
-      if ((i == j) && (SLIT_ELEMENT (LocalityPtr, i, j) != 10)) {\r
+      if ((Count == Index) && (SLIT_ELEMENT (LocalityPtr, Count,Index) != 10)) {\r
         IncrementErrorCount ();\r
         Print (\r
           L"ERROR: Diagonal Element[0x%lx][0x%lx] (%3d)."\r
             " Normalized Value is not 10\n",\r
-          i,\r
-          j,\r
-          SLIT_ELEMENT (LocalityPtr, i, j)\r
+          Count,\r
+          Index,\r
+          SLIT_ELEMENT (LocalityPtr, Count, Index)\r
           );\r
       }\r
       // Element[i][j] must be equal to Element[j][i]\r
-      if (SLIT_ELEMENT (LocalityPtr, i, j) !=\r
-          SLIT_ELEMENT (LocalityPtr, j, i)) {\r
+      if (SLIT_ELEMENT (LocalityPtr, Count, Index) !=\r
+          SLIT_ELEMENT (LocalityPtr, Index, Count)) {\r
         IncrementErrorCount ();\r
         Print (\r
           L"ERROR: Relative distances for Element[0x%lx][0x%lx] (%3d) and \n"\r
            "Element[0x%lx][0x%lx] (%3d) do not match.\n",\r
-          i,\r
-          j,\r
-          SLIT_ELEMENT (LocalityPtr, i, j),\r
-          j,\r
-          i,\r
-          SLIT_ELEMENT (LocalityPtr, j, i)\r
+          Count,\r
+          Index,\r
+          SLIT_ELEMENT (LocalityPtr, Count, Index),\r
+          Index,\r
+          Count,\r
+          SLIT_ELEMENT (LocalityPtr, Index, Count)\r
           );\r
       }\r
     }\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Spcr/SpcrParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Spcr/SpcrParser.c
index 64340886fe582440088cb58ed7ea4bc7ad147d12..815ba9a9db03f88f264edee2c3685defebb80ac1 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Spcr/SpcrParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Spcr/SpcrParser.c
@@ -98,7 +98,10 @@ ValidateInterruptType (
   )\r
 {\r
 #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)\r
-  UINT8 InterruptType = *Ptr;\r
+  UINT8 InterruptType;\r
+\r
+  InterruptType = *Ptr;\r
+\r
   if (InterruptType !=\r
         EFI_ACPI_SERIAL_PORT_CONSOLE_REDIRECTION_TABLE_INTERRUPT_TYPE_GIC) {\r
     IncrementErrorCount ();\r
@@ -126,7 +129,10 @@ ValidateIrq (
   )\r
 {\r
 #if defined (MDE_CPU_ARM) || defined (MDE_CPU_AARCH64)\r
-  UINT8 Irq = *Ptr;\r
+  UINT8 Irq;\r
+\r
+  Irq = *Ptr;\r
+\r
   if (Irq != 0) {\r
     IncrementErrorCount ();\r
     Print (\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/SratParser.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/SratParser.c
index fbe943d898ad96158f51d5afffe1fe17893ae62f..043277aabf8d08f0999734959864ff1e94a1d7cc 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/SratParser.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/Parsers/Srat/SratParser.c
@@ -177,7 +177,10 @@ DumpSratApicProximity (
  IN UINT8*        Ptr\r
  )\r
 {\r
-  UINT32 ProximityDomain = Ptr[0] | (Ptr[1] << 8) | (Ptr[2] << 16);\r
+  UINT32 ProximityDomain;\r
+\r
+  ProximityDomain = Ptr[0] | (Ptr[1] << 8) | (Ptr[2] << 16);\r
+\r
   Print (Format, ProximityDomain);\r
 }\r
 \r
@@ -210,13 +213,19 @@ ParseAcpiSrat (
 {\r
   UINT32 Offset;\r
   UINT8* ResourcePtr;\r
-  UINT32 GicCAffinityIndex = 0;\r
-  UINT32 GicITSAffinityIndex = 0;\r
-  UINT32 MemoryAffinityIndex = 0;\r
-  UINT32 ApicSapicAffinityIndex = 0;\r
-  UINT32 X2ApicAffinityIndex = 0;\r
+  UINT32 GicCAffinityIndex;\r
+  UINT32 GicITSAffinityIndex;\r
+  UINT32 MemoryAffinityIndex;\r
+  UINT32 ApicSapicAffinityIndex;\r
+  UINT32 X2ApicAffinityIndex;\r
   CHAR8  Buffer[80];  // Used for AsciiName param of ParseAcpi\r
 \r
+  GicCAffinityIndex = 0;\r
+  GicITSAffinityIndex = 0;\r
+  MemoryAffinityIndex = 0;\r
+  ApicSapicAffinityIndex = 0;\r
+  X2ApicAffinityIndex = 0;\r
+\r
   if (!Trace) {\r
     return;\r
   }\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
index 8479bfbc9be06533cb4f94388fb3512757b13451..c2f40009eeb9b3ac401b481b283f5803797e8261 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.c
@@ -64,7 +64,10 @@ RegisterAllParsers (
   )\r
 {\r
   EFI_STATUS Status;\r
-  UINTN Count = sizeof (ParserList) / sizeof (ParserList[0]);\r
+  UINTN Count;\r
+\r
+  Count = sizeof (ParserList) / sizeof (ParserList[0]);\r
+\r
   while (Count-- != 0) {\r
     Status = RegisterParser (\r
                ParserList[Count].Signature,\r

diff --git a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf
index dbdb7e301b4a53e53886e9a1f05b3fb2921a90d9..6df8c08b855241ed4704b606bb1fd61a0a59464a 100644 (file)
--- a/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf
+++ b/ShellPkg/Library/UefiShellAcpiViewCommandLib/UefiShellAcpiViewCommandLib.inf
@@ -27,6 +27,9 @@
   UefiShellAcpiViewCommandLib.uni\r
   UefiShellAcpiViewCommandLib.c\r
   UefiShellAcpiViewCommandLib.h\r
+  AcpiParser.h\r
+  AcpiTableParser.h\r
+  AcpiView.h\r
   AcpiParser.c\r
   AcpiTableParser.c\r
   AcpiView.c\r