Remove old modules after Remove old modules after renaming.

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

23 files changed, 0 insertions, 6674 deletions

diff --git a/MdeModulePkg/Universal/EmuVariableRuntimeDxe/EmuVariable.c b/MdeModulePkg/Universal/EmuVariableRuntimeDxe/EmuVariable.c
deleted file mode 100644
index f56cf04..0000000
--- a/MdeModulePkg/Universal/EmuVariableRuntimeDxe/EmuVariable.c
+++ /dev/null
@@ -1,849 +0,0 @@
-/*++

-

-Copyright (c) 2006 - 2007, Intel Corporation

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-Module Name:

-

-    EmuVariable.c

-

-Abstract:

-

-Revision History

-

---*/

-

-#include "Variable.h"

-

-//

-// Don't use module globals after the SetVirtualAddress map is signaled

-//

-ESAL_VARIABLE_GLOBAL  *mVariableModuleGlobal;

-

-//

-// This is a temperary function which will be removed

-// when EfiAcquireLock in UefiLib can handle the

-// the call in UEFI Runtimer driver in RT phase.

-//

-STATIC

-VOID

-AcquireLockOnlyAtBootTime (

-  IN EFI_LOCK  *Lock

-  )

-{

-  if (!EfiAtRuntime ()) {

-    EfiAcquireLock (Lock);

-  }

-}

-

-//

-// This is a temperary function which will be removed

-// when EfiAcquireLock in UefiLib can handle the

-// the call in UEFI Runtimer driver in RT phase.

-//

-STATIC

-VOID

-ReleaseLockOnlyAtBootTime (

-  IN EFI_LOCK  *Lock

-  )

-{

-  if (!EfiAtRuntime ()) {

-    EfiReleaseLock (Lock);

-  }

-}

-

-STATIC

-UINT8 *

-EFIAPI

-GetVariableDataPtr (

-  IN  VARIABLE_HEADER   *Variable

-  )

-/*++

-

-Routine Description:

-

-  This code gets the pointer to the variable data.

-

-Arguments:

-

-  Variable            Pointer to the Variable Header.

-

-Returns:

-

-  UINT8*              Pointer to Variable Data

-

---*/

-{

-  if (Variable->StartId != VARIABLE_DATA) {

-    return NULL;

-  }

-  //

-  // Be careful about pad size for alignment

-  //

-  return (UINT8 *) ((UINTN) GET_VARIABLE_NAME_PTR (Variable) + Variable->NameSize + GET_PAD_SIZE (Variable->NameSize));

-}

-

-STATIC

-VARIABLE_HEADER *

-EFIAPI

-GetNextVariablePtr (

-  IN  VARIABLE_HEADER   *Variable

-  )

-/*++

-

-Routine Description:

-

-  This code gets the pointer to the next variable header.

-

-Arguments:

-

-  Variable                  Pointer to the Variable Header.

-

-Returns:

-

-  VARIABLE_HEADER*      Pointer to next variable header.

-

---*/

-{

-  VARIABLE_HEADER *VarHeader;

-

-  if (Variable->StartId != VARIABLE_DATA) {

-    return NULL;

-  }

-  //

-  // Be careful about pad size for alignment

-  //

-  VarHeader = (VARIABLE_HEADER *) (GetVariableDataPtr (Variable) + Variable->DataSize + GET_PAD_SIZE (Variable->DataSize));

-

-  if (VarHeader->StartId != VARIABLE_DATA ||

-      (sizeof (VARIABLE_HEADER) + VarHeader->DataSize + VarHeader->NameSize) > MAX_VARIABLE_SIZE

-      ) {

-    return NULL;

-  }

-

-  return VarHeader;

-}

-

-STATIC

-VARIABLE_HEADER *

-EFIAPI

-GetEndPointer (

-  IN VARIABLE_STORE_HEADER       *VolHeader

-  )

-/*++

-

-Routine Description:

-

-  This code gets the pointer to the last variable memory pointer byte

-

-Arguments:

-

-  Variable                  Pointer to the Variable Header.

-

-Returns:

-

-  VARIABLE_HEADER*      Pointer to last unavailable Variable Header

-

---*/

-{

-  //

-  // The end of variable store

-  //

-  return (VARIABLE_HEADER *) ((UINTN) VolHeader + VolHeader->Size);

-}

-

-STATIC

-EFI_STATUS

-EFIAPI

-FindVariable (

-  IN  CHAR16                  *VariableName,

-  IN  EFI_GUID                *VendorGuid,

-  OUT VARIABLE_POINTER_TRACK  *PtrTrack,

-  IN  VARIABLE_GLOBAL         *Global

-  )

-/*++

-

-Routine Description:

-

-  This code finds variable in storage blocks (Volatile or Non-Volatile)

-

-Arguments:

-

-  VariableName                Name of the variable to be found

-  VendorGuid                  Vendor GUID to be found.

-  PtrTrack                    Variable Track Pointer structure that contains

-                              Variable Information.

-                              Contains the pointer of Variable header.

-  Global                      VARIABLE_GLOBAL pointer

-

-Returns:

-

-  EFI STATUS

-

---*/

-{

-  VARIABLE_HEADER       *Variable[2];

-  VARIABLE_STORE_HEADER *VariableStoreHeader[2];

-  UINTN                 Index;

-

-  //

-  // We aquire the lock at the entry of FindVariable as GetVariable, GetNextVariableName

-  // SetVariable all call FindVariable at entry point. Please move "Aquire Lock" to

-  // the correct places if this assumption does not hold TRUE anymore.

-  //

-  AcquireLockOnlyAtBootTime(&Global->VariableServicesLock);

-

-  //

-  // 0: Non-Volatile, 1: Volatile

-  //

-  VariableStoreHeader[0]  = (VARIABLE_STORE_HEADER *) ((UINTN) Global->NonVolatileVariableBase);

-  VariableStoreHeader[1]  = (VARIABLE_STORE_HEADER *) ((UINTN) Global->VolatileVariableBase);

-

-  //

-  // Start Pointers for the variable.

-  // Actual Data Pointer where data can be written.

-  //

-  Variable[0] = (VARIABLE_HEADER *) (VariableStoreHeader[0] + 1);

-  Variable[1] = (VARIABLE_HEADER *) (VariableStoreHeader[1] + 1);

-

-  if (VariableName[0] != 0 && VendorGuid == NULL) {

-    return EFI_INVALID_PARAMETER;

-  }

-  //

-  // Find the variable by walk through non-volatile and volatile variable store

-  //

-  for (Index = 0; Index < 2; Index++) {

-    PtrTrack->StartPtr  = (VARIABLE_HEADER *) (VariableStoreHeader[Index] + 1);

-    PtrTrack->EndPtr    = GetEndPointer (VariableStoreHeader[Index]);

-

-    while ((Variable[Index] != NULL) && (Variable[Index] <= GetEndPointer (VariableStoreHeader[Index]))) {

-      if (Variable[Index]->StartId == VARIABLE_DATA && Variable[Index]->State == VAR_ADDED) {

-        if (!(EfiAtRuntime () && !(Variable[Index]->Attributes & EFI_VARIABLE_RUNTIME_ACCESS))) {

-          if (VariableName[0] == 0) {

-            PtrTrack->CurrPtr   = Variable[Index];

-            PtrTrack->Volatile  = (BOOLEAN) Index;

-            return EFI_SUCCESS;

-          } else {

-            if (CompareGuid (VendorGuid, &Variable[Index]->VendorGuid)) {

-              if (!CompareMem (VariableName, GET_VARIABLE_NAME_PTR (Variable[Index]), Variable[Index]->NameSize)) {

-                PtrTrack->CurrPtr   = Variable[Index];

-                PtrTrack->Volatile  = (BOOLEAN) Index;

-                return EFI_SUCCESS;

-              }

-            }

-          }

-        }

-      }

-

-      Variable[Index] = GetNextVariablePtr (Variable[Index]);

-    }

-  }

-  PtrTrack->CurrPtr = NULL;

-  return EFI_NOT_FOUND;

-}

-

-EFI_STATUS

-EFIAPI

-GetVariable (

-  IN      CHAR16            *VariableName,

-  IN      EFI_GUID          * VendorGuid,

-  OUT     UINT32            *Attributes OPTIONAL,

-  IN OUT  UINTN             *DataSize,

-  OUT     VOID              *Data,

-  IN      VARIABLE_GLOBAL   * Global,

-  IN      UINT32            Instance

-  )

-/*++

-

-Routine Description:

-

-  This code finds variable in storage blocks (Volatile or Non-Volatile)

-

-Arguments:

-

-  VariableName                    Name of Variable to be found

-  VendorGuid                      Variable vendor GUID

-  Attributes OPTIONAL             Attribute value of the variable found

-  DataSize                        Size of Data found. If size is less than the

-                                  data, this value contains the required size.

-  Data                            Data pointer

-  Global                          Pointer to VARIABLE_GLOBAL structure

-  Instance                        Instance of the Firmware Volume.

-

-Returns:

-

-  EFI STATUS

-

---*/

-{

-  VARIABLE_POINTER_TRACK  Variable;

-  UINTN                   VarDataSize;

-  EFI_STATUS              Status;

-

-  if (VariableName == NULL || VendorGuid == NULL || DataSize == NULL) {

-    return EFI_INVALID_PARAMETER;

-  }

-  //

-  // Find existing variable

-  //

-  Status = FindVariable (VariableName, VendorGuid, &Variable, Global);

-

-  if (Variable.CurrPtr == NULL || EFI_ERROR (Status)) {

-    goto Done;

-  }

-  //

-  // Get data size

-  //

-  VarDataSize = Variable.CurrPtr->DataSize;

-  if (*DataSize >= VarDataSize) {

-    if (Data == NULL) {

-      Status = EFI_INVALID_PARAMETER;

-      goto Done;

-    }

-

-    CopyMem (Data, GetVariableDataPtr (Variable.CurrPtr), VarDataSize);

-    if (Attributes != NULL) {

-      *Attributes = Variable.CurrPtr->Attributes;

-    }

-

-    *DataSize = VarDataSize;

-    Status = EFI_SUCCESS;

-    goto Done;

-  } else {

-    *DataSize = VarDataSize;

-    Status = EFI_BUFFER_TOO_SMALL;

-    goto Done;

-  }

-

-Done:

-  ReleaseLockOnlyAtBootTime (&Global->VariableServicesLock);

-  return Status;

-}

-

-EFI_STATUS

-EFIAPI

-GetNextVariableName (

-  IN OUT  UINTN             *VariableNameSize,

-  IN OUT  CHAR16            *VariableName,

-  IN OUT  EFI_GUID          *VendorGuid,

-  IN      VARIABLE_GLOBAL   *Global,

-  IN      UINT32            Instance

-  )

-/*++

-

-Routine Description:

-

-  This code Finds the Next available variable

-

-Arguments:

-

-  VariableNameSize            Size of the variable

-  VariableName                Pointer to variable name

-  VendorGuid                  Variable Vendor Guid

-  Global                      VARIABLE_GLOBAL structure pointer.

-  Instance                    FV instance

-

-Returns:

-

-  EFI STATUS

-

---*/

-{

-  VARIABLE_POINTER_TRACK  Variable;

-  UINTN                   VarNameSize;

-  EFI_STATUS              Status;

-

-  if (VariableNameSize == NULL || VariableName == NULL || VendorGuid == NULL) {

-    return EFI_INVALID_PARAMETER;

-  }

-

-  Status = FindVariable (VariableName, VendorGuid, &Variable, Global);

-

-  if (Variable.CurrPtr == NULL || EFI_ERROR (Status)) {

-    goto Done;

-  }

-

-  while (TRUE) {

-    if (VariableName[0] != 0) {

-      //

-      // If variable name is not NULL, get next variable

-      //

-      Variable.CurrPtr = GetNextVariablePtr (Variable.CurrPtr);

-    }

-    //

-    // If both volatile and non-volatile variable store are parsed,

-    // return not found

-    //

-    if (Variable.CurrPtr >= Variable.EndPtr || Variable.CurrPtr == NULL) {

-      Variable.Volatile = (BOOLEAN) (Variable.Volatile ^ ((BOOLEAN) 0x1));

-      if (Variable.Volatile) {

-        Variable.StartPtr = (VARIABLE_HEADER *) ((UINTN) (Global->VolatileVariableBase + sizeof (VARIABLE_STORE_HEADER)));

-        Variable.EndPtr = (VARIABLE_HEADER *) GetEndPointer ((VARIABLE_STORE_HEADER *) ((UINTN) Global->VolatileVariableBase));

-      } else {

-        Status = EFI_NOT_FOUND;

-        goto Done;

-      }

-

-      Variable.CurrPtr = Variable.StartPtr;

-      if (Variable.CurrPtr->StartId != VARIABLE_DATA) {

-        continue;

-      }

-    }

-    //

-    // Variable is found

-    //

-    if (Variable.CurrPtr->StartId == VARIABLE_DATA && Variable.CurrPtr->State == VAR_ADDED) {

-      if (!(EfiAtRuntime () && !(Variable.CurrPtr->Attributes & EFI_VARIABLE_RUNTIME_ACCESS))) {

-        VarNameSize = Variable.CurrPtr->NameSize;

-        if (VarNameSize <= *VariableNameSize) {

-          CopyMem (

-            VariableName,

-            GET_VARIABLE_NAME_PTR (Variable.CurrPtr),

-            VarNameSize

-            );

-          CopyMem (

-            VendorGuid,

-            &Variable.CurrPtr->VendorGuid,

-            sizeof (EFI_GUID)

-            );

-          Status = EFI_SUCCESS;

-        } else {

-          Status = EFI_BUFFER_TOO_SMALL;

-        }

-

-        *VariableNameSize = VarNameSize;

-        goto Done;

-      }

-    }

-  }

-

-Done:

-  ReleaseLockOnlyAtBootTime (&Global->VariableServicesLock);

-  return Status;

-

-}

-

-EFI_STATUS

-EFIAPI

-SetVariable (

-  IN CHAR16                  *VariableName,

-  IN EFI_GUID                *VendorGuid,

-  IN UINT32                  Attributes,

-  IN UINTN                   DataSize,

-  IN VOID                    *Data,

-  IN VARIABLE_GLOBAL         *Global,

-  IN UINTN                   *VolatileOffset,

-  IN UINTN                   *NonVolatileOffset,

-  IN UINT32                  Instance

-  )

-/*++

-

-Routine Description:

-

-  This code sets variable in storage blocks (Volatile or Non-Volatile)

-

-Arguments:

-

-  VariableName                    Name of Variable to be found

-  VendorGuid                      Variable vendor GUID

-  Attributes                      Attribute value of the variable found

-  DataSize                        Size of Data found. If size is less than the

-                                  data, this value contains the required size.

-  Data                            Data pointer

-  Global                          Pointer to VARIABLE_GLOBAL structure

-  VolatileOffset                  The offset of last volatile variable

-  NonVolatileOffset               The offset of last non-volatile variable

-  Instance                        Instance of the Firmware Volume.

-

-Returns:

-

-  EFI STATUS

-

---*/

-{

-  VARIABLE_POINTER_TRACK  Variable;

-  EFI_STATUS              Status;

-  VARIABLE_HEADER         *NextVariable;

-  UINTN                   VarNameSize;

-  UINTN                   VarNameOffset;

-  UINTN                   VarDataOffset;

-  UINTN                   VarSize;

-

-  if (VariableName == NULL || VariableName[0] == 0 || VendorGuid == NULL) {

-    return EFI_INVALID_PARAMETER;

-  }

-

-  Status = FindVariable (VariableName, VendorGuid, &Variable, Global);

-

-  if (Status == EFI_INVALID_PARAMETER) {

-    goto Done;

-  } else if (!EFI_ERROR (Status) && Variable.Volatile && EfiAtRuntime()) {

-    //

-    // If EfiAtRuntime and the variable is Volatile and Runtime Access,

-    // the volatile is ReadOnly, and SetVariable should be aborted and

-    // return EFI_WRITE_PROTECTED.

-    //

-    Status = EFI_WRITE_PROTECTED;

-    goto Done;

-  } else if (sizeof (VARIABLE_HEADER) + (StrSize (VariableName) + DataSize) > MAX_VARIABLE_SIZE) {

-    //

-    //  The size of the VariableName, including the Unicode Null in bytes plus

-    //  the DataSize is limited to maximum size of MAX_VARIABLE_SIZE (1024) bytes.

-    //

-    Status = EFI_INVALID_PARAMETER;

-    goto Done;

-  } else if ((Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == EFI_VARIABLE_RUNTIME_ACCESS

-          ) {

-    //

-    //  Make sure if runtime bit is set, boot service bit is set also

-    //

-    Status = EFI_INVALID_PARAMETER;

-    goto Done;

-  } else if (EfiAtRuntime () && Attributes && !(Attributes & EFI_VARIABLE_RUNTIME_ACCESS)) {

-    //

-    // Runtime but Attribute is not Runtime

-    //

-    Status = EFI_INVALID_PARAMETER;

-    goto Done;

-  } else if (EfiAtRuntime () && Attributes && !(Attributes & EFI_VARIABLE_NON_VOLATILE)) {

-    //

-    // Cannot set volatile variable in Runtime

-    //

-    Status = EFI_INVALID_PARAMETER;

-    goto Done;

-  } else if (DataSize == 0 || (Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == 0) {

-    //

-    // Setting a data variable with no access, or zero DataSize attributes

-    // specified causes it to be deleted.

-    //

-    if (!EFI_ERROR (Status)) {

-      Variable.CurrPtr->State &= VAR_DELETED;

-      Status = EFI_SUCCESS;

-      goto Done;

-    }

-

-    Status = EFI_NOT_FOUND;

-    goto Done;

-  } else {

-    if (!EFI_ERROR (Status)) {

-      //

-      // If the variable is marked valid and the same data has been passed in

-      // then return to the caller immediately.

-      //

-      if (Variable.CurrPtr->DataSize == DataSize &&

-          !CompareMem (Data, GetVariableDataPtr (Variable.CurrPtr), DataSize)

-            ) {

-        Status = EFI_SUCCESS;

-        goto Done;

-      } else if (Variable.CurrPtr->State == VAR_ADDED) {

-        //

-        // Mark the old variable as in delete transition

-        //

-        Variable.CurrPtr->State &= VAR_IN_DELETED_TRANSITION;

-      }

-    }

-    //

-    // Create a new variable and copy the data.

-    //

-    VarNameOffset = sizeof (VARIABLE_HEADER);

-    VarNameSize   = StrSize (VariableName);

-    VarDataOffset = VarNameOffset + VarNameSize + GET_PAD_SIZE (VarNameSize);

-    VarSize       = VarDataOffset + DataSize + GET_PAD_SIZE (DataSize);

-

-    if (Attributes & EFI_VARIABLE_NON_VOLATILE) {

-      if ((UINT32) (VarSize +*NonVolatileOffset) >

-            ((VARIABLE_STORE_HEADER *) ((UINTN) (Global->NonVolatileVariableBase)))->Size

-            ) {

-        Status = EFI_OUT_OF_RESOURCES;

-        goto Done;

-      }

-

-      NextVariable        = (VARIABLE_HEADER *) (UINT8 *) (*NonVolatileOffset + (UINTN) Global->NonVolatileVariableBase);

-      *NonVolatileOffset  = *NonVolatileOffset + VarSize;

-    } else {

-      if (EfiAtRuntime ()) {

-        Status = EFI_INVALID_PARAMETER;

-        goto Done;

-      }

-

-      if ((UINT32) (VarSize +*VolatileOffset) >

-            ((VARIABLE_STORE_HEADER *) ((UINTN) (Global->VolatileVariableBase)))->Size

-            ) {

-        Status = EFI_OUT_OF_RESOURCES;

-        goto Done;

-      }

-

-      NextVariable    = (VARIABLE_HEADER *) (UINT8 *) (*VolatileOffset + (UINTN) Global->VolatileVariableBase);

-      *VolatileOffset = *VolatileOffset + VarSize;

-    }

-

-    NextVariable->StartId     = VARIABLE_DATA;

-    NextVariable->Attributes  = Attributes;

-    NextVariable->State       = VAR_ADDED;

-    NextVariable->Reserved    = 0;

-

-    //

-    // There will be pad bytes after Data, the NextVariable->NameSize and

-    // NextVariable->NameSize should not include pad size so that variable

-    // service can get actual size in GetVariable

-    //

-    NextVariable->NameSize  = (UINT32)VarNameSize;

-    NextVariable->DataSize  = (UINT32)DataSize;

-

-    CopyMem (&NextVariable->VendorGuid, VendorGuid, sizeof (EFI_GUID));

-    CopyMem (

-      (UINT8 *) ((UINTN) NextVariable + VarNameOffset),

-      VariableName,

-      VarNameSize

-      );

-    CopyMem (

-      (UINT8 *) ((UINTN) NextVariable + VarDataOffset),

-      Data,

-      DataSize

-      );

-

-    //

-    // Mark the old variable as deleted

-    //

-    if (!EFI_ERROR (Status)) {

-      Variable.CurrPtr->State &= VAR_DELETED;

-    }

-  }

-

-  Status = EFI_SUCCESS;

-Done:

-  ReleaseLockOnlyAtBootTime (&Global->VariableServicesLock);

-  return Status;

-}

-

-EFI_STATUS

-EFIAPI

-QueryVariableInfo (

-  IN  UINT32                 Attributes,

-  OUT UINT64                 *MaximumVariableStorageSize,

-  OUT UINT64                 *RemainingVariableStorageSize,

-  OUT UINT64                 *MaximumVariableSize,

-  IN  VARIABLE_GLOBAL        *Global,

-  IN  UINT32                 Instance

-  )

-/*++

-

-Routine Description:

-

-  This code returns information about the EFI variables.

-

-Arguments:

-

-  Attributes                      Attributes bitmask to specify the type of variables

-                                  on which to return information.

-  MaximumVariableStorageSize      Pointer to the maximum size of the storage space available

-                                  for the EFI variables associated with the attributes specified.

-  RemainingVariableStorageSize    Pointer to the remaining size of the storage space available

-                                  for the EFI variables associated with the attributes specified.

-  MaximumVariableSize             Pointer to the maximum size of the individual EFI variables

-                                  associated with the attributes specified.

-  Global                          Pointer to VARIABLE_GLOBAL structure.

-  Instance                        Instance of the Firmware Volume.

-

-Returns:

-

-  EFI STATUS

-  EFI_INVALID_PARAMETER           - An invalid combination of attribute bits was supplied.

-  EFI_SUCCESS                     - Query successfully.

-  EFI_UNSUPPORTED                 - The attribute is not supported on this platform.

-

---*/

-{

-  VARIABLE_HEADER        *Variable;

-  VARIABLE_HEADER        *NextVariable;

-  UINT64                 VariableSize;

-  VARIABLE_STORE_HEADER  *VariableStoreHeader;

-

-  if(MaximumVariableStorageSize == NULL || RemainingVariableStorageSize == NULL || MaximumVariableSize == NULL) {

-    return EFI_INVALID_PARAMETER;

-  }

-

-  if((Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS)) == 0) {

-    //

-    // Make sure the Attributes combination is supported by the platform.

-    //

-    return EFI_UNSUPPORTED;

-  } else if ((Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == EFI_VARIABLE_RUNTIME_ACCESS) {

-    //

-    // Make sure if runtime bit is set, boot service bit is set also.

-    //

-    return EFI_INVALID_PARAMETER;

-  } else if (EfiAtRuntime () && !(Attributes & EFI_VARIABLE_RUNTIME_ACCESS)) {

-    //

-    //   Make sure RT Attribute is set if we are in Runtime phase.

-    //

-    return EFI_INVALID_PARAMETER;

-  } else if (EfiAtRuntime () && Attributes && !(Attributes & EFI_VARIABLE_NON_VOLATILE)) {

-    //

-    // Cannot Query volatile variable in Runtime

-    //

-    return EFI_INVALID_PARAMETER;

-  }

-

-  AcquireLockOnlyAtBootTime(&Global->VariableServicesLock);

-

-  if((Attributes & EFI_VARIABLE_NON_VOLATILE) == 0) {

-    //

-    // Query is Volatile related.

-    //

-    VariableStoreHeader = (VARIABLE_STORE_HEADER *) ((UINTN) Global->VolatileVariableBase);

-  } else {

-    //

-    // Query is Non-Volatile related.

-    //

-    VariableStoreHeader = (VARIABLE_STORE_HEADER *) ((UINTN) Global->NonVolatileVariableBase);

-  }

-

-  //

-  // Now let's fill *MaximumVariableStorageSize *RemainingVariableStorageSize

-  // with the storage size (excluding the storage header size)

-  //

-  *MaximumVariableStorageSize   = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER);

-  *RemainingVariableStorageSize = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER);

-

-  //

-  // Let *MaximumVariableSize be MAX_VARIABLE_SIZE

-  //

-  *MaximumVariableSize = MAX_VARIABLE_SIZE;

-

-  //

-  // Point to the starting address of the variables.

-  //

-  Variable = (VARIABLE_HEADER *) (VariableStoreHeader + 1);

-

-  //

-  // Now walk through the related variable store.

-  //

-  while (Variable < GetEndPointer (VariableStoreHeader)) {

-    if (Variable->StartId != VARIABLE_DATA) {

-      break;

-    }

-

-    NextVariable = (VARIABLE_HEADER *) (GetVariableDataPtr (Variable) + Variable->DataSize + GET_PAD_SIZE (Variable->DataSize));

-    VariableSize = (UINT64) (UINTN) NextVariable - (UINT64) (UINTN) Variable;

-

-    if (Variable->State == VAR_ADDED) {

-      *RemainingVariableStorageSize -= VariableSize;

-    }

-

-    //

-    // Go to the next one.

-    //

-    Variable = NextVariable;

-  }

-

-  ReleaseLockOnlyAtBootTime (&Global->VariableServicesLock);

-  return EFI_SUCCESS;

-}

