]> git.proxmox.com Git - mirror_edk2.git/blobdiff - EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
Make EdkModulePkg pass Intel IPF compiler with /W4 /WX switches, solving warning...
[mirror_edk2.git] / EdkModulePkg / Universal / Console / ConSplitter / Dxe / ConSplitter.h
index fc68f049a023fa64852e067422f60d1a89275ce0..13c4e743db68ca7ebda2d97e8c240878b2e4bb3e 100644 (file)
@@ -1,6 +1,7 @@
-/*++\r
+/**@file\r
+  Private data structures for the Console Splitter driver\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 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
@@ -9,18 +10,10 @@ http://opensource.org/licenses/bsd-license.php
 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
-Module Name:\r
-\r
-  ConSplitter.h\r
-\r
-Abstract:\r
-\r
-  Private data structures for the Console Splitter driver\r
+**/\r
 \r
---*/\r
-\r
-#ifndef SPLITER_H_\r
-#define SPLITER_H_\r
+#ifndef _CON_SPLITER_H_\r
+#define _CON_SPLITER_H_\r
 \r
 //\r
 // Private Data Structures\r
@@ -35,7 +28,7 @@ typedef struct {
 } TEXT_OUT_SPLITTER_QUERY_DATA;\r
 \r
 //\r
-// Private data for the EFI_SIMPLE_INPUT_PROTOCOL splitter\r
+// Private data for the EFI_SIMPLE_TEXT_INPUT_PROTOCOL splitter\r
 //\r
 #define TEXT_IN_SPLITTER_PRIVATE_DATA_SIGNATURE EFI_SIGNATURE_32 ('T', 'i', 'S', 'p')\r
 \r
@@ -64,18 +57,18 @@ typedef struct {
   BOOLEAN                     InputEventSignalState;\r
 } TEXT_IN_SPLITTER_PRIVATE_DATA;\r
 \r
