diff options
Diffstat (limited to 'MdeModulePkg/Universal')
6 files changed, 27 insertions, 27 deletions
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h index 7f8cad2..f7883dc 100644 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h +++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h @@ -20,12 +20,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Protocol/SimpleTextOut.h>
#include <Protocol/DevicePath.h>
#include <Protocol/SimpleTextIn.h>
+#include <Protocol/HotPlugDevice.h>
#include <Guid/GlobalVariable.h>
#include <Guid/ConsoleInDevice.h>
#include <Guid/StandardErrorDevice.h>
#include <Guid/ConsoleOutDevice.h>
-#include <Guid/HotPlugDevice.h>
#include <Library/DebugLib.h>
#include <Library/UefiDriverEntryPoint.h>
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf index 471f561..be3a5f9 100644 --- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf +++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf @@ -54,16 +54,14 @@ DebugLib
[Guids]
- gEfiGlobalVariableGuid # SOMETIMES_CONSUMED L"ErrOut"
-
-[Protocols]
- gEfiDevicePathProtocolGuid # PROTOCOL TO_START
- gEfiSimpleTextInProtocolGuid # PROTOCOL TO_START
- gEfiSimpleTextOutProtocolGuid # PROTOCOL TO_START
-
-[Guids]
- gEfiHotPlugDeviceGuid
+ gEfiGlobalVariableGuid ## SOMETIMES_CONSUMES ## Variable:L"ErrOut"
gEfiStandardErrorDeviceGuid
gEfiConsoleOutDeviceGuid
gEfiConsoleInDeviceGuid
+
+[Protocols]
+ gEfiDevicePathProtocolGuid ## TO_START
+ gEfiSimpleTextInProtocolGuid ## TO_START
+ gEfiSimpleTextOutProtocolGuid ## TO_START
+ gEfiHotPlugDeviceGuid ## SOMETIMES_CONSUMES
\ No newline at end of file diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h index 5c5d691..4e37213 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h @@ -28,6 +28,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Protocol/SimpleTextInEx.h>
#include <Protocol/GraphicsOutput.h>
#include <Protocol/UgaDraw.h>
+#include <Protocol/SimpleTextInExNotify.h>
#include <Guid/PrimaryStandardErrorDevice.h>
#include <Guid/PrimaryConsoleOutDevice.h>
@@ -67,7 +68,6 @@ extern EFI_DRIVER_BINDING_PROTOCOL gConSplitterStdErrDriverBinding; extern EFI_COMPONENT_NAME_PROTOCOL gConSplitterStdErrComponentName;
extern EFI_COMPONENT_NAME2_PROTOCOL gConSplitterStdErrComponentName2;
-extern EFI_GUID gSimpleTextInExNotifyGuid;
//
// These definitions were in the old Hii protocol, but are not in the new UEFI
diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf index 11982a1..1f31796 100644 --- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf +++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf @@ -71,17 +71,16 @@ PcdLib
[Guids]
- gEfiConsoleInDeviceGuid ## SOMETIMES_CONSUMED
- gEfiStandardErrorDeviceGuid ## SOMETIMES_CONSUMED
- gEfiConsoleOutDeviceGuid ## SOMETIMES_CONSUMED
- gEfiPrimaryConsoleOutDeviceGuid ## PRODUCED
- gEfiPrimaryConsoleInDeviceGuid ## PRODUCED
- gEfiPrimaryStandardErrorDeviceGuid ## PRODUCED
- gSimpleTextInExNotifyGuid ## PRODUCED
- gEfiGenericPlatformVariableGuid ## SOMETIMES_CONSUMED ## Variable:L"ConOutMode"
+ gEfiConsoleInDeviceGuid ## SOMETIMES_CONSUMES
+ gEfiStandardErrorDeviceGuid ## SOMETIMES_CONSUMES
+ gEfiConsoleOutDeviceGuid ## SOMETIMES_CONSUMES
+ gEfiPrimaryConsoleOutDeviceGuid ## PRODUCES
+ gEfiPrimaryConsoleInDeviceGuid ## PRODUCES
+ gEfiPrimaryStandardErrorDeviceGuid ## PRODUCES
+ gEfiGenericPlatformVariableGuid ## SOMETIMES_CONSUMES ## Variable:L"ConOutMode"
[Protocols]
- gEfiConsoleControlProtocolGuid ## PRODUCED
+ gEfiConsoleControlProtocolGuid ## PRODUCES
gEfiSimplePointerProtocolGuid ## BY_START
gEfiAbsolutePointerProtocolGuid ## BY_START
gEfiSimpleTextInProtocolGuid ## BY_START
@@ -89,6 +88,7 @@ gEfiSimpleTextOutProtocolGuid ## BY_START
gEfiGraphicsOutputProtocolGuid ## BY_START
gEfiUgaDrawProtocolGuid ## BY_START
+ gSimpleTextInExNotifyGuid ## PRODUCES
[FeaturePcd.common]
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h index f228400..6d7d4ce 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h +++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h @@ -17,14 +17,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Uefi.h>
+
+#include <Guid/GlobalVariable.h>
+#include <Guid/PcAnsi.h>
+
+#include <Protocol/SimpleTextInExNotify.h>
+#include <Protocol/HotPlugDevice.h>
#include <Protocol/SimpleTextOut.h>
#include <Protocol/SerialIo.h>
-#include <Guid/GlobalVariable.h>
#include <Protocol/DevicePath.h>
#include <Protocol/SimpleTextIn.h>
#include <Protocol/SimpleTextInEx.h>
-#include <Guid/HotPlugDevice.h>
-#include <Guid/PcAnsi.h>
+
#include <Library/DebugLib.h>
#include <Library/UefiDriverEntryPoint.h>
#include <Library/UefiLib.h>
@@ -164,8 +168,6 @@ extern EFI_DRIVER_BINDING_PROTOCOL gTerminalDriverBinding; extern EFI_COMPONENT_NAME_PROTOCOL gTerminalComponentName;
extern EFI_COMPONENT_NAME2_PROTOCOL gTerminalComponentName2;
-extern EFI_GUID gSimpleTextInExNotifyGuid;
-
/**
The user Entry Point for module Terminal. The user code starts with this function.
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf index 67e154d..b7c7652 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf @@ -65,8 +65,6 @@ gEfiVT100Guid ## SOMETIMES_CONSUMES ## GUID
gEfiVT100PlusGuid ## SOMETIMES_CONSUMES ## GUID
gEfiPcAnsiGuid ## SOMETIMES_CONSUMES ## GUID
- gSimpleTextInExNotifyGuid ## SOMETIMES_CONSUMES ##
- gEfiHotPlugDeviceGuid ## SOMETIMES_CONSUMES ##
[Protocols]
gEfiSerialIoProtocolGuid ## TO_START
@@ -74,6 +72,8 @@ gEfiSimpleTextInProtocolGuid ## BY_START
gEfiSimpleTextInputExProtocolGuid ## BY_START
gEfiSimpleTextOutProtocolGuid ## BY_START
+ gSimpleTextInExNotifyGuid ## SOMETIMES_CONSUMES
+ gEfiHotPlugDeviceGuid ## SOMETIMES_CONSUMES
[Pcd]
gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleError
|