ShellPkg: Apply uncrustify changes
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737 Apply uncrustify changes to .c/.h files in the ShellPkg package Cc: Andrew Fish <afish@apple.com> Cc: Leif Lindholm <leif@nuviainc.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com> Reviewed-by: Ray Ni <ray.ni@intel.com>
This commit is contained in:
Michael Kubacki
committed by
mergify[bot]
mergify[bot]
parent
c411b485b6
commit
47d20b54f9
@ -11,41 +11,41 @@
|
||||
//
|
||||
// Need full names for Standard-Format Output
|
||||
//
|
||||
STATIC CONST CHAR16 NameEfiReservedMemoryType[] = L"Reserved";
|
||||
STATIC CONST CHAR16 NameEfiLoaderCode[] = L"LoaderCode";
|
||||
STATIC CONST CHAR16 NameEfiLoaderData[] = L"LoaderData";
|
||||
STATIC CONST CHAR16 NameEfiBootServicesCode[] = L"BootServiceCode";
|
||||
STATIC CONST CHAR16 NameEfiBootServicesData[] = L"BootServiceData";
|
||||
STATIC CONST CHAR16 NameEfiRuntimeServicesCode[] = L"RuntimeCode";
|
||||
STATIC CONST CHAR16 NameEfiRuntimeServicesData[] = L"RuntimeData";
|
||||
STATIC CONST CHAR16 NameEfiConventionalMemory[] = L"Available";
|
||||
STATIC CONST CHAR16 NameEfiPersistentMemory[] = L"Persistent";
|
||||
STATIC CONST CHAR16 NameEfiUnusableMemory[] = L"UnusableMemory";
|
||||
STATIC CONST CHAR16 NameEfiACPIReclaimMemory[] = L"ACPIReclaimMemory";
|
||||
STATIC CONST CHAR16 NameEfiACPIMemoryNVS[] = L"ACPIMemoryNVS";
|
||||
STATIC CONST CHAR16 NameEfiMemoryMappedIO[] = L"MemoryMappedIO";
|
||||
STATIC CONST CHAR16 NameEfiMemoryMappedIOPortSpace[] = L"MemoryMappedIOPortSpace";
|
||||
STATIC CONST CHAR16 NameEfiPalCode[] = L"PalCode";
|
||||
STATIC CONST CHAR16 NameEfiReservedMemoryType[] = L"Reserved";
|
||||
STATIC CONST CHAR16 NameEfiLoaderCode[] = L"LoaderCode";
|
||||
STATIC CONST CHAR16 NameEfiLoaderData[] = L"LoaderData";
|
||||
STATIC CONST CHAR16 NameEfiBootServicesCode[] = L"BootServiceCode";
|
||||
STATIC CONST CHAR16 NameEfiBootServicesData[] = L"BootServiceData";
|
||||
STATIC CONST CHAR16 NameEfiRuntimeServicesCode[] = L"RuntimeCode";
|
||||
STATIC CONST CHAR16 NameEfiRuntimeServicesData[] = L"RuntimeData";
|
||||
STATIC CONST CHAR16 NameEfiConventionalMemory[] = L"Available";
|
||||
STATIC CONST CHAR16 NameEfiPersistentMemory[] = L"Persistent";
|
||||
STATIC CONST CHAR16 NameEfiUnusableMemory[] = L"UnusableMemory";
|
||||
STATIC CONST CHAR16 NameEfiACPIReclaimMemory[] = L"ACPIReclaimMemory";
|
||||
STATIC CONST CHAR16 NameEfiACPIMemoryNVS[] = L"ACPIMemoryNVS";
|
||||
STATIC CONST CHAR16 NameEfiMemoryMappedIO[] = L"MemoryMappedIO";
|
||||
STATIC CONST CHAR16 NameEfiMemoryMappedIOPortSpace[] = L"MemoryMappedIOPortSpace";
|
||||
STATIC CONST CHAR16 NameEfiPalCode[] = L"PalCode";
|
||||
|
||||
//
|
||||
// Need short names for some memory types
|
||||
//
|
||||
STATIC CONST CHAR16 NameEfiBootServicesCodeShort[] = L"BS_Code";
|
||||
STATIC CONST CHAR16 NameEfiBootServicesDataShort[] = L"BS_Data";
|
||||
STATIC CONST CHAR16 NameEfiRuntimeServicesCodeShort[] = L"RT_Code";
|
||||
STATIC CONST CHAR16 NameEfiRuntimeServicesDataShort[] = L"RT_Data";
|
||||
STATIC CONST CHAR16 NameEfiUnusableMemoryShort[] = L"Unusable";
|
||||
STATIC CONST CHAR16 NameEfiACPIReclaimMemoryShort[] = L"ACPI_Recl";
|
||||
STATIC CONST CHAR16 NameEfiACPIMemoryNVSShort[] = L"ACPI_NVS";
|
||||
STATIC CONST CHAR16 NameEfiMemoryMappedIOShort[] = L"MMIO";
|
||||
STATIC CONST CHAR16 NameEfiMemoryMappedIOPortSpaceShort[] = L"MMIO_Port";
|
||||
STATIC CONST CHAR16 NameEfiBootServicesCodeShort[] = L"BS_Code";
|
||||
STATIC CONST CHAR16 NameEfiBootServicesDataShort[] = L"BS_Data";
|
||||
STATIC CONST CHAR16 NameEfiRuntimeServicesCodeShort[] = L"RT_Code";
|
||||
STATIC CONST CHAR16 NameEfiRuntimeServicesDataShort[] = L"RT_Data";
|
||||
STATIC CONST CHAR16 NameEfiUnusableMemoryShort[] = L"Unusable";
|
||||
STATIC CONST CHAR16 NameEfiACPIReclaimMemoryShort[] = L"ACPI_Recl";
|
||||
STATIC CONST CHAR16 NameEfiACPIMemoryNVSShort[] = L"ACPI_NVS";
|
||||
STATIC CONST CHAR16 NameEfiMemoryMappedIOShort[] = L"MMIO";
|
||||
STATIC CONST CHAR16 NameEfiMemoryMappedIOPortSpaceShort[] = L"MMIO_Port";
|
||||
|
||||
#include "UefiShellDebug1CommandsLib.h"
|
||||
|
||||
typedef struct {
|
||||
UINT32 Type;
|
||||
UINT64 NumberOfPages;
|
||||
LIST_ENTRY Link;
|
||||
UINT32 Type;
|
||||
UINT64 NumberOfPages;
|
||||
LIST_ENTRY Link;
|
||||
} MEMORY_LENGTH_ENTRY;
|
||||
|
||||
/**
|
||||
@ -57,14 +57,14 @@ typedef struct {
|
||||
**/
|
||||
VOID
|
||||
AddMemoryLength (
|
||||
LIST_ENTRY *List,
|
||||
UINT32 Type,
|
||||
UINT64 NumberOfPages
|
||||
LIST_ENTRY *List,
|
||||
UINT32 Type,
|
||||
UINT64 NumberOfPages
|
||||
)
|
||||
{
|
||||
MEMORY_LENGTH_ENTRY *Entry;
|
||||
MEMORY_LENGTH_ENTRY *NewEntry;
|
||||
LIST_ENTRY *Link;
|
||||
MEMORY_LENGTH_ENTRY *Entry;
|
||||
MEMORY_LENGTH_ENTRY *NewEntry;
|
||||
LIST_ENTRY *Link;
|
||||
|
||||
Entry = NULL;
|
||||
for (Link = GetFirstNode (List); !IsNull (List, Link); Link = GetNextNode (List, Link)) {
|
||||
@ -89,7 +89,8 @@ AddMemoryLength (
|
||||
if (NewEntry == NULL) {
|
||||
return;
|
||||
}
|
||||
NewEntry->Type = Type;
|
||||
|
||||
NewEntry->Type = Type;
|
||||
NewEntry->NumberOfPages = 0;
|
||||
InsertTailList (Link, &NewEntry->Link);
|
||||
}
|
||||
@ -110,52 +111,52 @@ ShellCommandRunMemMap (
|
||||
IN EFI_SYSTEM_TABLE *SystemTable
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
UINTN Size;
|
||||
EFI_MEMORY_DESCRIPTOR *Descriptors;
|
||||
UINTN MapKey;
|
||||
UINTN ItemSize;
|
||||
UINT32 Version;
|
||||
EFI_MEMORY_DESCRIPTOR *Walker;
|
||||
UINT64 ReservedPages;
|
||||
UINT64 LoadCodePages;
|
||||
UINT64 LoadDataPages;
|
||||
UINT64 BSCodePages;
|
||||
UINT64 BSDataPages;
|
||||
UINT64 RTDataPages;
|
||||
UINT64 RTCodePages;
|
||||
UINT64 AvailPages;
|
||||
UINT64 TotalPages;
|
||||
UINT64 ReservedPagesSize;
|
||||
UINT64 LoadCodePagesSize;
|
||||
UINT64 LoadDataPagesSize;
|
||||
UINT64 BSCodePagesSize;
|
||||
UINT64 BSDataPagesSize;
|
||||
UINT64 RTDataPagesSize;
|
||||
UINT64 RTCodePagesSize;
|
||||
UINT64 AvailPagesSize;
|
||||
UINT64 TotalPagesSize;
|
||||
UINT64 AcpiReclaimPages;
|
||||
UINT64 AcpiNvsPages;
|
||||
UINT64 MmioSpacePages;
|
||||
UINT64 AcpiReclaimPagesSize;
|
||||
UINT64 AcpiNvsPagesSize;
|
||||
UINT64 MmioSpacePagesSize;
|
||||
UINT64 MmioPortPages;
|
||||
UINT64 MmioPortPagesSize;
|
||||
UINT64 UnusableMemoryPages;
|
||||
UINT64 UnusableMemoryPagesSize;
|
||||
UINT64 PalCodePages;
|
||||
UINT64 PalCodePagesSize;
|
||||
UINT64 PersistentPages;
|
||||
UINT64 PersistentPagesSize;
|
||||
BOOLEAN Sfo;
|
||||
LIST_ENTRY MemoryList;
|
||||
MEMORY_LENGTH_ENTRY *Entry;
|
||||
LIST_ENTRY *Link;
|
||||
EFI_STATUS Status;
|
||||
LIST_ENTRY *Package;
|
||||
CHAR16 *ProblemParam;
|
||||
SHELL_STATUS ShellStatus;
|
||||
UINTN Size;
|
||||
EFI_MEMORY_DESCRIPTOR *Descriptors;
|
||||
UINTN MapKey;
|
||||
UINTN ItemSize;
|
||||
UINT32 Version;
|
||||
EFI_MEMORY_DESCRIPTOR *Walker;
|
||||
UINT64 ReservedPages;
|
||||
UINT64 LoadCodePages;
|
||||
UINT64 LoadDataPages;
|
||||
UINT64 BSCodePages;
|
||||
UINT64 BSDataPages;
|
||||
UINT64 RTDataPages;
|
||||
UINT64 RTCodePages;
|
||||
UINT64 AvailPages;
|
||||
UINT64 TotalPages;
|
||||
UINT64 ReservedPagesSize;
|
||||
UINT64 LoadCodePagesSize;
|
||||
UINT64 LoadDataPagesSize;
|
||||
UINT64 BSCodePagesSize;
|
||||
UINT64 BSDataPagesSize;
|
||||
UINT64 RTDataPagesSize;
|
||||
UINT64 RTCodePagesSize;
|
||||
UINT64 AvailPagesSize;
|
||||
UINT64 TotalPagesSize;
|
||||
UINT64 AcpiReclaimPages;
|
||||
UINT64 AcpiNvsPages;
|
||||
UINT64 MmioSpacePages;
|
||||
UINT64 AcpiReclaimPagesSize;
|
||||
UINT64 AcpiNvsPagesSize;
|
||||
UINT64 MmioSpacePagesSize;
|
||||
UINT64 MmioPortPages;
|
||||
UINT64 MmioPortPagesSize;
|
||||
UINT64 UnusableMemoryPages;
|
||||
UINT64 UnusableMemoryPagesSize;
|
||||
UINT64 PalCodePages;
|
||||
UINT64 PalCodePagesSize;
|
||||
UINT64 PersistentPages;
|
||||
UINT64 PersistentPagesSize;
|
||||
BOOLEAN Sfo;
|
||||
LIST_ENTRY MemoryList;
|
||||
MEMORY_LENGTH_ENTRY *Entry;
|
||||
LIST_ENTRY *Link;
|
||||
|
||||
AcpiReclaimPages = 0;
|
||||
AcpiNvsPages = 0;
|
||||
@ -182,42 +183,43 @@ ShellCommandRunMemMap (
|
||||
//
|
||||
// initialize the shell lib (we must be in non-auto-init...)
|
||||
//
|
||||
Status = ShellInitialize();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = ShellInitialize ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
Status = CommandInit();
|
||||
ASSERT_EFI_ERROR(Status);
|
||||
Status = CommandInit ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
//
|
||||
// parse the command line
|
||||
//
|
||||
Status = ShellCommandLineParse (SfoParamList, &Package, &ProblemParam, TRUE);
|
||||
if (EFI_ERROR(Status)) {
|
||||
if (Status == EFI_VOLUME_CORRUPTED && ProblemParam != NULL) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, L"memmap", ProblemParam);
|
||||
FreePool(ProblemParam);
|
||||
if (EFI_ERROR (Status)) {
|
||||
if ((Status == EFI_VOLUME_CORRUPTED) && (ProblemParam != NULL)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PROBLEM), gShellDebug1HiiHandle, L"memmap", ProblemParam);
|
||||
FreePool (ProblemParam);
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
ASSERT(FALSE);
|
||||
ASSERT (FALSE);
|
||||
}
|
||||
} else {
|
||||
if (ShellCommandLineGetCount(Package) > 1) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"memmap");
|
||||
if (ShellCommandLineGetCount (Package) > 1) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_TOO_MANY), gShellDebug1HiiHandle, L"memmap");
|
||||
ShellStatus = SHELL_INVALID_PARAMETER;
|
||||
} else {
|
||||
Status = gBS->GetMemoryMap(&Size, Descriptors, &MapKey, &ItemSize, &Version);
|
||||
if (Status == EFI_BUFFER_TOO_SMALL){
|
||||
Size += SIZE_1KB;
|
||||
Descriptors = AllocateZeroPool(Size);
|
||||
Status = gBS->GetMemoryMap(&Size, Descriptors, &MapKey, &ItemSize, &Version);
|
||||
Status = gBS->GetMemoryMap (&Size, Descriptors, &MapKey, &ItemSize, &Version);
|
||||
if (Status == EFI_BUFFER_TOO_SMALL) {
|
||||
Size += SIZE_1KB;
|
||||
Descriptors = AllocateZeroPool (Size);
|
||||
Status = gBS->GetMemoryMap (&Size, Descriptors, &MapKey, &ItemSize, &Version);
|
||||
}
|
||||
if (EFI_ERROR(Status)) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MEMMAP_GET_FAILED), gShellDebug1HiiHandle, L"memmap");
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MEMMAP_GET_FAILED), gShellDebug1HiiHandle, L"memmap");
|
||||
ShellStatus = SHELL_ACCESS_DENIED;
|
||||
} else {
|
||||
ASSERT(Version == EFI_MEMORY_DESCRIPTOR_VERSION);
|
||||
ASSERT (Version == EFI_MEMORY_DESCRIPTOR_VERSION);
|
||||
|
||||
Sfo = ShellCommandLineGetFlag(Package, L"-sfo");
|
||||
Sfo = ShellCommandLineGetFlag (Package, L"-sfo");
|
||||
if (!Sfo) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MEMMAP_LIST_HEAD), gShellDebug1HiiHandle);
|
||||
} else {
|
||||
@ -225,79 +227,80 @@ ShellCommandRunMemMap (
|
||||
}
|
||||
|
||||
for ( Walker = Descriptors
|
||||
; (Walker < (EFI_MEMORY_DESCRIPTOR *) ((UINT8*)Descriptors + Size)) && (Walker != NULL)
|
||||
; Walker = (EFI_MEMORY_DESCRIPTOR *) ((UINT8 *)Walker + ItemSize)
|
||||
){
|
||||
; (Walker < (EFI_MEMORY_DESCRIPTOR *)((UINT8 *)Descriptors + Size)) && (Walker != NULL)
|
||||
; Walker = (EFI_MEMORY_DESCRIPTOR *)((UINT8 *)Walker + ItemSize)
|
||||
)
|
||||
{
|
||||
switch (Walker->Type) {
|
||||
case EfiReservedMemoryType:
|
||||
ShellPrintHiiEx(-1, -1, NULL, (EFI_STRING_ID)(!Sfo?STRING_TOKEN (STR_MEMMAP_LIST_ITEM):STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, NameEfiReservedMemoryType, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64(SIZE_4KB,Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
case EfiReservedMemoryType:
|
||||
ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, NameEfiReservedMemoryType, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
ReservedPages += Walker->NumberOfPages;
|
||||
break;
|
||||
case EfiLoaderCode:
|
||||
ShellPrintHiiEx(-1, -1, NULL, (EFI_STRING_ID)(!Sfo?STRING_TOKEN (STR_MEMMAP_LIST_ITEM):STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, NameEfiLoaderCode, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64(SIZE_4KB,Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, NameEfiLoaderCode, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
LoadCodePages += Walker->NumberOfPages;
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
break;
|
||||
case EfiLoaderData:
|
||||
ShellPrintHiiEx(-1, -1, NULL, (EFI_STRING_ID)(!Sfo?STRING_TOKEN (STR_MEMMAP_LIST_ITEM):STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, NameEfiLoaderData, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64(SIZE_4KB,Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, NameEfiLoaderData, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
LoadDataPages += Walker->NumberOfPages;
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
break;
|
||||
case EfiBootServicesCode:
|
||||
ShellPrintHiiEx(-1, -1, NULL, (EFI_STRING_ID)(!Sfo?STRING_TOKEN (STR_MEMMAP_LIST_ITEM):STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo?NameEfiBootServicesCodeShort:NameEfiBootServicesCode, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64(SIZE_4KB,Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo ? NameEfiBootServicesCodeShort : NameEfiBootServicesCode, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
BSCodePages += Walker->NumberOfPages;
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
break;
|
||||
case EfiBootServicesData:
|
||||
ShellPrintHiiEx(-1, -1, NULL, (EFI_STRING_ID)(!Sfo?STRING_TOKEN (STR_MEMMAP_LIST_ITEM):STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo?NameEfiBootServicesDataShort:NameEfiBootServicesData, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64(SIZE_4KB,Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo ? NameEfiBootServicesDataShort : NameEfiBootServicesData, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
BSDataPages += Walker->NumberOfPages;
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
break;
|
||||
case EfiRuntimeServicesCode:
|
||||
ShellPrintHiiEx(-1, -1, NULL, (EFI_STRING_ID)(!Sfo?STRING_TOKEN (STR_MEMMAP_LIST_ITEM):STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo?NameEfiRuntimeServicesCodeShort:NameEfiRuntimeServicesCode, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64(SIZE_4KB,Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo ? NameEfiRuntimeServicesCodeShort : NameEfiRuntimeServicesCode, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
RTCodePages += Walker->NumberOfPages;
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
break;
|
||||
case EfiRuntimeServicesData:
|
||||
ShellPrintHiiEx(-1, -1, NULL, (EFI_STRING_ID)(!Sfo?STRING_TOKEN (STR_MEMMAP_LIST_ITEM):STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo?NameEfiRuntimeServicesDataShort:NameEfiRuntimeServicesData, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64(SIZE_4KB,Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo ? NameEfiRuntimeServicesDataShort : NameEfiRuntimeServicesData, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
RTDataPages += Walker->NumberOfPages;
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
break;
|
||||
case EfiConventionalMemory:
|
||||
ShellPrintHiiEx(-1, -1, NULL, (EFI_STRING_ID)(!Sfo?STRING_TOKEN (STR_MEMMAP_LIST_ITEM):STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, NameEfiConventionalMemory, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64(SIZE_4KB,Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, NameEfiConventionalMemory, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
AvailPages += Walker->NumberOfPages;
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
break;
|
||||
case EfiPersistentMemory:
|
||||
ShellPrintHiiEx(-1, -1, NULL, (EFI_STRING_ID)(!Sfo?STRING_TOKEN (STR_MEMMAP_LIST_ITEM):STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, NameEfiPersistentMemory, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64(SIZE_4KB,Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, NameEfiPersistentMemory, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
PersistentPages += Walker->NumberOfPages;
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
break;
|
||||
case EfiUnusableMemory:
|
||||
ShellPrintHiiEx(-1, -1, NULL, (EFI_STRING_ID)(!Sfo?STRING_TOKEN (STR_MEMMAP_LIST_ITEM):STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo?NameEfiUnusableMemoryShort:NameEfiUnusableMemory, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64(SIZE_4KB,Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo ? NameEfiUnusableMemoryShort : NameEfiUnusableMemory, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
UnusableMemoryPages += Walker->NumberOfPages;
|
||||
break;
|
||||
case EfiACPIReclaimMemory:
|
||||
ShellPrintHiiEx(-1, -1, NULL, (EFI_STRING_ID)(!Sfo?STRING_TOKEN (STR_MEMMAP_LIST_ITEM):STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo?NameEfiACPIReclaimMemoryShort:NameEfiACPIReclaimMemory, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64(SIZE_4KB,Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo ? NameEfiACPIReclaimMemoryShort : NameEfiACPIReclaimMemory, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
AcpiReclaimPages += Walker->NumberOfPages;
|
||||
break;
|
||||
case EfiACPIMemoryNVS:
|
||||
ShellPrintHiiEx(-1, -1, NULL, (EFI_STRING_ID)(!Sfo?STRING_TOKEN (STR_MEMMAP_LIST_ITEM):STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo?NameEfiACPIMemoryNVSShort:NameEfiACPIMemoryNVS, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64(SIZE_4KB,Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
AcpiNvsPages += Walker->NumberOfPages;
|
||||
ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo ? NameEfiACPIMemoryNVSShort : NameEfiACPIMemoryNVS, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
AcpiNvsPages += Walker->NumberOfPages;
|
||||
break;
|
||||
case EfiMemoryMappedIO:
|
||||
ShellPrintHiiEx(-1, -1, NULL, (EFI_STRING_ID)(!Sfo?STRING_TOKEN (STR_MEMMAP_LIST_ITEM):STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo?NameEfiMemoryMappedIOShort:NameEfiMemoryMappedIO, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64(SIZE_4KB,Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
MmioSpacePages += Walker->NumberOfPages;
|
||||
ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo ? NameEfiMemoryMappedIOShort : NameEfiMemoryMappedIO, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
MmioSpacePages += Walker->NumberOfPages;
|
||||
break;
|
||||
case EfiMemoryMappedIOPortSpace:
|
||||
ShellPrintHiiEx(-1, -1, NULL, (EFI_STRING_ID)(!Sfo?STRING_TOKEN (STR_MEMMAP_LIST_ITEM):STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo?NameEfiMemoryMappedIOPortSpaceShort:NameEfiMemoryMappedIOPortSpace, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64(SIZE_4KB,Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, !Sfo ? NameEfiMemoryMappedIOPortSpaceShort : NameEfiMemoryMappedIOPortSpace, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
MmioPortPages += Walker->NumberOfPages;
|
||||
break;
|
||||
case EfiPalCode:
|
||||
ShellPrintHiiEx(-1, -1, NULL, (EFI_STRING_ID)(!Sfo?STRING_TOKEN (STR_MEMMAP_LIST_ITEM):STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, NameEfiPalCode, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64(SIZE_4KB,Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
ShellPrintHiiEx (-1, -1, NULL, (EFI_STRING_ID)(!Sfo ? STRING_TOKEN (STR_MEMMAP_LIST_ITEM) : STRING_TOKEN (STR_MEMMAP_LIST_ITEM_SFO)), gShellDebug1HiiHandle, NameEfiPalCode, Walker->PhysicalStart, Walker->PhysicalStart+MultU64x64 (SIZE_4KB, Walker->NumberOfPages)-1, Walker->NumberOfPages, Walker->Attribute);
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
PalCodePages += Walker->NumberOfPages;
|
||||
break;
|
||||
default:
|
||||
@ -308,46 +311,67 @@ ShellCommandRunMemMap (
|
||||
if (!Sfo) {
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MEMMAP_LIST_ITEM_OTHER), gShellDebug1HiiHandle, Walker->Type, Walker->PhysicalStart, Walker->PhysicalStart + MultU64x64 (SIZE_4KB, Walker->NumberOfPages) - 1, Walker->NumberOfPages, Walker->Attribute);
|
||||
}
|
||||
|
||||
TotalPages += Walker->NumberOfPages;
|
||||
AddMemoryLength (&MemoryList, Walker->Type, Walker->NumberOfPages);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
// print the summary
|
||||
//
|
||||
ReservedPagesSize = MultU64x64(SIZE_4KB,ReservedPages);
|
||||
LoadCodePagesSize = MultU64x64(SIZE_4KB,LoadCodePages);
|
||||
LoadDataPagesSize = MultU64x64(SIZE_4KB,LoadDataPages);
|
||||
BSCodePagesSize = MultU64x64(SIZE_4KB,BSCodePages);
|
||||
BSDataPagesSize = MultU64x64(SIZE_4KB,BSDataPages);
|
||||
RTDataPagesSize = MultU64x64(SIZE_4KB,RTDataPages);
|
||||
RTCodePagesSize = MultU64x64(SIZE_4KB,RTCodePages);
|
||||
AvailPagesSize = MultU64x64(SIZE_4KB,AvailPages);
|
||||
TotalPagesSize = MultU64x64(SIZE_4KB,TotalPages);
|
||||
AcpiReclaimPagesSize = MultU64x64(SIZE_4KB,AcpiReclaimPages);
|
||||
AcpiNvsPagesSize = MultU64x64(SIZE_4KB,AcpiNvsPages);
|
||||
MmioSpacePagesSize = MultU64x64(SIZE_4KB,MmioSpacePages);
|
||||
MmioPortPagesSize = MultU64x64(SIZE_4KB,MmioPortPages);
|
||||
PalCodePagesSize = MultU64x64(SIZE_4KB,PalCodePages);
|
||||
PersistentPagesSize = MultU64x64(SIZE_4KB,PersistentPages);
|
||||
UnusableMemoryPagesSize = MultU64x64(SIZE_4KB,UnusableMemoryPages);
|
||||
ReservedPagesSize = MultU64x64 (SIZE_4KB, ReservedPages);
|
||||
LoadCodePagesSize = MultU64x64 (SIZE_4KB, LoadCodePages);
|
||||
LoadDataPagesSize = MultU64x64 (SIZE_4KB, LoadDataPages);
|
||||
BSCodePagesSize = MultU64x64 (SIZE_4KB, BSCodePages);
|
||||
BSDataPagesSize = MultU64x64 (SIZE_4KB, BSDataPages);
|
||||
RTDataPagesSize = MultU64x64 (SIZE_4KB, RTDataPages);
|
||||
RTCodePagesSize = MultU64x64 (SIZE_4KB, RTCodePages);
|
||||
AvailPagesSize = MultU64x64 (SIZE_4KB, AvailPages);
|
||||
TotalPagesSize = MultU64x64 (SIZE_4KB, TotalPages);
|
||||
AcpiReclaimPagesSize = MultU64x64 (SIZE_4KB, AcpiReclaimPages);
|
||||
AcpiNvsPagesSize = MultU64x64 (SIZE_4KB, AcpiNvsPages);
|
||||
MmioSpacePagesSize = MultU64x64 (SIZE_4KB, MmioSpacePages);
|
||||
MmioPortPagesSize = MultU64x64 (SIZE_4KB, MmioPortPages);
|
||||
PalCodePagesSize = MultU64x64 (SIZE_4KB, PalCodePages);
|
||||
PersistentPagesSize = MultU64x64 (SIZE_4KB, PersistentPages);
|
||||
UnusableMemoryPagesSize = MultU64x64 (SIZE_4KB, UnusableMemoryPages);
|
||||
if (!Sfo) {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MEMMAP_LIST_SUMM), gShellDebug1HiiHandle,
|
||||
ReservedPages, ReservedPagesSize,
|
||||
LoadCodePages, LoadCodePagesSize,
|
||||
LoadDataPages, LoadDataPagesSize,
|
||||
BSCodePages, BSCodePagesSize,
|
||||
BSDataPages, BSDataPagesSize,
|
||||
RTCodePages, RTCodePagesSize,
|
||||
RTDataPages, RTDataPagesSize,
|
||||
AcpiReclaimPages, AcpiReclaimPagesSize,
|
||||
AcpiNvsPages, AcpiNvsPagesSize,
|
||||
MmioSpacePages, MmioSpacePagesSize,
|
||||
MmioPortPages, MmioPortPagesSize,
|
||||
PalCodePages, PalCodePagesSize,
|
||||
AvailPages, AvailPagesSize,
|
||||
PersistentPages, PersistentPagesSize
|
||||
ShellPrintHiiEx (
|
||||
-1,
|
||||
-1,
|
||||
NULL,
|
||||
STRING_TOKEN (STR_MEMMAP_LIST_SUMM),
|
||||
gShellDebug1HiiHandle,
|
||||
ReservedPages,
|
||||
ReservedPagesSize,
|
||||
LoadCodePages,
|
||||
LoadCodePagesSize,
|
||||
LoadDataPages,
|
||||
LoadDataPagesSize,
|
||||
BSCodePages,
|
||||
BSCodePagesSize,
|
||||
BSDataPages,
|
||||
BSDataPagesSize,
|
||||
RTCodePages,
|
||||
RTCodePagesSize,
|
||||
RTDataPages,
|
||||
RTDataPagesSize,
|
||||
AcpiReclaimPages,
|
||||
AcpiReclaimPagesSize,
|
||||
AcpiNvsPages,
|
||||
AcpiNvsPagesSize,
|
||||
MmioSpacePages,
|
||||
MmioSpacePagesSize,
|
||||
MmioPortPages,
|
||||
MmioPortPagesSize,
|
||||
PalCodePages,
|
||||
PalCodePagesSize,
|
||||
AvailPages,
|
||||
AvailPagesSize,
|
||||
PersistentPages,
|
||||
PersistentPagesSize
|
||||
);
|
||||
|
||||
//
|
||||
@ -355,16 +379,34 @@ ShellCommandRunMemMap (
|
||||
//
|
||||
for (Link = GetFirstNode (&MemoryList); !IsNull (&MemoryList, Link); Link = GetNextNode (&MemoryList, Link)) {
|
||||
Entry = BASE_CR (Link, MEMORY_LENGTH_ENTRY, Link);
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MEMMAP_LIST_SUMM_OTHER), gShellDebug1HiiHandle,
|
||||
Entry->Type, Entry->NumberOfPages, MultU64x64 (SIZE_4KB, Entry->NumberOfPages)
|
||||
ShellPrintHiiEx (
|
||||
-1,
|
||||
-1,
|
||||
NULL,
|
||||
STRING_TOKEN (STR_MEMMAP_LIST_SUMM_OTHER),
|
||||
gShellDebug1HiiHandle,
|
||||
Entry->Type,
|
||||
Entry->NumberOfPages,
|
||||
MultU64x64 (SIZE_4KB, Entry->NumberOfPages)
|
||||
);
|
||||
}
|
||||
|
||||
ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_MEMMAP_LIST_SUMM2), gShellDebug1HiiHandle,
|
||||
DivU64x32(MultU64x64(SIZE_4KB,TotalPages), SIZE_1MB), TotalPagesSize
|
||||
);
|
||||
ShellPrintHiiEx (
|
||||
-1,
|
||||
-1,
|
||||
NULL,
|
||||
STRING_TOKEN (STR_MEMMAP_LIST_SUMM2),
|
||||
gShellDebug1HiiHandle,
|
||||
DivU64x32 (MultU64x64 (SIZE_4KB, TotalPages), SIZE_1MB),
|
||||
TotalPagesSize
|
||||
);
|
||||
} else {
|
||||
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_MEMMAP_LIST_SUMM_SFO), gShellDebug1HiiHandle,
|
||||
ShellPrintHiiEx (
|
||||
-1,
|
||||
-1,
|
||||
NULL,
|
||||
STRING_TOKEN (STR_MEMMAP_LIST_SUMM_SFO),
|
||||
gShellDebug1HiiHandle,
|
||||
TotalPagesSize,
|
||||
ReservedPagesSize,
|
||||
BSCodePagesSize,
|
||||
@ -381,15 +423,16 @@ ShellCommandRunMemMap (
|
||||
AcpiNvsPagesSize,
|
||||
PalCodePagesSize,
|
||||
PersistentPagesSize
|
||||
);
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ShellCommandLineFreeVarList (Package);
|
||||
}
|
||||
|
||||
if (Descriptors != NULL) {
|
||||
FreePool(Descriptors);
|
||||
FreePool (Descriptors);
|
||||
}
|
||||
|
||||
//
|
||||
@ -401,4 +444,3 @@ ShellCommandRunMemMap (
|
||||
|
||||
return (ShellStatus);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user