1. Removed definition for EFI_1_1 from module ConSplitter

[mirror_edk2.git] / EdkModulePkg / Universal / Console / ConSplitter / Dxe / ConSplitter.h

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
index 54a1e575045e3510fa377c1ee77734b57772e8d7..222e6b4c357562b173cb7f51e5ad832976069ec3 100644 (file)
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
@@ -2,13 +2,13 @@
   Private data structures for the Console Splitter driver\r
 \r
 Copyright (c) 2006 - 2007 Intel Corporation. <BR>\r
-All rights reserved. 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
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+All rights reserved. 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
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r
 \r
@@ -94,20 +94,11 @@ typedef struct {
   EFI_SIMPLE_TEXT_OUT_PROTOCOL    TextOut;\r
   EFI_SIMPLE_TEXT_OUTPUT_MODE     TextOutMode;\r
 \r
-#if (EFI_SPECIFICATION_VERSION < 0x00020000)\r
-  EFI_UGA_DRAW_PROTOCOL           UgaDraw;\r
-  UINT32                          UgaHorizontalResolution;\r
-  UINT32                          UgaVerticalResolution;\r
-  UINT32                          UgaColorDepth;\r
-  UINT32                          UgaRefreshRate;\r
-  EFI_UGA_PIXEL                   *UgaBlt;\r
-#else\r
   EFI_GRAPHICS_OUTPUT_PROTOCOL    GraphicsOutput;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL   *GraphicsOutputBlt;\r
   TEXT_OUT_GOP_MODE               *GraphicsOutputModeBuffer;\r
   UINTN                           CurrentNumberOfGraphicsOutput;\r
   BOOLEAN                         HardwareNeedsStarting;\r
-#endif\r
 \r
   EFI_CONSOLE_CONTROL_PROTOCOL    ConsoleControl;\r
 \r
@@ -626,52 +617,6 @@ DevNullGopSync (
   )\r
 ;\r
 \r
-#if (EFI_SPECIFICATION_VERSION < 0x00020000)\r
-EFI_STATUS\r
-EFIAPI\r
-ConSpliterUgaDrawGetMode (\r
-  IN  EFI_UGA_DRAW_PROTOCOL           *This,\r
-  OUT UINT32                          *HorizontalResolution,\r
-  OUT UINT32                          *VerticalResolution,\r
-  OUT UINT32                          *ColorDepth,\r
-  OUT UINT32                          *RefreshRate\r
-  )\r
-;\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-ConSpliterUgaDrawSetMode (\r
-  IN  EFI_UGA_DRAW_PROTOCOL           *This,\r
-  IN UINT32                           HorizontalResolution,\r
-  IN UINT32                           VerticalResolution,\r
-  IN UINT32                           ColorDepth,\r
-  IN UINT32                           RefreshRate\r
-  )\r
-;\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-ConSpliterUgaDrawBlt (\r
-  IN  EFI_UGA_DRAW_PROTOCOL                         *This,\r
-  IN  EFI_UGA_PIXEL                                 *BltBuffer, OPTIONAL\r
-  IN  EFI_UGA_BLT_OPERATION                         BltOperation,\r
-  IN  UINTN                                         SourceX,\r
-  IN  UINTN                                         SourceY,\r
-  IN  UINTN                                         DestinationX,\r
-  IN  UINTN                                         DestinationY,\r
-  IN  UINTN                                         Width,\r
-  IN  UINTN                                         Height,\r
-  IN  UINTN                                         Delta         OPTIONAL\r
-  )\r
-;\r
-\r
-EFI_STATUS\r
-DevNullUgaSync (\r
-  IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
-  IN  EFI_UGA_DRAW_PROTOCOL           *UgaDraw\r
-  )\r
-;\r
-#endif\r
 \r
 EFI_STATUS\r
 DevNullTextOutOutputString (\r