MdeModulePkg: INF/DEC file updates to EDK II packages

1. Usage information in INF file comment blocks are either incomplete or incorrect. This includes usage information for Protocols/PPIs/GUIDs/PCDs/HOBs/Events/BootModes. The syntax for usage information in comment blocks is defined in the EDK II Module Information (INF) Specification Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Zeng, Star <star.zeng@intel.com> Reviewed-by: Gao, Liming <liming.gao@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15962 6f19259b-4bc3-4df7-8a09-765794883524
2014-08-28 06:34:06 +00:00
parent f7acc87241
commit 6036e94dc9
149 changed files with 1838 additions and 1221 deletions
--- a/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
+++ b/MdeModulePkg/Library/BasePlatformHookLibNull/BasePlatformHookLibNull.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Null Platform Hook Library instance.
 #
-#  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -15,6 +15,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = BasePlatformHookLibNull
+  MODULE_UNI_FILE                = BasePlatformHookLibNull.uni
  FILE_GUID                      = EBC3AEAD-CC13-49b0-A678-5BED93956955
  MODULE_TYPE                    = BASE
  VERSION_STRING                 = 1.0
--- a/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.inf
+++ b/MdeModulePkg/Library/BaseResetSystemLibNull/BaseResetSystemLibNull.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Null Reset System Library instance that only generates ASSERT() conditions.
 #
-#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -15,6 +15,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = BaseResetSystemLibNull
+  MODULE_UNI_FILE                = BaseResetSystemLibNull.uni
  FILE_GUID                      = 667A8B1C-9C97-4b2a-AE7E-568772FE45F3
  MODULE_TYPE                    = BASE
  VERSION_STRING                 = 1.0
--- a/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
+++ b/MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
@@ -1,7 +1,7 @@
 ## @file
 # Null instance of CPU Exception Handler Library with empty functions.
 #
-#  Copyright (c) 2012 - 2013, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -15,6 +15,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = CpuExceptionHandlerLibNull
+  MODULE_UNI_FILE                = CpuExceptionHandlerLibNull.uni
  FILE_GUID                      = 3175E6B9-4B01-496a-9A2B-64AF02D87E34
  MODULE_TYPE                    = PEIM
  VERSION_STRING                 = 1.0
--- a/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
+++ b/MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Customize display library used by display engine.
 #
-#  Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -15,6 +15,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = CustomizedDisplayLib
+  MODULE_UNI_FILE                = CustomizedDisplayLibModStrs.uni
  FILE_GUID                      = 80B92017-EC64-4923-938D-94FAEE85832E
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -52,7 +53,7 @@
  PcdLib

 [Guids]
-  gEfiIfrTianoGuid
+  gEfiIfrTianoGuid  ## SOMETIMES_CONSUMES   ## UNDEFINED
  
 [Protocols]

--- a/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
+++ b/MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.inf
@@ -1,7 +1,7 @@
 ## @file
-# Null instance of Debug Agent Library with empty functions.
+#  Null instance of Debug Agent Library with empty functions.
 #
-#  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -10,11 +10,12 @@
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
-#
+##

 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DebugAgentLibNull
+  MODULE_UNI_FILE                = DebugAgentLibNull.uni
  FILE_GUID                      = 4904B42F-9FC0-4c2e-BB3F-A2AB35123530
  MODULE_TYPE                    = BASE
  VERSION_STRING                 = 1.0
--- a/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
+++ b/MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
@@ -2,7 +2,7 @@
 #  NULL Dxe Capsule library instance.
 #  It can make core modules pass package level build.
 #
-#  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -17,6 +17,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeCapsuleLibNull
+  MODULE_UNI_FILE                = DxeCapsuleLibNull.uni
  FILE_GUID                      = 4004de5a-09a5-4f0c-94d7-82322e096aa7
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -35,4 +36,3 @@
  MdePkg/MdePkg.dec
  MdeModulePkg/MdeModulePkg.dec

-  
--- a/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
+++ b/MdeModulePkg/Library/DxeCoreMemoryAllocationLib/DxeCoreMemoryAllocationLib.inf
@@ -1,11 +1,10 @@
 ## @file
-#
 # Memory Allocation Library instance dedicated to DXE Core.
 # The implementation borrows the DxeCore Memory Allocation services as the primitive
 # for memory allocation instead of using UEFI boot servces in an indirect way.
 # It is assumed that this library instance must be linked with DxeCore in this package. 
 #
-# Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -20,6 +19,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeCoreMemoryAllocationLib
+  MODULE_UNI_FILE                = DxeCoreMemoryAllocationLib.uni
  FILE_GUID                      = 632F3FAC-1CA4-4725-BAA2-BDECCF9A111C
  MODULE_TYPE                    = DXE_CORE
  VERSION_STRING                 = 1.0
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
+++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
@@ -9,7 +9,7 @@
 #  This library is mainly used by DxeCore to start performance logging to ensure that
 #  Performance and PerformanceEx Protocol are installed at the very beginning of DXE phase.
 #  
-#  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #  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
@@ -23,6 +23,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeCorePerformanceLib
+  MODULE_UNI_FILE                = DxeCorePerformanceLib.uni
  FILE_GUID                      = D0F78BBF-0A30-4c63-8A48-0F618A4AFACD
  MODULE_TYPE                    = DXE_CORE
  VERSION_STRING                 = 1.0
@@ -57,11 +58,13 @@


 [Guids]
