diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2021-05-26 22:14:10 +0200 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-06-04 16:01:50 +0000 |
| commit | 180f1908b34f9cca0792d442a9deaae7f6e9beab (patch) | |
| tree | 0190604774642a025099a28195e2b58323463ed2 /OvmfPkg | |
| parent | 2a85d9b07ebf0e7c5fa12372a72da8bdaf452ec4 (diff) | |
| download | edk2-180f1908b34f9cca0792d442a9deaae7f6e9beab.tar.gz edk2-180f1908b34f9cca0792d442a9deaae7f6e9beab.tar.bz2 edk2-180f1908b34f9cca0792d442a9deaae7f6e9beab.zip | |
OvmfPkg/AcpiPlatformDxe: sort #includes and [LibraryClasses]
Place all public #includes first, all module-private #includes second.
Separate them with a single empty line. Keep each section sorted in
itself.
Sort all sections in both INF files.
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2122
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20210526201446.12554-8-lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Diffstat (limited to 'OvmfPkg')
| -rw-r--r-- | OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h | 15 | ||||
| -rw-r--r-- | OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf | 18 | ||||
| -rw-r--r-- | OvmfPkg/AcpiPlatformDxe/EntryPoint.c | 1 | ||||
| -rw-r--r-- | OvmfPkg/AcpiPlatformDxe/Qemu.c | 11 | ||||
| -rw-r--r-- | OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c | 12 | ||||
| -rw-r--r-- | OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf | 2 | ||||
| -rw-r--r-- | OvmfPkg/AcpiPlatformDxe/Xen.c | 3 |
7 files changed, 31 insertions, 31 deletions
diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h index c8dee8ab7a..511a30782f 100644 --- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h +++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h @@ -9,19 +9,16 @@ #ifndef ACPI_PLATFORM_H_
#define ACPI_PLATFORM_H_
-#include <PiDxe.h>
-
-#include <Protocol/AcpiTable.h>
-#include <Protocol/FirmwareVolume2.h>
-#include <Protocol/PciIo.h>
-
+#include <IndustryStandard/Acpi.h>
#include <Library/BaseLib.h>
-#include <Library/UefiBootServicesTableLib.h>
#include <Library/DebugLib.h>
#include <Library/PcdLib.h>
+#include <Library/UefiBootServicesTableLib.h>
#include <Library/XenPlatformLib.h>
-
-#include <IndustryStandard/Acpi.h>
+#include <PiDxe.h>
+#include <Protocol/AcpiTable.h>
+#include <Protocol/FirmwareVolume2.h>
+#include <Protocol/PciIo.h>
typedef struct {
EFI_PCI_IO_PROTOCOL *PciIo;
diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf b/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf index e486b8afa5..4522d7f611 100644 --- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf +++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf @@ -32,24 +32,24 @@ Xen.c
[Packages]
- MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
+ MdePkg/MdePkg.dec
OvmfPkg/OvmfPkg.dec
UefiCpuPkg/UefiCpuPkg.dec
[LibraryClasses]
- UefiLib
- PcdLib
+ BaseLib
BaseMemoryLib
DebugLib
- UefiBootServicesTableLib
- UefiDriverEntryPoint
- QemuFwCfgLib
- QemuFwCfgS3Lib
- MemoryAllocationLib
- BaseLib
DxeServicesTableLib
+ MemoryAllocationLib
OrderedCollectionLib
+ PcdLib
+ QemuFwCfgLib
+ QemuFwCfgS3Lib
+ UefiBootServicesTableLib
+ UefiDriverEntryPoint
+ UefiLib
XenPlatformLib
[Protocols]
diff --git a/OvmfPkg/AcpiPlatformDxe/EntryPoint.c b/OvmfPkg/AcpiPlatformDxe/EntryPoint.c index f66f892911..fb07ed8537 100644 --- a/OvmfPkg/AcpiPlatformDxe/EntryPoint.c +++ b/OvmfPkg/AcpiPlatformDxe/EntryPoint.c @@ -8,6 +8,7 @@ **/
#include <Guid/RootBridgesConnectedEventGroup.h>
+
#include "AcpiPlatform.h"
STATIC
diff --git a/OvmfPkg/AcpiPlatformDxe/Qemu.c b/OvmfPkg/AcpiPlatformDxe/Qemu.c index 7fb4227004..bed3b16159 100644 --- a/OvmfPkg/AcpiPlatformDxe/Qemu.c +++ b/OvmfPkg/AcpiPlatformDxe/Qemu.c @@ -9,14 +9,15 @@ **/
-#include "AcpiPlatform.h"
+#include <IndustryStandard/Acpi.h>
#include <Library/BaseMemoryLib.h>
-#include <Library/MemoryAllocationLib.h>
-#include <Library/QemuFwCfgLib.h>
#include <Library/DxeServicesTableLib.h>
-#include <Library/PcdLib.h>
+#include <Library/MemoryAllocationLib.h>
#include <Library/OrderedCollectionLib.h>
-#include <IndustryStandard/Acpi.h>
+#include <Library/PcdLib.h>
+#include <Library/QemuFwCfgLib.h>
+
+#include "AcpiPlatform.h"
BOOLEAN
QemuDetected (
diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c index b62027db6e..c07b84a213 100644 --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c @@ -8,17 +8,17 @@ **/
-#include "AcpiPlatform.h"
-#include "QemuLoader.h"
+#include <IndustryStandard/Acpi.h>
#include <Library/BaseMemoryLib.h>
+#include <Library/DxeServicesTableLib.h>
#include <Library/MemoryAllocationLib.h>
+#include <Library/OrderedCollectionLib.h>
+#include <Library/PcdLib.h>
#include <Library/QemuFwCfgLib.h>
#include <Library/QemuFwCfgS3Lib.h>
-#include <Library/DxeServicesTableLib.h>
-#include <Library/PcdLib.h>
-#include <Library/OrderedCollectionLib.h>
-#include <IndustryStandard/Acpi.h>
+#include "AcpiPlatform.h"
+#include "QemuLoader.h"
//
// The user structure for the ordered collection that will track the fw_cfg
diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf index c9ec4f60bc..cc24f35bd8 100644 --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf @@ -30,8 +30,8 @@ QemuLoader.h
[Packages]
- MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
+ MdePkg/MdePkg.dec
OvmfPkg/OvmfPkg.dec
[LibraryClasses]
diff --git a/OvmfPkg/AcpiPlatformDxe/Xen.c b/OvmfPkg/AcpiPlatformDxe/Xen.c index 289ef971c4..1d69989042 100644 --- a/OvmfPkg/AcpiPlatformDxe/Xen.c +++ b/OvmfPkg/AcpiPlatformDxe/Xen.c @@ -8,9 +8,10 @@ **/
-#include "AcpiPlatform.h"
#include <Library/BaseLib.h>
+#include "AcpiPlatform.h"
+
#define XEN_ACPI_PHYSICAL_ADDRESS 0x000EA020
#define XEN_BIOS_PHYSICAL_END 0x000FFFFF
|