1. Add EFI LOADED IMAGE DEVICE PATH Protocol in LoadImage() service, per UEFI 2.1b.

2. Update comments for DHCP.transmitreceive().
2. Update UefiPxeBcDxe.inf and PxeBcDxe.inf to assign correct protocol usages.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4758 6f19259b-4bc3-4df7-8a09-765794883524

3 files changed, 17 insertions, 12 deletions

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
index 09de4cdaab..514e33e925 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Impl.c
@@ -984,13 +984,18 @@ SIGNAL_USER:
 

 

 /**

-  Transmit and receive a packet through this DHCP service.

-  This is unsupported.

-

-  @param  This                   The DHCP protocol instance

-  @param  Token                  The transmit and receive instance

-

-  @retval EFI_UNSUPPORTED        It always returns unsupported.

+  Transmits a DHCP formatted packet and optionally waits for responses.

+

+  @param  This    Pointer to the EFI_DHCP4_PROTOCOL instance.

+  @param  Token   Pointer to the EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN structure.

+

+  @retval EFI_SUCCESS           The packet was successfully queued for transmission.

+  @retval EFI_INVALID_PARAMETER Some parameter is NULL.

+  @retval EFI_NOT_READY         The previous call to this function has not finished yet. Try to call

+                                this function after collection process completes.

+  @retval EFI_NO_MAPPING        The default station address is not available yet.

+  @retval EFI_OUT_OF_RESOURCES  Required system resources could not be allocated.

+  @retval Others                Some other unexpected error occurred.

 

 **/

 STATIC

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf b/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf
index 99c5363d63..1971731e08 100644
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf
@@ -81,8 +81,8 @@
 

 [Protocols]

   gEfiBisProtocolGuid                             # PROTOCOL ALWAYS_CONSUMED

-  gEfiPxeBaseCodeCallbackProtocolGuid             # PROTOCOL ALWAYS_CONSUMED

-  gEfiPxeBaseCodeProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED

+  gEfiPxeBaseCodeCallbackProtocolGuid             # PROTOCOL ALWAYS_PRODUCED

+  gEfiPxeBaseCodeProtocolGuid                     # PROTOCOL ALWAYS_PRODUCED

   gEfiLoadFileProtocolGuid                        # PROTOCOL ALWAYS_CONSUMED

   gEfiSimpleNetworkProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED

   gEfiDevicePathProtocolGuid                      # PROTOCOL ALWAYS_CONSUMED

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
index bc1bafba60..fd4ab6be68 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
@@ -83,9 +83,9 @@
   gEfiMtftp4ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED

   gEfiUdp4ServiceBindingProtocolGuid               # PROTOCOL ALWAYS_CONSUMED

   gEfiDhcp4ServiceBindingProtocolGuid              # PROTOCOL ALWAYS_CONSUMED

-  gEfiPxeBaseCodeCallbackProtocolGuid              # PROTOCOL ALWAYS_CONSUMED

-  gEfiPxeBaseCodeProtocolGuid                      # PROTOCOL ALWAYS_CONSUMED

-  gEfiLoadFileProtocolGuid                         # PROTOCOL ALWAYS_CONSUMED

+  gEfiPxeBaseCodeCallbackProtocolGuid              # PROTOCOL ALWAYS_PRODUCED

+  gEfiPxeBaseCodeProtocolGuid                      # PROTOCOL ALWAYS_PRODUCED

+  gEfiLoadFileProtocolGuid                         # PROTOCOL ALWAYS_PRODUCED

   gEfiDhcp4ProtocolGuid                            # PROTOCOL ALWAYS_CONSUMED

   gEfiUdp4ProtocolGuid                             # PROTOCOL ALWAYS_CONSUMED

   gEfiNetworkInterfaceIdentifierProtocolGuid_31    # PROTOCOL ALWAYS_CONSUMED