1. add gEfiDebugPortVariableGuid and gEfiDebugPortDevicePathGuid in MdePkg.dec, even...

2. Meta data clean up.

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

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
index 595b6f043daa1488c01e0fffbef7be6f59389ceb..11982a1203673a16cf7e424abfeed2d27176e659 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
@@ -1,13 +1,13 @@
 #/** @file\r
 # This driver provides multi console supports.\r
 #\r
-# This driver acts as a virtual console, takes over the console I/O control from selected \r
+# This driver acts as a virtual console, takes over the console I/O control from selected\r
 # standard console devices, and transmits console I/O to related console device drivers.\r
 # Consplitter could install Graphics Output protocol and/or UGA Draw protocol in system\r
 # table according PCD settings(PcdConOutGopSupport, and PcdConOutUgaSupport). It always\r
-# consumes Graphics Output protocol which is produced by display device, and consumes UGA Draw \r
-# protocol which is produced by display device according to PcdUgaConsumeSupport value. \r
-# Note: If only UGA Draw protocol is installed in system table, PcdUgaConsumeSupport \r
+# consumes Graphics Output protocol which is produced by display device, and consumes UGA Draw\r
+# protocol which is produced by display device according to PcdUgaConsumeSupport value.\r
+# Note: If only UGA Draw protocol is installed in system table, PcdUgaConsumeSupport\r
 # should be set to TRUE.\r
 #\r
 # Copyright (c) 2006 - 2008, Intel Corporation\r
@@ -27,7 +27,7 @@
   BASE_NAME                      = ConSplitterDxe\r
   FILE_GUID                      = 408edcec-cf6d-477c-a5a8-b4844e3de281\r
   MODULE_TYPE                    = UEFI_DRIVER\r
-  VERSION_STRING                 = 1.0  \r
+  VERSION_STRING                 = 1.0\r
   ENTRY_POINT                    = ConSplitterDriverEntry\r
 \r
 #\r
@@ -71,24 +71,25 @@
   PcdLib\r
 \r
 [Guids]\r
-  gEfiConsoleInDeviceGuid                       # ALWAYS_CONSUMED\r
-  gEfiStandardErrorDeviceGuid                   # ALWAYS_CONSUMED\r
-  gEfiConsoleOutDeviceGuid                      # ALWAYS_CONSUMED\r
-  gEfiPrimaryConsoleOutDeviceGuid               # ALWAYS_PRODUCED\r
-  gEfiPrimaryConsoleInDeviceGuid                # ALWAYS_PRODUCED\r
-  gEfiPrimaryStandardErrorDeviceGuid            # ALWAYS_PRODUCED\r
-  gSimpleTextInExNotifyGuid                     # ALWAYS_PRODUCED\r
-  gEfiGenericPlatformVariableGuid               # ALWAYS_CONSUMED\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
 \r
 [Protocols]\r