-#define TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_THIS(a) \\r
-  CR (a, \\r
-      TEXT_IN_SPLITTER_PRIVATE_DATA, \\r
-      TextIn, \\r
-      TEXT_IN_SPLITTER_PRIVATE_DATA_SIGNATURE \\r
+#define TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_THIS(a)  \\r
+  CR ((a),                                            \\r
+      TEXT_IN_SPLITTER_PRIVATE_DATA,                \\r
+      TextIn,                                       \\r
+      TEXT_IN_SPLITTER_PRIVATE_DATA_SIGNATURE       \\r
       )\r
 \r
 #define TEXT_IN_SPLITTER_PRIVATE_DATA_FROM_SIMPLE_POINTER_THIS(a) \\r
-  CR (a, \\r
-      TEXT_IN_SPLITTER_PRIVATE_DATA, \\r
-      SimplePointer, \\r
-      TEXT_IN_SPLITTER_PRIVATE_DATA_SIGNATURE \\r
+  CR ((a),                                                          \\r
+      TEXT_IN_SPLITTER_PRIVATE_DATA,                              \\r
+      SimplePointer,                                              \\r
+      TEXT_IN_SPLITTER_PRIVATE_DATA_SIGNATURE                     \\r
       )\r
 \r
 //\r
@@ -84,33 +77,48 @@ typedef struct {
 #define TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE  EFI_SIGNATURE_32 ('T', 'o', 'S', 'p')\r
 \r
 typedef struct {\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL  *GraphicsOutput;\r
   EFI_UGA_DRAW_PROTOCOL         *UgaDraw;\r
   EFI_SIMPLE_TEXT_OUT_PROTOCOL  *TextOut;\r
   BOOLEAN                       TextOutEnabled;\r
-} TEXT_OUT_AND_UGA_DATA;\r
+} TEXT_OUT_AND_GOP_DATA;\r
+\r
+typedef struct {\r
+  UINT32                     HorizontalResolution;\r
+  UINT32                     VerticalResolution;\r
+} TEXT_OUT_GOP_MODE;\r
 \r
 typedef struct {\r
   UINT64                          Signature;\r
   EFI_HANDLE                      VirtualHandle;\r
   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
   UINTN                           CurrentNumberOfConsoles;\r
-  TEXT_OUT_AND_UGA_DATA           *TextOutList;\r
+  TEXT_OUT_AND_GOP_DATA           *TextOutList;\r
   UINTN                           TextOutListCount;\r
   TEXT_OUT_SPLITTER_QUERY_DATA    *TextOutQueryData;\r
   UINTN                           TextOutQueryDataCount;\r
   INT32                           *TextOutModeMap;\r
 \r
-  EFI_CONSOLE_CONTROL_SCREEN_MODE UgaMode;\r
+  EFI_CONSOLE_CONTROL_SCREEN_MODE ConsoleOutputMode;\r
 \r
   UINTN                           DevNullColumns;\r
   UINTN                           DevNullRows;\r
@@ -120,24 +128,31 @@ typedef struct {
 } TEXT_OUT_SPLITTER_PRIVATE_DATA;\r
 \r
 #define TEXT_OUT_SPLITTER_PRIVATE_DATA_FROM_THIS(a) \\r
-  CR (a, \\r
-      TEXT_OUT_SPLITTER_PRIVATE_DATA, \\r
-      TextOut, \\r
-      TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE \\r
+  CR ((a),                                            \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA,               \\r
+      TextOut,                                      \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE      \\r
+      )\r
+\r
+#define GRAPHICS_OUTPUT_SPLITTER_PRIVATE_DATA_FROM_THIS(a)  \\r
+  CR ((a),                                                    \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA,                       \\r
+      GraphicsOutput,                                       \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE              \\r
       )\r
 \r
 #define UGA_DRAW_SPLITTER_PRIVATE_DATA_FROM_THIS(a) \\r
-  CR (a, \\r
-      TEXT_OUT_SPLITTER_PRIVATE_DATA, \\r
-      UgaDraw, \\r
-      TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE \\r
+  CR ((a),                                            \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA,               \\r
+      UgaDraw,                                      \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE      \\r
       )\r
 \r
-#define CONSOLE_CONTROL_SPLITTER_PRIVATE_DATA_FROM_THIS(a) \\r
-  CR (a, \\r
-      TEXT_OUT_SPLITTER_PRIVATE_DATA, \\r
-      ConsoleControl, \\r
-      TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE \\r
+#define CONSOLE_CONTROL_SPLITTER_PRIVATE_DATA_FROM_THIS(a)  \\r
+  CR ((a),                                                    \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA,                       \\r
+      ConsoleControl,                                       \\r
+      TEXT_OUT_SPLITTER_PRIVATE_DATA_SIGNATURE              \\r
       )\r
 \r
 //\r
@@ -151,14 +166,12 @@ ConSplitterDriverEntry (
   )\r
 ;\r
 \r
-\r
 EFI_STATUS\r
 ConSplitterTextInConstructor (\r
   TEXT_IN_SPLITTER_PRIVATE_DATA       *Private\r
   )\r
 ;\r
 \r
-\r
 EFI_STATUS\r
 ConSplitterTextOutConstructor (\r
   TEXT_OUT_SPLITTER_PRIVATE_DATA      *Private\r
@@ -168,7 +181,6 @@ ConSplitterTextOutConstructor (
 //\r
 // Driver Binding Functions\r
 //\r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingSupported (\r
@@ -178,7 +190,6 @@ ConSplitterConInDriverBindingSupported (
   )\r
 ;\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingSupported (\r
@@ -188,7 +199,6 @@ ConSplitterSimplePointerDriverBindingSupported (
   )\r
 ;\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingSupported (\r
@@ -198,7 +208,6 @@ ConSplitterConOutDriverBindingSupported (
   )\r
 ;\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingSupported (\r
@@ -208,7 +217,6 @@ ConSplitterStdErrDriverBindingSupported (
   )\r
 ;\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStart (\r
@@ -218,7 +226,6 @@ ConSplitterConInDriverBindingStart (
   )\r
 ;\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStart (\r
@@ -228,7 +235,6 @@ ConSplitterSimplePointerDriverBindingStart (
   )\r
 ;\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStart (\r
@@ -238,7 +244,6 @@ ConSplitterConOutDriverBindingStart (
   )\r
 ;\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStart (\r
@@ -248,7 +253,6 @@ ConSplitterStdErrDriverBindingStart (
   )\r
 ;\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStop (\r
@@ -259,7 +263,6 @@ ConSplitterConInDriverBindingStop (
   )\r
 ;\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStop (\r
@@ -270,7 +273,6 @@ ConSplitterSimplePointerDriverBindingStop (
   )\r
 ;\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStop (\r
@@ -281,7 +283,6 @@ ConSplitterConOutDriverBindingStop (
   )\r
 ;\r
 \r
-\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStop (\r
@@ -292,6 +293,54 @@ ConSplitterStdErrDriverBindingStop (
   )\r
 ;\r
 \r
+EFI_STATUS\r
+EFIAPI\r
+ConSplitterComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ConSplitterConInComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ConSplitterSimplePointerComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ConSplitterConOutComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ConSplitterStdErrComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
 //\r
 // TextIn Constructor/Destructor functions\r
 //\r
@@ -333,6 +382,7 @@ EFI_STATUS
 ConSplitterTextOutAddDevice (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
   IN  EFI_SIMPLE_TEXT_OUT_PROTOCOL    *TextOut,\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL    *GraphicsOutput,\r
   IN  EFI_UGA_DRAW_PROTOCOL           *UgaDraw\r
   )\r
 ;\r
@@ -521,7 +571,7 @@ EFIAPI
 ConSpliterConsoleControlGetMode (\r
   IN  EFI_CONSOLE_CONTROL_PROTOCOL    *This,\r
   OUT EFI_CONSOLE_CONTROL_SCREEN_MODE *Mode,\r
-  OUT BOOLEAN                         *UgaExists,\r
+  OUT BOOLEAN                         *GopExists,\r
   OUT BOOLEAN                         *StdInLocked\r
   )\r
 ;\r
@@ -534,6 +584,49 @@ ConSpliterConsoleControlSetMode (
   )\r
 ;\r
 \r
+EFI_STATUS\r
+EFIAPI\r
+ConSpliterGraphicsOutputQueryMode (\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL                 *This,\r
+  IN  UINT32                                   ModeNumber,\r
+  OUT UINTN                                       *SizeOfInfo,\r
+  OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION     **Info\r
+  )\r
+;\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ConSpliterGraphicsOutputSetMode (\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL * This,\r
+  IN  UINT32                       ModeNumber\r
+  )\r
+;\r
+\r
+EFI_STATUS\r
+EFIAPI\r
+ConSpliterGraphicsOutputBlt (\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL                  *This,\r
+  IN  EFI_GRAPHICS_OUTPUT_BLT_PIXEL                 *BltBuffer, OPTIONAL\r
+  IN  EFI_GRAPHICS_OUTPUT_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
+DevNullGopSync (\r
+  IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private,\r
+  IN  EFI_GRAPHICS_OUTPUT_PROTOCOL    *GraphicsOutput,\r
+  IN  EFI_UGA_DRAW_PROTOCOL           *UgaDraw\r
+  )\r
+;\r
+\r
+#if (EFI_SPECIFICATION_VERSION < 0x00020000)\r
 EFI_STATUS\r
 EFIAPI\r
 ConSpliterUgaDrawGetMode (\r
@@ -578,6 +671,7 @@ DevNullUgaSync (
   IN  EFI_UGA_DRAW_PROTOCOL           *UgaDraw\r
   )\r
 ;\r
+#endif\r
 \r
 EFI_STATUS\r
 DevNullTextOutOutputString (\r
@@ -615,7 +709,7 @@ DevNullTextOutEnableCursor (
 ;\r
 \r
 EFI_STATUS\r
-DevNullSyncUgaStdOut (\r
+DevNullSyncGopStdOut (\r
   IN  TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private\r
   )\r
 ;\r