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 1110529c9dcf10cc03d58e297f2bc70ddfe9a6ae..ed4bc1ef669ac35f889c4ebac78d3fecf9182af3 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
@@ -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
@@ -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