ShellPkg/pci: Fix extended register dumping for MFVC capability

[mirror_edk2.git] / ShellPkg / Library / UefiShellDebug1CommandsLib / UefiShellDebug1CommandsLib.c

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
index 945002a2ea8734a786d00d94a8bdfbe9ccaec7d5..6ebf0024c6134c0e8b6408ced465f021deb242f2 100644 (file)
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.c
@@ -13,6 +13,7 @@
 **/\r
 \r
 #include "UefiShellDebug1CommandsLib.h"\r
+#include <Library/BcfgCommandLib.h>\r
 \r
 STATIC CONST CHAR16 mFileName[] = L"Debug1Commands";\r
 EFI_HANDLE gShellDebug1HiiHandle = NULL;\r
@@ -84,18 +85,10 @@ UefiShellDebug1CommandsLibConstructor (
   ShellCommandRegisterCommandName(L"edit",          ShellCommandRunEdit               , ShellCommandGetManFileNameDebug1, 0, L"Debug1", TRUE, gShellDebug1HiiHandle, STRING_TOKEN(STR_GET_HELP_EDIT)         );\r
   ShellCommandRegisterCommandName(L"hexedit",       ShellCommandRunHexEdit            , ShellCommandGetManFileNameDebug1, 0, L"Debug1", TRUE, gShellDebug1HiiHandle, STRING_TOKEN(STR_GET_HELP_HEXEDIT)      );\r
 \r
-  //\r
-  // check install profile bit of the profiles mask is set\r
-  //\r
-  if ((PcdGet8(PcdShellProfileMask) & BIT2) == 0) {\r
-    ShellCommandRegisterCommandName(L"bcfg",        ShellCommandRunBcfg               , ShellCommandGetManFileNameDebug1, 0, L"Debug1", TRUE, gShellDebug1HiiHandle, STRING_TOKEN(STR_GET_HELP_BCFG)         );\r
-  }\r
-\r
-\r
-\r
-\r
   ShellCommandRegisterAlias(L"dmem", L"mem");\r
 \r
+  BcfgLibraryRegisterBcfgCommand(ImageHandle, SystemTable, L"Debug1");\r
+\r
   return (EFI_SUCCESS);\r
 }\r
 \r
@@ -115,77 +108,9 @@ UefiShellDebug1CommandsLibDestructor (
   if (gShellDebug1HiiHandle != NULL) {\r
     HiiRemovePackages(gShellDebug1HiiHandle);\r
   }\r
-  return (EFI_SUCCESS);\r
-}\r
-\r
-STATIC CONST CHAR8 Hex[] = {\r
-  '0',\r
-  '1',\r
-  '2',\r
-  '3',\r
-  '4',\r
-  '5',\r
-  '6',\r
-  '7',\r
-  '8',\r
-  '9',\r
-  'A',\r
-  'B',\r
-  'C',\r
-  'D',\r
-  'E',\r
-  'F'\r
-};\r
-\r
-/**\r
-  Dump some hexadecimal data to the screen.\r
-\r
-  @param[in] Indent     How many spaces to indent the output.\r
-  @param[in] Offset     The offset of the printing.\r
-  @param[in] DataSize   The size in bytes of UserData.\r
-  @param[in] UserData   The data to print out.\r
-**/\r
-VOID\r
-DumpHex (\r
-  IN UINTN        Indent,\r
-  IN UINTN        Offset,\r
-  IN UINTN        DataSize,\r
-  IN VOID         *UserData\r
-  )\r
-{\r
-  UINT8 *Data;\r
-\r
-  CHAR8 Val[50];\r
 \r
-  CHAR8 Str[20];\r
-\r
-  UINT8 TempByte;\r
-  UINTN Size;\r
-  UINTN Index;\r
-\r
-  Data = UserData;\r
-  while (DataSize != 0) {\r
-    Size = 16;\r
-    if (Size > DataSize) {\r
-      Size = DataSize;\r
-    }\r
-\r
-    for (Index = 0; Index < Size; Index += 1) {\r
-      TempByte            = Data[Index];\r
-      Val[Index * 3 + 0]  = Hex[TempByte >> 4];\r
-      Val[Index * 3 + 1]  = Hex[TempByte & 0xF];\r
-      Val[Index * 3 + 2]  = (CHAR8) ((Index == 7) ? '-' : ' ');\r
-      Str[Index]          = (CHAR8) ((TempByte < ' ' || TempByte > 'z') ? '.' : TempByte);\r
-    }\r
-\r
-    Val[Index * 3]  = 0;\r
-    Str[Index]      = 0;\r
-    ShellPrintEx(-1, -1, L"%*a%02X: %-.48a *%a*\r\n", Indent, "", Offset, Val, Str);\r
-\r
-    Data += Size;\r
-    Offset += Size;\r
-    DataSize -= Size;\r
-  }\r
+  BcfgLibraryUnregisterBcfgCommand(ImageHandle, SystemTable);\r
+  return (EFI_SUCCESS);\r
 }\r
 \r
 /**\r
@@ -206,7 +131,6 @@ DumpHex (
   //Stolen from MdePkg Baselib\r
 **/\r
 CHAR16\r
