From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 058BA81EDE for ; Mon, 23 Jan 2017 09:41:20 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP; 23 Jan 2017 09:41:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,274,1477983600"; d="scan'208";a="925725749" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga003.jf.intel.com with ESMTP; 23 Jan 2017 09:41:18 -0800 Received: from fmsmsx157.amr.corp.intel.com (10.18.116.73) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 23 Jan 2017 09:40:54 -0800 Received: from fmsmsx103.amr.corp.intel.com ([169.254.2.47]) by FMSMSX157.amr.corp.intel.com ([169.254.14.122]) with mapi id 14.03.0248.002; Mon, 23 Jan 2017 09:40:53 -0800 From: "Carsey, Jaben" To: "Ni, Ruiyu" , "Zeng, Star" , "edk2-devel@lists.01.org" CC: "Carsey, Jaben" Thread-Topic: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS spec 3.1.1 Thread-Index: AQHSdIgOGP8n/dsPIU+XPGhMo6ezdaFEt9SAgAAH/wCAAAbNAIABj91Q Date: Mon, 23 Jan 2017 17:40:52 +0000 Message-ID: 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> <0C09AFA07DD0434D9E2A0C6AEB0483103B818FBB@shsmsx102.ccr.corp.intel.com> <734D49CCEBEEF84792F5B80ED585239D5B8862A7@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <734D49CCEBEEF84792F5B80ED585239D5B8862A7@SHSMSX104.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNjI0ODliZDMtODFhMS00NzAyLTkwMzQtNjc3NDYxYmIxOWY2IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6InpSQk5Vb2NYbURzY0pjY1BVQ0xIVXJrVGRXTXFZVkk4ZXVCelwveFF6RHR3PSJ9 x-ctpclassification: CTP_IC x-originating-ip: [10.1.200.107] 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: Mon, 23 Jan 2017 17:41:21 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jaben Carsey I think that string mixed use existed in the EDK version of the command and= was just never removed. -Jaben > -----Original Message----- > From: Ni, Ruiyu > Sent: Sunday, January 22, 2017 1:49 AM > 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 > Importance: High >=20 > Reviewed-by: Ruiyu Ni >=20 > Thanks/Ray >=20 > > -----Original Message----- > > From: Zeng, Star > > Sent: Sunday, January 22, 2017 5:25 PM > > To: Ni, Ruiyu ; edk2-devel@lists.01.org > > Cc: Carsey, Jaben ; Zeng, Star > > > > Subject: RE: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS > > spec 3.1.1 > > > > 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 t= here > > since it was created. > > > > > > Thanks, > > Star > > -----Original Message----- > > From: Ni, Ruiyu > > 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 ; > > > Carsey, Jaben > > > Subject: [PATCH 3/3] ShellPkg SmbiosView: Add decoding of SMBIOS > spec > > > 3.1.1 > > > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D349 > > > > > > 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(-) > > > > > > 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, > > > + Option); > > > break; > > > > > > // > > > @@ -1818,6 +1818,10 @@ DisplayProcessorFamily ( > > > Print (L"AMD Opteron(TM) X3000 Series APU\n"); > > > break; > > > > > > + 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" > > > } > > > }; > > > > > > @@ -3156,6 +3160,22 @@ TABLE_ITEM IPMIDIBMCInterfaceTypeTable[] > =3D > > { > > > }, > > > }; > > > > > > +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 ( } > > > > > > /** > > > + 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. > > > > > > @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. > > > > > > - Copyright (c) 2005 - 2012, Intel Corporation. All rights > > > reserved.
> > > + Copyright (c) 2005 - 2017, Intel Corporation. All rights > > > + reserved.
> > > This program and the accompanying materials > > > are licensed and made available under the terms and conditions of > > > the BSD License > > > which accompanies this distribution. The full text of the license > > > may be found at @@ -779,4 +779,16 @@ > DisplayIPMIDIBMCInterfaceType ( > > > IN UINT8 Option > > > ); > > > > > > +/** > > > + 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 > > > reserved.
> > > +// Copyright (c) 2005 - 2017, Intel Corporation. All rights > > > +reserved.
> > > // (C) Copyright 2014-2015 Hewlett-Packard Development Company, > > > L.P.
// (C) Copyright 2015-2017 Hewlett Packard Enterprise > > > Development LP
// This program and the accompanying materials > @@ > > > -444,6 +444,7 @@ #string > > > 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 > #language > > > 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