From 3709c4cd5bc3956fee59f31bdd1b7dc5b61a039a Mon Sep 17 00:00:00 2001 From: eric_tian Date: Fri, 27 Feb 2009 05:35:08 +0000 Subject: =?UTF-8?q?1.=20delete=20Include/Guid/VariableInfo.h=202.=20move?= =?UTF-8?q?=20VariableFormat.h=20into=20GUID=20directory=20and=20change=20?= =?UTF-8?q?the=20=E2=80=9CSignature=E2=80=9D=20field=20of=20the=20VARIABLE?= =?UTF-8?q?=5FSTORE=5FHEADER=20to=20gEfiVariableGuid=20value.=203.=20mergi?= =?UTF-8?q?ng=20VARIABLE=5FINFO=5FENTRY=20structure=20into=20the=20new=20I?= =?UTF-8?q?nclude/Guid/VariableFormat.h=204.=20change=20gEfiVariableInfoGu?= =?UTF-8?q?id=20into=20gEfiVariableGuid.=205.=20modify=20FDF=20files=20to?= =?UTF-8?q?=20use=20new=20guid=20value=20instead=20of=20the=20original=20s?= =?UTF-8?q?ignature.=206.=20all=20code=20related=20to=20signature=20is=20c?= =?UTF-8?q?hanged=20to=20use=20guid=20value.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7728 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/Variable/EmuRuntimeDxe/EmuVariable.c | 2 +- .../Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf | 1 + .../Universal/Variable/EmuRuntimeDxe/Variable.h | 2 +- MdeModulePkg/Universal/Variable/Pei/Variable.c | 8 ++++++-- MdeModulePkg/Universal/Variable/Pei/Variable.h | 2 +- MdeModulePkg/Universal/Variable/Pei/VariablePei.inf | 3 +++ MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c | 17 ++++++++++------- MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h | 3 +-- .../Variable/RuntimeDxe/VariableRuntimeDxe.inf | 2 +- 9 files changed, 25 insertions(+), 15 deletions(-) (limited to 'MdeModulePkg/Universal') diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c index 76f9f09260..1fdf25de27 100644 --- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c +++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c @@ -822,7 +822,7 @@ InitializeVariableStore ( *VariableBase = (EFI_PHYSICAL_ADDRESS) (UINTN) VariableStore; *LastVariableOffset = sizeof (VARIABLE_STORE_HEADER); - VariableStore->Signature = VARIABLE_STORE_SIGNATURE; + CopyGuid (&VariableStore->Signature, &gEfiVariableGuid); VariableStore->Size = FixedPcdGet32(PcdVariableStoreSize); VariableStore->Format = VARIABLE_STORE_FORMATTED; VariableStore->State = VARIABLE_STORE_HEALTHY; diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf index 12cbbc929a..5e25d1efae 100644 --- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf +++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf @@ -56,6 +56,7 @@ [Guids] gEfiEventVirtualAddressChangeGuid ## PRODUCES ## Event + gEfiVariableGuid [Pcd.common] gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h index 482a192a38..a3fc9d1eeb 100644 --- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h +++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/Variable.h @@ -31,7 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include +#include #include diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.c b/MdeModulePkg/Universal/Variable/Pei/Variable.c index f98d236443..7f4b4f68d7 100644 --- a/MdeModulePkg/Universal/Variable/Pei/Variable.c +++ b/MdeModulePkg/Universal/Variable/Pei/Variable.c @@ -268,7 +268,8 @@ GetVariableStoreStatus ( IN VARIABLE_STORE_HEADER *VarStoreHeader ) { - if (VarStoreHeader->Signature == VARIABLE_STORE_SIGNATURE && + + if (CompareGuid (&VarStoreHeader->Signature, &gEfiVariableGuid) && VarStoreHeader->Format == VARIABLE_STORE_FORMATTED && VarStoreHeader->State == VARIABLE_STORE_HEALTHY ) { @@ -276,7 +277,10 @@ GetVariableStoreStatus ( return EfiValid; } - if (VarStoreHeader->Signature == 0xffffffff && + if (((UINT32 *)(&VarStoreHeader->Signature))[0] == 0xffffffff && + ((UINT32 *)(&VarStoreHeader->Signature))[1] == 0xffffffff && + ((UINT32 *)(&VarStoreHeader->Signature))[2] == 0xffffffff && + ((UINT32 *)(&VarStoreHeader->Signature))[3] == 0xffffffff && VarStoreHeader->Size == 0xffffffff && VarStoreHeader->Format == 0xff && VarStoreHeader->State == 0xff diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.h b/MdeModulePkg/Universal/Variable/Pei/Variable.h index 7641a760d0..7cee1f08b5 100644 --- a/MdeModulePkg/Universal/Variable/Pei/Variable.h +++ b/MdeModulePkg/Universal/Variable/Pei/Variable.h @@ -28,7 +28,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include -#include +#include typedef struct { VARIABLE_HEADER *CurrPtr; diff --git a/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf b/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf index 46e29b2cca..2e5580bde6 100644 --- a/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf +++ b/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf @@ -57,6 +57,9 @@ PeiServicesTablePointerLib PeiServicesLib +[Guids] + gEfiVariableGuid + [Ppis] gEfiPeiReadOnlyVariable2PpiGuid ## SOMETIMES_PRODUCES (Not for boot mode RECOVERY) diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c index 0d03376359..d25fe038aa 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c @@ -137,7 +137,7 @@ UpdateVariableInfo ( StrCpy (gVariableInfo->Name, VariableName); gVariableInfo->Volatile = Volatile; - gBS->InstallConfigurationTable (&gEfiVariableInfoGuid, gVariableInfo); + gBS->InstallConfigurationTable (&gEfiVariableGuid, gVariableInfo); } @@ -362,16 +362,19 @@ GetVariableStoreStatus ( IN VARIABLE_STORE_HEADER *VarStoreHeader ) { - if (VarStoreHeader->Signature == VARIABLE_STORE_SIGNATURE && + if (CompareGuid (&VarStoreHeader->Signature, &gEfiVariableGuid) && VarStoreHeader->Format == VARIABLE_STORE_FORMATTED && VarStoreHeader->State == VARIABLE_STORE_HEALTHY ) { return EfiValid; - } else if (VarStoreHeader->Signature == 0xffffffff && - VarStoreHeader->Size == 0xffffffff && - VarStoreHeader->Format == 0xff && - VarStoreHeader->State == 0xff + } else if (((UINT32 *)(&VarStoreHeader->Signature))[0] == 0xffffffff && + ((UINT32 *)(&VarStoreHeader->Signature))[1] == 0xffffffff && + ((UINT32 *)(&VarStoreHeader->Signature))[2] == 0xffffffff && + ((UINT32 *)(&VarStoreHeader->Signature))[3] == 0xffffffff && + VarStoreHeader->Size == 0xffffffff && + VarStoreHeader->Format == 0xff && + VarStoreHeader->State == 0xff ) { return EfiRaw; @@ -1849,7 +1852,7 @@ VariableCommonInitialize ( mVariableModuleGlobal->VariableGlobal.VolatileVariableBase = (EFI_PHYSICAL_ADDRESS) (UINTN) VolatileVariableStore; mVariableModuleGlobal->VolatileLastVariableOffset = (UINTN) GetStartPointer (VolatileVariableStore) - (UINTN) VolatileVariableStore; - VolatileVariableStore->Signature = VARIABLE_STORE_SIGNATURE; + CopyGuid (&VolatileVariableStore->Signature, &gEfiVariableGuid); VolatileVariableStore->Size = FixedPcdGet32(PcdVariableStoreSize); VolatileVariableStore->Format = VARIABLE_STORE_FORMATTED; VolatileVariableStore->State = VARIABLE_STORE_HEALTHY; diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h index ec35a7dfcf..4e861dccbc 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h @@ -34,10 +34,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include #include -#include #include #include -#include +#include #define VARIABLE_RECLAIM_THRESHOLD (1024) diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf index c7ba49b11f..44063224a7 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf @@ -60,7 +60,7 @@ gEfiVariableArchProtocolGuid ## ALWAYS_PRODUCES [Guids] - gEfiVariableInfoGuid ## PRODUCES ## Configuration Table Guid + gEfiVariableGuid ## PRODUCES ## Configuration Table Guid gEfiGlobalVariableGuid ## PRODUCES ## Variable Guid gEfiEventVirtualAddressChangeGuid ## PRODUCES ## Event -- cgit v1.2.3