1.Moved HotPlugDevice.h & SimpleTextInNotify.h from /Guid to /Protocol

2.Modified the reference of two Guids in DEC file, Inf files and h files;

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7294 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 9 insertions, 7 deletions

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