-  gPerformanceProtocolGuid                        ## CONSUMES ## HOB
-  gPerformanceProtocolGuid                        ## PRODUCES ## PROTOCOL
-  gPerformanceExProtocolGuid                      ## CONSUMES ## HOB
-  gPerformanceExProtocolGuid                      ## PRODUCES ## PROTOCOL
+  ## SOMETIMES_CONSUMES   ## HOB
+  ## PRODUCES             ## UNDEFINED # Install protocol
+  gPerformanceProtocolGuid
+  ## SOMETIMES_CONSUMES   ## HOB
+  ## PRODUCES             ## UNDEFINED # Install protocol
+  gPerformanceExProtocolGuid

 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries
-  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries ## CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask    ## CONSUMES
--- a/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
+++ b/MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf
@@ -1,11 +1,13 @@
 ## @file
+#  Dxe Crc32 Guided Section Extract library.
+#
 #  This library doesn't produce any library class. The constructor function uses 
 #  ExtractGuidedSectionLib service to register CRC32 guided section handler
 #  that parses CRC32 encapsulation section and extracts raw data.
 #
 #  It uses UEFI boot service CalculateCrc32 to authenticate 32 bit CRC value.
 #
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -19,6 +21,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeCrc32GuidedSectionExtractLib
+  MODULE_UNI_FILE                = DxeCrc32GuidedSectionExtractLib.uni
  FILE_GUID                      = 387A2490-81FC-4E7C-8E0A-3E58C30FCD0B
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -46,8 +49,7 @@
  BaseMemoryLib

 [Guids]
-  gEfiCrc32GuidedSectionExtractionGuid             ## CONSUMES ## GUID
+  gEfiCrc32GuidedSectionExtractionGuid             ## PRODUCES ## UNDEFINED

 [Protocols]
-  gEfiSecurityPolicyProtocolGuid                   ## SOMETIMES_CONSUMED (Set platform override AUTH status if exist)
-  
+  gEfiSecurityPolicyProtocolGuid                   ## SOMETIMES_CONSUMES # Set platform override AUTH status if exist
--- a/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.inf
+++ b/MdeModulePkg/Library/DxeDebugPrintErrorLevelLib/DxeDebugPrintErrorLevelLib.inf
@@ -1,10 +1,9 @@
 ## @file
-#  Debug Print Error Level library instance that provide compatibility with the 
-#  "err" shell command.  This includes support for the Debug Mask Protocol
-#  supports for global debug print error level mask stored in an EFI Variable.
-#  This library instance only support DXE Phase modules.
+#  Debug Print Error Level library instance that provide compatibility with the "err" shell command.
+#  This includes support for the Debug Mask Protocol supports for global debug print error level mask
+#  stored in an EFI Variable. This library instance only support DXE Phase modules.
 #
-#  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -19,6 +18,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeDebugPrintErrorLevelLib
+  MODULE_UNI_FILE                = DxeDebugPrintErrorLevelLib.uni
  FILE_GUID                      = 1D564EC9-9373-49a4-9E3F-E4D7B9974C84
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -42,10 +42,13 @@
  HobLib
  
 [Protocols]
-  gEfiDebugMaskProtocolGuid
+  gEfiDebugMaskProtocolGuid     ## PRODUCES
  
 [Guids]
-  gEfiGenericVariableGuid  
+  ## SOMETIMES_PRODUCES   ## Variable:L"EFIDebug"
+  ## SOMETIMES_CONSUMES   ## Variable:L"EFIDebug"
+  ## SOMETIMES_CONSUMES   ## HOB
+  gEfiGenericVariableGuid

 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel  ## CONSUMES
--- a/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
+++ b/MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
@@ -1,22 +1,21 @@
 ## @file
-#  Instance of DxeDpcLib.
-#  
-#  This module provides DPC service by consuming EFI DPC Protocol.
+#  This library instance provides DPC service by consuming EFI DPC Protocol.
 #
-# Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
-# 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
+#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+#  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.
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 ##

 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeDpcLib
+  MODULE_UNI_FILE                = DxeDpcLib.uni
  FILE_GUID                      = 38897D86-FF36-4472-AE64-1DB9AE715C81
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -41,7 +40,7 @@
  UefiBootServicesTableLib

 [Protocols]
-  gEfiDpcProtocolGuid                  # PROTOCOL ALWAYS_CONSUMED
+  gEfiDpcProtocolGuid                  ## CONSUMES

 [Depex.common.DXE_DRIVER, Depex.common.DXE_RUNTIME_DRIVER, Depex.common.DXE_SAL_DRIVER, Depex.common.DXE_SMM_DRIVER]
  gEfiDpcProtocolGuid
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
@@ -1,17 +1,14 @@
 ## @file
-#  Instance of DxeIpIoLib.
+#  This library instance provides IP services upon EFI IPv4/IPv6 Protocols.
 #
-#  This module provides IP services by consuming EFI IP4 Service Binding Protocol and
-#  EFI IP4 Protocol.
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+#  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
 #
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
-# 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.
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 ##

@@ -19,6 +16,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeIpIoLib
+  MODULE_UNI_FILE                = DxeIpIoLib.uni
  FILE_GUID                      = A302F877-8625-425c-B1EC-7487B62C4FDA
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -48,8 +46,8 @@
  DpcLib

 [Protocols]
-  gEfiIp4ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED
-  gEfiIp4ServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
-  gEfiIp6ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED
-  gEfiIp6ServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
+  gEfiIp4ProtocolGuid                           ## SOMETIMES_CONSUMES
+  gEfiIp4ServiceBindingProtocolGuid             ## SOMETIMES_CONSUMES
+  gEfiIp6ProtocolGuid                           ## SOMETIMES_CONSUMES
+  gEfiIp6ServiceBindingProtocolGuid             ## SOMETIMES_CONSUMES

