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.37780.1681106000320174405 for ; Sun, 09 Apr 2023 22:53:20 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=iEWQ9Xr8; spf=pass (domain: intel.com, ip: 192.55.52.43, 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=1681106000; x=1712642000; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=NPyyW8rjnKVJp9LzIguRoT+wf5Q2BV5IyE/w1qcjwyY=; b=iEWQ9Xr8gQbwYt4nyO3WssIQtt4VIje7cVuSH/ns2mhedZSYTAVbAws5 P0c32JjsTqQQc7IwFVxJH2I2UziIKtlwWYd3ctbRa4yBt003QwzQbxESN G7Zoo3m36byyi3gHa4c3eBPgWCl1flB+0oGoWC90oyMkKOXrEs9PmuL3s MyuJAYqgo8A0oDeXtiSREL1JzQxya7taGb18lLhNWr/LwPZg97F1E3DG1 D1LxCG3ZnLv5f+DotapE8QGCYxFbE3UafdtK5KE3YIA9IvB1nciZ+CBj5 ZXbltPM572v/tYZo84T0+K9/8v1KvfcQcj/PsE3lWALl4iTSE4AepBsRW g==; X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="429579552" X-IronPort-AV: E=Sophos;i="5.98,332,1673942400"; d="scan'208";a="429579552" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Apr 2023 22:53:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10675"; a="718487687" X-IronPort-AV: E=Sophos;i="5.98,332,1673942400"; d="scan'208";a="718487687" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by orsmga008.jf.intel.com with ESMTP; 09 Apr 2023 22:53:19 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) 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.2507.23; Sun, 9 Apr 2023 22:53:18 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Sun, 9 Apr 2023 22:53:18 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) 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.2507.21 via Frontend Transport; Sun, 9 Apr 2023 22:53:18 -0700 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.105) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.21; Sun, 9 Apr 2023 22:53:18 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VOy3Abk6psnOEiLNEVO0nOWh7X/fTCtnXKjMxVsdMLOKMr3zx8AGG4ZtvR12JG2jfa+kudojE4U6uCDBl48HI593DrY2o2rDCTEL1C3IKNrvGYWVLrHLlAPl4eLskWaQYDJUKuxxGygn2Sw6AD+ExzmeSW4lfsU38E4smKzV4SzNQbcscMVtPukJfAR1Y7wyrfn4cbQzF7+MVg28wdjFA8uiuLXZlLsPtPDI/juaGL/6yBVVjzSlCKsQtvCw1rGFXVbLJ+K69cHhkxEr8lAIyK8LP1386qOr2geWENwuilzZhgSEN2x1Im+DgMfsMMSjVXNgnnBkMK3Z0SlgufJQgg== 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=TQvm6Iojqwk1p8EH9Kich4jFfL1PYjMgmpHCZhCvcYQ=; b=a0wpFFvyfSC1MS+mq7+9LXfLHBGJhAkIptRU6Je0fJnciZvSMQ41at5vsyQ5Rlz/ZDSn0/zvzcNUssRFNY989gvsDCbxtNaJwDAcEhcgXvU49stXP+FFuiHvjZ20CQftunt7OpF/0yK1zNrVpA73kxFN4uYPdSuLxi5RXedidmkyvoGyzFFrCli2UQfA4JcdWS0mlAG3vvCKY+JFghjOb9k8qdr17XuJmxUs9XgMnNdx5dmLYlmmzJIRgj8JWmEh3Nk71HE8jmHzsHMOuirF8iBw7CePZWKMP1ZTFRf3YkB1t2s8pVLIQ8EPTil7ORJyEZBJsnSXWItcXdyMslLCug== 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 MW4PR11MB6689.namprd11.prod.outlook.com (2603:10b6:303:1e9::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36; Mon, 10 Apr 2023 05:53:15 +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; Mon, 10 Apr 2023 05:53:15 +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 v3 Thread-Topic: [PATCH] ShellPkg: Update smbiosview type 0/4/17/41 with SMBIOS 3.5 fields v3 Thread-Index: AQHZa15Sprm3EthVxU+6ferTM0QZdK8kCpDA Date: Mon, 10 Apr 2023 05:53:14 +0000 Message-ID: References: <20230410034101.3572-1-millerx.lin@intel.com> In-Reply-To: <20230410034101.3572-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_|MW4PR11MB6689:EE_ x-ms-office365-filtering-correlation-id: 792662a4-0e57-42ba-fea1-08db3987e02a x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: mK94YykL9jVoEGhzxuY7sL1x2CivLnVBsxI2+oZ+RISjDBut2Jq47oWUPgxnfkIaAmZ7q18BjxX3n7Hov84zn/3IGqtnF/R7E7PcleRYliqqAmADk3U6HmsgVxye2yiMLaLJVLVWb/GhIdTzDhfI+jw9EowUM1buyjZam8ysoKEfDRLTYoWdpAOknRhnhfE+FmpVkyV1K+uUcGNE7uvZRX07bj2rFkL5EB7tZ8tes5zLM+Cx20TA6x6si5NSZj0q34A8VaYbJ8A88j9xP8VVhM4ZiOXZg1hQnYzb8s/U/lvpB8+3/Z+FGfvUwEiu9Me0NgGQp475xvSAkuNWAJoRsK4KviEc4yhj7tetfqXKsyUskW1fp8kkCg5GdZvfYdDsc1bWo9lbnFvwlpqsE5iU7MTvhH4TeqsBz99w3oBYX+Ii1pGEzReqBQSf8b+dTAApAhGBAyL77yCU3S/4O7ez5IISseMUe+TRb9O/smpSk5Md2nVFSu0UJBr3QZhsqsTeiYA3+IgGxB4M8jcZ/3rwgTCdrKduVUu/OMPiPCwY6L2SEnLRN0l1VpEzUDYrocRJisFn0T0uqoiHD1LNn9c16iNBXDnh5Lw8eBNQlRPHbq69i8sal4PTf8wltrWwTXl5m/yEHwqNZc42QnN9i+1OZg== 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)(39860400002)(376002)(346002)(396003)(136003)(366004)(451199021)(478600001)(7696005)(71200400001)(19627235002)(316002)(110136005)(9686003)(6506007)(26005)(53546011)(186003)(107886003)(2906002)(30864003)(5660300002)(66476007)(15650500001)(76116006)(66946007)(66556008)(4326008)(41300700001)(8936002)(8676002)(64756008)(52536014)(66446008)(82960400001)(38070700005)(38100700002)(122000001)(55016003)(86362001)(33656002)(83380400001)(579004)(559001)(44824005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?vKcOcd1rx5NFgt7OGSGv76FSDDCSjdGxNiSnkk1T/WqgmhqUkD4tVYSpKEY1?= =?us-ascii?Q?wkupRsIiLu9/5++5IDKsUXN6QViI/7QKK7AM1PJm4qKicZgvHmQO631A6/tX?= =?us-ascii?Q?gNv+jumNtVbK8Ba1dsM0DKoT5QHNrj0T7PnPkXloD7VzaP2JFUBcmfceemiS?= =?us-ascii?Q?KIcmTy+kD/hIIL6tBhDtXt0Ii2NRC51Hzyvl1bsyW+rqYhJpd03p41iB31yl?= =?us-ascii?Q?BQpwIKxI+w1UDJ9YAqdptOHsX983KQB1DphZJiuhZBQ+V04qrdgpfUM/zzt8?= =?us-ascii?Q?RWwqRNlH/FwyRCw5kvQe4TZC9VWDn6lSRp5lFaNOYh7E1EreZqNQSl3JsTSz?= =?us-ascii?Q?FtkRPfYrBryeJgOMKZIohz34wxzcDsk/d6R3hoRdaT4OerXDNTqwwwgYuwQ5?= =?us-ascii?Q?4dSI/excc0NuJF9n1dUCsvBHyIx6JrcPiXt1PLC3qZGK/jsHWWXx+SW2Fa4U?= =?us-ascii?Q?V4nECiZBAWXq3Rk5X3k9o6R1WcsWi8xGdmWpIQ3Xk/B4USpR5dANvBuLrD+n?= =?us-ascii?Q?WZ4Q70yECBTdehGCqQ7D6rQAKaB1hAHxFw1REDkfQwbWO629cLnFF1ObR3rU?= =?us-ascii?Q?sBCAkDzj6FZhj2dkUpLBwMh6dYUJOZ2eu0wtn7mbPa6kc8RQcsue4TH32jq6?= =?us-ascii?Q?9ic2pEh4IpLV3iMBez/hQriWiFfyxM5IkzZrlENQgMThpBkgL19wLjM86JL1?= =?us-ascii?Q?WDq+X0XiLvXvoCtfaROz9YAD1wN2sECjhZYz4xVwa+EBEIcWnp2lEvW1XFqG?= =?us-ascii?Q?9cbCjb6nIfTMQOmA4N4S1e+LtZe1KGDRhTkpHFz9pjuEwG3E0R03i/Y6dGX/?= =?us-ascii?Q?7A8dGoJZ/+j9tv8lU76Wj0OVIGM8DHj3GrxoLiCa5pVSM7J69w8fuOfcQvh6?= =?us-ascii?Q?h9dgoHKXjNFsJkeNbo67s8Pzhxj8bjUF7SZH2UrySw/D3OmQE3Q5Vu2eTZDc?= =?us-ascii?Q?dRyXzkK7E5r2G/0tu8FyWGcGwOE4x7KhLoFlcp04sGoUtG9rxRoVo5AE9IW2?= =?us-ascii?Q?cmeJ39IWe2Ic674ilCytBkPb5m7PE9C9vTqCli6s+5HkqtMBkSFayBiPhGpm?= =?us-ascii?Q?yU8yRD/zWXROz/caPJfDVzWkqHeDBZ3KCD/lUgoRNKGtqE08gSi1FUD++syk?= =?us-ascii?Q?FB6AIY/DV3ggtgxZVzdedR6kbFsME7YnuzuKwXxTlCBydF9/KlHweTMetTP0?= =?us-ascii?Q?7kVdu5trxfqK+1tTjRDa2sn423cne0KCiMIEu6rXsUMf1x/rsFOgYERM4T1B?= =?us-ascii?Q?GwsIyeuCK+QdATPnwN6tbrbKZ2deW9rbp7jaG9oa/lv+a/yuVazUj7MYDTWs?= =?us-ascii?Q?ZAP1FflV7paeFSyoXuf3wGdQniK/lSoq7ZYRmZUWE3lX+RlRbuQ7hY1F2TXb?= =?us-ascii?Q?HG6vs7jbq5eu5ezleHgegRN2yLWC1purnsh7h8T4cV9FuZVvMrvhrMMsLR2W?= =?us-ascii?Q?GGMh/mEThnS+2tpHwKoguNyDYzUi5UH2Ri/TU+Mjoos8+8Oq3ytUQ/rWA7mf?= =?us-ascii?Q?+qWEEMsTRPEaSiEoE5M+m/UELGewMxcaCJFeeGiw6GGpRjQf7wDn+hfkYzh1?= =?us-ascii?Q?BErcHgwXabv7w6XaHgl9xi8Xxhsv6xS2bjHQ1ygu?= 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: 792662a4-0e57-42ba-fea1-08db3987e02a X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Apr 2023 05:53:14.6803 (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: ULwvRkyyCyrQUaPqKurg4z820l0hAG2BSK0VXI9jJooNfESM5ad4kadYHV2rnucbL/vi4xAoQjfRBrG5re32bg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB6689 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 Reviewed-by: Zhichao Gao Thanks, Zhichao > -----Original Message----- > From: Lin, MillerX > Sent: Monday, April 10, 2023 11:41 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 v3 >=20 > Cc: Signed-off-by: MillerX Lin > Cc: Ray Ni > Cc: Zhichao Gao > --- > .../SmbiosView/PrintInfo.c | 152 +++++++++--------- > .../SmbiosView/SmbiosViewStrings.uni | 28 ++-- > 2 files changed, 89 insertions(+), 91 deletions(-) >=20 > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > index 2611601230..380e4d98c7 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,49 @@ 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)) = { > + ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY2), > gShellDebug1HiiHandle); > + if (Struct->Type4->ProcessorFamily2 >=3D 0x100) { > + DisplayProcessorFamily2 (Struct->Type4->ProcessorFamily2, Opti= on); > + } else { > + DisplayProcessorFamily ((UINT8) Struct->Type4->ProcessorFamily= 2, > 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 +830,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 +1259,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 +1607,6 @@ DisplayProcessorFamily ( > UINT8 Option > ) > { > - // > - // Print prompt message > - // > - ShellPrintHiiEx (-1, -1, NULL, STRING_TOKEN > (STR_SMBIOSVIEW_PRINTINFO_PROCESSOR_FAMILY), > gShellDebug1HiiHandle); > // > // Print option > // > @@ -2411,6 +2408,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 +2433,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