From nobody Thu Dec 26 12:52:37 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1506059456395882.6105439960807; Thu, 21 Sep 2017 22:50:56 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6C2222095E50A; Thu, 21 Sep 2017 22:47:24 -0700 (PDT) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 A339F2095E4E2 for ; Thu, 21 Sep 2017 22:47:22 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga104.jf.intel.com with ESMTP; 21 Sep 2017 22:50:30 -0700 Received: from ray-dev.ccr.corp.intel.com ([10.239.9.7]) by fmsmga006.fm.intel.com with ESMTP; 21 Sep 2017 22:50:29 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,427,1500966000"; d="scan'208";a="154738641" From: Ruiyu Ni To: edk2-devel@lists.01.org Date: Fri, 22 Sep 2017 13:50:14 +0800 Message-Id: <20170922055014.27288-15-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.12.2.windows.2 In-Reply-To: <20170922055014.27288-1-ruiyu.ni@intel.com> References: <20170922055014.27288-1-ruiyu.ni@intel.com> Subject: [edk2] [PATCH 14/14] ShellPkg/dh: Refine the dump output X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jaben Carsey MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The patch doesn't change any real functionality. Only the indent width and EOL are changed. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni Cc: Jaben Carsey --- .../UefiHandleParsingLib/UefiHandleParsingLib.c | 8 +- .../UefiHandleParsingLib/UefiHandleParsingLib.uni | 129 +++++++++++------= ---- 2 files changed, 69 insertions(+), 68 deletions(-) diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c b= /ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c index 164caa9b91..d12466c7b0 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.c @@ -497,7 +497,7 @@ EdidDiscoveredProtocolDumpInformation ( SHELL_FREE_NON_NULL (RetVal); RetVal =3D TempRetVal; =20 - TempRetVal =3D CatSDumpHex (RetVal, 7, 0, EdidDiscovered->SizeOfEdid, = EdidDiscovered->Edid); + TempRetVal =3D CatSDumpHex (RetVal, 4, 0, EdidDiscovered->SizeOfEdid, = EdidDiscovered->Edid); RetVal =3D TempRetVal; } return RetVal; @@ -561,7 +561,7 @@ EdidActiveProtocolDumpInformation ( SHELL_FREE_NON_NULL (RetVal); RetVal =3D TempRetVal; =20 - TempRetVal =3D CatSDumpHex (RetVal, 7, 0, EdidActive->SizeOfEdid, Edid= Active->Edid); + TempRetVal =3D CatSDumpHex (RetVal, 4, 0, EdidActive->SizeOfEdid, Edid= Active->Edid); RetVal =3D TempRetVal; } return RetVal; @@ -614,7 +614,7 @@ PciRootBridgeIoDumpInformation( if (Temp =3D=3D NULL) { return NULL; } - Temp2 =3D CatSPrint(L"\r\n", Temp, PciRootBridgeIo->ParentHandle); + Temp2 =3D CatSPrint(NULL, Temp, PciRootBridgeIo->ParentHandle); FreePool(Temp); RetVal =3D Temp2; Temp2 =3D NULL; @@ -692,7 +692,7 @@ PciRootBridgeIoDumpInformation( } =20 Temp2 =3D CatSPrint(RetVal, - L"%H%02x %016lx %016lx %02x%N\r\n", + L"\r\n%%H%02x %016lx %016lx %02x%%N", Configuration->SpecificFlag, Configuration->AddrRangeMin, Configuration->AddrRangeMax, diff --git a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni= b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni index 5d8a0d1bb9..f49ca94623 100644 --- a/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni +++ b/ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsingLib.uni @@ -339,71 +339,72 @@ #string STR_DEBUGSUPPORT_INFO #language en-US " Isa =3D %s" #string STR_DEBUGSUPPORT_UNKNOWN #language en-US " Unknown (%%H%s%%N)" =20 -#string STR_PCIRB_DUMP_PH #language en-US " ParentHandle..: %H= %x%N\r\n" -#string STR_PCIRB_DUMP_SEG #language en-US " Segment #.....: %H= %x%N\r\n" -#string STR_PCIRB_DUMP_ATT #language en-US " Attributes....: %H= %x%N\r\n" -#string STR_PCIRB_DUMP_SUPPORTS #language en-US " Supports......: %H= %x%N\r\n" -#string STR_PCIRB_DUMP_BUS #language en-US " BUS : " -#string STR_PCIRB_DUMP_MEM #language en-US " MEM : " -#string STR_PCIRB_DUMP_IO #language en-US " IO : " -#string STR_PCIRB_DUMP_TITLE #language en-US " Type Flag Base = Limit Gran\r\n" - " =3D=3D=3D=3D =3D= =3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D\r\n" -#string STR_PCIIO_DUMP_MAIN #language en-US " Segment #.....: %0= 2x\r\n" - " Bus #.........: %0= 2x\r\n" - " Device #......: %0= 2x\r\n" - " Function #....: %0= 2x\r\n" - " ROM Size......: %l= x\r\n" - " ROM Location..: %0= 8x\r\n" - " Vendor ID.....: %0= 4x\r\n" - " Device ID.....: %0= 4x\r\n" - " Class Code....: %0= 2x %02x %02x\r\n" - " Configuration Head= er :" -#string STR_USBIO_DUMP_MAIN #language en-US " Interface Number #= .....: %02x\r\n" - " Interface Class #.= .....: %02x\r\n" - " Interface Subclass= #...: %02x\r\n" - " Interface Protocol= #...: %02x" - -#string STR_LI_DUMP_NAME #language en-US " Name..........: %%= H%s%%N\r\n" - -#string STR_LI_DUMP_MAIN #language en-US " Revision......: %%= H0x%08x%%N\r\n" - " ParentHandle..: %%= H%x%%N\r\n" - " SystemTable...: %%= H%x%%N\r\n" - " DeviceHandle..: %%= H%x%%N\r\n" - " FilePath......: %%= H%s%%N\r\n" - " PdbFileName...: %%= H%a%%N\r\n" - " OptionsSize...: %%= H%x%%N\r\n" - " LoadOptions...: %%= H%x%%N\r\n" - " ImageBase.....: %%= H%x%%N\r\n" - " ImageSize.....: %%= H%Lx%%N\r\n" - " CodeType......: %%= H%s%%N\r\n" - " DataType......: %%= H%s%%N\r\n" - " Unload........: %%= H%x%%N" - -#string STR_GOP_DUMP_MAIN #language en-US " Max Mode..........= ....: %%H0x%08x%%N\r\n" - " Current Mode......= ....: %%H0x%08x%%N\r\n" - " Frame Buffer Base.= ....: %%H0x%L016x%%N\r\n" - " Frame Buffer Size.= ....: %%H0x%L016x%%N\r\n" - " Mode Info Size....= ....: %%H0x%L016x%%N\r\n" - " Information\r\n" - " Version.........= ....: %%H0x%08x%%N\r\n" - " HorizontalResolu= tion: %%H%d%%N\r\n" - " VerticalResoluti= on..: %%H%d%%N\r\n" - " Pixel Format....= ....: %%H%s%%N\r\n" - " Pixels / Scan Li= ne..: %%H%d%%N\r\n" - " Pixel Info\r\n" - " RedMask.......= ....: %%H0x%08x%%N\r\n" - " GreenMask.....= ....: %%H0x%08x%%N\r\n" - " BlueMask......= ....: %%H0x%08x%%N\r\n" - -#string STR_GOP_RES_LIST_MAIN #language en-US " Supported Resoluti= on List" -#string STR_GOP_RES_LIST_ENTRY #language en-US "\r\n Resolution[%= %H%d%%N]:\r\n" - " Horizontal....= ....: %%H%d%%N\r\n" - " Vertical......= ....: %%H%d%%N" +#string STR_PCIRB_DUMP_PH #language en-US " ParentHandle..: %%H%x= %%N\r\n" +#string STR_PCIRB_DUMP_SEG #language en-US " Segment #.....: %%H%x= %%N\r\n" +#string STR_PCIRB_DUMP_ATT #language en-US " Attributes....: %%H%x= %%N\r\n" +#string STR_PCIRB_DUMP_SUPPORTS #language en-US " Supports......: %%H%x= %%N\r\n" +#string STR_PCIRB_DUMP_BUS #language en-US " BUS : " +#string STR_PCIRB_DUMP_MEM #language en-US " MEM : " +#string STR_PCIRB_DUMP_IO #language en-US " IO : " +#string STR_PCIRB_DUMP_TITLE #language en-US " Type Flag Base = Limit Gran\r\n" + " =3D=3D=3D=3D =3D=3D= =3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D" +#string STR_PCIIO_DUMP_MAIN #language en-US " Segment #.....: %02x\= r\n" + " Bus #.........: %02x\= r\n" + " Device #......: %02x\= r\n" + " Function #....: %02x\= r\n" + " ROM Size......: %lx\r= \n" + " ROM Location..: %08x\= r\n" + " Vendor ID.....: %04x\= r\n" + " Device ID.....: %04x\= r\n" + " Class Code....: %02x = %02x %02x\r\n" + " Configuration Header = :" +#string STR_USBIO_DUMP_MAIN #language en-US " Interface Number #...= ..: %02x\r\n" + " Interface Class #....= ..: %02x\r\n" + " Interface Subclass #.= ..: %02x\r\n" + " Interface Protocol #.= ..: %02x" + +#string STR_LI_DUMP_NAME #language en-US " Name..........: %%H%s= %%N\r\n" + +#string STR_LI_DUMP_MAIN #language en-US " Revision......: %%H0x= %08x%%N\r\n" + " ParentHandle..: %%H%x= %%N\r\n" + " SystemTable...: %%H%x= %%N\r\n" + " DeviceHandle..: %%H%x= %%N\r\n" + " FilePath......: %%H%s= %%N\r\n" + " PdbFileName...: %%H%a= %%N\r\n" + " OptionsSize...: %%H%x= %%N\r\n" + " LoadOptions...: %%H%x= %%N\r\n" + " ImageBase.....: %%H%x= %%N\r\n" + " ImageSize.....: %%H%L= x%%N\r\n" + " CodeType......: %%H%s= %%N\r\n" + " DataType......: %%H%s= %%N\r\n" + " Unload........: %%H%x= %%N" + +#string STR_GOP_DUMP_MAIN #language en-US " Max Mode.............= .: %%H0x%08x%%N\r\n" + " Current Mode.........= .: %%H0x%08x%%N\r\n" + " Frame Buffer Base....= .: %%H0x%L016x%%N\r\n" + " Frame Buffer Size....= .: %%H0x%L016x%%N\r\n" + " Mode Info Size.......= .: %%H0x%L016x%%N\r\n" + " Information\r\n" + " Version............= .: %%H0x%08x%%N\r\n" + " HorizontalResolutio= n: %%H%d%%N\r\n" + " VerticalResolution.= .: %%H%d%%N\r\n" + " Pixel Format.......= .: %%H%s%%N\r\n" + " Pixels / Scan Line.= .: %%H%d%%N\r\n" + " Pixel Info\r\n" + " RedMask..........= .: %%H0x%08x%%N\r\n" + " GreenMask........= .: %%H0x%08x%%N\r\n" + " BlueMask.........= .: %%H0x%08x%%N\r\n" + +#string STR_GOP_RES_LIST_MAIN #language en-US " Supported Resolution = List" +#string STR_GOP_RES_LIST_ENTRY #language en-US "\r\n" + " Resolution[%%H%d%%N= ]:\r\n" + " Horizontal.......= .: %%H%d%%N\r\n" + " Vertical.........= .: %%H%d%%N" #string STR_BSDO_DUMP_MAIN #language en-US " Drv[%02x] File:%%H= %s%%N" -#string STR_EDID_DISCOVERED_MAIN #language en-US " EDID Discovered Si= ze : %%H0x%08x%%N\r\n" -#string STR_EDID_DISCOVERED_DATA #language en-US " EDID Discovered Da= ta :\r\n" -#string STR_EDID_ACTIVE_MAIN #language en-US " EDID Active Size := %%H0x%08x%%N\r\n" -#string STR_EDID_ACTIVE_DATA #language en-US " EDID Active Data := \r\n" +#string STR_EDID_DISCOVERED_MAIN #language en-US " EDID Discovered Size = : %%H0x%08x%%N\r\n" +#string STR_EDID_DISCOVERED_DATA #language en-US " EDID Discovered Data = :\r\n" +#string STR_EDID_ACTIVE_MAIN #language en-US " EDID Active Size : %%= H0x%08x%%N\r\n" +#string STR_EDID_ACTIVE_DATA #language en-US " EDID Active Data :\r\= n" =20 #string STR_GET_SUPP_TYPES_FAILED #language en-US "Unable to get s= upported types - %%H%r%%N\r\n" #string STR_SUPP_TYPE_HEADER #language en-US " Supported Inf= ormation Types: \r\n" --=20 2.12.2.windows.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel