QuarkPlatformPkg/SpiFvbServices: correct NumOfLba vararg type in EraseBlocks()

[mirror_edk2.git] / QuarkPlatformPkg / Platform / SpiFvbServices / FwBlockService.c

diff --git a/QuarkPlatformPkg/Platform/SpiFvbServices/FwBlockService.c b/QuarkPlatformPkg/Platform/SpiFvbServices/FwBlockService.c
index 6d21bb01b602ed20aa7c082748347f96ca6901d7..0e7a7b79a1cff3e3a8e01047b3c82e6cbd0b7eb4 100644 (file)
--- a/QuarkPlatformPkg/Platform/SpiFvbServices/FwBlockService.c
+++ b/QuarkPlatformPkg/Platform/SpiFvbServices/FwBlockService.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

-Copyright (c) 2013-2015 Intel Corporation.\r
+Copyright (c) 2013-2016 Intel Corporation.\r

 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r


@@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "FwBlockService.h"\r
 \r
 ESAL_FWB_GLOBAL         *mFvbModuleGlobal;\r
 #include "FwBlockService.h"\r
 \r
 ESAL_FWB_GLOBAL         *mFvbModuleGlobal;\r

-EFI_GUID gEfiFirmwareVolumeBlockProtocolGuid;\r
-EFI_GUID gEfiSmmFirmwareVolumeBlockProtocolGuid;\r

 \r
 EFI_FW_VOL_BLOCK_DEVICE mFvbDeviceTemplate = {\r
   FVB_DEVICE_SIGNATURE,  // Signature\r
 \r
 EFI_FW_VOL_BLOCK_DEVICE mFvbDeviceTemplate = {\r
   FVB_DEVICE_SIGNATURE,  // Signature\r


@@ -592,9 +590,6 @@ Returns:
 --*/\r
 {\r
   EFI_STATUS  Status;\r
 --*/\r
 {\r
   EFI_STATUS  Status;\r

-  UINTN       NumBytes;\r
-\r
-  NumBytes = LbaLength;\r

 \r
   WriteAddress -= (PcdGet32 (PcdFlashAreaBaseAddress));\r
   if (mInSmmMode == 0 ) { // !(EfiInManagementInterrupt ())) {\r
 \r
   WriteAddress -= (PcdGet32 (PcdFlashAreaBaseAddress));\r
   if (mInSmmMode == 0 ) { // !(EfiInManagementInterrupt ())) {\r


@@ -1216,7 +1211,7 @@ Returns:
       break;\r
     }\r
 \r
       break;\r
     }\r
 \r

-    NumOfLba = VA_ARG (args, UINT32);\r
+    NumOfLba = VA_ARG (args, UINTN);\r

 \r
     //\r
     // Check input parameters\r
 \r
     //\r
     // Check input parameters\r


@@ -1240,7 +1235,7 @@ Returns:
       break;\r
     }\r
 \r
       break;\r
     }\r
 \r

-    NumOfLba = VA_ARG (args, UINT32);\r
+    NumOfLba = VA_ARG (args, UINTN);\r

 \r
     while (NumOfLba > 0) {\r
       Status = FvbEraseBlock (FvbDevice->Instance, StartingLba, mFvbModuleGlobal, EfiGoneVirtual ());\r
 \r
     while (NumOfLba > 0) {\r
       Status = FvbEraseBlock (FvbDevice->Instance, StartingLba, mFvbModuleGlobal, EfiGoneVirtual ());\r


@@ -1640,7 +1635,6 @@ Returns:
   VOID                                *FirmwareVolumeHobList;\r
   UINT32                              BufferSize;\r
   EFI_FV_BLOCK_MAP_ENTRY              *PtrBlockMapEntry;\r
   VOID                                *FirmwareVolumeHobList;\r
   UINT32                              BufferSize;\r
   EFI_FV_BLOCK_MAP_ENTRY              *PtrBlockMapEntry;\r

-  UINTN                               LbaAddress;\r

   BOOLEAN                             WriteEnabled;\r
   BOOLEAN                             WriteLocked;\r
   EFI_HANDLE                          FwbHandle;\r
   BOOLEAN                             WriteEnabled;\r
   BOOLEAN                             WriteLocked;\r
   EFI_HANDLE                          FwbHandle;\r


@@ -1884,7 +1878,6 @@ Returns:
     FwhInstance->WriteEnabled             = WriteEnabled;\r
     EfiInitializeLock (&(FwhInstance->FvbDevLock), TPL_HIGH_LEVEL);\r
 \r
     FwhInstance->WriteEnabled             = WriteEnabled;\r
     EfiInitializeLock (&(FwhInstance->FvbDevLock), TPL_HIGH_LEVEL);\r
 \r

-    LbaAddress  = (UINTN) FwhInstance->FvWriteBase[0];\r

     NumOfBlocks = 0;\r
     WriteLocked = FALSE;\r
 \r
     NumOfBlocks = 0;\r
     WriteLocked = FALSE;\r
 \r