sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
vanjeff
2008-02-26 08:38:29 +00:00
parent 77442a5a27
commit ba39e316c9
6 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MdeModulePkg/Core/Dxe/DxeMain.inf
View File

@@ -134,6 +134,7 @@
gEfiLoadedImageProtocolGuid # PROTOCOL ALWAYS_PRODUCED
gEfiEbcProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
gEfiTcgPlatformProtocolGuid
gEfiLoadedImageDevicePathProtocolGuid # PROTOCOL ALWAYS_PRODUCED
[FixedPcd.common]
gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeCoreEntry | 0x3041000 # EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_PC_ENTRY_POINT

2
MdeModulePkg/Core/Dxe/Image.h
View File

@@ -55,7 +55,7 @@ typedef struct {
EFI_RUNTIME_IMAGE_ENTRY *RuntimeData; // Runtime image list
EFI_DEVICE_PATH_PROTOCOL *DeviceHandleDevicePath;
EFI_DEVICE_PATH_PROTOCOL *LoadedImageDevicePath; // Pointer to Loaded Image Device Path Protocl
PE_COFF_LOADER_IMAGE_CONTEXT ImageContext; // PeCoffLoader ImageContext

34
MdeModulePkg/Core/Dxe/Image/Image.c
View File

@@ -74,7 +74,7 @@ LOADED_IMAGE_PRIVATE_DATA mCorePrivateImage = {
0, // Machine
NULL, // Ebc
NULL, // RuntimeData
NULL, // DeviceHandleDevicePath
NULL // LoadedImageDevicePath
};
@@ -714,7 +714,6 @@ Returns:
if (!EFI_ERROR (Status)) {
FilePathSize = CoreDevicePathSize (HandleFilePath) - sizeof(EFI_DEVICE_PATH_PROTOCOL);
FilePath = (EFI_DEVICE_PATH_PROTOCOL *) ( ((UINT8 *)FilePath) + FilePathSize );
Image->DeviceHandleDevicePath = CoreDuplicateDevicePath (HandleFilePath);
}
//
@@ -782,6 +781,26 @@ Returns:
goto Done;
}
//
// If DevicePath parameter to the LoadImage() is not NULL, then make a copy of DevicePath,
// otherwise Loaded Image Device Path Protocol is installed with a NULL interface pointer.
//
if (OriginalFilePath != NULL) {
Image->LoadedImageDevicePath = CoreDuplicateDevicePath (OriginalFilePath);
}
//
// Install Loaded Image Device Path Protocol onto the image handle of a PE/COFE image
//
Status = CoreInstallProtocolInterface (
&Image->Handle,
&gEfiLoadedImageDevicePathProtocolGuid,
EFI_NATIVE_INTERFACE,
Image->LoadedImageDevicePath
);
if (EFI_ERROR (Status)) {
goto Done;
}
//
// Success. Return the image handle
@@ -1208,11 +1227,18 @@ Returns:
CoreRemoveDebugImageInfoEntry (Image->Handle);
Status = CoreUninstallProtocolInterface (
Image->Handle,
&gEfiLoadedImageDevicePathProtocolGuid,
Image->LoadedImageDevicePath
);
Status = CoreUninstallProtocolInterface (
Image->Handle,
&gEfiLoadedImageProtocolGuid,
&Image->Info
);
}
if (Image->RuntimeData != NULL) {
@@ -1239,8 +1265,8 @@ Returns:
CoreFreePool (Image->Info.FilePath);
}
if (Image->DeviceHandleDevicePath != NULL) {
CoreFreePool (Image->DeviceHandleDevicePath);
if (Image->LoadedImageDevicePath != NULL) {
CoreFreePool (Image->LoadedImageDevicePath);
}
if (Image->FixupData != NULL) {