--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
@@ -1,14 +1,14 @@
 ## @file
-#  Instance of DxeNetLib.
+#  This library instance provides the basic network services.
 #
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
-# 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
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
+#  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.
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 ##

@@ -16,6 +16,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeNetLib
+  MODULE_UNI_FILE                = DxeNetLib.uni
  FILE_GUID                      = db6dcef3-9f4e-4340-9351-fc35aa8a5888
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -50,14 +51,17 @@
  PrintLib

 [Guids]
-  gEfiNicIp4ConfigVariableGuid
-  gEfiSmbiosTableGuid
+  ## SOMETIMES_PRODUCES ## UNDEFINED # HiiConstructConfigHdr EFI_NIC_IP4_CONFIG_VARIABLE
+  ## UNDEFINED # Device Path Node 
+  gEfiNicIp4ConfigVariableGuid                  
+  gEfiSmbiosTableGuid                           ## SOMETIMES_CONSUMES  ## SystemTable

 [Protocols]
-  gEfiSimpleNetworkProtocolGuid                 # PROTOCOL ALWAYS_CONSUMED
-  gEfiManagedNetworkProtocolGuid                # PROTOCOL ALWAYS_CONSUMED
-  gEfiManagedNetworkServiceBindingProtocolGuid  # PROTOCOL ALWAYS_CONSUMED
-  gEfiComponentNameProtocolGuid                 # PROTOCOL ALWAYS_CONSUMED
-  gEfiComponentName2ProtocolGuid                # PROTOCOL ALWAYS_CONSUMED
-  gEfiHiiConfigRoutingProtocolGuid              # PROTOCOL ALWAYS_CONSUMED
-  gEfiHiiConfigAccessProtocolGuid               # PROTOCOL ALWAYS_CONSUMED
+  gEfiSimpleNetworkProtocolGuid                 ## SOMETIMES_CONSUMES
+  gEfiManagedNetworkProtocolGuid                ## SOMETIMES_CONSUMES
+  gEfiManagedNetworkServiceBindingProtocolGuid  ## SOMETIMES_CONSUMES
+  gEfiComponentNameProtocolGuid                 ## SOMETIMES_CONSUMES
+  gEfiComponentName2ProtocolGuid                ## SOMETIMES_CONSUMES
+  gEfiHiiConfigRoutingProtocolGuid              ## SOMETIMES_CONSUMES
+  gEfiHiiConfigAccessProtocolGuid               ## SOMETIMES_CONSUMES
+
--- a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
+++ b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
@@ -3,10 +3,10 @@
 #  
 #  This library instance provides infrastructure for DXE phase drivers to log performance
 #  data. It consumes PerformanceEx or Performance Protocol published by DxeCorePerformanceLib
-#  to log performance data. If both PerformanceEx and Performance Protocol are not available, it does not log any
-#  performance information.
+#  to log performance data. If both PerformanceEx and Performance Protocol are not available,
+#  it does not log any performance information.
 #  
-#  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #  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
@@ -20,6 +20,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxePerformanceLib
+  MODULE_UNI_FILE                = DxePerformanceLib.uni
  FILE_GUID                      = 8B8B4CCC-65FC-41a5-8067-308B8E42CCF2
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -47,10 +48,10 @@


 [Guids]
-  gPerformanceProtocolGuid      ## SOMETIMES_CONSUMES ## PROTOCOL
-  gPerformanceExProtocolGuid    ## SOMETIMES_CONSUMES ## PROTOCOL
+  gPerformanceProtocolGuid      ## SOMETIMES_CONSUMES   ## UNDEFINED # Locate protocol
+  gPerformanceExProtocolGuid    ## SOMETIMES_CONSUMES   ## UNDEFINED # Locate protocol


 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask
+  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask    ## CONSUMES

--- a/MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.inf
+++ b/MdeModulePkg/Library/DxePrintLibPrint2Protocol/DxePrintLibPrint2Protocol.inf
@@ -1,8 +1,7 @@
 ## @file
-#  Library instance that implements Print Library class based on protocol
-#  gEfiPrint2ProtocolGuid.
+#  Library instance that implements Print Library class based on protocol gEfiPrint2ProtocolGuid.
 #
-#  Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -17,6 +16,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxePrintLibPrint2Protocol
+  MODULE_UNI_FILE                = DxePrintLibPrint2Protocol.uni
  FILE_GUID                      = 55D460DB-8FEA-415a-B95D-70145AE0675C
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
--- a/MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
+++ b/MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf
@@ -1,8 +1,9 @@
 ## @file
-#  DXE report status code library
+#  DXE report status code library.
 #
-#  Retrieve status code and report status code in DXE phase
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Retrieve status code and report status code in DXE phase.
+#
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -17,6 +18,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeReportStatusCodeLib
+  MODULE_UNI_FILE                = DxeReportStatusCodeLib.uni
  FILE_GUID                      = EBF144C8-70F5-4e09-ADE2-F41F5C59AFDA
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -44,12 +46,12 @@
  DevicePathLib

 [Guids]
