From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web11.3896.1614758651855031485 for ; Wed, 03 Mar 2021 00:04:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=E9lpbAzx; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: zhichao.gao@intel.com) IronPort-SDR: tb3yQdIn/T82MLhDHWT3pAS6Q6IoqWKBzjnhDVMPjPzydzpBiovPaQE0Tsh2riCQ89s/4KNmcr yiWvecGPHwUw== X-IronPort-AV: E=McAfee;i="6000,8403,9911"; a="272134342" X-IronPort-AV: E=Sophos;i="5.81,219,1610438400"; d="scan'208,217";a="272134342" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2021 00:04:00 -0800 IronPort-SDR: YQ0b96uliXV8qJ1TDBUHMhD6/IpU7ZFwiqFTNb8hJ9hVRP0utbNqDDQpg7PQFoTe7RGjs/Ncbh 4fGPMPThHn9w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,219,1610438400"; d="scan'208,217";a="518182958" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga004.jf.intel.com with ESMTP; 03 Mar 2021 00:03:59 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Wed, 3 Mar 2021 00:03:55 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2 via Frontend Transport; Wed, 3 Mar 2021 00:03:55 -0800 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.107) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2106.2; Wed, 3 Mar 2021 00:03:55 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AE3dEQZ4AoQtZSAs5KQINBK3ejGL9DJkyGZb7ygx6L3fWAS3vrtG6gX9ZaFHPKWLjfbOYG0/g8AlZCw4fx4+NuuTyZPAWiTysTcNMCoYO88mdfCG/TUWhh9gBywNLAP4rdLikGX93cz18j4b5aJ6AASWfH3+NgbFMh7Wpt9tojnb986WlCPDGUtPRC4C8gnmD4AOTSiwyYwArisDif6csK+R3X5gEY4WlPzwMwCbzDvJay9geSoc16ZuGa6PoPLjHZ6DetHiLZ6GQKg1nde0dXijCHK9PaAQkx1wUIpeAiXO6SBdQFz2+UVG/9CDuD7JwX36ERAuTFO6gcwc3ncrng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Eewm307MMHkkVyjGLrFtlONaPRgOJnsi/QT3YCsi/dE=; b=IwmFp5cVTKoXxZJKsAFdrayrUn8qCcm0BTGy2OmYA2d5Aj5YvTphJXt2pK+HysFqtIngZ+dQD5bUSxhd98hqO9lMw9gylD4Uvor3GqYjchwvpIdnwQ73vPl/S9IrJ/Ll7dBHvBnbSbYTRMJsjtyR/6F/FX1NKbn/LXnbwZ62KDRQFWCsd8VKo0r0+ZIrlftj3nX78SAX9M0W7Qq+TBuTOS4GIcxTzZCjd5oOXm8INYzWKkEuQIb0S7jjPShh46fdhIr1mPmmYLUEaeR8MmNWJwPUsFJGmCuk6kg4P2/mT9aTJj7/AcRhoFWZD9MqKoJov/XCL1PGEkEGg3MfLwiK2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Eewm307MMHkkVyjGLrFtlONaPRgOJnsi/QT3YCsi/dE=; b=E9lpbAzxuM+q6lp2IXMOaJl3lWfxpwxONeuUsRHnNs8M7hvt8XMoAnqIXrgyysTNcKUOB6ak7xW6eKKMMPrH8ZX4f30odSedp8noO6X9tJrF/WKwjGuf0UwFFoHyI/pbOLr6vdR52nHkNbhwnq6I0zhfGW7VO9/GyLQ7xjXFi8U= Received: from MWHPR11MB1647.namprd11.prod.outlook.com (2603:10b6:301:d::12) by MWHPR1101MB2285.namprd11.prod.outlook.com (2603:10b6:301:57::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.23; Wed, 3 Mar 2021 08:03:54 +0000 Received: from MWHPR11MB1647.namprd11.prod.outlook.com ([fe80::d573:14a0:f9c5:68b0]) by MWHPR11MB1647.namprd11.prod.outlook.com ([fe80::d573:14a0:f9c5:68b0%4]) with mapi id 15.20.3890.030; Wed, 3 Mar 2021 08:03:54 +0000 From: "Gao, Zhichao" To: Mars CC Lin , "devel@edk2.groups.io" CC: Philippe Mathieu-Daude , Liming Gao Subject: Re: [PATCH V5] ShellPkg: add more items for smbiosview -t 3 . Thread-Topic: [PATCH V5] ShellPkg: add more items for smbiosview -t 3 . Thread-Index: AQHXD/7+1sqsnlHYVEW66maxVZeSRKpx45cQ Date: Wed, 3 Mar 2021 08:03:54 +0000 Message-ID: References: <20210303072810.942-1-mars_cc_lin@phoenix.com> In-Reply-To: <20210303072810.942-1-mars_cc_lin@phoenix.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 authentication-results: phoenix.com; dkim=none (message not signed) header.d=none;phoenix.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.213] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: cef2e317-de1b-480d-8c69-08d8de1ae3ee x-ms-traffictypediagnostic: MWHPR1101MB2285: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8273; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: zC0QvukXWAmXhG/ANagfx18DL4b9G93jB4tJJw0bcFwXebyerzvOUPjCqz2Glh+/icJ+DayatdsEfXulgdhtjjkbw9tfwX8jQdgpXnbzhR+JYFbJMXd04lHPrzM1lcBLH3T/UveV1Vwak5lnR1/DkcMdOgWGhAi/9jMEVNM9YSaOxgMM3cThlz5PsdqpUSQkcgvXMP5ZDrjHUrJgzGjoYarIH4483zM5WM0DrtNeSJWnNQRSzgWkgodyHEqAEl6xZ0cJB0BQQA0caBP/Totl4vGKTv/cUu7a+0kNsPYf+mQmctMXv9zCUxFsJWc+0uQRL3DiWNGnt7f1s5m7sJEHOH9DFpAJFkYyO/QQEswWPBNZ6GoCoYKZsIZ2gV7UHTvWD86ZTkKQfSoqCyKHdTtZomf9HcEAur37I7FBbNBX4fJLS41qEji+9stqdBNt6aib1PRl6Ka9vJSmKsaXKv/dtZpSseECRq8e4OpDmZpBrCbcpMnWfZDv65wZufTEdU5tgvwr/9IMLfL9aOzTCbO/Q0EcW8ljR0HM3a22VLFz/wVrEmAQS8mkq/Vu7fY7Hv+QWjZsuo7+rfO0x5EUDlZwvfbF9rQs37Qpmt2WGDE5zViqrN4GmAMMFq2KdZx6H0c7kXHK5fxxFzvvHInD7HMk9g== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR11MB1647.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(39860400002)(136003)(366004)(376002)(396003)(346002)(186003)(64756008)(8676002)(2906002)(76116006)(966005)(52536014)(66446008)(8936002)(53546011)(478600001)(26005)(33656002)(86362001)(6506007)(7696005)(316002)(83380400001)(4326008)(54906003)(66556008)(66476007)(110136005)(166002)(9686003)(55016002)(66946007)(5660300002)(71200400001)(132733001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?niUsvzInHjRSNot3pErZk7xA0zJwGo/Hgc4fKV3b/9Kj2sareTz0k/PIIMJb?= =?us-ascii?Q?385PADF/ekWLOpfvu+KTM7YEHfRVEWlRxaGG1HEnUysRlCZ2psTg8nKBNr/r?= =?us-ascii?Q?x1j1ZCxCLUss24hyhzc73QKMz6MGRJgzmA2uecT+a4DZLXsKOKip2/ycdoik?= =?us-ascii?Q?wlpdhG1ZB5coKEZhObmWgkOkTUeFdp5ymEDhDZLU6Z87odg591/YDWDDESk3?= =?us-ascii?Q?KNY4la9DAN5JxVdLr5JBb6xPUwYxniQoRG2U3pl+hwqf0Km2T9R3Iiw/I+MJ?= =?us-ascii?Q?OrPoly4OnkBGuw7AknCuCNYmx8x0W7EsTeHDVBrBuvB+g2BTJ45ZMDCMnQYW?= =?us-ascii?Q?FOUJnYh3D7G/9Qy6Cphz6Mp+bdYynWa57lCKIFJkQ7tVOhQEdzrpqxfX+Iro?= =?us-ascii?Q?DrVzk9T7OrNM0Os+2EMEKtA7MJcq6FkQ0NAeN+JUJxZPs2jBY/oYKHvjjh48?= =?us-ascii?Q?MfOnTw2m4WzRxmsCul9yjy0MtURtccMSExprWdHxEvgP5o3U+LtpJ2MC3mqT?= =?us-ascii?Q?Ylxx7oOMwSM9umm4pP734I1FAgHYbpOG6cHKdLN3Y1TrD8uBkQDZ41ZHz2t/?= =?us-ascii?Q?3NnYUWbaCfIBoKDdi7Z778V55EiZ3y4INiOYmjt+Uh3nU39hWKP/kqMqV/ne?= =?us-ascii?Q?ekz9AVJyU9g+tr2pQSqwTyOak5xu8XH4uBJ2Z89NMKbJE0VfNzy+saiYBbMS?= =?us-ascii?Q?yAeg/7XtYJ28OmStsfnXbr5xccaUKpXvQsCGp56WQtc5F1rjiqjyHv3mVqv0?= =?us-ascii?Q?nfiLNrJZ6ctutDcgDGQm0gvGyvg06I2NR76EePgCOq2l2iUhJ6qQOnrxSBJC?= =?us-ascii?Q?118tiwgQ06PyQTCdM7FhSoGoFZZP9j7LGqYlJPg5PuHrHQS+LJ+zAsd6o02y?= =?us-ascii?Q?xE5yQL9l3ZSGykGw5vj2cfNGtUGblofWrvD7kUjYQsQV6K1sYS0m45JsQRMh?= =?us-ascii?Q?e6ovm5ZTsuvv3ppZYZsH26zpaitRf2jJDZTM3rrLny2rcTorh4v6odWbuxDU?= =?us-ascii?Q?2Aa1c8D5b3upLNy+AU2g+qh916In0kMuhFY8kikVnW6jZLKOd+90ChlU2tBE?= =?us-ascii?Q?6to6dB4viTCnYLfI4B9mkftgtcYOP4Bvsf+BhVy1oqcuZfCde+R4fpffO0b/?= =?us-ascii?Q?IRfLVMhPuGBwtyH/vaHKS3LmjKgeh0kcos0NznwCazCY9KGK43QWjWLofR0N?= =?us-ascii?Q?hAIxkM23jqYmM6NHsUT0KFJZcMGc0szGrmCH2rsXOadHe4VGnlR2mYO7WaNa?= =?us-ascii?Q?5/OjrpYw819qkkEYeTSNLz6VPX10LQ6nw0N3fFgE21jM596Ik6SUiVyK1Sek?= =?us-ascii?Q?A+j1LjvIO9+6+GND/4XZa7Zz?= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR11MB1647.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cef2e317-de1b-480d-8c69-08d8de1ae3ee X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2021 08:03:54.6683 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: GywHEIzXh2i6OBkUgqs/jnjl4uZUcLClS8ywI/DMYUxpdYABq3JUe155M/vhXaoOlt9+PrdYwc9SVo7n8ZLKDw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1101MB2285 Return-Path: zhichao.gao@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_MWHPR11MB1647A43147CE9D2C2F75DAEDF6989MWHPR11MB1647namp_" --_000_MWHPR11MB1647A43147CE9D2C2F75DAEDF6989MWHPR11MB1647namp_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable I am OK with the patch. But the patch is using incorrect "Line ending": python ./BaseTools/Scripts/PatchCheck.py -1 Checking git commit: HEAD ShellPkg: add more items for smbiosview -t 3 . The commit message format passed all checks. Code format is not valid: * Line ending ('\n') is not CRLF File: ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c Line: if (Struct->Hdr->Length > 0x13) { * Line ending ('\n') is not CRLF File: ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c Line: PRINT_STRUCT_VALUE (Struct, Type3, ContainedElementCount); * Line ending ('\n') is not CRLF It is a good habit to use above check before send the patch. You should cha= nge your edit setting when you're working on edk2. Others are OK to me, Reviewed-by: Zhichao Gao Do not send the patch again. I would make the change. Because of it is hard= freeze now, the patch would be merged after the 202102 stable create. By the way, are you follow the development process https://github.com/tiano= core/tianocore.github.io/wiki/EDK-II-Development-Process to send the patch?= I am confused why I cannot extract your patch thru extractor tool. Thanks, Zhichao From: Mars CC Lin Sent: Wednesday, March 3, 2021 3:28 PM To: devel@edk2.groups.io Cc: Gao, Zhichao ; Philippe Mathieu-Daude ; Liming Gao Subject: [PATCH V5] ShellPkg: add more items for smbiosview -t 3 . https://bugzilla.tianocore.org/show_bug.cgi?id=3D3177 Add ContainedElementCount, ContainedElementRecordLength and ContainedElements for smbiosview type 3. Signed-off-by: Mars CC Lin > Cc: Zhichao Gao > Cc: Philippe Mathieu-Daude > Cc: Liming Gao > --- .../SmbiosView/PrintInfo.c | 15 +++++++++++++++ .../SmbiosView/SmbiosViewStrings.uni | 1 + 2 files changed, 16 insertions(+) diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintIn= fo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c index 478f63078a..04e4882272 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c @@ -404,6 +404,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 =3D 0; Index < Struct->Type3->ContainedElementCount; Index++) = { + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_CONTAIN= ED_ELEMENT), gShellDebug1HiiHandle, Index+1); + for (Index2 =3D 0; Index2< Struct->Type3->ContainedElementRecordLength; I= ndex2++) { + Print (L"%02X ", Buffer[0x15 + (Index * Struct->Type3->ContainedElementRe= cordLength) + Index2]); + } + Print (L"\n"); + } + } } if (AE_SMBIOS_VERSION (0x2, 0x7) && (Struct->Hdr->Length > 0x13)) { if (Struct->Hdr->Length > (0x15 + (Struct->Type3->ContainedElementCount * S= truct->Type3->ContainedElementRecordLength))) { diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosV= iewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/Smb= iosViewStrings.uni index 97e1d54fcf..20a556a175 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStri= ngs.uni +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStri= ngs.uni @@ -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 sta= te " #string STR_SMBIOSVIEW_PRINTINFO_SECURITY_STATUS #language en-US "Security = Status " +#string STR_SMBIOSVIEW_PRINTINFO_CONTAINED_ELEMENT #language en-US "Contai= ned 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 " -- 2.29.1.windows.1 --_000_MWHPR11MB1647A43147CE9D2C2F75DAEDF6989MWHPR11MB1647namp_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

