tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix DxeCapsuleLib build failure 

Signed-off-by : Chao Zhang <chao.b.zhang@intel.com>
Reviewed-by   : Gao Liming <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14779 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
czhang46 2013-10-16 07:43:14 +00:00 committed by czhang46
parent 8833370303
commit 5f7273293d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.c
View File

@ -201,8 +201,8 @@ ProcessFmpCapsuleImage (
MemMapNode.Header.Type = HARDWARE_DEVICE_PATH; MemMapNode.Header.Type = HARDWARE_DEVICE_PATH;
MemMapNode.Header.SubType = HW_MEMMAP_DP; MemMapNode.Header.SubType = HW_MEMMAP_DP;
MemMapNode.MemoryType = EfiBootServicesCode; MemMapNode.MemoryType = EfiBootServicesCode;
MemMapNode.StartingAddress = (EFI_PHYSICAL_ADDRESS)CapsuleHeader; MemMapNode.StartingAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)CapsuleHeader;
MemMapNode.EndingAddress = (EFI_PHYSICAL_ADDRESS)((UINT8 *)CapsuleHeader + CapsuleHeader->CapsuleImageSize - 1); MemMapNode.EndingAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)((UINT8 *)CapsuleHeader + CapsuleHeader->CapsuleImageSize - 1);
DriverDevicePath = AppendDevicePathNode (NULL, &MemMapNode.Header); DriverDevicePath = AppendDevicePathNode (NULL, &MemMapNode.Header);
if (DriverDevicePath == NULL) { if (DriverDevicePath == NULL) {
@ -210,13 +210,13 @@ ProcessFmpCapsuleImage (
} }
for (Index = 0; Index < FmpCapsuleHeader->EmbeddedDriverCount; Index++) { for (Index = 0; Index < FmpCapsuleHeader->EmbeddedDriverCount; Index++) {
if (FmpCapsuleHeader->PayloadItemCount == 0 && Index == FmpCapsuleHeader->EmbeddedDriverCount - 1) { if (FmpCapsuleHeader->PayloadItemCount == 0 && Index == (UINTN)FmpCapsuleHeader->EmbeddedDriverCount - 1) {
// //
// When driver is last element in the ItemOffsetList array, the driver size is calculated by reference CapsuleImageSize in EFI_CAPSULE_HEADER // When driver is last element in the ItemOffsetList array, the driver size is calculated by reference CapsuleImageSize in EFI_CAPSULE_HEADER
// //
DriverLen = CapsuleHeader->CapsuleImageSize - CapsuleHeader->HeaderSize - ItemOffsetList[Index]; DriverLen = CapsuleHeader->CapsuleImageSize - CapsuleHeader->HeaderSize - (UINTN)ItemOffsetList[Index];
} else { } else {
DriverLen = ItemOffsetList[Index + 1] - ItemOffsetList[Index]; DriverLen = (UINTN)ItemOffsetList[Index + 1] - (UINTN)ItemOffsetList[Index];
} }
Status = gBS->LoadImage( Status = gBS->LoadImage(
@ -265,7 +265,7 @@ ProcessFmpCapsuleImage (
Status = gBS->HandleProtocol( Status = gBS->HandleProtocol(
HandleBuffer[Index1], HandleBuffer[Index1],
&gEfiFirmwareManagementProtocolGuid, &gEfiFirmwareManagementProtocolGuid,
&Fmp (VOID **)&Fmp
); );
if (EFI_ERROR(Status)) { if (EFI_ERROR(Status)) {
continue; continue;