-  gEfiStatusCodeSpecificDataGuid                ## CONSUMES
-  gEfiStatusCodeDataTypeDebugGuid               ## CONSUMES
+  gEfiStatusCodeSpecificDataGuid                ## SOMETIMES_CONSUMES ## UNDEFINED
+  gEfiStatusCodeDataTypeDebugGuid               ## SOMETIMES_CONSUMES ## UNDEFINED

 [Protocols]
  gEfiStatusCodeRuntimeProtocolGuid             ## CONSUMES

 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask
+  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask  ## CONSUMES

--- a/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
+++ b/MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf
@@ -3,7 +3,7 @@
 #
 # This library provides generic security measurement functions for DXE module.
 #
-#  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -18,6 +18,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeSecurityManagementLib
+  MODULE_UNI_FILE                = DxeSecurityManagementLib.uni
  FILE_GUID                      = 7F61122C-19DF-47c3-BA0D-6C1149E30FA1
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
--- a/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf
+++ b/MdeModulePkg/Library/DxeSmmPerformanceLib/DxeSmmPerformanceLib.inf
@@ -5,7 +5,7 @@
 #  StartPerformanceMeasurement(), EndPerformanceMeasurement(), StartPerformanceMeasurementEx()
 #  and EndPerformanceMeasurementEx() are not implemented.
 #  
-#  Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
 #  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
@@ -19,6 +19,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeSmmPerformanceLib
+  MODULE_UNI_FILE                = DxeSmmPerformanceLib.uni
  FILE_GUID                      = DA80C15C-0B4D-4e75-8946-4043DE559B0C
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -49,15 +50,15 @@
  MemoryAllocationLib

 [Guids]
-  gSmmPerformanceProtocolGuid            ## SOMETIMES_CONSUMES
-  gSmmPerformanceExProtocolGuid          ## SOMETIMES_CONSUMES
+  gSmmPerformanceProtocolGuid           ## SOMETIMES_PRODUCES   ## UNDEFINED # Used to do smm communication
+  gSmmPerformanceExProtocolGuid         ## SOMETIMES_PRODUCES   ## UNDEFINED # Used to do smm communication

 [Protocols]
-  gEfiSmmCommunicationProtocolGuid       ## CONSUMES
+  gEfiSmmCommunicationProtocolGuid      ## CONSUMES


 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask
+  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask    ## CONSUMES

 [Depex.common.DXE_DRIVER, Depex.common.DXE_RUNTIME_DRIVER]
  gEfiSmmCommunicationProtocolGuid
--- a/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
+++ b/MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
@@ -1,17 +1,14 @@
 ## @file
-#  Instance of TcpIoLib.
-#
-#  This module provides TCP services by consuming EFI TCP Service Binding Protocol and
-#  EFI TCP Protocol.
+#  This library instance provides TCP services by EFI TCPv4/TCPv6 Protocols.
 #  
-# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
-# 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
+#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
+#  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.
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 ##

@@ -19,6 +16,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeTcpIoLib
+  MODULE_UNI_FILE                = DxeTcpIoLib.uni
  FILE_GUID                      = D4608509-1AB0-4cc7-827A-AB8E1E7BD3E6
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -47,7 +45,7 @@
  BaseMemoryLib

 [Protocols]
-  gEfiTcp4ServiceBindingProtocolGuid            # PROTOCOL ALWAYS_CONSUMED
-  gEfiTcp4ProtocolGuid                          # PROTOCOL ALWAYS_CONSUMED
-  gEfiTcp6ServiceBindingProtocolGuid            # PROTOCOL ALWAYS_CONSUMED
-  gEfiTcp6ProtocolGuid                          # PROTOCOL ALWAYS_CONSUMED
+  gEfiTcp4ServiceBindingProtocolGuid            ## SOMETIMES_CONSUMES
+  gEfiTcp4ProtocolGuid                          ## SOMETIMES_CONSUMES
+  gEfiTcp6ServiceBindingProtocolGuid            ## SOMETIMES_CONSUMES
+  gEfiTcp6ProtocolGuid                          ## SOMETIMES_CONSUMES
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
+++ b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
@@ -1,17 +1,14 @@
 ## @file
-#  Instance of UdpIoLib.
-#
-#  This module provides UDP services by consuming EFI UDP4 Service Binding Protocol and
-#  EFI UDP4 Protocol.
+#  This library instance provides UDP services by consuming EFI UDPv4/UDPv6 Protocols.
 #  
-# Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>
-# 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
+#  Copyright (c) 2008 - 2014, Intel Corporation. All rights reserved.<BR>
+#  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.
+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #
 ##

@@ -19,6 +16,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeUpdIoLib
+  MODULE_UNI_FILE                = DxeUpdIoLib.uni
  FILE_GUID                      = 7E615AA1-41EE-49d4-B7E9-1D7A60AA5C8D
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -48,8 +46,8 @@
  DpcLib

 [Protocols]
-  gEfiUdp4ServiceBindingProtocolGuid            # PROTOCOL ALWAYS_CONSUMED
-  gEfiUdp4ProtocolGuid                          # PROTOCOL ALWAYS_CONSUMED
-  gEfiUdp6ServiceBindingProtocolGuid            # PROTOCOL ALWAYS_CONSUMED
-  gEfiUdp6ProtocolGuid                          # PROTOCOL ALWAYS_CONSUMED
-  
+  gEfiUdp4ServiceBindingProtocolGuid            ## SOMETIMES_CONSUMES
+  gEfiUdp4ProtocolGuid                          ## SOMETIMES_CONSUMES
+  gEfiUdp6ServiceBindingProtocolGuid            ## SOMETIMES_CONSUMES
+  gEfiUdp6ProtocolGuid                          ## SOMETIMES_CONSUMES
+
--- a/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf
+++ b/MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf
@@ -1,7 +1,7 @@
 ## @file
