Clean up DuetBdsLib:

[mirror_edk2.git] / DuetPkg / Library / DuetBdsLib / BdsPlatform.h

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
index ce2a0ba2b80ab6354d5d7cbe6351cececd772d74..ed4bc1ef669ac35f889c4ebac78d3fecf9182af3 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
@@ -27,7 +27,7 @@ Abstract:
 \r
 #include <IndustryStandard/Pci.h>\r
 #include <IndustryStandard/Acpi.h>\r
-#include <IndustryStandard/Smbios.h>\r
+#include <IndustryStandard/SmBios.h>\r
 #include <IndustryStandard/LegacyBiosMpTable.h>\r
 \r
 #include <Library/DebugLib.h>\r
@@ -38,7 +38,6 @@ Abstract:
 #include <Library/PcdLib.h>\r
 #include <Library/GenericBdsLib.h>\r
 #include <Library/PlatformBdsLib.h>\r
-#include <Library/GraphicsLib.h>\r
 #include <Library/HobLib.h>\r
 #include <Library/UefiLib.h>\r
 #include <Library/DxeServicesTableLib.h>\r
@@ -48,7 +47,7 @@ Abstract:
 \r
 #include <Guid/Bmp.h>\r
 #include <Guid/Acpi.h>\r
-#include <Guid/Smbios.h>\r
+#include <Guid/SmBios.h>\r
 #include <Guid/Mps.h>\r
 #include <Guid/HobList.h>\r
 #include <Guid/PciExpressBaseAddress.h>\r
@@ -76,18 +75,24 @@ extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;
   { \\r
     HARDWARE_DEVICE_PATH, \\r
     HW_PCI_DP, \\r
-    (UINT8) (sizeof (PCI_DEVICE_PATH)), \\r
-    (UINT8) ((sizeof (PCI_DEVICE_PATH)) >> 8), \\r
+    { \\r
+      (UINT8) (sizeof (PCI_DEVICE_PATH)), \\r
+      (UINT8) ((sizeof (PCI_DEVICE_PATH)) >> 8) \\r
+    }, \\r
     (Func), \\r
     (Dev) \\r
   }\r
 \r
 #define PNPID_DEVICE_PATH_NODE(PnpId) \\r
   { \\r
-    ACPI_DEVICE_PATH, \\r
-    ACPI_DP, \\r
-    (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), \\r
-    (UINT8) ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8), \\r
+    { \\r
+      ACPI_DEVICE_PATH, \\r
+      ACPI_DP, \\r
+      { \\r
+        (UINT8) (sizeof (ACPI_HID_DEVICE_PATH)), \\r
+        (UINT8) ((sizeof (ACPI_HID_DEVICE_PATH)) >> 8) \\r
+      } \\r
+    }, \\r
     EISA_PNP_ID((PnpId)), \\r
     0 \\r
   }\r
@@ -109,10 +114,14 @@ extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;
 \r
 #define gUart \\r
   { \\r
-    MESSAGING_DEVICE_PATH, \\r
-    MSG_UART_DP, \\r
-    (UINT8) (sizeof (UART_DEVICE_PATH)), \\r
-    (UINT8) ((sizeof (UART_DEVICE_PATH)) >> 8), \\r
+    { \\r
+      MESSAGING_DEVICE_PATH, \\r
+      MSG_UART_DP, \\r
+      { \\r
+        (UINT8) (sizeof (UART_DEVICE_PATH)), \\r
+        (UINT8) ((sizeof (UART_DEVICE_PATH)) >> 8) \\r
+      } \\r
+    }, \\r
     0, \\r
     115200, \\r
     8, \\r
@@ -122,10 +131,14 @@ extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;
 \r
 #define gPcAnsiTerminal \\r
   { \\r
-    MESSAGING_DEVICE_PATH, \\r
-    MSG_VENDOR_DP, \\r
-    (UINT8) (sizeof (VENDOR_DEVICE_PATH)), \\r
-    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8), \\r
+    { \\r
+      MESSAGING_DEVICE_PATH, \\r
+      MSG_VENDOR_DP, \\r
+      { \\r
+        (UINT8) (sizeof (VENDOR_DEVICE_PATH)), \\r
+        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8) \\r
+      } \\r
+    }, \\r
     DEVICE_PATH_MESSAGING_PC_ANSI \\r
   }\r
 \r
@@ -133,8 +146,10 @@ extern VENDOR_DEVICE_PATH         gTerminalTypeDeviceNode;
   { \\r
     END_DEVICE_PATH_TYPE, \\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE, \\r
-    END_DEVICE_PATH_LENGTH, \\r
-    0 \\r
+    { \\r
+      END_DEVICE_PATH_LENGTH, \\r
+      0 \\r
+    } \\r
   }\r
 \r
 #define PCI_CLASS_SCC          0x07\r
@@ -203,28 +218,24 @@ extern PLATFORM_ROOT_BRIDGE_DEVICE_PATH  gPlatformRootBridge0;
 VOID\r
 PlatformBdsInit (\r
   IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 PlatformBdsPolicyBehavior (\r
   IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData,\r
   IN LIST_ENTRY                  *DriverOptionList,\r
   IN LIST_ENTRY                  *BootOptionList\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 PlatformBdsGetDriverOption (\r
   IN LIST_ENTRY               *BdsDriverLists\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 BdsMemoryTest (\r
   EXTENDMEM_COVERAGE_LEVEL Level\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 PlatformBdsShowProgress (\r
@@ -234,14 +245,12 @@ PlatformBdsShowProgress (
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL ProgressColor,\r
   UINTN                         Progress,\r
   UINTN                         PreviousValue\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 PlatformBdsConnectSequence (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 PlatformBdsBootFail (\r
@@ -249,64 +258,54 @@ PlatformBdsBootFail (
   IN  EFI_STATUS         Status,\r
   IN  CHAR16             *ExitData,\r
   IN  UINTN              ExitDataSize\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 PlatformBdsBootSuccess (\r
   IN  BDS_COMMON_OPTION *Option\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 ProcessCapsules (\r
   EFI_BOOT_MODE BootMode\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 PlatformBdsConnectConsole (\r
   IN BDS_CONSOLE_CONNECT_ENTRY   *PlatformConsole\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 PlatformBdsNoConsoleAction (\r
   VOID\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 ConvertMpsTable (\r
   IN OUT  VOID     **Table\r
-  )\r
-;\r
+  );\r
   \r
 EFI_STATUS\r
 ConvertSmbiosTable (\r
   IN OUT VOID       **Table\r
-  )\r
-;\r
+  );\r
   \r
 EFI_STATUS\r
 ConvertAcpiTable (\r
  IN      UINTN      TableLen,\r
  IN OUT  VOID       **Table\r
-  )\r
-;\r
+  );\r
 \r
 EFI_STATUS\r
 ConvertSystemTable (\r
  IN     EFI_GUID   *TableGuid,\r
  IN OUT VOID       **Table\r
-  )\r
-;\r
+  );\r
 \r
 VOID\r
 PlatformBdsEnterFrontPage (\r
   IN UINT16                 TimeoutDefault,\r
   IN BOOLEAN                ConnectAllHappened\r
-  )\r
-;\r
+  );\r
 \r
 #endif // _PLATFORM_SPECIFIC_BDS_PLATFORM_H_\r