From 8d4cd915278975a0c46957b523660bdf67e0d418 Mon Sep 17 00:00:00 2001
From: gikidy <gikidy@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 16 Jan 2009 07:33:08 +0000
Subject: 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     | 5 +++--
 MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf | 8 +++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'MdeModulePkg/Bus')

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
index 84950beab9..7ccd429aa2 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
+++ b/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)
diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
index 5e84288286..4c0126f307 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
@@ -59,17 +59,15 @@
   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
   
-- 
cgit v1.2.3