Revision: 18672
          http://sourceforge.net/p/edk2/code/18672
Author:   lersek
Date:     2015-10-26 14:58:46 +0000 (Mon, 26 Oct 2015)
Log Message:
-----------
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 <[email protected]>
Reviewed-by: Jordan Justen <[email protected]>

Modified Paths:
--------------
    trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
    trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
    trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
    trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c

Modified: trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c
===================================================================
--- trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c 2015-10-26 
14:58:39 UTC (rev 18671)
+++ trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbInfo.c 2015-10-26 
14:58:46 UTC (rev 18672)
@@ -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 {

Modified: 
trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf
===================================================================
--- trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf 
2015-10-26 14:58:39 UTC (rev 18671)
+++ trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf 
2015-10-26 14:58:46 UTC (rev 18672)
@@ -46,17 +46,16 @@
   OvmfPkg/OvmfPkg.dec
 
 [LibraryClasses]
-  UefiBootServicesTableLib
-  MemoryAllocationLib
+  BaseLib
   BaseMemoryLib
-  HobLib
   DebugLib
-  UefiRuntimeLib
+  DevicePathLib
   DxeServicesTableLib
-  BaseLib
+  MemoryAllocationLib
+  PcdLib
+  UefiBootServicesTableLib
   UefiDriverEntryPoint
-  UefiLib
-  PcdLib
+  UefiRuntimeLib
 
 [Guids]
   gEfiEventVirtualAddressChangeGuid   # ALWAYS_CONSUMED

Modified: trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c
===================================================================
--- trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c  
2015-10-26 14:58:39 UTC (rev 18671)
+++ trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c  
2015-10-26 14:58:46 UTC (rev 18672)
@@ -23,19 +23,19 @@
 //
 // The protocols, PPI and GUID defintions for this module
 //
+#include <Protocol/DevicePath.h>
 #include <Protocol/FirmwareVolumeBlock.h>
-#include <Protocol/DevicePath.h>
 
 //
 // The Library classes this module consumes
 //
 #include <Library/BaseLib.h>
+#include <Library/BaseMemoryLib.h>
+#include <Library/DebugLib.h>
+#include <Library/DevicePathLib.h>
 #include <Library/DxeServicesTableLib.h>
-#include <Library/DebugLib.h>
-#include <Library/BaseMemoryLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/UefiBootServicesTableLib.h>
-#include <Library/DevicePathLib.h>
 
 #include "FwBlockService.h"
 #include "QemuFlash.h"

Modified: trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c
===================================================================
--- trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c       
2015-10-26 14:58:39 UTC (rev 18671)
+++ trunk/edk2/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c       
2015-10-26 14:58:46 UTC (rev 18672)
@@ -13,8 +13,8 @@
 
 **/
 
+#include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
-#include <Library/BaseMemoryLib.h>
 #include <Library/PcdLib.h>
 
 #include "QemuFlash.h"


------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to