diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2015-10-26 14:58:46 +0000 |
|---|---|---|
| committer | lersek <lersek@Edk2> | 2015-10-26 14:58:46 +0000 |
| commit | 0f2eb31c764685a1919b52f414bea44ea37580a2 (patch) | |
| tree | d5f87a8b44f8e833d1d2fee79eb76509a8ba054a /OvmfPkg | |
| parent | 1767877a31b3ce191ddae6cb9aefba99a733fe20 (diff) | |
| download | edk2-platforms-0f2eb31c764685a1919b52f414bea44ea37580a2.tar.xz | |
OvmfPkg: QemuFlashFvbServicesRuntimeDxe: clean up includes and libraries
Before introducing the SMM driver interface, clean up #include directives
and [LibraryClasses] by:
- removing what's not directly used (HobLib and UefiLib),
- adding what's used but not spelled out (DevicePathLib),
- sorting the result.
This helps with seeing each source file's dependencies and with
determining the library classes for the SMM driver.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18672 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'OvmfPkg')
4 files changed, 13 insertions, 26 deletions
diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c index ec6bfdb24b..6edbeed82f 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c @@ -24,28 +24,16 @@ //
// The package level header files this module uses
//
-#include <PiDxe.h>
+#include <Pi/PiFirmwareVolume.h>
+
//
// The protocols, PPI and GUID defintions for this module
//
-#include <Guid/EventGroup.h>
-#include <Guid/FirmwareFileSystem2.h>
#include <Guid/SystemNvDataGuid.h>
-#include <Protocol/FirmwareVolumeBlock.h>
-#include <Protocol/DevicePath.h>
//
// The Library classes this module consumes
//
-#include <Library/UefiLib.h>
-#include <Library/UefiDriverEntryPoint.h>
#include <Library/BaseLib.h>
-#include <Library/DxeServicesTableLib.h>
-#include <Library/UefiRuntimeLib.h>
-#include <Library/DebugLib.h>
-#include <Library/HobLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/UefiBootServicesTableLib.h>
#include <Library/PcdLib.h>
typedef struct {
diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf index 480b6946b1..ea8413fcfd 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf @@ -46,17 +46,16 @@ OvmfPkg/OvmfPkg.dec
[LibraryClasses]
- UefiBootServicesTableLib
- MemoryAllocationLib
+ BaseLib
BaseMemoryLib
- HobLib
DebugLib
- UefiRuntimeLib
+ DevicePathLib
DxeServicesTableLib
- BaseLib
- UefiDriverEntryPoint
- UefiLib
+ MemoryAllocationLib
PcdLib
+ UefiBootServicesTableLib
+ UefiDriverEntryPoint
+ UefiRuntimeLib
[Guids]
gEfiEventVirtualAddressChangeGuid # ALWAYS_CONSUMED
diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c index 0158bf9cd0..c37aed1c9e 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c @@ -23,19 +23,19 @@ //
// The protocols, PPI and GUID defintions for this module
//
-#include <Protocol/FirmwareVolumeBlock.h>
#include <Protocol/DevicePath.h>
+#include <Protocol/FirmwareVolumeBlock.h>
//
// The Library classes this module consumes
//
#include <Library/BaseLib.h>
-#include <Library/DxeServicesTableLib.h>
-#include <Library/DebugLib.h>
#include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
+#include <Library/DevicePathLib.h>
+#include <Library/DxeServicesTableLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/UefiBootServicesTableLib.h>
-#include <Library/DevicePathLib.h>
#include "FwBlockService.h"
#include "QemuFlash.h"
diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c index 5b03046896..28bcb135ae 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c @@ -13,8 +13,8 @@ **/
-#include <Library/DebugLib.h>
#include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
#include <Library/PcdLib.h>
#include "QemuFlash.h"
|