VirtualBox

Ignore:
Timestamp:
Sep 27, 2023 1:34:02 PM (19 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
159276
Message:

EFI/FirmwareNew: Make edk2-stable202308 build on all supported platforms (using gcc at least, msvc not tested yet), bugref:4643

Location:
trunk/src/VBox/Devices/EFI/FirmwareNew
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/EFI/FirmwareNew

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/Dblk.c

    r99404 r101291  
    159159        }
    160160
    161         ShellConvertStringToUint64 (LbaString, &Lba, TRUE, FALSE);
     161        if (EFI_ERROR (ShellConvertStringToUint64 (LbaString, &Lba, TRUE, FALSE))) {
     162          ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dblk", LbaString);
     163          ShellStatus = SHELL_INVALID_PARAMETER;
     164        }
    162165      }
    163166
    … …  
    170173        }
    171174
    172         ShellConvertStringToUint64 (BlockCountString, &BlockCount, TRUE, FALSE);
    173         if (BlockCount > 0x10) {
    174           BlockCount = 0x10;
    175         } else if (BlockCount == 0) {
    176           ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dblk", BlockCountString);
    177           ShellStatus = SHELL_INVALID_PARAMETER;
     175        if (!EFI_ERROR (ShellConvertStringToUint64 (BlockCountString, &BlockCount, TRUE, FALSE))) {
     176          if (BlockCount > 0x10) {
     177            BlockCount = 0x10;
     178          } else if (BlockCount == 0) {
     179            ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_GEN_PARAM_INV), gShellDebug1HiiHandle, L"dblk", BlockCountString);
     180            ShellStatus = SHELL_INVALID_PARAMETER;
     181          }
    178182        }
    179183      }

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/Dmem.c

    r99404 r101291  
    1111#include "UefiShellDebug1CommandsLib.h"
    1212#include <Protocol/PciRootBridgeIo.h>
     13#include <Protocol/HiiDatabase.h>
    1314#include <Guid/Acpi.h>
    1415#include <Guid/Mps.h>
    1516#include <Guid/SmBios.h>
     17#include <Guid/MemoryAttributesTable.h>
     18#include <Guid/RtPropertiesTable.h>
     19#include <Guid/SystemResourceTable.h>
     20#include <Guid/DebugImageInfoTable.h>
     21#include <Guid/ImageAuthentication.h>
    1622
    1723/**
    … …  
    109115  UINT64        SmbiosTableAddress;
    110116  UINT64        MpsTableAddress;
     117  UINT64        DtbTableAddress;
     118  UINT64        MemoryAttributesTableAddress;
     119  UINT64        RtPropertiesTableAddress;
     120  UINT64        SystemResourceTableAddress;
     121  UINT64        DebugImageInfoTableAddress;
     122  UINT64        ImageExecutionTableAddress;
     123  UINT64        JsonConfigDataTableAddress;
     124  UINT64        JsonCapsuleDataTableAddress;
     125  UINT64        JsonCapsuleResultTableAddress;
     126  UINT64        MemoryRangeCapsuleAddress;
     127  UINT64        HiiDatabaseExportBufferAddress;
     128  UINT64        ConformanceProfileTableAddress;
    111129  UINTN         TableWalker;
    112130
    … …  
    169187        DumpHex (2, (UINTN)Address, (UINTN)Size, Address);
    170188        if (Address == (VOID *)gST) {
    171           Acpi20TableAddress = 0;
    172           AcpiTableAddress   = 0;
    173           SalTableAddress    = 0;
    174           SmbiosTableAddress = 0;
    175           MpsTableAddress    = 0;
     189          Acpi20TableAddress             = 0;
     190          AcpiTableAddress               = 0;
     191          SalTableAddress                = 0;
     192          SmbiosTableAddress             = 0;
     193          MpsTableAddress                = 0;
     194          DtbTableAddress                = 0;
     195          MemoryAttributesTableAddress   = 0;
     196          RtPropertiesTableAddress       = 0;
     197          SystemResourceTableAddress     = 0;
     198          DebugImageInfoTableAddress     = 0;
     199          ImageExecutionTableAddress     = 0;
     200          JsonConfigDataTableAddress     = 0;
     201          JsonCapsuleDataTableAddress    = 0;
     202          JsonCapsuleResultTableAddress  = 0;
     203          MemoryRangeCapsuleAddress      = 0;
     204          HiiDatabaseExportBufferAddress = 0;
     205          ConformanceProfileTableAddress = 0;
    176206          for (TableWalker = 0; TableWalker < gST->NumberOfTableEntries; TableWalker++) {
    177207            if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiAcpi20TableGuid)) {
    … …  
    197227            if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiMpsTableGuid)) {
    198228              MpsTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
     229              continue;
     230            }
     231
     232            if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiMemoryAttributesTableGuid)) {
     233              MemoryAttributesTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
     234              continue;
     235            }
     236
     237            if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiRtPropertiesTableGuid)) {
     238              RtPropertiesTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
     239              continue;
     240            }
     241
     242            if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiSystemResourceTableGuid)) {
     243              SystemResourceTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
     244              continue;
     245            }
     246
     247            if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiDebugImageInfoTableGuid)) {
     248              DebugImageInfoTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
     249              continue;
     250            }
     251
     252            if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiImageSecurityDatabaseGuid)) {
     253              ImageExecutionTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
     254              continue;
     255            }
     256
     257            if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiJsonConfigDataTableGuid)) {
     258              JsonConfigDataTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
     259              continue;
     260            }
     261
     262            if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiJsonCapsuleDataTableGuid)) {
     263              JsonCapsuleDataTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
     264              continue;
     265            }
     266
     267            if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiJsonCapsuleResultTableGuid)) {
     268              JsonCapsuleResultTableAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
     269              continue;
     270            }
     271
     272            if (CompareGuid (&gST->ConfigurationTable[TableWalker].VendorGuid, &gEfiHiiDatabaseProtocolGuid)) {
     273              HiiDatabaseExportBufferAddress = (UINT64)(UINTN)gST->ConfigurationTable[TableWalker].VendorTable;
    199274              continue;
    200275            }
    … …  
    219294            Acpi20TableAddress,
    220295            MpsTableAddress,
    221             SmbiosTableAddress
     296            SmbiosTableAddress,
     297            DtbTableAddress,
     298            MemoryAttributesTableAddress,
     299            RtPropertiesTableAddress,
     300            SystemResourceTableAddress,
     301            DebugImageInfoTableAddress,
     302            ImageExecutionTableAddress,
     303            JsonConfigDataTableAddress,
     304            JsonCapsuleDataTableAddress,
     305            JsonCapsuleResultTableAddress,
     306            MemoryRangeCapsuleAddress,
     307            HiiDatabaseExportBufferAddress,
     308            ConformanceProfileTableAddress
    222309            );
    223310        }

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/EfiDecompress.c

    r99404 r101291  
    113113        if (ShellStatus == SHELL_SUCCESS) {
    114114          Status = FileHandleGetSize (InFileHandle, &Temp64Bit);
    115           ASSERT (Temp64Bit <= (UINT32)(-1));
    116           InSize = (UINTN)Temp64Bit;
    117115          ASSERT_EFI_ERROR (Status);
    118           InBuffer = AllocateZeroPool (InSize);
     116          if (!EFI_ERROR (Status)) {
     117            ASSERT (Temp64Bit <= (UINT32)(-1));
     118            InSize   = (UINTN)Temp64Bit;
     119            InBuffer = AllocateZeroPool (InSize);
     120          }
     121
    119122          if (InBuffer == NULL) {
    120123            Status = EFI_OUT_OF_RESOURCES;

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c

    r99404 r101291  
    66  (C) Copyright 2014 Hewlett-Packard Development Company, L.P.<BR>
    77  (C) Copyright 2015-2019 Hewlett Packard Enterprise Development LP<BR>
     8  Copyright (c) 2023 Apple Inc. All rights reserved.<BR>
     9  Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
    810  SPDX-License-Identifier: BSD-2-Clause-Patent
    911
    … …  
    136138  )
    137139{
    138   UINT8  Anchor[5];
     140  UINT8  Anchor[SMBIOS_ANCHOR_STRING_LENGTH + 1]; // Including terminating NULL character
    139141  UINT8  InAnchor[6];
    140142
    … …  
    150152  if (Option >= SHOW_NORMAL) {
    151153    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ENTRY_POINT_SIGN), gShellDebug1HiiHandle);
    152     MemToString (Anchor, SmbiosTable->AnchorString, 4);
     154    MemToString (Anchor, SmbiosTable->AnchorString, SMBIOS_ANCHOR_STRING_LENGTH);
    153155    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ANCHOR_STR), gShellDebug1HiiHandle, Anchor);
    154156    ShellPrintHiiEx (
    … …  
    221223  )
    222224{
    223   UINT8  Anchor[5];
     225  UINT8  Anchor[SMBIOS_3_0_ANCHOR_STRING_LENGTH + 1]; // Including terminating NULL character
    224226
    225227  if (SmbiosTable == NULL) {
    … …  
    235237    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_64_BIT_ENTRY_POINT_SIGN), gShellDebug1HiiHandle);
    236238
    237     MemToString (Anchor, SmbiosTable->AnchorString, 5);
     239    MemToString (Anchor, SmbiosTable->AnchorString, SMBIOS_3_0_ANCHOR_STRING_LENGTH);
    238240    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_ANCHOR_STR), gShellDebug1HiiHandle, Anchor);
    239241
    … …  
    306308  )
    307309{
    308   UINT8  Index;
    309   UINT8  Index2;
    310   UINT8  *Buffer;
     310  UINT8       Index;
     311  UINT8       Index2;
     312  UINT8       *Buffer;
     313  EFI_STRING  String;
    311314
    312315  if (Struct == NULL) {
    … …  
    336339    //
    337340    case 0:
    338       PRINT_PENDING_STRING (Struct, Type0, Vendor);
    339       PRINT_PENDING_STRING (Struct, Type0, BiosVersion);
    340       PRINT_STRUCT_VALUE_H (Struct, Type0, BiosSegment);
    341       PRINT_PENDING_STRING (Struct, Type0, BiosReleaseDate);
    342       ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE), gShellDebug1HiiHandle, 64 * (Struct->Type0->BiosSize + 1));
     341      ShellPrintEx (-1, -1, L"Vendor: %a\n", LibGetSmbiosString (Struct, Struct->Type0->Vendor));
     342      ShellPrintEx (-1, -1, L"BIOS Version: %a\n", LibGetSmbiosString (Struct, Struct->Type0->BiosVersion));
     343      ShellPrintEx (-1, -1, L"BIOS Starting Address Segment: 0x%x\n", Struct->Type0->BiosSegment);
     344      ShellPrintEx (-1, -1, L"BIOS Release Date: %a\n", LibGetSmbiosString (Struct, Struct->Type0->BiosReleaseDate));
     345      if ((Struct->Type0->BiosSize != 0xFF) || !(AE_SMBIOS_VERSION (0x3, 0x1))) {
     346        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE), gShellDebug1HiiHandle, 64 * (Struct->Type0->BiosSize + 1));
     347      }
    343348
    344349      DisplayBiosCharacteristics (ReadUnaligned64 ((UINT64 *)(UINTN)&(Struct->Type0->BiosCharacteristics)), Option);
    … …  
    353358
    354359      if (AE_SMBIOS_VERSION (0x2, 0x4) && (Struct->Hdr->Length > 0x14)) {
    355         PRINT_STRUCT_VALUE (Struct, Type0, SystemBiosMajorRelease);
    356         PRINT_STRUCT_VALUE (Struct, Type0, SystemBiosMinorRelease);
    357         PRINT_STRUCT_VALUE (Struct, Type0, EmbeddedControllerFirmwareMajorRelease);
    358         PRINT_STRUCT_VALUE (Struct, Type0, EmbeddedControllerFirmwareMinorRelease);
     360        ShellPrintEx (-1, -1, L"System BIOS Major Release: %u\n", Struct->Type0->SystemBiosMajorRelease);
     361        ShellPrintEx (-1, -1, L"System BIOS Minor Release: %u\n", Struct->Type0->SystemBiosMinorRelease);
     362        ShellPrintEx (-1, -1, L"Embedded Controller Firmware Major Release: %u\n", Struct->Type0->EmbeddedControllerFirmwareMajorRelease);
     363        ShellPrintEx (-1, -1, L"Embedded Controller Firmware Minor Release: %u\n", Struct->Type0->EmbeddedControllerFirmwareMinorRelease);
    359364      }
    360365
    … …  
    471476    //
    472477    case 4:
    473       PRINT_SMBIOS_STRING (Struct, Struct->Type4->Socket, SocketDesignation)
     478      ShellPrintEx (-1, -1, L"Socket Designation: %a\n", LibGetSmbiosString (Struct, Struct->Type4->Socket));
    474479      DisplayProcessorType (Struct->Type4->ProcessorType, Option);
    475       if (AE_SMBIOS_VERSION (0x2, 0x6) && (Struct->Hdr->Length > 0x28) &&
    476           (Struct->Type4->ProcessorFamily == 0xFE))
    477       {
    478         //
    479         // Get family from ProcessorFamily2 field
    480         //
    481         DisplayProcessorFamily2 (Struct->Type4->ProcessorFamily2, Option);
    482       } else {
    483         DisplayProcessorFamily (Struct->Type4->ProcessorFamily, Option);
    484       }
    485 
    486       PRINT_PENDING_STRING (Struct, Type4, ProcessorManufacturer);
    487       PRINT_BIT_FIELD (Struct, Type4, ProcessorId, 8);
    488       PRINT_PENDING_STRING (Struct, Type4, ProcessorVersion);
     480      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY), gShellDebug1HiiHandle);
     481      DisplayProcessorFamily (Struct->Type4->ProcessorFamily, Option);
     482      ShellPrintEx (-1, -1, L"Processor Manufacturer: %a\n", LibGetSmbiosString (Struct, Struct->Type4->ProcessorManufacturer));
     483      ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_ID), gShellDebug1HiiHandle, 8);
     484      DumpHex (0, 0, 8, &(Struct->Type4->ProcessorId));
     485      ShellPrintEx (-1, -1, L"Processor Version: %a\n", LibGetSmbiosString (Struct, Struct->Type4->ProcessorVersion));
    489486      DisplayProcessorVoltage (*(UINT8 *)&(Struct->Type4->Voltage), Option);
    490       PRINT_STRUCT_VALUE (Struct, Type4, ExternalClock);
    491       PRINT_STRUCT_VALUE (Struct, Type4, MaxSpeed);
    492       PRINT_STRUCT_VALUE (Struct, Type4, CurrentSpeed);
     487      ShellPrintEx (-1, -1, L"External Clock: %u\n", Struct->Type4->ExternalClock);
     488      ShellPrintEx (-1, -1, L"Max Speed: %u\n", Struct->Type4->MaxSpeed);
     489      ShellPrintEx (-1, -1, L"Current Speed: %u\n", Struct->Type4->CurrentSpeed);
    493490      DisplayProcessorStatus (Struct->Type4->Status, Option);
    494491      DisplayProcessorUpgrade (Struct->Type4->ProcessorUpgrade, Option);
    495       PRINT_STRUCT_VALUE_H (Struct, Type4, L1CacheHandle);
    496       PRINT_STRUCT_VALUE_H (Struct, Type4, L2CacheHandle);
    497       PRINT_STRUCT_VALUE_H (Struct, Type4, L3CacheHandle);
     492      ShellPrintEx (-1, -1, L"L1 Cache Handle: 0x%x\n", Struct->Type4->L1CacheHandle);
     493      ShellPrintEx (-1, -1, L"L2 Cache Handle: 0x%x\n", Struct->Type4->L2CacheHandle);
     494      ShellPrintEx (-1, -1, L"L3 Cache Handle: 0x%x\n", Struct->Type4->L3CacheHandle);
    498495      if (AE_SMBIOS_VERSION (0x2, 0x3) && (Struct->Hdr->Length > 0x20)) {
    499         PRINT_PENDING_STRING (Struct, Type4, SerialNumber);
    500         PRINT_PENDING_STRING (Struct, Type4, AssetTag);
    501         PRINT_PENDING_STRING (Struct, Type4, PartNumber);
     496        ShellPrintEx (-1, -1, L"Serial Number: %a\n", LibGetSmbiosString (Struct, Struct->Type4->SerialNumber));
     497        ShellPrintEx (-1, -1, L"Asset Tag: %a\n", LibGetSmbiosString (Struct, Struct->Type4->AssetTag));
     498        ShellPrintEx (-1, -1, L"Part Number: %a\n", LibGetSmbiosString (Struct, Struct->Type4->PartNumber));
    502499      }
    503500
    504501      if (AE_SMBIOS_VERSION (0x2, 0x5) && (Struct->Hdr->Length > 0x23)) {
    505         PRINT_STRUCT_VALUE (Struct, Type4, CoreCount);
    506         PRINT_STRUCT_VALUE (Struct, Type4, EnabledCoreCount);
    507         PRINT_STRUCT_VALUE (Struct, Type4, ThreadCount);
     502        ShellPrintEx (-1, -1, L"Core Count: %u\n", Struct->Type4->CoreCount);
     503        ShellPrintEx (-1, -1, L"Core Enabled: %u\n", Struct->Type4->EnabledCoreCount);
     504        ShellPrintEx (-1, -1, L"Thread Count: %u\n", Struct->Type4->ThreadCount);
    508505        DisplayProcessorCharacteristics (Struct->Type4->ProcessorCharacteristics, Option);
    509506      }
    510507
     508      if (AE_SMBIOS_VERSION (0x2, 0x6) && (Struct->Hdr->Length > 0x28)) {
     509        ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY2), gShellDebug1HiiHandle);
     510        if (Struct->Type4->ProcessorFamily2 >= 0x100) {
     511          DisplayProcessorFamily2 (Struct->Type4->ProcessorFamily2, Option);
     512        } else {
     513          DisplayProcessorFamily ((UINT8)Struct->Type4->ProcessorFamily2, Option);
     514        }
     515      }
     516
    511517      if ((SmbiosMajorVersion >= 0x3) && (Struct->Hdr->Length > 0x2A)) {
    512         PRINT_STRUCT_VALUE (Struct, Type4, CoreCount2);
    513         PRINT_STRUCT_VALUE (Struct, Type4, EnabledCoreCount2);
    514         PRINT_STRUCT_VALUE (Struct, Type4, ThreadCount2);
     518        ShellPrintEx (-1, -1, L"Core Count 2: %u\n", Struct->Type4->CoreCount2);
     519        ShellPrintEx (-1, -1, L"Core Enabled 2: %u\n", Struct->Type4->EnabledCoreCount2);
     520        ShellPrintEx (-1, -1, L"Thread Count 2: %u\n", Struct->Type4->ThreadCount2);
    515521      }
    516522
    … …  
    830836    //
    831837    case 17:
    832       PRINT_STRUCT_VALUE_H (Struct, Type17, MemoryArrayHandle);
    833       PRINT_STRUCT_VALUE_H (Struct, Type17, MemoryErrorInformationHandle);
    834       PRINT_STRUCT_VALUE_H (Struct, Type17, TotalWidth);
    835       PRINT_STRUCT_VALUE_H (Struct, Type17, DataWidth);
     838      ShellPrintEx (-1, -1, L"Physical Memory Array Handle: 0x%x\n", Struct->Type17->MemoryArrayHandle);
     839      ShellPrintEx (-1, -1, L"Memory Error Information Handle: 0x%x\n", Struct->Type17->MemoryErrorInformationHandle);
     840      ShellPrintEx (-1, -1, L"Total Width: 0x%x\n", Struct->Type17->TotalWidth);
     841      ShellPrintEx (-1, -1, L"Data Width: 0x%x\n", Struct->Type17->DataWidth);
    836842      PRINT_STRUCT_VALUE (Struct, Type17, Size);
    837843      DisplayMemoryDeviceFormFactor (Struct->Type17->FormFactor, Option);
    838       PRINT_STRUCT_VALUE_H (Struct, Type17, DeviceSet);
    839       PRINT_PENDING_STRING (Struct, Type17, DeviceLocator);
    840       PRINT_PENDING_STRING (Struct, Type17, BankLocator);
     844      ShellPrintEx (-1, -1, L"Device Set: 0x%x\n", Struct->Type17->DeviceSet);
     845      ShellPrintEx (-1, -1, L"Device Locator: %a\n", LibGetSmbiosString (Struct, Struct->Type17->DeviceLocator));
     846      ShellPrintEx (-1, -1, L"Bank Locator: %a\n", LibGetSmbiosString (Struct, Struct->Type17->BankLocator));
    841847      DisplayMemoryDeviceType (Struct->Type17->MemoryType, Option);
    842848      DisplayMemoryDeviceTypeDetail (ReadUnaligned16 ((UINT16 *)(UINTN)&(Struct->Type17->TypeDetail)), Option);
    843849      PRINT_STRUCT_VALUE_H (Struct, Type17, Speed);
    844850      PRINT_PENDING_STRING (Struct, Type17, Manufacturer);
    845       PRINT_PENDING_STRING (Struct, Type17, SerialNumber);
    846       PRINT_PENDING_STRING (Struct, Type17, AssetTag);
    847       PRINT_PENDING_STRING (Struct, Type17, PartNumber);
     851      ShellPrintEx (-1, -1, L"Serial Number: %a\n", LibGetSmbiosString (Struct, Struct->Type17->SerialNumber));
     852      ShellPrintEx (-1, -1, L"Asset Tag: %a\n", LibGetSmbiosString (Struct, Struct->Type17->AssetTag));
     853      ShellPrintEx (-1, -1, L"Part Number: %a\n", LibGetSmbiosString (Struct, Struct->Type17->PartNumber));
    848854      if (AE_SMBIOS_VERSION (0x2, 0x6) && (Struct->Hdr->Length > 0x1B)) {
    849855        PRINT_STRUCT_VALUE_H (Struct, Type17, Attributes);
    … …  
    851857
    852858      if (AE_SMBIOS_VERSION (0x2, 0x7) && (Struct->Hdr->Length > 0x1C)) {
    853         PRINT_STRUCT_VALUE (Struct, Type17, ExtendedSize);
    854         PRINT_STRUCT_VALUE_H (Struct, Type17, ConfiguredMemoryClockSpeed);
     859        ShellPrintEx (-1, -1, L"Extended Size: %u\n", Struct->Type17->ExtendedSize);
     860        ShellPrintEx (-1, -1, L"Configured Memory Speed: 0x%x\n", Struct->Type17->ConfiguredMemoryClockSpeed);
    855861      }
    856862
    857863      if (AE_SMBIOS_VERSION (0x2, 0x8) && (Struct->Hdr->Length > 0x22)) {
    858         PRINT_STRUCT_VALUE (Struct, Type17, MinimumVoltage);
    859         PRINT_STRUCT_VALUE (Struct, Type17, MaximumVoltage);
    860         PRINT_STRUCT_VALUE (Struct, Type17, ConfiguredVoltage);
     864        ShellPrintEx (-1, -1, L"Minimum voltage: %u\n", Struct->Type17->MinimumVoltage);
     865        ShellPrintEx (-1, -1, L"Maximum voltage: %u\n", Struct->Type17->MaximumVoltage);
     866        ShellPrintEx (-1, -1, L"Configured voltage: %u\n", Struct->Type17->ConfiguredVoltage);
    861867      }
    862868
    … …  
    865871          DisplayMemoryDeviceMemoryTechnology (Struct->Type17->MemoryTechnology, Option);
    866872          DisplayMemoryDeviceMemoryOperatingModeCapability (Struct->Type17->MemoryOperatingModeCapability.Uint16, Option);
    867           PRINT_PENDING_STRING (Struct, Type17, FirmwareVersion);
    868           PRINT_STRUCT_VALUE_H (Struct, Type17, ModuleManufacturerID);
    869           PRINT_STRUCT_VALUE_H (Struct, Type17, ModuleProductID);
    870           PRINT_STRUCT_VALUE_H (Struct, Type17, MemorySubsystemControllerManufacturerID);
    871           PRINT_STRUCT_VALUE_H (Struct, Type17, MemorySubsystemControllerProductID);
     873          ShellPrintEx (-1, -1, L"Firmware Version: %a\n", LibGetSmbiosString (Struct, Struct->Type17->FirmwareVersion));
     874          ShellPrintEx (-1, -1, L"Module Manufacturer ID: 0x%x\n", Struct->Type17->ModuleManufacturerID);
     875          ShellPrintEx (-1, -1, L"Module Product ID: 0x%x\n", Struct->Type17->ModuleProductID);
     876          ShellPrintEx (-1, -1, L"Memory Subsystem Controller Manufacturer ID: 0x%x\n", Struct->Type17->MemorySubsystemControllerManufacturerID);
     877          ShellPrintEx (-1, -1, L"Memory Subsystem Controller Product ID: 0x%x\n", Struct->Type17->MemorySubsystemControllerProductID);
    872878        }
    873879
    874880        if (Struct->Hdr->Length > 0x34) {
    875           PRINT_STRUCT_VALUE_LH (Struct, Type17, NonVolatileSize);
     881          ShellPrintEx (-1, -1, L"Non-volatile Size: 0x%lx\n", Struct->Type17->NonVolatileSize);
    876882        }
    877883
    878884        if (Struct->Hdr->Length > 0x3C) {
    879           PRINT_STRUCT_VALUE_LH (Struct, Type17, VolatileSize);
     885          ShellPrintEx (-1, -1, L"Volatile Size: 0x%lx\n", Struct->Type17->VolatileSize);
    880886        }
    881887
    882888        if (Struct->Hdr->Length > 0x44) {
    883           PRINT_STRUCT_VALUE_LH (Struct, Type17, CacheSize);
     889          ShellPrintEx (-1, -1, L"Cache Size: 0x%lx\n", Struct->Type17->CacheSize);
    884890        }
    885891
    886892        if (Struct->Hdr->Length > 0x4C) {
    887           PRINT_STRUCT_VALUE_LH (Struct, Type17, LogicalSize);
     893          ShellPrintEx (-1, -1, L"Logical Size: 0x%lx\n", Struct->Type17->LogicalSize);
    888894        }
    889895      }
    890896
    891897      if (AE_SMBIOS_VERSION (0x3, 0x3) && (Struct->Hdr->Length > 0x54)) {
    892         PRINT_STRUCT_VALUE_H (Struct, Type17, ExtendedSpeed);
    893         PRINT_STRUCT_VALUE_H (Struct, Type17, ExtendedConfiguredMemorySpeed);
     898        ShellPrintEx (-1, -1, L"Extended Speed: 0x%x\n", Struct->Type17->ExtendedSpeed);
     899        ShellPrintEx (-1, -1, L"Extended Configured Memory Speed: 0x%x\n", Struct->Type17->ExtendedConfiguredMemorySpeed);
    894900      }
    895901
    … …  
    12591265    //
    12601266    case 41:
    1261       PRINT_PENDING_STRING (Struct, Type41, ReferenceDesignation);
     1267      ShellPrintEx (-1, -1, L"Reference Designation: %a\n", LibGetSmbiosString (Struct, Struct->Type41->ReferenceDesignation));
    12621268      ShellPrintEx (-1, -1, (((Struct->Type41->DeviceType) & 0x80) != 0) ? L"Device Enabled\n" : L"Device Disabled\n");
    12631269      DisplayOnboardDeviceTypes ((Struct->Type41->DeviceType) & 0x7F, Option);
    1264       PRINT_STRUCT_VALUE_H (Struct, Type41, DeviceTypeInstance);
    1265       PRINT_STRUCT_VALUE_H (Struct, Type41, SegmentGroupNum);
    1266       PRINT_STRUCT_VALUE_H (Struct, Type41, BusNum);
    1267       PRINT_STRUCT_VALUE_H (Struct, Type41, DevFuncNum);
     1270      ShellPrintEx (-1, -1, L"Device Type Instance: 0x%x\n", Struct->Type41->DeviceTypeInstance);
     1271      ShellPrintEx (-1, -1, L"Segment Group Number: 0x%x\n", Struct->Type41->SegmentGroupNum);
     1272      ShellPrintEx (-1, -1, L"Bus Number: 0x%x\n", Struct->Type41->BusNum);
     1273      ShellPrintEx (-1, -1, L"Device/Function Number: 0x%x\n", Struct->Type41->DevFuncNum);
    12681274      break;
    12691275
    … …  
    13011307      break;
    13021308
     1309    //
     1310    // Firmware Inventory (Type 45)
     1311    //
     1312    case 45:
     1313      PRINT_PENDING_STRING (Struct, Type45, FirmwareComponentName);
     1314      PRINT_PENDING_STRING (Struct, Type45, FirmwareVersion);
     1315      if (Struct->Type45->FirmwareVersionFormat == VersionFormatTypeFreeForm) {
     1316        String = L"Free-form string";
     1317      } else if (Struct->Type45->FirmwareVersionFormat == VersionFormatTypeMajorMinor) {
     1318        String = L"MAJOR.MINOR";
     1319      } else if (Struct->Type45->FirmwareVersionFormat == VersionFormatType32BitHex) {
     1320        String = L"32-bit hexadecimal string";
     1321      } else if (Struct->Type45->FirmwareVersionFormat == VersionFormatTypeMajorMinor) {
     1322        String = L"64-bit hexadecimal string";
     1323      } else if (Struct->Type45->FirmwareVersionFormat >= 0x80) {
     1324        String = L"BIOS Vendor/OEM-specific";
     1325      } else {
     1326        String = L"Reserved";
     1327      }
     1328
     1329      ShellPrintHiiEx (
     1330        -1,
     1331        -1,
     1332        NULL,
     1333        STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_FIRMWARE_VERSION_FORMAT),
     1334        gShellDebug1HiiHandle,
     1335        String
     1336        );
     1337      PRINT_PENDING_STRING (Struct, Type45, FirmwareId);
     1338      if (Struct->Type45->FirmwareIdFormat == FirmwareIdFormatTypeFreeForm) {
     1339        String = L"Free-form string";
     1340      } else if (Struct->Type45->FirmwareIdFormat == FirmwareIdFormatTypeUuid) {
     1341        String = L"RFC4122 UUID string";
     1342      } else if (Struct->Type45->FirmwareIdFormat >= 0x80) {
     1343        String = L"BIOS Vendor/OEM-specific";
     1344      } else {
     1345        String = L"Reserved";
     1346      }
     1347
     1348      ShellPrintHiiEx (
     1349        -1,
     1350        -1,
     1351        NULL,
     1352        STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_FIRMWARE_ID_FORMAT),
     1353        gShellDebug1HiiHandle,
     1354        String
     1355        );
     1356      PRINT_PENDING_STRING (Struct, Type45, ReleaseDate);
     1357      PRINT_PENDING_STRING (Struct, Type45, Manufacturer);
     1358      PRINT_PENDING_STRING (Struct, Type45, LowestSupportedVersion);
     1359      if (Struct->Type45->ImageSize != MAX_UINT64) {
     1360        PRINT_STRUCT_VALUE_H (Struct, Type45, ImageSize);
     1361      } else {
     1362        ShellPrintHiiEx (
     1363          -1,
     1364          -1,
     1365          NULL,
     1366          STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_IMAGE_SIZE_UNKNOWN),
     1367          gShellDebug1HiiHandle
     1368          );
     1369      }
     1370
     1371      DisplayFirmwareCharacteristics (ReadUnaligned16 ((UINT16 *)(UINTN)&(Struct->Type45->Characteristics)), Option);
     1372      DisplayFirmwareState (*(UINT8 *)(UINTN)&(Struct->Type45->State), Option);
     1373
     1374      PRINT_STRUCT_VALUE_H (Struct, Type45, AssociatedComponentCount);
     1375      if (Struct->Hdr->Length > sizeof (*Struct->Type45)) {
     1376        for (Index = 0; Index < Struct->Type45->AssociatedComponentCount; Index++) {
     1377          ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_FIRMWARE_INVENTORY_ASSOCIATED), gShellDebug1HiiHandle);
     1378          Print (L"    0x%04X ", Buffer[sizeof (*Struct->Type45) + (Index * sizeof (SMBIOS_HANDLE))]);
     1379          Print (L"\n");
     1380        }
     1381      }
     1382
     1383      break;
     1384
     1385    //
     1386    // String Property (Type 46)
     1387    //
     1388    case 46:
     1389      if (Struct->Type46->StringPropertyId == StringPropertyIdDevicePath) {
     1390        String = L"UEFI device path";
     1391      } else if ((Struct->Type46->StringPropertyId >= StringPropertyIdBiosVendor) &&
     1392                 (Struct->Type46->StringPropertyId < StringPropertyIdOem))
     1393      {
     1394        String = L"BIOS vendor defined";
     1395      } else if (Struct->Type46->StringPropertyId >= StringPropertyIdOem) {
     1396        String = L"OEM defined";
     1397      } else {
     1398        String = L"Reserved";
     1399      }
     1400
     1401      ShellPrintHiiEx (
     1402        -1,
     1403        -1,
     1404        NULL,
     1405        STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_STRING_PROPERTY_ID),
     1406        gShellDebug1HiiHandle,
     1407        String
     1408        );
     1409      PRINT_PENDING_STRING (Struct, Type46, StringPropertyValue);
     1410      PRINT_STRUCT_VALUE_H (Struct, Type46, ParentHandle);
     1411      break;
    13031412    //
    13041413    // Inactive (Type 126)
    … …  
    16081717{
    16091718  //
    1610   // Print prompt message
    1611   //
    1612   ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY), gShellDebug1HiiHandle);
    1613   //
    16141719  // Print option
    16151720  //
    … …  
    24102515    case 0xFB:
    24112516      Print (L"i960\n");
     2517      break;
     2518
     2519    case 0xFE:
     2520      Print (L"Indicator to obtain the processor family from the Processor Family 2 field\n");
    24122521      break;
    24132522
    … …  
    24332542  )
    24342543{
    2435   //
    2436   // Print prompt message
    2437   //
    2438   ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY), gShellDebug1HiiHandle);
    2439 
    24402544  //
    24412545  // Print option

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.h

    r99404 r101291  
    44  Copyright (c) 2005 - 2015, Intel Corporation. All rights reserved.<BR>
    55  (C) Copyright 2017 - 2019 Hewlett Packard Enterprise Development LP<BR>
     6  Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
    67  SPDX-License-Identifier: BSD-2-Clause-Patent
    78
    … …  
    440441  );
    441442
     443/**
     444  Display Firmware Characteristics (Type 45) details.
     445
     446  @param[in] Chara    The information bits.
     447  @param[in] Option   The optional information.
     448**/
     449VOID
     450DisplayFirmwareCharacteristics (
     451  IN UINT16  Chara,
     452  IN UINT8   Option
     453  );
     454
     455/**
     456  Display Firmware state (Type 45) details.
     457
     458  @param[in] Key            The key of the structure.
     459  @param[in] Option         The optional information.
     460**/
     461VOID
     462DisplayFirmwareState (
     463  IN UINT8  Key,
     464  IN UINT8  Option
     465  );
     466
    442467#endif

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable.c

    r99404 r101291  
    55  Copyright (c) 2005 - 2021, Intel Corporation. All rights reserved.<BR>
    66  (C) Copyright 2016-2019 Hewlett Packard Enterprise Development LP<BR>
     7  Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
    78  SPDX-License-Identifier: BSD-2-Clause-Patent
    89
    … …  
    36213622    L" 128-bit RISC-V (RV128) "
    36223623  }
     3624};
     3625
     3626TABLE_ITEM  FirmwareInventoryCharTable[] = {
     3627  {
     3628    0,
     3629    L"Updatable"
     3630  },
     3631  {
     3632    1,
     3633    L"Write-Protect"
     3634  }
     3635};
     3636
     3637TABLE_ITEM  FirmwareInventoryStateTable[] = {
     3638  {
     3639    1,
     3640    L"  Other"
     3641  },
     3642  {
     3643    2,
     3644    L"  Unknown "
     3645  },
     3646  {
     3647    3,
     3648    L"  Disabled: This firmware component is disabled. "
     3649  },
     3650  {
     3651    4,
     3652    L"  Enabled: This firmware component is enabled. "
     3653  },
     3654  {
     3655    5,
     3656    L"  Absent: This firmware component is either not present or not detected "
     3657  },
     3658  {
     3659    6,
     3660    L"  StandbyOffline: This firmware is enabled but awaits an external action to activate it. "
     3661  },
     3662  {
     3663    7,
     3664    L"  StandbySpare: This firmware is part of a redundancy set and awaits a failover or other external action to activate it. "
     3665  },
     3666  {
     3667    8,
     3668    L"  UnavailableOffline: This firmware component is present but cannot be used. "
     3669  },
    36233670};
    36243671
    … …  
    51285175
    51295176/**
     5177  Display Firmware Characteristics (Type 45) details.
     5178
     5179  @param[in] Chara    The information bits.
     5180  @param[in] Option   The optional information.
     5181**/
     5182VOID
     5183DisplayFirmwareCharacteristics (
     5184  IN UINT16  Chara,
     5185  IN UINT8   Option
     5186  )
     5187{
     5188  ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_QUERYTABLE_FIRMWARE_INVENTORY_CHAR), gShellDebug1HiiHandle);
     5189  PRINT_INFO_OPTION (Chara, Option);
     5190  PRINT_BITS_INFO (FirmwareInventoryCharTable, Chara);
     5191}
     5192
     5193/**
     5194  Display Firmware state (Type 45) details.
     5195
     5196  @param[in] Key            The key of the structure.
     5197  @param[in] Option         The optional information.
     5198**/
     5199VOID
     5200DisplayFirmwareState (
     5201  IN UINT8  Key,
     5202  IN UINT8  Option
     5203  )
     5204{
     5205  ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_QUERYTABLE_FIRMWARE_INVENTORY_STATE), gShellDebug1HiiHandle);
     5206  PRINT_INFO_OPTION (Key, Option);
     5207  PRINT_TABLE_ITEM (FirmwareInventoryStateTable, Key);
     5208}
     5209
     5210/**
    51305211  Display the structure type information.
    51315212

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView.c

    r99404 r101291  
    44  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
    55  Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved.<BR>
     6  Copyright (c) 2023 Apple Inc. All rights reserved.<BR>
    67  SPDX-License-Identifier: BSD-2-Clause-Patent
    78
    … …  
    264265  }
    265266
    266   if (CompareMem (SMBiosTable->AnchorString, "_SM_", 4) == 0) {
     267  if (CompareMem (SMBiosTable->AnchorString, SMBIOS_ANCHOR_STRING, SMBIOS_ANCHOR_STRING_LENGTH) == 0) {
    267268    //
    268269    // Have got SMBIOS table
    … …  
    442443  }
    443444
    444   if (CompareMem (SMBiosTable->AnchorString, "_SM3_", 5) == 0) {
     445  if (CompareMem (SMBiosTable->AnchorString, SMBIOS_3_0_ANCHOR_STRING, SMBIOS_3_0_ANCHOR_STRING_LENGTH) == 0) {
    445446    //
    446447    // Have got SMBIOS table
    … …  
    613614  }
    614615
    615   if (CompareMem (SMBiosTable->AnchorString, "_SM_", 4) != 0) {
     616  if (CompareMem (SMBiosTable->AnchorString, SMBIOS_ANCHOR_STRING, SMBIOS_ANCHOR_STRING_LENGTH) != 0) {
    616617    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_SMBIOSVIEW_SMBIOS_TABLE), gShellDebug1HiiHandle);
    617618    return EFI_INVALID_PARAMETER;
    … …  
    754755  }
    755756
    756   if (CompareMem (SMBiosTable->AnchorString, "_SM3_", 5) != 0) {
     757  if (CompareMem (SMBiosTable->AnchorString, SMBIOS_3_0_ANCHOR_STRING, SMBIOS_3_0_ANCHOR_STRING_LENGTH) != 0) {
    757758    ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN (STR_SMBIOSVIEW_SMBIOSVIEW_SMBIOS_TABLE), gShellDebug1HiiHandle);
    758759    return EFI_INVALID_PARAMETER;

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStrings.uni

    r99404 r101291  
    55// (C) Copyright 2014-2015 Hewlett-Packard Development Company, L.P.<BR>
    66// (C) Copyright 2015-2019 Hewlett Packard Enterprise Development LP<BR>
     7// Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
    78// SPDX-License-Identifier: BSD-2-Clause-Patent
    89//
    … …  
    8990#string STR_SMBIOSVIEW_PRINTINFO_INTER_ACHOR                    #language en-US "Inter Anchor:         %a\r\n"
    9091#string STR_SMBIOSVIEW_PRINTINFO_INTER_CHECKSUM                 #language en-US "Inter Checksum:       0x%x\r\n"
    91 #string STR_SMBIOSVIEW_PRINTINFO_FORMAT_PART_LEN                #language en-US "Format part Len : %d\r\n"
    92 #string STR_SMBIOSVIEW_PRINTINFO_STRUCT_HANDLE                  #language en-US "Structure Handle: %d\r\n"
     92#string STR_SMBIOSVIEW_PRINTINFO_FORMAT_PART_LEN                #language en-US "Length: %d\r\n"
     93#string STR_SMBIOSVIEW_PRINTINFO_STRUCT_HANDLE                  #language en-US "Handle: %d\r\n"
    9394#string STR_SMBIOSVIEW_PRINTINFO_BOOTUP_STATE                   #language en-US "Bootup state "
    9495#string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_STATE             #language en-US "Power Supply State "
    … …  
    169170#string STR_SMBIOSVIEW_PRINTINFO_BITS_RSVD_FOR_FUTURE           #language en-US " Bits %d:7 are reserved for future assignment\r\n"
    170171#string STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY               #language en-US "Processor Family: "
     172#string STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_ID                   #language en-US "Processor ID\r\nsize=%d:\r\n"
     173#string STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY2              #language en-US "Processor Family 2: "
    171174#string STR_SMBIOSVIEW_PRINTINFO_OTHER                          #language en-US "Other\r\n"
    172175#string STR_SMBIOSVIEW_PRINTINFO_UNKNOWN                        #language en-US "Unknown\r\n"
    … …  
    256259#string STR_SMBIOSVIEW_PRINTINFO_RSVD_FOR_SPEC_PENTIUM          #language en-US "Reserved for specific Pentium(R) Processor versions\r\n"
    257260#string STR_SMBIOSVIEW_PRINTINFO_UNDEFINED_PROC_FAMILY          #language en-US "Undefined processor family and type\r\n"
    258 #string STR_SMBIOSVIEW_PRINTINFO_PROC_INFO                      #language en-US "Processor Information -  Voltage:\r\n"
     261#string STR_SMBIOSVIEW_PRINTINFO_PROC_INFO                      #language en-US "Voltage:\r\n"
    259262#string STR_SMBIOSVIEW_PRINTINFO_PROC_CURRENT_VOLTAGE           #language en-US "Processor current voltage = (%d/10)V\r\n"
    260263#string STR_SMBIOSVIEW_PRINTINFO_5V_SUPOPRTED                   #language en-US " 5V is supported\r\n"
    … …  
    272275#string STR_SMBIOSVIEW_PRINTINFO_BIT14_NOT_ZERO                 #language en-US "Error, reserved BIT 14 must be zero\r\n"
    273276#string STR_SMBIOSVIEW_PRINTINFO_BIT15_NOT_ZERO                 #language en-US "Error, reserved BIT 15 must be zero\r\n"
    274 #string STR_SMBIOSVIEW_PRINTINFO_PROC_STATUS                    #language en-US "Processor Status:\r\n"
     277#string STR_SMBIOSVIEW_PRINTINFO_PROC_STATUS                    #language en-US "Status:\r\n"
    275278#string STR_SMBIOSVIEW_PRINTINFO_CPU_SOCKET_POPULATED           #language en-US "CPU Socket Populated\r\n"
    276279#string STR_SMBIOSVIEW_PRINTINFO_CPU_SOCKET_UNPOPULATED         #language en-US "CPU Socket Unpopulated\r\n"
    … …  
    383386#string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_REPLACE           #language en-US "Power supply is hot replaceable\r\n"
    384387#string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_NOT_REPLACE       #language en-US "Power supply is not hot replaceable\r\n"
    385 #string STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE                      #language en-US "BiosSize:  %d KB\r\n"
    386 #string STR_SMBIOSVIEW_PRINTINFO_EXTENDED_BIOS_SIZE             #language en-US "ExtendedBiosSize:  %d %s\r\n"
     388#string STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE                      #language en-US "BIOS ROM Size:  %d KB\r\n"
     389#string STR_SMBIOSVIEW_PRINTINFO_EXTENDED_BIOS_SIZE             #language en-US "Extended BIOS ROM Size:  %d %s\r\n"
    387390#string STR_SMBIOSVIEW_QUERYTABLE_NO_INFO                       #language en-US "No Info"
    388391#string STR_SMBIOSVIEW_QUERYTABLE_RSVD_BITS_SET                 #language en-US "\r\nIt also has reserved bits set 1 --- reserved bits: 0x%x"
    … …  
    420423#string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_PHYSICAL_WIDTH    #language en-US "System Slot Physical Width: "
    421424#string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_PITCH             #language en-US "System Slot Pitch: %d\r\n"
    422 #string STR_SMBIOSVIEW_QUERYTABLE_ONBOARD_DEVICE_TYPE           #language en-US "Onboard Device Type: "
     425#string STR_SMBIOSVIEW_QUERYTABLE_ONBOARD_DEVICE_TYPE           #language en-US "Device Type: "
    423426#string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_EVENT_LOG_TYPE         #language en-US "System Event Log Type: "
    424427#string STR_SMBIOSVIEW_QUERYTABLE_EVENT_LOG_VAR_DATA_FORMAT     #language en-US "Event Log Variable Data Format Types: "
    … …  
    432435#string STR_SMBIOSVIEW_QUERYTABLE_PHYS_MEM_ARRAY_USE            #language en-US "Physical Memory Array Use: "
    433436#string STR_SMBIOSVIEW_QUERYTABLE_PHYS_MEM_ARRAY_ERROR          #language en-US "Physical Memory Array Error Correction Types: "
    434 #string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_FORM_FACTOR        #language en-US "Memory Device - Form Factor: "
    435 #string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE               #language en-US "Memory Device - Type: "
    436 #string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE_DETAIL        #language en-US "Memory Device - Type Detail: "
    437 #string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEMORY_TECHNOLOGY  #language en-US "Memory Device - Memory Technology: "
    438 #string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEM_OPER_MODE_CAPA #language en-US "Memory Device - Memory Operating Mode Capability: "
     437#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_FORM_FACTOR        #language en-US "Form Factor: "
     438#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE               #language en-US "Memory Type: "
     439#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE_DETAIL        #language en-US "Type Detail: "
     440#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEMORY_TECHNOLOGY  #language en-US "Memory Technology: "
     441#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEM_OPER_MODE_CAPA #language en-US "Memory Operating Mode Capability: "
    439442#string STR_SMBIOSVIEW_QUERYTABLE_MEM_ERROR_INFO                #language en-US "32-bit Memory Error Information - Type: "
    440443#string STR_SMBIOSVIEW_QUERYTABLE_MEM_ERROR_GRANULARITY         #language en-US "Memory Error - Error granularity: "
    … …  
    455458#string STR_SMBIOSVIEW_QUERYTABLE_BMC_INTERFACE_TYPE            #language en-US "BMC Interface Type:"
    456459#string STR_SMBIOSVIEW_QUERYTABLE_MC_HOST_INTERFACE_TYPE        #language en-US "MC Host Interface Type:"
    457 #string STR_SMBIOSVIEW_QUERYTABLE_STRUCT_TYPE                   #language en-US "Structure Type:"
     460#string STR_SMBIOSVIEW_QUERYTABLE_STRUCT_TYPE                   #language en-US "Type:"
    458461#string STR_SMBIOSVIEW_QUERYTABLE_PROCESSOR_ARCH_TYPE           #language en-US "Processor Architecture Type:"
    459462#string STR_SMBIOSVIEW_SMBIOSVIEW_ONE_VAR_ARGV                  #language en-US "%s "
    … …  
    510513#string STR_SMBIOSVIEW_PRINTINFO_NV_STORAGE_DEVICE_NOT_PRESENT  #language en-US "NVStorageDevice: Not Present\n"
    511514#string STR_SMBIOSVIEW_PRINTINFO_BASE_ADDRESS                   #language en-US "BaseAddress: 0x%x\n"
    512 
     515#string STR_SMBIOSVIEW_PRINTINFO_FIRMWARE_VERSION_FORMAT        #language en-US "FirmwareVersionFormat: %s\r\n"
     516#string STR_SMBIOSVIEW_PRINTINFO_FIRMWARE_ID_FORMAT             #language en-US "FirmwareIdFormat: %s\r\n"
     517#string STR_SMBIOSVIEW_QUERYTABLE_FIRMWARE_INVENTORY_CHAR       #language en-US "Characteristics:\r\n"
     518#string STR_SMBIOSVIEW_QUERYTABLE_FIRMWARE_INVENTORY_STATE      #language en-US "State:\r\n"
     519#string STR_SMBIOSVIEW_PRINTINFO_FIRMWARE_INVENTORY_ASSOCIATED  #language en-US "  Associated handle:\r\n"
     520#string STR_SMBIOSVIEW_PRINTINFO_IMAGE_SIZE_UNKNOWN             #language en-US "ImageSize: Unknown\r\n"
     521#string STR_SMBIOSVIEW_PRINTINFO_STRING_PROPERTY_ID             #language en-US "String Property ID: %s\r\n"

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf

    r89983 r101291  
    122122  gEfiSimplePointerProtocolGuid               ## SOMETIMES_CONSUMES
    123123  gEfiCpuIo2ProtocolGuid                      ## SOMETIMES_CONSUMES
     124  gEfiHiiDatabaseProtocolGuid                 ## SOMETIMES_CONSUMES
    124125
    125126[Guids]
    … …  
    131132  gEfiAcpi20TableGuid             ## SOMETIMES_CONSUMES ## SystemTable
    132133  gShellDebug1HiiGuid             ## SOMETIMES_CONSUMES ## HII
     134  gEfiMemoryAttributesTableGuid   ## SOMETIMES_CONSUMES ## SystemTable
     135  gEfiRtPropertiesTableGuid       ## SOMETIMES_CONSUMES ## SystemTable
     136  gEfiSystemResourceTableGuid     ## SOMETIMES_CONSUMES ## SystemTable
     137  gEfiDebugImageInfoTableGuid     ## SOMETIMES_CONSUMES ## SystemTable
     138  gEfiImageSecurityDatabaseGuid   ## SOMETIMES_CONSUMES ## SystemTable
     139  gEfiJsonConfigDataTableGuid     ## SOMETIMES_CONSUMES ## SystemTable
     140  gEfiJsonCapsuleDataTableGuid    ## SOMETIMES_CONSUMES ## SystemTable
     141  gEfiJsonCapsuleResultTableGuid  ## SOMETIMES_CONSUMES ## SystemTable

  • trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni

    r99404 r101291  
    104104#string STR_DMEM_HEADER_ROW       #language en-US "Memory Address %016LX %X Bytes\r\n"
    105105#string STR_DMEM_MMIO_HEADER_ROW  #language en-US "Memory Mapped IO Address %016LX %X Bytes\r\n"
    106 #string STR_DMEM_DATA_ROW         #language en-US "%08X: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x *%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c*\r\n"
    107106#string STR_DMEM_SYSTEM_TABLE     #language en-US "\r\nValid EFI Header at Address %016Lx\r\n"
    108107                                                  "---------------------------------------------\r\n"
    109108                                                  "System: Table Structure size %08x revision %08x\r\n"
    110109                                                  "ConIn (%016LX) ConOut (%016LX) StdErr (%016LX)\r\n"
    111                                                   "Runtime Services %016LX\r\n"
    112                                                   "Boot Services    %016LX\r\n"
    113                                                   "SAL System Table %016LX\r\n"
    114                                                   "ACPI Table       %016LX\r\n"
    115                                                   "ACPI 2.0 Table   %016LX\r\n"
    116                                                   "MPS Table        %016LX\r\n"
    117                                                   "SMBIOS Table     %016LX\r\n"
     110                                                  "Runtime Services              %016LX\r\n"
     111                                                  "Boot Services                 %016LX\r\n"
     112                                                  "SAL System Table              %016LX\r\n"
     113                                                  "ACPI Table                    %016LX\r\n"
     114                                                  "ACPI 2.0 Table                %016LX\r\n"
     115                                                  "MPS Table                     %016LX\r\n"
     116                                                  "SMBIOS Table                  %016LX\r\n"
     117                                                  "DTB Table                     %016LX\r\n"
     118                                                  "Memory Attribute Table        %016LX\r\n"
     119                                                  "RT Properties Table           %016LX\r\n"
     120                                                  "System Resource Table         %016LX\r\n"
     121                                                  "Debug Image Info Table        %016LX\r\n"
     122                                                  "Image Execution Info Table    %016LX\r\n"
     123                                                  "Json Config Data Table        %016LX\r\n"
     124                                                  "Json Capsule Data Table       %016LX\r\n"
     125                                                  "Json Capsule Results Table    %016LX\r\n"
     126                                                  "Memory Range Capsule          %016LX\r\n"
     127                                                  "Hii Database Export Buffer    %016LX\r\n"
     128                                                  "Conformance Profile Table     %016LX\r\n"
     129
     130
    118131
    119132#string STR_LOAD_PCI_ROM_RES      #language en-US "Image '%B%s%N' load result: %r\r\n"
    … …  
    11721185"  * To edit memory region starting at address 0x00000000 with size of 2 bytes:\r\n"
    11731186"    fs0:\> hexedit -m 0 2\r\n"
    1174 
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette