Clean up the private GUID definition in module Level.

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

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
index 1110529c9dcf10cc03d58e297f2bc70ddfe9a6ae..564d488c1ade59c88e9306537c41276aacd12cdd 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
@@ -1,7 +1,7 @@
 /*++\r
 \r
-Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 http://opensource.org/licenses/bsd-license.php                                            \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
@@ -46,13 +45,13 @@ Abstract:
 \r
 #include <Protocol/PciIo.h>\r
 \r
-#include <Guid/Bmp.h>\r
 #include <Guid/Acpi.h>\r
 #include <Guid/SmBios.h>\r
 #include <Guid/Mps.h>\r
 #include <Guid/HobList.h>\r
 #include <Guid/PciExpressBaseAddress.h>\r
 #include <Guid/GlobalVariable.h>\r
+#include <Guid/LdrMemoryDescriptor.h>\r
 \r
 extern BDS_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];\r
 extern EFI_DEVICE_PATH_PROTOCOL   *gPlatformConnectSequence[];\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
@@ -200,18 +215,6 @@ extern PLATFORM_ROOT_BRIDGE_DEVICE_PATH  gPlatformRootBridge0;
 //\r
 // Platform BDS Functions\r
 //\r
-VOID\r
-PlatformBdsInit (\r
-  IN EFI_BDS_ARCH_PROTOCOL_INSTANCE  *PrivateData\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
 VOID\r
 PlatformBdsGetDriverOption (\r
   IN LIST_ENTRY               *BdsDriverLists\r
@@ -237,19 +240,6 @@ PlatformBdsConnectSequence (
   VOID\r
   );\r
 \r
-VOID\r
-PlatformBdsBootFail (\r
-  IN  BDS_COMMON_OPTION  *Option,\r
-  IN  EFI_STATUS         Status,\r
-  IN  CHAR16             *ExitData,\r
-  IN  UINTN              ExitDataSize\r
-  );\r
-\r
-VOID\r
-PlatformBdsBootSuccess (\r
-  IN  BDS_COMMON_OPTION *Option\r
-  );\r
-\r
 EFI_STATUS\r
 ProcessCapsules (\r
   EFI_BOOT_MODE BootMode\r