]> git.proxmox.com Git - mirror_edk2.git/commitdiff
1.Moved HotPlugDevice.h & SimpleTextInNotify.h from /Guid to /Protocol
authorgikidy <gikidy@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 16 Jan 2009 07:33:08 +0000 (07:33 +0000)
committergikidy <gikidy@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 16 Jan 2009 07:33:08 +0000 (07:33 +0000)
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

13 files changed:
MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h
MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
MdeModulePkg/Include/Guid/HotPlugDevice.h [deleted file]
MdeModulePkg/Include/Guid/SimpleTextInExNotify.h [deleted file]
MdeModulePkg/Include/Protocol/HotPlugDevice.h [new file with mode: 0644]
MdeModulePkg/Include/Protocol/SimpleTextInExNotify.h [new file with mode: 0644]
MdeModulePkg/MdeModulePkg.dec
MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.h
MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

index 84950beab934a6ad8b0358cd5c274d65fbecb729..7ccd429aa216803cba3a4f155ae87683da100c66 100644 (file)
@@ -22,8 +22,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/HiiDatabase.h>\r
 #include <Protocol/UsbIo.h>\r
 #include <Protocol/DevicePath.h>\r
+#include <Protocol/SimpleTextInExNotify.h>\r
+#include <Protocol/HotPlugDevice.h>\r
+\r
 #include <Guid/HiiKeyBoardLayout.h>\r
-#include <Guid/HotPlugDevice.h>\r
 \r
 #include <Library/DebugLib.h>\r
 #include <Library/ReportStatusCodeLib.h>\r
