@return A printable character representing Char.\r
**/\r
CHAR16\r
-MakePrintable(\r
- IN CONST CHAR16 Char\r
+MakePrintable (\r
+ IN CONST CHAR16 Char\r
)\r
{\r
- if ((Char < 0x20 && Char > 0)||(Char > 126)) {\r
+ if (((Char < 0x20) && (Char > 0)) || (Char > 126)) {\r
return (L'?');\r
}\r
+\r
return (Char);\r
}\r
\r
@param[in] Size The length of memory to display.\r
**/\r
SHELL_STATUS\r
-DisplayMmioMemory(\r
+DisplayMmioMemory (\r
IN CONST VOID *Address,\r
IN CONST UINTN Size\r
)\r
{\r
- EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *PciRbIo;\r
- EFI_STATUS Status;\r
- VOID *Buffer;\r
- SHELL_STATUS ShellStatus;\r
+ EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL *PciRbIo;\r
+ EFI_STATUS Status;\r
+ VOID *Buffer;\r
+ SHELL_STATUS ShellStatus;\r
\r
ShellStatus = SHELL_SUCCESS;\r
\r
- Status = gBS->LocateProtocol(&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID**)&PciRbIo);\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PCIRBIO_NF), gShellDebug1HiiHandle, L"dmem");\r
+ Status = gBS->LocateProtocol (&gEfiPciRootBridgeIoProtocolGuid, NULL, (VOID **)&PciRbIo);\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PCIRBIO_NF), gShellDebug1HiiHandle, L"dmem");\r
return (SHELL_NOT_FOUND);\r
}\r
- Buffer = AllocateZeroPool(Size);\r
+\r
+ Buffer = AllocateZeroPool (Size);\r
if (Buffer == NULL) {\r
return SHELL_OUT_OF_RESOURCES;\r
}\r
\r
- Status = PciRbIo->Mem.Read(PciRbIo, EfiPciWidthUint8, (UINT64)(UINTN)Address, Size, Buffer);\r
- if (EFI_ERROR(Status)) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PCIRBIO_ER), gShellDebug1HiiHandle, L"dmem");\r
+ Status = PciRbIo->Mem.Read (PciRbIo, EfiPciWidthUint8, (UINT64)(UINTN)Address, Size, Buffer);\r
+ if (EFI_ERROR (Status)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PCIRBIO_ER), gShellDebug1HiiHandle, L"dmem");\r
ShellStatus = SHELL_NOT_FOUND;\r
} else {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DMEM_MMIO_HEADER_ROW), gShellDebug1HiiHandle, (UINT64)(UINTN)Address, Size);\r
- DumpHex(2, (UINTN)Address, Size, Buffer);\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DMEM_MMIO_HEADER_ROW), gShellDebug1HiiHandle, (UINT64)(UINTN)Address, Size);\r
+ DumpHex (2, (UINTN)Address, Size, Buffer);\r
}\r
\r
- FreePool(Buffer);\r
+ FreePool (Buffer);\r
return (ShellStatus);\r
}\r
\r
-STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
- {L"-mmio", TypeFlag},\r
- {NULL, TypeMax}\r
- };\r
+STATIC CONST SHELL_PARAM_ITEM ParamList[] = {\r
+ { L"-mmio", TypeFlag },\r
+ { NULL, TypeMax }\r
+};\r
\r
/**\r
Function for 'dmem' command.\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- EFI_STATUS Status;\r
- LIST_ENTRY *Package;\r
- CHAR16 *ProblemParam;\r
- SHELL_STATUS ShellStatus;\r
- VOID *Address;\r
- UINT64 Size;\r
- CONST CHAR16 *Temp1;\r
- UINT64 AcpiTableAddress;\r
- UINT64 Acpi20TableAddress;\r
- UINT64 SalTableAddress;\r
- UINT64 SmbiosTableAddress;\r
- UINT64 MpsTableAddress;\r
- UINTN TableWalker;\r
-\r
- ShellStatus = SHELL_SUCCESS;\r
- Status = EFI_SUCCESS;\r
- Address = NULL;\r
- Size = 0;\r
+ EFI_STATUS Status;\r
+ LIST_ENTRY *Package;\r
+ CHAR16 *ProblemParam;\r
+ SHELL_STATUS ShellStatus;\r
+ VOID *Address;\r
+ UINT64 Size;\r
+ CONST CHAR16 *Temp1;\r
+ UINT64 AcpiTableAddress;\r
+ UINT64 Acpi20TableAddress;\r
+ UINT64 SalTableAddress;\r
+ UINT64 SmbiosTableAddress;\r
+ UINT64 MpsTableAddress;\r
+ UINTN TableWalker;\r
+\r
+ ShellStatus = SHELL_SUCCESS;\r
+ Status = EFI_SUCCESS;\r
+ Address = NULL;\r
+ Size = 0;\r
\r
//\r
// initialize the shell lib (we must be in non-auto-init...)\r
//\r
- Status = ShellInitialize();\r
- ASSERT_EFI_ERROR(Status);\r
+ Status = ShellInitialize ();\r
+ ASSERT_EFI_ERROR (Status);\r
\r
- Status = CommandInit();\r
- ASSERT_EFI_ERROR(Status);\r
+ Status = CommandInit ();\r
+ ASSERT_EFI_ERROR (Status);\r
\r
//\r
// parse the command line\r
//\r
Status = ShellCommandLineParse (ParamList, &Package, &ProblemParam, TRUE);\r
- if (EFI_ERROR(Status)) {\r
- if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, L"dmem", ProblemParam);\r
- FreePool(ProblemParam);\r
+ if (EFI_ERROR (Status)) {\r
+ if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, L"dmem", ProblemParam);\r
+ FreePool (ProblemParam);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- ASSERT(FALSE);\r
+ ASSERT (FALSE);\r
}\r
} else {\r
- if (ShellCommandLineGetCount(Package) > 3) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"dmem");\r
+ if (ShellCommandLineGetCount (Package) > 3) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"dmem");\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
- Temp1 = ShellCommandLineGetRawValue(Package, 1);\r
+ Temp1 = ShellCommandLineGetRawValue (Package, 1);\r
if (Temp1 == NULL) {\r
Address = gST;\r
Size = sizeof (*gST);\r
} else {\r
- if (!ShellIsHexOrDecimalNumber(Temp1, TRUE, FALSE) || EFI_ERROR(ShellConvertStringToUint64(Temp1, (UINT64*)&Address, TRUE, FALSE))) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dmem", Temp1);\r
+ if (!ShellIsHexOrDecimalNumber (Temp1, TRUE, FALSE) || EFI_ERROR (ShellConvertStringToUint64 (Temp1, (UINT64 *)&Address, TRUE, FALSE))) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dmem", Temp1);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
- Temp1 = ShellCommandLineGetRawValue(Package, 2);\r
+\r
+ Temp1 = ShellCommandLineGetRawValue (Package, 2);\r
if (Temp1 == NULL) {\r
Size = 512;\r
} else {\r
- if (!ShellIsHexOrDecimalNumber(Temp1, FALSE, FALSE) || EFI_ERROR(ShellConvertStringToUint64(Temp1, &Size, TRUE, FALSE))) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dmem", Temp1);\r
+ if (!ShellIsHexOrDecimalNumber (Temp1, FALSE, FALSE) || EFI_ERROR (ShellConvertStringToUint64 (Temp1, &Size, TRUE, FALSE))) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dmem", Temp1);\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
}\r
}\r
}\r
\r
if (ShellStatus == SHELL_SUCCESS) {\r
- if (!ShellCommandLineGetFlag(Package, L"-mmio")) {\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DMEM_HEADER_ROW), gShellDebug1HiiHandle, (UINT64)(UINTN)Address, Size);\r
- DumpHex(2, (UINTN)Address, (UINTN)Size, Address);\r
- if (Address == (VOID*)gST) {\r
- Acpi20TableAddress = 0;\r
- AcpiTableAddress = 0;\r
- SalTableAddress = 0;\r
- SmbiosTableAddress = 0;\r
- MpsTableAddress = 0;\r
- for (TableWalker = 0 ; TableWalker < gST->NumberOfTableEntries ; TableWalker++) {\r
- if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiAcpi20TableGuid)) {\r
+ if (!ShellCommandLineGetFlag (Package, L"-mmio")) {\r
+ ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_DMEM_HEADER_ROW), gShellDebug1HiiHandle, (UINT64)(UINTN)Address, Size);\r
+ DumpHex (2, (UINTN)Address, (UINTN)Size, Address);\r
+ if (Address == (VOID *)gST) {\r
+ Acpi20TableAddress = 0;\r
+ AcpiTableAddress = 0;\r
+ SalTableAddress = 0;\r
+ SmbiosTableAddress = 0;\r
+ MpsTableAddress = 0;\r
+ for (TableWalker = 0; TableWalker < gST->NumberOfTableEntries; TableWalker++) {\r
+ if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiAcpi20TableGuid)) {\r
Acpi20TableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;\r
continue;\r
}\r
- if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiAcpi10TableGuid)) {\r
+\r
+ if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiAcpi10TableGuid)) {\r
AcpiTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;\r
continue;\r
}\r
- if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiSmbiosTableGuid)) {\r
+\r
+ if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiSmbiosTableGuid)) {\r
SmbiosTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;\r
continue;\r
}\r
+\r
if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiSmbios3TableGuid)) {\r
- SmbiosTableAddress = (UINT64) (UINTN) gST->ConfigurationTable[TableWalker].VendorTable;\r
+ SmbiosTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;\r
continue;\r
}\r
- if (CompareGuid(&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiMpsTableGuid)) {\r
+\r
+ if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiMpsTableGuid)) {\r
MpsTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;\r
continue;\r
}\r
}\r
\r
- ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_DMEM_SYSTEM_TABLE), gShellDebug1HiiHandle,\r
+ ShellPrintHiiEx (\r
+ -1,\r
+ -1,\r
+ NULL,\r
+ STRING_TOKEN (STR_DMEM_SYSTEM_TABLE),\r
+ gShellDebug1HiiHandle,\r
(UINT64)(UINTN)Address,\r
gST->Hdr.HeaderSize,\r
gST->Hdr.Revision,\r
);\r
}\r
} else {\r
- ShellStatus = DisplayMmioMemory(Address, (UINTN)Size);\r
+ ShellStatus = DisplayMmioMemory (Address, (UINTN)Size);\r
}\r
}\r
\r
-\r
ShellCommandLineFreeVarList (Package);\r
}\r
\r
projects / mirror_edk2.git / blobdiff