ShellPkg/SmbiosView: add more items for smbiosview -t 3

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3177
Add ContainedElementCount, ContainedElementRecordLength and
ContainedElements for smbiosview type 3.

Signed-off-by: Mars CC Lin <mars_cc_lin@phoenix.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Philippe Mathieu-Daude <philmd@redhat.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
This commit is contained in:
Mars CC Lin 2021-03-03 15:19:52 +08:00 committed by mergify[bot]
parent ce6c2b0016
commit f9c53a69ed
2 changed files with 17 additions and 0 deletions
ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView

@ -280,6 +280,7 @@ SmbiosPrintStructure (
)
{
UINT8 Index;
UINT8 Index2;
UINT8 *Buffer;
if (Struct == NULL) {
@ -404,6 +405,21 @@ SmbiosPrintStructure (
if (Struct->Hdr->Length > 0x12) {
PRINT_STRUCT_VALUE (Struct, Type3, NumberofPowerCords);
}
if (Struct->Hdr->Length > 0x13) {
PRINT_STRUCT_VALUE (Struct, Type3, ContainedElementCount);
}
if (Struct->Hdr->Length > 0x14) {
PRINT_STRUCT_VALUE (Struct, Type3, ContainedElementRecordLength);
}
if (Struct->Hdr->Length > 0x15) {
for (Index = 0; Index < Struct->Type3->ContainedElementCount; Index++) {
ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_CONTAINED_ELEMENT), gShellDebug1HiiHandle, Index+1);
for (Index2 = 0; Index2< Struct->Type3->ContainedElementRecordLength; Index2++) {
Print (L"%02X ", Buffer[0x15 + (Index * Struct->Type3->ContainedElementRecordLength) + Index2]);
}
Print (L"\n");
}
}
}
if (AE_SMBIOS_VERSION (0x2, 0x7) && (Struct->Hdr->Length > 0x13)) {
if (Struct->Hdr->Length > (0x15 + (Struct->Type3->ContainedElementCount * Struct->Type3->ContainedElementRecordLength))) {

@ -93,6 +93,7 @@
#string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_STATE #language en-US "Power Supply State "
#string STR_SMBIOSVIEW_PRINTINFO_THERMAL_STATE #language en-US "Thermal state "
#string STR_SMBIOSVIEW_PRINTINFO_SECURITY_STATUS #language en-US "Security Status "
#string STR_SMBIOSVIEW_PRINTINFO_CONTAINED_ELEMENT #language en-US "Contained Element %d: "
#string STR_SMBIOSVIEW_PRINTINFO_SUPOPRT #language en-US "Support "
#string STR_SMBIOSVIEW_PRINTINFO_CURRENT #language en-US "Current "
#string STR_SMBIOSVIEW_PRINTINFO_INSTALLED #language en-US "Installed "