Revision: 14779
http://sourceforge.net/p/edk2/code/14779
Author: czhang46
Date: 2013-10-16 07:43:14 +0000 (Wed, 16 Oct 2013)
Log Message:
-----------
Fix DxeCapsuleLib build failure
Signed-off-by : Chao Zhang <[email protected]>
Reviewed-by : Gao Liming <[email protected]>
Modified Paths:
--------------
trunk/edk2/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.c
Modified:
trunk/edk2/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.c
===================================================================
--- trunk/edk2/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.c
2013-10-16 05:49:50 UTC (rev 14778)
+++ trunk/edk2/IntelFrameworkModulePkg/Library/DxeCapsuleLib/DxeCapsuleLib.c
2013-10-16 07:43:14 UTC (rev 14779)
@@ -201,8 +201,8 @@
MemMapNode.Header.Type = HARDWARE_DEVICE_PATH;
MemMapNode.Header.SubType = HW_MEMMAP_DP;
MemMapNode.MemoryType = EfiBootServicesCode;
- MemMapNode.StartingAddress = (EFI_PHYSICAL_ADDRESS)CapsuleHeader;
- MemMapNode.EndingAddress = (EFI_PHYSICAL_ADDRESS)((UINT8 *)CapsuleHeader +
CapsuleHeader->CapsuleImageSize - 1);
+ MemMapNode.StartingAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)CapsuleHeader;
+ MemMapNode.EndingAddress = (EFI_PHYSICAL_ADDRESS)(UINTN)((UINT8
*)CapsuleHeader + CapsuleHeader->CapsuleImageSize - 1);
DriverDevicePath = AppendDevicePathNode (NULL, &MemMapNode.Header);
if (DriverDevicePath == NULL) {
@@ -210,13 +210,13 @@
}
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
//
- DriverLen = CapsuleHeader->CapsuleImageSize - CapsuleHeader->HeaderSize
- ItemOffsetList[Index];
+ DriverLen = CapsuleHeader->CapsuleImageSize - CapsuleHeader->HeaderSize
- (UINTN)ItemOffsetList[Index];
} else {
- DriverLen = ItemOffsetList[Index + 1] - ItemOffsetList[Index];
+ DriverLen = (UINTN)ItemOffsetList[Index + 1] -
(UINTN)ItemOffsetList[Index];
}
Status = gBS->LoadImage(
@@ -265,7 +265,7 @@
Status = gBS->HandleProtocol(
HandleBuffer[Index1],
&gEfiFirmwareManagementProtocolGuid,
- &Fmp
+ (VOID **)&Fmp
);
if (EFI_ERROR(Status)) {
continue;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60135031&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