-

-STATIC

-EFI_STATUS

-EFIAPI

-InitializeVariableStore (

-  OUT EFI_PHYSICAL_ADDRESS  *VariableBase,

-  OUT UINTN                 *LastVariableOffset

-  )

-/*++

-

-Routine Description:

-  This function initializes variable store

-

-Arguments:

-

-Returns:

-

---*/

-{

-  VARIABLE_STORE_HEADER *VariableStore;

-

-  //

-  // Allocate memory for volatile variable store

-  //

-  VariableStore = (VARIABLE_STORE_HEADER *) AllocateRuntimePool (

-                                              VARIABLE_STORE_SIZE

-                                              );

-  if (NULL == VariableStore) {

-    return EFI_OUT_OF_RESOURCES;

-  }

-

-  SetMem (VariableStore, VARIABLE_STORE_SIZE, 0xff);

-

-  //

-  // Variable Specific Data

-  //

-  *VariableBase             = (EFI_PHYSICAL_ADDRESS) (UINTN) VariableStore;

-  *LastVariableOffset       = sizeof (VARIABLE_STORE_HEADER);

-

-  VariableStore->Signature  = VARIABLE_STORE_SIGNATURE;

-  VariableStore->Size       = VARIABLE_STORE_SIZE;

-  VariableStore->Format     = VARIABLE_STORE_FORMATTED;

-  VariableStore->State      = VARIABLE_STORE_HEALTHY;

-  VariableStore->Reserved   = 0;

-  VariableStore->Reserved1  = 0;

-

-  return EFI_SUCCESS;

-}

-

-EFI_STATUS

-EFIAPI

-VariableCommonInitialize (

-  IN EFI_HANDLE         ImageHandle,

-  IN EFI_SYSTEM_TABLE   *SystemTable

-  )

-/*++

-

-Routine Description:

-  This function does common initialization for variable services

-

-Arguments:

-

-Returns:

-

---*/

-{

-  EFI_STATUS  Status;

-

-  //

-  // Allocate memory for mVariableModuleGlobal

-  //

-  mVariableModuleGlobal = (ESAL_VARIABLE_GLOBAL *) AllocateRuntimePool (

-                                                    sizeof (ESAL_VARIABLE_GLOBAL)

-                                                   );

-  if (NULL == mVariableModuleGlobal) {

-    return EFI_OUT_OF_RESOURCES;

-  }

-

-  EfiInitializeLock(&mVariableModuleGlobal->VariableGlobal[Physical].VariableServicesLock, TPL_NOTIFY);

-

-  //

-  // Intialize volatile variable store

-  //

-  Status = InitializeVariableStore (

-            &mVariableModuleGlobal->VariableGlobal[Physical].VolatileVariableBase,

-            &mVariableModuleGlobal->VolatileLastVariableOffset

-            );

-

-  if (EFI_ERROR (Status)) {

-    return Status;

-  }

-  //

-  // Intialize non volatile variable store

-  //

-  Status = InitializeVariableStore (

-            &mVariableModuleGlobal->VariableGlobal[Physical].NonVolatileVariableBase,

-            &mVariableModuleGlobal->NonVolatileLastVariableOffset

-            );

-

-  return Status;

-}

diff --git a/MdeModulePkg/Universal/EmuVariableRuntimeDxe/EmuVariable.msa b/MdeModulePkg/Universal/EmuVariableRuntimeDxe/EmuVariable.msa
deleted file mode 100644
index 6e769aa..0000000
--- a/MdeModulePkg/Universal/EmuVariableRuntimeDxe/EmuVariable.msa
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-  <MsaHeader>

-    <ModuleName>EmuVariable</ModuleName>

-    <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>

-    <GuidValue>CBD2E4D5-7068-4FF5-B866-9822B4AD8D61</GuidValue>

-    <Version>1.0</Version>

-    <Abstract>Emulation Variable for EFI_RUNTIME_SERVICES.</Abstract>

-    <Description>This module provides three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName</Description>

-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>

-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

-  </MsaHeader>

-  <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 EBC</SupportedArchitectures>

-    <BinaryModule>false</BinaryModule>

-    <OutputFileBasename>EmuVariable</OutputFileBasename>

-  </ModuleDefinitions>

-  <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseMemoryLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>MemoryAllocationLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>DebugLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiRuntimeLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiDriverEntryPoint</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiBootServicesTableLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-  </LibraryClassDefinitions>

-  <SourceFiles>

-    <Filename>Variable.h</Filename>

-    <Filename>EmuVariable.c</Filename>

-    <Filename>EmuVariable.dxs</Filename>

-    <Filename>InitVariable.c</Filename>

-  </SourceFiles>

-  <PackageDependencies>

-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

-  </PackageDependencies>

-  <Protocols>

-    <Protocol Usage="ALWAYS_PRODUCED" SupArchList="IA32 X64">

-      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_PRODUCED" SupArchList="IA32 X64">

-      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>

-    </Protocol>

-  </Protocols>

-  <Externs>

-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

-    <Extern>

-      <ModuleEntryPoint>VariableServiceInitialize</ModuleEntryPoint>

-    </Extern>

-  </Externs>

-</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/MdeModulePkg/Universal/EmuVariableRuntimeDxe/EmuVariableRuntimeDxe.inf b/MdeModulePkg/Universal/EmuVariableRuntimeDxe/EmuVariableRuntimeDxe.inf
deleted file mode 100644
index acd3b15..0000000
--- a/MdeModulePkg/Universal/EmuVariableRuntimeDxe/EmuVariableRuntimeDxe.inf
+++ /dev/null
@@ -1,106 +0,0 @@
-#/** @file

-# Emulation Variable for EFI_RUNTIME_SERVICES.

-#

-# This module provides three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName

-# Copyright (c) 2006 - 2007, Intel Corporation

-#

-#  All rights reserved. This program and the accompanying materials

-#  are licensed and made available under the terms and conditions of the BSD License

-#  which accompanies this distribution. The full text of the license may be found at

-#  http://opensource.org/licenses/bsd-license.php

-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-#

-#

-#**/

-

-################################################################################

-#

-# Defines Section - statements that will be processed to create a Makefile.

-#

-################################################################################

-[Defines]

-  INF_VERSION                    = 0x00010005

-  BASE_NAME                      = EmuVariableRuntimeDxe

-  FILE_GUID                      = CBD2E4D5-7068-4FF5-B866-9822B4AD8D61

-  MODULE_TYPE                    = DXE_RUNTIME_DRIVER

-  VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

-  EFI_SPECIFICATION_VERSION      = 0x00020000

-

-  ENTRY_POINT                    = VariableServiceInitialize

-

-#

-# The following information is for reference only and not required by the build tools.

-#

-#  VALID_ARCHITECTURES           = IA32 X64 EBC

-#

-

-################################################################################

-#

-# Sources Section - list of files that are required for the build to succeed.

-#

-################################################################################

-

-[Sources.common]

-  InitVariable.c

-  EmuVariable.c

-  Variable.h

-

-

-################################################################################

-#

-# Package Dependency Section - list of Package files that are required for

-#                              this module.

-#

-################################################################################

-

-[Packages]

-  MdePkg/MdePkg.dec

-  MdeModulePkg/MdeModulePkg.dec

-

-

-################################################################################

-#

-# Library Class Section - list of Library Classes that are required for

-#                         this module.

-#

-################################################################################

-

-[LibraryClasses]

-  BaseLib

-  UefiLib

-  UefiBootServicesTableLib

-  UefiDriverEntryPoint

-  UefiRuntimeLib

-  DebugLib

-  MemoryAllocationLib

-  BaseMemoryLib

-

-

-################################################################################

-#

-# Protocol C Name Section - list of Protocol and Protocol Notify C Names

-#                           that this module uses or produces.

-#

-################################################################################

-

-[Protocols.IA32]

-  gEfiVariableArchProtocolGuid                  # PROTOCOL ALWAYS_PRODUCED

-  gEfiVariableWriteArchProtocolGuid             # PROTOCOL ALWAYS_PRODUCED

-

-[Protocols.X64]

-  gEfiVariableArchProtocolGuid                  # PROTOCOL ALWAYS_PRODUCED

-  gEfiVariableWriteArchProtocolGuid             # PROTOCOL ALWAYS_PRODUCED

-

-

-################################################################################

-#

-# Dependency Expression Section - list of Dependency expressions that are required for

-#                              this module.

-#

-################################################################################

-

-[Depex]

-  TRUE

-

diff --git a/MdeModulePkg/Universal/EmuVariableRuntimeDxe/InitVariable.c b/MdeModulePkg/Universal/EmuVariableRuntimeDxe/InitVariable.c
deleted file mode 100644
index efff41c..0000000
--- a/MdeModulePkg/Universal/EmuVariableRuntimeDxe/InitVariable.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*++

-

-Copyright (c) 2006 - 2007, Intel Corporation

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-Module Name:

-

-  InitVariable.c

-

-Abstract:

-

-Revision History

-

---*/

-

-#include "Variable.h"

-

-//

-// Don't use module globals after the SetVirtualAddress map is signaled

-//

-extern ESAL_VARIABLE_GLOBAL *mVariableModuleGlobal;

-

-EFI_STATUS

-EFIAPI

-RuntimeServiceGetVariable (

-  IN CHAR16        *VariableName,

-  IN EFI_GUID      * VendorGuid,

-  OUT UINT32       *Attributes OPTIONAL,

-  IN OUT UINTN     *DataSize,

-  OUT VOID         *Data

-  )

-/*++

-

-Routine Description:

-

-Arguments:

-

-Returns:

-

---*/

-{

-  return GetVariable (

-          VariableName,

-          VendorGuid,

-          Attributes OPTIONAL,

-          DataSize,

-          Data,

-          &mVariableModuleGlobal->VariableGlobal[Physical],

-          mVariableModuleGlobal->FvbInstance

-          );

-}

-

-EFI_STATUS

-EFIAPI

-RuntimeServiceGetNextVariableName (

-  IN OUT UINTN     *VariableNameSize,

-  IN OUT CHAR16    *VariableName,

-  IN OUT EFI_GUID  *VendorGuid

-  )

-/*++

-

-Routine Description:

-

-Arguments:

-

-Returns:

-

---*/

-{

-  return GetNextVariableName (

-          VariableNameSize,

-          VariableName,

-          VendorGuid,

-          &mVariableModuleGlobal->VariableGlobal[Physical],

-          mVariableModuleGlobal->FvbInstance

-          );

-}

-

-EFI_STATUS

-EFIAPI

-RuntimeServiceSetVariable (

-  IN CHAR16        *VariableName,

-  IN EFI_GUID      *VendorGuid,

-  IN UINT32        Attributes,

-  IN UINTN         DataSize,

-  IN VOID          *Data

-  )

-/*++

-

-Routine Description:

-

-Arguments:

-

-Returns:

-

---*/

-{

-  return SetVariable (

-          VariableName,

-          VendorGuid,

-          Attributes,

-          DataSize,

-          Data,

-          &mVariableModuleGlobal->VariableGlobal[Physical],

-          &mVariableModuleGlobal->VolatileLastVariableOffset,

-          &mVariableModuleGlobal->NonVolatileLastVariableOffset,

-          mVariableModuleGlobal->FvbInstance

-          );

-}

-

-EFI_STATUS

-EFIAPI

-RuntimeServiceQueryVariableInfo (

-  IN  UINT32                 Attributes,

-  OUT UINT64                 *MaximumVariableStorageSize,

-  OUT UINT64                 *RemainingVariableStorageSize,

-  OUT UINT64                 *MaximumVariableSize

-  )

-/*++

-

-Routine Description:

-

-Arguments:

-

-Returns:

-

---*/

-{

-  return QueryVariableInfo (

-          Attributes,

-          MaximumVariableStorageSize,

-          RemainingVariableStorageSize,

-          MaximumVariableSize,

-          &mVariableModuleGlobal->VariableGlobal[Physical],

-          mVariableModuleGlobal->FvbInstance

-          );

-}

-

-VOID

-EFIAPI

-VariableClassAddressChangeEvent (

-  IN EFI_EVENT        Event,

-  IN VOID             *Context

-  )

-/*++

-

-Routine Description:

-

-Arguments:

-

-Returns:

-

---*/

-{

-  EfiConvertPointer (

-    0x0,

-    (VOID **) &mVariableModuleGlobal->VariableGlobal[Physical].NonVolatileVariableBase

-    );

-  EfiConvertPointer (

-    0x0,

-    (VOID **) &mVariableModuleGlobal->VariableGlobal[Physical].VolatileVariableBase

-    );

-  EfiConvertPointer (0x0, (VOID **) &mVariableModuleGlobal);

-}

-

-EFI_STATUS

-EFIAPI

-VariableServiceInitialize (

-  IN EFI_HANDLE         ImageHandle,

-  IN EFI_SYSTEM_TABLE   *SystemTable

-  )

-/*++

-

-Routine Description:

-

-Arguments:

-

-Returns:

-

---*/

-{

-  EFI_HANDLE  NewHandle;

-  EFI_STATUS  Status;

-

-  Status = VariableCommonInitialize (ImageHandle, SystemTable);

-  ASSERT_EFI_ERROR (Status);

-

-  SystemTable->RuntimeServices->GetVariable         = RuntimeServiceGetVariable;

-  SystemTable->RuntimeServices->GetNextVariableName = RuntimeServiceGetNextVariableName;

-  SystemTable->RuntimeServices->SetVariable         = RuntimeServiceSetVariable;

-  SystemTable->RuntimeServices->QueryVariableInfo   = RuntimeServiceQueryVariableInfo;

-

-  //

-  // Now install the Variable Runtime Architectural Protocol on a new handle

-  //

-  NewHandle = NULL;

-  Status = gBS->InstallMultipleProtocolInterfaces (

-                  &NewHandle,

-                  &gEfiVariableArchProtocolGuid,

-                  NULL,

-                  &gEfiVariableWriteArchProtocolGuid,

-                  NULL,

-                  NULL

-                  );

-  ASSERT_EFI_ERROR (Status);

-

-  return EFI_SUCCESS;

-}

diff --git a/MdeModulePkg/Universal/EmuVariableRuntimeDxe/Variable.h b/MdeModulePkg/Universal/EmuVariableRuntimeDxe/Variable.h
deleted file mode 100644
index 1e445c5..0000000
--- a/MdeModulePkg/Universal/EmuVariableRuntimeDxe/Variable.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*++

-

-Copyright (c) 2006 - 2007, Intel Corporation

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-Module Name:

-

-  Variable.h

-

-Abstract:

-

---*/

-

-#ifndef _VARIABLE_H

-#define _VARIABLE_H

-

-//

-// Statements that include other header files

-//

-//

-// The package level header files this module uses

-//

-#include <PiDxe.h>

-//

-// The protocols, PPI and GUID defintions for this module

-//

-#include <Protocol/VariableWrite.h>

-#include <Protocol/Variable.h>

-//

-// The Library classes this module consumes

-//

-#include <Library/BaseMemoryLib.h>

-#include <Library/MemoryAllocationLib.h>

-#include <Library/DebugLib.h>

-#include <Library/UefiRuntimeLib.h>

-#include <Library/UefiDriverEntryPoint.h>

-#include <Library/UefiBootServicesTableLib.h>

-#include <Library/UefiLib.h>

-#include <Library/BaseLib.h>

-

-//

-// BugBug: We need relcate the head file.

-//

-#include <Common/Variable.h>

-

-#define VARIABLE_STORE_SIZE (64 * 1024)

-#define SCRATCH_SIZE        (4 * 1024)

-

-//

-// Define GET_PAD_SIZE to optimize compiler

-//

-#if ((ALIGNMENT == 0) || (ALIGNMENT == 1))

-#define GET_PAD_SIZE(a) (0)

-#else

-#define GET_PAD_SIZE(a) (((~a) + 1) & (ALIGNMENT - 1))

-#endif

-

-#define GET_VARIABLE_NAME_PTR(a)  (CHAR16 *) ((UINTN) (a) + sizeof (VARIABLE_HEADER))

-

-typedef enum {

-  Physical,

-  Virtual

-} VARIABLE_POINTER_TYPE;

-

-typedef struct {

-  VARIABLE_HEADER *CurrPtr;

-  VARIABLE_HEADER *EndPtr;

-  VARIABLE_HEADER *StartPtr;

-  BOOLEAN         Volatile;

-} VARIABLE_POINTER_TRACK;

-

-typedef struct {

-  EFI_PHYSICAL_ADDRESS  VolatileVariableBase;

-  EFI_PHYSICAL_ADDRESS  NonVolatileVariableBase;

-  EFI_LOCK              VariableServicesLock;

-} VARIABLE_GLOBAL;

-

-typedef struct {

-  VARIABLE_GLOBAL VariableGlobal[2];

-  UINTN           VolatileLastVariableOffset;

-  UINTN           NonVolatileLastVariableOffset;

-  UINT32          FvbInstance;

-} ESAL_VARIABLE_GLOBAL;

-

-extern ESAL_VARIABLE_GLOBAL *mVariableModuleGlobal;

-

-//

-// Functions

-//

-EFI_STATUS

-EFIAPI

-VariableCommonInitialize (

-  IN EFI_HANDLE         ImageHandle,

-  IN EFI_SYSTEM_TABLE   *SystemTable

-  )

-;

-

-EFI_STATUS

-EFIAPI

-VariableServiceInitialize (

-  IN EFI_HANDLE         ImageHandle,

-  IN EFI_SYSTEM_TABLE   *SystemTable

-  )

-;

-

-VOID

-EFIAPI

-VariableClassAddressChangeEvent (

-  IN EFI_EVENT        Event,

-  IN VOID             *Context

-  )

-;

-

-EFI_STATUS

-EFIAPI

-GetVariable (

-  IN      CHAR16            *VariableName,

-  IN      EFI_GUID          * VendorGuid,

-  OUT     UINT32            *Attributes OPTIONAL,

-  IN OUT  UINTN             *DataSize,

-  OUT     VOID              *Data,

-  IN      VARIABLE_GLOBAL   * Global,

-  IN      UINT32            Instance

-  )

-;

-

-EFI_STATUS

-EFIAPI

-GetNextVariableName (

-  IN OUT  UINTN             *VariableNameSize,

-  IN OUT  CHAR16            *VariableName,

-  IN OUT  EFI_GUID          *VendorGuid,

-  IN      VARIABLE_GLOBAL   *Global,

-  IN      UINT32            Instance

-  )

-;

-

-EFI_STATUS

-EFIAPI

-SetVariable (

-  IN CHAR16                  *VariableName,

-  IN EFI_GUID                *VendorGuid,

-  IN UINT32                  Attributes,

-  IN UINTN                   DataSize,

-  IN VOID                    *Data,

-  IN VARIABLE_GLOBAL         *Global,

-  IN UINTN                   *VolatileOffset,

-  IN UINTN                   *NonVolatileOffset,

-  IN UINT32                  Instance

-  )

-;

-

-EFI_STATUS

-EFIAPI

-QueryVariableInfo (

-  IN  UINT32                 Attributes,

-  OUT UINT64                 *MaximumVariableStorageSize,

-  OUT UINT64                 *RemainingVariableStorageSize,

-  OUT UINT64                 *MaximumVariableSize,

-  IN  VARIABLE_GLOBAL        *Global,

-  IN  UINT32                 Instance

-  )

-;

-

-#endif

diff --git a/MdeModulePkg/Universal/PcatCompatible/RealTimeClockRuntimeDxe/Ia32/Ia32PcRtc.c b/MdeModulePkg/Universal/PcatCompatible/RealTimeClockRuntimeDxe/Ia32/Ia32PcRtc.c
deleted file mode 100644
index f0b1640..0000000
--- a/MdeModulePkg/Universal/PcatCompatible/RealTimeClockRuntimeDxe/Ia32/Ia32PcRtc.c
+++ /dev/null
@@ -1,173 +0,0 @@
-/*++

-

-Copyright (c) 2006, Intel Corporation. All rights reserved. <BR> 

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

-

-

-

-Module Name:

-

- Ia32PcRtc.c

-

-Abstract:

-

---*/

-

-#include "PcRtc.h"

-

-static PC_RTC_MODULE_GLOBALS  mModuleGlobal;

-

-EFI_STATUS

-EFIAPI