I am OK with the patch. But the patch is using incor= rect “Line ending”:

python ./BaseTools/Scripts= /PatchCheck.py -1

Checking git commit: HEAD<= o:p>

ShellPkg: add more items f= or smbiosview -t 3 .

The commit message format = passed all checks.

Code format is not valid:<= o:p>

* Line ending ('\n') is no= t CRLF

   File: ShellPk= g/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c

   Line: &n= bsp;     if (Struct->Hdr->Length > 0x13) {

* Line ending ('\n') is no= t CRLF

   File: ShellPk= g/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c

   Line: &n= bsp;       PRINT_STRUCT_VALUE (Struct, Type3,= ContainedElementCount);

* Line ending ('\n') is no= t CRLF

 

It is a good habit to use above check before send th= e patch. You should change your edit setting when you’re working on e= dk2. Others are OK to me,

Reviewed-by: Zhichao Gao <zhichao.gao@intel.com&g= t;

Do not send the patch again. I would make the change= . Because of it is hard freeze now, the patch would be merged after the 202= 102 stable create.

 

By the way, are you follow the development process <= a href=3D"https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Deve= lopment-Process"> https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Development-Pr= ocess to send the patch? I am confused why I cannot extract your patch = thru extractor tool.

 

Thanks,

Zhichao

 

From: Mars CC Lin <mars_cc_lin@phoenix.com= >
Sent: Wednesday, March 3, 2021 3:28 PM
To: devel@edk2.groups.io
Cc: Gao, Zhichao <zhichao.gao@intel.com>; Philippe Mathieu-Dau= de <philmd@redhat.com>; Liming Gao <gaoliming@byosoft.com.cn> Subject: [PATCH V5] ShellPkg: add more items for smbiosview -t 3 .

 

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

Signed-off-by: Mars CC Lin <m= ars_cc_lin@phoenix.com>
Cc: Zhichao Gao <zhichao.gao@in= tel.com>
Cc: Philippe Mathieu-Daude <philmd@= redhat.com>
Cc: Liming Gao <gaoliming@by= osoft.com.cn>
---
.../SmbiosView/PrintInfo.c | 15 +++++++++++++++
.../SmbiosView/SmbiosViewStrings.uni | 1 +
2 files changed, 16 insertions(+)

diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintIn= fo.c b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c index 478f63078a..04e4882272 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c @@ -404,6 +404,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 =3D 0; Index < Struct->Type3->ContainedElementCount; = Index++) {
+ ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN (STR_SMBIOSVIEW_PRINTINFO_CONTAIN= ED_ELEMENT), gShellDebug1HiiHandle, Index+1);
+ for (Index2 =3D 0; Index2< Struct->Type3->ContainedElementRecord= Length; Index2++) {
+ Print (L"%02X ", Buffer[0x15 + (Index * Struct->Type3->Co= ntainedElementRecordLength) + Index2]);
+ }
+ Print (L"\n");
+ }
+ }
}
if (AE_SMBIOS_VERSION (0x2, 0x7) && (Struct->Hdr->Length >= 0x13)) {
if (Struct->Hdr->Length > (0x15 + (Struct->Type3->ContainedE= lementCount * Struct->Type3->ContainedElementRecordLength))) {
diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosV= iewStrings.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/Smb= iosViewStrings.uni
index 97e1d54fcf..20a556a175 100644
--- a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStri= ngs.uni
+++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosViewStri= ngs.uni
@@ -93,6 +93,7 @@
#string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_STATE #language en-US "P= ower Supply State "
#string STR_SMBIOSVIEW_PRINTINFO_THERMAL_STATE #language en-US "Therma= l state "
#string STR_SMBIOSVIEW_PRINTINFO_SECURITY_STATUS #language en-US "Secu= rity Status "
+#string STR_SMBIOSVIEW_PRINTINFO_CONTAINED_ELEMENT #language en-US "C= ontained Element %d: "
#string STR_SMBIOSVIEW_PRINTINFO_SUPOPRT #language en-US "Support &quo= t;
#string STR_SMBIOSVIEW_PRINTINFO_CURRENT #language en-US "Current &quo= t;
#string STR_SMBIOSVIEW_PRINTINFO_INSTALLED #language en-US "Installed = "
--
2.29.1.windows.1

--_000_MWHPR11MB1647A43147CE9D2C2F75DAEDF6989MWHPR11MB1647namp_--