OvmfPg: flash driver: fix type of EFI_SIZE_TO_PAGES argument (VS2010)

[mirror_edk2.git] / OvmfPkg / QemuFlashFvbServicesRuntimeDxe / FwBlockService.c

diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
index 2ae667875128261c7a9e7bc36518fd6f496e6e3a..42060c84cf0d126c169b25675f5862a28b45e587 100644 (file)
--- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
+++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
@@ -1,6 +1,6 @@
 /**@file\r
 \r
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -197,6 +197,7 @@ Returns:
 {\r
   EFI_FW_VOL_INSTANCE *FwhRecord;\r
 \r
+  *FwhInstance = NULL;\r
   if (Instance >= Global->NumFv) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
@@ -879,7 +880,8 @@ Returns:
   if (Checksum != 0) {\r
     UINT16 Expected;\r
 \r
-    Expected = ((UINTN) FwVolHeader->Checksum + 0x10000 - Checksum) & 0xffff;\r
+    Expected =\r
+      (UINT16) (((UINTN) FwVolHeader->Checksum + 0x10000 - Checksum) & 0xffff);\r
 \r
     DEBUG ((EFI_D_INFO, "FV@%p Checksum is 0x%x, expected 0x%x\n",\r
             FwVolHeader, FwVolHeader->Checksum, Expected));\r
@@ -893,7 +895,7 @@ STATIC
 EFI_STATUS\r
 MarkMemoryRangeForRuntimeAccess (\r
   EFI_PHYSICAL_ADDRESS                BaseAddress,\r
-  UINT64                              Length\r
+  UINTN                               Length\r
   )\r
 {\r
   EFI_STATUS                          Status;\r
@@ -917,7 +919,7 @@ MarkMemoryRangeForRuntimeAccess (
   Status = gBS->AllocatePages (\r
                   AllocateAddress,\r
                   EfiRuntimeServicesData,\r
-                  (UINTN) EFI_SIZE_TO_PAGES (Length),\r
+                  EFI_SIZE_TO_PAGES (Length),\r
                   &BaseAddress\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
@@ -1024,7 +1026,7 @@ Returns:
   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *OldFwbInterface;\r
   UINT32                              MaxLbaSize;\r
   EFI_PHYSICAL_ADDRESS                BaseAddress;\r
-  UINT64                              Length;\r
+  UINTN                               Length;\r
   UINTN                               NumOfBlocks;\r
   EFI_EVENT                           VirtualAddressChangeEvent;\r
 \r
@@ -1222,5 +1224,6 @@ Returns:
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
+  PcdSetBool (PcdOvmfFlashVariablesEnable, TRUE);\r
   return EFI_SUCCESS;\r
 }\r