From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7F6FD81ECC for ; Sun, 22 Jan 2017 01:24:58 -0800 (PST) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP; 22 Jan 2017 01:24:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,268,1477983600"; d="scan'208";a="55855006" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga005.jf.intel.com with ESMTP; 22 Jan 2017 01:24:57 -0800 Received: from FMSMSX110.amr.corp.intel.com (10.18.116.10) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sun, 22 Jan 2017 01:24:57 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx110.amr.corp.intel.com (10.18.116.10) with Microsoft SMTP Server (TLS) id 14.3.248.2; Sun, 22 Jan 2017 01:24:57 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.88]) by SHSMSX103.ccr.corp.intel.com ([10.239.4.69]) with mapi id 14.03.0248.002; Sun, 22 Jan 2017 17:24:54 +0800 From: "Zeng, Star" To: "Ni, Ruiyu" , "edk2-devel@lists.01.org" CC: "Carsey, Jaben" , "Zeng, Star" Thread-Topic: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1 Thread-Index: AQHSdIgPgwjz8oS+3Equ+RuAiomDVKFDq5yAgACKfNA= Date: Sun, 22 Jan 2017 09:24:54 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103B818FBB@shsmsx102.ccr.corp.intel.com> References: <1485073063-211620-1-git-send-email-star.zeng@intel.com> <1485073063-211620-4-git-send-email-star.zeng@intel.com> <734D49CCEBEEF84792F5B80ED585239D5B886249@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <734D49CCEBEEF84792F5B80ED585239D5B886249@SHSMSX104.ccr.corp.intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2017 09:24:58 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Ray & Jaben, I am not so sure about the rule. The mixed using of strings in c code and strings in uni file has been there= since it was created. Thanks, Star -----Original Message----- From: Ni, Ruiyu=20 Sent: Sunday, January 22, 2017 4:56 PM To: Zeng, Star ; edk2-devel@lists.01.org Cc: Carsey, Jaben Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3= .1.1 Star, Why some strings are hardcoded in C file while some are defined in UNI file= ? What's the rule? Thanks/Ray > -----Original Message----- > From: Zeng, Star > Sent: Sunday, January 22, 2017 4:18 PM > To: edk2-devel@lists.01.org > Cc: Zeng, Star ; Ni, Ruiyu ;=20 > Carsey, Jaben > Subject: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec > 3.1.1 >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D349 >=20 > Cc: Ruiyu Ni > Cc: Jaben Carsey > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Star Zeng > --- > .../SmbiosView/PrintInfo.c | 6 +++- > .../SmbiosView/QueryTable.c | 37 ++++++++++++++++= ++++++ > .../SmbiosView/QueryTable.h | 14 +++++++- > .../SmbiosView/SmbiosViewStrings.uni | 3 +- > 4 files changed, 57 insertions(+), 3 deletions(-) >=20 > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > index ecb8e2492453..1d6002b92593 100644 > --- > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > +++ > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/PrintInfo.c > @@ -1106,7 +1106,7 @@ SmbiosPrintStructure ( > // Management Controller Host Interface (Type 42) > // > case 42: > - PRINT_STRUCT_VALUE_H (Struct, Type42, InterfaceType); > + DisplayMCHostInterfaceType (Struct->Type42->InterfaceType,=20 > + Option); > break; >=20 > // > @@ -1818,6 +1818,10 @@ DisplayProcessorFamily ( > Print (L"AMD Opteron(TM) X3000 Series APU\n"); > break; >=20 > + case 0x6B: > + Print (L"AMD Zen Processor Family\n"); > + break; > + > case 0x70: > ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN > (STR_SMBIOSVIEW_PRINTINFO_HOBBIT_FAMILY), gShellDebug1HiiHandle); > break; > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable. > c > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable. > c > index 4a06c12e3b2b..282ba584c8c9 100644 > --- > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable. > c > +++ > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable. > +++ c > @@ -575,6 +575,10 @@ TABLE_ITEM ProcessorUpgradeTable[] =3D { > { > 0x37, > L"Socket SP3" > + }, > + { > + 0x38, > + L"Socket SP3r2" > } > }; >=20 > @@ -3156,6 +3160,22 @@ TABLE_ITEM IPMIDIBMCInterfaceTypeTable[] =3D { > }, > }; >=20 > +TABLE_ITEM MCHostInterfaceTypeTable[] =3D { > + { > + 0x3F00, > + L" MCTP Host Interface " > + }, > + { > + 0x40, > + L" Network Host Interface " > + }, > + { > + 0xF0, > + L" OEM defined " > + }, > +}; > + > + > TABLE_ITEM StructureTypeInfoTable[] =3D { > { > 0, > @@ -4525,6 +4545,23 @@ DisplayIPMIDIBMCInterfaceType ( } >=20 > /** > + Display Management Controller Host Interface (Type 42) information. > + > + @param[in] Key The key of the structure. > + @param[in] Option The optional information. > +**/ > +VOID > +DisplayMCHostInterfaceType ( > + IN UINT8 Key, > + IN UINT8 Option > + ) > +{ > + ShellPrintHiiEx(-1,-1,NULL,STRING_TOKEN > +(STR_SMBIOSVIEW_QUERYTABLE_MC_HOST_INTERFACE_TYPE), > +gShellDebug1HiiHandle); > + PRINT_INFO_OPTION (Key, Option); > + PRINT_TABLE_ITEM (MCHostInterfaceTypeTable, Key); } > + > +/** > Display the structure type information. >=20 > @param[in] Key The key of the structure. > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable. > h > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable. > h > index 9cae7094fb19..bd9e6898d40a 100644 > --- > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable. > h > +++ > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/QueryTable. > +++ h > @@ -2,7 +2,7 @@ > Build a table, each item is (key, info) pair. > and give a interface of query a string out of a table. >=20 > - Copyright (c) 2005 - 2012, Intel Corporation. All rights=20 > reserved.
> + Copyright (c) 2005 - 2017, Intel Corporation. All rights=20 > + reserved.
> This program and the accompanying materials > are licensed and made available under the terms and conditions of=20 > the BSD License > which accompanies this distribution. The full text of the license=20 > may be found at @@ -779,4 +779,16 @@ DisplayIPMIDIBMCInterfaceType ( > IN UINT8 Option > ); >=20 > +/** > + Display Management Controller Host Interface (Type 42) information. > + > + @param[in] Key The key of the structure. > + @param[in] Option The optional information. > +**/ > +VOID > +DisplayMCHostInterfaceType ( > + IN UINT8 Key, > + IN UINT8 Option > + ); > + > #endif > diff --git > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView > Strings.uni > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView > Strings.uni > index b9032df076d2..7d694536dbcd 100644 > --- > a/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView > Strings.uni > +++ > b/ShellPkg/Library/UefiShellDebug1CommandsLib/SmbiosView/SmbiosView > S > +++ trings.uni > @@ -1,6 +1,6 @@ > // /** > // > -// Copyright (c) 2005 - 2015, Intel Corporation. All rights=20 > reserved.
> +// Copyright (c) 2005 - 2017, Intel Corporation. All rights=20 > +reserved.
> // (C) Copyright 2014-2015 Hewlett-Packard Development Company,=20 > L.P.
// (C) Copyright 2015-2017 Hewlett Packard Enterprise=20 > Development LP
// This program and the accompanying materials @@=20 > -444,6 +444,7 @@ #string=20 > STR_SMBIOSVIEW_QUERYTABLE_MANAGEMENT_DEV_ADDR_TYPE > #language en-US "Management Device - Address Type:" > #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_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.7.0.windows.1