-#  Component description file for LockBox library.
+#  NULL LockBox library instance.
 #
-#  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions
@@ -17,6 +17,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = LockBoxNullLib
+  MODULE_UNI_FILE                = LockBoxNullLib.uni
  FILE_GUID                      = 0BA38EBD-E190-4df7-8EC4-0A6E2B43772D
  MODULE_TYPE                    = BASE
  VERSION_STRING                 = 1.0
@@ -36,6 +37,3 @@
  MdePkg/MdePkg.dec
  MdeModulePkg/MdeModulePkg.dec

-[LibraryClasses]
-  BaseLib
-
--- a/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
+++ b/MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Null instance of OEM Hook Status Code Library with empty functions.
 #
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -16,6 +16,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = OemHookStatusCodeLibNull
+  MODULE_UNI_FILE                = OemHookStatusCodeLibNull.uni
  FILE_GUID                      = 54D2878F-25CD-4a2b-8420-EBD18E609C76
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
--- a/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.inf
+++ b/MdeModulePkg/Library/PeiCrc32GuidedSectionExtractLib/PeiCrc32GuidedSectionExtractLib.inf
@@ -1,4 +1,6 @@
 ## @file
+#  Pei Crc32 Guided Section Extract library.
+#
 #  This library doesn't produce any library class. The constructor function uses 
 #  ExtractGuidedSectionLib service to register CRC32 guided section handler
 #  that parses CRC32 encapsulation section and extracts raw data.
--- a/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.inf
+++ b/MdeModulePkg/Library/PeiDebugPrintHobLib/PeiDebugPrintHobLib.inf
@@ -3,6 +3,7 @@
 #  HOB that contains the debug mask.
 #
 #  Copyright (c) 2011, Apple, Inc. All rights reserved.<BR>
+#  Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -17,6 +18,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = PeiDebugPrintHobLib
+  MODULE_UNI_FILE                = PeiDebugPrintHobLib.uni
  FILE_GUID                      = EB0BDD73-DABB-E74B-BF51-62DC1DA521E1
  MODULE_TYPE                    = PEIM
  VERSION_STRING                 = 1.0
@@ -37,10 +39,12 @@
  DebugLib

 [Ppis]
-  gEfiPeiReadOnlyVariable2PpiGuid
+  gEfiPeiReadOnlyVariable2PpiGuid   ## CONSUMES

 [Guids]
-  gEfiGenericVariableGuid              
+  ## SOMETIMES_CONSUMES   ## Variable:L"EFIDebug"
+  ## SOMETIMES_PRODUCES   ## HOB
+  gEfiGenericVariableGuid

 [Depex]
  gEfiPeiReadOnlyVariable2PpiGuid
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
+++ b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
@@ -1,12 +1,11 @@
-## @file
-#  
+## @file 
 #  Performance library instance used in PEI phase.
 #  
 #  This library provides the performance measurement interfaces in PEI phase, it creates
 #  and consumes GUIDed HOB for performance logging. The GUIDed HOB is passed to DXE phase
 #  so that it can be taken over by DxeCorePerformanceLib.  
 #  
-#  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #  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
@@ -20,6 +19,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = PeiPerformanceLib
+  MODULE_UNI_FILE                = PeiPerformanceLib.uni
  FILE_GUID                      = F72DE735-B24F-4ef6-897F-70A85D01A047
  MODULE_TYPE                    = PEIM
  VERSION_STRING                 = 1.0
@@ -50,9 +50,13 @@


 [Guids]
-  gPerformanceProtocolGuid     ## PRODUCES ## HOB
-  gPerformanceExProtocolGuid   ## PRODUCES ## HOB
+  ## PRODUCES ## HOB
+  ## CONSUMES ## HOB
+  gPerformanceProtocolGuid
+  ## PRODUCES ## HOB
+  ## CONSUMES ## HOB
+  gPerformanceExProtocolGuid

 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries
-  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries ## CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask    ## CONSUMES
--- a/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
+++ b/MdeModulePkg/Library/PeiRecoveryLibNull/PeiRecoveryLibNull.inf
@@ -1,11 +1,10 @@
-## @file
-#  
+## @file 
 #  Null Recovery library instance for PEIM module
 #  This library instance is no longer used and module using this library
 #  class should update to directly locate EFI_PEI_RECOVERY_MODULE_PPI defined
 #  in PI 1.2 specification. 
 #  
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #  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
@@ -19,6 +18,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = PeiRecoveryLibNull
+  MODULE_UNI_FILE                = PeiRecoveryLibNull.uni
  FILE_GUID                      = 41789FB9-02AC-4484-BD40-A3147D7EDA25
  MODULE_TYPE                    = PEIM
  VERSION_STRING                 = 1.0
@@ -37,4 +37,3 @@
  MdePkg/MdePkg.dec
  MdeModulePkg/MdeModulePkg.dec

-  
--- a/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
+++ b/MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
@@ -5,7 +5,7 @@
 #  code via PEI Status Code Service. If the service is not available, it then tries calling
 #  OEM Hook Status Code Library.
 #
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -20,6 +20,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = PeiReportStatusCodeLib
+  MODULE_UNI_FILE                = PeiReportStatusCodeLib.uni
  FILE_GUID                      = 8c690838-7a22-45c4-aa58-a33e3e515cd4
  MODULE_TYPE                    = PEIM
  VERSION_STRING                 = 1.0