-  gEfiConsoleControlProtocolGuid                # PROTOCOL ALWAYS_PRODUCED\r
-  gEfiSimplePointerProtocolGuid                 # PROTOCOL ALWAYS_PRODUCED\r
-  gEfiSimpleTextInProtocolGuid                  # PROTOCOL ALWAYS_PRODUCED\r
-  gEfiSimpleTextInputExProtocolGuid             # PROTOCOL ALWAYS_PRODUCED\r
-  gEfiSimpleTextOutProtocolGuid                 # PROTOCOL ALWAYS_PRODUCED\r
-  gEfiGraphicsOutputProtocolGuid                # PROTOCOL ALWAYS_PRODUCED\r
-  gEfiUgaDrawProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED\r
-  gEfiAbsolutePointerProtocolGuid               # PROTOCOL ALWAYS_PRODUCED\r
+  gEfiConsoleControlProtocolGuid                ## PRODUCED\r
+  gEfiSimplePointerProtocolGuid                 ## BY_START\r
+  gEfiAbsolutePointerProtocolGuid               ## BY_START\r
+  gEfiSimpleTextInProtocolGuid                  ## BY_START\r
+  gEfiSimpleTextInputExProtocolGuid             ## BY_START\r
+  gEfiSimpleTextOutProtocolGuid                 ## BY_START\r
+  gEfiGraphicsOutputProtocolGuid                ## BY_START\r
+  gEfiUgaDrawProtocolGuid                       ## BY_START\r
+\r
 \r
 [FeaturePcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport\r

diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf b/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf
index b1904a26a6c31fd975f4f8dd5cebd1cb50dee397..8c1d8686217a734b611955444a5938152a456523 100644 (file)
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf
+++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf
@@ -21,7 +21,7 @@
   BASE_NAME                      = DebugPortDxe\r
   FILE_GUID                      = 73E9457A-CEA1-4917-9A9C-9F1F0F0FD322\r
   MODULE_TYPE                    = UEFI_DRIVER\r
-  VERSION_STRING                 = 1.0 \r
+  VERSION_STRING                 = 1.0\r
   ENTRY_POINT                    = InitializeDebugPortDriver\r
   UNLOAD_IMAGE                   = ImageUnloadHandler\r
 \r
@@ -57,13 +57,12 @@
   UefiDriverEntryPoint\r
   DebugLib\r
 \r
+[Guids]\r
+  gEfiDebugPortVariableGuid                     ## SOMETIMES_CONSUMES ## Variable:L"DEBUGPORT"\r
+  gEfiDebugPortDevicePathGuid                   ## SOMETIMES_CONSUMES ## GUID\r
 \r
 [Protocols]\r
-  gEfiSerialIoProtocolGuid                      # PROTOCOL TO_START\r
-  gEfiDevicePathProtocolGuid                    # PROTOCOL BY_START\r
-  gEfiDebugPortProtocolGuid                     # PROTOCOL BY_START\r
-\r
-\r
-[Depex]\r
-  TRUE\r
+  gEfiSerialIoProtocolGuid                      ## TO_START\r
+  gEfiDevicePathProtocolGuid                    ## BY_START\r
+  gEfiDebugPortProtocolGuid                     ## BY_START\r
 \r

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
index 9b424e31fed906f4ba90f23aaa9404642514f0e2..44a8f0666c67f1e5370160054877476dbc444db1 100644 (file)
--- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
+++ b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
@@ -80,8 +80,8 @@
 \r
 \r
 [Protocols]\r
-  gEfiLoadedImageProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED\r
-  gEfiDebugSupportProtocolGuid                  # PROTOCOL ALWAYS_PRODUCED\r
+  gEfiLoadedImageProtocolGuid                   ## CONSUMED\r
+  gEfiDebugSupportProtocolGuid                  ## PRODUCED\r
 \r
 \r
 [FeaturePcd.IA32]\r

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 1eb0240fcf66fcebb0a2ad0aaaf37a9ceb6568f8..f4a579230a78a4b8392bb6ce99e2d693a2f048f0 100644 (file)
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -2,7 +2,7 @@
 #\r
 # This Package provides all definitions(including functions, MACROs, structures and library classes)\r
 # and libraries instances, which are defined in MDE Specification.\r
-# It also provides the definitions(including PPIs/PROTOCOLs/GUIDs) of \r
+# It also provides the definitions(including PPIs/PROTOCOLs/GUIDs) of\r
 # EFI1.10/UEFI2.0/UEFI2.1/PI1.0 and some Industry Standards.\r
 #\r
 # Copyright (c) 2007 - 2008, Intel Corporation.\r
@@ -12,7 +12,7 @@
 # the terms and conditions of the BSD License which accompanies this distribution.\r
 # The full text of the license may be found at\r
 # http://opensource.org/licenses/bsd-license.php\r
-# \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
@@ -42,7 +42,7 @@
   Include/Ebc\r
 \r
 [LibraryClasses.common]\r
-  ##  @libraryclass  Provides most usb APIs to support the Hid requests defined in Usb Hid 1.1 spec \r
+  ##  @libraryclass  Provides most usb APIs to support the Hid requests defined in Usb Hid 1.1 spec\r
   #                  and the standard requests defined in Usb 1.1 spec.\r
   ##\r
   UefiUsbLib|Include/Library/UefiUsbLib.h\r
@@ -77,7 +77,7 @@
   TimerLib|Include/Library/TimerLib.h\r
 \r
   ##  @libraryclass  Provides library functions to access SMBUS devices.\r
-  #                  Libraries of this class must be ported to a specific SMBUS controller. \r
+  #                  Libraries of this class must be ported to a specific SMBUS controller.\r
   SmbusLib|Include/Library/SmbusLib.h\r
 \r
   ##  @libraryclass  Provides the functions to submit Scsi commands defined in SCSI-2 specification for scsi device.\r
@@ -164,7 +164,7 @@
   ##  @libraryclass  Provides services to maintain instruction and data caches.\r
   CacheMaintenanceLib|Include/Library/CacheMaintenanceLib.h\r
 \r
-  ##  @libraryclass  Provides copy memory, fill memory, zero memory, and GUID functions. \r
+  ##  @libraryclass  Provides copy memory, fill memory, zero memory, and GUID functions.\r
   BaseMemoryLib|Include/Library/BaseMemoryLib.h\r
 \r
   ##  @libraryclass  Provides string functions, linked list functions, math functions, synchronization functions\r
@@ -180,7 +180,7 @@
 \r
   ##  @libraryclass  Provides a set of PI library functions and macros for DXE phase.\r
   DxeServicesLib|Include/Library/DxeServicesLib.h\r
-  \r
+\r
 [LibraryClasses.IPF]\r
   ##  @libraryclass  The SAL Library provides a service to make a SAL CALL.\r
   SalLib|Include/Library/SalLib.h\r
@@ -227,6 +227,8 @@
   gEfiEventMemoryMapChangeGuid   = { 0x78BEE926, 0x692F, 0x48FD, { 0x9E, 0xDB, 0x01, 0x42, 0x2E, 0xF0, 0xD7, 0xAB }}\r
   gEfiEventVirtualAddressChangeGuid = { 0x13FA7698, 0xC831, 0x49C7, { 0x87, 0xEA, 0x8F, 0x43, 0xFC, 0xC2, 0x51, 0x96 }}\r
   gEfiEventExitBootServicesGuid  = { 0x27ABF055, 0xB1B8, 0x4C26, { 0x80, 0x48, 0x74, 0x8F, 0x37, 0xBA, 0xA2, 0xDF }}\r
+  gEfiDebugPortVariableGuid      = { 0xEBA4E8D2, 0x3858, 0x41EC, { 0xA2, 0x81, 0x26, 0x47, 0xBA, 0x96, 0x60, 0xD0 }}\r
+  gEfiDebugPortDevicePathGuid    = { 0xEBA4E8D2, 0x3858, 0x41EC, { 0xA2, 0x81, 0x26, 0x47, 0xBA, 0x96, 0x60, 0xD0 }}\r
 \r
   #\r
   # GUID defined in PI1.0\r
@@ -383,16 +385,16 @@
 [PcdsFeatureFlag.common]\r
   ## If TRUE, the component name protocol will not be installed.\r
   gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE|BOOLEAN|0x0000000d\r
-  \r
+\r
   ## If TRUE, the driver diagnostics protocol will not be installed.\r
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE|BOOLEAN|0x0000000e\r
-  \r
+\r
   ## If TRUE, the component name2 protocol will not be installed.\r
   gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|FALSE|BOOLEAN|0x000000010\r
-  \r
+\r
   ## If TRUE, the driver diagnostics2 protocol will not be installed.\r
   gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|FALSE|BOOLEAN|0x00000011\r
-  \r
+\r
   ## Indicates whether EFI 1.1 ISO 639-2 language supports are obsolete\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate|FALSE|BOOLEAN|0x00000012             .\r
 \r
@@ -402,25 +404,25 @@
 [PcdsFixedAtBuild.common]\r
   ## Indicates the maximum length of unicode string\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000|UINT32|0x00000001\r
-  \r
+\r
   ## Indicates the maximum length of ascii string\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000|UINT32|0x00000002\r
-  \r
+\r
   ## Indicates the maximum node number of linked list\r
   gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000|UINT32|0x00000003\r
-  \r
+\r
   ## Indicates the timeout tick of holding spin lock\r
   gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout|10000000|UINT32|0x00000004\r
-  \r
+\r
   ## The mask is used to control DebugLib behavior\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0|UINT8|0x00000005\r
-  \r
+\r
   ## This flag is used to control the printout of DebugLib\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0|UINT32|0x00000006\r
-  \r
+\r
   ## The mask is used to control ReportStatusCodeLib behavior\r
   gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0|UINT8|0x00000007\r
-  \r
+\r
   ## This value is used to fill a segment of memory\r
   gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue|0xAF|UINT8|0x00000008\r
 \r
@@ -429,18 +431,18 @@
 \r
   ## This value is used to set the base address of pci express hierarchy\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE0000000|UINT64|0x0000000a\r
-  \r
+\r
   ## The mask is used to control PostCodeLib behavior\r
   gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask|0|UINT8|0x0000000b\r
-  \r
+\r
   ## This value is used to set the FSB clock\r
   gEfiMdePkgTokenSpaceGuid.PcdFSBClock|200000000|UINT32|0x0000000c\r
-  \r
+\r
   ## The maxium allowable size of formatted unicode string\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|320|UINT32|0x101\r
-  \r
+\r
   ## Status code value for indicating a watchdog timer is expired\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueEfiWatchDogTimerExpired|0x00011003|UINT32|0x00000013   \r
+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueEfiWatchDogTimerExpired|0x00011003|UINT32|0x00000013\r
 \r
   ## Status code value for indicating the invocation of SetVirtualAddressMap()\r
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueSetVirtualAddressMap|0x03101004|UINT32|0x00000014\r
@@ -468,7 +470,7 @@
 \r
   ## Status code value for indicating the enable of mouse device\r
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseEnable|0x01020004|UINT32|0x30001001\r
-  \r
+\r
   ## Status code value for indicating the disable of mouse device\r
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseDisable|0x01020002|UINT32|0x30001002\r
 \r
@@ -507,32 +509,32 @@
 \r
   ## Default current ISO 639-2 language: English\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang|"eng"|VOID*|0x0000001d\r
-  \r
+\r
   ## Default platform supported RFC 3066 languages: (American) English & French\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLangCodes|"en-US;fr-FR"|VOID*|0x0000001e\r
-  \r
+\r
   ## Defualt current RFC 3066 language: (American) English\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang|"en-US"|VOID*|0x0000001f\r
-  \r
+\r
   ## Default current ISO 639-2 language: English & French\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangCodes|"engfra"|VOID*|0x0000001c\r
-  \r
+\r
   ## Indicates the default baud rate of UART\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200|UINT64|0x00000020\r
-  \r
+\r
   ## Indicates the number of efficient data bit in UART transaction\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8|UINT8|0x00000021\r
-  \r
+\r
   ## Indicates the setting of data parity in UART transaction\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1|UINT8|0x00000022\r
-  \r
+\r
   ## Indicates the setting of stop bit in UART transaction\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1|UINT8|0x00000023\r
-  \r
+\r
   ## Indicates the usable type of terminal\r
   # 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8\r
-  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0|UINT8|0x00000024  \r
-  \r
+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0|UINT8|0x00000024\r
+\r
   ## Status code value for indicating the handoff from Pei phase to Dxe phase\r
   gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeiHandoffToDxe|0x3031001|UINT32|0x3000100d\r
 \r
@@ -570,16 +572,16 @@
 \r
   ## Default current ISO 639-2 language: English & French\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangCodes|"engfra"|VOID*|0x0000001c\r
-  \r
+\r
   ## Default current ISO 639-2 language: English\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang|"eng"|VOID*|0x0000001d\r
-  \r
+\r
   ## Default platform supported RFC 3066 languages: (American) English & French\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLangCodes|"en-US;fr-FR"|VOID*|0x0000001e\r
-  \r
+\r
   ## Defualt current RFC 3066 language: (American) English\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang|"en-US"|VOID*|0x0000001f\r
-  \r
+\r
   ## Indicates the default baud rate of UART\r
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200|UINT64|0x00000020\r
 \r
@@ -605,7 +607,7 @@
 \r
   ## Default current ISO 639-2 language: English\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLang|"eng"|VOID*|0x0000001d\r
-  \r
+\r
   ## Default platform supported RFC 3066 languages: (American) English & French\r
   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLangCodes|"en-US;fr-FR"|VOID*|0x0000001e\r
 \r
@@ -627,6 +629,6 @@
   ## Indicates the usable type of terminal\r
   # 0-PCANSI, 1-VT100, 2-VT00+, 3-UTF8\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0|UINT8|0x00000024\r
-  \r
+\r
   ## This value is used to set the base address of pci express hierarchy\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE0000000|UINT64|0x0000000a\r