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>

diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h
index c8dee8ab7a3c92f3f80659e8043f307875eefd7a..511a30782f6d8235d5fccc7c7234c4ad25a30c33 100644 (file)
--- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h
+++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatform.h
@@ -9,19 +9,16 @@
 #ifndef ACPI_PLATFORM_H_\r
 #define ACPI_PLATFORM_H_\r
 \r
-#include <PiDxe.h>\r
-\r
-#include <Protocol/AcpiTable.h>\r
-#include <Protocol/FirmwareVolume2.h>\r
-#include <Protocol/PciIo.h>\r
-\r
+#include <IndustryStandard/Acpi.h>\r
 #include <Library/BaseLib.h>\r
-#include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/PcdLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/XenPlatformLib.h>\r
-\r
-#include <IndustryStandard/Acpi.h>\r
+#include <PiDxe.h>\r
+#include <Protocol/AcpiTable.h>\r
+#include <Protocol/FirmwareVolume2.h>\r
+#include <Protocol/PciIo.h>\r
 \r
 typedef struct {\r
   EFI_PCI_IO_PROTOCOL *PciIo;\r

diff --git a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf b/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
index e486b8afa56da521647a92687754b26a08249b77..4522d7f6110cb0ab08bf4785818ff8e6f57dbf30 100644 (file)
--- a/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
+++ b/OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
@@ -32,24 +32,24 @@
   Xen.c\r
 \r
 [Packages]\r
-  MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
+  MdePkg/MdePkg.dec\r
   OvmfPkg/OvmfPkg.dec\r
   UefiCpuPkg/UefiCpuPkg.dec\r
 \r
 [LibraryClasses]\r
-  UefiLib\r
-  PcdLib\r
+  BaseLib\r
   BaseMemoryLib\r
   DebugLib\r
-  UefiBootServicesTableLib\r
-  UefiDriverEntryPoint\r
-  QemuFwCfgLib\r
-  QemuFwCfgS3Lib\r
-  MemoryAllocationLib\r
-  BaseLib\r
   DxeServicesTableLib\r
+  MemoryAllocationLib\r
   OrderedCollectionLib\r
+  PcdLib\r
+  QemuFwCfgLib\r
+  QemuFwCfgS3Lib\r
+  UefiBootServicesTableLib\r
+  UefiDriverEntryPoint\r
+  UefiLib\r
   XenPlatformLib\r
 \r
 [Protocols]\r

diff --git a/OvmfPkg/AcpiPlatformDxe/EntryPoint.c b/OvmfPkg/AcpiPlatformDxe/EntryPoint.c
index f66f89291157b9036b106639498ca675b355c1a7..fb07ed85373d0d2fb108786dd99a5e3161619a05 100644 (file)
--- a/OvmfPkg/AcpiPlatformDxe/EntryPoint.c
+++ b/OvmfPkg/AcpiPlatformDxe/EntryPoint.c
@@ -8,6 +8,7 @@
 **/\r
 \r
 #include <Guid/RootBridgesConnectedEventGroup.h>\r
+\r
 #include "AcpiPlatform.h"\r
 \r
 STATIC\r

diff --git a/OvmfPkg/AcpiPlatformDxe/Qemu.c b/OvmfPkg/AcpiPlatformDxe/Qemu.c
index 7fb42270043fbe22109330c814f3a27e62ea254c..bed3b16159a6508afeaca8506aa02d267572b9e3 100644 (file)
--- a/OvmfPkg/AcpiPlatformDxe/Qemu.c
+++ b/OvmfPkg/AcpiPlatformDxe/Qemu.c
@@ -9,14 +9,15 @@
 \r
 **/\r
 \r
-#include "AcpiPlatform.h"\r
+#include <IndustryStandard/Acpi.h>\r
 #include <Library/BaseMemoryLib.h>\r
-#include <Library/MemoryAllocationLib.h>\r
-#include <Library/QemuFwCfgLib.h>\r
 #include <Library/DxeServicesTableLib.h>\r
-#include <Library/PcdLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
 #include <Library/OrderedCollectionLib.h>\r
-#include <IndustryStandard/Acpi.h>\r
+#include <Library/PcdLib.h>\r
+#include <Library/QemuFwCfgLib.h>\r
+\r
+#include "AcpiPlatform.h"\r
 \r
 BOOLEAN\r
 QemuDetected (\r

diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
index b62027db6e6692ee2f5415267f5e2226b8449f30..c07b84a213856d8209fc68661fea35153adebb59 100644 (file)
--- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
+++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c
@@ -8,17 +8,17 @@
 \r
 **/\r
 \r
-#include "AcpiPlatform.h"\r
-#include "QemuLoader.h"\r
+#include <IndustryStandard/Acpi.h>\r
 #include <Library/BaseMemoryLib.h>\r
+#include <Library/DxeServicesTableLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
+#include <Library/OrderedCollectionLib.h>\r
+#include <Library/PcdLib.h>\r
 #include <Library/QemuFwCfgLib.h>\r
 #include <Library/QemuFwCfgS3Lib.h>\r
-#include <Library/DxeServicesTableLib.h>\r
-#include <Library/PcdLib.h>\r
-#include <Library/OrderedCollectionLib.h>\r
-#include <IndustryStandard/Acpi.h>\r
 \r
+#include "AcpiPlatform.h"\r
+#include "QemuLoader.h"\r
 \r
 //\r
 // The user structure for the ordered collection that will track the fw_cfg\r

diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf
index c9ec4f60bc7862ce7f4a1e4827f5f1230fb9eb09..cc24f35bd83a7b9aa20f8e8d4b317ada821e87c8 100644 (file)
--- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf
+++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf
@@ -30,8 +30,8 @@
   QemuLoader.h\r
 \r
 [Packages]\r
-  MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
+  MdePkg/MdePkg.dec\r
   OvmfPkg/OvmfPkg.dec\r
 \r
 [LibraryClasses]\r

diff --git a/OvmfPkg/AcpiPlatformDxe/Xen.c b/OvmfPkg/AcpiPlatformDxe/Xen.c
index 289ef971c4b89f36bfad1632b37e2c220066edbf..1d69989042c6c63c9bb2161e1053331fe4059da8 100644 (file)
--- a/OvmfPkg/AcpiPlatformDxe/Xen.c
+++ b/OvmfPkg/AcpiPlatformDxe/Xen.c
@@ -8,9 +8,10 @@
 \r
 **/\r
 \r
-#include "AcpiPlatform.h"\r
 #include <Library/BaseLib.h>\r
 \r
+#include "AcpiPlatform.h"\r
+\r
 #define XEN_ACPI_PHYSICAL_ADDRESS         0x000EA020\r
 #define XEN_BIOS_PHYSICAL_END             0x000FFFFF\r
 \r