@@ -49,10 +50,10 @@


 [Guids]
-  gEfiStatusCodeSpecificDataGuid                ## CONSUMES
-  gEfiStatusCodeDataTypeDebugGuid               ## CONSUMES
+  gEfiStatusCodeSpecificDataGuid                ## SOMETIMES_CONSUMES   ## UNDEFINED
+  gEfiStatusCodeDataTypeDebugGuid               ## SOMETIMES_CONSUMES   ## UNDEFINED


 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask
+  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask  ## CONSUMES

--- a/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
+++ b/MdeModulePkg/Library/PeiS3LibNull/PeiS3LibNull.inf
@@ -1,11 +1,10 @@
 ## @file
-#  
 #  Null S3 library instance for PEIM module.
 #  This library instance is no longer used and module using this library
 #  class should update to directly locate EFI_PEI_S3_RESUME_PPI defined
 #  in PI 1.2 specification. 
 #  
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -20,6 +19,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = PeiS3LibNull
+  MODULE_UNI_FILE                = PeiS3LibNull.uni
  FILE_GUID                      = 018E1925-D6A2-4a2a-8958-817610A15ADF
  MODULE_TYPE                    = PEIM
  VERSION_STRING                 = 1.0
--- a/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
+++ b/MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # DXE S3 boot script Library.
 #
-# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 # This program and the accompanying materials are
 # licensed and made available under the terms and conditions of the BSD License
@@ -16,6 +16,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = DxeS3BootScriptLib
+  MODULE_UNI_FILE                = DxeS3BootScriptLib.uni
  FILE_GUID                      = 57F9967B-26CD-4262-837A-55B8AA158254
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -53,13 +54,18 @@
  PciLib
  IoLib 
  LockBoxLib
-  
+
 [Protocols]
-  gEfiSmmBase2ProtocolGuid                       # ALWAYS_CONSUMED
-  gEfiDxeSmmReadyToLockProtocolGuid              # ALWAYS_CONSUMED
-  gEfiSmmReadyToLockProtocolGuid                 # ALWAYS_CONSUMED
-  
+  gEfiSmmBase2ProtocolGuid                      ## SOMETIMES_CONSUMES
+  gEfiDxeSmmReadyToLockProtocolGuid             ## NOTIFY
+  gEfiSmmReadyToLockProtocolGuid                ## NOTIFY
+
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr                   ## CONSUMES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr                ## CONSUMES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptRuntimeTableReservePageNumber         ## CONSUMES
+  ## CONSUMES
+  ## SOMETIMES_PRODUCES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateDataPtr
+  ## CONSUMES
+  ## SOMETIMES_PRODUCES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptTablePrivateSmmDataPtr
+  gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptRuntimeTableReservePageNumber   ## CONSUMES
+
--- a/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
+++ b/MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
@@ -4,7 +4,7 @@
 # for memory allocation instead of using SMM System Table servces in an indirect way.
 # It is assumed that this library instance must be linked with SMM Cre in this package. 
 #
-# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -18,6 +18,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = PiSmmCoreMemoryAllocationLib
+  MODULE_UNI_FILE                = PiSmmCoreMemoryAllocationLib.uni
  FILE_GUID                      = B618E089-9ABA-4d97-AE80-57B5BCCDA51D
  MODULE_TYPE                    = SMM_CORE
  VERSION_STRING                 = 1.0
--- a/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
+++ b/MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # SMM Core SMM Services Table Library.
 #
-# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -16,6 +16,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = PiSmmCoreSmmServicesTableLib
+  MODULE_UNI_FILE                = PiSmmCoreSmmServicesTableLib.uni
  FILE_GUID                      = C427146A-2EF2-4af9-A85A-E09EA65EE47D
  MODULE_TYPE                    = SMM_CORE
  VERSION_STRING                 = 1.0
@@ -33,5 +34,3 @@
 [Packages]
  MdePkg/MdePkg.dec

-[LibraryClasses]
-  DebugLib
--- a/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
+++ b/MdeModulePkg/Library/RuntimeDxeReportStatusCodeLib/RuntimeDxeReportStatusCodeLib.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Report status code library instance which supports logging message in DXE & runtime phase.
 #
-#  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -16,6 +16,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = RuntimeDxeReportStatusCodeLib
+  MODULE_UNI_FILE                = RuntimeDxeReportStatusCodeLib.uni
  FILE_GUID                      = 07D25BBB-F832-41bb-BBA0-612E9F033067
  MODULE_TYPE                    = DXE_RUNTIME_DRIVER
  VERSION_STRING                 = 1.0
@@ -45,8 +46,8 @@
  UefiRuntimeLib

 [Guids]
-  gEfiStatusCodeSpecificDataGuid                ## CONSUMES
-  gEfiStatusCodeDataTypeDebugGuid               ## CONSUMES
+  gEfiStatusCodeSpecificDataGuid                ## SOMETIMES_CONSUMES   ## UNDEFINED
+  gEfiStatusCodeDataTypeDebugGuid               ## SOMETIMES_CONSUMES   ## UNDEFINED
  gEfiEventVirtualAddressChangeGuid             ## CONSUMES ## Event
  gEfiEventExitBootServicesGuid                 ## CONSUMES ## Event

@@ -54,5 +55,5 @@
  gEfiStatusCodeRuntimeProtocolGuid             ## CONSUMES

 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask
+  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask  ## CONSUMES