-EFIAPI\r
 CharToUpper (\r
   IN      CHAR16                    Char\r
   )\r
@@ -229,7 +153,6 @@ CharToUpper (
   @retval EFI_NOT_FOUND    A configuration table matching TableGuid was not found.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 GetSystemConfigurationTable (\r
   IN EFI_GUID *TableGuid,\r
   IN OUT VOID **Table\r
@@ -262,7 +185,6 @@ GetSystemConfigurationTable (
 \r
 **/\r
 UINTN\r
-EFIAPI\r
 HexCharToUintn (\r
   IN      CHAR16                    Char\r
   )\r
@@ -284,7 +206,6 @@ HexCharToUintn (
   @retval EFI_SUCCESS             The conversion was successful.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ConvertStringToGuid (\r
   IN CONST CHAR16 *StringGuid,\r
   IN OUT EFI_GUID *Guid\r
@@ -375,7 +296,6 @@ ConvertStringToGuid (
   @param[in] LastRow            The last printable row.\r
 **/\r
 VOID\r
-EFIAPI\r
 EditorClearLine (\r
   IN UINTN Row,\r
   IN UINTN LastCol,\r
@@ -417,7 +337,6 @@ EditorClearLine (
   @retval FALSE     The character is not valid.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsValidFileNameChar (\r
   IN CONST CHAR16 Ch\r
   )\r
@@ -425,7 +344,7 @@ IsValidFileNameChar (
   //\r
   // See if there are any illegal characters within the name\r
   //\r
-  if (Ch < 0x20 || Ch == L'\"' || Ch == L'*' || Ch == L'/' || Ch == L'<' || Ch == L'>' || Ch == L'?' || Ch == L'|' || Ch == L' ') {\r
+  if (Ch < 0x20 || Ch == L'\"' || Ch == L'*' || Ch == L'/' || Ch == L'<' || Ch == L'>' || Ch == L'?' || Ch == L'|') {\r
     return FALSE;\r
   }\r
 \r
@@ -441,7 +360,6 @@ IsValidFileNameChar (
   @retval FALSE     The filename is not ok.\r
 **/\r
 BOOLEAN\r
-EFIAPI\r
 IsValidFileName (\r
   IN CONST CHAR16 *Name\r
   )\r
@@ -483,18 +401,15 @@ IsValidFileName (
   @return the valid filename.\r
 **/\r
 CHAR16 *\r
-EFIAPI\r
 EditGetDefaultFileName (\r
   IN CONST CHAR16 *Extension\r
   )\r
 {\r
   EFI_STATUS         Status;\r
   UINTN              Suffix;\r
-  BOOLEAN            FoundNewFile;\r
   CHAR16             *FileNameTmp;\r
 \r
   Suffix       = 0;\r
-  FoundNewFile = FALSE;\r
 \r
   do {\r
     FileNameTmp = CatSPrint (NULL, L"NewFile%d.%s", Suffix, Extension);\r
@@ -539,7 +454,6 @@ EditGetDefaultFileName (
   @retval EFI_INVALID_PARAMETER FileName was a directory.\r
 **/\r
 EFI_STATUS\r
-EFIAPI\r
 ReadFileIntoBuffer (\r
   IN CONST CHAR16 *FileName,\r
   OUT VOID        **Buffer,\r