From 8d4cd915278975a0c46957b523660bdf67e0d418 Mon Sep 17 00:00:00 2001 From: gikidy 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 +++---- MdeModulePkg/Include/Guid/HotPlugDevice.h | 24 --------------------- MdeModulePkg/Include/Guid/SimpleTextInExNotify.h | 25 ---------------------- MdeModulePkg/Include/Protocol/HotPlugDevice.h | 24 +++++++++++++++++++++ .../Include/Protocol/SimpleTextInExNotify.h | 25 ++++++++++++++++++++++ MdeModulePkg/MdeModulePkg.dec | 12 +++++------ .../Universal/Console/ConPlatformDxe/ConPlatform.h | 2 +- .../Console/ConPlatformDxe/ConPlatformDxe.inf | 16 ++++++-------- .../Universal/Console/ConSplitterDxe/ConSplitter.h | 2 +- .../Console/ConSplitterDxe/ConSplitterDxe.inf | 18 ++++++++-------- .../Universal/Console/TerminalDxe/Terminal.h | 12 ++++++----- .../Universal/Console/TerminalDxe/TerminalDxe.inf | 4 ++-- 13 files changed, 88 insertions(+), 89 deletions(-) delete mode 100644 MdeModulePkg/Include/Guid/HotPlugDevice.h delete mode 100644 MdeModulePkg/Include/Guid/SimpleTextInExNotify.h create mode 100644 MdeModulePkg/Include/Protocol/HotPlugDevice.h create mode 100644 MdeModulePkg/Include/Protocol/SimpleTextInExNotify.h diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.h index 84950be..7ccd429 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 #include #include +#include +#include + #include -#include #include #include @@ -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 5e84288..4c0126f 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 diff --git a/MdeModulePkg/Include/Guid/HotPlugDevice.h b/MdeModulePkg/Include/Guid/HotPlugDevice.h deleted file mode 100644 index ae6ef46..0000000 --- a/MdeModulePkg/Include/Guid/HotPlugDevice.h +++ /dev/null @@ -1,24 +0,0 @@ -/** @file - This guid is used to specify the device is the hot plug device. - If the device is the hot plug device, this guid as the protocol guid - will be installed into this device handle. - -Copyright (c) 2006 - 2008, Intel Corporation -All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#ifndef __HOT_PLUG_DEVICE_H__ -#define __HOT_PLUG_DEVICE_H__ - -#define HOT_PLUG_DEVICE_GUID \ - { 0x220ac432, 0x1d43, 0x49e5, {0xa7, 0x4f, 0x4c, 0x9d, 0xa6, 0x7a, 0xd2, 0x3b } } - -extern EFI_GUID gEfiHotPlugDeviceGuid; -#endif diff --git a/MdeModulePkg/Include/Guid/SimpleTextInExNotify.h b/MdeModulePkg/Include/Guid/SimpleTextInExNotify.h deleted file mode 100644 index 7e4ae41..0000000 --- a/MdeModulePkg/Include/Guid/SimpleTextInExNotify.h +++ /dev/null @@ -1,25 +0,0 @@ -/** @file - This file defines Simple TextInEx Notify Guid that specify the notify handle. - -Copyright (c) 2008, Intel Corporation.
-All rights reserved. This program and the accompanying materials -are licensed and made available under the terms and conditions of the BSD License -which accompanies this distribution. The full text of the license may be found at -http://opensource.org/licenses/bsd-license.php - -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#ifndef _SIMPLE_TEXTIN_EX_NOTIFY__H_ -#define _SIMPLE_TEXTIN_EX_NOTIFY__H_ - -#define SIMPLE_TEXTIN_EX_NOTIFY_GUID \ - { \ - 0x856f2def, 0x4e93, 0x4d6b, {0x94, 0xce, 0x1c, 0xfe, 0x47, 0x1, 0x3e, 0xa5} \ - } - -extern EFI_GUID gSimpleTextInExNotifyGuid; - -#endif diff --git a/MdeModulePkg/Include/Protocol/HotPlugDevice.h b/MdeModulePkg/Include/Protocol/HotPlugDevice.h new file mode 100644 index 0000000..ae6ef46 --- /dev/null +++ b/MdeModulePkg/Include/Protocol/HotPlugDevice.h @@ -0,0 +1,24 @@ +/** @file + This guid is used to specify the device is the hot plug device. + If the device is the hot plug device, this guid as the protocol guid + will be installed into this device handle. + +Copyright (c) 2006 - 2008, Intel Corporation +All rights reserved. This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#ifndef __HOT_PLUG_DEVICE_H__ +#define __HOT_PLUG_DEVICE_H__ + +#define HOT_PLUG_DEVICE_GUID \ + { 0x220ac432, 0x1d43, 0x49e5, {0xa7, 0x4f, 0x4c, 0x9d, 0xa6, 0x7a, 0xd2, 0x3b } } + +extern EFI_GUID gEfiHotPlugDeviceGuid; +#endif diff --git a/MdeModulePkg/Include/Protocol/SimpleTextInExNotify.h b/MdeModulePkg/Include/Protocol/SimpleTextInExNotify.h new file mode 100644 index 0000000..7e4ae41 --- /dev/null +++ b/MdeModulePkg/Include/Protocol/SimpleTextInExNotify.h @@ -0,0 +1,25 @@ +/** @file + This file defines Simple TextInEx Notify Guid that specify the notify handle. + +Copyright (c) 2008, Intel Corporation.
+All rights reserved. This program and the accompanying materials +are licensed and made available under the terms and conditions of the BSD License +which accompanies this distribution. The full text of the license may be found at +http://opensource.org/licenses/bsd-license.php + +THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#ifndef _SIMPLE_TEXTIN_EX_NOTIFY__H_ +#define _SIMPLE_TEXTIN_EX_NOTIFY__H_ + +#define SIMPLE_TEXTIN_EX_NOTIFY_GUID \ + { \ + 0x856f2def, 0x4e93, 0x4d6b, {0x94, 0xce, 0x1c, 0xfe, 0x47, 0x1, 0x3e, 0xa5} \ + } + +extern EFI_GUID gSimpleTextInExNotifyGuid; + +#endif diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index ff183f1..6675ffb 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -120,9 +120,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 }} @@ -219,6 +213,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. 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 #include #include +#include #include #include #include #include -#include #include #include 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 #include #include +#include #include #include @@ -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 + +#include +#include + +#include +#include #include #include -#include #include #include #include -#include -#include + #include #include #include @@ -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 -- cgit v1.1