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 AC2FD21A16EC4 for ; Mon, 5 Jun 2017 00:37:39 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Jun 2017 00:38:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,300,1493708400"; d="scan'208";a="1178346111" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga002.fm.intel.com with ESMTP; 05 Jun 2017 00:38:44 -0700 Received: from fmsmsx123.amr.corp.intel.com (10.18.125.38) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 5 Jun 2017 00:38:44 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx123.amr.corp.intel.com (10.18.125.38) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 5 Jun 2017 00:38:44 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.116]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.56]) with mapi id 14.03.0319.002; Mon, 5 Jun 2017 15:38:41 +0800 From: "Ye, Ting" To: "Wu, Jiaxin" , "edk2-devel@lists.01.org" CC: "Fu, Siyuan" Thread-Topic: [Patch 2/2] MdeModulePkg/UefiPxeBcDxe: Refine the PXE boot displayed information Thread-Index: AQHS0s4pD8mKburwDU2biPnxUzAMH6IV987Q Date: Mon, 5 Jun 2017 07:38:40 +0000 Message-ID: References: <1495438575-9900-1-git-send-email-jiaxin.wu@intel.com> <1495438575-9900-3-git-send-email-jiaxin.wu@intel.com> In-Reply-To: <1495438575-9900-3-git-send-email-jiaxin.wu@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch 2/2] MdeModulePkg/UefiPxeBcDxe: Refine the PXE boot displayed information 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: , X-List-Received-Date: Mon, 05 Jun 2017 07:37:39 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ye Ting =20 -----Original Message----- From: Wu, Jiaxin=20 Sent: Monday, May 22, 2017 3:36 PM To: edk2-devel@lists.01.org Cc: Ye, Ting ; Fu, Siyuan ; Wu, Jia= xin Subject: [Patch 2/2] MdeModulePkg/UefiPxeBcDxe: Refine the PXE boot display= ed information This path is to refine the PXE boot displayed information so as to in line = with NetworkPkg/UefiPxeBcDxe driver. Cc: Ye Ting Cc: Fu Siyuan Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Wu Jiaxin --- .../Universal/Network/UefiPxeBcDxe/PxeBcImpl.c | 18 ++++++++++++++++++ .../Universal/Network/UefiPxeBcDxe/PxeBcSupport.c | 22 ++++++++++++++++++= +++- .../Universal/Network/UefiPxeBcDxe/PxeBcSupport.h | 16 +++++++++++++= ++- 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/MdeM= odulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c index 259568e..6d4f33f 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c @@ -336,10 +336,12 @@ EfiPxeBcStart ( // IPv6 is not supported now. // return EFI_UNSUPPORTED; } =20 + AsciiPrint ("\n>>Start PXE over IPv4"); + // // Configure the udp4 instance to let it receive data // Status =3D Private->Udp4Read->Configure ( Private->Udp4Read, @@ -665,10 +667,15 @@ Ef= iPxeBcDhcp ( // Check the selected offer to see whether BINL is required, if no or BI= NL is // finished, set the various Mode members. // Status =3D PxeBcCheckSelectedOffer (Private); =20 + AsciiPrint ("\n Station IP address is "); + + PxeBcShowIp4Addr (&Private->StationIp.v4); AsciiPrint ("\n"); + ON_EXIT: if (EFI_ERROR (Status)) { Dhcp4->Stop (Dhcp4); Dhcp4->Configure (Dhcp4, NULL); } else { @@ -2738,10 +2745,18 @@ DiscoverBootFile ( ); } =20 Private->FileSize =3D (UINTN) *BufferSize; =20 + // + // Display all the information: boot server address, boot file name and = boot file size. + // + AsciiPrint ("\n Server IP address is "); PxeBcShowIp4Addr=20 + (&Private->ServerIp.v4); AsciiPrint ("\n NBP filename is %a",=20 + Private->BootFileName); AsciiPrint ("\n NBP filesize is %d Bytes",=20 + Private->FileSize); + return Status; } =20 /** Causes the driver to load a specified file. @@ -2853,10 +2868,11 @@ EfiPxeLoadFile ( Status =3D DiscoverBootFile (Private, &TmpBufSize, Buffer); =20 if (sizeof (UINTN) < sizeof (UINT64) && (TmpBufSize > 0xFFFFFFFF)) { Status =3D EFI_DEVICE_ERROR; } else if (TmpBufSize > 0 && *BufferSize >=3D (UINTN) TmpBufSize && Bu= ffer !=3D NULL) { + AsciiPrint ("\n Downloading NBP file...\n"); *BufferSize =3D (UINTN) TmpBufSize; Status =3D PxeBc->Mtftp ( PxeBc, EFI_PXE_BASE_CODE_TFTP_READ_FILE, Buffer, @@ -2877,10 +2893,11 @@ EfiPxeLoadFile ( Status =3D EFI_BUFFER_TOO_SMALL; } else { // // Download the file. // + AsciiPrint ("\n Downloading NBP file...\n"); TmpBufSize =3D (UINT64) (*BufferSize); Status =3D PxeBc->Mtftp ( PxeBc, EFI_PXE_BASE_CODE_TFTP_READ_FILE, Buffer, @@ -2911,10 +2928,11 @@ EfiPxeLoadFile ( =20 // // Check download status // if (Status =3D=3D EFI_SUCCESS) { + AsciiPrint ("\n NBP file downloaded successfully.\n"); // // The DHCP4 can have only one configured child instance so we need to= stop // reset the DHCP4 child before we return. Otherwise the other program= s which=20 // also need to use DHCP4 will be impacted. // The functionality of PXE Base Code protocol will not be stopped, di= ff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c b/Mde= ModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c index 0779056..c1cabca 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c @@ -1,9 +1,9 @@ /** @file Support routines for PxeBc. =20 -Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made availab= le under the terms and conditions of the BSD License which accompanies thi= s distribution. The full text of the license may be found at http://opens= ource.org/licenses/bsd-license.php =20 @@ -112,10 +112,30 @@ PxeBcConfigureUdpWriteInstance ( } =20 return Status; } =20 +/** + This function is to display the IPv4 address. + + @param[in] Ip The pointer to the IPv4 address. + +**/ +VOID +PxeBcShowIp4Addr ( + IN EFI_IPv4_ADDRESS *Ip + ) +{ + UINTN Index; + + for (Index =3D 0; Index < 4; Index++) { + AsciiPrint ("%d", Ip->Addr[Index]); + if (Index < 3) { + AsciiPrint ("."); + } + } +} =20 /** Convert number to ASCII value. =20 @param Number Numeric value to convert to decimal ASCII va= lue. diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h b/M= deModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h index 16ac05e..59e9b32 100644 --- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h +++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h @@ -1,8 +1,8 @@ /** @file Support routines for PxeBc. -Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made availab= le under the terms and conditions of the BSD License which accompanies thi= s distribution. The full text of the license may be found at http://opens= ource.org/licenses/bsd-license.php =20 @@ -65,10 +65,24 @@ PxeBcConfigureUdpWriteInstance ( IN EFI_IPv4_ADDRESS *Gateway, IN OUT UINT16 *SrcPort, IN UINT8 Ttl, IN UINT8 ToS ); + + +/** + This function is to display the IPv4 address. + + @param[in] Ip The pointer to the IPv4 address. + +**/ +VOID +PxeBcShowIp4Addr ( + IN EFI_IPv4_ADDRESS *Ip + ); + =20 + /** Convert number to ASCII value. =20 @param Number Numeric value to convert to decimal ASCII va= lue. @param Buffer Buffer to place ASCII version of the Number. -- 1.9.5.msysgit.1