1. delete Include/Guid/VariableInfo.h

2. move VariableFormat.h into GUID directory and change the “Signature” field of the VARIABLE_STORE_HEADER to gEfiVariableGuid value.
3. merging VARIABLE_INFO_ENTRY structure into the new Include/Guid/VariableFormat.h
4. change gEfiVariableInfoGuid into gEfiVariableGuid.
5. modify FDF files to use new guid value instead of the original signature.
6. all code related to signature is changed to use guid value.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7728 6f19259b-4bc3-4df7-8a09-765794883524

9 files changed, 20 insertions, 12 deletions

diff --git a/DuetPkg/DxeIpl/DxeIpl.h b/DuetPkg/DxeIpl/DxeIpl.h
index c8c6794..8b6e9a8 100644
--- a/DuetPkg/DxeIpl/DxeIpl.h
+++ b/DuetPkg/DxeIpl/DxeIpl.h
@@ -18,6 +18,7 @@
 #include <Guid/Mps.h>

 #include <Guid/FlashMapHob.h>

 #include <Guid/SystemNvDataGuid.h>

+#include <Guid/VariableFormat.h>

 

 #include <Protocol/Decompress.h>

 #include <Protocol/StatusCode.h>

@@ -29,7 +30,6 @@
 #include <Library/PrintLib.h>

 #include <Library/IoLib.h>

 

-#include <VariableFormat.h>

 #include <CpuIA32.h>

 

 #endif // _DUET_DXEIPL_H_

diff --git a/DuetPkg/DxeIpl/DxeIpl.inf b/DuetPkg/DxeIpl/DxeIpl.inf
index 6a2ba5d..826aee1 100644
--- a/DuetPkg/DxeIpl/DxeIpl.inf
+++ b/DuetPkg/DxeIpl/DxeIpl.inf
@@ -39,6 +39,9 @@
   ReportStatusCodeLib

   IoLib

 

+[Guids]

+  gEfiVariableGuid

+

 [Sources.common]

   DxeIpl.h

   DxeInit.c

diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index 0b215eb..93bf289 100644
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -738,7 +738,7 @@ PrepareHobNvStorage (
 */

 {

   STATIC VARIABLE_STORE_HEADER VarStoreHeader = {

-    VARIABLE_STORE_SIGNATURE,

+    gEfiVariableGuid,

     0xffffffff,                 // will be fixed in Variable driver

     VARIABLE_STORE_FORMATTED,

     VARIABLE_STORE_HEALTHY,

diff --git a/DuetPkg/FSVariable/FSVariable.c b/DuetPkg/FSVariable/FSVariable.c
index 18b93c0..d20b3a7 100644
--- a/DuetPkg/FSVariable/FSVariable.c
+++ b/DuetPkg/FSVariable/FSVariable.c
@@ -22,7 +22,7 @@ Abstract:
 #include "FSVariable.h"

 

 VARIABLE_STORE_HEADER mStoreHeaderTemplate = {

-  VARIABLE_STORE_SIGNATURE,

+  gEfiVariableGuid,

   VOLATILE_VARIABLE_STORE_SIZE,

   VARIABLE_STORE_FORMATTED,

   VARIABLE_STORE_HEALTHY,

@@ -100,15 +100,18 @@ Returns:
 

 --*/

 {

-  if ((VarStoreHeader->Signature == mStoreHeaderTemplate.Signature) &&

+  if (CompareGuid (&VarStoreHeader->Signature, &mStoreHeaderTemplate.Signature) &&

       (VarStoreHeader->Format == mStoreHeaderTemplate.Format) &&

       (VarStoreHeader->State == mStoreHeaderTemplate.State)

      ) {

     return EfiValid;

-  } else if (VarStoreHeader->Signature == VAR_DEFAULT_VALUE_32 &&

-           VarStoreHeader->Size == VAR_DEFAULT_VALUE_32 &&

-           VarStoreHeader->Format == VAR_DEFAULT_VALUE &&

-           VarStoreHeader->State == VAR_DEFAULT_VALUE

+  } else if (((UINT32 *)(&VarStoreHeader->Signature))[0] == VAR_DEFAULT_VALUE_32 &&

+             ((UINT32 *)(&VarStoreHeader->Signature))[1] == VAR_DEFAULT_VALUE_32 &&

+             ((UINT32 *)(&VarStoreHeader->Signature))[2] == VAR_DEFAULT_VALUE_32 &&

+             ((UINT32 *)(&VarStoreHeader->Signature))[3] == VAR_DEFAULT_VALUE_32 &&

+             VarStoreHeader->Size == VAR_DEFAULT_VALUE_32 &&

+             VarStoreHeader->Format == VAR_DEFAULT_VALUE &&

+             VarStoreHeader->State == VAR_DEFAULT_VALUE

           ) {

 

     return EfiRaw;

diff --git a/DuetPkg/FSVariable/FSVariable.h b/DuetPkg/FSVariable/FSVariable.h
index 9fdd0a7..6da525c 100644
--- a/DuetPkg/FSVariable/FSVariable.h
+++ b/DuetPkg/FSVariable/FSVariable.h
@@ -38,6 +38,7 @@ Abstract:
 

 #include <Guid/HobList.h>

 #include <Guid/FlashMapHob.h>

+#include <Guid/VariableFormat.h>

 

 #include <Protocol/Variable.h>

 #include <Protocol/VariableWrite.h>

@@ -46,7 +47,6 @@ Abstract:
 

 

 #include "EfiFlashMap.h"

-#include "VariableFormat.h"

 #include "VariableStorage.h"

 

 #define VOLATILE_VARIABLE_STORE_SIZE  (64 * 1024)

diff --git a/DuetPkg/FSVariable/FSVariable.inf b/DuetPkg/FSVariable/FSVariable.inf
index 52a805d..c2a8c84 100644
--- a/DuetPkg/FSVariable/FSVariable.inf
+++ b/DuetPkg/FSVariable/FSVariable.inf
@@ -57,6 +57,7 @@
 [Guids]

   gEfiHobListGuid

   gEfiFlashMapHobGuid

+  gEfiVariableGuid

 

 [Protocols]

   gEfiVariableArchProtocolGuid

diff --git a/DuetPkg/FSVariable/FileStorage.c b/DuetPkg/FSVariable/FileStorage.c
index df11ae1..0c25efa 100644
--- a/DuetPkg/FSVariable/FileStorage.c
+++ b/DuetPkg/FSVariable/FileStorage.c
@@ -247,7 +247,7 @@ FileStorageConstructor (
   ASSERT_EFI_ERROR (Status);

   ZeroMem (Dev, sizeof(VS_DEV));

 

-  Dev->Signature          = VARIABLE_STORE_SIGNATURE;

+  CopyGuid (&Dev->Signature, &gEfiVariableGuid);

   Dev->Size               = Size;

   VAR_DATA_PTR (Dev)      = (UINT8 *) (UINTN) NvStorageBase;

   VAR_FILE_VOLUMEID (Dev) = VolumeId;

diff --git a/DuetPkg/FSVariable/MemStorage.c b/DuetPkg/FSVariable/MemStorage.c
index cb8c864..02582d9 100644
--- a/DuetPkg/FSVariable/MemStorage.c
+++ b/DuetPkg/FSVariable/MemStorage.c
@@ -59,7 +59,7 @@ MemStorageConstructor (
 

   ZeroMem (Dev, sizeof(VS_DEV));

 

-  Dev->Signature   = VARIABLE_STORE_SIGNATURE;

+  CopyGuid (&Dev->Signature, &gEfiVariableGuid);

   Dev->Size        = Size;

 

   Dev->VarStore.Erase    = MemEraseStore;

diff --git a/DuetPkg/FSVariable/VariableStorage.h b/DuetPkg/FSVariable/VariableStorage.h
index 2c4a3f9..d5423bb 100644
--- a/DuetPkg/FSVariable/VariableStorage.h
+++ b/DuetPkg/FSVariable/VariableStorage.h
@@ -100,7 +100,8 @@ typedef struct _VS_DEV {
 

 } VS_DEV;

 

-#define DEV_FROM_THIS(a)        CR (a, VS_DEV, VarStore, VARIABLE_STORE_SIGNATURE)

+#define VS_DEV_SIGNATURE        SIGNATURE_32 ('$', 'V', 'S', 'D')

+#define DEV_FROM_THIS(a)        CR (a, VS_DEV, VarStore, VS_DEV_SIGNATURE)

 

 #define VAR_DATA_PTR(a)         ((a)->Info.Data)

 #define VAR_FILE_DEVICEPATH(a)  ((a)->Info.FileInfo.DevicePath)