BaseTools/BinToPcd: Fix Python 2.7.x compatibility issue

[mirror_edk2.git] / DuetPkg / FSVariable / MemStorage.c

diff --git a/DuetPkg/FSVariable/MemStorage.c b/DuetPkg/FSVariable/MemStorage.c
index ed72b898f0e658b60d815fd0f16e2375d73a4366..cc0d546190d14871cf640e90efa0fb818903c3cc 100644 (file)
--- a/DuetPkg/FSVariable/MemStorage.c
+++ b/DuetPkg/FSVariable/MemStorage.c
@@ -1,7 +1,13 @@
 /*++\r
 \r
-Copyright (c) 2006 - 2007, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+Caution: This file is used for Duet platform only, do not use them in real platform.\r
+All variable code, variable metadata, and variable data used by Duet platform are on \r
+disk. They can be changed by user. BIOS is not able to protoect those.\r
+Duet trusts all meta data from disk. If variable code, variable metadata and variable\r
+data is modified in inproper way, the behavior is undefined.\r
+\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
 http://opensource.org/licenses/bsd-license.php\r
@@ -22,22 +28,19 @@ Revision History
 --*/\r
 #include "FSVariable.h"\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
-OnVirtualAddressChange (\r
+OnVirtualAddressChangeMs (\r
   IN EFI_EVENT            Event,\r
   IN VOID                 *Context\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 MemEraseStore(\r
   IN VARIABLE_STORAGE   *This\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 MemWriteStore (\r
@@ -57,32 +60,31 @@ MemStorageConstructor (
   EFI_STATUS                  Status;\r
   VS_DEV                      *Dev;\r
 \r
-  Status = gBS->AllocatePool (EfiRuntimeServicesData, sizeof(VS_DEV), &Dev);\r
+  Status = gBS->AllocatePool (EfiRuntimeServicesData, sizeof(VS_DEV), (VOID **) &Dev);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   ZeroMem (Dev, sizeof(VS_DEV));\r
 \r
-  Dev->Signature   = VARIABLE_STORE_SIGNATURE;\r
+  Dev->Signature   = VS_DEV_SIGNATURE;\r
   Dev->Size        = Size;\r
 \r
   Dev->VarStore.Erase    = MemEraseStore;\r
   Dev->VarStore.Write    = MemWriteStore;\r
 \r
-  Status = gBS->AllocatePool (EfiRuntimeServicesData, Size, &VAR_DATA_PTR (Dev));\r
+  Status = gBS->AllocatePool (EfiRuntimeServicesData, Size, (VOID **) &VAR_DATA_PTR (Dev));\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   DEBUG ((EFI_D_ERROR, "VStorage: Size = 0x%x\n", Size));\r
   \r
   *VarStore       = &Dev->VarStore;\r
-  *GoVirtualEvent = OnVirtualAddressChange;\r
+  *GoVirtualEvent = OnVirtualAddressChangeMs;\r
 \r
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
-OnVirtualAddressChange (\r
+OnVirtualAddressChangeMs (\r
   IN EFI_EVENT            Event,\r
   IN VOID                 *Context\r
   )\r
@@ -91,12 +93,11 @@ OnVirtualAddressChange (
 \r
   Dev = DEV_FROM_THIS (Context);\r
 \r
-  EfiConvertPointer (0, &VAR_DATA_PTR (Dev));\r
-  EfiConvertPointer (0, (VOID**)&Dev->VarStore.Erase);\r
-  EfiConvertPointer (0, (VOID**)&Dev->VarStore.Write);\r
+  EfiConvertPointer (0, (VOID **)&VAR_DATA_PTR (Dev));\r
+  EfiConvertPointer (0, (VOID **)&Dev->VarStore.Erase);\r
+  EfiConvertPointer (0, (VOID **)&Dev->VarStore.Write);\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 MemEraseStore(\r
@@ -111,7 +112,6 @@ MemEraseStore(
 }\r
 \r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 MemWriteStore (\r