--- a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf
+++ b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf
@@ -2,13 +2,13 @@
 #  Performance library instance used by SMM Core.
 #  
 #  This library provides the performance measurement interfaces and initializes performance
-#  logging for the SMM phase. 
+#  logging for the SMM phase.
 #  It initializes SMM phase performance logging by publishing the SMM Performance and PerformanceEx Protocol,
 #  which is consumed by SmmPerformanceLib to logging performance data in SMM phase.
 #  This library is mainly used by SMM Core to start performance logging to ensure that
 #  SMM Performance and PerformanceEx Protocol are installed at the very beginning of SMM phase.
 #  
-#  Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
 #  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
@@ -22,6 +22,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = SmmCorePerformanceLib
+  MODULE_UNI_FILE                = SmmCorePerformanceLib.uni
  FILE_GUID                      = 36290D10-0F47-42c1-BBCE-E191C7928DCF
  MODULE_TYPE                    = SMM_CORE
  VERSION_STRING                 = 1.0
@@ -61,8 +62,12 @@
  gEfiSmmAccess2ProtocolGuid                ## CONSUMES

 [Guids]
-  gSmmPerformanceProtocolGuid               ## PRODUCES
-  gSmmPerformanceExProtocolGuid             ## PRODUCES
+  ## PRODUCES ## UNDEFINED # Install protocol
+  ## CONSUMES ## UNDEFINED # SmiHandlerRegister
+  gSmmPerformanceProtocolGuid
+  ## PRODUCES ## UNDEFINED # Install protocol
+  ## CONSUMES ## UNDEFINED # SmiHandlerRegister
+  gSmmPerformanceExProtocolGuid

 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask
+  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask    ## CONSUMES
--- a/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.inf
+++ b/MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.inf
@@ -1,7 +1,7 @@
 ## @file
 #  SMM Core Platform Hook Null Library instance
 #
-#  Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -15,6 +15,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = SmmCorePlatformHookLibNull
+  MODULE_UNI_FILE                = SmmCorePlatformHookLibNull.uni
  FILE_GUID                      = FED6583D-2418-4760-AC96-B5E18F0A6326
  MODULE_TYPE                    = SMM_CORE
  VERSION_STRING                 = 1.0
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
@@ -1,7 +1,7 @@
 ## @file
-#  Component description file for LockBox library.
+#  DXE LockBox library instance.
 #
-#  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions
@@ -17,6 +17,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = SmmLockBoxDxeLib
+  MODULE_UNI_FILE                = SmmLockBoxDxeLib.uni
  FILE_GUID                      = 4A0054B4-3CA8-4e1b-9339-9B58D5FBB7D2
  MODULE_TYPE                    = DXE_DRIVER
  VERSION_STRING                 = 1.0
@@ -38,13 +39,12 @@

 [LibraryClasses]
  UefiBootServicesTableLib
-  UefiRuntimeServicesTableLib
  BaseLib
  BaseMemoryLib
  DebugLib

 [Guids]
-  gEfiSmmLockBoxCommunicationGuid       ## CONSUMED
+  gEfiSmmLockBoxCommunicationGuid       ## SOMETIMES_CONSUMES ## GUID # Used to do smm communication

 [Protocols]
-  gEfiSmmCommunicationProtocolGuid   ## CONSUMED
+  gEfiSmmCommunicationProtocolGuid      ## SOMETIMES_CONSUMES
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
@@ -1,7 +1,7 @@
 ## @file
-#  Component description file for LockBox library.
+#  PEI LockBox library instance.
 #
-#  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions
@@ -17,6 +17,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = SmmLockBoxPeiLib
+  MODULE_UNI_FILE                = SmmLockBoxPeiLib.uni
  FILE_GUID                      = 5F5E6140-E7BA-4bd6-B85F-236B5BCD8E1E
  MODULE_TYPE                    = PEIM
  VERSION_STRING                 = 1.0
@@ -45,12 +46,14 @@
  DebugLib

 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode  ## CONSUMES

 [Guids]
-  gEfiSmmLockBoxCommunicationGuid       ## CONSUMED
-  gEfiAcpiVariableGuid               ## CONSUMED
+  ## SOMETIMES_CONSUMES ## UNDEFINED # Used to do smm communication
+  ## SOMETIMES_CONSUMES ## UNDEFINED # SmmSystemTable
+  gEfiSmmLockBoxCommunicationGuid
+  gEfiAcpiVariableGuid                  ## SOMETIMES_CONSUMES ## HOB

 [Ppis]
-  gEfiPeiSmmCommunicationPpiGuid     ## CONSUMED
-  gPeiSmmAccessPpiGuid               ## CONSUMED
+  gEfiPeiSmmCommunicationPpiGuid        ## CONSUMES
+  gPeiSmmAccessPpiGuid                  ## SOMETIMES_CONSUMES
--- a/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf
+++ b/MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxSmmLib.inf
@@ -1,7 +1,7 @@
 ## @file
-#  Component description file for LockBox library.
+#  SMM LockBox library instance.
 #
-#  Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions
@@ -17,6 +17,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = SmmLockBoxSmmLib
+  MODULE_UNI_FILE                = SmmLockBoxSmmLib.uni
  FILE_GUID                      = E04894D6-290D-4171-A362-0ACFD939F3C8
  MODULE_TYPE                    = DXE_SMM_DRIVER
  VERSION_STRING                 = 1.0
@@ -43,4 +44,6 @@
  DebugLib

 [Guids]
