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

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