@@ -157,7 +159,6 @@ typedef struct {
 extern EFI_DRIVER_BINDING_PROTOCOL   gUsbKeyboardDriverBinding;\r
 extern EFI_COMPONENT_NAME_PROTOCOL   gUsbKeyboardComponentName;\r
 extern EFI_COMPONENT_NAME2_PROTOCOL  gUsbKeyboardComponentName2;\r
-extern EFI_GUID                      gSimpleTextInExNotifyGuid;\r
 \r
 #define USB_KB_DEV_FROM_THIS(a) \\r
     CR(a, USB_KB_DEV, SimpleInput, USB_KB_DEV_SIGNATURE)\r
index 5e84288286c814171b8a69ce8cc00370bfaf4237..4c0126f30798570a7f602a03459c9348d4d67f2e 100644 (file)
   UefiUsbLib\r
   BaseLib\r
 \r
-[Guids]\r
-  gEfiHotPlugDeviceGuid                         # ALWAYS_CONSUMED\r
-  gSimpleTextInExNotifyGuid                     # ALWAYS_CONSUMED\r
-\r
 [Protocols]\r
   gEfiUsbIoProtocolGuid                         # PROTOCOL TO_START\r
   gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
   gEfiSimpleTextInProtocolGuid                  # PROTOCOL BY_START\r
   gEfiSimpleTextInputExProtocolGuid             # PROTOCOL BY_START\r
   gEfiHiiDatabaseProtocolGuid                   # PROTOCOL TO_START\r
-\r
+  gSimpleTextInExNotifyGuid                     # PROTOCOL ALWAYS_CONSUMED\r
+  gEfiHotPlugDeviceGuid                         # PROTOCOL ALWAYS_CONSUMED\r
+  \r
 [FeaturePcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver\r
   \r
diff --git a/MdeModulePkg/Include/Guid/HotPlugDevice.h b/MdeModulePkg/Include/Guid/HotPlugDevice.h
deleted file mode 100644 (file)
index ae6ef46..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/** @file\r
-  This guid is used to specify the device is the hot plug device.\r
-  If the device is the hot plug device, this guid as the protocol guid\r
-  will be installed into this device handle.\r
-\r
-Copyright (c) 2006 - 2008, Intel Corporation\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
-http://opensource.org/licenses/bsd-license.php\r
-\r
-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
-**/\r
-\r
-#ifndef __HOT_PLUG_DEVICE_H__\r
-#define __HOT_PLUG_DEVICE_H__\r
-\r
-#define HOT_PLUG_DEVICE_GUID    \\r
-    { 0x220ac432, 0x1d43, 0x49e5, {0xa7, 0x4f, 0x4c, 0x9d, 0xa6, 0x7a, 0xd2, 0x3b } }\r
-\r
-extern EFI_GUID gEfiHotPlugDeviceGuid;\r
-#endif\r
diff --git a/MdeModulePkg/Include/Guid/SimpleTextInExNotify.h b/MdeModulePkg/Include/Guid/SimpleTextInExNotify.h
deleted file mode 100644 (file)
index 7e4ae41..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/** @file\r
-  This file defines Simple TextInEx Notify Guid that specify the notify handle.\r
-\r
-Copyright (c) 2008, 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
-http://opensource.org/licenses/bsd-license.php\r
-\r
-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
-**/\r
-\r
-#ifndef _SIMPLE_TEXTIN_EX_NOTIFY__H_\r
-#define _SIMPLE_TEXTIN_EX_NOTIFY__H_\r
-\r
-#define SIMPLE_TEXTIN_EX_NOTIFY_GUID \\r
-  { \\r
-    0x856f2def, 0x4e93, 0x4d6b, {0x94, 0xce, 0x1c, 0xfe, 0x47, 0x1, 0x3e, 0xa5} \\r
-  }\r
-\r
-extern EFI_GUID gSimpleTextInExNotifyGuid;\r
-\r
-#endif\r
diff --git a/MdeModulePkg/Include/Protocol/HotPlugDevice.h b/MdeModulePkg/Include/Protocol/HotPlugDevice.h
new file mode 100644 (file)
index 0000000..ae6ef46
--- /dev/null
@@ -0,0 +1,24 @@
+/** @file\r
+  This guid is used to specify the device is the hot plug device.\r
+  If the device is the hot plug device, this guid as the protocol guid\r
+  will be installed into this device handle.\r
+\r
+Copyright (c) 2006 - 2008, Intel Corporation\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
+http://opensource.org/licenses/bsd-license.php\r
+\r
+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
+**/\r
+\r
+#ifndef __HOT_PLUG_DEVICE_H__\r
+#define __HOT_PLUG_DEVICE_H__\r
+\r
+#define HOT_PLUG_DEVICE_GUID    \\r
+    { 0x220ac432, 0x1d43, 0x49e5, {0xa7, 0x4f, 0x4c, 0x9d, 0xa6, 0x7a, 0xd2, 0x3b } }\r
+\r
+extern EFI_GUID gEfiHotPlugDeviceGuid;\r
+#endif\r
diff --git a/MdeModulePkg/Include/Protocol/SimpleTextInExNotify.h b/MdeModulePkg/Include/Protocol/SimpleTextInExNotify.h
new file mode 100644 (file)
index 0000000..7e4ae41
--- /dev/null
@@ -0,0 +1,25 @@
+/** @file\r
+  This file defines Simple TextInEx Notify Guid that specify the notify handle.\r
+\r
+Copyright (c) 2008, 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
+http://opensource.org/licenses/bsd-license.php\r
+\r
+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
+**/\r
+\r
+#ifndef _SIMPLE_TEXTIN_EX_NOTIFY__H_\r
+#define _SIMPLE_TEXTIN_EX_NOTIFY__H_\r
+\r
+#define SIMPLE_TEXTIN_EX_NOTIFY_GUID \\r
+  { \\r
+    0x856f2def, 0x4e93, 0x4d6b, {0x94, 0xce, 0x1c, 0xfe, 0x47, 0x1, 0x3e, 0xa5} \\r
+  }\r
+\r
+extern EFI_GUID gSimpleTextInExNotifyGuid;\r
+\r
+#endif\r
index ff183f17a78f28139f654227b5f0fc71f6f64f3f..6675ffb7fba6f346b2f8868c84102d09ca7cbc01 100644 (file)
 \r
   ## Guid specify the device is the console in device.\r
   gEfiConsoleInDeviceGuid        = { 0xD3B36F2B, 0xD551, 0x11D4, { 0x9A, 0x46, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r
-\r
-  ## Guid specify the device is the hot plug device.\r
-  gEfiHotPlugDeviceGuid          = { 0x220AC432, 0x1D43, 0x49E5, { 0xA7, 0x4F, 0x4C, 0x9D, 0xA6, 0x7A, 0xD2, 0x3B }}\r
   \r
   ## Guid specify the primary console out device.\r
   gEfiPrimaryConsoleOutDeviceGuid = { 0x62BDF38A, 0xE3D5, 0x492C, { 0x95, 0x0C, 0x23, 0xA7, 0xF6, 0x6E, 0x67, 0x2E }}\r
   ## Guid specify the variable list entries put in the EFI system table.\r
   gEfiVariableInfoGuid           = { 0xddcf3616, 0x3275, 0x4164, { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }}\r
   \r
-  ## Guid specify the Simple TextIn Notify handle.\r
-  gSimpleTextInExNotifyGuid      = { 0x856f2def, 0x4e93, 0x4d6b, { 0x94, 0xce, 0x1c, 0xfe, 0x47, 0x01, 0x3e, 0xa5 }}\r
-  \r
   ## Platform Override Variable guid\r
   gEfiOverrideVariableGuid       = { 0x8e3d4ad5, 0xf762, 0x438a, { 0xa1, 0xc1, 0x5b, 0x9f, 0xe6, 0x8c, 0x6b, 0x15 }}\r
 \r
   \r
   ## Tcg addtional services to measure PeImage and ActionString.\r
   gEfiTcgPlatformProtocolGuid    = { 0x8c4c9a41, 0xbf56, 0x4627, { 0x9e, 0xa, 0xc8, 0x38, 0x6d, 0x66, 0x11, 0x5c }}\r
+  \r
+  ## Protocol Guid specify the Simple TextIn Notify handle.\r
+  gSimpleTextInExNotifyGuid      = { 0x856f2def, 0x4e93, 0x4d6b, { 0x94, 0xce, 0x1c, 0xfe, 0x47, 0x01, 0x3e, 0xa5 }}  \r
+\r
+  ## Protocol Guid specify the device is the hot plug device.\r
+  gEfiHotPlugDeviceGuid          = { 0x220AC432, 0x1D43, 0x49E5, { 0xA7, 0x4F, 0x4C, 0x9D, 0xA6, 0x7A, 0xD2, 0x3B }}\r
 \r
 [Ppis.common]\r
   ## Pei memory test PPI used to Perform memory test in PEI phase.\r
index 7f8cad2304d0042d76cadf88a73881fcfaddfb3e..f7883dce6cb14f92961010a15ddcc806872360cb 100644 (file)
@@ -20,12 +20,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/SimpleTextOut.h>\r
 #include <Protocol/DevicePath.h>\r
 #include <Protocol/SimpleTextIn.h>\r
+#include <Protocol/HotPlugDevice.h>\r
 \r
 #include <Guid/GlobalVariable.h>\r
 #include <Guid/ConsoleInDevice.h>\r
 #include <Guid/StandardErrorDevice.h>\r
 #include <Guid/ConsoleOutDevice.h>\r
-#include <Guid/HotPlugDevice.h>\r
 \r
 #include <Library/DebugLib.h>\r
 #include <Library/UefiDriverEntryPoint.h>\r
index 471f561abbbdcf2574bbce0882f5e688ac1f15d7..be3a5f9ff1b5d5d561e46d2afef2556df90bd3ec 100644 (file)
   DebugLib\r
 \r
 [Guids]\r
-  gEfiGlobalVariableGuid                        # SOMETIMES_CONSUMED L"ErrOut"\r
-\r
-[Protocols]\r
-  gEfiDevicePathProtocolGuid                    # PROTOCOL TO_START\r
-  gEfiSimpleTextInProtocolGuid                  # PROTOCOL TO_START\r
-  gEfiSimpleTextOutProtocolGuid                 # PROTOCOL TO_START\r
-\r
-[Guids]\r
-  gEfiHotPlugDeviceGuid\r
+  gEfiGlobalVariableGuid                        ## SOMETIMES_CONSUMES ## Variable:L"ErrOut"\r
   gEfiStandardErrorDeviceGuid\r
   gEfiConsoleOutDeviceGuid\r
   gEfiConsoleInDeviceGuid\r
+\r
+[Protocols]\r
+  gEfiDevicePathProtocolGuid                    ## TO_START\r
+  gEfiSimpleTextInProtocolGuid                  ## TO_START\r
+  gEfiSimpleTextOutProtocolGuid                 ## TO_START\r
+  gEfiHotPlugDeviceGuid                         ## SOMETIMES_CONSUMES\r
   
\ No newline at end of file
index 5c5d691761ab68d523e277a5db31e6e9b4ada6e1..4e37213b34a49881c1bdb70ecd9967d7527fe37d 100644 (file)
@@ -28,6 +28,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/SimpleTextInEx.h>\r
 #include <Protocol/GraphicsOutput.h>\r
 #include <Protocol/UgaDraw.h>\r
+#include <Protocol/SimpleTextInExNotify.h>\r
 \r
 #include <Guid/PrimaryStandardErrorDevice.h>\r
 #include <Guid/PrimaryConsoleOutDevice.h>\r
@@ -67,7 +68,6 @@ extern EFI_DRIVER_BINDING_PROTOCOL  gConSplitterStdErrDriverBinding;
 extern EFI_COMPONENT_NAME_PROTOCOL  gConSplitterStdErrComponentName;\r
 extern EFI_COMPONENT_NAME2_PROTOCOL gConSplitterStdErrComponentName2;\r
 \r
-extern EFI_GUID                     gSimpleTextInExNotifyGuid;\r
 \r
 //\r
 // These definitions were in the old Hii protocol, but are not in the new UEFI\r
index 11982a1203673a16cf7e424abfeed2d27176e659..1f31796cb389feefdfe7fa42c14e89326d289379 100644 (file)
   PcdLib\r
 \r
 [Guids]\r
-  gEfiConsoleInDeviceGuid                       ## SOMETIMES_CONSUMED\r
-  gEfiStandardErrorDeviceGuid                   ## SOMETIMES_CONSUMED\r
-  gEfiConsoleOutDeviceGuid                      ## SOMETIMES_CONSUMED\r
-  gEfiPrimaryConsoleOutDeviceGuid               ## PRODUCED\r
-  gEfiPrimaryConsoleInDeviceGuid                ## PRODUCED\r
-  gEfiPrimaryStandardErrorDeviceGuid            ## PRODUCED\r
-  gSimpleTextInExNotifyGuid                     ## PRODUCED\r
-  gEfiGenericPlatformVariableGuid               ## SOMETIMES_CONSUMED ## Variable:L"ConOutMode"\r
+  gEfiConsoleInDeviceGuid                       ## SOMETIMES_CONSUMES\r
+  gEfiStandardErrorDeviceGuid                   ## SOMETIMES_CONSUMES\r
+  gEfiConsoleOutDeviceGuid                      ## SOMETIMES_CONSUMES\r
+  gEfiPrimaryConsoleOutDeviceGuid               ## PRODUCES\r
+  gEfiPrimaryConsoleInDeviceGuid                ## PRODUCES\r
+  gEfiPrimaryStandardErrorDeviceGuid            ## PRODUCES\r
+  gEfiGenericPlatformVariableGuid               ## SOMETIMES_CONSUMES ## Variable:L"ConOutMode"\r
 \r
 [Protocols]\r
-  gEfiConsoleControlProtocolGuid                ## PRODUCED\r
+  gEfiConsoleControlProtocolGuid                ## PRODUCES\r
   gEfiSimplePointerProtocolGuid                 ## BY_START\r
   gEfiAbsolutePointerProtocolGuid               ## BY_START\r
   gEfiSimpleTextInProtocolGuid                  ## BY_START\r
@@ -89,6 +88,7 @@
   gEfiSimpleTextOutProtocolGuid                 ## BY_START\r
   gEfiGraphicsOutputProtocolGuid                ## BY_START\r
   gEfiUgaDrawProtocolGuid                       ## BY_START\r
+  gSimpleTextInExNotifyGuid                     ## PRODUCES\r
 \r
 \r
 [FeaturePcd.common]\r
index f228400142aae6eb3f473f08f502a0411c847639..6d7d4ceddd9d358558a2e0858d297816c9335408 100644 (file)
@@ -17,14 +17,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 \r
 #include <Uefi.h>\r
+\r
+#include <Guid/GlobalVariable.h>\r
+#include <Guid/PcAnsi.h>\r
+\r
+#include <Protocol/SimpleTextInExNotify.h>\r
+#include <Protocol/HotPlugDevice.h>\r
 #include <Protocol/SimpleTextOut.h>\r
 #include <Protocol/SerialIo.h>\r
-#include <Guid/GlobalVariable.h>\r
 #include <Protocol/DevicePath.h>\r
 #include <Protocol/SimpleTextIn.h>\r
 #include <Protocol/SimpleTextInEx.h>\r
-#include <Guid/HotPlugDevice.h>\r
-#include <Guid/PcAnsi.h>\r
+\r
 #include <Library/DebugLib.h>\r
 #include <Library/UefiDriverEntryPoint.h>\r
 #include <Library/UefiLib.h>\r
@@ -164,8 +168,6 @@ extern EFI_DRIVER_BINDING_PROTOCOL   gTerminalDriverBinding;
 extern EFI_COMPONENT_NAME_PROTOCOL   gTerminalComponentName;\r
 extern EFI_COMPONENT_NAME2_PROTOCOL  gTerminalComponentName2;\r
 \r
-extern EFI_GUID                      gSimpleTextInExNotifyGuid;\r
-\r
 /**\r
   The user Entry Point for module Terminal. The user code starts with this function.\r
 \r
index 67e154df56892e636e441c022c008155500a8985..b7c765267f417661cd8d549bc667e09db2a97c11 100644 (file)
@@ -65,8 +65,6 @@
   gEfiVT100Guid                                 ## SOMETIMES_CONSUMES ## GUID\r
   gEfiVT100PlusGuid                             ## SOMETIMES_CONSUMES ## GUID \r
   gEfiPcAnsiGuid                                ## SOMETIMES_CONSUMES ## GUID\r
-  gSimpleTextInExNotifyGuid                     ## SOMETIMES_CONSUMES ##\r
-  gEfiHotPlugDeviceGuid                         ## SOMETIMES_CONSUMES ##\r
   \r
 [Protocols]\r
   gEfiSerialIoProtocolGuid                      ## TO_START\r
@@ -74,6 +72,8 @@
   gEfiSimpleTextInProtocolGuid                  ## BY_START\r
   gEfiSimpleTextInputExProtocolGuid             ## BY_START\r
   gEfiSimpleTextOutProtocolGuid                 ## BY_START\r
+  gSimpleTextInExNotifyGuid                     ## SOMETIMES_CONSUMES \r
+  gEfiHotPlugDeviceGuid                         ## SOMETIMES_CONSUMES \r
 \r
 [Pcd]\r
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleError\r