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

MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h

@@ -22,8 +22,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/HiiDatabase.h>
 #include <Protocol/UsbIo.h>
 #include <Protocol/DevicePath.h>
+#include <Protocol/SimpleTextInExNotify.h>
+#include <Protocol/HotPlugDevice.h>
+
 #include <Guid/HiiKeyBoardLayout.h>
-#include <Guid/HotPlugDevice.h>
 
 #include <Library/DebugLib.h>
 #include <Library/ReportStatusCodeLib.h>
@@ -157,7 +159,6 @@ typedef struct {
 extern EFI_DRIVER_BINDING_PROTOCOL   gUsbKeyboardDriverBinding;
 extern EFI_COMPONENT_NAME_PROTOCOL   gUsbKeyboardComponentName;
 extern EFI_COMPONENT_NAME2_PROTOCOL  gUsbKeyboardComponentName2;
-extern EFI_GUID                      gSimpleTextInExNotifyGuid;
 
 #define USB_KB_DEV_FROM_THIS(a) \
     CR(a, USB_KB_DEV, SimpleInput, USB_KB_DEV_SIGNATURE)

MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf

@@ -59,16 +59,14 @@
   UefiUsbLib
   BaseLib
 
-[Guids]
-  gEfiHotPlugDeviceGuid                         # ALWAYS_CONSUMED
-  gSimpleTextInExNotifyGuid                     # ALWAYS_CONSUMED
-
 [Protocols]
   gEfiUsbIoProtocolGuid                         # PROTOCOL TO_START
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START
   gEfiSimpleTextInProtocolGuid                  # PROTOCOL BY_START
   gEfiSimpleTextInputExProtocolGuid             # PROTOCOL BY_START
   gEfiHiiDatabaseProtocolGuid                   # PROTOCOL TO_START
+  gSimpleTextInExNotifyGuid                     # PROTOCOL ALWAYS_CONSUMED
+  gEfiHotPlugDeviceGuid                         # PROTOCOL ALWAYS_CONSUMED
   
 [FeaturePcd.common]
   gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver

MdeModulePkg/MdeModulePkg.dec

@@ -121,9 +121,6 @@
   ## Guid specify the device is the console in device.
   gEfiConsoleInDeviceGuid        = { 0xD3B36F2B, 0xD551, 0x11D4, { 0x9A, 0x46, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}
   
-  ## Guid specify the device is the hot plug device.
-  gEfiHotPlugDeviceGuid          = { 0x220AC432, 0x1D43, 0x49E5, { 0xA7, 0x4F, 0x4C, 0x9D, 0xA6, 0x7A, 0xD2, 0x3B }}
-  
   ## Guid specify the primary console out device.
   gEfiPrimaryConsoleOutDeviceGuid = { 0x62BDF38A, 0xE3D5, 0x492C, { 0x95, 0x0C, 0x23, 0xA7, 0xF6, 0x6E, 0x67, 0x2E }}
   
@@ -163,9 +160,6 @@
   ## Guid specify the variable list entries put in the EFI system table.
   gEfiVariableInfoGuid           = { 0xddcf3616, 0x3275, 0x4164, { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}
   
-  ## Guid specify the Simple TextIn Notify handle.
-  gSimpleTextInExNotifyGuid      = { 0x856f2def, 0x4e93, 0x4d6b, { 0x94, 0xce, 0x1c, 0xfe, 0x47, 0x01, 0x3e, 0xa5 }}
-  
   ## Platform Override Variable guid
   gEfiOverrideVariableGuid       = { 0x8e3d4ad5, 0xf762, 0x438a, { 0xa1, 0xc1, 0x5b, 0x9f, 0xe6, 0x8c, 0x6b, 0x15 }}
 
@@ -220,6 +214,12 @@
   ## Tcg addtional services to measure PeImage and ActionString.
   gEfiTcgPlatformProtocolGuid    = { 0x8c4c9a41, 0xbf56, 0x4627, { 0x9e, 0xa, 0xc8, 0x38, 0x6d, 0x66, 0x11, 0x5c }}
   
+  ## Protocol Guid specify the Simple TextIn Notify handle.
+  gSimpleTextInExNotifyGuid      = { 0x856f2def, 0x4e93, 0x4d6b, { 0x94, 0xce, 0x1c, 0xfe, 0x47, 0x01, 0x3e, 0xa5 }}  
+
+  ## Protocol Guid specify the device is the hot plug device.
+  gEfiHotPlugDeviceGuid          = { 0x220AC432, 0x1D43, 0x49E5, { 0xA7, 0x4F, 0x4C, 0x9D, 0xA6, 0x7A, 0xD2, 0x3B }}
+
 [Ppis.common]
   ## Pei memory test PPI used to Perform memory test in PEI phase.
   gPeiBaseMemoryTestPpiGuid      = { 0xB6EC423C, 0x21D2, 0x490D, { 0x85, 0xC6, 0xDD, 0x58, 0x64, 0xEA, 0xA6, 0x74 }}

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>

MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

@@ -54,16 +54,14 @@
   DebugLib
 
 [Guids]
-  gEfiGlobalVariableGuid                        # SOMETIMES_CONSUMED L"ErrOut"
+  gEfiGlobalVariableGuid                        ## SOMETIMES_CONSUMES ## Variable:L"ErrOut"
-
-[Protocols]
-  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START
-  gEfiSimpleTextInProtocolGuid                  # PROTOCOL TO_START
-  gEfiSimpleTextOutProtocolGuid                 # PROTOCOL TO_START
-
-[Guids]
-  gEfiHotPlugDeviceGuid
   gEfiStandardErrorDeviceGuid
   gEfiConsoleOutDeviceGuid
   gEfiConsoleInDeviceGuid
 
+[Protocols]
+  gEfiDevicePathProtocolGuid                    ## TO_START
+  gEfiSimpleTextInProtocolGuid                  ## TO_START
+  gEfiSimpleTextOutProtocolGuid                 ## TO_START
+  gEfiHotPlugDeviceGuid                         ## SOMETIMES_CONSUMES
+  

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

MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf

@@ -71,17 +71,16 @@
   PcdLib
 
 [Guids]
-  gEfiConsoleInDeviceGuid                       ## SOMETIMES_CONSUMED
+  gEfiConsoleInDeviceGuid                       ## SOMETIMES_CONSUMES
-  gEfiStandardErrorDeviceGuid                   ## SOMETIMES_CONSUMED
+  gEfiStandardErrorDeviceGuid                   ## SOMETIMES_CONSUMES
-  gEfiConsoleOutDeviceGuid                      ## SOMETIMES_CONSUMED
+  gEfiConsoleOutDeviceGuid                      ## SOMETIMES_CONSUMES
-  gEfiPrimaryConsoleOutDeviceGuid               ## PRODUCED
+  gEfiPrimaryConsoleOutDeviceGuid               ## PRODUCES
-  gEfiPrimaryConsoleInDeviceGuid                ## PRODUCED
+  gEfiPrimaryConsoleInDeviceGuid                ## PRODUCES
-  gEfiPrimaryStandardErrorDeviceGuid            ## PRODUCED
+  gEfiPrimaryStandardErrorDeviceGuid            ## PRODUCES
-  gSimpleTextInExNotifyGuid                     ## PRODUCED
+  gEfiGenericPlatformVariableGuid               ## SOMETIMES_CONSUMES ## Variable:L"ConOutMode"
-  gEfiGenericPlatformVariableGuid               ## SOMETIMES_CONSUMED ## 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]

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.
 

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