-  gEfiSmmLockBoxCommunicationGuid       ## COMSUMED
+  ## SOMETIMES_CONSUMES   ## UNDEFINED # SmmSystemTable
+  ## SOMETIMES_PRODUCES   ## UNDEFINED # SmmSystemTable
+  gEfiSmmLockBoxCommunicationGuid
--- a/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf
+++ b/MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf
@@ -3,10 +3,10 @@
 #  
 #  This library instance provides infrastructure for SMM drivers to log performance
 #  data. It consumes SMM PerformanceEx or Performance Protocol published by SmmCorePerformanceLib
-#  to log performance data. If both SMM PerformanceEx and Performance Protocol are not available, it does not log any
-#  performance information.
+#  to log performance data. If both SMM PerformanceEx and Performance Protocol are not available,
+#  it does not log any performance information.
 #  
-#  Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
 #  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
@@ -20,6 +20,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = SmmPerformanceLib
+  MODULE_UNI_FILE                = SmmPerformanceLib.uni
  FILE_GUID                      = 1EDD13E6-D0CD-4432-A692-FF65C9B4F039
  MODULE_TYPE                    = DXE_SMM_DRIVER
  VERSION_STRING                 = 1.0
@@ -49,8 +50,8 @@
  BaseMemoryLib

 [Guids]
-  gSmmPerformanceProtocolGuid           ## SOMETIMES_CONSUMES
-  gSmmPerformanceExProtocolGuid         ## SOMETIMES_CONSUMES
+  gSmmPerformanceProtocolGuid           ## SOMETIMES_CONSUMES   ## UNDEFINED # Locate protocol
+  gSmmPerformanceExProtocolGuid         ## SOMETIMES_CONSUMES   ## UNDEFINED # Locate protocol

 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask
+  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask    ## CONSUMES
--- a/MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
+++ b/MdeModulePkg/Library/SmmReportStatusCodeLib/SmmReportStatusCodeLib.inf
@@ -1,8 +1,9 @@
 ## @file
-#  SMM report status code library
+#  SMM report status code library.
 #
-#  Retrieve status code and report status code in SMM phase
-#  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Retrieve status code and report status code in SMM phase.
+#
+#  Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -17,6 +18,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = SmmReportStatusCodeLib
+  MODULE_UNI_FILE                = SmmReportStatusCodeLib.uni
  FILE_GUID                      = 67089D19-B3D6-4d9e-A0EB-FEDC1F83A1EE
  MODULE_TYPE                    = DXE_SMM_DRIVER
  VERSION_STRING                 = 1.0
@@ -44,11 +46,11 @@
  MemoryAllocationLib

 [Guids]
-  gEfiStatusCodeSpecificDataGuid                ## CONSUMES
-  gEfiStatusCodeDataTypeDebugGuid               ## CONSUMES
+  gEfiStatusCodeSpecificDataGuid                ## SOMETIMES_CONSUMES   ## UNDEFINED
+  gEfiStatusCodeDataTypeDebugGuid               ## SOMETIMES_CONSUMES   ## UNDEFINED

 [Protocols]
  gEfiSmmStatusCodeProtocolGuid                 ## CONSUMES

 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask
+  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask  ## CONSUMES
--- a/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
+++ b/MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf
@@ -1,10 +1,7 @@
 ## @file
+#  HII Library implementation using UEFI HII protocols and services.
 #
-#  Instance of HII Library using DXE protocols and services.
-#
-#  HII Library implementation that uses EFI Hii Database Protocol and EFI Hii String Protocol.
-#
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -20,6 +17,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = UefiHiiLib
+  MODULE_UNI_FILE                = UefiHiiLib.uni
  FILE_GUID                      = 3143687A-7C80-404e-B5FE-2D88980E1B1C
  MODULE_TYPE                    = UEFI_DRIVER
  VERSION_STRING                 = 1.0
@@ -51,5 +49,5 @@
  PrintLib

 [Protocols]
-  gEfiFormBrowser2ProtocolGuid ## CONSUMES
-  gEfiDevicePathProtocolGuid   ## CONSUMES
+  gEfiFormBrowser2ProtocolGuid ## SOMETIMES_CONSUMES
+  gEfiDevicePathProtocolGuid   ## SOMETIMES_CONSUMES
--- a/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
+++ b/MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # UEFI HII Services Library implementation.
 # 
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -16,6 +16,7 @@
 [Defines]
  INF_VERSION                    = 0x00010005
  BASE_NAME                      = UefiHiiServicesLib
+  MODULE_UNI_FILE                = UefiHiiServicesLib.uni
  FILE_GUID                      = 894DC1B6-07A3-4a9d-8CDD-333580B3D4B1
  MODULE_TYPE                    = UEFI_DRIVER
  VERSION_STRING                 = 1.0
@@ -39,11 +40,11 @@
  DebugLib
  
 [Protocols]
-  gEfiHiiFontProtocolGuid
-  gEfiHiiStringProtocolGuid
-  gEfiHiiImageProtocolGuid
-  gEfiHiiDatabaseProtocolGuid
-  gEfiHiiConfigRoutingProtocolGuid
+  gEfiHiiFontProtocolGuid             ## SOMETIMES_CONSUMES 
+  gEfiHiiStringProtocolGuid           ## CONSUMES
+  gEfiHiiImageProtocolGuid            ## SOMETIMES_CONSUMES
+  gEfiHiiDatabaseProtocolGuid         ## CONSUMES
+  gEfiHiiConfigRoutingProtocolGuid    ## CONSUMES

 [Depex.common.DXE_DRIVER]
  gEfiHiiStringProtocolGuid        AND