Reviewed-by: Ye Ting <ting...@intel.com>
-----Original Message-----
From: Wu, Jiaxin
Sent: Monday, May 22, 2017 3:36 PM
To: edk2-devel@lists.01.org
Cc: Ye, Ting <ting...@intel.com>; Fu, Siyuan <siyuan...@intel.com>; Wu, Jiaxin
<jiaxin...@intel.com>
Subject: [Patch 2/2] MdeModulePkg/UefiPxeBcDxe: Refine the PXE boot displayed
information
This path is to refine the PXE boot displayed information so as to in line with
NetworkPkg/UefiPxeBcDxe driver.
Cc: Ye Ting <ting...@intel.com>
Cc: Fu Siyuan <siyuan...@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Wu Jiaxin <jiaxin...@intel.com>
---
.../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/MdeModulePkg/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;
}
+ AsciiPrint ("\n>>Start PXE over IPv4");
+
//
// Configure the udp4 instance to let it receive data
//
Status = Private->Udp4Read->Configure (
Private->Udp4Read, @@ -665,10 +667,15 @@
EfiPxeBcDhcp (
// Check the selected offer to see whether BINL is required, if no or BINL is
// finished, set the various Mode members.
//
Status = PxeBcCheckSelectedOffer (Private);
+ 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 (
);
}
Private->FileSize = (UINTN) *BufferSize;
+ //
+ // Display all the information: boot server address, boot file name and boot
file size.
+ //
+ AsciiPrint ("\n Server IP address is "); PxeBcShowIp4Addr
+ (&Private->ServerIp.v4); AsciiPrint ("\n NBP filename is %a",
+ Private->BootFileName); AsciiPrint ("\n NBP filesize is %d Bytes",
+ Private->FileSize);
+
return Status;
}
/**
Causes the driver to load a specified file.
@@ -2853,10 +2868,11 @@ EfiPxeLoadFile (
Status = DiscoverBootFile (Private, &TmpBufSize, Buffer);
if (sizeof (UINTN) < sizeof (UINT64) && (TmpBufSize > 0xFFFFFFFF)) {
Status = EFI_DEVICE_ERROR;
} else if (TmpBufSize > 0 && *BufferSize >= (UINTN) TmpBufSize && Buffer
!= NULL) {
+ AsciiPrint ("\n Downloading NBP file...\n");
*BufferSize = (UINTN) TmpBufSize;
Status = PxeBc->Mtftp (
PxeBc,
EFI_PXE_BASE_CODE_TFTP_READ_FILE,
Buffer,
@@ -2877,10 +2893,11 @@ EfiPxeLoadFile (
Status = EFI_BUFFER_TOO_SMALL;
} else {
//
// Download the file.
//
+ AsciiPrint ("\n Downloading NBP file...\n");
TmpBufSize = (UINT64) (*BufferSize);
Status = PxeBc->Mtftp (
PxeBc,
EFI_PXE_BASE_CODE_TFTP_READ_FILE,
Buffer,
@@ -2911,10 +2928,11 @@ EfiPxeLoadFile (
//
// Check download status
//
if (Status == 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 programs
which
// also need to use DHCP4 will be impacted.
// The functionality of PXE Base Code protocol will not be stopped, diff
--git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.c
b/MdeModulePkg/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.
-Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
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
http://opensource.org/licenses/bsd-license.php
@@ -112,10 +112,30 @@ PxeBcConfigureUdpWriteInstance (
}
return Status;
}
+/**
+ 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 = 0; Index < 4; Index++) {
+ AsciiPrint ("%d", Ip->Addr[Index]);
+ if (Index < 3) {
+ AsciiPrint (".");
+ }
+ }
+}
/**
Convert number to ASCII value.
@param Number Numeric value to convert to decimal ASCII value.
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcSupport.h
b/MdeModulePkg/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.<BR>
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
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
http://opensource.org/licenses/bsd-license.php
@@ -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
+ );
+
+
/**
Convert number to ASCII value.
@param Number Numeric value to convert to decimal ASCII value.
@param Buffer Buffer to place ASCII version of the Number.
--
1.9.5.msysgit.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
