]> git.proxmox.com Git - mirror_edk2.git/blobdiff - EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
projects / mirror_edk2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Make EdkModulePkg pass Intel IPF compiler with /W4 /WX switches, solving warning...
[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 30980225e57dec2b372680b02e583e1b1a15ac41..13c4e743db68ca7ebda2d97e8c240878b2e4bb3e 100644 (file)
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.h
@@ -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
@@ -135,31 +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
+#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
@@ -173,14 +166,12 @@ ConSplitterDriverEntry (
   )\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 ConSplitterTextInConstructor (\r
   TEXT_IN_SPLITTER_PRIVATE_DATA       *Private\r
   )\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 ConSplitterTextOutConstructor (\r
   TEXT_OUT_SPLITTER_PRIVATE_DATA      *Private\r
@@ -190,7 +181,6 @@ ConSplitterTextOutConstructor (
 //\r
 // Driver Binding Functions\r
 //\r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingSupported (\r
@@ -200,7 +190,6 @@ ConSplitterConInDriverBindingSupported (
   )\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingSupported (\r
@@ -210,7 +199,6 @@ ConSplitterSimplePointerDriverBindingSupported (
   )\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingSupported (\r
@@ -220,7 +208,6 @@ ConSplitterConOutDriverBindingSupported (
   )\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingSupported (\r
@@ -230,7 +217,6 @@ ConSplitterStdErrDriverBindingSupported (
   )\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStart (\r
@@ -240,7 +226,6 @@ ConSplitterConInDriverBindingStart (
   )\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStart (\r
@@ -250,7 +235,6 @@ ConSplitterSimplePointerDriverBindingStart (
   )\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStart (\r
@@ -260,7 +244,6 @@ ConSplitterConOutDriverBindingStart (
   )\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStart (\r
@@ -270,7 +253,6 @@ ConSplitterStdErrDriverBindingStart (
   )\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConInDriverBindingStop (\r
@@ -281,7 +263,6 @@ ConSplitterConInDriverBindingStop (
   )\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterSimplePointerDriverBindingStop (\r
@@ -292,7 +273,6 @@ ConSplitterSimplePointerDriverBindingStop (
   )\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterConOutDriverBindingStop (\r
@@ -303,7 +283,6 @@ ConSplitterConOutDriverBindingStop (
   )\r
 ;\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 ConSplitterStdErrDriverBindingStop (\r
@@ -314,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
@@ -599,7 +626,7 @@ DevNullGopSync (
   )\r
 ;\r
 \r
-#if (EFI_SPECIFICATION < 0x00020000)\r
+#if (EFI_SPECIFICATION_VERSION < 0x00020000)\r
 EFI_STATUS\r
 EFIAPI\r
 ConSpliterUgaDrawGetMode (\r
EFI Development Kit II mirror for PVE