-PcRtcEfiGetTime (

-  OUT EFI_TIME                *Time,

-  OUT  EFI_TIME_CAPABILITIES  *Capabilities

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Time          - GC_TODO: add argument description

-  Capabilities  - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-{

-  return PcRtcGetTime (Time, Capabilities, &mModuleGlobal);

-}

-

-EFI_STATUS

-EFIAPI

-PcRtcEfiSetTime (

-  IN EFI_TIME                *Time

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Time  - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-{

-  return PcRtcSetTime (Time, &mModuleGlobal);

-}

-

-EFI_STATUS

-EFIAPI

-PcRtcEfiGetWakeupTime (

-  OUT BOOLEAN     *Enabled,

-  OUT BOOLEAN     *Pending,

-  OUT EFI_TIME    *Time

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Enabled - GC_TODO: add argument description

-  Pending - GC_TODO: add argument description

-  Time    - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-{

-  return PcRtcGetWakeupTime (Enabled, Pending, Time, &mModuleGlobal);

-}

-

-EFI_STATUS

-EFIAPI

-PcRtcEfiSetWakeupTime (

-  IN BOOLEAN      Enabled,

-  OUT EFI_TIME    *Time

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Enabled - GC_TODO: add argument description

-  Time    - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-{

-  return PcRtcSetWakeupTime (Enabled, Time, &mModuleGlobal);

-}

-

-EFI_STATUS

-EFIAPI

-InitializePcRtc (

-  IN EFI_HANDLE                            ImageHandle,

-  IN EFI_SYSTEM_TABLE                      *SystemTable

-  )

-/*++

-

-Routine Description:

-

-  Arguments:

-

-  

-

-Returns: 

---*/

-// GC_TODO:    ImageHandle - add argument and description to function comment

-// GC_TODO:    SystemTable - add argument and description to function comment

-{

-  EFI_STATUS  Status;

-  EFI_HANDLE  NewHandle;

-

-  EfiInitializeLock (&mModuleGlobal.RtcLock, TPL_HIGH_LEVEL);

-

-  Status = PcRtcInit (&mModuleGlobal);

-  if (EFI_ERROR (Status)) {

-    return Status;

-  }

-

-  gRT->GetTime       = PcRtcEfiGetTime;

-  gRT->SetTime       = PcRtcEfiSetTime;

-  gRT->GetWakeupTime = PcRtcEfiGetWakeupTime;

-  gRT->SetWakeupTime = PcRtcEfiSetWakeupTime;

-

-  NewHandle = NULL;

-  Status = gBS->InstallMultipleProtocolInterfaces (

-                  &NewHandle,

-                  &gEfiRealTimeClockArchProtocolGuid,

-                  NULL,

-                  NULL

-                  );

-

-  return Status;

-}

diff --git a/MdeModulePkg/Universal/PcatCompatible/RealTimeClockRuntimeDxe/PcRtc.c b/MdeModulePkg/Universal/PcatCompatible/RealTimeClockRuntimeDxe/PcRtc.c
deleted file mode 100644
index a58aee5..0000000
--- a/MdeModulePkg/Universal/PcatCompatible/RealTimeClockRuntimeDxe/PcRtc.c
+++ /dev/null
@@ -1,1071 +0,0 @@
-/*++

-

-Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved. <BR>

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

-

-

-

-Module Name:

-

-  PcRtc.c

-

-Abstract:

-

-  RTC Architectural Protocol GUID as defined in DxeCis 0.96

-

---*/

-

-#include "PcRtc.h"

-

-STATIC

-INTN

-CompareHMS (

-  IN EFI_TIME   *From,

-  IN EFI_TIME   *To

-  );

-

-STATIC

-BOOLEAN

-IsWithinOneDay (

-  IN EFI_TIME   *From,

-  IN EFI_TIME   *To

-  );

-

-STATIC

-UINT8

-RtcRead (

-  IN  UINT8 Address

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Address - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-{

-  IoWrite8 (PCAT_RTC_ADDRESS_REGISTER, (UINT8) (Address | (UINT8) (IoRead8 (PCAT_RTC_ADDRESS_REGISTER) & 0x80)));

-  return IoRead8 (PCAT_RTC_DATA_REGISTER);

-}

-

-STATIC

-VOID

-RtcWrite (

-  IN  UINT8   Address,

-  IN  UINT8   Data

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Address - GC_TODO: add argument description

-  Data    - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-{

-  IoWrite8 (PCAT_RTC_ADDRESS_REGISTER, (UINT8) (Address | (UINT8) (IoRead8 (PCAT_RTC_ADDRESS_REGISTER) & 0x80)));

-  IoWrite8 (PCAT_RTC_DATA_REGISTER, Data);

-}

-

-EFI_STATUS

-PcRtcInit (

-  IN PC_RTC_MODULE_GLOBALS  *Global

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Global  - GC_TODO: add argument description

-

-Returns:

-

-  EFI_DEVICE_ERROR - GC_TODO: Add description for return value

-  EFI_SUCCESS - GC_TODO: Add description for return value

-

---*/

-{

-  EFI_STATUS      Status;

-  RTC_REGISTER_A  RegisterA;

-  RTC_REGISTER_B  RegisterB;

-  RTC_REGISTER_D  RegisterD;

-  UINT8           Century;

-  EFI_TIME        Time;

-

-  //

-  // Acquire RTC Lock to make access to RTC atomic

-  //

-  //BugBug: the EfiAtRuntime should be encapsulated in EfiAcquireLock or

-  //        provide a new instance for EfiAcquireLock, say, RtEfiAcquireLock

-  if (!EfiAtRuntime ()) {

-  EfiAcquireLock (&Global->RtcLock);

-  }

-  //

-  // Initialize RTC Register

-  //

-  // Make sure Division Chain is properly configured,

-  // or RTC clock won't "tick" -- time won't increment

-  //

-  RegisterA.Data = RTC_INIT_REGISTER_A;

-  RtcWrite (RTC_ADDRESS_REGISTER_A, RegisterA.Data);

-

-  //

-  // Read Register B

-  //

-  RegisterB.Data = RtcRead (RTC_ADDRESS_REGISTER_B);

-

-  //

-  // Clear RTC flag register

-  //

-  RtcRead (RTC_ADDRESS_REGISTER_C);

-

-  //

-  // Clear RTC register D

-  //

-  RegisterD.Data = RTC_INIT_REGISTER_D;

-  RtcWrite (RTC_ADDRESS_REGISTER_D, RegisterD.Data);

-

-  //

-  // Wait for up to 0.1 seconds for the RTC to be updated

-  //

-  Status = RtcWaitToUpdate (100000);

-  if (EFI_ERROR (Status)) {

-  	//BugBug: the EfiAtRuntime should be encapsulated in EfiAcquireLock or

-    //        provide a new instance for EfiAcquireLock, say, RtEfiAcquireLock

-    if (!EfiAtRuntime ()) {

-    EfiReleaseLock (&Global->RtcLock);

-    }

-    return EFI_DEVICE_ERROR;

-  }

-  //

-  // Get the Time/Date/Daylight Savings values.

-  //

-  Time.Second = RtcRead (RTC_ADDRESS_SECONDS);

-  Time.Minute = RtcRead (RTC_ADDRESS_MINUTES);

-  Time.Hour   = RtcRead (RTC_ADDRESS_HOURS);

-  Time.Day    = RtcRead (RTC_ADDRESS_DAY_OF_THE_MONTH);

-  Time.Month  = RtcRead (RTC_ADDRESS_MONTH);

-  Time.Year   = RtcRead (RTC_ADDRESS_YEAR);

-

-  ConvertRtcTimeToEfiTime (&Time, RegisterB);

-

-  if (RtcTestCenturyRegister () == EFI_SUCCESS) {

-    Century = BcdToDecimal8 ((UINT8) (RtcRead (RTC_ADDRESS_CENTURY) & 0x7f));

-  } else {

-    Century = BcdToDecimal8 (RtcRead (RTC_ADDRESS_CENTURY));

-  }

-

-  Time.Year = (UINT16) (Century * 100 + Time.Year);

-

-  //

-  // Set RTC configuration after get original time

-  //

-  RtcWrite (RTC_ADDRESS_REGISTER_B, RTC_INIT_REGISTER_B);

-

-  //

-  // Release RTC Lock.

-  //

-  //BugBug: the EfiAtRuntime should be encapsulated in EfiAcquireLock or

-  //        provide a new instance for EfiAcquireLock, say, RtEfiAcquireLock

-  if (!EfiAtRuntime ()) {

-  EfiReleaseLock (&Global->RtcLock);

-  }

-  //

-  // Validate time fields

-  //

-  Status = RtcTimeFieldsValid (&Time);

-  if (EFI_ERROR (Status)) {

-    Time.Second = RTC_INIT_SECOND;

-    Time.Minute = RTC_INIT_MINUTE;

-    Time.Hour   = RTC_INIT_HOUR;

-    Time.Day    = RTC_INIT_DAY;

-    Time.Month  = RTC_INIT_MONTH;

-    Time.Year   = RTC_INIT_YEAR;

-  }

-  //

-  // Reset time value according to new RTC configuration

-  //

-  PcRtcSetTime (&Time, Global);

-

-  return EFI_SUCCESS;

-}

-

-EFI_STATUS

-PcRtcGetTime (

-  OUT EFI_TIME              *Time,

-  IN  EFI_TIME_CAPABILITIES *Capabilities,

-  IN  PC_RTC_MODULE_GLOBALS *Global

-  )

-/*++

-

-Routine Description:

-

-  Arguments:

-

-  Returns:

---*/

-// GC_TODO:    Time - add argument and description to function comment

-// GC_TODO:    Capabilities - add argument and description to function comment

-// GC_TODO:    Global - add argument and description to function comment

-// GC_TODO:    EFI_INVALID_PARAMETER - add return value to function comment

-// GC_TODO:    EFI_DEVICE_ERROR - add return value to function comment

-// GC_TODO:    EFI_SUCCESS - add return value to function comment

-{

-  EFI_STATUS      Status;

-  RTC_REGISTER_B  RegisterB;

-  UINT8           Century;

-

-  //

-  // Check parameters for null pointer

-  //

-  if (Time == NULL) {

-    return EFI_INVALID_PARAMETER;

-

-  }

-  //

-  // Acquire RTC Lock to make access to RTC atomic

-  //

-  //BugBug: the EfiAtRuntime should be encapsulated in EfiAcquireLock or

-  //        provide a new instance for EfiAcquireLock, say, RtEfiAcquireLock

-  if (!EfiAtRuntime ()) {

-  EfiAcquireLock (&Global->RtcLock);

-  }

-  //

-  // Wait for up to 0.1 seconds for the RTC to be updated

-  //

-  Status = RtcWaitToUpdate (100000);

-  if (EFI_ERROR (Status)) {

-  	  //BugBug: the EfiAtRuntime should be encapsulated in EfiReleaseLock or

-      //        provide a new instance for EfiReleaseLock, say, RtEfiReleaseLock

-      if (!EfiAtRuntime ()) {

-    EfiReleaseLock (&Global->RtcLock);

-      }

-    return Status;

-  }

-  //

-  // Read Register B

-  //

-  RegisterB.Data = RtcRead (RTC_ADDRESS_REGISTER_B);

-

-  //

-  // Get the Time/Date/Daylight Savings values.

-  //

-  Time->Second  = RtcRead (RTC_ADDRESS_SECONDS);

-  Time->Minute  = RtcRead (RTC_ADDRESS_MINUTES);

-  Time->Hour    = RtcRead (RTC_ADDRESS_HOURS);

-  Time->Day     = RtcRead (RTC_ADDRESS_DAY_OF_THE_MONTH);

-  Time->Month   = RtcRead (RTC_ADDRESS_MONTH);

-  Time->Year    = RtcRead (RTC_ADDRESS_YEAR);

-

-  ConvertRtcTimeToEfiTime (Time, RegisterB);

-

-  if (RtcTestCenturyRegister () == EFI_SUCCESS) {

-    Century = BcdToDecimal8 ((UINT8) (RtcRead (RTC_ADDRESS_CENTURY) & 0x7f));

-  } else {

-    Century = BcdToDecimal8 (RtcRead (RTC_ADDRESS_CENTURY));

-  }

-

-  Time->Year = (UINT16) (Century * 100 + Time->Year);

-

-  //

-  // Release RTC Lock.

-  //

-  //BugBug: the EfiAtRuntime should be encapsulated in EfiReleaseLock or

-  //        provide a new instance for EfiReleaseLock, say, RtEfiReleaseLock

-  if (!EfiAtRuntime ()) {

-  EfiReleaseLock (&Global->RtcLock);

-  }

-  //

-  // Get the variable that containts the TimeZone and Daylight fields

-  //

-  Time->TimeZone  = Global->SavedTimeZone;

-  Time->Daylight  = Global->Daylight;

-

-  //

-  // Make sure all field values are in correct range

-  //

-  Status = RtcTimeFieldsValid (Time);

-  if (EFI_ERROR (Status)) {

-    return EFI_DEVICE_ERROR;

-  }

-  //

-  //  Fill in Capabilities if it was passed in

-  //

-  if (Capabilities) {

-    Capabilities->Resolution = 1;

-    //

-    // 1 hertz

-    //

-    Capabilities->Accuracy = 50000000;

-    //

-    // 50 ppm

-    //

-    Capabilities->SetsToZero = FALSE;

-  }

-

-  return EFI_SUCCESS;

-}

-

-EFI_STATUS

-PcRtcSetTime (

-  IN EFI_TIME                *Time,

-  IN PC_RTC_MODULE_GLOBALS   *Global

-  )

-/*++

-

-Routine Description:

-

-  Arguments:

-

-  Returns:

---*/

-// GC_TODO:    Time - add argument and description to function comment

-// GC_TODO:    Global - add argument and description to function comment

-// GC_TODO:    EFI_INVALID_PARAMETER - add return value to function comment

-{

-  EFI_STATUS      Status;

-  EFI_TIME        RtcTime;

-  RTC_REGISTER_B  RegisterB;

-  UINT8           Century;

-

-  if (Time == NULL) {

-    return EFI_INVALID_PARAMETER;

-  }

-  //

-  // Make sure that the time fields are valid

-  //

-  Status = RtcTimeFieldsValid (Time);

-  if (EFI_ERROR (Status)) {

-    return Status;

-  }

-

-  CopyMem (&RtcTime, Time, sizeof (EFI_TIME));

-

-  //

-  // Acquire RTC Lock to make access to RTC atomic

-  //

-  //BugBug: the EfiAtRuntime should be encapsulated in EfiAcquireLock or

-  //        provide a new instance for EfiAcquireLock, say, RtEfiAcquireLock

-  if (!EfiAtRuntime ()) {

-  EfiAcquireLock (&Global->RtcLock);

-  }

-  //

-  // Wait for up to 0.1 seconds for the RTC to be updated

-  //

-  Status = RtcWaitToUpdate (100000);

-  if (EFI_ERROR (Status)) {

-  	 //BugBug: the EfiAtRuntime should be encapsulated in EfiReleaseLock or

-     //        provide a new instance for EfiReleaseLock, say, RtEfiReleaseLock

-     if (!EfiAtRuntime ()) {

-    EfiReleaseLock (&Global->RtcLock);

-     }

-    return Status;

-  }

-  //

-  // Read Register B, and inhibit updates of the RTC

-  //

-  RegisterB.Data      = RtcRead (RTC_ADDRESS_REGISTER_B);

-  RegisterB.Bits.SET  = 1;

-  RtcWrite (RTC_ADDRESS_REGISTER_B, RegisterB.Data);

-

-  ConvertEfiTimeToRtcTime (&RtcTime, RegisterB, &Century);

-

-  RtcWrite (RTC_ADDRESS_SECONDS, RtcTime.Second);

-  RtcWrite (RTC_ADDRESS_MINUTES, RtcTime.Minute);

-  RtcWrite (RTC_ADDRESS_HOURS, RtcTime.Hour);

-  RtcWrite (RTC_ADDRESS_DAY_OF_THE_MONTH, RtcTime.Day);

-  RtcWrite (RTC_ADDRESS_MONTH, RtcTime.Month);

-  RtcWrite (RTC_ADDRESS_YEAR, (UINT8) RtcTime.Year);

-  if (RtcTestCenturyRegister () == EFI_SUCCESS) {

-    Century = (UINT8) ((Century & 0x7f) | (RtcRead (RTC_ADDRESS_CENTURY) & 0x80));

-  }

-

-  RtcWrite (RTC_ADDRESS_CENTURY, Century);

-

-  //

-  // Allow updates of the RTC registers

-  //

-  RegisterB.Bits.SET = 0;

-  RtcWrite (RTC_ADDRESS_REGISTER_B, RegisterB.Data);

-

-  //

-  // Release RTC Lock.

-  //

-  //BugBug: the EfiAtRuntime should be encapsulated in EfiReleaseLock or

-  //        provide a new instance for EfiReleaseLock, say, RtEfiReleaseLock

-  if (!EfiAtRuntime ()) {

-  EfiReleaseLock (&Global->RtcLock);

-  }

-  //

-  // Set the variable that containts the TimeZone and Daylight fields

-  //

-  Global->SavedTimeZone = Time->TimeZone;

-  Global->Daylight      = Time->Daylight;

-  return Status;

-}

-

-EFI_STATUS

-PcRtcGetWakeupTime (

-  OUT BOOLEAN                *Enabled,

-  OUT BOOLEAN                *Pending,

-  OUT EFI_TIME               *Time,

-  IN PC_RTC_MODULE_GLOBALS   *Global

-  )

-/*++

-

-Routine Description:

-

-  Arguments:

-

-

-

-Returns:

---*/

-// GC_TODO:    Enabled - add argument and description to function comment

-// GC_TODO:    Pending - add argument and description to function comment

-// GC_TODO:    Time - add argument and description to function comment

-// GC_TODO:    Global - add argument and description to function comment

-// GC_TODO:    EFI_INVALID_PARAMETER - add return value to function comment

-// GC_TODO:    EFI_DEVICE_ERROR - add return value to function comment

-// GC_TODO:    EFI_DEVICE_ERROR - add return value to function comment

-// GC_TODO:    EFI_SUCCESS - add return value to function comment

-{

-  EFI_STATUS      Status;

-  RTC_REGISTER_B  RegisterB;

-  RTC_REGISTER_C  RegisterC;

-  UINT8           Century;

-

-  //

-  // Check paramters for null pointers

-  //

-  if ((Enabled == NULL) || (Pending == NULL) || (Time == NULL)) {

-    return EFI_INVALID_PARAMETER;

-

-  }

-  //

-  // Acquire RTC Lock to make access to RTC atomic

-  //

-  //BugBug: the EfiAtRuntime should be encapsulated in EfiAcquireLock or

-  //        provide a new instance for EfiAcquireLock, say, RtEfiAcquireLock

-  if (!EfiAtRuntime ()) {

-  EfiAcquireLock (&Global->RtcLock);

-  }

-  //

-  // Wait for up to 0.1 seconds for the RTC to be updated

-  //

-  Status = RtcWaitToUpdate (100000);

-  if (EFI_ERROR (Status)) {

-  	//BugBug: the EfiAtRuntime should be encapsulated in EfiReleaseLock or

-    //        provide a new instance for EfiReleaseLock, say, RtEfiReleaseLock

-    if (!EfiAtRuntime ()) {

-    EfiReleaseLock (&Global->RtcLock);

-    }

-    return EFI_DEVICE_ERROR;

-  }

-  //

-  // Read Register B and Register C

-  //

-  RegisterB.Data  = RtcRead (RTC_ADDRESS_REGISTER_B);

-  RegisterC.Data  = RtcRead (RTC_ADDRESS_REGISTER_C);

-

-  //

-  // Get the Time/Date/Daylight Savings values.

-  //

-  *Enabled = RegisterB.Bits.AIE;

-  if (*Enabled) {

-    Time->Second  = RtcRead (RTC_ADDRESS_SECONDS_ALARM);

-    Time->Minute  = RtcRead (RTC_ADDRESS_MINUTES_ALARM);

-    Time->Hour    = RtcRead (RTC_ADDRESS_HOURS_ALARM);

-    Time->Day     = RtcRead (RTC_ADDRESS_DAY_OF_THE_MONTH);

-    Time->Month   = RtcRead (RTC_ADDRESS_MONTH);

-    Time->Year    = RtcRead (RTC_ADDRESS_YEAR);

-  } else {

-    Time->Second  = 0;

-    Time->Minute  = 0;

-    Time->Hour    = 0;

-    Time->Day     = RtcRead (RTC_ADDRESS_DAY_OF_THE_MONTH);

-    Time->Month   = RtcRead (RTC_ADDRESS_MONTH);

-    Time->Year    = RtcRead (RTC_ADDRESS_YEAR);

-  }

-

-  ConvertRtcTimeToEfiTime (Time, RegisterB);

-

-  if (RtcTestCenturyRegister () == EFI_SUCCESS) {

-    Century = BcdToDecimal8 ((UINT8) (RtcRead (RTC_ADDRESS_CENTURY) & 0x7f));

-  } else {

-    Century = BcdToDecimal8 (RtcRead (RTC_ADDRESS_CENTURY));

-  }

-

-  Time->Year = (UINT16) (Century * 100 + Time->Year);

-

-  //

-  // Release RTC Lock.

-  //

-  //BugBug: the EfiAtRuntime should be encapsulated in EfiReleaseLock or

-  //        provide a new instance for EfiReleaseLock, say, RtEfiReleaseLock

-  if (!EfiAtRuntime ()) {

-  EfiReleaseLock (&Global->RtcLock);

-  }

-  //

-  // Make sure all field values are in correct range

-  //

-  Status = RtcTimeFieldsValid (Time);

-  if (EFI_ERROR (Status)) {

-    return EFI_DEVICE_ERROR;

-  }

-

-  *Pending = RegisterC.Bits.AF;

-

-  return EFI_SUCCESS;

-}

-

-EFI_STATUS

-PcRtcSetWakeupTime (

-  IN BOOLEAN                Enable,

-  OUT EFI_TIME              *Time,

-  IN PC_RTC_MODULE_GLOBALS  *Global

-  )

-/*++

-

-Routine Description:

-

-  Arguments:

-

-

-

-Returns:

---*/

-// GC_TODO:    Enable - add argument and description to function comment

-// GC_TODO:    Time - add argument and description to function comment

-// GC_TODO:    Global - add argument and description to function comment

-// GC_TODO:    EFI_INVALID_PARAMETER - add return value to function comment

-// GC_TODO:    EFI_INVALID_PARAMETER - add return value to function comment

-// GC_TODO:    EFI_UNSUPPORTED - add return value to function comment

-// GC_TODO:    EFI_DEVICE_ERROR - add return value to function comment

-// GC_TODO:    EFI_SUCCESS - add return value to function comment

-{

-  EFI_STATUS            Status;

-  EFI_TIME              RtcTime;

-  RTC_REGISTER_B        RegisterB;

-  UINT8                 Century;

-  EFI_TIME_CAPABILITIES Capabilities;

-

-  if (Enable) {

-

-    if (Time == NULL) {

-      return EFI_INVALID_PARAMETER;

-    }

-    //

-    // Make sure that the time fields are valid

-    //

-    Status = RtcTimeFieldsValid (Time);

-    if (EFI_ERROR (Status)) {

-      return EFI_INVALID_PARAMETER;

-    }

-    //

-    // Just support set alarm time within 24 hours

-    //

-    PcRtcGetTime (&RtcTime, &Capabilities, Global);

-    if (!IsWithinOneDay (&RtcTime, Time)) {

-      return EFI_UNSUPPORTED;

-    }

-    //

-    // Make a local copy of the time and date

-    //

-    CopyMem (&RtcTime, Time, sizeof (EFI_TIME));

-

-  }

-  //

-  // Acquire RTC Lock to make access to RTC atomic

-  //

-  //BugBug: the EfiAtRuntime should be encapsulated in EfiAcquireLock or

-  //        provide a new instance for EfiAcquireLock, say, RtEfiAcquireLock

-  if (!EfiAtRuntime ()) {

-  EfiAcquireLock (&Global->RtcLock);

-  }

-  //

-  // Wait for up to 0.1 seconds for the RTC to be updated

-  //

-  Status = RtcWaitToUpdate (100000);

-  if (EFI_ERROR (Status)) {

-    //BugBug: the EfiAtRuntime should be encapsulated in EfiReleaseLock or

-    //        provide a new instance for EfiReleaseLock, say, RtEfiReleaseLock

-    if (!EfiAtRuntime ()) {

-    EfiReleaseLock (&Global->RtcLock);

-    }

-    return EFI_DEVICE_ERROR;

-  }

-  //

-  // Read Register B, and inhibit updates of the RTC

-  //

-  RegisterB.Data      = RtcRead (RTC_ADDRESS_REGISTER_B);

-

-  RegisterB.Bits.SET  = 1;

-  RtcWrite (RTC_ADDRESS_REGISTER_B, RegisterB.Data);

-

-  if (Enable) {

-    ConvertEfiTimeToRtcTime (&RtcTime, RegisterB, &Century);

-

-    //

-    // Set RTC alarm time

-    //

-    RtcWrite (RTC_ADDRESS_SECONDS_ALARM, RtcTime.Second);

-    RtcWrite (RTC_ADDRESS_MINUTES_ALARM, RtcTime.Minute);

-    RtcWrite (RTC_ADDRESS_HOURS_ALARM, RtcTime.Hour);

-

-    RegisterB.Bits.AIE = 1;

-

-  } else {

-    RegisterB.Bits.AIE = 0;

-  }

-  //

-  // Allow updates of the RTC registers

-  //

-  RegisterB.Bits.SET = 0;

-  RtcWrite (RTC_ADDRESS_REGISTER_B, RegisterB.Data);

-

-  //

-  // Release RTC Lock.

-  //

-  //BugBug: the EfiAtRuntime should be encapsulated in EfiReleaseLock or

-  //        provide a new instance for EfiReleaseLock, say, RtEfiReleaseLock

-  if (!EfiAtRuntime ()) {

-  EfiReleaseLock (&Global->RtcLock);

-  }

-  return EFI_SUCCESS;

-}

-

-EFI_STATUS

-RtcTestCenturyRegister (

-  VOID

-  )

-/*++

-

-Routine Description:

-

-  Arguments:

-

-

-

-Returns:

---*/

-// GC_TODO:    EFI_SUCCESS - add return value to function comment

-// GC_TODO:    EFI_DEVICE_ERROR - add return value to function comment

-{

-  UINT8 Century;

-  UINT8 Temp;

-

-  Century = RtcRead (RTC_ADDRESS_CENTURY);

-  //

-  //  RtcWrite (RTC_ADDRESS_CENTURY, 0x00);

-  //

-  Temp = (UINT8) (RtcRead (RTC_ADDRESS_CENTURY) & 0x7f);

-  RtcWrite (RTC_ADDRESS_CENTURY, Century);

-  if (Temp == 0x19 || Temp == 0x20) {

-    return EFI_SUCCESS;

-  }

-

-  return EFI_DEVICE_ERROR;

-}

-

-VOID

-ConvertRtcTimeToEfiTime (

-  IN EFI_TIME       *Time,

-  IN RTC_REGISTER_B RegisterB

-  )

-/*++

-

-Routine Description:

-

-  Arguments:

-

-

-

-Returns:

---*/

-// GC_TODO:    Time - add argument and description to function comment

-// GC_TODO:    RegisterB - add argument and description to function comment

-{

-  BOOLEAN PM;

-

-  if ((Time->Hour) & 0x80) {

-    PM = TRUE;

-  } else {

-    PM = FALSE;

-  }

-

-  Time->Hour = (UINT8) (Time->Hour & 0x7f);

-

-  if (RegisterB.Bits.DM == 0) {

-    Time->Year    = BcdToDecimal8 ((UINT8) Time->Year);

-    Time->Month   = BcdToDecimal8 (Time->Month);

-    Time->Day     = BcdToDecimal8 (Time->Day);

-    Time->Hour    = BcdToDecimal8 (Time->Hour);

-    Time->Minute  = BcdToDecimal8 (Time->Minute);

-    Time->Second  = BcdToDecimal8 (Time->Second);

-  }

-  //

-  // If time is in 12 hour format, convert it to 24 hour format

-  //

-  if (RegisterB.Bits.MIL == 0) {

-    if (PM && Time->Hour < 12) {

-      Time->Hour = (UINT8) (Time->Hour + 12);

-    }

-

-    if (!PM && Time->Hour == 12) {

-      Time->Hour = 0;

-    }

-  }

-

-  Time->Nanosecond  = 0;

-  Time->TimeZone    = EFI_UNSPECIFIED_TIMEZONE;

-  Time->Daylight    = 0;

-}

-

-EFI_STATUS

-RtcWaitToUpdate (

-  UINTN Timeout

-  )

-/*++

-

-Routine Description:

-

-  Arguments:

-

-

-Returns:

---*/

-// GC_TODO:    Timeout - add argument and description to function comment

-// GC_TODO:    EFI_DEVICE_ERROR - add return value to function comment

-// GC_TODO:    EFI_DEVICE_ERROR - add return value to function comment

-// GC_TODO:    EFI_SUCCESS - add return value to function comment

-{

-  RTC_REGISTER_A  RegisterA;

-  RTC_REGISTER_D  RegisterD;

-

-  //

-  // See if the RTC is functioning correctly

-  //

-  RegisterD.Data = RtcRead (RTC_ADDRESS_REGISTER_D);

-

-  if (RegisterD.Bits.VRT == 0) {

-    return EFI_DEVICE_ERROR;

-  }

-  //

-  // Wait for up to 0.1 seconds for the RTC to be ready.

-  //

-  Timeout         = (Timeout / 10) + 1;

-  RegisterA.Data  = RtcRead (RTC_ADDRESS_REGISTER_A);

-  while (RegisterA.Bits.UIP == 1 && Timeout > 0) {

-    MicroSecondDelay (10);

-    RegisterA.Data = RtcRead (RTC_ADDRESS_REGISTER_A);

-    Timeout--;

-  }

-

-  RegisterD.Data = RtcRead (RTC_ADDRESS_REGISTER_D);

-  if (Timeout == 0 || RegisterD.Bits.VRT == 0) {

-    return EFI_DEVICE_ERROR;

-  }

-

-  return EFI_SUCCESS;

-}

-

-EFI_STATUS

-RtcTimeFieldsValid (

-  IN EFI_TIME *Time

-  )

-/*++

-

-Routine Description:

-

-  Arguments:

-

-  Returns:

---*/

-// GC_TODO:    Time - add argument and description to function comment

-// GC_TODO:    EFI_INVALID_PARAMETER - add return value to function comment

-// GC_TODO:    EFI_SUCCESS - add return value to function comment

-{

-  if (Time->Year < 1998 ||

-      Time->Year > 2099 ||

-      Time->Month < 1 ||

-      Time->Month > 12 ||

-      (!DayValid (Time)) ||

-      Time->Hour > 23 ||

-      Time->Minute > 59 ||

-      Time->Second > 59 ||

-      Time->Nanosecond > 999999999 ||

-      (!(Time->TimeZone == EFI_UNSPECIFIED_TIMEZONE || (Time->TimeZone >= -1440 && Time->TimeZone <= 1440))) ||

-      (Time->Daylight & (~(EFI_TIME_ADJUST_DAYLIGHT | EFI_TIME_IN_DAYLIGHT)))

-      ) {

-    return EFI_INVALID_PARAMETER;

-  }

-

-  return EFI_SUCCESS;

-}

-

-BOOLEAN

-DayValid (

-  IN  EFI_TIME  *Time

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Time  - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-{

-  INTN  DayOfMonth[12];

-

-  DayOfMonth[0] = 31;

-  DayOfMonth[1] = 29;

-  DayOfMonth[2] = 31;

-  DayOfMonth[3] = 30;

-  DayOfMonth[4] = 31;

-  DayOfMonth[5] = 30;

-  DayOfMonth[6] = 31;

-  DayOfMonth[7] = 31;

-  DayOfMonth[8] = 30;

-  DayOfMonth[9] = 31;

-  DayOfMonth[10] = 30;

-  DayOfMonth[11] = 31;

-

-  if (Time->Day < 1 ||

-      Time->Day > DayOfMonth[Time->Month - 1] ||

-      (Time->Month == 2 && (!IsLeapYear (Time) && Time->Day > 28))

-      ) {

-    return FALSE;

-  }

-

-  return TRUE;

-}

-

-BOOLEAN

-IsLeapYear (

-  IN EFI_TIME   *Time

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Time  - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-{

-  if (Time->Year % 4 == 0) {

-    if (Time->Year % 100 == 0) {

-      if (Time->Year % 400 == 0) {

-        return TRUE;

-      } else {

-        return FALSE;

-      }

-    } else {

-      return TRUE;

-    }

-  } else {

-    return FALSE;

-  }

-}

-

-VOID

-ConvertEfiTimeToRtcTime (

-  IN EFI_TIME       *Time,

-  IN RTC_REGISTER_B RegisterB,

-  IN UINT8          *Century

-  )

-/*++

-

-Routine Description:

-

-  Arguments:

-

-

-Returns:

---*/

-// GC_TODO:    Time - add argument and description to function comment

-// GC_TODO:    RegisterB - add argument and description to function comment

-// GC_TODO:    Century - add argument and description to function comment

-{

-  BOOLEAN PM;

-

-  PM = TRUE;

-  //

-  // Adjust hour field if RTC in in 12 hour mode

-  //

-  if (RegisterB.Bits.MIL == 0) {

-    if (Time->Hour < 12) {

-      PM = FALSE;

-    }

-

-    if (Time->Hour >= 13) {

-      Time->Hour = (UINT8) (Time->Hour - 12);

-    } else if (Time->Hour == 0) {

-      Time->Hour = 12;

-    }

-  }

-  //

-  // Set the Time/Date/Daylight Savings values.

-  //

-  *Century    = DecimalToBcd8 ((UINT8) (Time->Year / 100));

-

-  Time->Year  = (UINT16) (Time->Year % 100);

-

-  if (RegisterB.Bits.DM == 0) {

-    Time->Year    = DecimalToBcd8 ((UINT8) Time->Year);

-    Time->Month   = DecimalToBcd8 (Time->Month);

-    Time->Day     = DecimalToBcd8 (Time->Day);

-    Time->Hour    = DecimalToBcd8 (Time->Hour);

-    Time->Minute  = DecimalToBcd8 (Time->Minute);

-    Time->Second  = DecimalToBcd8 (Time->Second);

-  }

-  //

-  // If we are in 12 hour mode and PM is set, then set bit 7 of the Hour field.

-  //

-  if (RegisterB.Bits.MIL == 0 && PM) {

-    Time->Hour = (UINT8) (Time->Hour | 0x80);

-  }

-}

-

-STATIC

-INTN

-CompareHMS (

-  IN EFI_TIME   *From,

-  IN EFI_TIME   *To

-  )

-/*++

-

-Routine Description:

-

-  Compare the Hour, Minute and Second of the 'From' time and the 'To' time.

-  Only compare H/M/S in EFI_TIME and ignore other fields here.

-

-Arguments:

-

-  From  -   the first time

-  To    -   the second time

-

-Returns:

-

-  >0   : The H/M/S of the 'From' time is later than those of 'To' time

-  ==0  : The H/M/S of the 'From' time is same as those of 'To' time

-  <0   : The H/M/S of the 'From' time is earlier than those of 'To' time

-

---*/

-{

-  if ((From->Hour > To->Hour) ||

-     ((From->Hour == To->Hour) && (From->Minute > To->Minute)) ||

-     ((From->Hour == To->Hour) && (From->Minute == To->Minute) && (From->Second > To->Second))) {

-    return 1;

-  } else if ((From->Hour == To->Hour) && (From->Minute == To->Minute) && (From->Second == To->Second)) {

-    return 0;

-  } else {

-    return -1;

-  }

-}

-

-STATIC

-BOOLEAN

-IsWithinOneDay (

-  IN EFI_TIME  *From,

-  IN EFI_TIME  *To

-  )

-/*++

-

-Routine Description:

-

-  Judge whether two days are adjacent.

-

-Arguments:

-

-  From  -   the first day

-  To    -   the second day

-

-Returns:

-

-  TRUE  -   The interval of two days are within one day.

-  FALSE -   The interval of two days exceed ony day or parameter error.

-

---*/

-{

-  UINT8   DayOfMonth[12] = {31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};

-  BOOLEAN Adjacent = FALSE;

-

-  if (From->Year == To->Year) {

-    if (From->Month == To->Month) {

-      if ((From->Day + 1) == To->Day) {

-        if ((CompareHMS(From, To) >= 0)) {

-          Adjacent = TRUE;

-        }

-      } else if (From->Day == To->Day) {

-        if ((CompareHMS(From, To) <= 0)) {

-          Adjacent = TRUE;

-        }

-      }

-    } else if (((From->Month + 1) == To->Month) && (To->Day == 1)) {

-      if ((From->Month == 2) && !IsLeapYear(From)) {

-        if (From->Day == 28) {

-          if ((CompareHMS(From, To) >= 0)) {

-            Adjacent = TRUE;

-          }

-        }

-      } else if (From->Day == DayOfMonth[From->Month - 1]) {

-        if ((CompareHMS(From, To) >= 0)) {

-           Adjacent = TRUE;

-        }

-      }

-    }

-  } else if (((From->Year + 1) == To->Year) &&

-             (From->Month == 12) &&

-             (From->Day   == 31) &&

-             (To->Month   == 1)  &&

-             (To->Day     == 1)) {

-    if ((CompareHMS(From, To) >= 0)) {

-      Adjacent = TRUE;

-    }

-  }

-

-  return Adjacent;

-}

-

diff --git a/MdeModulePkg/Universal/PcatCompatible/RealTimeClockRuntimeDxe/PcRtc.h b/MdeModulePkg/Universal/PcatCompatible/RealTimeClockRuntimeDxe/PcRtc.h
deleted file mode 100644
index 55ed7c3..0000000
--- a/MdeModulePkg/Universal/PcatCompatible/RealTimeClockRuntimeDxe/PcRtc.h
+++ /dev/null
@@ -1,514 +0,0 @@
-/*++

-

-Copyright (c) 2006, Intel Corporation. All rights reserved. 

-This software and associated documentation (if any) is furnished

-under a license and may only be used or copied in accordance

-with the terms of the license. Except as permitted by such

-license, no part of this software or documentation may be

-reproduced, stored in a retrieval system, or transmitted in any

-form or by any means without the express written consent of

-Intel Corporation.

-

-

-Module Name:

-  

-    PcRtc.h

-

-Abstract:

-

-    Include for real time clock driver

-

-Revision History

-

-

---*/

-

-#ifndef _RTC_H_

-#define _RTC_H_

-

-//

-// The package level header files this module uses

-//

-#include <PiDxe.h>

-//

-// The protocols, PPI and GUID defintions for this module

-//

-#include <Protocol/RealTimeClock.h>

-//

-// The Library classes this module consumes

-//

-#include <Library/BaseLib.h>

-#include <Library/DebugLib.h>

-#include <Library/UefiLib.h>

-#include <Library/BaseMemoryLib.h>

-#include <Library/IoLib.h>

-#include <Library/TimerLib.h>

-#include <Library/UefiDriverEntryPoint.h>

-#include <Library/UefiBootServicesTableLib.h>

-#include <Library/UefiRuntimeLib.h>

-#include <Library/UefiRuntimeServicesTableLib.h>

-

-

-typedef struct {

-  EFI_LOCK  RtcLock;

-  UINT16    SavedTimeZone;

-  UINT8     Daylight;

-} PC_RTC_MODULE_GLOBALS;

-

-#define PCAT_RTC_ADDRESS_REGISTER 0x70

-#define PCAT_RTC_DATA_REGISTER    0x71

-

-//

-// Dallas DS12C887 Real Time Clock

-//

-#define RTC_ADDRESS_SECONDS           0   // R/W  Range 0..59

-#define RTC_ADDRESS_SECONDS_ALARM     1   // R/W  Range 0..59

-#define RTC_ADDRESS_MINUTES           2   // R/W  Range 0..59

-#define RTC_ADDRESS_MINUTES_ALARM     3   // R/W  Range 0..59

-#define RTC_ADDRESS_HOURS             4   // R/W  Range 1..12 or 0..23 Bit 7 is AM/PM

-#define RTC_ADDRESS_HOURS_ALARM       5   // R/W  Range 1..12 or 0..23 Bit 7 is AM/PM

-#define RTC_ADDRESS_DAY_OF_THE_WEEK   6   // R/W  Range 1..7

-#define RTC_ADDRESS_DAY_OF_THE_MONTH  7   // R/W  Range 1..31

-#define RTC_ADDRESS_MONTH             8   // R/W  Range 1..12

-#define RTC_ADDRESS_YEAR              9   // R/W  Range 0..99

-#define RTC_ADDRESS_REGISTER_A        10  // R/W[0..6]  R0[7]

-#define RTC_ADDRESS_REGISTER_B        11  // R/W

-#define RTC_ADDRESS_REGISTER_C        12  // RO

-#define RTC_ADDRESS_REGISTER_D        13  // RO

-#define RTC_ADDRESS_CENTURY           50  // R/W  Range 19..20 Bit 8 is R/W

-//

-// Date and time initial values.

-// They are used if the RTC values are invalid during driver initialization

-//

-#define RTC_INIT_SECOND 0

-#define RTC_INIT_MINUTE 0

-#define RTC_INIT_HOUR   0

-#define RTC_INIT_DAY    1

-#define RTC_INIT_MONTH  1

-#define RTC_INIT_YEAR   2001

-

-//

-// Register initial values

-//

-#define RTC_INIT_REGISTER_A 0x26

-#define RTC_INIT_REGISTER_B 0x02

-#define RTC_INIT_REGISTER_D 0x0

-

-#pragma pack(1)

-//

-// Register A

-//

-typedef struct {

-  UINT8 RS : 4;   // Rate Selection Bits

-  UINT8 DV : 3;   // Divisor

-  UINT8 UIP : 1;  // Update in progress

-} RTC_REGISTER_A_BITS;

-

-typedef union {

-  RTC_REGISTER_A_BITS Bits;

-  UINT8               Data;

-} RTC_REGISTER_A;

-

-//

-// Register B

-//

-typedef struct {

-  UINT8 DSE : 1;  // 0 - Daylight saving disabled  1 - Daylight savings enabled

-  UINT8 MIL : 1;  // 0 - 12 hour mode              1 - 24 hour mode

-  UINT8 DM : 1;   // 0 - BCD Format                1 - Binary Format

-  UINT8 SQWE : 1; // 0 - Disable SQWE output       1 - Enable SQWE output

-  UINT8 UIE : 1;  // 0 - Update INT disabled       1 - Update INT enabled

-  UINT8 AIE : 1;  // 0 - Alarm INT disabled        1 - Alarm INT Enabled

-  UINT8 PIE : 1;  // 0 - Periodic INT disabled     1 - Periodic INT Enabled

-  UINT8 SET : 1;  // 0 - Normal operation.         1 - Updates inhibited

-} RTC_REGISTER_B_BITS;

-

-typedef union {

-  RTC_REGISTER_B_BITS Bits;

-  UINT8               Data;

-} RTC_REGISTER_B;

-

-//

-// Register C

-//

-typedef struct {

-  UINT8 Reserved : 4; // Read as zero.  Can not be written.

-  UINT8 UF : 1;       // Update End Interrupt Flag

-  UINT8 AF : 1;       // Alarm Interrupt Flag

-  UINT8 PF : 1;       // Periodic Interrupt Flag

-  UINT8 IRQF : 1;     // Iterrupt Request Flag = PF & PIE | AF & AIE | UF & UIE

-} RTC_REGISTER_C_BITS;

-

-typedef union {

-  RTC_REGISTER_C_BITS Bits;

-  UINT8               Data;

-} RTC_REGISTER_C;

-

-//

-// Register D

-//

-typedef struct {

-  UINT8 Reserved : 7; // Read as zero.  Can not be written.

-  UINT8 VRT : 1;      // Valid RAM and Time

-} RTC_REGISTER_D_BITS;

-

-typedef union {

-  RTC_REGISTER_D_BITS Bits;

-  UINT8               Data;

-} RTC_REGISTER_D;

-

-#pragma pack()

-

-EFI_STATUS

-PcRtcInit (

-  IN PC_RTC_MODULE_GLOBALS  *Global

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Global  - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-;

-

-EFI_STATUS

-PcRtcSetTime (

-  IN EFI_TIME               *Time,

-  IN PC_RTC_MODULE_GLOBALS  *Global

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Time    - GC_TODO: add argument description

-  Global  - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-;

-

-EFI_STATUS

-PcRtcGetTime (

-  OUT EFI_TIME              *Time,

-  IN  EFI_TIME_CAPABILITIES *Capabilities,

-  IN  PC_RTC_MODULE_GLOBALS *Global

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Time          - GC_TODO: add argument description

-  Capabilities  - GC_TODO: add argument description

-  Global        - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-;

-

-EFI_STATUS

-PcRtcSetWakeupTime (

-  IN BOOLEAN                Enable,

-  OUT EFI_TIME              *Time,

-  IN  PC_RTC_MODULE_GLOBALS *Global

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Enable  - GC_TODO: add argument description

-  Time    - GC_TODO: add argument description

-  Global  - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-;

-

-EFI_STATUS

-PcRtcGetWakeupTime (

-  OUT BOOLEAN               *Enabled,

-  OUT BOOLEAN               *Pending,

-  OUT EFI_TIME              *Time,

-  IN  PC_RTC_MODULE_GLOBALS *Global

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Enabled - GC_TODO: add argument description

-  Pending - GC_TODO: add argument description

-  Time    - GC_TODO: add argument description

-  Global  - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-;

-

-EFI_STATUS

-EFIAPI

-InitializePcRtc (

-  IN EFI_HANDLE                            ImageHandle,

-  IN EFI_SYSTEM_TABLE                      *SystemTable

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  ImageHandle - GC_TODO: add argument description

-  SystemTable - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-;

-

-UINT8

-BcdToDecimal (

-  IN  UINT8 BcdValue

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  BcdValue  - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-;

-

-EFI_STATUS

-RtcTimeFieldsValid (

-  IN EFI_TIME *Time

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Time  - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-;

-

-UINT8

-DecimaltoBcd (

-  IN  UINT8 DecValue

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  DecValue  - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-;

-

-VOID

-ConvertEfiTimeToRtcTime (

-  IN EFI_TIME       *Time,

-  IN RTC_REGISTER_B RegisterB,

-  IN UINT8          *Century

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Time      - GC_TODO: add argument description

-  RegisterB - GC_TODO: add argument description

-  Century   - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-;

-

-EFI_STATUS

-RtcTestCenturyRegister (

-  VOID

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  None

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-;

-

-VOID

-ConvertRtcTimeToEfiTime (

-  IN EFI_TIME       *Time,

-  IN RTC_REGISTER_B RegisterB

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Time      - GC_TODO: add argument description

-  RegisterB - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-;

-

-EFI_STATUS

-RtcWaitToUpdate (

-  UINTN Timeout

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Timeout - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-;

-

-UINT8

-RtcSaveContext (

-  IN  PC_RTC_MODULE_GLOBALS  *Global

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  Global  - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-;

-

-VOID

-RtcRestoreContext (

-  IN  UINT8                 SavedAddressRegister,

-  IN  PC_RTC_MODULE_GLOBALS *Global

-  )

-/*++

-

-Routine Description:

-

-  GC_TODO: Add function description

-

-Arguments:

-

-  SavedAddressRegister  - GC_TODO: add argument description

-  Global                - GC_TODO: add argument description

-

-Returns:

-

-  GC_TODO: add return values

-

---*/

-;

-

-BOOLEAN

-DayValid (

-  IN  EFI_TIME  *Time

-  );

-

-BOOLEAN

-IsLeapYear (

-  IN EFI_TIME   *Time

-  );

-

-#endif

diff --git a/MdeModulePkg/Universal/PcatCompatible/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf b/MdeModulePkg/Universal/PcatCompatible/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
deleted file mode 100644
index e9c0649..0000000
--- a/MdeModulePkg/Universal/PcatCompatible/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf
+++ /dev/null
@@ -1,105 +0,0 @@
-#/** @file

-# PcRtc driver to install EFI_REAL_TIME_CLOCK_ARCH_PROTOCOL.

-#

-# This driver provides GetTime, SetTime, GetWakeupTime, SetWakeupTime services to Runtime Service Table.

-# Copyright (c) 2006 - 2007, Intel Corporation.

-#

-#  All rights reserved.

-#  This software and associated documentation (if any) is furnished

-#  under a license and may only be used or copied in accordance

-#  with the terms of the license. Except as permitted by such

-#  license, no part of this software or documentation may be

-#  reproduced, stored in a retrieval system, or transmitted in any

-#  form or by any means without the express written consent of

-#  Intel Corporation.

-#

-#

-#**/

-

-################################################################################

-#

-# Defines Section - statements that will be processed to create a Makefile.

-#

-################################################################################

-[Defines]

-  INF_VERSION                    = 0x00010005

-  BASE_NAME                      = PcRtc

-  FILE_GUID                      = 378D7B65-8DA9-4773-B6E4-A47826A833E1

-  MODULE_TYPE                    = DXE_RUNTIME_DRIVER

-  VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

-  EFI_SPECIFICATION_VERSION      = 0x00020000

-

-  ENTRY_POINT                    = InitializePcRtc

-

-#

-# The following information is for reference only and not required by the build tools.

-#

-#  VALID_ARCHITECTURES           = IA32 X64 EBC

-#

-

-################################################################################

-#

-# Sources Section - list of files that are required for the build to succeed.

-#

-################################################################################

-

-[Sources.common]

-  Ia32/Ia32PcRtc.c

-  PcRtc.c

-  PcRtc.h

-

-

-################################################################################

-#

-# Package Dependency Section - list of Package files that are required for

-#                              this module.

-#

-################################################################################

-

-[Packages]

-  MdePkg/MdePkg.dec

-  IntelFrameworkPkg/IntelFrameworkPkg.dec

-

-

-################################################################################

-#

-# Library Class Section - list of Library Classes that are required for

-#                         this module.

-#

-################################################################################

-

-[LibraryClasses]

-  UefiRuntimeServicesTableLib

-  UefiRuntimeLib

-  UefiBootServicesTableLib

-  UefiDriverEntryPoint

-  TimerLib

-  IoLib

-  BaseMemoryLib

-  UefiLib

-  DebugLib

-  BaseLib

-

-

-################################################################################

-#

-# Protocol C Name Section - list of Protocol and Protocol Notify C Names

-#                           that this module uses or produces.

-#

-################################################################################

-

-[Protocols]

-  gEfiRealTimeClockArchProtocolGuid             # PROTOCOL ALWAYS_PRODUCED

-

-

-################################################################################

-#

-# Dependency Expression Section - list of Dependency expressions that are required for

-#                              this module.

-#

-################################################################################

-

-[Depex]

-  gEfiCpuArchProtocolGuid AND gEfiMetronomeArchProtocolGuid

-

diff --git a/MdeModulePkg/Universal/PcatCompatible/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.msa b/MdeModulePkg/Universal/PcatCompatible/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.msa
deleted file mode 100644
index 9e911b8..0000000
--- a/MdeModulePkg/Universal/PcatCompatible/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.msa
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xsi:schemaLocation="http://www.TianoCore.org/2006/Edk2.0  http://www.TianoCore.org/2006/Edk2.0/SurfaceArea.xsd" xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-  <MsaHeader>

-    <ModuleName>PcRtc</ModuleName>

-    <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>

-    <GuidValue>378D7B65-8DA9-4773-B6E4-A47826A833E1</GuidValue>

-    <Version>1.0</Version>

-    <Abstract>PcRtc driver to install EFI_REAL_TIME_CLOCK_ARCH_PROTOCOL.</Abstract>

-    <Description>This driver provides GetTime, SetTime, GetWakeupTime, SetWakeupTime services to Runtime Service Table.</Description>

-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>

-    <License>All rights reserved.

-      This software and associated documentation (if any) is furnished

-      under a license and may only be used or copied in accordance

-      with the terms of the license. Except as permitted by such

-      license, no part of this software or documentation may be

-      reproduced, stored in a retrieval system, or transmitted in any

-      form or by any means without the express written consent of

-      Intel Corporation.</License>

-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

-  </MsaHeader>

-  <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 EBC</SupportedArchitectures>

-    <BinaryModule>false</BinaryModule>

-    <OutputFileBasename>PcRtc</OutputFileBasename>

-  </ModuleDefinitions>

-  <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>DebugLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseMemoryLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>IoLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>TimerLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiDriverEntryPoint</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiBootServicesTableLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiRuntimeLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiRuntimeServicesTableLib</Keyword>

-    </LibraryClass>

-  </LibraryClassDefinitions>

-  <SourceFiles>

-    <Filename>PcRtc.h</Filename>

-    <Filename>PcRtc.c</Filename>

-    <Filename>Ia32PcRtc.dxs</Filename>

-    <Filename>Ia32/Ia32PcRtc.c</Filename>

-  </SourceFiles>

-  <PackageDependencies>

-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-  </PackageDependencies>

-  <Protocols>

-    <Protocol Usage="ALWAYS_PRODUCED">

-      <ProtocolCName>gEfiRealTimeClockArchProtocolGuid</ProtocolCName>

-    </Protocol>

-  </Protocols>

-  <Externs>

-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

-    <Extern>

-      <ModuleEntryPoint>InitializePcRtc</ModuleEntryPoint>

-    </Extern>

-  </Externs>

-</ModuleSurfaceArea>

diff --git a/MdeModulePkg/Universal/VariablePei/Ipf/VariableWorker.c b/MdeModulePkg/Universal/VariablePei/Ipf/VariableWorker.c
deleted file mode 100644
index 0a4ee95..0000000
--- a/MdeModulePkg/Universal/VariablePei/Ipf/VariableWorker.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/** @file

-  Variable worker functions.

-

-  Copyright (c) 2006, Intel Corporation<BR>

-  All rights reserved. This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-**/

-

-#include <Variable.h>

-

-

-/**

-  Get one variable by the index count.

-

-  @param  IndexTable  The pointer to variable index table.

-  @param  Count       The index count of variable in index table.

-

-  @return The pointer to variable header indexed by count.

-

-**/

-VARIABLE_HEADER *

-GetVariableByIndex (

-  IN VARIABLE_INDEX_TABLE        *IndexTable,

-  IN UINT32                      Count

-  )

-{

-  return (VARIABLE_HEADER *) (UINTN) ((((UINT32)IndexTable->Index[Count]) << 2) + ((UINT32)(UINTN)IndexTable->StartPtr & 0xFFFC0000) );

-}

-

-/**

-  Record Variable in VariableIndex HOB.

-

-  Record Variable in VariableIndex HOB and update the length of variable index table.

-

-  @param  IndexTable  The pointer to variable index table.

-  @param  Variable    The pointer to the variable that will be recorded.

-

-  @retval VOID

-

-**/

-VOID

-VariableIndexTableUpdate (

-  IN OUT  VARIABLE_INDEX_TABLE   *IndexTable,

-  IN      VARIABLE_HEADER        *Variable

-  )

-{

-  IndexTable->Index[IndexTable->Length++] = (UINT16) (((UINT32)(UINTN) Variable) >> 2);

-

-  return;

-}

-

diff --git a/MdeModulePkg/Universal/VariablePei/Variable.c b/MdeModulePkg/Universal/VariablePei/Variable.c
deleted file mode 100644
index ba8a23d..0000000
--- a/MdeModulePkg/Universal/VariablePei/Variable.c
+++ /dev/null
@@ -1,522 +0,0 @@
-/*++

-

-Copyright (c) 2006 - 2007 Intel Corporation. <BR>

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-Module Name:

-

-  Variable.c

-

-Abstract:

-

-  Framework PEIM to provide the Variable functionality

-

---*/

-

-

-#include "Variable.h"

-

-//

-// Module globals

-//

-static EFI_PEI_READ_ONLY_VARIABLE2_PPI mVariablePpi = {

-  PeiGetVariable,

-  PeiGetNextVariableName

-};

-

-static EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable = {

-  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

-  &gEfiPeiReadOnlyVariable2PpiGuid,

-  &mVariablePpi

-};

-

-EFI_GUID mEfiVariableIndexTableGuid = EFI_VARIABLE_INDEX_TABLE_GUID;

-

-EFI_STATUS

-EFIAPI

-PeimInitializeVariableServices (

-  IN EFI_FFS_FILE_HEADER       *FfsHeader,

-  IN EFI_PEI_SERVICES          **PeiServices

-  )

-/*++

-

-Routine Description:

-

-  Provide the functionality of the variable services.

-

-Arguments:

-

-  FfsHeadher  - The FFS file header

-  PeiServices - General purpose services available to every PEIM.

-

-Returns:

-

-  Status -  EFI_SUCCESS if the interface could be successfully

-            installed

-

---*/

-{

-  //

-  // Publish the variable capability to other modules

-  //

-  return (**PeiServices).InstallPpi (PeiServices, &mPpiListVariable);

-

-}

-

-STATIC

-VARIABLE_HEADER *

-GetNextVariablePtr (

-  IN VARIABLE_HEADER  *Variable

-  )

-/*++

-

-Routine Description:

-

-  This code checks if variable header is valid or not.

-

-Arguments:

-  Variable       Pointer to the Variable Header.

-

-Returns:

-  TRUE            Variable header is valid.

-  FALSE           Variable header is not valid.

-

---*/

-{

-  return (VARIABLE_HEADER *) ((UINTN) GET_VARIABLE_DATA_PTR (Variable) + Variable->DataSize + GET_PAD_SIZE (Variable->DataSize));

-}

-

-STATIC

-BOOLEAN

-EFIAPI

-IsValidVariableHeader (

-  IN  VARIABLE_HEADER   *Variable

-  )

-/*++

-

-Routine Description:

-

-  This code checks if variable header is valid or not.

-

-Arguments:

-  Variable              Pointer to the Variable Header.

-

-Returns:

-  TRUE            Variable header is valid.

-  FALSE           Variable header is not valid.

-

---*/

-{

-  if (Variable == NULL ||

-      Variable->StartId != VARIABLE_DATA ||

-      (sizeof (VARIABLE_HEADER) + Variable->DataSize + Variable->NameSize) > MAX_VARIABLE_SIZE

-      ) {

-    return FALSE;

-  }

-

-  return TRUE;

-}

-

-STATIC

-VARIABLE_STORE_STATUS

-EFIAPI

-GetVariableStoreStatus (

-  IN VARIABLE_STORE_HEADER *VarStoreHeader

-  )

-/*++

-

-Routine Description:

-

-  This code gets the pointer to the variable name.

-

-Arguments:

-

-  VarStoreHeader  Pointer to the Variable Store Header.

-

-Returns:

-

-  EfiRaw        Variable store is raw

-  EfiValid      Variable store is valid

-  EfiInvalid    Variable store is invalid

-

---*/

-{

-  if (VarStoreHeader->Signature == VARIABLE_STORE_SIGNATURE &&

-      VarStoreHeader->Format == VARIABLE_STORE_FORMATTED &&

-      VarStoreHeader->State == VARIABLE_STORE_HEALTHY

-      ) {

-

-    return EfiValid;

-  }

-

-  if (VarStoreHeader->Signature == 0xffffffff &&

-      VarStoreHeader->Size == 0xffffffff &&

-      VarStoreHeader->Format == 0xff &&

-      VarStoreHeader->State == 0xff

-      ) {

-

-    return EfiRaw;

-  } else {

-    return EfiInvalid;

-  }

-}

-

-STATIC

-EFI_STATUS

-CompareWithValidVariable (

-  IN  VARIABLE_HEADER               *Variable,

-  IN  CONST CHAR16                  *VariableName,

-  IN  CONST EFI_GUID                *VendorGuid,

-  OUT VARIABLE_POINTER_TRACK        *PtrTrack

-  )

-/*++

-

-Routine Description:

-

-  This function compares a variable with variable entries in database

-

-Arguments:

-

-  Variable       - Pointer to the variable in our database

-  VariableName   - Name of the variable to compare to 'Variable'

-  VendorGuid     - GUID of the variable to compare to 'Variable'

-  PtrTrack       - Variable Track Pointer structure that contains

-                   Variable Information.

-

-Returns:

-

-  EFI_SUCCESS    - Found match variable

-  EFI_NOT_FOUND  - Variable not found

-

---*/

-{

-  if (VariableName[0] == 0) {

-    PtrTrack->CurrPtr = Variable;

-    return EFI_SUCCESS;

-  } else {

-    //

-    // Don't use CompareGuid function here for performance reasons.

-    // Instead we compare the GUID a UINT32 at a time and branch

-    // on the first failed comparison.

-    //

-    if ((((INT32 *) VendorGuid)[0] == ((INT32 *) &Variable->VendorGuid)[0]) &&

-        (((INT32 *) VendorGuid)[1] == ((INT32 *) &Variable->VendorGuid)[1]) &&

-        (((INT32 *) VendorGuid)[2] == ((INT32 *) &Variable->VendorGuid)[2]) &&

-        (((INT32 *) VendorGuid)[3] == ((INT32 *) &Variable->VendorGuid)[3])

-        ) {

-      if (!CompareMem (VariableName, GET_VARIABLE_NAME_PTR (Variable), Variable->NameSize)) {

-        PtrTrack->CurrPtr = Variable;

-        return EFI_SUCCESS;

-      }

-    }

-  }

-

-  return EFI_NOT_FOUND;

-}

-

-STATIC

-EFI_STATUS

-EFIAPI

-FindVariable (

-  IN EFI_PEI_SERVICES         **PeiServices,

-  IN CONST  CHAR16            *VariableName,

-  IN CONST  EFI_GUID          *VendorGuid,

-  OUT VARIABLE_POINTER_TRACK  *PtrTrack

-  )

-/*++

-

-Routine Description:

-

-  This code finds variable in storage blocks (Non-Volatile)

-

-Arguments:

-

-  PeiServices    - General purpose services available to every PEIM.

-  VariableName   - Name of the variable to be found

-  VendorGuid     - Vendor GUID to be found.

-  PtrTrack       - Variable Track Pointer structure that contains

-                   Variable Information.

-

-Returns:

-

-  EFI_SUCCESS      - Variable found successfully

-  EFI_NOT_FOUND    - Variable not found

-  EFI_INVALID_PARAMETER  - Invalid variable name

-

---*/

-{

-  EFI_HOB_GUID_TYPE       *GuidHob;

-  VARIABLE_STORE_HEADER   *VariableStoreHeader;

-  VARIABLE_HEADER         *Variable;

-  VARIABLE_HEADER         *MaxIndex;

-  VARIABLE_INDEX_TABLE    *IndexTable;

-  UINT32                  Count;

-  UINT8                   *VariableBase;

-

-  if (VariableName != 0 && VendorGuid == NULL) {

-    return EFI_INVALID_PARAMETER;

-  }

-  //

-  // No Variable Address equals zero, so 0 as initial value is safe.

-  //

-  MaxIndex = 0;

-

-  GuidHob = GetFirstGuidHob (&mEfiVariableIndexTableGuid);

-  if (GuidHob == NULL) {

-    IndexTable = BuildGuidHob (&mEfiVariableIndexTableGuid, sizeof (VARIABLE_INDEX_TABLE));

-    IndexTable->Length      = 0;

-    IndexTable->StartPtr    = NULL;

-    IndexTable->EndPtr      = NULL;

-    IndexTable->GoneThrough = 0;

-  } else {

-    IndexTable = GET_GUID_HOB_DATA (GuidHob);

-    for (Count = 0; Count < IndexTable->Length; Count++)

-    {

-      MaxIndex = GetVariableByIndex (IndexTable, Count);

-

-      if (CompareWithValidVariable (MaxIndex, VariableName, VendorGuid, PtrTrack) == EFI_SUCCESS) {

-        PtrTrack->StartPtr  = IndexTable->StartPtr;

-        PtrTrack->EndPtr    = IndexTable->EndPtr;

-

-        return EFI_SUCCESS;

-      }

-    }

-

-    if (IndexTable->GoneThrough) {

-      return EFI_NOT_FOUND;

-    }

-  }

-  //

-  // If not found in HOB, then let's start from the MaxIndex we've found.

-  //

-  if (MaxIndex != NULL) {

-    Variable = GetNextVariablePtr (MaxIndex);

-  } else {

-    if (IndexTable->StartPtr || IndexTable->EndPtr) {

-      Variable = IndexTable->StartPtr;

-    } else {

-      VariableBase = (UINT8 *) (UINTN) PcdGet32 (PcdFlashNvStorageVariableBase);

-      VariableStoreHeader = (VARIABLE_STORE_HEADER *) (VariableBase + \

-                            ((EFI_FIRMWARE_VOLUME_HEADER *) (VariableBase)) -> HeaderLength);

-

-      if (GetVariableStoreStatus (VariableStoreHeader) != EfiValid) {

-        return EFI_UNSUPPORTED;

-      }

-

-      if (~VariableStoreHeader->Size == 0) {

-        return EFI_NOT_FOUND;

-      }

-      //

-      // Find the variable by walk through non-volatile variable store

-      //

-      IndexTable->StartPtr  = (VARIABLE_HEADER *) (VariableStoreHeader + 1);

-      IndexTable->EndPtr    = (VARIABLE_HEADER *) ((UINTN) VariableStoreHeader + VariableStoreHeader->Size);

-

-      //

-      // Start Pointers for the variable.

-      // Actual Data Pointer where data can be written.

-      //

-      Variable = IndexTable->StartPtr;

-    }

-  }

-  //

-  // Find the variable by walk through non-volatile variable store

-  //

-  PtrTrack->StartPtr  = IndexTable->StartPtr;

-  PtrTrack->EndPtr    = IndexTable->EndPtr;

-

-  while (IsValidVariableHeader (Variable) && (Variable <= IndexTable->EndPtr)) {

-    if (Variable->State == VAR_ADDED) {

-      //

-      // Record Variable in VariableIndex HOB

-      //

-      if (IndexTable->Length < VARIABLE_INDEX_TABLE_VOLUME)

-      {

-        VariableIndexTableUpdate (IndexTable, Variable);

-      }

-

-      if (CompareWithValidVariable (Variable, VariableName, VendorGuid, PtrTrack) == EFI_SUCCESS) {

-        return EFI_SUCCESS;

-      }

-    }

-

-    Variable = GetNextVariablePtr (Variable);

-  }

-  //

-  // If gone through the VariableStore, that means we never find in Firmware any more.

-  //

-  if (IndexTable->Length < VARIABLE_INDEX_TABLE_VOLUME) {

-    IndexTable->GoneThrough = 1;

-  }

-

-  PtrTrack->CurrPtr = NULL;

-

-  return EFI_NOT_FOUND;

-}

-

-EFI_STATUS

-EFIAPI

-PeiGetVariable (

-  IN CONST  EFI_PEI_READ_ONLY_VARIABLE2_PPI *This,

-  IN CONST  CHAR16                          *VariableName,

-  IN CONST  EFI_GUID                        *VariableGuid,

-  OUT       UINT32                          *Attributes,

-  IN OUT    UINTN                           *DataSize,

-  OUT       VOID                            *Data

-  )

-/*++

-

-Routine Description:

-

-  Provide the read variable functionality of the variable services.

-

-Arguments:

-

-  PeiServices - General purpose services available to every PEIM.

-

-  VariableName     - The variable name

-

-  VendorGuid       - The vendor's GUID

-

-  Attributes       - Pointer to the attribute

-

-  DataSize         - Size of data

-

-  Data             - Pointer to data

-

-Returns:

-

-  EFI_SUCCESS           - The interface could be successfully installed

-

-  EFI_NOT_FOUND         - The variable could not be discovered

-

-  EFI_BUFFER_TOO_SMALL  - The caller buffer is not large enough

-

---*/

-{

-  VARIABLE_POINTER_TRACK  Variable;

-  UINTN                   VarDataSize;

-  EFI_STATUS              Status;

-  EFI_PEI_SERVICES        **PeiServices;

-

-  PeiServices = GetPeiServicesTablePointer ();

-  if (VariableName == NULL || VariableGuid == NULL) {

-    return EFI_INVALID_PARAMETER;

-  }

-  //

-  // Find existing variable

-  //

-  Status = FindVariable (PeiServices, VariableName, VariableGuid, &Variable);

-  if (Variable.CurrPtr == NULL || Status != EFI_SUCCESS) {

-    return Status;

-  }

-  //

-  // Get data size

-  //

-  VarDataSize = Variable.CurrPtr->DataSize;

-  if (*DataSize >= VarDataSize) {

-    (*PeiServices)->CopyMem (Data, GET_VARIABLE_DATA_PTR (Variable.CurrPtr), VarDataSize);

-

-    if (Attributes != NULL) {

-      *Attributes = Variable.CurrPtr->Attributes;

-    }

-

-    *DataSize = VarDataSize;

-    return EFI_SUCCESS;

-  } else {

-    *DataSize = VarDataSize;

-    return EFI_BUFFER_TOO_SMALL;

-  }

-}

-

-EFI_STATUS

-EFIAPI

-PeiGetNextVariableName (

-  IN CONST  EFI_PEI_READ_ONLY_VARIABLE2_PPI *This,

-  IN OUT UINTN                              *VariableNameSize,

-  IN OUT CHAR16                             *VariableName,

-  IN OUT EFI_GUID                           *VariableGuid

-  )

-/*++

-

-Routine Description:

-

-  Provide the get next variable functionality of the variable services.

-

-Arguments:

-

-  PeiServices        - General purpose services available to every PEIM.

-  VariabvleNameSize  - The variable name's size.

-  VariableName       - A pointer to the variable's name.

-  VariableGuid       - A pointer to the EFI_GUID structure.

-

-  VariableNameSize - Size of the variable name

-

-  VariableName     - The variable name

-

-  VendorGuid       - The vendor's GUID

-

-Returns:

-

-  EFI_SUCCESS - The interface could be successfully installed

-

-  EFI_NOT_FOUND - The variable could not be discovered

-

---*/

-{

-  VARIABLE_POINTER_TRACK  Variable;

-  UINTN                   VarNameSize;

-  EFI_STATUS              Status;

-  EFI_PEI_SERVICES        **PeiServices;

-

-  PeiServices = GetPeiServicesTablePointer ();

-  if (VariableName == NULL) {

-    return EFI_INVALID_PARAMETER;

-  }

-

-  Status = FindVariable (PeiServices, VariableName, VariableGuid, &Variable);

-  if (Variable.CurrPtr == NULL || Status != EFI_SUCCESS) {

-    return Status;

-  }

-

-  if (VariableName[0] != 0) {

-    //

-    // If variable name is not NULL, get next variable

-    //

-    Variable.CurrPtr = GetNextVariablePtr (Variable.CurrPtr);

-  }

-

-  while (!(Variable.CurrPtr >= Variable.EndPtr || Variable.CurrPtr == NULL)) {

-    if (IsValidVariableHeader (Variable.CurrPtr)) {

-      if (Variable.CurrPtr->State == VAR_ADDED) {

-        VarNameSize = (UINTN) Variable.CurrPtr->NameSize;

-        if (VarNameSize <= *VariableNameSize) {

-          (*PeiServices)->CopyMem (VariableName, GET_VARIABLE_NAME_PTR (Variable.CurrPtr), VarNameSize);

-

-          (*PeiServices)->CopyMem (VariableGuid, &Variable.CurrPtr->VendorGuid, sizeof (EFI_GUID));

-

-          Status = EFI_SUCCESS;

-        } else {

-          Status = EFI_BUFFER_TOO_SMALL;

-        }

-

-        *VariableNameSize = VarNameSize;

-        return Status;

-        //

-        // Variable is found

-        //

-      } else {

-        Variable.CurrPtr = GetNextVariablePtr (Variable.CurrPtr);

-      }

-    } else {

-      break;

-    }

-  }

-

-  return EFI_NOT_FOUND;

-}

diff --git a/MdeModulePkg/Universal/VariablePei/Variable.dxs b/MdeModulePkg/Universal/VariablePei/Variable.dxs
deleted file mode 100644
index 8c2255a..0000000
--- a/MdeModulePkg/Universal/VariablePei/Variable.dxs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*++

-

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

-are licensed and made available under the terms and conditions of the BSD License         

-which accompanies this distribution.  The full text of the license may be found at        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

-

-Module Name:

-

-  Variable.dxs

-

-Abstract:

-

-  Dependency expression file for Variable PEIM.

-

---*/  

-//

-// Include common header file for this module.

-//

-#include "CommonHeader.h"

-

-#include <PeimDepex.h>

-

-DEPENDENCY_START

-  TRUE

-DEPENDENCY_END

-

-

diff --git a/MdeModulePkg/Universal/VariablePei/Variable.h b/MdeModulePkg/Universal/VariablePei/Variable.h
deleted file mode 100644
index 9747a8d..0000000
--- a/MdeModulePkg/Universal/VariablePei/Variable.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/*++

-

-Copyright (c) 2006 - 2007, Intel Corporation

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-Module Name:

-

-  Variable.h

-

-Abstract:

-

-  Tiano PEIM to provide the variable functionality

-

---*/

-

-#ifndef _PEI_VARIABLE_H

-#define _PEI_VARIABLE_H

-

-#include <PiPei.h>

-#include <Ppi/ReadOnlyVariable2.h>

-#include <Library/DebugLib.h>

-#include <Library/PeimEntryPoint.h>

-#include <Library/HobLib.h>

-#include <Library/PcdLib.h>

-#include <Library/BaseMemoryLib.h>

-#include <Library/PeiServicesTablePointerLib.h>

-

-

-//

-// BugBug: We need relcate the head file.

-//

-#include <Common/Variable.h>

-

-//

-// Define GET_PAD_SIZE to optimize compiler

-//

-#if ((ALIGNMENT == 0) || (ALIGNMENT == 1))

-#define GET_PAD_SIZE(a) (0)

-#else

-#define GET_PAD_SIZE(a) (((~a) + 1) & (ALIGNMENT - 1))

-#endif

-

-#define GET_VARIABLE_NAME_PTR(a)  (CHAR16 *) ((UINTN) (a) + sizeof (VARIABLE_HEADER))

-

-#define GET_VARIABLE_DATA_PTR(a) \

-  (UINT8 *) ((UINTN) GET_VARIABLE_NAME_PTR (a) + (a)->NameSize + GET_PAD_SIZE ((a)->NameSize))

-

-typedef struct {

-  VARIABLE_HEADER *CurrPtr;

-  VARIABLE_HEADER *EndPtr;

-  VARIABLE_HEADER *StartPtr;

-} VARIABLE_POINTER_TRACK;

-

-#define VARIABLE_INDEX_TABLE_VOLUME 122

-

-#define EFI_VARIABLE_INDEX_TABLE_GUID \

-  { 0x8cfdb8c8, 0xd6b2, 0x40f3, { 0x8e, 0x97, 0x02, 0x30, 0x7c, 0xc9, 0x8b, 0x7c } }

-

-typedef struct {

-  UINT16          Length;

-  UINT16          GoneThrough;

-  VARIABLE_HEADER *EndPtr;

-  VARIABLE_HEADER *StartPtr;

-  UINT16          Index[VARIABLE_INDEX_TABLE_VOLUME];

-} VARIABLE_INDEX_TABLE;

-

-

-//

-// Functions

-//

-EFI_STATUS

-EFIAPI

-PeimInitializeVariableServices (

-  IN EFI_FFS_FILE_HEADER       *FfsHeader,

-  IN EFI_PEI_SERVICES          **PeiServices

-  )

-/*++

-

-Routine Description:

-

-  TODO: Add function description

-

-Arguments:

-

-  FfsHeader   - TODO: add argument description

-  PeiServices - TODO: add argument description

-

-Returns:

-

-  TODO: add return values

-

---*/

-;

-

-EFI_STATUS

-EFIAPI

-PeiGetVariable (

-  IN CONST  EFI_PEI_READ_ONLY_VARIABLE2_PPI *This,

-  IN CONST  CHAR16                          *VariableName,

-  IN CONST  EFI_GUID                        *VariableGuid,

-  OUT       UINT32                          *Attributes,

-  IN OUT    UINTN                           *DataSize,

-  OUT       VOID                            *Data

-  )

-/*++

-

-Routine Description:

-

-  TODO: Add function description

-

-Arguments:

-

-  PeiServices   - TODO: add argument description

-  VariableName  - TODO: add argument description

-  VendorGuid    - TODO: add argument description

-  Attributes    - TODO: add argument description

-  DataSize      - TODO: add argument description

-  Data          - TODO: add argument description

-

-Returns:

-

-  TODO: add return values

-

---*/

-;

-

-EFI_STATUS

-EFIAPI

-PeiGetNextVariableName (

-  IN CONST  EFI_PEI_READ_ONLY_VARIABLE2_PPI *This,

-  IN OUT UINTN                              *VariableNameSize,

-  IN OUT CHAR16                             *VariableName,

-  IN OUT EFI_GUID                           *VariableGuid

-  )

-/*++

-

-Routine Description:

-

-  TODO: Add function description

-

-Arguments:

-

-  PeiServices       - TODO: add argument description

-  VariableNameSize  - TODO: add argument description

-  VariableName      - TODO: add argument description

-  VendorGuid        - TODO: add argument description

-

-Returns:

-

-  TODO: add return values

-

---*/

-;

-

-/**

-  Get one variable by the index count.

-

-  @param  IndexTable  The pointer to variable index table.

-  @param  Count       The index count of variable in index table.

-

-  @return The pointer to variable header indexed by count.

-

-**/

-VARIABLE_HEADER *

-GetVariableByIndex (

-  IN VARIABLE_INDEX_TABLE        *IndexTable,

-  IN UINT32                      Count

-  );

-

-/**

-  Record Variable in VariableIndex HOB.

-

-  Record Variable in VariableIndex HOB and update the length of variable index table.

-

-  @param  IndexTable  The pointer to variable index table.

-  @param  Variable    The pointer to the variable that will be recorded.

-

-  @retval VOID

-

-**/

-VOID

-VariableIndexTableUpdate (

-  IN OUT  VARIABLE_INDEX_TABLE   *IndexTable,

-  IN      VARIABLE_HEADER        *Variable

-  );

-

-#endif // _PEI_VARIABLE_H

diff --git a/MdeModulePkg/Universal/VariablePei/Variable.msa b/MdeModulePkg/Universal/VariablePei/Variable.msa
deleted file mode 100644
index 565ae31..0000000
--- a/MdeModulePkg/Universal/VariablePei/Variable.msa
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-  <MsaHeader>

-    <ModuleName>PeiVariable</ModuleName>

-    <ModuleType>PEIM</ModuleType>

-    <GuidValue>34C8C28F-B61C-45a2-8F2E-89E46BECC63B</GuidValue>

-    <Version>1.0</Version>

-    <Abstract>Component description file for PeiVariable module.</Abstract>

-    <Description>Framework PEIM to provide the Variable functionality.</Description>

-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>

-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

-  </MsaHeader>

-  <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64 IPF EBC</SupportedArchitectures>

-    <BinaryModule>false</BinaryModule>

-    <OutputFileBasename>PeiVariable</OutputFileBasename>

-  </ModuleDefinitions>

-  <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>DebugLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PeimEntryPoint</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>HobLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PcdLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseMemoryLib</Keyword>

-    </LibraryClass>

-  </LibraryClassDefinitions>

-  <SourceFiles>

-    <Filename>Variable.h</Filename>

-    <Filename>Variable.c</Filename>

-    <Filename>Variable.dxs</Filename>

-    <Filename SupArchList="IA32 X64 EBC">VariableWorker.c</Filename>

-    <Filename SupArchList="IPF">Ipf/VariableWorker.c</Filename>

-    <Filename SupArchList="IA32">Ia32/VarMachine.h</Filename>

-    <Filename SupArchList="EBC">Ebc/VarMachine.h</Filename>

-    <Filename SupArchList="X64">x64/VarMachine.h</Filename>

-    <Filename SupArchList="IPF">Ipf/VarMachine.h</Filename>

-  </SourceFiles>

-  <PackageDependencies>

-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

-  </PackageDependencies>

-  <PPIs>

-    <Ppi Usage="ALWAYS_CONSUMED">

-      <PpiCName>gEfiPeiReadOnlyVariablePpiGuid</PpiCName>

-    </Ppi>

-  </PPIs>

-  <Externs>

-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

-    <Extern>

-      <ModuleEntryPoint>PeimInitializeVariableServices</ModuleEntryPoint>

-    </Extern>

-  </Externs>

-  <PcdCoded>

-    <PcdEntry PcdItemType="DYNAMIC">

-      <C_Name>PcdFlashNvStorageVariableBase</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>The driver gets the Variable store base address from this PCD.  This base address point to
-        an EFI_FIRMWARE_VOLUMN_HEADER struct.</HelpText>

-    </PcdEntry>

-  </PcdCoded>

-</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/MdeModulePkg/Universal/VariablePei/VariablePei.inf b/MdeModulePkg/Universal/VariablePei/VariablePei.inf
deleted file mode 100644
index 72a6b79..0000000
--- a/MdeModulePkg/Universal/VariablePei/VariablePei.inf
+++ /dev/null
@@ -1,69 +0,0 @@
-#/** @file

-# Component description file for PeiVariable module.

-#

-# Framework PEIM to provide the Variable functionality.

-# Copyright (c) 2006 - 2007, Intel Corporation

-#

-#  All rights reserved. This program and the accompanying materials

-#  are licensed and made available under the terms and conditions of the BSD License

-#  which accompanies this distribution. The full text of the license may be found at

-#  http://opensource.org/licenses/bsd-license.php

-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-#

-#

-#**/

-

-[Defines]

-  INF_VERSION                    = 0x00010005

-  BASE_NAME                      = PeiVariable

-  FILE_GUID                      = 34C8C28F-B61C-45a2-8F2E-89E46BECC63B

-  MODULE_TYPE                    = PEIM

-  VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

-  EFI_SPECIFICATION_VERSION      = 0x00020000

-

-  ENTRY_POINT                    = PeimInitializeVariableServices

-

-#

-# The following information is for reference only and not required by the build tools.

-#

-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC

-#

-

-[Sources.common]

-  Variable.c

-  Variable.h

-

-[Sources.Ia32]

-  VariableWorker.c

-

-[Sources.X64]

-  VariableWorker.c

-

-[Sources.IPF]

-  Ipf/VariableWorker.c

-

-[Sources.EBC]

-  VariableWorker.c

-

-[Packages]

-  MdePkg/MdePkg.dec

-  MdeModulePkg/MdeModulePkg.dec

-

-[LibraryClasses]

-  BaseMemoryLib

-  PcdLib

-  HobLib

-  PeimEntryPoint

-  DebugLib

-  PeiServiceTablePointerLib

-

-[Ppis]

-  gEfiPeiReadOnlyVariable2PpiGuid                # PPI ALWAYS_CONSUMED

-

-[PcdsDynamic.common]

-  PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid

-

-[Depex]

-  TRUE

diff --git a/MdeModulePkg/Universal/VariablePei/VariableWorker.c b/MdeModulePkg/Universal/VariablePei/VariableWorker.c
deleted file mode 100644
index 1a49ee8..0000000
--- a/MdeModulePkg/Universal/VariablePei/VariableWorker.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*++

-

-Copyright (c) 2007, Intel Corporation

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-Module Name:

-

-  VariableWorker.c

-

-Abstract:

-

-  Framework PEIM to provide the Variable functionality

-

---*/

-

-#include <Variable.h>

-

-/**

-  Get one variable by the index count.

-

-  @param  IndexTable  The pointer to variable index table.

-  @param  Count       The index count of variable in index table.

-

-  @return The pointer to variable header indexed by count.

-

-**/

-VARIABLE_HEADER *

-GetVariableByIndex (

-  IN VARIABLE_INDEX_TABLE        *IndexTable,

-  IN UINT32                      Count

-  )

-{

-  return (VARIABLE_HEADER *) (UINTN) (IndexTable->Index[Count] + ((UINTN) IndexTable->StartPtr & 0xFFFF0000));

-}

-

-/**

-  Record Variable in VariableIndex HOB.

-

-  Record Variable in VariableIndex HOB and update the length of variable index table.

-

-  @param  IndexTable  The pointer to variable index table.

-  @param  Variable    The pointer to the variable that will be recorded.

-

-  @retval VOID

-

-**/

-VOID

-VariableIndexTableUpdate (

-  IN OUT  VARIABLE_INDEX_TABLE   *IndexTable,

-  IN      VARIABLE_HEADER        *Variable

-  )

-{

-  IndexTable->Index[IndexTable->Length++] = (UINT16) (UINTN) Variable;

-

-  return;

-}

-

diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/InitVariable.c b/MdeModulePkg/Universal/VariableRuntimeDxe/InitVariable.c
deleted file mode 100644
index 59403e9..0000000
--- a/MdeModulePkg/Universal/VariableRuntimeDxe/InitVariable.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*++

-

-Copyright (c) 2006 - 2007, Intel Corporation

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-Module Name:

-

-  InitVariable.c

-

-Abstract:

-

-Revision History

-

---*/

-

-#include "Variable.h"

-

-//

-// Event for Exit Boot Services Callback

-//

-STATIC EFI_EVENT mExitBootServicesEvent = NULL;

-

-

-//

-// Don't use module globals after the SetVirtualAddress map is signaled

-//

-extern ESAL_VARIABLE_GLOBAL *mVariableModuleGlobal;

-

-EFI_STATUS

-EFIAPI

-RuntimeServiceGetVariable (

-  IN CHAR16        *VariableName,

-  IN EFI_GUID      * VendorGuid,

-  OUT UINT32       *Attributes OPTIONAL,

-  IN OUT UINTN     *DataSize,

-  OUT VOID         *Data

-  )

-/*++

-

-Routine Description:

-

-Arguments:

-

-Returns:

-

---*/

-{

-  return GetVariable (

-          VariableName,

-          VendorGuid,

-          Attributes OPTIONAL,

-          DataSize,

-          Data,

-          &mVariableModuleGlobal->VariableGlobal[Physical],

-          mVariableModuleGlobal->FvbInstance

-          );

-}

-

-EFI_STATUS

-EFIAPI

-RuntimeServiceGetNextVariableName (

-  IN OUT UINTN     *VariableNameSize,

-  IN OUT CHAR16    *VariableName,

-  IN OUT EFI_GUID  *VendorGuid

-  )

-/*++

-

-Routine Description:

-

-Arguments:

-

-Returns:

-

---*/

-{

-  return GetNextVariableName (

-          VariableNameSize,

-          VariableName,

-          VendorGuid,

-          &mVariableModuleGlobal->VariableGlobal[Physical],

-          mVariableModuleGlobal->FvbInstance

-          );

-}

-

-EFI_STATUS

-EFIAPI

-RuntimeServiceSetVariable (

-  IN CHAR16        *VariableName,

-  IN EFI_GUID      *VendorGuid,

-  IN UINT32        Attributes,

-  IN UINTN         DataSize,

-  IN VOID          *Data

-  )

-/*++

-

-Routine Description:

-

-Arguments:

-

-Returns:

-

---*/

-{

-  return SetVariable (

-          VariableName,

-          VendorGuid,

-          Attributes,

-          DataSize,

-          Data,

-          &mVariableModuleGlobal->VariableGlobal[Physical],

-          &mVariableModuleGlobal->VolatileLastVariableOffset,

-          &mVariableModuleGlobal->NonVolatileLastVariableOffset,

-          mVariableModuleGlobal->FvbInstance

-          );

-}

-

-EFI_STATUS

-EFIAPI

-RuntimeServiceQueryVariableInfo (

-  IN  UINT32                 Attributes,

-  OUT UINT64                 *MaximumVariableStorageSize,

-  OUT UINT64                 *RemainingVariableStorageSize,

-  OUT UINT64                 *MaximumVariableSize

-  )

-/*++

-

-Routine Description:

-

-Arguments:

-

-Returns:

-

---*/

-{

-  return QueryVariableInfo (

-          Attributes,

-          MaximumVariableStorageSize,

-          RemainingVariableStorageSize,

-          MaximumVariableSize,

-          &mVariableModuleGlobal->VariableGlobal[Physical],

-          mVariableModuleGlobal->FvbInstance

-          );

-}

-

-VOID

-EFIAPI

-VariableClassAddressChangeEvent (

-  IN EFI_EVENT        Event,

-  IN VOID             *Context

-  )

-/*++

-

-Routine Description:

-

-Arguments:

-

-Returns:

-

---*/

-{

-  EfiConvertPointer (

-    0x0,

-    (VOID **) &mVariableModuleGlobal->VariableGlobal[Physical].NonVolatileVariableBase

-    );

-  EfiConvertPointer (

-    0x0,

-    (VOID **) &mVariableModuleGlobal->VariableGlobal[Physical].VolatileVariableBase

-    );

-  EfiConvertPointer (0x0, (VOID **) &mVariableModuleGlobal);

-}

-

-EFI_STATUS

-EFIAPI

-VariableServiceInitialize (

-  IN EFI_HANDLE         ImageHandle,

-  IN EFI_SYSTEM_TABLE   *SystemTable

-  )

-/*++

-

-Routine Description:

-

-Arguments:

-

-Returns:

-

---*/

-{

-  EFI_HANDLE  NewHandle;

-  EFI_STATUS  Status;

-

-  Status = VariableCommonInitialize (ImageHandle, SystemTable);

-  ASSERT_EFI_ERROR (Status);

-

-  SystemTable->RuntimeServices->GetVariable         = RuntimeServiceGetVariable;

-  SystemTable->RuntimeServices->GetNextVariableName = RuntimeServiceGetNextVariableName;

-  SystemTable->RuntimeServices->SetVariable         = RuntimeServiceSetVariable;

-  SystemTable->RuntimeServices->QueryVariableInfo   = RuntimeServiceQueryVariableInfo;

-

-  //

-  // Now install the Variable Runtime Architectural Protocol on a new handle

-  //

-  NewHandle = NULL;

-  Status = gBS->InstallMultipleProtocolInterfaces (

-                  &NewHandle,

-                  &gEfiVariableArchProtocolGuid,

-                  NULL,

-                  &gEfiVariableWriteArchProtocolGuid,

-                  NULL,

-                  NULL

-                  );

-  ASSERT_EFI_ERROR (Status);

-

-  Status = gBS->CreateEvent (

-                  EVT_SIGNAL_EXIT_BOOT_SERVICES,

-                  TPL_NOTIFY,

-                  VariableClassAddressChangeEvent,

-                  NULL,

-                  &mExitBootServicesEvent

-                  );

-  ASSERT_EFI_ERROR (Status);

-

-  return EFI_SUCCESS;

-}

diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c
deleted file mode 100644
index 784a198..0000000
--- a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c
+++ /dev/null
@@ -1,1477 +0,0 @@
-/*++

-

-Copyright (c) 2006 - 2007, Intel Corporation

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-Module Name:

-

-  Variable.c

-

-Abstract:

-

-Revision History

-

---*/

-

-

-#include "Variable.h"

-#include <Common/FlashMap.h>

-

-//

-// Don't use module globals after the SetVirtualAddress map is signaled

-//

-ESAL_VARIABLE_GLOBAL  *mVariableModuleGlobal;

-

-//

-// This is a temperary function which will be removed

-// when EfiAcquireLock in UefiLib can handle the

-// the call in UEFI Runtimer driver in RT phase.

-//

-STATIC

-VOID

-AcquireLockOnlyAtBootTime (

-  IN EFI_LOCK  *Lock

-  )

-{

-  if (!EfiAtRuntime ()) {

-    EfiAcquireLock (Lock);

-  }

-}

-

-//

-// This is a temperary function which will be removed

-// when EfiAcquireLock in UefiLib can handle the

-// the call in UEFI Runtimer driver in RT phase.

-//

-STATIC

-VOID

-ReleaseLockOnlyAtBootTime (

-  IN EFI_LOCK  *Lock

-  )

-{

-  if (!EfiAtRuntime ()) {

-    EfiReleaseLock (Lock);

-  }

-}

-

-STATIC

-BOOLEAN

-EFIAPI

-IsValidVariableHeader (

-  IN  VARIABLE_HEADER   *Variable

-  )

-/*++

-

-Routine Description:

-

-  This code checks if variable header is valid or not.

-

-Arguments:

-  Variable              Pointer to the Variable Header.

-

-Returns:

-  TRUE            Variable header is valid.

-  FALSE           Variable header is not valid.

-

---*/

-{

-  if (Variable == NULL ||

-      Variable->StartId != VARIABLE_DATA ||

-      (sizeof (VARIABLE_HEADER) + Variable->NameSize + Variable->DataSize) > MAX_VARIABLE_SIZE

-      ) {

-    return FALSE;

-  }

-

-  return TRUE;

-}

-

-STATIC

-EFI_STATUS

-EFIAPI

-UpdateVariableStore (

-  IN  VARIABLE_GLOBAL         *Global,

-  IN  BOOLEAN                 Volatile,

-  IN  BOOLEAN                 SetByIndex,

-  IN  UINTN                   Instance,

-  IN  UINTN                   DataPtrIndex,

-  IN  UINT32                  DataSize,

-  IN  UINT8                   *Buffer

-  )

-/*++

-

-Routine Description:

-

-  This function writes data to the FWH at the correct LBA even if the LBAs

-  are fragmented.

-

-Arguments:

-

-  Global            Pointer to VARAIBLE_GLOBAL structure

-  Volatile          If the Variable is Volatile or Non-Volatile

-  SetByIndex        TRUE: Target pointer is given as index

-                    FALSE: Target pointer is absolute

-  Instance          Instance of FV Block services

-  DataPtrIndex      Pointer to the Data from the end of VARIABLE_STORE_HEADER

-                    structure

-  DataSize          Size of data to be written.

-  Buffer            Pointer to the buffer from which data is written

-

-Returns:

-

-  EFI STATUS

-

---*/

-{

-  EFI_FV_BLOCK_MAP_ENTRY      *PtrBlockMapEntry;

-  UINTN                       BlockIndex2;

-  UINTN                       LinearOffset;

-  UINTN                       CurrWriteSize;

-  UINTN                       CurrWritePtr;

-  UINT8                       *CurrBuffer;

-  EFI_LBA                     LbaNumber;

-  UINTN                       Size;

-  EFI_FIRMWARE_VOLUME_HEADER  *FwVolHeader;

-  VARIABLE_STORE_HEADER       *VolatileBase;

-  EFI_PHYSICAL_ADDRESS        FvVolHdr;

-  EFI_PHYSICAL_ADDRESS        DataPtr;

-  EFI_STATUS                  Status;

-

-  FwVolHeader = NULL;

-  DataPtr     = DataPtrIndex;

-

-  //

-  // Check if the Data is Volatile

-  //

-  if (!Volatile) {

-    EfiFvbGetPhysicalAddress (Instance, &FvVolHdr);

-    FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) ((UINTN) FvVolHdr);

-    //

-    // Data Pointer should point to the actual Address where data is to be

-    // written

-    //

-    if (SetByIndex) {

-      DataPtr += Global->NonVolatileVariableBase;

-    }

-

-    if ((DataPtr + DataSize) >= ((EFI_PHYSICAL_ADDRESS) (UINTN) ((UINT8 *) FwVolHeader + FwVolHeader->FvLength))) {

-      return EFI_INVALID_PARAMETER;

-    }

-  } else {

-    //

-    // Data Pointer should point to the actual Address where data is to be

-    // written

-    //

-    VolatileBase = (VARIABLE_STORE_HEADER *) ((UINTN) Global->VolatileVariableBase);

-    if (SetByIndex) {

-      DataPtr += Global->VolatileVariableBase;

-    }

-

-    if ((DataPtr + DataSize) >= ((UINTN) ((UINT8 *) VolatileBase + VolatileBase->Size))) {

-      return EFI_INVALID_PARAMETER;

-    }

-  }

-  //

-  // If Volatile Variable just do a simple mem copy.

-  //

-  if (Volatile) {

-    CopyMem ((UINT8 *) ((UINTN) DataPtr), Buffer, DataSize);

-    return EFI_SUCCESS;

-  }

-  //

-  // If we are here we are dealing with Non-Volatile Variables

-  //

-  LinearOffset  = (UINTN) FwVolHeader;

-  CurrWritePtr  = (UINTN) DataPtr;

-  CurrWriteSize = DataSize;

-  CurrBuffer    = Buffer;

-  LbaNumber     = 0;

-

-  if (CurrWritePtr < LinearOffset) {

-    return EFI_INVALID_PARAMETER;

-  }

-

-  for (PtrBlockMapEntry = FwVolHeader->BlockMap; PtrBlockMapEntry->NumBlocks != 0; PtrBlockMapEntry++) {

-    for (BlockIndex2 = 0; BlockIndex2 < PtrBlockMapEntry->NumBlocks; BlockIndex2++) {

-      //

-      // Check to see if the Variable Writes are spanning through multiple

-      // blocks.

-      //

-      if ((CurrWritePtr >= LinearOffset) && (CurrWritePtr < LinearOffset + PtrBlockMapEntry->Length)) {

-        if ((CurrWritePtr + CurrWriteSize) <= (LinearOffset + PtrBlockMapEntry->Length)) {

-          Status = EfiFvbWriteBlock (

-                    Instance,

-                    LbaNumber,

-                    (UINTN) (CurrWritePtr - LinearOffset),

-                    &CurrWriteSize,

-                    CurrBuffer

-                    );

-          if (EFI_ERROR (Status)) {

-            return Status;

-          }

-        } else {

-          Size = (UINT32) (LinearOffset + PtrBlockMapEntry->Length - CurrWritePtr);

-          Status = EfiFvbWriteBlock (

-                    Instance,

-                    LbaNumber,

-                    (UINTN) (CurrWritePtr - LinearOffset),

-                    &Size,

-                    CurrBuffer

-                    );

-          if (EFI_ERROR (Status)) {

-            return Status;

-          }

-

-          CurrWritePtr  = LinearOffset + PtrBlockMapEntry->Length;

-          CurrBuffer    = CurrBuffer + Size;

-          CurrWriteSize = CurrWriteSize - Size;

-        }

-      }

-

-      LinearOffset += PtrBlockMapEntry->Length;

-      LbaNumber++;

-    }

-  }

-

-  return EFI_SUCCESS;

-}

-

-STATIC

-VARIABLE_STORE_STATUS

-EFIAPI

-GetVariableStoreStatus (

-  IN VARIABLE_STORE_HEADER *VarStoreHeader

-  )

-/*++

-

-Routine Description:

-

-  This code gets the current status of Variable Store.

-

-Arguments:

-

-  VarStoreHeader  Pointer to the Variable Store Header.

-

-Returns:

-

-  EfiRaw        Variable store status is raw

-  EfiValid      Variable store status is valid

-  EfiInvalid    Variable store status is invalid

-

---*/

-{

-  if (VarStoreHeader->Signature == VARIABLE_STORE_SIGNATURE &&

-      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

-          ) {

-

-    return EfiRaw;

-  } else {

-    return EfiInvalid;

-  }

-}

-

-STATIC

-UINT8 *

-EFIAPI

-GetVariableDataPtr (

-  IN  VARIABLE_HEADER   *Variable

-  )

-/*++

-

-Routine Description:

-

-  This code gets the pointer to the variable data.

-

-Arguments:

-

-  Variable            Pointer to the Variable Header.

-

-Returns:

-

-  UINT8*              Pointer to Variable Data

-

---*/

-{

-  //

-  // Be careful about pad size for alignment

-  //

-  return (UINT8 *) ((UINTN) GET_VARIABLE_NAME_PTR (Variable) + Variable->NameSize + GET_PAD_SIZE (Variable->NameSize));

-}

-

-STATIC

-VARIABLE_HEADER *

-EFIAPI

-GetNextVariablePtr (

-  IN  VARIABLE_HEADER   *Variable

-  )

-/*++

-

-Routine Description:

-

-  This code gets the pointer to the next variable header.

-

-Arguments:

-

-  Variable              Pointer to the Variable Header.

-

-Returns:

-

-  VARIABLE_HEADER*      Pointer to next variable header.

-

---*/

-{

-  if (!IsValidVariableHeader (Variable)) {

-    return NULL;

-  }

-  //

-  // Be careful about pad size for alignment

-  //

-  return (VARIABLE_HEADER *) ((UINTN) GetVariableDataPtr (Variable) + Variable->DataSize + GET_PAD_SIZE (Variable->DataSize));

-}

-

-STATIC

-VARIABLE_HEADER *

-EFIAPI

-GetEndPointer (

-  IN VARIABLE_STORE_HEADER       *VarStoreHeader

-  )

-/*++

-

-Routine Description:

-

-  This code gets the pointer to the last variable memory pointer byte

-

-Arguments:

-

-  VarStoreHeader        Pointer to the Variable Store Header.

-

-Returns:

-

-  VARIABLE_HEADER*      Pointer to last unavailable Variable Header

-

---*/

-{

-  //

-  // The end of variable store

-  //

-  return (VARIABLE_HEADER *) ((UINTN) VarStoreHeader + VarStoreHeader->Size);

-}

-

-STATIC

-EFI_STATUS

-EFIAPI

-Reclaim (

-  IN  EFI_PHYSICAL_ADDRESS  VariableBase,

-  OUT UINTN                 *LastVariableOffset,

-  IN  BOOLEAN               IsVolatile

-  )

-/*++

-

-Routine Description:

-

-  Variable store garbage collection and reclaim operation

-

-Arguments:

-

-  VariableBase                Base address of variable store

-  LastVariableOffset          Offset of last variable

-  IsVolatile                  The variable store is volatile or not,

-                              if it is non-volatile, need FTW

-

-Returns:

-

-  EFI STATUS

-

---*/

-{

-  VARIABLE_HEADER       *Variable;

-  VARIABLE_HEADER       *NextVariable;

-  VARIABLE_STORE_HEADER *VariableStoreHeader;

-  UINT8                 *ValidBuffer;

-  UINTN                 ValidBufferSize;

-  UINTN                 VariableSize;

-  UINT8                 *CurrPtr;

-  EFI_STATUS            Status;

-

-  VariableStoreHeader = (VARIABLE_STORE_HEADER *) ((UINTN) VariableBase);

-

-  //

-  // Start Pointers for the variable.

-  //

-  Variable        = (VARIABLE_HEADER *) (VariableStoreHeader + 1);

-

-  ValidBufferSize = sizeof (VARIABLE_STORE_HEADER);

-

-  while (IsValidVariableHeader (Variable)) {

-    NextVariable = GetNextVariablePtr (Variable);

-    if (Variable->State == VAR_ADDED) {

-      VariableSize = (UINTN) NextVariable - (UINTN) Variable;

-      ValidBufferSize += VariableSize;

-    }

-

-    Variable = NextVariable;

-  }

-

-  ValidBuffer = AllocatePool (ValidBufferSize);

-  if (ValidBuffer == NULL) {

-    return EFI_OUT_OF_RESOURCES;

-  }

-

-  SetMem (ValidBuffer, ValidBufferSize, 0xff);

-

-  CurrPtr = ValidBuffer;

-

-  //

-  // Copy variable store header

-  //

-  CopyMem (CurrPtr, VariableStoreHeader, sizeof (VARIABLE_STORE_HEADER));

-  CurrPtr += sizeof (VARIABLE_STORE_HEADER);

-

-  //

-  // Start Pointers for the variable.

-  //

-  Variable = (VARIABLE_HEADER *) (VariableStoreHeader + 1);

-

-  while (IsValidVariableHeader (Variable)) {

-    NextVariable = GetNextVariablePtr (Variable);

-    if (Variable->State == VAR_ADDED) {

-      VariableSize = (UINTN) NextVariable - (UINTN) Variable;

-      CopyMem (CurrPtr, (UINT8 *) Variable, VariableSize);

-      CurrPtr += VariableSize;

-    }

-

-    Variable = NextVariable;

-  }

-

-  if (IsVolatile) {

-    //

-    // If volatile variable store, just copy valid buffer

-    //

-    SetMem ((UINT8 *) (UINTN) VariableBase, VariableStoreHeader->Size, 0xff);

-    CopyMem ((UINT8 *) (UINTN) VariableBase, ValidBuffer, ValidBufferSize);

-    *LastVariableOffset = ValidBufferSize;

-    Status              = EFI_SUCCESS;

-  } else {

-    //

-    // If non-volatile variable store, perform FTW here.

-    //

-    Status = FtwVariableSpace (

-              VariableBase,

-              ValidBuffer,

-              ValidBufferSize

-              );

-    if (!EFI_ERROR (Status)) {

-      *LastVariableOffset = ValidBufferSize;

-    }

-  }

-

-  FreePool (ValidBuffer);

-

-  if (EFI_ERROR (Status)) {

-    *LastVariableOffset = 0;

-  }

-

-  return Status;

-}

-

-STATIC

-EFI_STATUS

-EFIAPI

-FindVariable (

-  IN  CHAR16                  *VariableName,

-  IN  EFI_GUID                *VendorGuid,

-  OUT VARIABLE_POINTER_TRACK  *PtrTrack,

-  IN  VARIABLE_GLOBAL         *Global

-  )

-/*++

-

-Routine Description:

-

-  This code finds variable in storage blocks (Volatile or Non-Volatile)

-

-Arguments:

-

-  VariableName                Name of the variable to be found

-  VendorGuid                  Vendor GUID to be found.

-  PtrTrack                    Variable Track Pointer structure that contains

-                              Variable Information.

-                              Contains the pointer of Variable header.

-  Global                      VARIABLE_GLOBAL pointer

-

-Returns:

-

-  EFI STATUS

-

---*/

-{

-  VARIABLE_HEADER       *Variable[2];

-  VARIABLE_STORE_HEADER *VariableStoreHeader[2];

-  UINTN                 Index;

-

-  //

-  // We aquire the lock at the entry of FindVariable as GetVariable, GetNextVariableName

-  // SetVariable all call FindVariable at entry point. Please move "Aquire Lock" to

-  // the correct places if this assumption does not hold TRUE anymore.

-  //

-  AcquireLockOnlyAtBootTime(&Global->VariableServicesLock);

-

-  //

-  // 0: Non-Volatile, 1: Volatile

-  //

-  VariableStoreHeader[0]  = (VARIABLE_STORE_HEADER *) ((UINTN) Global->NonVolatileVariableBase);

-  VariableStoreHeader[1]  = (VARIABLE_STORE_HEADER *) ((UINTN) Global->VolatileVariableBase);

-

-  //

-  // Start Pointers for the variable.

-  // Actual Data Pointer where data can be written.

-  //

-  Variable[0] = (VARIABLE_HEADER *) (VariableStoreHeader[0] + 1);

-  Variable[1] = (VARIABLE_HEADER *) (VariableStoreHeader[1] + 1);

-

-  if (VariableName[0] != 0 && VendorGuid == NULL) {

-    return EFI_INVALID_PARAMETER;

-  }

-  //

-  // Find the variable by walk through non-volatile and volatile variable store

-  //

-  for (Index = 0; Index < 2; Index++) {

-    PtrTrack->StartPtr  = (VARIABLE_HEADER *) (VariableStoreHeader[Index] + 1);

-    PtrTrack->EndPtr    = GetEndPointer (VariableStoreHeader[Index]);

-

-    while (IsValidVariableHeader (Variable[Index]) && (Variable[Index] <= GetEndPointer (VariableStoreHeader[Index]))) {

-      if (Variable[Index]->State == VAR_ADDED) {

-        if (!(EfiAtRuntime () && !(Variable[Index]->Attributes & EFI_VARIABLE_RUNTIME_ACCESS))) {

-          if (VariableName[0] == 0) {

-            PtrTrack->CurrPtr   = Variable[Index];

-            PtrTrack->Volatile  = (BOOLEAN) Index;

-            return EFI_SUCCESS;

-          } else {

-            if (CompareGuid (VendorGuid, &Variable[Index]->VendorGuid)) {

-              if (!CompareMem (VariableName, GET_VARIABLE_NAME_PTR (Variable[Index]), Variable[Index]->NameSize)) {

-                PtrTrack->CurrPtr   = Variable[Index];

-                PtrTrack->Volatile  = (BOOLEAN) Index;

-                return EFI_SUCCESS;

-              }

-            }

-          }

-        }

-      }

-

-      Variable[Index] = GetNextVariablePtr (Variable[Index]);

-    }

-    //

-    // While (...)

-    //

-  }

-  //

-  // for (...)

-  //

-  PtrTrack->CurrPtr = NULL;

-  return EFI_NOT_FOUND;

-}

-

-EFI_STATUS

-EFIAPI

-GetVariable (

-  IN      CHAR16            *VariableName,

-  IN      EFI_GUID          * VendorGuid,

-  OUT     UINT32            *Attributes OPTIONAL,

-  IN OUT  UINTN             *DataSize,

-  OUT     VOID              *Data,

-  IN      VARIABLE_GLOBAL   * Global,

-  IN      UINT32            Instance

-  )

-/*++

-

-Routine Description:

-

-  This code finds variable in storage blocks (Volatile or Non-Volatile)

-

-Arguments:

-

-  VariableName                    Name of Variable to be found

-  VendorGuid                      Variable vendor GUID

-  Attributes OPTIONAL             Attribute value of the variable found

-  DataSize                        Size of Data found. If size is less than the

-                                  data, this value contains the required size.

-  Data                            Data pointer

-  Global                          Pointer to VARIABLE_GLOBAL structure

-  Instance                        Instance of the Firmware Volume.

-

-Returns:

-

-  EFI STATUS

-

---*/

-{

-  VARIABLE_POINTER_TRACK  Variable;

-  UINTN                   VarDataSize;

-  EFI_STATUS              Status;

-

-  if (VariableName == NULL || VendorGuid == NULL || DataSize == NULL) {

-    return EFI_INVALID_PARAMETER;

-  }

-  //

-  // Find existing variable

-  //

-  Status = FindVariable (VariableName, VendorGuid, &Variable, Global);

-

-  if (Variable.CurrPtr == NULL || EFI_ERROR (Status)) {

-    goto Done;

-  }

-  //

-  // Get data size

-  //

-  VarDataSize = Variable.CurrPtr->DataSize;

-  if (*DataSize >= VarDataSize) {

-    if (Data == NULL) {

-      Status = EFI_INVALID_PARAMETER;

-      goto Done;

-    }

-

-    CopyMem (Data, GetVariableDataPtr (Variable.CurrPtr), VarDataSize);

-    if (Attributes != NULL) {

-      *Attributes = Variable.CurrPtr->Attributes;

-    }

-

-    *DataSize = VarDataSize;

-    Status = EFI_SUCCESS;

-    goto Done;

-  } else {

-    *DataSize = VarDataSize;

-    Status = EFI_BUFFER_TOO_SMALL;

-    goto Done;

-  }

-

-Done:

-  ReleaseLockOnlyAtBootTime (&Global->VariableServicesLock);

-  return Status;

-}

-

-EFI_STATUS

-EFIAPI

-GetNextVariableName (

-  IN OUT  UINTN             *VariableNameSize,

-  IN OUT  CHAR16            *VariableName,

-  IN OUT  EFI_GUID          *VendorGuid,

-  IN      VARIABLE_GLOBAL   *Global,

-  IN      UINT32            Instance

-  )

-/*++

-

-Routine Description:

-

-  This code Finds the Next available variable

-

-Arguments:

-

-  VariableNameSize            Size of the variable

-  VariableName                Pointer to variable name

-  VendorGuid                  Variable Vendor Guid

-  Global                      VARIABLE_GLOBAL structure pointer.

-  Instance                    FV instance

-

-Returns:

-

-  EFI STATUS

-

---*/

-{

-  VARIABLE_POINTER_TRACK  Variable;

-  UINTN                   VarNameSize;

-  EFI_STATUS              Status;

-

-  if (VariableNameSize == NULL || VariableName == NULL || VendorGuid == NULL) {

-    return EFI_INVALID_PARAMETER;

-  }

-

-  Status = FindVariable (VariableName, VendorGuid, &Variable, Global);

-

-  if (Variable.CurrPtr == NULL || EFI_ERROR (Status)) {

-    goto Done;

-  }

-

-  if (VariableName[0] != 0) {

-    //

-    // If variable name is not NULL, get next variable

-    //

-    Variable.CurrPtr = GetNextVariablePtr (Variable.CurrPtr);

-  }

-

-  while (TRUE) {

-    //

-    // If both volatile and non-volatile variable store are parsed,

-    // return not found

-    //

-    if (Variable.CurrPtr >= Variable.EndPtr || Variable.CurrPtr == NULL) {

-      Variable.Volatile = (BOOLEAN) (Variable.Volatile ^ ((BOOLEAN) 0x1));

-      if (Variable.Volatile) {

-        Variable.StartPtr = (VARIABLE_HEADER *) ((UINTN) (Global->VolatileVariableBase + sizeof (VARIABLE_STORE_HEADER)));

-        Variable.EndPtr = (VARIABLE_HEADER *) GetEndPointer ((VARIABLE_STORE_HEADER *) ((UINTN) Global->VolatileVariableBase));

-      } else {

-        Status = EFI_NOT_FOUND;

-        goto Done;

-      }

-

-      Variable.CurrPtr = Variable.StartPtr;

-      if (!IsValidVariableHeader (Variable.CurrPtr)) {

-        continue;

-      }

-    }

-    //

-    // Variable is found

-    //

-    if (IsValidVariableHeader (Variable.CurrPtr) && Variable.CurrPtr->State == VAR_ADDED) {

-      if (!(EfiAtRuntime () && !(Variable.CurrPtr->Attributes & EFI_VARIABLE_RUNTIME_ACCESS))) {

-        VarNameSize = Variable.CurrPtr->NameSize;

-        if (VarNameSize <= *VariableNameSize) {

-          CopyMem (

-            VariableName,

-            GET_VARIABLE_NAME_PTR (Variable.CurrPtr),

-            VarNameSize

-            );

-          CopyMem (

-            VendorGuid,

-            &Variable.CurrPtr->VendorGuid,

-            sizeof (EFI_GUID)

-            );

-          Status = EFI_SUCCESS;

-        } else {

-          Status = EFI_BUFFER_TOO_SMALL;

-        }

-

-        *VariableNameSize = VarNameSize;

-        goto Done;

-      }

-    }

-

-    Variable.CurrPtr = GetNextVariablePtr (Variable.CurrPtr);

-  }

-

-Done:

-  ReleaseLockOnlyAtBootTime (&Global->VariableServicesLock);

-  return Status;

-}

-

-EFI_STATUS

-EFIAPI

-SetVariable (

-  IN CHAR16                  *VariableName,

-  IN EFI_GUID                *VendorGuid,

-  IN UINT32                  Attributes,

-  IN UINTN                   DataSize,

-  IN VOID                    *Data,

-  IN VARIABLE_GLOBAL         *Global,

-  IN UINTN                   *VolatileOffset,

-  IN UINTN                   *NonVolatileOffset,

-  IN UINT32                  Instance

-  )

-/*++

-

-Routine Description:

-

-  This code sets variable in storage blocks (Volatile or Non-Volatile)

-

-Arguments:

-

-  VariableName                    Name of Variable to be found

-  VendorGuid                      Variable vendor GUID

-  Attributes                      Attribute value of the variable found

-  DataSize                        Size of Data found. If size is less than the

-                                  data, this value contains the required size.

-  Data                            Data pointer

-  Global                          Pointer to VARIABLE_GLOBAL structure

-  VolatileOffset                  The offset of last volatile variable

-  NonVolatileOffset               The offset of last non-volatile variable

-  Instance                        Instance of the Firmware Volume.

-

-Returns:

-

-  EFI STATUS

-  EFI_INVALID_PARAMETER           - Invalid parameter

-  EFI_SUCCESS                     - Set successfully

-  EFI_OUT_OF_RESOURCES            - Resource not enough to set variable

-  EFI_NOT_FOUND                   - Not found

-

---*/

-{

-  VARIABLE_POINTER_TRACK  Variable;

-  EFI_STATUS              Status;

-  VARIABLE_HEADER         *NextVariable;

-  UINTN                   VarNameSize;

-  UINTN                   VarNameOffset;

-  UINTN                   VarDataOffset;

-  UINTN                   VarSize;

-  UINT8                   State;

-  BOOLEAN                 Reclaimed;

-

-  Reclaimed = FALSE;

-

-  if (VariableName == NULL || VariableName[0] == 0 || VendorGuid == NULL) {

-    return EFI_INVALID_PARAMETER;

-  }

-

-  Status = FindVariable (VariableName, VendorGuid, &Variable, Global);

-

-  if (Status == EFI_INVALID_PARAMETER) {

-    goto Done;

-  } else if (!EFI_ERROR (Status) && Variable.Volatile && EfiAtRuntime()) {

-    //

-    // If EfiAtRuntime and the variable is Volatile and Runtime Access,

-    // the volatile is ReadOnly, and SetVariable should be aborted and

-    // return EFI_WRITE_PROTECTED.

-    //

-    Status = EFI_WRITE_PROTECTED;

-    goto Done;

-  } else if (sizeof (VARIABLE_HEADER) + StrSize (VariableName) + DataSize > MAX_VARIABLE_SIZE) {

-    //

-    //  The size of the VariableName, including the Unicode Null in bytes plus

-    //  the DataSize is limited to maximum size of MAX_VARIABLE_SIZE (1024) bytes.

-    //

-    Status = EFI_INVALID_PARAMETER;

-    goto Done;

-  } else if (Attributes == EFI_VARIABLE_NON_VOLATILE) {

-    //

-    //  Make sure not only EFI_VARIABLE_NON_VOLATILE is set

-    //

-    Status = EFI_INVALID_PARAMETER;

-    goto Done;

-  } else if ((Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) ==

-                EFI_VARIABLE_RUNTIME_ACCESS) {

-    //

-    //  Make sure if runtime bit is set, boot service bit is set also

-    //

-    Status = EFI_INVALID_PARAMETER;

-    goto Done;

-  } else if (EfiAtRuntime () && Attributes && !(Attributes & EFI_VARIABLE_RUNTIME_ACCESS)) {

-    //

-    // Runtime but Attribute is not Runtime

-    //

-    Status = EFI_INVALID_PARAMETER;

-    goto Done;

-  } else if (EfiAtRuntime () && Attributes && !(Attributes & EFI_VARIABLE_NON_VOLATILE)) {

-    //

-    // Cannot set volatile variable in Runtime

-    //

-    Status = EFI_INVALID_PARAMETER;

-    goto Done;

-  } else if (DataSize == 0 || (Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == 0) {

-    //

-    // Setting a data variable with no access, or zero DataSize attributes

-    // specified causes it to be deleted.

-    //

-    if (!EFI_ERROR (Status)) {

-      State = Variable.CurrPtr->State;

-      State &= VAR_DELETED;

-

-      Status = UpdateVariableStore (

-                Global,

-                Variable.Volatile,

-                FALSE,

-                Instance,

-                (UINTN) &Variable.CurrPtr->State,

-                sizeof (UINT8),

-                &State

-                );

-      if (EFI_ERROR (Status)) {

-        goto Done;

-      }

-

-      Status = EFI_SUCCESS;

-      goto Done;

-    }

-

-    Status = EFI_NOT_FOUND;

-    goto Done;

-  } else {

-    if (!EFI_ERROR (Status)) {

-      //

-      // If the variable is marked valid and the same data has been passed in

-      // then return to the caller immediately.

-      //

-      if (Variable.CurrPtr->DataSize == DataSize &&

-          !CompareMem (Data, GetVariableDataPtr (Variable.CurrPtr), DataSize)

-            ) {

-        Status = EFI_SUCCESS;

-        goto Done;

-      } else if (Variable.CurrPtr->State == VAR_ADDED) {

-        //

-        // Mark the old variable as in delete transition

-        //

-        State = Variable.CurrPtr->State;

-        State &= VAR_IN_DELETED_TRANSITION;

-

-        Status = UpdateVariableStore (

-                  Global,

-                  Variable.Volatile,

-                  FALSE,

-                  Instance,

-                  (UINTN) &Variable.CurrPtr->State,

-                  sizeof (UINT8),

-                  &State

-                  );

-        if (EFI_ERROR (Status)) {

-          goto Done;

-        }

-      }

-    }

-    //

-    // Create a new variable and copy the data.

-    //

-    // Tricky part: Use scratch data area at the end of volatile variable store

-    // as a temporary storage.

-    //

-    NextVariable = GetEndPointer ((VARIABLE_STORE_HEADER *) ((UINTN) Global->VolatileVariableBase));

-

-    SetMem (NextVariable, SCRATCH_SIZE, 0xff);

-

-    NextVariable->StartId     = VARIABLE_DATA;

-    NextVariable->Attributes  = Attributes;

-    //

-    // NextVariable->State = VAR_ADDED;

-    //

-    NextVariable->Reserved  = 0;

-    VarNameOffset           = sizeof (VARIABLE_HEADER);

-    VarNameSize             = StrSize (VariableName);

-    CopyMem (

-      (UINT8 *) ((UINTN) NextVariable + VarNameOffset),

-      VariableName,

-      VarNameSize

-      );

-    VarDataOffset = VarNameOffset + VarNameSize + GET_PAD_SIZE (VarNameSize);

-    CopyMem (

-      (UINT8 *) ((UINTN) NextVariable + VarDataOffset),

-      Data,

-      DataSize

-      );

-    CopyMem (&NextVariable->VendorGuid, VendorGuid, sizeof (EFI_GUID));

-    //

-    // There will be pad bytes after Data, the NextVariable->NameSize and

-    // NextVariable->DataSize should not include pad size so that variable

-    // service can get actual size in GetVariable

-    //

-    NextVariable->NameSize  = (UINT32)VarNameSize;

-    NextVariable->DataSize  = (UINT32)DataSize;

-

-    //

-    // The actual size of the variable that stores in storage should

-    // include pad size.

-    //

-    VarSize = VarDataOffset + DataSize + GET_PAD_SIZE (DataSize);

-    if (Attributes & EFI_VARIABLE_NON_VOLATILE) {

-      if ((UINT32) (VarSize +*NonVolatileOffset) >

-            ((VARIABLE_STORE_HEADER *) ((UINTN) (Global->NonVolatileVariableBase)))->Size

-            ) {

-        if (EfiAtRuntime ()) {

-          Status = EFI_OUT_OF_RESOURCES;

-          goto Done;

-        }

-        //

-        // Perform garbage collection & reclaim operation

-        //

-        Status = Reclaim (Global->NonVolatileVariableBase, NonVolatileOffset, FALSE);

-        if (EFI_ERROR (Status)) {

-          goto Done;

-        }

-        //

-        // If still no enough space, return out of resources

-        //

-        if ((UINT32) (VarSize +*NonVolatileOffset) >

-              ((VARIABLE_STORE_HEADER *) ((UINTN) (Global->NonVolatileVariableBase)))->Size

-              ) {

-          Status = EFI_OUT_OF_RESOURCES;

-          goto Done;

-        }

-

-        Reclaimed = TRUE;

-      }

-      //

-      // Three steps

-      // 1. Write variable header

-      // 2. Write variable data

-      // 3. Set variable state to valid

-      //

-      //

-      // Step 1:

-      //

-      Status = UpdateVariableStore (

-                Global,

-                FALSE,

-                TRUE,

-                Instance,

-                *NonVolatileOffset,

-                sizeof (VARIABLE_HEADER),

-                (UINT8 *) NextVariable

-                );

-

-      if (EFI_ERROR (Status)) {

-        goto Done;

-      }

-      //

-      // Step 2:

-      //

-      Status = UpdateVariableStore (

-                Global,

-                FALSE,

-                TRUE,

-                Instance,

-                *NonVolatileOffset + sizeof (VARIABLE_HEADER),

-                (UINT32) VarSize - sizeof (VARIABLE_HEADER),

-                (UINT8 *) NextVariable + sizeof (VARIABLE_HEADER)

-                );

-

-      if (EFI_ERROR (Status)) {

-        goto Done;

-      }

-      //

-      // Step 3:

-      //

-      NextVariable->State = VAR_ADDED;

-      Status = UpdateVariableStore (

-                Global,

-                FALSE,

-                TRUE,

-                Instance,

-                *NonVolatileOffset,

-                sizeof (VARIABLE_HEADER),

-                (UINT8 *) NextVariable

-                );

-

-      if (EFI_ERROR (Status)) {

-        goto Done;

-      }

-

-      *NonVolatileOffset = *NonVolatileOffset + VarSize;

-

-    } else {

-      if (EfiAtRuntime ()) {

-        Status = EFI_INVALID_PARAMETER;

-        goto Done;

-      }

-

-      if ((UINT32) (VarSize +*VolatileOffset) >

-            ((VARIABLE_STORE_HEADER *) ((UINTN) (Global->VolatileVariableBase)))->Size

-            ) {

-        //

-        // Perform garbage collection & reclaim operation

-        //

-        Status = Reclaim (Global->VolatileVariableBase, VolatileOffset, TRUE);

-        if (EFI_ERROR (Status)) {

-          goto Done;

-        }

-        //

-        // If still no enough space, return out of resources

-        //

-        if ((UINT32) (VarSize +*VolatileOffset) >

-              ((VARIABLE_STORE_HEADER *) ((UINTN) (Global->VolatileVariableBase)))->Size

-              ) {

-          Status = EFI_OUT_OF_RESOURCES;

-          goto Done;

-        }

-

-        Reclaimed = TRUE;

-      }

-

-      NextVariable->State = VAR_ADDED;

-      Status = UpdateVariableStore (

-                Global,

-                TRUE,

-                TRUE,

-                Instance,

-                *VolatileOffset,

-                (UINT32) VarSize,

-                (UINT8 *) NextVariable

-                );

-

-      if (EFI_ERROR (Status)) {

-        goto Done;

-      }

-

-      *VolatileOffset = *VolatileOffset + VarSize;

-    }

-    //

-    // Mark the old variable as deleted

-    //

-    if (!Reclaimed && !EFI_ERROR (Status) && Variable.CurrPtr != NULL) {

-      State = Variable.CurrPtr->State;

-      State &= VAR_DELETED;

-

-      Status = UpdateVariableStore (

-                Global,

-                Variable.Volatile,

-                FALSE,

-                Instance,

-                (UINTN) &Variable.CurrPtr->State,

-                sizeof (UINT8),

-                &State

-                );

-

-      if (EFI_ERROR (Status)) {

-        goto Done;

-      }

-    }

-  }

-

-  Status = EFI_SUCCESS;

-Done:

-  ReleaseLockOnlyAtBootTime (&Global->VariableServicesLock);

-  return Status;

-}

-

-EFI_STATUS

-EFIAPI

-QueryVariableInfo (

-  IN  UINT32                 Attributes,

-  OUT UINT64                 *MaximumVariableStorageSize,

-  OUT UINT64                 *RemainingVariableStorageSize,

-  OUT UINT64                 *MaximumVariableSize,

-  IN  VARIABLE_GLOBAL        *Global,

-  IN  UINT32                 Instance

-  )

-/*++

-

-Routine Description:

-

-  This code returns information about the EFI variables.

-

-Arguments:

-

-  Attributes                      Attributes bitmask to specify the type of variables

-                                  on which to return information.

-  MaximumVariableStorageSize      Pointer to the maximum size of the storage space available

-                                  for the EFI variables associated with the attributes specified.

-  RemainingVariableStorageSize    Pointer to the remaining size of the storage space available

-                                  for the EFI variables associated with the attributes specified.

-  MaximumVariableSize             Pointer to the maximum size of the individual EFI variables

-                                  associated with the attributes specified.

-  Global                          Pointer to VARIABLE_GLOBAL structure.

-  Instance                        Instance of the Firmware Volume.

-

-Returns:

-

-  EFI STATUS

-  EFI_INVALID_PARAMETER           - An invalid combination of attribute bits was supplied.

-  EFI_SUCCESS                     - Query successfully.

-  EFI_UNSUPPORTED                 - The attribute is not supported on this platform.

-

---*/

-{

-  VARIABLE_HEADER        *Variable;

-  VARIABLE_HEADER        *NextVariable;

-  UINT64                 VariableSize;

-  VARIABLE_STORE_HEADER  *VariableStoreHeader;

-

-  if(MaximumVariableStorageSize == NULL || RemainingVariableStorageSize == NULL || MaximumVariableSize == NULL) {

-    return EFI_INVALID_PARAMETER;

-  }

-

-  if((Attributes & (EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS)) == 0) {

-    //

-    // Make sure the Attributes combination is supported by the platform.

-    //

-    return EFI_UNSUPPORTED;

-  } else if ((Attributes & (EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS)) == EFI_VARIABLE_RUNTIME_ACCESS) {

-    //

-    // Make sure if runtime bit is set, boot service bit is set also.

-    //

-    return EFI_INVALID_PARAMETER;

-  } else if (EfiAtRuntime () && !(Attributes & EFI_VARIABLE_RUNTIME_ACCESS)) {

-    //

-    // Make sure RT Attribute is set if we are in Runtime phase.

-    //

-    return EFI_INVALID_PARAMETER;

-  }

-

-  AcquireLockOnlyAtBootTime(&Global->VariableServicesLock);

-

-  if((Attributes & EFI_VARIABLE_NON_VOLATILE) == 0) {

-    //

-    // Query is Volatile related.

-    //

-    VariableStoreHeader = (VARIABLE_STORE_HEADER *) ((UINTN) Global->VolatileVariableBase);

-  } else {

-    //

-    // Query is Non-Volatile related.

-    //

-    VariableStoreHeader = (VARIABLE_STORE_HEADER *) ((UINTN) Global->NonVolatileVariableBase);

-  }

-

-  //

-  // Now let's fill *MaximumVariableStorageSize *RemainingVariableStorageSize

-  // with the storage size (excluding the storage header size).

-  //

-  *MaximumVariableStorageSize   = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER);

-  *RemainingVariableStorageSize = VariableStoreHeader->Size - sizeof (VARIABLE_STORE_HEADER);

-

-  //

-  // Let *MaximumVariableSize be MAX_VARIABLE_SIZE.

-  //

-  *MaximumVariableSize = MAX_VARIABLE_SIZE;

-

-  //

-  // Point to the starting address of the variables.

-  //

-  Variable = (VARIABLE_HEADER *) (VariableStoreHeader + 1);

-

-  //

-  // Now walk through the related variable store.

-  //

-  while (IsValidVariableHeader (Variable) && (Variable < GetEndPointer (VariableStoreHeader))) {

-    NextVariable = GetNextVariablePtr (Variable);

-    VariableSize = (UINT64) (UINTN) NextVariable - (UINT64) (UINTN) Variable;

-

-    if (EfiAtRuntime ()) {

-      //

-      // we don't take the state of the variables in mind

-      // when calculating RemainingVariableStorageSize,

-      // since the space occupied by variables not marked with

-      // VAR_ADDED is not allowed to be reclaimed in Runtime.

-      //

-      *RemainingVariableStorageSize -= VariableSize;

-    } else {

-      //

-      // Only care about Variables with State VAR_ADDED,because

-      // the space not marked as VAR_ADDED is reclaimable now.

-      //

-      if (Variable->State == VAR_ADDED) {

-        *RemainingVariableStorageSize -= VariableSize;

-      }

-    }

-

-    //

-    // Go to the next one

-    //

-    Variable = NextVariable;

-  }

-

-  ReleaseLockOnlyAtBootTime (&Global->VariableServicesLock);

-  return EFI_SUCCESS;

-}

-

-EFI_STATUS

-EFIAPI

-VariableCommonInitialize (

-  IN EFI_HANDLE         ImageHandle,

-  IN EFI_SYSTEM_TABLE   *SystemTable

-  )

-/*++

-

-Routine Description:

-  This function does common initialization for variable services

-

-Arguments:

-

-  ImageHandle   - The firmware allocated handle for the EFI image.

-  SystemTable   - A pointer to the EFI System Table.

-

-Returns:

-

-  Status code.

-

-  EFI_NOT_FOUND     - Variable store area not found.

-  EFI_UNSUPPORTED   - Currently only one non-volatile variable store is supported.

-  EFI_SUCCESS       - Variable services successfully initialized.

-

---*/

-{

-  EFI_STATUS                      Status;

-  EFI_FIRMWARE_VOLUME_HEADER      *FwVolHeader;

-  CHAR8                           *CurrPtr;

-  VARIABLE_STORE_HEADER           *VolatileVariableStore;

-  VARIABLE_STORE_HEADER           *VariableStoreHeader;

-  VARIABLE_HEADER                 *NextVariable;

-  UINT32                          Instance;

-  EFI_PHYSICAL_ADDRESS            FvVolHdr;

-

-  UINT64                          TempVariableStoreHeader;

-

-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR GcdDescriptor;

-  EFI_FLASH_SUBAREA_ENTRY         VariableStoreEntry;

-  UINT64                          BaseAddress;

-  UINT64                          Length;

-  UINTN                           Index;

-  UINT8                           Data;

-

-  mVariableModuleGlobal = AllocateRuntimePool (sizeof (ESAL_VARIABLE_GLOBAL));

-  if (mVariableModuleGlobal == NULL) {

-    return EFI_OUT_OF_RESOURCES;

-  }

-

-  EfiInitializeLock(&mVariableModuleGlobal->VariableGlobal[Physical].VariableServicesLock, TPL_NOTIFY);

-

-  //

-  // Allocate memory for volatile variable store

-  //

-  VolatileVariableStore = AllocateRuntimePool (VARIABLE_STORE_SIZE + SCRATCH_SIZE);

-  if (VolatileVariableStore == NULL) {

-    FreePool (mVariableModuleGlobal);

-    return EFI_OUT_OF_RESOURCES;

-  }

-

-  SetMem (VolatileVariableStore, VARIABLE_STORE_SIZE + SCRATCH_SIZE, 0xff);

-

-  //

-  //  Variable Specific Data

-  //

-  mVariableModuleGlobal->VariableGlobal[Physical].VolatileVariableBase = (EFI_PHYSICAL_ADDRESS) (UINTN) VolatileVariableStore;

-  mVariableModuleGlobal->VolatileLastVariableOffset = sizeof (VARIABLE_STORE_HEADER);

-

-  VolatileVariableStore->Signature                  = VARIABLE_STORE_SIGNATURE;

-  VolatileVariableStore->Size                       = VARIABLE_STORE_SIZE;

-  VolatileVariableStore->Format                     = VARIABLE_STORE_FORMATTED;

-  VolatileVariableStore->State                      = VARIABLE_STORE_HEALTHY;

-  VolatileVariableStore->Reserved                   = 0;

-  VolatileVariableStore->Reserved1                  = 0;

-

-  //

-  // Get non volatile varaible store

-  //

-

-  TempVariableStoreHeader = (UINT64) PcdGet32 (PcdFlashNvStorageVariableBase);

-  VariableStoreEntry.Base = TempVariableStoreHeader + \

-                              (((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) (TempVariableStoreHeader)) -> HeaderLength);

-  VariableStoreEntry.Length = (UINT64) PcdGet32 (PcdFlashNvStorageVariableSize) - \

-                                (((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) (TempVariableStoreHeader)) -> HeaderLength);

-  //

-  // Mark the variable storage region of the FLASH as RUNTIME

-  //

-  BaseAddress = VariableStoreEntry.Base & (~EFI_PAGE_MASK);

-  Length      = VariableStoreEntry.Length + (VariableStoreEntry.Base - BaseAddress);

-  Length      = (Length + EFI_PAGE_SIZE - 1) & (~EFI_PAGE_MASK);

-

-  Status      = gDS->GetMemorySpaceDescriptor (BaseAddress, &GcdDescriptor);

-  if (EFI_ERROR (Status)) {

-    FreePool (mVariableModuleGlobal);

-    FreePool (VolatileVariableStore);

-    return EFI_UNSUPPORTED;

-  }

-

-  Status = gDS->SetMemorySpaceAttributes (

-                  BaseAddress,

-                  Length,

-                  GcdDescriptor.Attributes | EFI_MEMORY_RUNTIME

-                  );

-  if (EFI_ERROR (Status)) {

-    FreePool (mVariableModuleGlobal);

-    FreePool (VolatileVariableStore);

-    return EFI_UNSUPPORTED;

-  }

-  //

-  // Get address of non volatile variable store base

-  //

-  mVariableModuleGlobal->VariableGlobal[Physical].NonVolatileVariableBase = VariableStoreEntry.Base;

-

-  //

-  // Check Integrity

-  //

-  //

-  // Find the Correct Instance of the FV Block Service.

-  //

-  Instance  = 0;

-  CurrPtr   = (CHAR8 *) ((UINTN) mVariableModuleGlobal->VariableGlobal[Physical].NonVolatileVariableBase);

-  while (EfiFvbGetPhysicalAddress (Instance, &FvVolHdr) == EFI_SUCCESS) {

-    FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) ((UINTN) FvVolHdr);

-    if (CurrPtr >= (CHAR8 *) FwVolHeader && CurrPtr < (((CHAR8 *) FwVolHeader) + FwVolHeader->FvLength)) {

-      mVariableModuleGlobal->FvbInstance = Instance;

-      break;

-    }

-

-    Instance++;

-  }

-

-  VariableStoreHeader = (VARIABLE_STORE_HEADER *) CurrPtr;

-  if (GetVariableStoreStatus (VariableStoreHeader) == EfiValid) {

-    if (~VariableStoreHeader->Size == 0) {

-      Status = UpdateVariableStore (

-                &mVariableModuleGlobal->VariableGlobal[Physical],

-                FALSE,

-                FALSE,

-                mVariableModuleGlobal->FvbInstance,

-                (UINTN) &VariableStoreHeader->Size,

-                sizeof (UINT32),

-                (UINT8 *) &VariableStoreEntry.Length

-                );

-      //

-      // As Variables are stored in NV storage, which are slow devices,such as flash.

-      // Variable operation may skip checking variable program result to improve performance,

-      // We can assume Variable program is OK through some check point.

-      // Variable Store Size Setting should be the first Variable write operation,

-      // We can assume all Read/Write is OK if we can set Variable store size successfully.

-      // If write fail, we will assert here

-      //

-      ASSERT(VariableStoreHeader->Size == VariableStoreEntry.Length);

-

-      if (EFI_ERROR (Status)) {

-        return Status;

-      }

-    }

-

-    mVariableModuleGlobal->VariableGlobal[Physical].NonVolatileVariableBase = (EFI_PHYSICAL_ADDRESS) ((UINTN) CurrPtr);

-    //

-    // Parse non-volatile variable data and get last variable offset

-    //

-    NextVariable  = (VARIABLE_HEADER *) (CurrPtr + sizeof (VARIABLE_STORE_HEADER));

-    Status        = EFI_SUCCESS;

-

-    while (IsValidVariableHeader (NextVariable)) {

-      NextVariable = GetNextVariablePtr (NextVariable);

-    }

-

-    mVariableModuleGlobal->NonVolatileLastVariableOffset = (UINTN) NextVariable - (UINTN) CurrPtr;

-

-    //

-    // Check if the free area is blow a threshold

-    //

-    if ((((VARIABLE_STORE_HEADER *)((UINTN) CurrPtr))->Size - mVariableModuleGlobal->NonVolatileLastVariableOffset) < VARIABLE_RECLAIM_THRESHOLD) {

-      Status = Reclaim (

-                mVariableModuleGlobal->VariableGlobal[Physical].NonVolatileVariableBase,

-                &mVariableModuleGlobal->NonVolatileLastVariableOffset,

-                FALSE

-                );

-    }

-

-    if (EFI_ERROR (Status)) {

-      FreePool (mVariableModuleGlobal);

-      FreePool (VolatileVariableStore);

-      return Status;

-    }

-

-    //

-    // Check if the free area is really free.

-    //

-    for (Index = mVariableModuleGlobal->NonVolatileLastVariableOffset; Index < VariableStoreHeader->Size; Index++) {

-      Data = ((UINT8 *) (UINTN) mVariableModuleGlobal->VariableGlobal[Physical].NonVolatileVariableBase)[Index];

-      if (Data != 0xff) {

-        //

-        // There must be something wrong in variable store, do reclaim operation.

-        //

-        Status = Reclaim (

-                  mVariableModuleGlobal->VariableGlobal[Physical].NonVolatileVariableBase,

-                  &mVariableModuleGlobal->NonVolatileLastVariableOffset,

-                  FALSE

-                  );

-        break;

-      }

-    }

-  }

-

-  if (EFI_ERROR (Status)) {

-    FreePool (mVariableModuleGlobal);

-    FreePool (VolatileVariableStore);

-  }

-

-  return Status;

-}

diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.h b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.h
deleted file mode 100644
index 904a681..0000000
--- a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*++

-

-Copyright (c) 2006 - 2007, Intel Corporation

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-Module Name:

-

-  Variable.h

-

-Abstract:

-

---*/

-

-#ifndef _VARIABLE_H

-#define _VARIABLE_H

-

-#include <PiDxe.h>

-#include <Protocol/VariableWrite.h>

-#include <Protocol/FaultTolerantWriteLite.h>

-#include <Protocol/FirmwareVolumeBlock.h>

-#include <Protocol/Variable.h>

-#include <Library/PcdLib.h>

-#include <Library/UefiDriverEntryPoint.h>

-#include <Library/DxeServicesTableLib.h>

-#include <Library/UefiRuntimeLib.h>

-#include <Library/DebugLib.h>

-#include <Library/BaseMemoryLib.h>

-#include <Library/FvbServiceLib.h>

-#include <Library/UefiBootServicesTableLib.h>

-#include <Library/UefiLib.h>

-#include <Library/BaseLib.h>

-#include <Library/MemoryAllocationLib.h>

-#include <Library/HobLib.h>

-#include <Common/FlashMap.h>

-#include <Guid/FlashMapHob.h>

-

-//

-// BugBug: We need relcate the head file.

-//

-#include <Common/Variable.h>

-

-#define VARIABLE_RECLAIM_THRESHOLD (1024)

-

-#define VARIABLE_STORE_SIZE (64 * 1024)

-#define SCRATCH_SIZE        (4 * 1024)

-

-//

-// Define GET_PAD_SIZE to optimize compiler

-//

-#if ((ALIGNMENT == 0) || (ALIGNMENT == 1))

-#define GET_PAD_SIZE(a) (0)

-#else

-#define GET_PAD_SIZE(a) (((~a) + 1) & (ALIGNMENT - 1))

-#endif

-

-#define GET_VARIABLE_NAME_PTR(a)  (CHAR16 *) ((UINTN) (a) + sizeof (VARIABLE_HEADER))

-

-typedef enum {

-  Physical,

-  Virtual

-} VARIABLE_POINTER_TYPE;

-

-typedef struct {

-  VARIABLE_HEADER *CurrPtr;

-  VARIABLE_HEADER *EndPtr;

-  VARIABLE_HEADER *StartPtr;

-  BOOLEAN         Volatile;

-} VARIABLE_POINTER_TRACK;

-

-typedef struct {

-  EFI_PHYSICAL_ADDRESS  VolatileVariableBase;

-  EFI_PHYSICAL_ADDRESS  NonVolatileVariableBase;

-  EFI_LOCK              VariableServicesLock;

-} VARIABLE_GLOBAL;

-

-typedef struct {

-  VARIABLE_GLOBAL VariableGlobal[2];

-  UINTN           VolatileLastVariableOffset;

-  UINTN           NonVolatileLastVariableOffset;

-  UINT32          FvbInstance;

-} ESAL_VARIABLE_GLOBAL;

-

-extern ESAL_VARIABLE_GLOBAL *mVariableModuleGlobal;

-

-//

-// Functions

-//

-EFI_STATUS

-EFIAPI

-VariableCommonInitialize (

-  IN EFI_HANDLE         ImageHandle,

-  IN EFI_SYSTEM_TABLE   *SystemTable

-  );

-

-EFI_STATUS

-EFIAPI

-VariableServiceInitialize (

-  IN EFI_HANDLE         ImageHandle,

-  IN EFI_SYSTEM_TABLE   *SystemTable

-  );

-

-VOID

-EFIAPI

-VariableClassAddressChangeEvent (

-  IN EFI_EVENT        Event,

-  IN VOID             *Context

-  );

-

-EFI_STATUS

-EFIAPI

-GetVariable (

-  IN      CHAR16            *VariableName,

-  IN      EFI_GUID          * VendorGuid,

-  OUT     UINT32            *Attributes OPTIONAL,

-  IN OUT  UINTN             *DataSize,

-  OUT     VOID              *Data,

-  IN      VARIABLE_GLOBAL   * Global,

-  IN      UINT32            Instance

-  );

-

-EFI_STATUS

-EFIAPI

-GetNextVariableName (

-  IN OUT  UINTN             *VariableNameSize,

-  IN OUT  CHAR16            *VariableName,

-  IN OUT  EFI_GUID          *VendorGuid,

-  IN      VARIABLE_GLOBAL   *Global,

-  IN      UINT32            Instance

-  );

-

-EFI_STATUS

-EFIAPI

-SetVariable (

-  IN CHAR16                  *VariableName,

-  IN EFI_GUID                *VendorGuid,

-  IN UINT32                  Attributes,

-  IN UINTN                   DataSize,

-  IN VOID                    *Data,

-  IN VARIABLE_GLOBAL         *Global,

-  IN UINTN                   *VolatileOffset,

-  IN UINTN                   *NonVolatileOffset,

-  IN UINT32                  Instance

-  );

-

-EFI_STATUS

-EFIAPI

-QueryVariableInfo (

-  IN  UINT32                 Attributes,

-  OUT UINT64                 *MaximumVariableStorageSize,

-  OUT UINT64                 *RemainingVariableStorageSize,

-  OUT UINT64                 *MaximumVariableSize,

-  IN  VARIABLE_GLOBAL        *Global,

-  IN  UINT32                 Instance

-  );

-

-EFI_STATUS

-GetFvbHandleByAddress (

-  IN  EFI_PHYSICAL_ADDRESS   VariableStoreBase,

-  OUT EFI_HANDLE             *FvbHandle

-  );

-

-EFI_STATUS

-FtwVariableSpace (

-  IN EFI_PHYSICAL_ADDRESS   VariableBaseAddress,

-  IN UINT8                  *Buffer,

-  IN UINTN                  BufferSize

-  );

-

-#endif

diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.msa b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.msa
deleted file mode 100644
index 56f19b0..0000000
--- a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.msa
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

-  <MsaHeader>

-    <ModuleName>Variable</ModuleName>

-    <ModuleType>DXE_RUNTIME_DRIVER</ModuleType>

-    <GuidValue>CBD2E4D5-7068-4FF5-B462-9822B4AD8D60</GuidValue>

-    <Version>1.0</Version>

-    <Abstract>Component description file for Variable module.</Abstract>

-    <Description>This module installs three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName.</Description>

-    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-      WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>

-    <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

-  </MsaHeader>

-  <ModuleDefinitions>

-    <SupportedArchitectures>IA32 X64</SupportedArchitectures>

-    <BinaryModule>false</BinaryModule>

-    <OutputFileBasename>Variable</OutputFileBasename>

-  </ModuleDefinitions>

-  <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>PcdLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiDriverEntryPoint</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>DxeServicesTableLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiRuntimeLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>DebugLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseMemoryLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>EdkFvbServiceLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiBootServicesTableLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>MemoryAllocationLib</Keyword>

-    </LibraryClass>

-  </LibraryClassDefinitions>

-  <SourceFiles>

-    <Filename>Variable.h</Filename>

-    <Filename>Variable.c</Filename>

-    <Filename>reclaim.h</Filename>

-    <Filename>reclaim.c</Filename>

-    <Filename>InitVariable.c</Filename>

-    <Filename>Variable.dxs</Filename>

-  </SourceFiles>

-  <PackageDependencies>

-    <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

-  </PackageDependencies>

-  <Protocols>

-    <Protocol Usage="ALWAYS_PRODUCED">

-      <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="ALWAYS_PRODUCED">

-      <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="SOMETIMES_CONSUMED">

-      <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>

-    </Protocol>

-    <Protocol Usage="SOMETIMES_CONSUMED">

-      <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>

-    </Protocol>

-  </Protocols>

-  <Externs>

-    <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

-    <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

-    <Extern>

-      <ModuleEntryPoint>VariableServiceInitialize</ModuleEntryPoint>

-    </Extern>

-    <Extern>

-      <SetVirtualAddressMapCallBack>VariableClassAddressChangeEvent</SetVirtualAddressMapCallBack>

-    </Extern>

-  </Externs>

-  <PcdCoded>

-    <PcdEntry PcdItemType="DYNAMIC">

-      <C_Name>PcdFlashNvStorageVariableBase</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>The driver gets the Variable store base address from this PCD.  This base address point to
-        an EFI_FIRMWARE_VOLUMN_HEADER struct.</HelpText>

-    </PcdEntry>

-    <PcdEntry PcdItemType="DYNAMIC">

-      <C_Name>PcdFlashNvStorageVariableSize</C_Name>

-      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>The driver gets the NvStorage Variable Size from this PCD.</HelpText>

-    </PcdEntry>

-  </PcdCoded>

-</ModuleSurfaceArea>
\ No newline at end of file
diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/VariableRuntimeDxe.inf b/MdeModulePkg/Universal/VariableRuntimeDxe/VariableRuntimeDxe.inf
deleted file mode 100644
index b8b4ecc..0000000
--- a/MdeModulePkg/Universal/VariableRuntimeDxe/VariableRuntimeDxe.inf
+++ /dev/null
@@ -1,74 +0,0 @@
-#/** @file

-# Component description file for Variable module.

-#

-# This module installs three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName.

-# Copyright (c) 2006 - 2007, Intel Corporation

-#

-#  All rights reserved. This program and the accompanying materials

-#  are licensed and made available under the terms and conditions of the BSD License

-#  which accompanies this distribution. The full text of the license may be found at

-#  http://opensource.org/licenses/bsd-license.php

-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-#

-#

-#**/

-

-[Defines]

-  INF_VERSION                    = 0x00010005

-  BASE_NAME                      = VariableRuntimeDxe

-  FILE_GUID                      = CBD2E4D5-7068-4FF5-B462-9822B4AD8D60

-  MODULE_TYPE                    = DXE_RUNTIME_DRIVER

-  VERSION_STRING                 = 1.0

-  EDK_RELEASE_VERSION            = 0x00020000

-  EFI_SPECIFICATION_VERSION      = 0x00020000

-

-  ENTRY_POINT                    = VariableServiceInitialize

-

-#

-# The following information is for reference only and not required by the build tools.

-#

-#  VALID_ARCHITECTURES           = IA32 X64

-#

-#  VIRTUAL_ADDRESS_MAP_CALLBACK  =  VariableClassAddressChangeEvent

-#

-

-[Sources.common]

-  InitVariable.c

-  reclaim.c

-  Variable.c

-  Variable.h

-

-[Packages]

-  MdePkg/MdePkg.dec

-

-[LibraryClasses]

-  MemoryAllocationLib

-  BaseLib

-  UefiLib

-  UefiBootServicesTableLib

-  FvbServiceLib

-  BaseMemoryLib

-  DebugLib

-  UefiRuntimeLib

-  DxeServicesTableLib

-  UefiDriverEntryPoint

-  PcdLib

-  HobLib

-

-[Guids]

-  gEfiFlashMapHobGuid

-

-[Protocols]

-  gEfiFirmwareVolumeBlockProtocolGuid           # PROTOCOL SOMETIMES_CONSUMED

-  gEfiFaultTolerantWriteLiteProtocolGuid        # PROTOCOL SOMETIMES_CONSUMED

-  gEfiVariableWriteArchProtocolGuid             # PROTOCOL ALWAYS_PRODUCED

-  gEfiVariableArchProtocolGuid                  # PROTOCOL ALWAYS_PRODUCED

-

-[PcdsDynamic.common]

-  PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid

-

-[Depex]

-  gEfiFirmwareVolumeBlockProtocolGuid AND gEfiAlternateFvBlockGuid AND gEfiFaultTolerantWriteLiteProtocolGuid

-

diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c b/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c
deleted file mode 100644
index 0adaa87..0000000
--- a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*++

-

-Copyright (c) 2006 - 2007, Intel Corporation

-All rights reserved. This program and the accompanying materials

-are licensed and made available under the terms and conditions of the BSD License

-which accompanies this distribution.  The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php

-

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-Module Name:

-

-  reclaim.c

-

-Abstract:

-

-  Handles non-volatile variable store garbage collection, using FTW

-  (Fault Tolerant Write) protocol.

-

-Revision History

-

---*/

-

-

-#include <Variable.h>

-#include "Common/Variable.h"

-

-EFI_STATUS

-GetFvbHandleByAddress (

-  IN  EFI_PHYSICAL_ADDRESS   Address,

-  OUT EFI_HANDLE             *FvbHandle

-  )

-{

-  EFI_STATUS                          Status;

-  EFI_HANDLE                          *HandleBuffer;

-  UINTN                               HandleCount;

-  UINTN                               Index;

-  EFI_PHYSICAL_ADDRESS                FvbBaseAddress;

-  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *Fvb;

-  EFI_FIRMWARE_VOLUME_HEADER          *FwVolHeader;

-

-  *FvbHandle = NULL;

-  //

-  // Locate all handles of Fvb protocol

-  //

-  Status = gBS->LocateHandleBuffer (

-                  ByProtocol,

-                  &gEfiFirmwareVolumeBlockProtocolGuid,

-                  NULL,

-                  &HandleCount,

-                  &HandleBuffer

-                  );

-  if (EFI_ERROR (Status)) {

-    return EFI_NOT_FOUND;

-  }

-  //

-  // Get the FVB to access variable store

-  //

-  for (Index = 0; Index < HandleCount; Index += 1) {

-    Status = gBS->HandleProtocol (

-                    HandleBuffer[Index],

-                    &gEfiFirmwareVolumeBlockProtocolGuid,

-                    (VOID **) &Fvb

-                    );

-    if (EFI_ERROR (Status)) {

-      Status = EFI_NOT_FOUND;

-      break;

-    }

-    //

-    // Compare the address and select the right one

-    //

-    Status = Fvb->GetPhysicalAddress (Fvb, &FvbBaseAddress);

-    if (EFI_ERROR (Status)) {

-      continue;

-    }

-

-    FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) ((UINTN) FvbBaseAddress);

-    if ((Address >= FvbBaseAddress) && (Address <= (FvbBaseAddress + FwVolHeader->FvLength))) {

-      *FvbHandle  = HandleBuffer[Index];

-      Status      = EFI_SUCCESS;

-      break;

-    }

-  }

-

-  FreePool (HandleBuffer);

-  return Status;

-}

-

-STATIC

-EFI_STATUS

-GetLbaAndOffsetByAddress (

-  IN  EFI_PHYSICAL_ADDRESS   Address,

-  OUT EFI_LBA                *Lba,

-  OUT UINTN                  *Offset

-  )

-{

-  EFI_STATUS                          Status;

-  EFI_HANDLE                          FvbHandle;

-  EFI_PHYSICAL_ADDRESS                FvbBaseAddress;

-  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL  *Fvb;

-  EFI_FIRMWARE_VOLUME_HEADER          *FwVolHeader;

-  EFI_FV_BLOCK_MAP_ENTRY              *FvbMapEntry;

-  UINT32                              LbaIndex;

-

-  *Lba    = (EFI_LBA) (-1);

-  *Offset = 0;

-

-  //

-  // Get the proper FVB

-  //

-  Status = GetFvbHandleByAddress (Address, &FvbHandle);

-  if (EFI_ERROR (Status)) {

-    return Status;

-  }

-

-  Status = gBS->HandleProtocol (

-                  FvbHandle,

-                  &gEfiFirmwareVolumeBlockProtocolGuid,

-                  (VOID **) &Fvb

-                  );

-  if (EFI_ERROR (Status)) {

-    return Status;

-  }

-  //

-  // Get the Base Address of FV

-  //

-  Status = Fvb->GetPhysicalAddress (Fvb, &FvbBaseAddress);

-  if (EFI_ERROR (Status)) {

-    return Status;

-  }

-

-  FwVolHeader = (EFI_FIRMWARE_VOLUME_HEADER *) ((UINTN) FvbBaseAddress);

-

-  //

-  // Get the (LBA, Offset) of Address

-  //

-  if ((Address >= FvbBaseAddress) && (Address <= (FvbBaseAddress + FwVolHeader->FvLength))) {

-    if ((FwVolHeader->FvLength) > (FwVolHeader->HeaderLength)) {

-      //

-      // BUGBUG: Assume one FV has one type of BlockLength

-      //

-      FvbMapEntry = &FwVolHeader->BlockMap[0];

-      for (LbaIndex = 1; LbaIndex <= FvbMapEntry->NumBlocks; LbaIndex += 1) {

-        if (Address < (FvbBaseAddress + FvbMapEntry->Length * LbaIndex)) {

-          //

-          // Found the (Lba, Offset)

-          //

-          *Lba    = LbaIndex - 1;

-          *Offset = (UINTN) (Address - (FvbBaseAddress + FvbMapEntry->Length * (LbaIndex - 1)));

-          return EFI_SUCCESS;

-       }

-      }

-    }

-  }

-

-  return EFI_ABORTED;

-}

-

-EFI_STATUS

-FtwVariableSpace (

-  IN EFI_PHYSICAL_ADDRESS   VariableBase,

-  IN UINT8                  *Buffer,

-  IN UINTN                  BufferSize

-  )

-/*++

-

-Routine Description:

-    Write a buffer to Variable space, in the working block.

-

-Arguments:

-    FvbHandle        - Indicates a handle to FVB to access variable store

-    Buffer           - Point to the input buffer

-    BufferSize       - The number of bytes of the input Buffer

-

-Returns:

-    EFI_SUCCESS            - The function completed successfully

-    EFI_ABORTED            - The function could not complete successfully

-    EFI_NOT_FOUND          - Locate FVB protocol by handle fails

-

---*/

-{

-  EFI_STATUS            Status;

-  EFI_HANDLE            FvbHandle;

-  EFI_FTW_LITE_PROTOCOL *FtwLiteProtocol;

-  EFI_LBA               VarLba;

-  UINTN                 VarOffset;

-  UINT8                 *FtwBuffer;

-  UINTN                 FtwBufferSize;

-

-  //

-  // Locate fault tolerant write protocol

-  //

-  Status = gBS->LocateProtocol (

-                  &gEfiFaultTolerantWriteLiteProtocolGuid,

-                  NULL,

-                  (VOID **) &FtwLiteProtocol

-                  );

-  if (EFI_ERROR (Status)) {

-    return EFI_NOT_FOUND;

-  }

-  //

-  // Locate Fvb handle by address

-  //

-  Status = GetFvbHandleByAddress (VariableBase, &FvbHandle);

-  if (EFI_ERROR (Status)) {

-    return Status;

-  }

-  //

-  // Get LBA and Offset by address

-  //

-  Status = GetLbaAndOffsetByAddress (VariableBase, &VarLba, &VarOffset);

-  if (EFI_ERROR (Status)) {

-    return EFI_ABORTED;

-  }

-  //

-  // Prepare for the variable data

-  //

-  FtwBufferSize = ((VARIABLE_STORE_HEADER *) ((UINTN) VariableBase))->Size;

-  FtwBuffer     = AllocateRuntimePool (FtwBufferSize);

-  if (FtwBuffer == NULL) {

-    return EFI_OUT_OF_RESOURCES;

-  }

-

-  SetMem (FtwBuffer, FtwBufferSize, (UINT8) 0xff);

-  CopyMem (FtwBuffer, Buffer, BufferSize);

-

-  //

-  // FTW write record

-  //

-  Status = FtwLiteProtocol->Write (

-                              FtwLiteProtocol,

-                              FvbHandle,

-                              VarLba,         // LBA

-                              VarOffset,      // Offset

-                              &FtwBufferSize, // NumBytes,

-                              FtwBuffer

-                              );

-

-  FreePool (FtwBuffer);

-  return Status;

-}