From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web10.5.1680836500505266068 for ; Thu, 06 Apr 2023 20:01:40 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=DxYzcxSk; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: zhichao.gao@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680836500; x=1712372500; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=YL+SK2yN2Wcv1hHT4QbC0A1+gvTGAZdSjBuVuKnB+4E=; b=DxYzcxSkPGn6b2T6rCpw1mCt6q2NPdI85BqceaMDjrygyPBUkfTyE6sf DggpikoKozoBDcB/wOE2zL/4uePGUgRKTowgx9bWNztjXBe7xN5nTrnte 4G2bGranS1Yv0TEGC37URHoyK6dWkFCSpT+/Q0Ni7RKiNHl+YZqaPBw+F 5LZhio0WzTODZ7Ka0kIZ+pNd4cHJ/qmoISyRMm2Zf3iNRGHu5TFRf174l dF0OvHHzsc5alOJG9vhbk7iv6l5zuf9wuN9tRFg8Omsq+TUl9lz9P/dCw bxoPzUuwlUDFmoQd/UfUSptljNS9IqgUo5fc6WDvOvvnu81ix4m2veLUi Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10672"; a="341665949" X-IronPort-AV: E=Sophos;i="5.98,324,1673942400"; d="scan'208";a="341665949" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2023 20:01:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10672"; a="717698907" X-IronPort-AV: E=Sophos;i="5.98,324,1673942400"; d="scan'208";a="717698907" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga008.jf.intel.com with ESMTP; 06 Apr 2023 20:01:31 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Thu, 6 Apr 2023 20:01:31 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Thu, 6 Apr 2023 20:01:30 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21 via Frontend Transport; Thu, 6 Apr 2023 20:01:30 -0700 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (104.47.74.49) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.21; Thu, 6 Apr 2023 20:01:29 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IjkNzeD/thTb9bqsdgOTn255un42djajJIS4Kz7sGDbhE+Vy3YjayQzN4CbIwlLIsCYFFq7EStaTHpLPBkMkw5JULkr6DkTiWsnkQ9co1CqaRhbo5jpUUTh7f77c/B21EJv7ttmc7BiDu0/xhCb49OyWnzo7Sberx+VcIN2Fal+aMV1ocoyDU8k2zfFZr+pTt6ocJ2k4i93RLuJ2mJudh0/sMKY2npL7axnmvaly5us1yjI4znYH+tU3pGVWcm7LzDbdVLyNtA/eX4jZu90tZ3Ixk7mVmhKXmkDl95h4+EqCylSLwF/klgEujp5tqvMbBh8rzAyOINeq9o67s6GqgQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tjK3891akmArM6Q6jzUb2kMlRPECnX9hMtkqw85B0co=; b=Twvw+j4uYsY4Iqu0ePQh6m11lJ6B/kDSQVNbQkEivijtUMAMM7aX2fndCEyfOo8VvTl3MPvc+eCa0xTgA7Kw5vfHfimwDeD9PYLnJSeVITocEDdXCF+G6nbPtiMmFml9cA9XKwZ66XxE5zWlxmvYk2ihKBWFIvAfFqpjuFbEp+u0ewVj8559ceFIb4UPYhX3I6F+PJIdT/+EvLqjXmRlNajO09tuNy46GIPCOH+qQlS26L6gMqwEmTsaI8EGSeG2Ih+qofF/HIz7nzl8xajSxiqXC2GP5A+lzW4b0nKK1ZU2Jl3DdghwUDdKZtviz4MdXV97O9x47a9vQIizs6RVNA== 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 Received: from PH7PR11MB6377.namprd11.prod.outlook.com (2603:10b6:510:1fb::13) by IA1PR11MB7318.namprd11.prod.outlook.com (2603:10b6:208:426::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6254.33; Fri, 7 Apr 2023 03:01:27 +0000 Received: from PH7PR11MB6377.namprd11.prod.outlook.com ([fe80::55a1:169b:b642:6dea]) by PH7PR11MB6377.namprd11.prod.outlook.com ([fe80::55a1:169b:b642:6dea%8]) with mapi id 15.20.6277.031; Fri, 7 Apr 2023 03:01:27 +0000 From: "Gao, Zhichao" To: "Lin, MillerX" , "devel@edk2.groups.io" CC: "Ni, Ray" Subject: Re: [PATCH] ShellPkg: Update smbiosview type 0/4/17/41 with SMBIOS 3.5 fields Thread-Topic: [PATCH] ShellPkg: Update smbiosview type 0/4/17/41 with SMBIOS 3.5 fields Thread-Index: AQHZVVPY7upoOKKog0OADRLzyCA5j68fT2qQ Date: Fri, 7 Apr 2023 03:01:26 +0000 Message-ID: References: <20230313023014.1818-1-millerx.lin@intel.com> In-Reply-To: <20230313023014.1818-1-millerx.lin@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PH7PR11MB6377:EE_|IA1PR11MB7318:EE_ x-ms-office365-filtering-correlation-id: 45686ae3-b7bd-42e4-5eee-08db37146102 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: PZwBKOtuhDxeytT3IkZZqHXCOBauK7hBFi/XYDmtSe/wRXjHfuDLUaHwadcns9nLrFoa1zjy4Fh6fpQxqdDUnPGz28+5I6psOcvi9Vb2lxTv3ooZ0Ykh3SKf7L/IgB6izd8kvQatB3Qm5boiz8TixrhSp/sdP0+EzrYqSgV6qYOdKIyrIZr/D25LfPjtfl1jtJuU5165QqY8ogAU9YFoiofR1WKwfUNZ/wo5FbHEVfmXG0pxOn55kxxk3yRo/rAMjKJNH7FR5IBTxarQZ5FwaocNMETQvvP7QL/iw6TV/yqWpzji7NvDYtcc7NV3q0lp2ynlsBA71cl+kpwVcjXO24h25xvZy7SqNxT1MkcQZphqP0t8i/q3XhXm2Ujs7CVp0RFD2b6aAhBhOyP+6zAaxp/ogJw2B8iWMj3N+HUTlJ96W2uEHIs1iUXi8SPRenlMJrXYWO09dVK7K3cN9ud6JUHBgDAqPKZhOm1qM2j+jDTwQbi60atlapj/lccai357VtoJq9e4SY54zcVGx+CtCf6FCk+0czM4natsCHcICklzwyKww33KuN5f2ZCmABOpit4NTsJ+bSc0l7Kdm5mtgAzbksqpovM6ual7iy5Fx83lFQs0CiBEybYPjkGHscEwz+XaeQgvlb1mGKqYnA/4mQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH7PR11MB6377.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(366004)(346002)(39860400002)(396003)(136003)(451199021)(33656002)(82960400001)(4326008)(83380400001)(8676002)(316002)(66946007)(66556008)(41300700001)(86362001)(19627235002)(76116006)(66476007)(2906002)(122000001)(66446008)(64756008)(110136005)(478600001)(7696005)(15650500001)(71200400001)(38100700002)(8936002)(52536014)(38070700005)(5660300002)(9686003)(53546011)(186003)(107886003)(30864003)(55016003)(26005)(6506007)(579004)(559001)(44824005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?LiEF5Cf7tGxtpiVCcqTTcZZQ+0pfBh81WFkUZfy/ZN5tC/hQ1irNBWxXfaNk?= =?us-ascii?Q?ek8eXiQbIwFWVfPqI3ah0sSrEZnpzYDVmjq0F/lLxY+K2DMuGUmSWmFTYRTT?= =?us-ascii?Q?GvcCGhBB7FlvfQQtHYC/Y2tfFLJqyHgI7z1Pryr2amybm4p1xlbhuOshT1o7?= =?us-ascii?Q?8NAS5dYbuBSDXhpbumuL+SohpiGe7PzsV1SSQhtVyE1Z2Dpn3I5izuX8gIb3?= =?us-ascii?Q?RDbKP6FDLg8Lc9b74ZatovZcv+KGe7XEwZoZaQrrpfrUx5MgRjYMPVnsI2K0?= =?us-ascii?Q?o7VcI/VX3ZbB/4Jvc1MED+jlo/s0fGETsRLan5zDp4RPwWkqWo6Xu/F5e779?= =?us-ascii?Q?j4CDVVjUZ7pH2kwW7Up7yIwmMznOCramB1HGzsm0j240x0YuhGo89hARAhOP?= =?us-ascii?Q?an1fH5gY4oF6tETt1lz097AO+G8F6OhqZXccMOhsf4KwO/TN7ThbtJKfwIHq?= =?us-ascii?Q?y2Gk+kmJoWANCrUtGLuWpakQx3iJ53heCJc6oHXLZ7V7+6D64xKriHC6KRnw?= =?us-ascii?Q?lRP6WlRLANPRQGNOnAH6poN/S9uic5W9MDg3fMQm+MzMBxQXn2DTIWkBEPQ/?= =?us-ascii?Q?d026Bi4+4qnkaBCuk4tc8b6szycV9Nnl2MRe2V/uAqFbYkGd5cTAkzYfb5AZ?= =?us-ascii?Q?hb0KBEdWOaKkC2W8QWnvHRIUQk/JVokbMUEJhPUxHYLdw4lSWd4NzoBnJX1O?= =?us-ascii?Q?UEB6rUWfOWvneOENam00NEcbhH8G1zAKU4JovveSbSCnqS0Jd8E1p1lgp+FR?= =?us-ascii?Q?71PF9FD+lCNLEVdcNPTzq9dbZXaU7oYhdMbfgK5kck7gwX3GirhQaSVXkFTV?= =?us-ascii?Q?4Q5yWiY8zafKn9inZqtKToWc6WPfWWP6lfw2encpBCf+lE0L86RLnjIvcD18?= =?us-ascii?Q?lBBRXVWH9Mk14p10vaXKypR85ZzeoI2jMwRnUq+AGzCPejqBXLaJQpdLdeib?= =?us-ascii?Q?zfx1RwrpW+IZBtQSDTMk7n+xAvw1H2WAMuWyuTw2JU4qVVwOYuk6cQSkhtsz?= =?us-ascii?Q?JOoLIOPIXAxv85000jUR08tV/8WYvFJOZeJVLXGzpnXAj83RpiSWShKNivth?= =?us-ascii?Q?JbHvhpRIK838pNoT//ybDShtswyy6oJwGRkBJ/12GGAhVcFYW5IYV32JTrbh?= =?us-ascii?Q?NdapN/9C7tPhHHy/11/EOAM438Yg05cRf2bWfZiO2iNtJEy1ovN8hDQt4pjr?= =?us-ascii?Q?Mve/piAgDQ2XQvlO/dmGq9EVDo0ouLejI2iwzKwD3ljweP8U0FqDQF76mR41?= =?us-ascii?Q?CvmUXXBkqUGnar/NgRuYY0hT4cFLZhA+7AwNSBWSnkt9e9eCkB3HClawDr9a?= =?us-ascii?Q?smxgo+HWG9rDMWoQEIWEfHD7h76+JKgC9lqk/v35Cn8+KPf5ieLkYAoB/d+/?= =?us-ascii?Q?ZNoQLGoXPHlluX/NoHV0eGJU4+muzT+uD8dPab5bwcAWEABWy8OsUT8BeNab?= =?us-ascii?Q?fZOd5r/ONzs7JTk3cpsYfLG7VlesLjGc8UNIWaSP7OuSoeZ7Hebg1GRSKUxL?= =?us-ascii?Q?awxW1edD8gLHBEVm+S2ETjDlZSPMCL5L5f00lfDK1jXpVx81mgBjDWSllKEi?= =?us-ascii?Q?4tzYgyEFwaKTBzYCL9GuNcN4up0GXgsuB/1QakK7?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB6377.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 45686ae3-b7bd-42e4-5eee-08db37146102 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Apr 2023 03:01:26.9144 (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: Jxf4Vbzh+nO5+y6a3/GVCw4xgy6xWYATWGOuI5YYJMtknCyweZ/9KLyjBb4kvQQsnse9w0VyU3hcbFGBAN2KVQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB7318 Return-Path: zhichao.gao@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable > -----Original Message----- > From: Lin, MillerX > Sent: Monday, March 13, 2023 10:30 AM > To: devel@edk2.groups.io > Cc: Lin, MillerX ; Ni, Ray ; Gao= , > Zhichao > Subject: [PATCH] ShellPkg: Update smbiosview type 0/4/17/41 with SMBIOS > 3.5 fields >=20 > Cc: Signed-off-by: MillerX Lin > Cc: Ray Ni > Cc: Zhichao Gao >=20 > --- > .../SmbiosView/PrintInfo.c | 153 +++++++++--------- > .../SmbiosView/SmbiosViewStrings.uni | 28 ++-- > 2 files changed, 90 insertions(+), 91 deletions(-) >=20 > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > index 2611601230..de9cc8becd 100644 > --- > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > +++ > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > @@ -335,10 +335,10 @@ SmbiosPrintStructure ( > // BIOS Information (Type 0) > // > case 0: > - PRINT_PENDING_STRING (Struct, Type0, Vendor); > - PRINT_PENDING_STRING (Struct, Type0, BiosVersion); > - PRINT_STRUCT_VALUE_H (Struct, Type0, BiosSegment); > - PRINT_PENDING_STRING (Struct, Type0, BiosReleaseDate); > + ShellPrintEx (-1, -1, L"Vendor: %a\n", LibGetSmbiosString (Struct,= Struct- > >Type0->Vendor)); > + ShellPrintEx (-1, -1, L"BIOS Version: %a\n", LibGetSmbiosString (S= truct, > Struct->Type0->BiosVersion)); > + ShellPrintEx (-1, -1, L"BIOS Starting Address Segment: 0x%x\n", St= ruct- > >Type0->BiosSegment); > + ShellPrintEx (-1, -1, L"BIOS Release Date: %a\n", > + LibGetSmbiosString (Struct, Struct->Type0->BiosReleaseDate)); > ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE), gShellDebug1HiiHandle, 64 * > (Struct->Type0->BiosSize + 1)); >=20 > DisplayBiosCharacteristics (ReadUnaligned64 ((UINT64 > *)(UINTN)&(Struct->Type0->BiosCharacteristics)), Option); @@ -352,10 > +352,10 @@ SmbiosPrintStructure ( > } >=20 > if (AE_SMBIOS_VERSION (0x2, 0x4) && (Struct->Hdr->Length > 0x14)) = { > - PRINT_STRUCT_VALUE (Struct, Type0, SystemBiosMajorRelease); > - PRINT_STRUCT_VALUE (Struct, Type0, SystemBiosMinorRelease); > - PRINT_STRUCT_VALUE (Struct, Type0, > EmbeddedControllerFirmwareMajorRelease); > - PRINT_STRUCT_VALUE (Struct, Type0, > EmbeddedControllerFirmwareMinorRelease); > + ShellPrintEx (-1, -1, L"System BIOS Major Release: %u\n", Struct= - > >Type0->SystemBiosMajorRelease); > + ShellPrintEx (-1, -1, L"System BIOS Minor Release: %u\n", Struct= - > >Type0->SystemBiosMinorRelease); > + ShellPrintEx (-1, -1, L"Embedded Controller Firmware Major > Release: %u\n", Struct->Type0- > >EmbeddedControllerFirmwareMajorRelease); > + ShellPrintEx (-1, -1, L"Embedded Controller Firmware Minor > + Release: %u\n", > + Struct->Type0->EmbeddedControllerFirmwareMinorRelease); > } >=20 > if (AE_SMBIOS_VERSION (0x3, 0x1) && (Struct->Hdr->Length > 0x18)) > { @@ -470,48 +470,50 @@ SmbiosPrintStructure ( > // Processor Information (Type 4) > // > case 4: > - PRINT_SMBIOS_STRING (Struct, Struct->Type4->Socket, > SocketDesignation) > + ShellPrintEx (-1, -1, L"Socket Designation: %a\n", > + LibGetSmbiosString (Struct, Struct->Type4->Socket)); > DisplayProcessorType (Struct->Type4->ProcessorType, Option); > - if (AE_SMBIOS_VERSION (0x2, 0x6) && (Struct->Hdr->Length > 0x28) &= & > - (Struct->Type4->ProcessorFamily =3D=3D 0xFE)) > - { > - // > - // Get family from ProcessorFamily2 field > - // > - DisplayProcessorFamily2 (Struct->Type4->ProcessorFamily2, Option= ); > - } else { > - DisplayProcessorFamily (Struct->Type4->ProcessorFamily, Option); > - } > - > - PRINT_PENDING_STRING (Struct, Type4, ProcessorManufacturer); > - PRINT_BIT_FIELD (Struct, Type4, ProcessorId, 8); > - PRINT_PENDING_STRING (Struct, Type4, ProcessorVersion); > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY), > gShellDebug1HiiHandle); > + DisplayProcessorFamily (Struct->Type4->ProcessorFamily, Option); > + ShellPrintEx (-1, -1, L"Processor Manufacturer: %a\n", > LibGetSmbiosString (Struct, Struct->Type4->ProcessorManufacturer)); > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_ID), gShellDebug1HiiHandle, 8); > + DumpHex (0, 0, 8, &(Struct->Type4->ProcessorId)); > + ShellPrintEx (-1, -1, L"Processor Version: %a\n", > + LibGetSmbiosString (Struct, Struct->Type4->ProcessorVersion)); > DisplayProcessorVoltage (*(UINT8 *)&(Struct->Type4->Voltage), Opti= on); > - PRINT_STRUCT_VALUE (Struct, Type4, ExternalClock); > - PRINT_STRUCT_VALUE (Struct, Type4, MaxSpeed); > - PRINT_STRUCT_VALUE (Struct, Type4, CurrentSpeed); > + ShellPrintEx (-1, -1, L"External Clock: %u\n", Struct->Type4- > >ExternalClock); > + ShellPrintEx (-1, -1, L"Max Speed: %u\n", Struct->Type4->MaxSpeed)= ; > + ShellPrintEx (-1, -1, L"Current Speed: %u\n", > + Struct->Type4->CurrentSpeed); > DisplayProcessorStatus (Struct->Type4->Status, Option); > DisplayProcessorUpgrade (Struct->Type4->ProcessorUpgrade, Option); > - PRINT_STRUCT_VALUE_H (Struct, Type4, L1CacheHandle); > - PRINT_STRUCT_VALUE_H (Struct, Type4, L2CacheHandle); > - PRINT_STRUCT_VALUE_H (Struct, Type4, L3CacheHandle); > + ShellPrintEx (-1, -1, L"L1 Cache Handle: 0x%x\n", Struct->Type4- > >L1CacheHandle); > + ShellPrintEx (-1, -1, L"L2 Cache Handle: 0x%x\n", Struct->Type4- > >L2CacheHandle); > + ShellPrintEx (-1, -1, L"L3 Cache Handle: 0x%x\n", > + Struct->Type4->L3CacheHandle); > if (AE_SMBIOS_VERSION (0x2, 0x3) && (Struct->Hdr->Length > 0x20)) = { > - PRINT_PENDING_STRING (Struct, Type4, SerialNumber); > - PRINT_PENDING_STRING (Struct, Type4, AssetTag); > - PRINT_PENDING_STRING (Struct, Type4, PartNumber); > + ShellPrintEx (-1, -1, L"Serial Number: %a\n", LibGetSmbiosString= (Struct, > Struct->Type4->SerialNumber)); > + ShellPrintEx (-1, -1, L"Asset Tag: %a\n", LibGetSmbiosString (St= ruct, > Struct->Type4->AssetTag)); > + ShellPrintEx (-1, -1, L"Part Number: %a\n", LibGetSmbiosString > + (Struct, Struct->Type4->PartNumber)); > } >=20 > if (AE_SMBIOS_VERSION (0x2, 0x5) && (Struct->Hdr->Length > 0x23)) = { > - PRINT_STRUCT_VALUE (Struct, Type4, CoreCount); > - PRINT_STRUCT_VALUE (Struct, Type4, EnabledCoreCount); > - PRINT_STRUCT_VALUE (Struct, Type4, ThreadCount); > + ShellPrintEx (-1, -1, L"Core Count: %u\n", Struct->Type4->CoreCo= unt); > + ShellPrintEx (-1, -1, L"Core Enabled: %u\n", Struct->Type4- > >EnabledCoreCount); > + ShellPrintEx (-1, -1, L"Thread Count: %u\n", > + Struct->Type4->ThreadCount); > DisplayProcessorCharacteristics (Struct->Type4- > >ProcessorCharacteristics, Option); > } >=20 > + if (AE_SMBIOS_VERSION (0x2, 0x6) && (Struct->Hdr->Length > 0x28) &= & > + (Struct->Type4->ProcessorFamily2 >=3D 0x100)) > + { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY2), > gShellDebug1HiiHandle); > + DisplayProcessorFamily2 (Struct->Type4->ProcessorFamily2, Option= ); > + } else { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY2), > gShellDebug1HiiHandle); This should be family instead of family2. Others look good to me. Thanks, Zhichao > + DisplayProcessorFamily (Struct->Type4->ProcessorFamily, Option); > + } > + > if ((SmbiosMajorVersion >=3D 0x3) && (Struct->Hdr->Length > 0x2A))= { > - PRINT_STRUCT_VALUE (Struct, Type4, CoreCount2); > - PRINT_STRUCT_VALUE (Struct, Type4, EnabledCoreCount2); > - PRINT_STRUCT_VALUE (Struct, Type4, ThreadCount2); > + ShellPrintEx (-1, -1, L"Core Count 2: %u\n", Struct->Type4- > >CoreCount2); > + ShellPrintEx (-1, -1, L"Core Enabled 2: %u\n", Struct->Type4- > >EnabledCoreCount2); > + ShellPrintEx (-1, -1, L"Thread Count 2: %u\n", > + Struct->Type4->ThreadCount2); > } >=20 > break; > @@ -829,68 +831,68 @@ SmbiosPrintStructure ( > // Memory Device (Type 17) > // > case 17: > - PRINT_STRUCT_VALUE_H (Struct, Type17, MemoryArrayHandle); > - PRINT_STRUCT_VALUE_H (Struct, Type17, > MemoryErrorInformationHandle); > - PRINT_STRUCT_VALUE_H (Struct, Type17, TotalWidth); > - PRINT_STRUCT_VALUE_H (Struct, Type17, DataWidth); > + ShellPrintEx (-1, -1, L"Physical Memory Array Handle: 0x%x\n", Str= uct- > >Type17->MemoryArrayHandle); > + ShellPrintEx (-1, -1, L"Memory Error Information Handle: 0x%x\n", > Struct->Type17->MemoryErrorInformationHandle); > + ShellPrintEx (-1, -1, L"Total Width: 0x%x\n", Struct->Type17->Tota= lWidth); > + ShellPrintEx (-1, -1, L"Data Width: 0x%x\n", > + Struct->Type17->DataWidth); > PRINT_STRUCT_VALUE (Struct, Type17, Size); > DisplayMemoryDeviceFormFactor (Struct->Type17->FormFactor, Option)= ; > - PRINT_STRUCT_VALUE_H (Struct, Type17, DeviceSet); > - PRINT_PENDING_STRING (Struct, Type17, DeviceLocator); > - PRINT_PENDING_STRING (Struct, Type17, BankLocator); > + ShellPrintEx (-1, -1, L"Device Set: 0x%x\n", Struct->Type17->Devic= eSet); > + ShellPrintEx (-1, -1, L"Device Locator: %a\n", LibGetSmbiosString(= Struct, > Struct->Type17->DeviceLocator)); > + ShellPrintEx (-1, -1, L"Bank Locator: %a\n", > + LibGetSmbiosString(Struct, Struct->Type17->BankLocator)); > DisplayMemoryDeviceType (Struct->Type17->MemoryType, Option); > DisplayMemoryDeviceTypeDetail (ReadUnaligned16 ((UINT16 > *)(UINTN)&(Struct->Type17->TypeDetail)), Option); > PRINT_STRUCT_VALUE_H (Struct, Type17, Speed); > PRINT_PENDING_STRING (Struct, Type17, Manufacturer); > - PRINT_PENDING_STRING (Struct, Type17, SerialNumber); > - PRINT_PENDING_STRING (Struct, Type17, AssetTag); > - PRINT_PENDING_STRING (Struct, Type17, PartNumber); > + ShellPrintEx (-1, -1, L"Serial Number: %a\n", LibGetSmbiosString(S= truct, > Struct->Type17->SerialNumber)); > + ShellPrintEx (-1, -1, L"Asset Tag: %a\n", LibGetSmbiosString(Struc= t, > Struct->Type17->AssetTag)); > + ShellPrintEx (-1, -1, L"Part Number: %a\n", > + LibGetSmbiosString(Struct, Struct->Type17->PartNumber)); > if (AE_SMBIOS_VERSION (0x2, 0x6) && (Struct->Hdr->Length > 0x1B)) = { > PRINT_STRUCT_VALUE_H (Struct, Type17, Attributes); > } >=20 > if (AE_SMBIOS_VERSION (0x2, 0x7) && (Struct->Hdr->Length > 0x1C)) = { > - PRINT_STRUCT_VALUE (Struct, Type17, ExtendedSize); > - PRINT_STRUCT_VALUE_H (Struct, Type17, > ConfiguredMemoryClockSpeed); > + ShellPrintEx (-1, -1, L"Extended Size: %u\n", Struct->Type17- > >ExtendedSize); > + ShellPrintEx (-1, -1, L"Configured Memory Speed: 0x%x\n", > + Struct->Type17->ConfiguredMemoryClockSpeed); > } >=20 > if (AE_SMBIOS_VERSION (0x2, 0x8) && (Struct->Hdr->Length > 0x22)) = { > - PRINT_STRUCT_VALUE (Struct, Type17, MinimumVoltage); > - PRINT_STRUCT_VALUE (Struct, Type17, MaximumVoltage); > - PRINT_STRUCT_VALUE (Struct, Type17, ConfiguredVoltage); > + ShellPrintEx (-1, -1, L"Minimum voltage: %u\n", Struct->Type17- > >MinimumVoltage); > + ShellPrintEx (-1, -1, L"Maximum voltage: %u\n", Struct->Type17- > >MaximumVoltage); > + ShellPrintEx (-1, -1, L"Configured voltage: %u\n", > + Struct->Type17->ConfiguredVoltage); > } >=20 > if (AE_SMBIOS_VERSION (0x3, 0x2)) { > if (Struct->Hdr->Length > 0x28) { > DisplayMemoryDeviceMemoryTechnology (Struct->Type17- > >MemoryTechnology, Option); > DisplayMemoryDeviceMemoryOperatingModeCapability (Struct- > >Type17->MemoryOperatingModeCapability.Uint16, Option); > - PRINT_PENDING_STRING (Struct, Type17, FirmwareVersion); > - PRINT_STRUCT_VALUE_H (Struct, Type17, ModuleManufacturerID); > - PRINT_STRUCT_VALUE_H (Struct, Type17, ModuleProductID); > - PRINT_STRUCT_VALUE_H (Struct, Type17, > MemorySubsystemControllerManufacturerID); > - PRINT_STRUCT_VALUE_H (Struct, Type17, > MemorySubsystemControllerProductID); > + ShellPrintEx (-1, -1, L"Firmware Version: %a\n", > LibGetSmbiosString(Struct, Struct->Type17->FirmwareVersion)); > + ShellPrintEx (-1, -1, L"Module Manufacturer ID: 0x%x\n", Struc= t- > >Type17->ModuleManufacturerID); > + ShellPrintEx (-1, -1, L"Module Product ID: 0x%x\n", Struct->Ty= pe17- > >ModuleProductID); > + ShellPrintEx (-1, -1, L"Memory Subsystem Controller Manufactur= er ID: > 0x%x\n", Struct->Type17->MemorySubsystemControllerManufacturerID); > + ShellPrintEx (-1, -1, L"Memory Subsystem Controller Product > + ID: 0x%x\n", Struct->Type17->MemorySubsystemControllerProductID); > } >=20 > if (Struct->Hdr->Length > 0x34) { > - PRINT_STRUCT_VALUE_LH (Struct, Type17, NonVolatileSize); > + ShellPrintEx (-1, -1, L"Non-volatile Size: 0x%lx\n", > + Struct->Type17->NonVolatileSize); > } >=20 > if (Struct->Hdr->Length > 0x3C) { > - PRINT_STRUCT_VALUE_LH (Struct, Type17, VolatileSize); > + ShellPrintEx (-1, -1, L"Volatile Size: 0x%lx\n", > + Struct->Type17->VolatileSize); > } >=20 > if (Struct->Hdr->Length > 0x44) { > - PRINT_STRUCT_VALUE_LH (Struct, Type17, CacheSize); > + ShellPrintEx (-1, -1, L"Cache Size: 0x%lx\n", > + Struct->Type17->CacheSize); > } >=20 > if (Struct->Hdr->Length > 0x4C) { > - PRINT_STRUCT_VALUE_LH (Struct, Type17, LogicalSize); > + ShellPrintEx (-1, -1, L"Logical Size: 0x%lx\n", > + Struct->Type17->LogicalSize); > } > } >=20 > if (AE_SMBIOS_VERSION (0x3, 0x3) && (Struct->Hdr->Length > 0x54)) = { > - PRINT_STRUCT_VALUE_H (Struct, Type17, ExtendedSpeed); > - PRINT_STRUCT_VALUE_H (Struct, Type17, > ExtendedConfiguredMemorySpeed); > + ShellPrintEx (-1, -1, L"Extended Speed: 0x%x\n", Struct->Type17- > >ExtendedSpeed); > + ShellPrintEx (-1, -1, L"Extended Configured Memory Speed: > + 0x%x\n", Struct->Type17->ExtendedConfiguredMemorySpeed); > } >=20 > break; > @@ -1258,13 +1260,13 @@ SmbiosPrintStructure ( > // Onboard Devices Extended Information (Type 41) > // > case 41: > - PRINT_PENDING_STRING (Struct, Type41, ReferenceDesignation); > + ShellPrintEx (-1, -1, L"Reference Designation: %a\n", > + LibGetSmbiosString (Struct, Struct->Type41->ReferenceDesignation)); > ShellPrintEx (-1, -1, (((Struct->Type41->DeviceType) & 0x80) !=3D = 0) ? > L"Device Enabled\n" : L"Device Disabled\n"); > DisplayOnboardDeviceTypes ((Struct->Type41->DeviceType) & 0x7F, > Option); > - PRINT_STRUCT_VALUE_H (Struct, Type41, DeviceTypeInstance); > - PRINT_STRUCT_VALUE_H (Struct, Type41, SegmentGroupNum); > - PRINT_STRUCT_VALUE_H (Struct, Type41, BusNum); > - PRINT_STRUCT_VALUE_H (Struct, Type41, DevFuncNum); > + ShellPrintEx (-1, -1, L"Device Type Instance: 0x%x\n", Struct->Typ= e41- > >DeviceTypeInstance); > + ShellPrintEx (-1, -1, L"Segment Group Number: 0x%x\n", Struct- > >Type41->SegmentGroupNum); > + ShellPrintEx (-1, -1, L"Bus Number: 0x%x\n", Struct->Type41->BusNu= m); > + ShellPrintEx (-1, -1, L"Device/Function Number: 0x%x\n", > + Struct->Type41->DevFuncNum); > break; >=20 > // > @@ -1606,10 +1608,6 @@ DisplayProcessorFamily ( > UINT8 Option > ) > { > - // > - // Print prompt message > - // > - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY), > gShellDebug1HiiHandle); > // > // Print option > // > @@ -2411,6 +2409,10 @@ DisplayProcessorFamily ( > Print (L"i960\n"); > break; >=20 > + case 0xFE: > + Print (L"Indicator to obtain the processor family from the Process= or > Family 2 field\n"); > + break; > + > default: > ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_SMBIOSVIEW_PRINTINFO_UNDEFINED_PROC_FAMILY), > gShellDebug1HiiHandle); > } > @@ -2432,11 +2434,6 @@ DisplayProcessorFamily2 ( > IN UINT8 Option > ) > { > - // > - // Print prompt message > - // > - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY), > gShellDebug1HiiHandle); > - > // > // Print option > // > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView > Strings.uni > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView > Strings.uni > index 05f7a61d9d..73f7b2ab19 100644 > --- > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView > Strings.uni > +++ > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView > S > +++ trings.uni > @@ -88,8 +88,8 @@ > #string STR_SMBIOSVIEW_PRINTINFO_FORMATTED_AREA > #language en-US "Formatted Area: \r\n" > #string STR_SMBIOSVIEW_PRINTINFO_INTER_ACHOR #languag= e > en-US "Inter Anchor: %a\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_INTER_CHECKSUM > #language en-US "Inter Checksum: 0x%x\r\n" > -#string STR_SMBIOSVIEW_PRINTINFO_FORMAT_PART_LEN > #language en-US "Format part Len : %d\r\n" > -#string STR_SMBIOSVIEW_PRINTINFO_STRUCT_HANDLE #languag= e > en-US "Structure Handle: %d\r\n" > +#string STR_SMBIOSVIEW_PRINTINFO_FORMAT_PART_LEN > #language en-US "Length: %d\r\n" > +#string STR_SMBIOSVIEW_PRINTINFO_STRUCT_HANDLE > #language en-US "Handle: %d\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_BOOTUP_STATE #languag= e > en-US "Bootup state " > #string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_STATE > #language en-US "Power Supply State " > #string STR_SMBIOSVIEW_PRINTINFO_THERMAL_STATE #languag= e > en-US "Thermal state " > @@ -168,6 +168,8 @@ > #string STR_SMBIOSVIEW_PRINTINFO_MCFG_ENABLED #languag= e > en-US "Manufacturing mode is enabled\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_BITS_RSVD_FOR_FUTURE > #language en-US " Bits %d:7 are reserved for future assignment\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY > #language en-US "Processor Family: " > +#string STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_ID #languag= e > en-US "Processor ID\r\nsize=3D%d:\r\n" > +#string STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY2 > #language en-US "Processor Family 2: " > #string STR_SMBIOSVIEW_PRINTINFO_OTHER #languag= e en-US > "Other\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_UNKNOWN #languag= e > en-US "Unknown\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_INTEL386_PROCESSOR > #language en-US "Intel386(TM) Processor\r\n" > @@ -255,7 +257,7 @@ > #string STR_SMBIOSVIEW_PRINTINFO_RSVD_FOR_SPEC_K5 > #language en-US "Reserved for specific K5 versions\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_RSVD_FOR_SPEC_PENTIUM > #language en-US "Reserved for specific Pentium(R) Processor versions\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_UNDEFINED_PROC_FAMILY > #language en-US "Undefined processor family and type\r\n" > -#string STR_SMBIOSVIEW_PRINTINFO_PROC_INFO #languag= e > en-US "Processor Information - Voltage:\r\n" > +#string STR_SMBIOSVIEW_PRINTINFO_PROC_INFO #languag= e > en-US "Voltage:\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_PROC_CURRENT_VOLTAGE > #language en-US "Processor current voltage =3D (%d/10)V\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_5V_SUPOPRTED #languag= e > en-US " 5V is supported\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_33V_SUPPORTED #languag= e > en-US " 3.3V is supported\r\n" > @@ -271,7 +273,7 @@ > #string STR_SMBIOSVIEW_PRINTINFO_BIT13_NOT_ZERO #languag= e > en-US "Error, reserved BIT 13 must be zero\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_BIT14_NOT_ZERO #languag= e > en-US "Error, reserved BIT 14 must be zero\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_BIT15_NOT_ZERO #languag= e > en-US "Error, reserved BIT 15 must be zero\r\n" > -#string STR_SMBIOSVIEW_PRINTINFO_PROC_STATUS #languag= e > en-US "Processor Status:\r\n" > +#string STR_SMBIOSVIEW_PRINTINFO_PROC_STATUS #languag= e > en-US "Status:\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_CPU_SOCKET_POPULATED > #language en-US "CPU Socket Populated\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_CPU_SOCKET_UNPOPULATED > #language en-US "CPU Socket Unpopulated\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_CPU_ENABLED #languag= e > en-US "CPU Enabled\r\n" > @@ -382,8 +384,8 @@ > #string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_NOT_PRESENT > #language en-US "Power supply is not present\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_REPLACE > #language en-US "Power supply is hot replaceable\r\n" > #string STR_SMBIOSVIEW_PRINTINFO_POWER_SUPPLY_NOT_REPLACE > #language en-US "Power supply is not hot replaceable\r\n" > -#string STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE #languag= e en- > US "BiosSize: %d KB\r\n" > -#string STR_SMBIOSVIEW_PRINTINFO_EXTENDED_BIOS_SIZE > #language en-US "ExtendedBiosSize: %d %s\r\n" > +#string STR_SMBIOSVIEW_PRINTINFO_BIOS_SIZE #languag= e en- > US "BIOS ROM Size: %d KB\r\n" > +#string STR_SMBIOSVIEW_PRINTINFO_EXTENDED_BIOS_SIZE > #language en-US "Extended BIOS ROM Size: %d %s\r\n" > #string STR_SMBIOSVIEW_QUERYTABLE_NO_INFO #languag= e en- > US "No Info" > #string STR_SMBIOSVIEW_QUERYTABLE_RSVD_BITS_SET #languag= e > en-US "\r\nIt also has reserved bits set 1 --- reserved bits: 0x%x" > #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_WAKEUP_TYPE > #language en-US "System Wakeup Type:" > @@ -419,7 +421,7 @@ > #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_HEIGHT > #language en-US "System Slot Height: " > #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_PHYSICAL_WIDTH > #language en-US "System Slot Physical Width: " > #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_SLOT_PITCH > #language en-US "System Slot Pitch: %d\r\n" > -#string STR_SMBIOSVIEW_QUERYTABLE_ONBOARD_DEVICE_TYPE > #language en-US "Onboard Device Type: " > +#string STR_SMBIOSVIEW_QUERYTABLE_ONBOARD_DEVICE_TYPE > #language en-US "Device Type: " > #string STR_SMBIOSVIEW_QUERYTABLE_SYSTEM_EVENT_LOG_TYPE > #language en-US "System Event Log Type: " > #string STR_SMBIOSVIEW_QUERYTABLE_EVENT_LOG_VAR_DATA_FORMAT > #language en-US "Event Log Variable Data Format Types: " > #string STR_SMBIOSVIEW_QUERYTABLE_POST_RESULTS_BITMAP > #language en-US "POST Results Bitmap - First DWORD:\r\n" > @@ -431,11 +433,11 @@ > #string STR_SMBIOSVIEW_QUERYTABLE_PHYS_MEM_ARRAY_LOCATION > #language en-US "Physical Memory Array Location: " > #string STR_SMBIOSVIEW_QUERYTABLE_PHYS_MEM_ARRAY_USE > #language en-US "Physical Memory Array Use: " > #string STR_SMBIOSVIEW_QUERYTABLE_PHYS_MEM_ARRAY_ERROR > #language en-US "Physical Memory Array Error Correction Types: " > -#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_FORM_FACTOR > #language en-US "Memory Device - Form Factor: " > -#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE > #language en-US "Memory Device - Type: " > -#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE_DETAIL > #language en-US "Memory Device - Type Detail: " > -#string > STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEMORY_TECHNOLOGY > #language en-US "Memory Device - Memory Technology: " > -#string > STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEM_OPER_MODE_CAPA > #language en-US "Memory Device - Memory Operating Mode Capability: " > +#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_FORM_FACTOR > #language en-US "Form Factor: " > +#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE > #language en-US "Memory Type: " > +#string STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_TYPE_DETAIL > #language en-US "Type Detail: " > +#string > STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEMORY_TECHNOLOGY > #language en-US "Memory Technology: " > +#string > STR_SMBIOSVIEW_QUERYTABLE_MEM_DEVICE_MEM_OPER_MODE_CAPA > #language en-US "Memory Operating Mode Capability: " > #string STR_SMBIOSVIEW_QUERYTABLE_MEM_ERROR_INFO > #language en-US "32-bit Memory Error Information - Type: " > #string STR_SMBIOSVIEW_QUERYTABLE_MEM_ERROR_GRANULARITY > #language en-US "Memory Error - Error granularity: " > #string STR_SMBIOSVIEW_QUERYTABLE_MEM_ERROR_OP > #language en-US "Memory Error - Error Operation: " > @@ -454,7 +456,7 @@ > #string STR_SMBIOSVIEW_QUERYTABLE_MEM_CHANNEL_TYPE > #language en-US "Memory Channel Type:" > #string STR_SMBIOSVIEW_QUERYTABLE_BMC_INTERFACE_TYPE > #language en-US "BMC Interface Type:" > #string STR_SMBIOSVIEW_QUERYTABLE_MC_HOST_INTERFACE_TYPE > #language en-US "MC Host Interface Type:" > -#string STR_SMBIOSVIEW_QUERYTABLE_STRUCT_TYPE #languag= e > en-US "Structure Type:" > +#string STR_SMBIOSVIEW_QUERYTABLE_STRUCT_TYPE #languag= e > en-US "Type:" > #string STR_SMBIOSVIEW_QUERYTABLE_PROCESSOR_ARCH_TYPE > #language en-US "Processor Architecture Type:" > #string STR_SMBIOSVIEW_SMBIOSVIEW_ONE_VAR_ARGV > #language en-US "%s " > #string STR_SMBIOSVIEW_SMBIOSVIEW_QUERY_STRUCT_COND > #language en-US "Query Structure, conditions are:\r\n" > -- > 2.39.1.windows.1