diff options
Diffstat (limited to 'MdeModulePkg/Universal/VariableRuntimeDxe')
7 files changed, 40 insertions, 179 deletions
diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/CommonHeader.h b/MdeModulePkg/Universal/VariableRuntimeDxe/CommonHeader.h deleted file mode 100644 index 7148577..0000000 --- a/MdeModulePkg/Universal/VariableRuntimeDxe/CommonHeader.h +++ /dev/null @@ -1,48 +0,0 @@ -/**@file
- Common header file shared by all source files.
-
- This file includes package header files, library classes and protocol, PPI & GUID definitions.
-
- 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.
-**/
-
-#ifndef __COMMON_HEADER_H_
-#define __COMMON_HEADER_H_
-
-
-//
-// 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/FaultTolerantWriteLite.h>
-#include <Protocol/FirmwareVolumeBlock.h>
-#include <Protocol/Variable.h>
-//
-// The Library classes this module consumes
-//
-#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>
-
-
-#endif
diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/InitVariable.c b/MdeModulePkg/Universal/VariableRuntimeDxe/InitVariable.c index 15e84e8..59403e9 100644 --- a/MdeModulePkg/Universal/VariableRuntimeDxe/InitVariable.c +++ b/MdeModulePkg/Universal/VariableRuntimeDxe/InitVariable.c @@ -19,11 +19,6 @@ Revision History --*/
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
#include "Variable.h"
//
diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c index 4322961..784a198 100644 --- a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c +++ b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.c @@ -21,8 +21,6 @@ Revision History #include "Variable.h"
-#include "reclaim.h"
-
#include <Common/FlashMap.h>
//
diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.h b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.h index aff0b82..904a681 100644 --- a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.h +++ b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.h @@ -20,14 +20,25 @@ Abstract: #ifndef _VARIABLE_H
#define _VARIABLE_H
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
-//
-// Statements that include other header files
-//
+#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.
@@ -85,24 +96,21 @@ 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
@@ -114,8 +122,7 @@ GetVariable ( OUT VOID *Data,
IN VARIABLE_GLOBAL * Global,
IN UINT32 Instance
- )
-;
+ );
EFI_STATUS
EFIAPI
@@ -125,8 +132,7 @@ GetNextVariableName ( IN OUT EFI_GUID *VendorGuid,
IN VARIABLE_GLOBAL *Global,
IN UINT32 Instance
- )
-;
+ );
EFI_STATUS
EFIAPI
@@ -140,8 +146,7 @@ SetVariable ( IN UINTN *VolatileOffset,
IN UINTN *NonVolatileOffset,
IN UINT32 Instance
- )
-;
+ );
EFI_STATUS
EFIAPI
@@ -152,7 +157,19 @@ QueryVariableInfo ( 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.inf b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf index 5765c26..c2c5878 100644 --- a/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf +++ b/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf @@ -14,11 +14,6 @@ #
#**/
-################################################################################
-#
-# Defines Section - statements that will be processed to create a Makefile.
-#
-################################################################################
[Defines]
INF_VERSION = 0x00010005
BASE_NAME = Variable
@@ -38,38 +33,15 @@ # VIRTUAL_ADDRESS_MAP_CALLBACK = VariableClassAddressChangeEvent
#
-################################################################################
-#
-# Sources Section - list of files that are required for the build to succeed.
-#
-################################################################################
-
[Sources.common]
InitVariable.c
reclaim.c
- reclaim.h
Variable.c
Variable.h
- CommonHeader.h
-
-
-################################################################################
-#
-# Package Dependency Section - list of Package files that are required for
-# this module.
-#
-################################################################################
[Packages]
MdePkg/MdePkg.dec
-################################################################################
-#
-# Library Class Section - list of Library Classes that are required for
-# this module.
-#
-################################################################################
-
[LibraryClasses]
MemoryAllocationLib
BaseLib
@@ -87,39 +59,16 @@ [Guids]
gEfiFlashMapHobGuid
-################################################################################
-#
-# Protocol C Name Section - list of Protocol and Protocol Notify C Names
-# that this module uses or produces.
-#
-################################################################################
-
[Protocols]
gEfiFirmwareVolumeBlockProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
gEfiFaultTolerantWriteLiteProtocolGuid # PROTOCOL SOMETIMES_CONSUMED
gEfiVariableWriteArchProtocolGuid # PROTOCOL ALWAYS_PRODUCED
gEfiVariableArchProtocolGuid # PROTOCOL ALWAYS_PRODUCED
-
-################################################################################
-#
-# Pcd DYNAMIC - list of PCDs that this module is coded for.
-#
-################################################################################
-
[PcdsDynamic.common]
PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid
PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid
-
-################################################################################
-#
-# Dependency Expression Section - list of Dependency expressions that are required for
-# this module.
-#
-################################################################################
-
[Depex]
gEfiFirmwareVolumeBlockProtocolGuid AND gEfiAlternateFvBlockGuid AND gEfiFaultTolerantWriteLiteProtocolGuid
-
diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c b/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c index 3ee3736..0adaa87 100644 --- a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c +++ b/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.c @@ -23,7 +23,7 @@ Revision History --*/
-#include "reclaim.h"
+#include <Variable.h>
#include "Common/Variable.h"
EFI_STATUS
diff --git a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.h b/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.h deleted file mode 100644 index 393b590..0000000 --- a/MdeModulePkg/Universal/VariableRuntimeDxe/reclaim.h +++ /dev/null @@ -1,50 +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:
-
- reclaim.h
-
-Abstract:
-
- Definitions for non-volatile variable store garbage collection
-
-Revision History
-
---*/
-
-#ifndef _VAR_RECLAIM_H
-#define _VAR_RECLAIM_H
-
-//
-// Include common header file for this module.
-//
-#include "CommonHeader.h"
-
-//
-// Functions
-//
-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
|