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

MdeModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf

@@ -1,7 +1,7 @@
 ## @file
 #  Sample ACPI Platform Driver
 #
-#  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
 #  which accompanies this distribution.  The full text of the license may be found at
@@ -15,6 +15,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = AcpiPlatform
+  MODULE_UNI_FILE                = AcpiPlatform.uni
   FILE_GUID                      = cb933912-df8f-4305-b1f9-7b44fa11395c
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -43,11 +44,13 @@
   UefiDriverEntryPoint
 
 [Protocols]
-  gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED
+  gEfiAcpiTableProtocolGuid                     ## CONSUMES
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiTableStorageFile
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiTableStorageFile    ## CONSUMES
 
 [Depex]
   gEfiAcpiTableProtocolGuid
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  AcpiPlatformExtra.uni

MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf

@@ -1,7 +1,7 @@
 ## @file
 #  ACPI Table Protocol Driver
 #
-#  Copyright (c) 2006 - 2013, 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
@@ -15,6 +15,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = AcpiTableDxe
+  MODULE_UNI_FILE                = AcpiTableDxe.uni
   FILE_GUID                      = 9622E42C-8E38-4a08-9E8F-54F784652F6B
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -54,24 +55,28 @@
   PcdLib
 
 [Guids]
-  gEfiAcpi10TableGuid                           # ALWAYS_CONSUMED
-  gEfiAcpiTableGuid
+  gEfiAcpi10TableGuid                           ## PRODUCES ## SystemTable
+  gEfiAcpiTableGuid                             ## PRODUCES ## SystemTable
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol
+  gEfiMdeModulePkgTokenSpaceGuid.PcdInstallAcpiSdtProtocol  ## CONSUMES
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId            ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId       ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision      ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId        ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision  ## CONSUMES
 
 [Protocols]
-  gEfiAcpiTableProtocolGuid                     # PROTOCOL ALWAYS_PRODUCED
-  gEfiAcpiSdtProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED
-  gEfiDxeSmmReadyToLockProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
+  gEfiAcpiTableProtocolGuid                     ## PRODUCES
+  gEfiAcpiSdtProtocolGuid                       ## PRODUCES
+  ## NOTIFY
+  ## SOMETIMES_CONSUMES
+  gEfiDxeSmmReadyToLockProtocolGuid
 
 [Depex]
   TRUE
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  AcpiTableDxeExtra.uni

MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf

@@ -1,7 +1,7 @@
 ## @file
 #  This module install ACPI Boot Graphics Resource Table (BGRT).
 #
-#  Copyright (c) 2011 - 2013, 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
@@ -15,6 +15,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = BootGraphicsResourceTableDxe
+  MODULE_UNI_FILE                = BootGraphicsResourceTableDxe.uni
   FILE_GUID                      = B8E62775-BB0A-43f0-A843-5BE8B14F8CCD
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -44,15 +45,18 @@
   PcdLib
 
 [Protocols]
-  gEfiAcpiTableProtocolGuid                     ## SOMETIMES_CONSUMES
-  gEfiBootLogoProtocolGuid                      ## SOMETIMES_CONSUMES
+  gEfiAcpiTableProtocolGuid                     ## CONSUMES
+  gEfiBootLogoProtocolGuid                      ## PRODUCES
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId            ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId       ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision      ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId        ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision  ## CONSUMES
 
 [Guids]
-  gEfiEventReadyToBootGuid                      ## CONSUMES
+  gEfiEventReadyToBootGuid                      ## CONSUMES ## Event
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  BootGraphicsResourceTableDxeExtra.uni

MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf

@@ -4,7 +4,7 @@
 # This is a standalone Boot Script Executor. Standalone means it does not
 # depends on any PEI or DXE service.
 #
-# Copyright (c) 2006 - 2013, 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 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = BootScriptExecutorDxe
+  MODULE_UNI_FILE                = BootScriptExecutorDxe.uni
   FILE_GUID                      = FA20568B-548B-4b2b-81EF-1BA08D4A3CEC
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -50,19 +51,14 @@
   MdeModulePkg/MdeModulePkg.dec
 
 [LibraryClasses]
-  TimerLib
   PcdLib
   BaseMemoryLib
-  SmbusLib
   UefiDriverEntryPoint
   BaseLib
-  PciLib
-  IoLib
   S3BootScriptLib
   PeCoffLib
   DxeServicesLib
   UefiBootServicesTableLib
-  UefiRuntimeServicesTableLib
   CacheMaintenanceLib
   UefiLib
   DebugAgentLib
@@ -70,20 +66,22 @@
   CpuExceptionHandlerLib
 
 [Guids]
-  gEfiBootScriptExecutorVariableGuid
-  gEfiBootScriptExecutorContextGuid
-  gPerformanceProtocolGuid
-  gEfiEventExitBootServicesGuid
+  gEfiBootScriptExecutorVariableGuid    ## PRODUCES ## UNDEFINED # SaveLockBox
+  gEfiBootScriptExecutorContextGuid     ## PRODUCES ## UNDEFINED # SaveLockBox
 
 [Protocols]
+  ## NOTIFY
+  ## CONSUMES
   gEfiDxeSmmReadyToLockProtocolGuid
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode  ## CONSUMES
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
+  gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable          ## SOMETIMES_CONSUMES
 
 [Depex]
   gEfiLockBoxProtocolGuid
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  BootScriptExecutorDxeExtra.uni

MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf

@@ -5,7 +5,7 @@
 #  for Firmware Basic Boot Performance Record and other boot performance records, 
 #  and install FPDT to ACPI table.
 #
-#  Copyright (c) 2011 - 2013, 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                      = FirmwarePerformanceDxe
+  MODULE_UNI_FILE                = FirmwarePerformanceDxe.uni
   FILE_GUID                      = 00160F8D-2B35-4df2-BBE0-B272A8D631F0
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -52,37 +53,39 @@
   UefiLib
 
 [Protocols]
-  gEfiAcpiTableProtocolGuid                     ## SOMETIMES_CONSUMES
+  gEfiAcpiTableProtocolGuid                     ## CONSUMES
   gEfiRscHandlerProtocolGuid                    ## CONSUMES
   gEfiSmmCommunicationProtocolGuid              ## SOMETIMES_CONSUMES
-  gEfiVariableArchProtocolGuid                  ## SOMETIMES_CONSUMES
-  gEfiLockBoxProtocolGuid                       ## SOMETIMES_CONSUMES
+  gEfiVariableArchProtocolGuid                  ## CONSUMES
+  gEfiLockBoxProtocolGuid                       ## CONSUMES
 
 [Guids]
-  gEfiEventExitBootServicesGuid                 ## CONSUMES
-  gEfiEventReadyToBootGuid                      ## CONSUMES
-  gEfiEventLegacyBootGuid                       ## CONSUMES
-  gEfiAcpiTableGuid                             ## SOMETIMES_CONSUMES
-  gEfiAcpi10TableGuid                           ## SOMETIMES_CONSUMES
-  gEfiAcpi20TableGuid                           ## SOMETIMES_CONSUMES
-  gEfiFirmwarePerformanceGuid                   ## PRODUCES  ## Variable:L"FirmwarePerformance"
-  gEfiFirmwarePerformanceGuid                   ## SOMETIMES_CONSUMES ## Hob
-  gEfiFirmwarePerformanceGuid                   ## SOMETIMES_CONSUMES ## SmiHandler
-  gEfiFirmwarePerformanceGuid                   ## SOMETIMES_CONSUMES ## StatusCode Data
-  gFirmwarePerformanceS3PointerGuid             ## SOMETIMES_PRODUCES # SaveLockBox
+  gEfiEventExitBootServicesGuid                 ## CONSUMES             ## Event
+  gEfiEventReadyToBootGuid                      ## CONSUMES             ## Event
+  gEfiEventLegacyBootGuid                       ## SOMETIMES_CONSUMES   ## Event
+  ## SOMETIMES_CONSUMES   ## HOB
+  ## SOMETIMES_CONSUMES   ## Variable:L"FirmwarePerformance"
+  ## PRODUCES             ## Variable:L"FirmwarePerformance"
+  ## SOMETIMES_CONSUMES ## UNDEFINED # Used to do smm communication
+  ## SOMETIMES_CONSUMES ## UNDEFINED # StatusCode Data
+  gEfiFirmwarePerformanceGuid
+  gFirmwarePerformanceS3PointerGuid             ## PRODUCES ## UNDEFINED # SaveLockBox
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderLoad
-  gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderStart
-  gEfiMdeModulePkgTokenSpaceGuid.PcdExtFpdtBootRecordPadSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId
-  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision
+  gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderLoad    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeOsLoaderStart   ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdExtFpdtBootRecordPadSize    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemId            ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemTableId       ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision      ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorId        ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision  ## CONSUMES
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwarePerformanceDataTableS3Support
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwarePerformanceDataTableS3Support   ## CONSUMES
 
 [Depex]
   gEfiRscHandlerProtocolGuid
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  FirmwarePerformanceDxeExtra.uni

MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTablePei/FirmwarePerformancePei.inf

@@ -1,13 +1,14 @@
 ## @file
-#  This module updates S3 Resume Performance Record in ACPI Firmware Performance
-#  Data Table in S3 resume boot mode. In normal boot mode, this module consumes
-#  SecPerformance PPI produced by SEC phase and build Hob to convey the SEC
-#  performance data to DXE phase.
+#  Firmware Performance Pei Module.
+#
+#  In S3 resume boot mode, it updates S3 Resume Performance Record in ACPI Firmware Performance Data Table.
+#  In normal boot mode, it consumes SecPerformance PPI produced by SEC phase
+#  and build Hob to convey the SEC performance data to DXE phase.
 #
 #  This module register report status code listener to collect performance data
 #  for S3 Resume Performance Record on S3 resume boot path.
 #
-#  Copyright (c) 2011 - 2013, 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
@@ -21,6 +22,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = FirmwarePerformancePei
+  MODULE_UNI_FILE                = FirmwarePerformancePei.uni
   FILE_GUID                      = ADF01BF6-47D6-495d-B95B-687777807214
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
@@ -52,14 +54,23 @@
 
 [Ppis]
   gEfiPeiRscHandlerPpiGuid                      ## CONSUMES
-  gPeiSecPerformancePpiGuid                     ## CONSUMES
+  gPeiSecPerformancePpiGuid                     ## SOMETIMES_CONSUMES
 
 [Guids]
-  gEfiFirmwarePerformanceGuid                   ## CONSUMES
-  gFirmwarePerformanceS3PointerGuid             ## CONSUMES
+  ## SOMETIMES_CONSUMES   ## UNDEFINED # RestoreLockBox
+  ## SOMETIMES_PRODUCES   ## HOB
+  ## SOMETIMES_CONSUMES   ## Variable:L"FirmwarePerformance"
+  gEfiFirmwarePerformanceGuid
+  gFirmwarePerformanceS3PointerGuid             ## SOMETIMES_CONSUMES ## UNDEFINED # RestoreLockBox
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwarePerformanceDataTableS3Support
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwarePerformanceDataTableS3Support   ## CONSUMES
 
 [Depex]
   gEfiPeiMasterBootModePpiGuid AND gEfiPeiRscHandlerPpiGuid
+
+# [BootMode]
+# S3_RESUME             ## SOMETIMES_CONSUMES
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  FirmwarePerformancePeiExtra.uni

MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf

@@ -4,7 +4,7 @@
 #  This module registers report status code listener to collect performance data
 #  for SMM boot performance records and S3 Suspend Performance Record.
 #
-#  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
@@ -18,6 +18,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = FirmwarePerformanceSmm
+  MODULE_UNI_FILE                = FirmwarePerformanceSmm.uni
   FILE_GUID                      = 044310AB-77FD-402a-AF1A-87D4120E7329
   MODULE_TYPE                    = DXE_SMM_DRIVER
   VERSION_STRING                 = 1.0
@@ -55,13 +56,17 @@
   gEfiSmmAccess2ProtocolGuid                    ## CONSUMES
 
 [Guids]
-  gEfiFirmwarePerformanceGuid                   ## CONSUMES  ## LockBox
-  gEfiFirmwarePerformanceGuid                   ## PRODUCES  ## SmiHandler
-  gEfiFirmwarePerformanceGuid                   ## SOMETIMES_CONSUMES ## StatusCode Data
+  ## SOMETIMES_PRODUCES   ## UNDEFINED # SaveLockBox
+  ## PRODUCES             ## UNDEFINED # SmiHandlerRegister
+  ## SOMETIMES_CONSUMES   ## UNDEFINED # StatusCode Data
+  gEfiFirmwarePerformanceGuid
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeS3SuspendStart
-  gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeS3SuspendEnd
+  gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeS3SuspendStart  ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdProgressCodeS3SuspendEnd    ## CONSUMES
 
 [Depex]
   gEfiSmmRscHandlerProtocolGuid
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  FirmwarePerformanceSmmExtra.uni

MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf

@@ -1,7 +1,9 @@
 ## @file
-# Component description file for ScriptSave module.
+# S3 Boot Script Save State driver.
 #
-# Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+# It will install S3 Save State protocol to store or record various IO operations to be replayed during an S3 resume.
+#
+# 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
@@ -16,6 +18,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = S3SaveStateDxe
+  MODULE_UNI_FILE                = S3SaveStateDxe.uni
   FILE_GUID                      = BDCE85BB-FBAA-4f4e-9264-501A2C249581
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -38,19 +41,19 @@
   MdeModulePkg/MdeModulePkg.dec
 
 [LibraryClasses]
-  UefiRuntimeServicesTableLib
   UefiBootServicesTableLib
   MemoryAllocationLib
   UefiDriverEntryPoint
   BaseMemoryLib
-  DebugLib
   BaseLib
   S3BootScriptLib
 
 [Protocols]
-  gEfiS3SaveStateProtocolGuid                # PROTOCOL ALWAYS_PRODUCED
+  gEfiS3SaveStateProtocolGuid                ## PRODUCES
 
 
 [Depex]
-  TRUE        
-  
+  TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  S3SaveStateDxeExtra.uni

MdeModulePkg/Universal/Acpi/SmmS3SaveState/SmmS3SaveState.inf

@@ -1,9 +1,9 @@
 ## @file
-# Component description file for ScriptSave Lite module.
+# S3 SMM Boot Script Save State driver.
 #
-# This is an implementation of the Boot Script Save protocol.
+# It will install S3 SMM Save State protocol to store or record various IO operations to be replayed during an S3 resume.
 #
-# 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                      = SmmS3SaveState
+  MODULE_UNI_FILE                = SmmS3SaveState.uni
   FILE_GUID                      = 2D59F041-53A4-40d0-A6CD-844DC0DFEF17
   MODULE_TYPE                    = DXE_SMM_DRIVER
   VERSION_STRING                 = 1.0
@@ -44,13 +45,14 @@
   SmmServicesTableLib
   UefiDriverEntryPoint
   BaseMemoryLib
-  DebugLib
   BaseLib
   S3BootScriptLib
 
 [Protocols]
-  gEfiS3SmmSaveStateProtocolGuid                # PROTOCOL ALWAYS_PRODUCED
+  gEfiS3SmmSaveStateProtocolGuid                ## PRODUCES
 
 [Depex]
   TRUE
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  SmmS3SaveStateExtra.uni

MdeModulePkg/Universal/CapsulePei/CapsulePei.inf

@@ -1,14 +1,12 @@
 ## @file
-# Component description file for Capsule module.
-#
-# Capsule update module supports EFI and UEFI.
+# Capsule update PEIM supports EFI and UEFI.
 #
 #  Caution: This module requires additional review when modified.
 #  This driver will have external input - capsule image.
 #  This external input must be validated carefully to avoid security issue like
 #  buffer overflow, integer overflow.
 #
-# 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
@@ -24,6 +22,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = CapsulePei
+  MODULE_UNI_FILE                = CapsulePei.uni
   FILE_GUID                      = C779F6D8-7113-4AA1-9648-EB1633C7D53B
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
@@ -62,25 +61,36 @@
   DebugAgentLib
 
 [Guids]
-  gEfiCapsuleVendorGuid                         # ALWAYS_CONSUMED
+  ## SOMETIMES_CONSUMES   ## Variable:L"CapsuleUpdateData"
+  ## SOMETIMES_CONSUMES   ## Variable:L"CapsuleLongModeBuffer"
+  gEfiCapsuleVendorGuid
 
 [Ppis]
-  gEfiPeiReadOnlyVariable2PpiGuid               # PPI ALWAYS_CONSUMED
-  gPeiCapsulePpiGuid                            # PPI ALWAYS_CONSUMED
+  gEfiPeiReadOnlyVariable2PpiGuid               ## CONSUMES
+  gPeiCapsulePpiGuid                            ## PRODUCES
   
 [Ppis.IA32]  
-  gEfiPeiLoadFilePpiGuid                        # PPI ALWAYS_CONSUMED
+  gEfiPeiLoadFilePpiGuid                        ## SOMETIMES_CONSUMES
 
 [Pcd.IA32]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdCapsuleCoalesceFile
-
-[Pcd.IA32]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable
+  gEfiMdeModulePkgTokenSpaceGuid.PcdCapsuleCoalesceFile     ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable          ## SOMETIMES_CONSUMES
 
 [FeaturePcd.IA32]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode  ## CONSUMES
 
 [Depex]
   gEfiPeiReadOnlyVariable2PpiGuid
 
+# [BootMode]
+# FLASH_UPDATE              ## SOMETIMES_CONSUMES
 
+# [Hob.IA32]
+# UNDEFINED                 ## SOMETIMES_CONSUMES # CPU
+
+# [Hob]
+# UNDEFINED                 ## SOMETIMES_PRODUCES # UEFI_CAPSULE
+
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  CapsulePeiExtra.uni

MdeModulePkg/Universal/CapsulePei/CapsuleX64.inf

@@ -1,5 +1,5 @@
 ## @file
-# Component description file for CapsuleX64 module.
+# CapsuleX64 module handles >4GB capsule blocks.
 #
 # The X64 entrypoint to process capsule in long mode.
 # This module is built as X64.
@@ -9,7 +9,7 @@
 #  This external input must be validated carefully to avoid security issue like
 #  buffer overflow, integer overflow.
 #
-# 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
@@ -25,6 +25,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = CapsuleX64
+  MODULE_UNI_FILE                = CapsuleX64.uni
   FILE_GUID                      = F7FDE4A6-294C-493c-B50F-9734553BB757
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
@@ -52,4 +53,5 @@
 [Depex]
   FALSE
 
-
+[UserExtensions.TianoCore."ExtraFiles"]
+  CapsuleX64Extra.uni

MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

@@ -1,7 +1,6 @@
 ## @file
-#  
-#  Capsule Runtime Driver produces two UEFI capsule runtime services.
-#  (UpdateCapsule, QueryCapsuleCapabilities)
+#  Capsule Runtime Driver produces two UEFI capsule runtime services: (UpdateCapsule, QueryCapsuleCapabilities).
+#
 #  It installs the Capsule Architectural Protocol defined in PI1.0a to signify 
 #  the capsule runtime services are ready.
 #  
@@ -19,6 +18,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = CapsuleRuntimeDxe
+  MODULE_UNI_FILE                = CapsuleRuntimeDxe.uni
   FILE_GUID                      = 42857F0A-13F2-4B21-8A23-53D3F714B840
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER
   VERSION_STRING                 = 1.0
@@ -62,15 +62,17 @@
   HobLib  
 
 [Guids]
-  gEfiCapsuleVendorGuid                         ## SOMETIMES_PRODUCED (Process across reset capsule image) ## Variable:L"CapsuleUpdateData" for capsule updated data
-  gEfiFmpCapsuleGuid                            ## FMP capsule GUID
+  ## SOMETIMES_PRODUCES   ## Variable:L"CapsuleUpdateData" # (Process across reset capsule image) for capsule updated data
+  ## SOMETIMES_PRODUCES   ## Variable:L"CapsuleLongModeBuffer" # The long mode buffer used by IA32 Capsule PEIM to call X64 CapsuleCoalesce code to handle >4GB capsule blocks
+  gEfiCapsuleVendorGuid
+  gEfiFmpCapsuleGuid                            ## SOMETIMES_CONSUMES   ## GUID # FMP capsule GUID
 
 [Guids.X64]
-  gEfiAcpiVariableGuid                          # ALWAYS_CONSUMED
-  gEfiAcpiS3ContextGuid                         # ALWAYS_CONSUMED
+  gEfiAcpiVariableGuid                          ## SOMETIMES_CONSUMES   ## GUID # RestoreLockBox
+  gEfiAcpiS3ContextGuid                         ## SOMETIMES_CONSUMES   ## GUID # RestoreLockBox
 
 [Protocols]
-  gEfiCapsuleArchProtocolGuid                   ## PRODUCED
+  gEfiCapsuleArchProtocolGuid                   ## PRODUCES
 
 [Protocols.X64]
   ## UNDEFINED ## NOTIFY
@@ -78,21 +80,27 @@
   gEdkiiVariableLockProtocolGuid
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset   ## CONSUMES
 
 [FeaturePcd.X64]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode      ## CONSUMES
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizeNonPopulateCapsule
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizePopulateCapsule || gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset  ## Populate Image requires reset support.
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizeNonPopulateCapsule   ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizePopulateCapsule || gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleReset ## SOMETIMES_CONSUMES # Populate Image requires reset support.
 
 [Pcd.X64]
   ## SOMETIMES_CONSUMES
   ## SOMETIMES_PRODUCES
   gEfiMdeModulePkgTokenSpaceGuid.PcdIdentifyMappingPageTablePtr
-  gEfiMdeModulePkgTokenSpaceGuid.PcdCapsulePeiLongModeStackSize
+  gEfiMdeModulePkgTokenSpaceGuid.PcdCapsulePeiLongModeStackSize   ## SOMETIMES_CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable                ## SOMETIMES_CONSUMES
 
 [Depex]
-  gEfiVariableWriteArchProtocolGuid             ## Depends on variable write functionality to produce capsule data variable
+  gEfiVariableWriteArchProtocolGuid             # Depends on variable write functionality to produce capsule data variable
+
+# [Hob.X64]
+# UNDEFINED                 ## SOMETIMES_CONSUMES # CPU
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  CapsuleRuntimeDxeExtra.uni

MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf

@@ -1,8 +1,10 @@
 ## @file
+# Platform console driver manages console devices.
+#
 # Console Platfrom DXE Driver that specifies whether device can be used as console
 # input/output device or error output device and update global variables accordingly.
 #
-# 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
@@ -17,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = ConPlatformDxe
+  MODULE_UNI_FILE                = ConPlatformDxe.uni
   FILE_GUID                      = 51ccf399-4fdf-4e55-a45b-e123f84d456a
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -55,37 +58,41 @@
   DebugLib
 
 [Guids]
-  ##
+  #
   # This is the VendorGuid of all architecturally defined variables in UEFI spec.
   #
-  gEfiGlobalVariableGuid                        ## CONSUMES  ## Variable:L"ConIn"
-  gEfiGlobalVariableGuid                        ## CONSUMES  ## Variable:L"ConOut"
-  gEfiGlobalVariableGuid                        ## CONSUMES  ## Variable:L"ErrOut"
-  gEfiGlobalVariableGuid                        ## CONSUMES  ## Variable:L"ConInDev"
-  gEfiGlobalVariableGuid                        ## CONSUMES  ## Variable:L"ConOutDev"
-  gEfiGlobalVariableGuid                        ## CONSUMES  ## Variable:L"ErrOutDev"
-  ##
+  ## SOMETIMES_CONSUMES ## Variable:L"ConIn"
+  ## SOMETIMES_CONSUMES ## Variable:L"ConOut"
+  ## SOMETIMES_CONSUMES ## Variable:L"ErrOut"
+  ## SOMETIMES_PRODUCES ## Variable:L"ConInDev"
+  ## SOMETIMES_PRODUCES ## Variable:L"ConOutDev"
+  ## SOMETIMES_PRODUCES ## Variable:L"ErrOutDev"
+  gEfiGlobalVariableGuid
+  #
   # This GUID is used to specify the device is the standard error device.
   # If the device is a standard error device, this GUID as the protocol GUID will be installed
   # onto this device handle.
   #
-  gEfiStandardErrorDeviceGuid                   ## PROTOCOL
-  ##
+  gEfiStandardErrorDeviceGuid                   ## SOMETIMES_PRODUCES ## UNDEFINED # protocol GUID installed on device handle
+  #
   # This GUID is used to specify the device is the console output device.
   # If the device is a console output device, this GUID as the protocol GUID will be installed
   # onto this device handle.
   #
-  gEfiConsoleOutDeviceGuid                      ## PROTOCOL
-  ##
+  gEfiConsoleOutDeviceGuid                      ## SOMETIMES_PRODUCES ## UNDEFINED # protocol GUID installed on device handle
+  #
   # This GUID is used to specify the device is the console input device.
   # If the device is a console input device, this GUID as the protocol GUID will be installed
   # onto this device handle.
   #
-  gEfiConsoleInDeviceGuid                       ## PROTOCOL
+  gEfiConsoleInDeviceGuid                       ## SOMETIMES_PRODUCES ## UNDEFINED # protocol GUID installed on device handle
 
 [Protocols]
   gEfiDevicePathProtocolGuid                    ## TO_START
   gEfiSimpleTextInProtocolGuid                  ## TO_START
   gEfiSimpleTextOutProtocolGuid                 ## TO_START
-  gEfiPciIoProtocolGuid                         ## TO_START
-  gEfiGraphicsOutputProtocolGuid                ## TO_START
+  gEfiPciIoProtocolGuid                         ## SOMETIMES_CONSUMES
+  gEfiGraphicsOutputProtocolGuid                ## SOMETIMES_CONSUMES
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  ConPlatformDxeExtra.uni

MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf

@@ -7,10 +7,10 @@
 # table according PCD settings(PcdConOutGopSupport, and PcdConOutUgaSupport). It always
 # consumes Graphics Output protocol which is produced by display device, and consumes UGA Draw
 # protocol which is produced by display device according to PcdUgaConsumeSupport value.
-# Note: If only UGA Draw protocol is installed in system table, PcdUgaConsumeSupport
-# should be set to TRUE.
+# Note: If only UGA Draw protocol is installed in system, PcdUgaConsumeSupport should be
+# set to TRUE.
 #
-# 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
@@ -25,6 +25,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = ConSplitterDxe
+  MODULE_UNI_FILE                = ConSplitterDxe.uni
   FILE_GUID                      = 408edcec-cf6d-477c-a5a8-b4844e3de281
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -70,27 +71,49 @@
   PcdLib
 
 [Guids]
-  gEfiConsoleInDeviceGuid                       ## SOMETIMES_CONSUMES
-  gEfiStandardErrorDeviceGuid                   ## SOMETIMES_CONSUMES
-  gEfiConsoleOutDeviceGuid                      ## SOMETIMES_CONSUMES
-  gConnectConInEventGuid                        ## ALWAYS_CONSUMES
+  gEfiConsoleInDeviceGuid                       ## SOMETIMES_CONSUMES ## UNDEFINED # protocol GUID installed on device handle
+  gEfiStandardErrorDeviceGuid                   ## SOMETIMES_CONSUMES ## UNDEFINED # protocol GUID installed on device handle
+  gEfiConsoleOutDeviceGuid                      ## SOMETIMES_CONSUMES ## UNDEFINED # protocol GUID installed on device handle
+  ## SOMETIMES_PRODUCES ## Event
+  ## SOMETIMES_CONSUMES ## Event
+  gConnectConInEventGuid
 
 [Protocols]
-  gEfiSimplePointerProtocolGuid                 ## BY_START
-  gEfiAbsolutePointerProtocolGuid               ## BY_START
-  gEfiSimpleTextInProtocolGuid                  ## BY_START
-  gEfiSimpleTextInputExProtocolGuid             ## BY_START
-  gEfiSimpleTextOutProtocolGuid                 ## BY_START
-  gEfiGraphicsOutputProtocolGuid                ## BY_START
-  gEfiUgaDrawProtocolGuid                       ## BY_START
-
+  ## PRODUCES
+  ## TO_START
+  gEfiSimplePointerProtocolGuid
+  ## PRODUCES
+  ## TO_START
+  gEfiAbsolutePointerProtocolGuid
+  ## PRODUCES
+  ## TO_START
+  gEfiSimpleTextInProtocolGuid
+  ## PRODUCES
+  ## TO_START
+  gEfiSimpleTextInputExProtocolGuid
+  ## PRODUCES
+  ## TO_START 
+  gEfiSimpleTextOutProtocolGuid
+  ## SOMETIMES_PRODUCES
+  ## SOMETIMES_CONSUMES
+  gEfiGraphicsOutputProtocolGuid
+  ## SOMETIMES_PRODUCES
+  ## SOMETIMES_CONSUMES
+  gEfiUgaDrawProtocolGuid
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport
-  gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport   ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport   ## CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport        ## CONSUMES
 
 [Pcd]
+  ## SOMETIMES_PRODUCES
+  ## SOMETIMES_CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
+  ## SOMETIMES_PRODUCES
+  ## SOMETIMES_CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand  ## SOMETIMES_CONSUMES
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  ConSplitterDxeExtra.uni

MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf

@@ -1,10 +1,10 @@
 ## @file
-# 
-#  Component description file for GraphicsConsole module
+#  Console support on graphic devices.
 #
-#  This is the main routine for initializing the Graphics Console support routines.
+#  This driver will install Simple Text Output protocol by consuming Graphices Output
+#  protocol or UGA Draw protocol on graphic devices.
 #  
-#  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
 #  which accompanies this distribution. The full text of the license may be found at
@@ -18,6 +18,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = GraphicsConsoleDxe
+  MODULE_UNI_FILE                = GraphicsConsoleDxe.uni
   FILE_GUID                      = CCCB0C28-4B24-11d5-9A5A-0090273FC14D
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -54,17 +55,21 @@
   PcdLib
 
 [Protocols]
-  gEfiDevicePathProtocolGuid                    ## CONSUMES
+  gEfiDevicePathProtocolGuid                    ## TO_START
   gEfiSimpleTextOutProtocolGuid                 ## BY_START
   gEfiGraphicsOutputProtocolGuid                ## TO_START
   gEfiUgaDrawProtocolGuid                       ## TO_START
   gEfiHiiFontProtocolGuid                       ## TO_START
-  gEfiHiiDatabaseProtocolGuid                   ## TO_START   
+  ## TO_START
+  ## NOTIFY
+  gEfiHiiDatabaseProtocolGuid
 
 [FeaturePcd]
-  gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
+  gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport ## CONSUMES
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution   ## SOMETIMES_CONSUMES
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  GraphicsConsoleDxeExtra.uni

MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

@@ -1,8 +1,9 @@
 ## @file
+#  Terminal module installs Simple Text Input(ex)/Out protocols for serial devices.
 #
-#  Component description file for Terminal module.
-#
-#  This driver installs Simple Text In/Out protocol for terminal devices (serial devices or hotplug devices).
+#  This module will install Simple Text Input (Ex) protocol and Simple Test Output
+#  protocols based on Serial I/O protocol for serial devices including hotplug serial
+#  devices.
 #
 #  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #  This program and the accompanying materials
@@ -18,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = TerminalDxe
+  MODULE_UNI_FILE                = TerminalDxe.uni
   FILE_GUID                      = 9E863906-A40F-4875-977F-5B93FF237FC6
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -60,29 +62,37 @@
   BaseLib
 
 [Guids]
-  gEfiGlobalVariableGuid                        ## SOMETIMES_CONSUMES ## Variable:L"ErrOutDev"
-  gEfiVTUTF8Guid                                ## SOMETIMES_CONSUMES ## GUID
-  gEfiVT100Guid                                 ## SOMETIMES_CONSUMES ## GUID
-  gEfiVT100PlusGuid                             ## SOMETIMES_CONSUMES ## GUID
-  gEfiPcAnsiGuid                                ## SOMETIMES_CONSUMES ## GUID
+  ## SOMETIMES_PRODUCES ## Variable:L"ConInDev"
+  ## SOMETIMES_CONSUMES ## Variable:L"ConInDev"
+  ## SOMETIMES_PRODUCES ## Variable:L"ConOutDev"
+  ## SOMETIMES_CONSUMES ## Variable:L"ConOutDev"
+  ## SOMETIMES_PRODUCES ## Variable:L"ErrOutDev"
+  ## SOMETIMES_CONSUMES ## Variable:L"ErrOutDev"
+  gEfiGlobalVariableGuid
+  gEfiVTUTF8Guid                                ## SOMETIMES_CONSUMES ## GUID # used with a Vendor-Defined Messaging Device Path
+  gEfiVT100Guid                                 ## SOMETIMES_CONSUMES ## GUID # used with a Vendor-Defined Messaging Device Path
+  gEfiVT100PlusGuid                             ## SOMETIMES_CONSUMES ## GUID # used with a Vendor-Defined Messaging Device Path
+  gEfiPcAnsiGuid                                ## SOMETIMES_CONSUMES ## GUID # used with a Vendor-Defined Messaging Device Path
   gEdkiiStatusCodeDataTypeVariableGuid          ## SOMETIMES_CONSUMES ## GUID
 
 [Protocols]
   gEfiSerialIoProtocolGuid                      ## TO_START
-  gEfiDevicePathProtocolGuid                    ## TO_START
+  ## BY_START
+  ## TO_START
+  gEfiDevicePathProtocolGuid
   gEfiSimpleTextInProtocolGuid                  ## BY_START
   gEfiSimpleTextInputExProtocolGuid             ## BY_START
   gEfiSimpleTextOutProtocolGuid                 ## BY_START
 
 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType
-  gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable
+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType           ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable    ## CONSUMES
 
 # [Event]
-#   ##
-#   # Relative timer event set by UnicodeToEfiKey(), used to one 2 seconds input timeout.
-#   #
-#   EVENT_TYPE_RELATIVE_TIMER                   ## PRODUCES
-#
-#
+# # Relative timer event set by UnicodeToEfiKey(), used to be one 2 seconds input timeout.
+# EVENT_TYPE_RELATIVE_TIMER                   ## CONSUMES
+# # Period timer event to invoke TerminalConInTimerHandler(), period value is KEYBOARD_TIMER_INTERVAL and used to poll the key from serial
+# EVENT_TYPE_PERIODIC_TIMER                   ## CONSUMES
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  TerminalDxeExtra.uni

MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf

@@ -1,10 +1,10 @@
 ## @file
-# This driver produces Debug Port protocol to be used by debug agent to communicate with
-# the remote debug host.
+# This driver produces Debug Port protocol to be used by debug agent to communicate with the remote debug host.
 #
 # This driver binds exclusively to a standard UART serial port on the controller handle,
-#  and initializes serial Io interface, publishs Debug Port and Device Path Protocol.
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+# and initializes serial Io interface, publishs Debug Port and Device Path 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
@@ -19,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = DebugPortDxe
+  MODULE_UNI_FILE                = DebugPortDxe.uni
   FILE_GUID                      = 73E9457A-CEA1-4917-9A9C-9F1F0F0FD322
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -58,11 +59,13 @@
   DebugLib
 
 [Guids]
-  gEfiDebugPortVariableGuid                     ## SOMETIMES_CONSUMES ## Variable:L"DEBUGPORT"
-  gEfiDebugPortDevicePathGuid                   ## SOMETIMES_CONSUMES ## GUID
+  gEfiDebugPortVariableGuid                     ## SOMETIMES_CONSUMES   ## Variable:L"DEBUGPORT"
+  gEfiDebugPortDevicePathGuid                   ## SOMETIMES_CONSUMES   ## UNDEFINED # Device path
 
 [Protocols]
   gEfiSerialIoProtocolGuid                      ## TO_START
   gEfiDevicePathProtocolGuid                    ## BY_START
   gEfiDebugPortProtocolGuid                     ## BY_START
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  DebugPortDxeExtra.uni

MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf

@@ -6,7 +6,7 @@
 # provides debug-agent to periodically gain control during operation of the machine to
 # check for asynchronous commands form the host.
 #
-# 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
@@ -21,6 +21,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = DebugSupportDxe
+  MODULE_UNI_FILE                = DebugSupportDxe.uni
   FILE_GUID                      = 911D584C-35F7-4955-BEF9-B452769DDC3A
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -71,18 +72,16 @@
   UefiDriverEntryPoint
   DebugLib
 
-[LibraryClasses.IA32]
+[LibraryClasses.IA32, LibraryClasses.X64]
   BaseLib
 
-[LibraryClasses.X64]
-  BaseLib
-
-
 [Protocols]
-  gEfiLoadedImageProtocolGuid                   ## CONSUMED
-  gEfiDebugSupportProtocolGuid                  ## PRODUCED
+  gEfiLoadedImageProtocolGuid                   ## CONSUMES
+  gEfiDebugSupportProtocolGuid                  ## PRODUCES
 
 
 [Depex]
   TRUE
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  DebugSupportDxeExtra.uni

MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf

@@ -6,7 +6,7 @@
 #  PcdDevicePathSupportDevicePathToText & PcdDevicePathSupportDevicePathFromText
 #  respectively.
 #
-#  Copyright (c) 2006 - 2013, 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                      = DevicePathDxe
+  MODULE_UNI_FILE                = DevicePathDxe.uni
   FILE_GUID                      = 9B680FCE-AD6B-4F3A-B60B-F59899003443
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -44,13 +45,16 @@
   UefiDriverEntryPoint
   
 [Protocols]
-  gEfiDevicePathToTextProtocolGuid   | gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText ## PRODUCES
-  gEfiDevicePathFromTextProtocolGuid | gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText ## PRODUCES
+  gEfiDevicePathToTextProtocolGuid   | gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText ## SOMETIMES_PRODUCES
+  gEfiDevicePathFromTextProtocolGuid | gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText ## SOMETIMES_PRODUCES
   gEfiDevicePathUtilitiesProtocolGuid ## PRODUCES
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText   ## CONSUMES
 
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  DevicePathDxeExtra.uni

MdeModulePkg/Universal/Disk/CdExpressPei/CdExpressPei.inf

@@ -1,11 +1,11 @@
 ## @file
-# Component description file for PeiCdExpress module.
+# PeiCdExpress recovery module.
 #
 # This module reads data from CDROM device by all installed block IO ppi and 
 # finds whether there is Recovery data in the device. If it finds recovery
 # data, it will install Device Recovery Module PPI.
 #
-# 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
@@ -21,6 +21,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = CdExpressPei
+  MODULE_UNI_FILE                = CdExpressPei.uni
   FILE_GUID                      = 31e147a6-d39a-4147-9da3-befd4d523243
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
@@ -52,18 +53,20 @@
   PcdLib
 
 [Guids]
-  gRecoveryOnDataCdGuid                         # ALWAYS_CONSUMED
+  gRecoveryOnDataCdGuid                         ## CONSUMES   ## UNDEFINED # Indicate the recovery device type
 
 
 [Ppis]
-  gEfiPeiVirtualBlockIoPpiGuid                  # PPI_NOTIFY SOMETIMES_CONSUMED
-  gEfiPeiDeviceRecoveryModulePpiGuid            # PPI ALWAYS_PRODUCED
+  ## NOTIFY
+  ## CONSUMES
+  gEfiPeiVirtualBlockIoPpiGuid
+  gEfiPeiDeviceRecoveryModulePpiGuid            ## PRODUCES
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport	         ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport   ## CONSUMES
 
 [Depex]
   gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiBootInRecoveryModePpiGuid
 
-
-
+[UserExtensions.TianoCore."ExtraFiles"]
+  CdExpressPeiExtra.uni

MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf

@@ -8,7 +8,7 @@
 #  already have a Disk I/O protocol. File systems and other disk access
 #  code utilize the Disk I/O protocol.
 #  
-#  Copyright (c) 2006 - 2013, 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
@@ -22,6 +22,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = DiskIoDxe
+  MODULE_UNI_FILE                = DiskIoDxe.uni
   FILE_GUID                      = 6B38F7B4-AD98-40e9-9093-ACA2B5A253C4
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -64,4 +65,7 @@
   gEfiBlockIo2ProtocolGuid                      ## TO_START
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDiskIoDataBufferBlockNum
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDiskIoDataBufferBlockNum    ## SOMETIMES_CONSUMES
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  DiskIoDxeExtra.uni

MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf

@@ -1,6 +1,5 @@
 ## @file
-#  Modules that produces the logic Block I/O protocol for every partition
-#  it discovers via the physical Block I/O.
+#  Modules that produces the logic Block I/O protocol for every partition via the physical Block I/O.
 #
 #  This module produces the logical Block I/O device that represents
 #  the bytes from Start to End of the Parent Block I/O device.
@@ -12,7 +11,7 @@
 #  This external input must be validated carefully to avoid security issue like
 #  buffer overflow, integer overflow.
 #
-#  Copyright (c) 2006 - 2013, 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
@@ -26,6 +25,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PartitionDxe
+  MODULE_UNI_FILE                = PartitionDxe.uni
   FILE_GUID                      = 1FA1F39E-FEFF-4aae-BD7B-38A070A3B609
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -67,16 +67,23 @@
 
 [Guids]
   gEfiPartTypeUnusedGuid                        ## SOMETIMES_CONSUMES ## GUID
-  gEfiPartTypeSystemPartGuid                    ## SOMETIMES_CONSUMES ## Protocol
+  ## SOMETIMES_CONSUMES ## GUID
+  ## SOMETIMES_CONSUMES ## GUID # Install protocol
+  gEfiPartTypeSystemPartGuid
 
 
 [Protocols]
-  gEfiBlockIoProtocolGuid                       ## BY_START
-  gEfiDevicePathProtocolGuid                    ## BY_START
-  gEfiDiskIoProtocolGuid                        ## BY_START
-  gEfiDiskIo2ProtocolGuid                       ## BY_START
-  gEfiBlockIoProtocolGuid                       ## TO_START
-  gEfiBlockIo2ProtocolGuid                      ## TO_START
-  gEfiDevicePathProtocolGuid                    ## TO_START
+  ## BY_START
+  ## TO_START
+  gEfiBlockIoProtocolGuid
+  ## BY_START
+  ## TO_START
+  gEfiBlockIo2ProtocolGuid
+  ## BY_START
+  ## TO_START
+  gEfiDevicePathProtocolGuid
   gEfiDiskIoProtocolGuid                        ## TO_START
   gEfiDiskIo2ProtocolGuid                       ## TO_START
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  PartitionDxeExtra.uni

MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf

@@ -7,7 +7,7 @@
 #  It allows code running in the boot services environment to perform lexical
 #  comparison functions on Unicode strings for English languages.
 #  
-#  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
 #  which accompanies this distribution.  The full text of the license may be found at
@@ -21,6 +21,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = EnglishDxe
+  MODULE_UNI_FILE                = EnglishDxe.uni
   FILE_GUID                      = CD3BAFB6-50FB-4fe8-8E4E-AB74D2C1A600
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -48,10 +49,12 @@
   PcdLib
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollationSupport
-  gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollation2Support
+  gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollationSupport     ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollation2Support    ## CONSUMES
 
 [Protocols]
-  gEfiUnicodeCollationProtocolGuid  | gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollationSupport  ## PRODUCES
-  gEfiUnicodeCollation2ProtocolGuid | gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollation2Support ## PRODUCES
+  gEfiUnicodeCollationProtocolGuid | gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollationSupport      ## SOMETIMES_PRODUCES
+  gEfiUnicodeCollation2ProtocolGuid | gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollation2Support    ## PRODUCES
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  EnglishDxeExtra.uni

MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf

@@ -1,7 +1,7 @@
 ## @file
-# The DXE driver produces FORM BROWSER protocols defined in UEFI HII 2.1 specificatin.
+# The DXE driver produces FORM DISPLAY ENGIEN protocol.
 #
-# Copyright (c) 2007 - 2013, 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
@@ -17,6 +17,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = DisplayEngine
+  MODULE_UNI_FILE                = DisplayEngine.uni
   FILE_GUID                      = E660EA85-058E-4b55-A54B-F02F83A24707
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -51,13 +52,15 @@
   CustomizedDisplayLib
 
 [Protocols]
-  gEdkiiFormDisplayEngineProtocolGuid
-  gEdkiiFormBrowserEx2ProtocolGuid
+  gEdkiiFormDisplayEngineProtocolGuid   ## PRODUCES
+  gEdkiiFormBrowserEx2ProtocolGuid      ## CONSUMES
 
 [Depex]
   gEfiHiiDatabaseProtocolGuid AND gEfiHiiConfigRoutingProtocolGuid AND gEdkiiFormBrowserEx2ProtocolGuid
   
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserGrayOutTextStatement            ## CONSUMES
-  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowerGrayOutReadOnlyMenu              ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowserGrayOutTextStatement     ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdBrowerGrayOutReadOnlyMenu       ## CONSUMES
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  DisplayEngineExtra.uni

MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf

@@ -1,8 +1,10 @@
 ## @file
-# This is a sample driver which show how HII protocol, VFR and UNI files are used to
-# create a driver which can be dipslayed and configured by a UEFI HII Form Browser.
+# This is a sample HII driver. 
 #
-# Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
+# This driver shows how HII protocol, VFR and UNI files are used to create a HII 
+# driver which can be dipslayed and configured by a UEFI HII Form Browser.
+#
+# 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
@@ -18,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = DriverSample
+  MODULE_UNI_FILE                = DriverSample.uni
   FILE_GUID                      = FE3542FE-C1D3-4EF8-657C-8048606FF671
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -58,20 +61,40 @@
   DevicePathLib
 
 [Guids]
-  gEfiIfrTianoGuid                              ## CONSUMES ## Guid
-  gDriverSampleFormSetGuid                      ## PRODUCES ## Guid
-  gDriverSampleInventoryGuid                    ## PRODUCES ## Guid
-  gEfiIfrRefreshIdOpGuid                        ## SOMETIMES_PRODUCES ## EventGuid
+  gEfiIfrTianoGuid                              ## PRODUCES ## UNDEFINED
+  gDriverSampleInventoryGuid                    ## CONSUMES ## HII
+  ## SOMETIMES_PRODUCES ## Event
+  ## CONSUMES ## Event
+  gEfiIfrRefreshIdOpGuid
+  ## CONSUMES ## HII
+  ## PRODUCES ## Variable:L"MyIfrNVData"
+  ## SOMETIMES_CONSUMES ## Variable:L"MyIfrNVData"
+  ## PRODUCES ## Variable:L"MyEfiVar"
+  ## SOMETIMES_CONSUMES ## Variable:L"MyEfiVar"
+  ## PRODUCES ## GUID  # HiiConstructConfigHdr MyEfiVar
+  ## PRODUCES ## GUID  # HiiConstructConfigHdr MyIfrNVData
+  ## SOMETIMES_CONSUMES ## GUID  # HiiIsConfigHdrMatch MyEfiVar
+  ## SOMETIMES_CONSUMES ## GUID  # HiiIsConfigHdrMatch MyIfrNVData
+  ## SOMETIMES_PRODUCES ## GUID  # HiiGetBrowserData MyIfrNVData
+  ## SOMETIMES_CONSUMES ## GUID  # HiiSetBrowserData MyIfrNVData
+  ## SOMETIMES_PRODUCES ## GUID  # HiiGetBrowserData MyEfiVar
+  ## SOMETIMES_CONSUMES ## GUID  # HiiSetBrowserData MyEfiVar
+  gDriverSampleFormSetGuid
 
 [Protocols]
+  ## PRODUCES # DriverSampleFormSet
+  ## PRODUCES # DriverSampleInventory
+  gEfiDevicePathProtocolGuid
   gEfiHiiStringProtocolGuid                     ## CONSUMES
   gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES
   gEfiHiiConfigAccessProtocolGuid               ## PRODUCES
   gEfiFormBrowser2ProtocolGuid                  ## CONSUMES
   gEfiHiiDatabaseProtocolGuid                   ## CONSUMES
-  gEfiSimpleTextInputExProtocolGuid             ## CONSUMES
+  gEfiSimpleTextInputExProtocolGuid             ## SOMETIMES_CONSUMES
   gEfiFormBrowserExProtocolGuid                 ## CONSUMES
 
 [Depex]
   gEfiSimpleTextOutProtocolGuid AND gEfiHiiDatabaseProtocolGuid AND gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  DriverSampleExtra.uni

MdeModulePkg/Universal/EbcDxe/EbcDxe.inf

@@ -5,7 +5,7 @@
 #  platform and processor-independent mechanisms for loading and executing EFI
 #  device drivers.
 #
-#  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
 #  which accompanies this distribution.  The full text of the license may be found at
@@ -19,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = EbcDxe
+  MODULE_UNI_FILE                = EbcDxe.uni
   FILE_GUID                      = 13AC6DD0-73D0-11D4-B06B-00AA00BD6DE7
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -75,12 +76,10 @@
   TRUE
 
 # [Event]
-#   ##
-#   # Periodic timer event to support EFI debug support protocol for EBC image.
-#   #
-#   EVENT_TYPE_PERIODIC_TIMER                   ## PRODUCES
 #
+# Periodic timer event to support EFI debug support protocol for EBC image.
 #
-#
-#
-#
+# EVENT_TYPE_PERIODIC_TIMER ## CONSUMES
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  EbcDxeExtra.uni

MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf

@@ -1,4 +1,6 @@
 ## @file
+# Fault Tolerant Write Dxe Driver.
+#
 # This driver installs Fault Tolerant Write (FTW) protocol, 
 # which provides fault tolerant write capability for block devices.
 # Its implementation depends on the full functionality FVB protocol that support read, write/erase flash access.
@@ -17,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = FaultTolerantWriteDxe
+  MODULE_UNI_FILE                = FaultTolerantWriteDxe.uni
   FILE_GUID                      = FE5CEA76-4F72-49e8-986F-2CD899DFFE5D
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -50,23 +53,30 @@
   ReportStatusCodeLib
 
 [Guids]
-  gEdkiiWorkingBlockSignatureGuid               ## CONSUMES ## FV Signature of Working Space Header
+  #
+  # Signature in EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER
+  #
+  ## CONSUMES           ## GUID
+  ## PRODUCES           ## GUID
+  gEdkiiWorkingBlockSignatureGuid
 
 [Protocols]
-  gEfiSwapAddressRangeProtocolGuid     | gEfiMdeModulePkgTokenSpaceGuid.PcdFullFtwServiceEnable          ## CONSUMES
-  gEfiFirmwareVolumeBlockProtocolGuid           ## CONSUMES
+  gEfiSwapAddressRangeProtocolGuid | gEfiMdeModulePkgTokenSpaceGuid.PcdFullFtwServiceEnable ## SOMETIMES_CONSUMES
+  ## NOTIFY
+  ## CONSUMES
+  gEfiFirmwareVolumeBlockProtocolGuid
   gEfiFaultTolerantWriteProtocolGuid            ## PRODUCES
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFullFtwServiceEnable
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFullFtwServiceEnable    ## CONSUMES
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase    ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64  ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase      ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize      ## CONSUMES
 
 #
 # gBS->CalculateCrc32() is consumed in EntryPoint.
@@ -77,3 +87,5 @@
 [Depex]
   gEfiFirmwareVolumeBlockProtocolGuid AND gEfiRuntimeArchProtocolGuid
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  FaultTolerantWriteDxeExtra.uni

MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf

@@ -1,4 +1,6 @@
 ## @file
+#   Fault Tolerant Write Smm Driver.
+#
 #   This driver installs SMM Fault Tolerant Write (FTW) protocol, which provides fault 
 #   tolerant write capability in SMM environment for block devices. Its implementation 
 #   depends on the full functionality SMM FVB protocol that support read, write/erase 
@@ -18,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = SmmFaultTolerantWriteDxe
+  MODULE_UNI_FILE                = SmmFaultTolerantWriteDxe.uni
   FILE_GUID                      = 470CB248-E8AC-473c-BB4F-81069A1FE6FD
   MODULE_TYPE                    = DXE_SMM_DRIVER
   VERSION_STRING                 = 1.0
@@ -53,25 +56,34 @@
   ReportStatusCodeLib
 
 [Guids]
-  gEdkiiWorkingBlockSignatureGuid                  ## CONSUMES ## FV Signature of Working Space Header
+  #
+  # Signature in EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER
+  #
+  ## CONSUMES           ## GUID
+  ## PRODUCES           ## GUID
+  gEdkiiWorkingBlockSignatureGuid
 
 [Protocols]
-  gEfiSmmSwapAddressRangeProtocolGuid     | gEfiMdeModulePkgTokenSpaceGuid.PcdFullFtwServiceEnable          ## CONSUMES
-  gEfiSmmFirmwareVolumeBlockProtocolGuid           ## CONSUMES
-  gEfiSmmFaultTolerantWriteProtocolGuid            ## PRODUCES
+  gEfiSmmSwapAddressRangeProtocolGuid | gEfiMdeModulePkgTokenSpaceGuid.PcdFullFtwServiceEnable  ## SOMETIMES_CONSUMES
+  ## NOTIFY
+  ## CONSUMES
+  gEfiSmmFirmwareVolumeBlockProtocolGuid
+  ## PRODUCES
+  ## UNDEFINED # SmiHandlerRegister
+  gEfiSmmFaultTolerantWriteProtocolGuid
   gEfiSmmAccess2ProtocolGuid                       ## CONSUMES
   gEfiSmmEndOfDxeProtocolGuid                      ## CONSUMES
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFullFtwServiceEnable
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFullFtwServiceEnable    ## CONSUMES
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase    ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64  ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase      ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize      ## CONSUMES
 
 #
 # gBS->CalculateCrc32() is consumed in EntryPoint.
@@ -82,3 +94,5 @@
 [Depex]
   gEfiSmmFirmwareVolumeBlockProtocolGuid AND gEfiRuntimeArchProtocolGuid
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  SmmFaultTolerantWriteDxeExtra.uni

MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmmDxe.inf

@@ -1,11 +1,12 @@
 ## @file
-# This module is the DXE part corresponding to SMM Fault Tolerant Write (FTW) module.
+# This module is the Runtime DXE part corresponding to SMM Fault Tolerant Write (FTW) module.
+#
 # It installs FTW protocol and works with SMM FTW module together.
 # The FTW protocol will not work after End Of Dxe because it will be not safe to expose
 # the related operations in SMM handler in SMM FTW module. You can use the FTW protocol
 # before End Of Dxe or use FaultTolerantWriteDxe module instead if you really want to.
 #
-# Copyright (c) 2011 - 2013, 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 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = FaultTolerantWriteSmmDxe
+  MODULE_UNI_FILE                = FaultTolerantWriteSmmDxe.uni
   FILE_GUID                      = 98948C4A-70F2-4035-8E9F-5927493CFC07
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -47,10 +49,16 @@
   UefiDriverEntryPoint
 
 [Protocols]
-  gEfiFaultTolerantWriteProtocolGuid           ## ALWAYS_PRODUCES
-  gEfiSmmCommunicationProtocolGuid
+  gEfiFaultTolerantWriteProtocolGuid            ## PRODUCES
+  gEfiSmmCommunicationProtocolGuid              ## CONSUMES
+  ## NOTIFY
+  ## UNDEFINED # Used to do smm communication
+  ## CONSUMES
   gEfiSmmFaultTolerantWriteProtocolGuid
-  gEfiFirmwareVolumeBlockProtocolGuid
+  gEfiFirmwareVolumeBlockProtocolGuid           ## CONSUMES
    
 [Depex]
   gEfiSmmCommunicationProtocolGuid
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  FaultTolerantWriteSmmDxeExtra.uni

MdeModulePkg/Universal/FaultTolerantWritePei/FaultTolerantWritePei.inf

@@ -1,8 +1,9 @@
 ## @file
-# This driver installs gEdkiiFaultTolerantWriteGuid PPI to inform
-# the check for FTW last write data has been done.
+# Fault Tolerant Write PEI Driver.
 #
-# Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+# This module installs gEdkiiFaultTolerantWriteGuid PPI to inform the check for FTW last write data has been done.
+#
+# 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
@@ -16,6 +17,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = FaultTolerantWritePei
+  MODULE_UNI_FILE                = FaultTolerantWritePei.uni
   FILE_GUID                      = AAC33064-9ED0-4b89-A5AD-3EA767960B22
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
@@ -44,18 +46,22 @@
   PcdLib
 
 [Guids]
-  gEdkiiFaultTolerantWriteGuid                  ## CONSUMES
-  gEdkiiWorkingBlockSignatureGuid               ## CONSUMES
-  gEfiSystemNvDataFvGuid                        ## CONSUMES
+  ## SOMETIMES_PRODUCES   ## HOB
+  ## PRODUCES             ## GUID # Install ppi
+  gEdkiiFaultTolerantWriteGuid
+  gEdkiiWorkingBlockSignatureGuid               ## SOMETIMES_CONSUMES   ## GUID
+  gEfiSystemNvDataFvGuid                        ## SOMETIMES_CONSUMES   ## GUID
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase    ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64  ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase      ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize      ## CONSUMES
 
 [Depex]
   TRUE
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  FaultTolerantWritePeiExtra.uni

MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

@@ -1,7 +1,10 @@
 ## @file
-# The DXE driver produces HII protocols defined in UEFI HII 2.1 specificatin.
+# The DXE driver produces HII protocols defined in UEFI specification.
 #
-# Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
+# This driver produces all required HII serivces that includes HiiDataBase, HiiString,
+# HiiFont, HiiConfigRouting. To support UEFI HII, this driver is required.
+#
+# 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   
@@ -17,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = HiiDatabase
+  MODULE_UNI_FILE                = HiiDatabase.uni
   FILE_GUID                      = 348C4D62-BFBD-4882-9ECE-C80BB1C4783B
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -58,26 +62,29 @@
 [Protocols]
   gEfiDevicePathProtocolGuid                                            ## SOMETIMES_CONSUMES
   gEfiHiiStringProtocolGuid                                             ## PRODUCES
-  gEfiHiiImageProtocolGuid |gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol                  ## PRODUCES
+  gEfiHiiImageProtocolGuid |gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol  ## SOMETIMES_PRODUCES
   gEfiHiiConfigRoutingProtocolGuid                                      ## PRODUCES
   gEfiHiiDatabaseProtocolGuid                                           ## PRODUCES
   gEfiHiiFontProtocolGuid                                               ## PRODUCES
-  gEfiHiiConfigAccessProtocolGuid                                       ## CONSUMES
+  gEfiHiiConfigAccessProtocolGuid                                       ## SOMETIMES_CONSUMES
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportHiiImageProtocol   ## CONSUMES
 
 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang
+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultPlatformLang ## CONSUMES
 
 [Guids]  
-  gEfiGlobalVariableGuid  ## SOMETIMES_CONSUMES ## Variable:"PlatformLang"
-  ##
+  #
   # Event registered to EFI_HII_SET_KEYBOARD_LAYOUT_EVENT_GUID group,
   # which will be triggered by EFI_HII_DATABASE_PROTOCOL.SetKeyboardLayout().
-  ##
-  gEfiHiiKeyBoardLayoutGuid  ## SOMETIME_CONSUMES  ## Event
+  #
+  ## CONSUMES  ## Event
+  ## PRODUCES  ## Event
+  gEfiHiiKeyBoardLayoutGuid
 
 [Depex]
   TRUE
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  HiiDatabaseExtra.uni

MdeModulePkg/Universal/HiiResourcesSampleDxe/HiiResourcesSampleDxe.inf

@@ -1,8 +1,10 @@
 ## @file
-# This is an example of how a driver retrieve HII data using HII Package List
-# Protocol, and how to publish the HII data.
+#  This is a sample HII resource driver.
 #
-#  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+#  This driver show how a HII driver retrieve HII data using HII Package List protocol
+#  and publish the HII data.
+#
+#  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 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = HiiResourcesSample
+  MODULE_UNI_FILE                = HiiResourcesSample.uni
   FILE_GUID                      = D49D2EB0-44D5-4621-9FD6-1A92C9109B99
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -51,3 +54,7 @@
 
 [Protocols]
   gEfiHiiPackageListProtocolGuid    ## CONSUMES
+  gEfiDevicePathProtocolGuid        ## PRODUCES
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  HiiResourcesSampleExtra.uni

MdeModulePkg/Universal/LegacyRegion2Dxe/LegacyRegion2Dxe.inf

@@ -11,7 +11,7 @@
 #  Protocol. For Lock/UnLock/Decode, EFI_SUCCESS is returned although the region's
 #  attributes were not actually modified.
 #
-# 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
 # which accompanies this distribution.  The full text of the license may be found at
@@ -25,6 +25,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = LegacyRegion2Dxe
+  MODULE_UNI_FILE                = LegacyRegion2Dxe.uni
   FILE_GUID                      = EC2BEECA-E84A-445B-869B-F7A73C96F58A
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0  
@@ -54,3 +55,6 @@
 
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  LegacyRegion2DxeExtra.uni

MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf

@@ -1,12 +1,12 @@
 ## @file
-#  Component description file for LockBox SMM driver.
+#  LockBox SMM driver.
 #
 #  Caution: This module requires additional review when modified.
 #  This driver will have external input - communicate buffer in SMM mode.
 #  This external input must be validated carefully to avoid security issue like
 #  buffer overflow, integer overflow.
 #
-#  Copyright (c) 2010 - 2012, 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
@@ -22,6 +22,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = SmmLockBox
+  MODULE_UNI_FILE                = SmmLockBox.uni
   FILE_GUID                      = 33FB3535-F15E-4c17-B303-5EB94595ECB6
   MODULE_TYPE                    = DXE_SMM_DRIVER
   VERSION_STRING                 = 1.0
@@ -44,7 +45,6 @@
 [LibraryClasses]
   UefiDriverEntryPoint
   UefiBootServicesTableLib
-  UefiRuntimeServicesTableLib
   SmmServicesTableLib
   BaseLib
   BaseMemoryLib
@@ -52,12 +52,15 @@
   LockBoxLib
 
 [Guids]
-  gEfiSmmLockBoxCommunicationGuid    ## PRODUCED
+  gEfiSmmLockBoxCommunicationGuid   ## PRODUCES ## GUID # SmiHandlerRegister
 
 [Protocols]
-  gEfiSmmReadyToLockProtocolGuid     ## CONSUMED
-  gEfiSmmAccess2ProtocolGuid         ## CONSUMED
-  gEfiLockBoxProtocolGuid            ## PRODUCED
+  gEfiSmmReadyToLockProtocolGuid    ## NOTIFY
+  gEfiSmmAccess2ProtocolGuid        ## CONSUMES
+  gEfiLockBoxProtocolGuid           ## PRODUCES
 
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  SmmLockBoxExtra.uni

MdeModulePkg/Universal/MemoryTest/GenericMemoryTestDxe/GenericMemoryTestDxe.inf

@@ -1,10 +1,7 @@
 ## @file
-# Component description file for Generic memory test.
+# This driver first constructs the non-tested memory range, then performs the R/W/V memory test.
 #
-# This driver first constructs the non-tested memory range,
-# then performs the R/W/V memory test.
-#
-# 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 +16,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = GenericMemoryTestDxe
+  MODULE_UNI_FILE                = GenericMemoryTestDxe.uni
   FILE_GUID                      = 9C1080EE-D02E-487f-9432-F3BF086EC180
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -51,9 +49,11 @@
   DebugLib
 
 [Protocols]
-  gEfiCpuArchProtocolGuid                       # PROTOCOL ALWAYS_CONSUMED
-  gEfiGenericMemTestProtocolGuid                # PROTOCOL ALWAYS_PRODUCED
+  gEfiCpuArchProtocolGuid                       ## CONSUMES
+  gEfiGenericMemTestProtocolGuid                ## PRODUCES
 
 [Depex]
   gEfiCpuArchProtocolGuid
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  GenericMemoryTestDxeExtra.uni

MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf

@@ -1,7 +1,7 @@
 ## @file
 #   This driver installs Generic Memory Test Protocol which does not perform real memory test.
 #  
-#  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
@@ -15,6 +15,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = NullMemoryTestDxe
+  MODULE_UNI_FILE                = NullMemoryTestDxe.uni
   FILE_GUID                      = 96B5C032-DF4C-4b6e-8232-438DCF448D0E
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -46,3 +47,6 @@
 
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  NullMemoryTestDxeExtra.uni

MdeModulePkg/Universal/Metronome/Metronome.inf

@@ -11,7 +11,7 @@
 # overflows that could occur for long delays if only nanoseconds were used and also
 # provides the greatest accuracy for small delays. 
 #
-# 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         
 # which accompanies this distribution.  The full text of the license may be found at        
@@ -25,6 +25,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = Metronome
+  MODULE_UNI_FILE                = Metronome.uni
   FILE_GUID                      = C8339973-A563-4561-B858-D8476F9DEFC4
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -54,3 +55,6 @@
 
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  MetronomeExtra.uni

MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

@@ -1,8 +1,7 @@
 ## @file
-# This module produces the UEFI boot service GetNextMonotonicCount()
-# and runtime service GetNextHighMonotonicCount().
+# This module produces the UEFI boot service GetNextMonotonicCount() and runtime service GetNextHighMonotonicCount().
 #
-# 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 +16,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = MonotonicCounterRuntimeDxe
+  MODULE_UNI_FILE                = MonotonicCounterRuntimeDxe.uni
   FILE_GUID                      = AD608272-D07F-4964-801E-7BD3B7888652
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER
   VERSION_STRING                 = 1.0
@@ -45,11 +45,16 @@
   BaseLib
 
 [Guids]
+  ## PRODUCES ## Variable:L"MTC"
+  ## CONSUMES ## Variable:L"MTC"
   gMtcVendorGuid
 
 [Protocols]
-  gEfiMonotonicCounterArchProtocolGuid          ## PRODUCES
+  gEfiMonotonicCounterArchProtocolGuid  ## PRODUCES
 
 
 [Depex]
   gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  MonotonicCounterRuntimeDxeExtra.uni

MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf

@@ -1,12 +1,15 @@
 ## @file
-# Component description file for ARP module
+#  This module produces EFI ARP Protocol and EFI ARP Service Binding Protocol.
 #
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  This module produces EFI ARP Protocol upon EFI MNP Protocol, to provide a generic
+#  implementation of the Address Resolution Protocol that is described in RFCs 826
+#  and 1122.
 #
-#   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.
@@ -17,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = ArpDxe
+  MODULE_UNI_FILE                = ArpDxe.uni
   FILE_GUID                      = 529D3F93-E8E9-4e73-B1E1-BDF6A9D50113
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -55,7 +59,10 @@
   DpcLib
 
 [Protocols]
-  gEfiManagedNetworkServiceBindingProtocolGuid  # PROTOCOL ALWAYS_CONSUMED
-  gEfiArpServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
-  gEfiManagedNetworkProtocolGuid                # PROTOCOL ALWAYS_CONSUMED
-  gEfiArpProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED
+  gEfiArpServiceBindingProtocolGuid             ## BY_START
+  gEfiManagedNetworkServiceBindingProtocolGuid  ## TO_START
+  gEfiArpProtocolGuid                           ## BY_START
+  gEfiManagedNetworkProtocolGuid                ## TO_START
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  ArpDxeExtra.uni

MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf

@@ -1,8 +1,11 @@
 ## @file
-# Component name for module Dhcp4
+#  This module produces EFI DHCPv4 Protocol and EFI DHCPv4 Service Binding Protocol.
 #
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+#  This module produces EFI DHCPv4 Protocol upon EFI UDPv4 Protocol, to provide the
+#  capability to collect configuration information for the EFI IPv4 Protocol drivers
+#  and to provide DHCPv4 server and PXE boot server discovery services.
 #
+#  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
@@ -17,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = Dhcp4Dxe
+  MODULE_UNI_FILE                = Dhcp4Dxe.uni
   FILE_GUID                      = 94734718-0BBC-47fb-96A5-EE7A5AE6A2AD
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -59,8 +63,10 @@
 
 
 [Protocols]
-  gEfiUdp4ServiceBindingProtocolGuid            # PROTOCOL ALWAYS_CONSUMED
-  gEfiDhcp4ServiceBindingProtocolGuid           # PROTOCOL ALWAYS_CONSUMED
-  gEfiUdp4ProtocolGuid                          # PROTOCOL ALWAYS_CONSUMED
-  gEfiDhcp4ProtocolGuid                         # PROTOCOL ALWAYS_CONSUMED
+  gEfiDhcp4ServiceBindingProtocolGuid           ## BY_START
+  gEfiUdp4ServiceBindingProtocolGuid            ## TO_START
+  gEfiDhcp4ProtocolGuid                         ## BY_START
+  gEfiUdp4ProtocolGuid                          ## TO_START
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  Dhcp4DxeExtra.uni

MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf

@@ -1,12 +1,11 @@
 ## @file
-# Component description file for DPC module
+#  This module produces Deferred Procedure Call Protocol.
 #
-# Copyright (c) 2007 - 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) 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.
@@ -17,6 +16,7 @@
 [Defines]
   INF_VERSION               = 0x00010005
   BASE_NAME                 = DpcDxe
+  MODULE_UNI_FILE           = DpcDxe.uni
   FILE_GUID                 = A210F973-229D-4f4d-AA37-9895E6C9EABA
   MODULE_TYPE               = DXE_DRIVER
   VERSION_STRING            = 1.0
@@ -44,7 +44,9 @@
   MemoryAllocationLib
 
 [Protocols]
-  gEfiDpcProtocolGuid                           # PROTOCOL ALWAYS_PRODUCED
+  gEfiDpcProtocolGuid                           ## PRODUCES
 
 [Depex]
-  TRUE
+  TRUE
+[UserExtensions.TianoCore."ExtraFiles"]
+  DpcDxeExtra.uni

MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf

@@ -1,20 +1,26 @@
 ## @file
-#  Component description file for IScsi module.
+#  This module produces EFI iSCSI Initiator Name Protocol.
 #
-# Copyright (c) 2004 - 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
+#  This module produces EFI iSCSI Initiator Name Protocol upon EFI TCPv4 Protocol
+#  and EFI DHCPv4 Protocol, to provide the capability to do the transport for SCSI
+#  data over TCP/IP. It installs EFI HII Configuration Access Protocol to provide
+#  one way to configurate the iSCSI setting.
 #
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  Copyright (c) 2004 - 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.
 #
 ##
 
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = IScsi4Dxe
+  MODULE_UNI_FILE                = IScsi4Dxe.uni
   FILE_GUID                      = 4579B72D-7EC4-4dd4-8486-083C86B182A7
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -81,23 +87,39 @@
   NetLib
 
 [Protocols]
+  ## PRODUCES
+  ## UNDEFINED # Variable
   gEfiIScsiInitiatorNameProtocolGuid
-  gEfiTcp4ProtocolGuid
-  gEfiExtScsiPassThruProtocolGuid
+  gEfiExtScsiPassThruProtocolGuid               ## BY_START
+  gEfiTcp4ProtocolGuid                          ## TO_START
+  gEfiTcp4ServiceBindingProtocolGuid            ## TO_START
+  gEfiDhcp4ProtocolGuid                         ## TO_START
+  gEfiDhcp4ServiceBindingProtocolGuid           ## TO_START
+  ## TO_START
+  ## PRODUCES
   gEfiDevicePathProtocolGuid
-  gEfiTcp4ServiceBindingProtocolGuid
-  gEfiHiiDatabaseProtocolGuid
-  gEfiHiiConfigAccessProtocolGuid
-  gEfiPciIoProtocolGuid
-  gEfiAcpiTableProtocolGuid
-  gEfiDhcp4ProtocolGuid
-  gEfiDhcp4ServiceBindingProtocolGuid
+  gEfiHiiConfigAccessProtocolGuid               ## PRODUCES
+  gEfiHiiDatabaseProtocolGuid                   ## CONSUMES
+  gEfiPciIoProtocolGuid                         ## SOMETIMES_CONSUMES
+  gEfiAcpiTableProtocolGuid                     ## SOMETIMES_CONSUMES
 
 [Guids]
-  gEfiEventExitBootServicesGuid
-  gEfiIfrTianoGuid                              ## CONSUMES ## GUID
-  gEfiAcpiTableGuid                             ## CONSUMES ## GUID
-  gEfiAcpi10TableGuid                           ## CONSUMES ## GUID
-  gEfiAcpi20TableGuid                           ## CONSUMES ## GUID
-  gIp4IScsiConfigGuid                           ## PRODUCES ## GUID
-  gIScsiCHAPAuthInfoGuid
+  gEfiEventExitBootServicesGuid                 ## SOMETIMES_CONSUMES ## Event
+  gEfiIfrTianoGuid                              ## SOMETIMES_PRODUCES ## UNDEFINED
+  gEfiAcpiTableGuid                             ## SOMETIMES_CONSUMES ## SystemTable
+  gEfiAcpi10TableGuid                           ## SOMETIMES_CONSUMES ## SystemTable
+  gEfiAcpi20TableGuid                           ## SOMETIMES_CONSUMES ## SystemTable
+  ## SOMETIMES_PRODUCES ## Variable:L"iSCSIDeviceList"
+  ## SOMETIMES_CONSUMES ## Variable:L"iSCSIDeviceList"
+  ## SOMETIMES_CONSUMES ## UNDEFINED # HiiIsConfigHdrMatch   mVendorStorageName
+  ## SOMETIMES_PRODUCES ## UNDEFINED # HiiConstructConfigHdr mVendorStorageName
+  ## SOMETIMES_PRODUCES ## UNDEFINED # HiiGetBrowserData     mVendorStorageName
+  ## SOMETIMES_CONSUMES ## UNDEFINED # HiiSetBrowserData     mVendorStorageName
+  ## SOMETIMES_CONSUMES ## HII
+  gIp4IScsiConfigGuid
+  ## SOMETIMES_PRODUCES ## Variable
+  ## SOMETIMES_CONSUMES ## Variable
+  gIScsiCHAPAuthInfoGuid
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  IScsi4DxeExtra.uni

MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf

@@ -1,8 +1,12 @@
 ## @file
-# Component name for module Ip4Config
+#  This module produces EFI IPv4 Configuration Protocol.
 #
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+#  This module produces EFI IPv4 Configuration Protocol upon EFI MNP Protocol,
+#  to performs platform- and policy-dependent configuration for the EFI IPv4
+#  Protocol driver. It installs EFI HII Configuration Access Protocol to provide
+#  one way to configurate the IPv4 network setting.
 #
+#  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
@@ -17,6 +21,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = Ip4ConfigDxe
+  MODULE_UNI_FILE                = Ip4ConfigDxe.uni
   FILE_GUID                      = 26841BDE-920A-4e7a-9FBE-637F477143A6
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -56,15 +61,31 @@
   HiiLib
   PrintLib
   DpcLib
+  DevicePathLib
 
 [Protocols]
-  gEfiDhcp4ServiceBindingProtocolGuid           # PROTOCOL ALWAYS_CONSUMED
-  gEfiManagedNetworkServiceBindingProtocolGuid  # PROTOCOL ALWAYS_CONSUMED
-  gEfiIp4ConfigProtocolGuid                     # PROTOCOL ALWAYS_PRODUCED
-  gEfiManagedNetworkProtocolGuid                # PROTOCOL ALWAYS_CONSUMED
-  gEfiDhcp4ProtocolGuid                         # PROTOCOL ALWAYS_CONSUMED
-  gEfiHiiConfigAccessProtocolGuid               # PROTOCOL ALWAYS_CONSUMED
+  gEfiIp4ConfigProtocolGuid                     ## BY_START
+  gEfiManagedNetworkServiceBindingProtocolGuid  ## TO_START
+  gEfiManagedNetworkProtocolGuid                ## TO_START
+  gEfiDhcp4ServiceBindingProtocolGuid           ## TO_START
+  gEfiDhcp4ProtocolGuid                         ## TO_START
+  gEfiHiiConfigAccessProtocolGuid               ## BY_START
+  ## TO_START
+  ## BY_START
+  gEfiDevicePathProtocolGuid
 
 [Guids]
-  gEfiNicIp4ConfigVariableGuid                  ## CONSUMES ## Guid
-  gNicIp4ConfigNvDataGuid                       ## PRODUCES ## Guid
+  ## SOMETIMES_CONSUMES ## GUID # HiiIsConfigHdrMatch   EFI_NIC_IP4_CONFIG_VARIABLE
+  ## SOMETIMES_PRODUCES ## GUID # HiiConstructConfigHdr EFI_NIC_IP4_CONFIG_VARIABLE
+  ## SOMETIMES_PRODUCES ## Variable
+  ## SOMETIMES_CONSUMES ## Variable
+  ## SOMETIMES_PRODUCES ## GUID # Device Path Node
+  gEfiNicIp4ConfigVariableGuid
+  ## SOMETIMES_CONSUMES ## GUID # HiiIsConfigHdrMatch   EFI_NIC_IP4_CONFIG_VARIABLE
+  ## SOMETIMES_PRODUCES ## GUID # HiiConstructConfigHdr EFI_NIC_IP4_CONFIG_VARIABLE
+  ## SOMETIMES_PRODUCES ## GUID # HiiGetBrowserData     EFI_NIC_IP4_CONFIG_VARIABLE
+  ## SOMETIMES_CONSUMES ## HII
+  gNicIp4ConfigNvDataGuid
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  Ip4ConfigDxeExtra.uni

MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf

@@ -1,8 +1,12 @@
 ## @file
-# Component name for module Ip4
+#  This module produces EFI IPv4 Protocol and EFI IPv4 Service Binding Protocol.
 #
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+#  This module produces EFI IPv4 Protocol upon EFI MNP Protocol and EFI ARP Protocol,
+#  to provide basic network IPv4 packet I/O services, which includes support for a
+#  subset of the Internet Control Message Protocol (ICMP) and may include support for
+#  the Internet Group Management Protocol (IGMP).
 #
+#  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
@@ -17,6 +21,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = Ip4Dxe
+  MODULE_UNI_FILE                = Ip4Dxe.uni
   FILE_GUID                      = 9FB1A1F3-3B71-4324-B39A-745CBB015FFF
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0 
@@ -73,12 +78,16 @@
   DpcLib
 
 [Protocols]
-  gEfiIp4ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED
-  gEfiManagedNetworkServiceBindingProtocolGuid  # PROTOCOL ALWAYS_CONSUMED
-  gEfiIp4ConfigProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED
-  gEfiArpServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
-  gEfiIp4ServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
-  gEfiManagedNetworkProtocolGuid                # PROTOCOL ALWAYS_CONSUMED
-  gEfiArpProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED
-  gEfiIpSec2ProtocolGuid                        # PROTOCOL ALWAYS_CONSUMED
-  
+  ## BY_START
+  ## UNDEFINED # variable
+  gEfiIp4ServiceBindingProtocolGuid
+  gEfiIp4ProtocolGuid                           ## BY_START
+  gEfiManagedNetworkServiceBindingProtocolGuid  ## TO_START
+  gEfiManagedNetworkProtocolGuid                ## TO_START
+  gEfiArpServiceBindingProtocolGuid             ## TO_START
+  gEfiIp4ConfigProtocolGuid                     ## TO_START
+  gEfiArpProtocolGuid                           ## TO_START
+  gEfiIpSec2ProtocolGuid                        ## SOMETIMES_CONSUMES
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  Ip4DxeExtra.uni

MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf

@@ -1,7 +1,11 @@
 ## @file
-#  Component description file for Mnp module.
+#  This module produces EFI MNP Protocol, EFI MNP Servie Binding Protocol and EFI VLAN Protocol.
 #
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  This module produces EFI Managed Network Protocol upon EFI Simple Network Protocol,
+#  to provide raw asynchronous network I/O services. It also produces EFI VLAN Protocol
+#  to provide manageability interface for VLAN configuration. 
+#
+#  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
@@ -15,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = MnpDxe
+  MODULE_UNI_FILE                = MnpDxe.uni
   FILE_GUID                      = 025BBFC7-E6A9-4b8b-82AD-6815A1AEAF4A
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -58,7 +63,12 @@
   DpcLib
 
 [Protocols]
-  gEfiManagedNetworkServiceBindingProtocolGuid  ## PRODUCES
-  gEfiSimpleNetworkProtocolGuid                 ## CONSUMES
-  gEfiManagedNetworkProtocolGuid                ## PRODUCES
-  gEfiVlanConfigProtocolGuid                    ## SOMETIMES_PRODUCES
+  gEfiManagedNetworkServiceBindingProtocolGuid  ## BY_START
+  gEfiSimpleNetworkProtocolGuid                 ## TO_START
+  gEfiManagedNetworkProtocolGuid                ## BY_START
+  ## BY_START
+  ## UNDEFINED # variable
+  gEfiVlanConfigProtocolGuid
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  MnpDxeExtra.uni

MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf

@@ -1,8 +1,10 @@
 ## @file
-# Component name for module Mtftp4
+#  This module produces EFI MTFTPv4 Protocol and EFI MTFTPv4 Service Binding Protocol.
 #
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+#  This module produces EFI MTFTPv4 Protocol upon EFI UDPv4 Protocol, to provide
+#  basic services for client-side unicast and/or multicase TFTP operations.
 #
+#  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
@@ -17,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = Mtftp4Dxe
+  MODULE_UNI_FILE                = Mtftp4Dxe.uni
   FILE_GUID                      = DC3641B8-2FA8-4ed3-BC1F-F9962A03454B
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -63,8 +66,10 @@
 
 
 [Protocols]
-  gEfiMtftp4ServiceBindingProtocolGuid          # PROTOCOL ALWAYS_CONSUMED
-  gEfiMtftp4ProtocolGuid                        # PROTOCOL ALWAYS_CONSUMED
-  gEfiUdp4ServiceBindingProtocolGuid            # PROTOCOL ALWAYS_CONSUMED
-  gEfiUdp4ProtocolGuid                          # PROTOCOL ALWAYS_CONSUMED
+  gEfiMtftp4ServiceBindingProtocolGuid          ## BY_START
+  gEfiUdp4ServiceBindingProtocolGuid            ## TO_START
+  gEfiMtftp4ProtocolGuid                        ## BY_START
+  gEfiUdp4ProtocolGuid                          ## TO_START
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  Mtftp4DxeExtra.uni

MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf

@@ -1,20 +1,24 @@
 ## @file
-#    Component description file for SNP module.
+#  This module produces EFI SNP Protocol.
 #
-# 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 
+#  This module produces Simple Network Protocol upon EFI Network Interface 
+#  Identifier Protocol, to provide a packet level interface to a network adapter.
 #
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  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.
 #
 ##
 
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = SnpDxe
+  MODULE_UNI_FILE                = SnpDxe.uni
   FILE_GUID                      = A2f436EA-A127-4EF8-957C-8048606FF670
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -67,11 +71,13 @@
   NetLib
 
 [Guids]
-  gEfiEventExitBootServicesGuid                 ## CONSUMES
-
+  gEfiEventExitBootServicesGuid                 ## SOMETIMES_CONSUMES ## Event
 
 [Protocols]
-  gEfiPciIoProtocolGuid                         # PROTOCOL ALWAYS_CONSUMED
-  gEfiSimpleNetworkProtocolGuid                 # PROTOCOL ALWAYS_CONSUMED
-  gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED
-  gEfiNetworkInterfaceIdentifierProtocolGuid_31 # PROTOCOL ALWAYS_CONSUMED
+  gEfiSimpleNetworkProtocolGuid                 ## BY_START
+  gEfiDevicePathProtocolGuid                    ## TO_START
+  gEfiNetworkInterfaceIdentifierProtocolGuid_31 ## TO_START
+  gEfiPciIoProtocolGuid                         ## TO_START
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  SnpDxeExtra.uni

MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf

@@ -1,9 +1,10 @@
 ## @file
-# Component name for module Tcp4
+#  This module produces EFI TCPv4 Protocol and EFI TCPv4 Service Binding Protocol.
 #
-# FIX ME!
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+#  This module produces EFI TCPv4(Transmission Control Protocol version 4) Protocol
+#  upon EFI IPv4 Protocol, to provide basic TCPv4 I/O services.
 #
+#  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
@@ -18,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = Tcp4Dxe
+  MODULE_UNI_FILE                = Tcp4Dxe.uni
   FILE_GUID                      = 6d6963ab-906d-4a65-a7ca-bd40e5d6af4d
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -73,8 +75,10 @@
   DpcLib
 
 [Protocols]
-  gEfiIp4ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED
-  gEfiTcp4ServiceBindingProtocolGuid            # PROTOCOL ALWAYS_PRODUCED
-  gEfiIp4ServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
-  gEfiTcp4ProtocolGuid                          # PROTOCOL SOMETIMES_PRODUCED
-  
+  gEfiTcp4ServiceBindingProtocolGuid            ## BY_START
+  gEfiIp4ServiceBindingProtocolGuid             ## TO_START
+  gEfiTcp4ProtocolGuid                          ## BY_START
+  gEfiIp4ProtocolGuid                           ## TO_START
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  Tcp4DxeExtra.uni

MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf

@@ -1,9 +1,10 @@
 ## @file
-# Component name for module Udp4
+#  This module produces EFI UDP Protocol and EFI UDPv4 Service Binding Protocol.
 #
-# FIX ME!
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  This module produces EFI UDP(User Datagram Protocol) Protocol upon EFI IPv4
+#  Protocol, to provide basic UDPv4 I/O services.
 #
+#  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
@@ -18,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = Udp4Dxe
+  MODULE_UNI_FILE                = Udp4Dxe.uni
   FILE_GUID                      = 6d6963ab-906d-4a65-a7ca-bd40e5d6af2b
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -59,8 +61,10 @@
   DpcLib
 
 [Protocols]
-  gEfiIp4ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED
-  gEfiUdp4ServiceBindingProtocolGuid            # PROTOCOL ALWAYS_CONSUMED
-  gEfiIp4ServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
-  gEfiUdp4ProtocolGuid                          # PROTOCOL ALWAYS_CONSUMED
-  
+  gEfiUdp4ServiceBindingProtocolGuid            ## BY_START
+  gEfiIp4ServiceBindingProtocolGuid             ## TO_START
+  gEfiUdp4ProtocolGuid                          ## BY_START
+  gEfiIp4ProtocolGuid                           ## TO_START
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  Udp4DxeExtra.uni

MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf

@@ -1,8 +1,12 @@
 ## @file
-# Component name for module UefiPxeBc
+#  This module produces EFI Preboot Execution Environment (PXE) Base Code Protocol.
 #
-# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+#  This module produces EFI PXE Base Code Protocol upon EFI MMP Protocl and IPv4
+#  network stack, used to control PXE-compatible devices. It produces EFI Load File
+#  Protocol to provide one clean way to otain control from the boot manager if the
+#  boot patch is from the remote device.
 #
+#  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
@@ -18,6 +22,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = UefiPxe4BcDxe
+  MODULE_UNI_FILE                = UefiPxe4BcDxe.uni
   FILE_GUID                      = 3B1DEAB5-C75D-442e-9238-8E2FFB62B0BB
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -52,8 +57,6 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
 
-
-
 [LibraryClasses]
   BaseLib
   UefiLib
@@ -67,20 +70,23 @@
   PcdLib
 
 [Protocols]
-  gEfiArpServiceBindingProtocolGuid                # PROTOCOL ALWAYS_CONSUMED
-  gEfiArpProtocolGuid                              # PROTOCOL ALWAYS_CONSUMED
-  gEfiMtftp4ServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED
-  gEfiMtftp4ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED
-  gEfiUdp4ServiceBindingProtocolGuid               # PROTOCOL ALWAYS_CONSUMED
-  gEfiDhcp4ServiceBindingProtocolGuid              # PROTOCOL ALWAYS_CONSUMED
-  gEfiPxeBaseCodeCallbackProtocolGuid              # PROTOCOL ALWAYS_PRODUCED
-  gEfiPxeBaseCodeProtocolGuid                      # PROTOCOL ALWAYS_PRODUCED
-  gEfiLoadFileProtocolGuid                         # PROTOCOL ALWAYS_PRODUCED
-  gEfiDhcp4ProtocolGuid                            # PROTOCOL ALWAYS_CONSUMED
-  gEfiUdp4ProtocolGuid                             # PROTOCOL ALWAYS_CONSUMED
+  gEfiPxeBaseCodeCallbackProtocolGuid              ## SOMETIMES_PRODUCES
+  gEfiPxeBaseCodeProtocolGuid                      ## BY_START
+  gEfiLoadFileProtocolGuid                         ## BY_START
   gEfiNetworkInterfaceIdentifierProtocolGuid_31    ## SOMETIMES_CONSUMES
-  gEfiIp4ServiceBindingProtocolGuid                # PROTOCOL ALWAYS_CONSUMED
-  gEfiIp4ProtocolGuid                              # PROTOCOL ALWAYS_CONSUMED
+  gEfiArpServiceBindingProtocolGuid                ## TO_START
+  gEfiArpProtocolGuid                              ## TO_START
+  gEfiMtftp4ServiceBindingProtocolGuid             ## TO_START
+  gEfiMtftp4ProtocolGuid                           ## TO_START
+  gEfiUdp4ServiceBindingProtocolGuid               ## TO_START
+  gEfiUdp4ProtocolGuid                             ## TO_START
+  gEfiDhcp4ServiceBindingProtocolGuid              ## TO_START
+  gEfiDhcp4ProtocolGuid                            ## TO_START
+  gEfiIp4ServiceBindingProtocolGuid                ## TO_START
+  gEfiIp4ProtocolGuid                              ## TO_START
 
 [Pcd]  
-  gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize     ## CONSUMES  
+  gEfiMdeModulePkgTokenSpaceGuid.PcdTftpBlockSize  ## SOMETIMES_CONSUMES  
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  UefiPxe4BcDxeExtra.uni

MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf

@@ -1,7 +1,10 @@
 ## @file
-#  Component description file for VLAN configuration module.
+#  This module provides one way to configurate VALN setting.
 #
-#  Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<BR>
+#  This module produces EFI HII Configuration Access Protocol to provide one way to
+#  configurate VALN setting
+#
+#  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
 #  which accompanies this distribution. The full text of the license may be found at
@@ -15,6 +18,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = VlanConfigDxe
+  MODULE_UNI_FILE                = VlanConfigDxe.uni
   FILE_GUID                      = E4F61863-FE2C-4b56-A8F4-08519BC439DF
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
@@ -51,10 +55,18 @@
   HiiLib
 
 [Guids]
-  gEfiIfrTianoGuid
+  gEfiIfrTianoGuid                              ## SOMETIMES_PRODUCES ## UNDEFINED
+  ## SOMETIMES_CONSUMES ## UNDEFINED # HiiIsConfigHdrMatch   mVlanStorageName
+  ## SOMETIMES_PRODUCES ## UNDEFINED # HiiConstructConfigHdr mVlanStorageName
+  ## SOMETIMES_PRODUCES ## UNDEFINED # HiiGetBrowserData     mVlanStorageName
+  ## SOMETIMES_CONSUMES ## UNDEFINED # HiiSetBrowserData     mVlanStorageName
+  ## SOMETIMES_CONSUMES ## HII
   gVlanConfigFormSetGuid
 
 [Protocols]
-  gEfiHiiConfigAccessProtocolGuid               ## PRODUCES
+  gEfiHiiConfigAccessProtocolGuid               ## BY_START
   gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES
-  gEfiVlanConfigProtocolGuid                    ## CONSUMES
+  gEfiVlanConfigProtocolGuid                    ## TO_START
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  VlanConfigDxeExtra.uni

MdeModulePkg/Universal/PCD/Dxe/Pcd.inf

@@ -279,7 +279,7 @@
 #            - Variable GUID for HII type PCD
 #            - Token space GUID for dynamicex type PCD 
 #    
-#  Copyright (c) 2006 - 2013, 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
@@ -294,6 +294,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PcdDxe
+  MODULE_UNI_FILE                = PcdDxe.uni
   FILE_GUID                      = 80CF7257-87AB-47f9-A3FE-D50B76D89541
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 4.0
@@ -330,7 +331,7 @@
 
 [Guids]
   gPcdDataBaseHobGuid                           ## SOMETIMES_CONSUMES  ## HOB
-  gPcdDataBaseSignatureGuid                     ## CONSUMES  ## UNDEFINED  # PCD database signature GUID.
+  gPcdDataBaseSignatureGuid                     ## CONSUMES  ## GUID  # PCD database signature GUID.
 
 [Protocols]
   gPcdProtocolGuid                              ## PRODUCES
@@ -344,3 +345,5 @@
 [Depex]
   TRUE
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  PcdDxeExtra.uni

MdeModulePkg/Universal/PCD/Pei/Pcd.inf

@@ -278,7 +278,7 @@
 #            - Variable GUID for HII type PCD
 #            - Token space GUID for dynamicex type PCD 
 #    
-#  Copyright (c) 2006 - 2013, 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
@@ -293,6 +293,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PcdPeim
+  MODULE_UNI_FILE                = PcdPeim.uni
   FILE_GUID                      = 9B3ADA4F-AE56-4c24-8DEA-F03B7558AE50
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 4.0
@@ -328,7 +329,7 @@
   ## PRODUCES            ## HOB
   ## SOMETIMES_CONSUMES  ## HOB
   gPcdDataBaseHobGuid                           
-  gPcdDataBaseSignatureGuid                     ## CONSUMES  ## UNDEFINED  # PCD database signature GUID.
+  gPcdDataBaseSignatureGuid                     ## CONSUMES  ## GUID  # PCD database signature GUID.
 
 [Ppis]
   gEfiPeiReadOnlyVariable2PpiGuid               ## SOMETIMES_CONSUMES
@@ -347,3 +348,5 @@
 [Depex]
   TRUE
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  PcdPeimExtra.uni

MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf

@@ -1,9 +1,10 @@
 ## @file
-#  This driver installs Single Segment Pci Configuration 2 PPI 
-#  to provide read, write and modify access to Pci configuration space in PEI phase. 
+#  Pcat SingleSegmentPciCfg2Pei Pei Module.
+#
+#  It installs SingleSegmentPciConfiguration2 PPI to provide read, write and modify access to Pci configuration space in PEI phase.
 #  To follow PI specification, these services also support access to the unaligned Pci address.
 #
-#  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
@@ -18,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PcatSingleSegmentPciCfg2Pei
+  MODULE_UNI_FILE                = PcatSingleSegmentPciCfg2Pei.uni
   FILE_GUID                      = 4F1F379F-2A62-48bb-AC34-D3F135C6E2B7
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
@@ -44,7 +46,10 @@
   PeiServicesLib
 
 [Ppis]
-  gEfiPciCfg2PpiGuid                   ## PRODUCED
+  gEfiPciCfg2PpiGuid                   ## PRODUCES
 
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  PcatSingleSegmentPciCfg2PeiExtra.uni

MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.inf

@@ -33,6 +33,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PlatDriOverrideDxe
+  MODULE_UNI_FILE                = PlatDriOverrideDxe.uni
   FILE_GUID                      = 35034CE2-A6E5-4fb4-BABE-A0156E9B2549
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -72,32 +73,43 @@
   PrintLib 
    
 [Guids]
-  ##  This GUID C Name is not required for build since it is from UefiLib and not directly used by this module source.
-  ##  gEfiGlobalVariableGuid                      ## SOMETIMES_CONSUMED ## Variable:L"PlatformLang" this variable specifies the platform supported language string (RFC 4646 format)
-  ##  gEfiGlobalVariableGuid                      ## SOMETIMES_CONSUMED ## Variable:L"Lang" this variable specifies the platform supported language string (ISO 639-2 format)
-  ##
-  # There could be more than one variables, from PlatDriOver, PlatDriOver1, PlatDriOver2,...
   #
-  # gEfiCallerIdGuid                            ## Private  ## Variable:L"PlatDriOver"
-  gEfiIfrTianoGuid                              ## CONSUMES ## Guid
-  gPlatformOverridesManagerGuid                 ## PRODUCES ## Guid
+  # This GUID C Name is not required for build since it is from UefiLib and not directly used by this module source.
+  #  gEfiGlobalVariableGuid                     ## SOMETIMES_CONSUMES   ## Variable:L"PlatformLang" # this variable specifies the platform supported language string (RFC 4646 format)
+  #  gEfiGlobalVariableGuid                     ## SOMETIMES_CONSUMES   ## Variable:L"Lang" # this variable specifies the platform supported language string (ISO 639-2 format)
+  #
+  # There could be more than one variables, from PlatDriOver, PlatDriOver1, PlatDriOver2,...
+  #  gEfiCallerIdGuid                           ## Private  ## Variable:L"PlatDriOver"
+  #
+  gEfiIfrTianoGuid                              ## SOMETIMES_PRODUCES   ## UNDEFINED
+  ## SOMETIMES_CONSUMES ## GUID # HiiIsConfigHdrMatch Data
+  ## SOMETIMES_PRODUCES ## GUID # HiiGetBrowserData Data
+  ## SOMETIMES_CONSUMES ## GUID # HiiSetBrowserData Data
+  ## SOMETIMES_PRODUCES ## GUID # HiiConstructConfigHdr Data
+  ## CONSUMES           ## HII
+  gPlatformOverridesManagerGuid
 
 [Protocols]
-  gEfiComponentName2ProtocolGuid                ## SOMETIMES_CONSUMED (Get Driver Name if ComponentName2Protocol exists)
-  gEfiComponentNameProtocolGuid                 ## SOMETIMES_CONSUMED (Get Driver Name if ComponentNameProtocol exists and ComponentName2Protocol doesn't exist)
-  gEfiFirmwareVolume2ProtocolGuid               ## SOMETIMES_CONSUMED (Get Driver Name from EFI UI section if ComponentName2Protocol and ComponentNameProtocol don't exist)
-  gEfiPciIoProtocolGuid                         ## SOMETIMES_CONSUMED (Find the PCI device if PciIo protocol is installed)
-  gEfiBusSpecificDriverOverrideProtocolGuid     ## SOMETIMES_CONSUMED (Check whether the PCI device contains one or more efi drivers in its option rom by this protocol) 
+  gEfiComponentName2ProtocolGuid                ## SOMETIMES_CONSUMES # Get Driver Name if ComponentName2Protocol exists
+  gEfiComponentNameProtocolGuid                 ## SOMETIMES_CONSUMES # Get Driver Name if ComponentNameProtocol exists and ComponentName2Protocol doesn't exist
+  gEfiFirmwareVolume2ProtocolGuid               ## SOMETIMES_CONSUMES # Get Driver Name from EFI UI section if ComponentName2Protocol and ComponentNameProtocol don't exist
+  gEfiPciIoProtocolGuid                         ## SOMETIMES_CONSUMES # Find the PCI device if PciIo protocol is installed
+  gEfiBusSpecificDriverOverrideProtocolGuid     ## SOMETIMES_CONSUMES # Check whether the PCI device contains one or more efi drivers in its option rom by this protocol
 
-  gEfiDriverBindingProtocolGuid                 ## SOMETIMES_CONSUMED
-  gEfiLoadedImageProtocolGuid                   ## SOMETIMES_CONSUMED
-  gEfiLoadedImageDevicePathProtocolGuid         ## SOMETIMES_CONSUMED (Show the drivers in the second page that support DriverBindingProtocol, LoadedImageProtocol and LoadedImageDevicePathProtocol)
-  gEfiDevicePathProtocolGuid                    ## SOMETIMES_CONSUMED (Show the controller device in the first page that support DevicePathProtocol)
+  gEfiDriverBindingProtocolGuid                 ## SOMETIMES_CONSUMES
+  gEfiLoadedImageProtocolGuid                   ## SOMETIMES_CONSUMES
+  gEfiLoadedImageDevicePathProtocolGuid         ## SOMETIMES_CONSUMES # Show the drivers in the second page that support DriverBindingProtocol, LoadedImageProtocol and LoadedImageDevicePathProtocol
 
-  gEfiFormBrowser2ProtocolGuid                  ## CONSUMED
-  gEfiHiiConfigRoutingProtocolGuid              ## CONSUMED
-  gEfiHiiConfigAccessProtocolGuid               ## PRODUCED
-  gEfiPlatformDriverOverrideProtocolGuid        ## PRODUCED
+  gEfiFormBrowser2ProtocolGuid                  ## CONSUMES
+  gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES
+  gEfiHiiConfigAccessProtocolGuid               ## PRODUCES
+  gEfiPlatformDriverOverrideProtocolGuid        ## PRODUCES
+  ## PRODUCES
+  ## SOMETIMES_CONSUMES # Show the controller device in the first page that support DevicePathProtocol
+  gEfiDevicePathProtocolGuid
 
 [Depex]
-  gEfiFormBrowser2ProtocolGuid AND gEfiHiiConfigRoutingProtocolGuid
+  gEfiFormBrowser2ProtocolGuid AND gEfiHiiConfigRoutingProtocolGuid
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  PlatDriOverrideDxeExtra.uni

MdeModulePkg/Universal/PrintDxe/PrintDxe.inf

@@ -3,7 +3,7 @@
 #
 #  This driver produces Print2 protocol layered on top of the PrintLib from the MdePkg.
 #
-#  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
 #  which accompanies this distribution.  The full text of the license may be found at
@@ -17,6 +17,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PrintDxe
+  MODULE_UNI_FILE                = PrintDxe.uni
   FILE_GUID                      = 79E4A61C-ED73-4312-94FE-E3E7563362A9
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -46,3 +47,6 @@
 
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  PrintDxeExtra.uni

MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf

@@ -1,7 +1,7 @@
 ## @file
 #  Report Status Code Router PEIM which produces Report Stataus Code Handler PPI and Status Code PPI.
 #
-#  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
@@ -16,6 +16,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = ReportStatusCodeRouterPei
+  MODULE_UNI_FILE                = ReportStatusCodeRouterPei.uni
   FILE_GUID                      = A3610442-E69F-4DF3-82CA-2360C4031A23
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
@@ -43,7 +44,9 @@
   HobLib
 
 [Guids]
-  gStatusCodeCallbackGuid                       ## CONSUMES ## HOB
+  ## PRODUCES ## HOB
+  ## CONSUMES ## HOB
+  gStatusCodeCallbackGuid
 
 [Ppis]
   gEfiPeiRscHandlerPpiGuid                      ## PRODUCES
@@ -52,3 +55,6 @@
 
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  ReportStatusCodeRouterPeiExtra.uni

MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf

@@ -1,8 +1,7 @@
 ## @file
-#  Report Status Code Router Driver which produces Report Stataus Code Handler Protocol
-#  and Status Code Runtime Protocol.
+#  Report Status Code Router Driver which produces Report Stataus Code Handler Protocol and Status Code Runtime Protocol.
 #
-#  Copyright (c) 2009 - 2012, 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                      = ReportStatusCodeRouterRuntimeDxe
+  MODULE_UNI_FILE                = ReportStatusCodeRouterRuntimeDxe.uni
   FILE_GUID                      = D93CE3D8-A7EB-4730-8C8E-CC466A9ECC3C
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER
   VERSION_STRING                 = 1.0  
@@ -58,3 +58,6 @@
 
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  ReportStatusCodeRouterRuntimeDxeExtra.uni

MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf

@@ -1,8 +1,7 @@
 ## @file
-#  Report Status Code Router Driver which produces Report Stataus Code Handler Protocol
-#  and Status Code Runtime Protocol.
+#  Report Status Code Router Driver which produces SMM Report Stataus Code Handler Protocol and SMM Status Code Protocol.
 #
-#  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                      = ReportStatusCodeRouterSmm
+  MODULE_UNI_FILE                = ReportStatusCodeRouterSmm.uni
   FILE_GUID                      = A6885402-D022-4b0e-A509-4711B90F2A39
   MODULE_TYPE                    = DXE_SMM_DRIVER
   PI_SPECIFICATION_VERSION       = 0x0001000A
@@ -51,3 +51,6 @@
 
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  ReportStatusCodeRouterSmmExtra.uni

MdeModulePkg/Universal/ResetSystemRuntimeDxe/ResetSystemRuntimeDxe.inf

@@ -1,9 +1,7 @@
 ## @file
-# Component description file for ResetSystem module.
-#
 # This driver implements Reset Architectural Protocol.
 #
-# 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
@@ -18,6 +16,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = ResetSystemRuntimeDxe
+  MODULE_UNI_FILE                = ResetSystemRuntimeDxe.uni
   FILE_GUID                      = 4B28E4C7-FF36-4e10-93CF-A82159E777C5
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER
   VERSION_STRING                 = 1.0
@@ -52,13 +51,15 @@
 
 
 [Guids]
-  gEfiCapsuleVendorGuid                         # ALWAYS_CONSUMED
+  gEfiCapsuleVendorGuid                         ## SOMETIMES_CONSUMES   ## Variable:L"CapsuleUpdateData"
 
 
 [Protocols]
-  gEfiResetArchProtocolGuid                     # PROTOCOL ALWAYS_PRODUCED
+  gEfiResetArchProtocolGuid                     ## PRODUCES
 
 
 [Depex]
   TRUE
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  ResetSystemRuntimeDxeExtra.uni

MdeModulePkg/Universal/SectionExtractionDxe/SectionExtractionDxe.inf

@@ -19,7 +19,7 @@
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
   ENTRY_POINT                    = SectionExtractionDxeEntry
-  MODULE_UNI_FILE                = SectionExtractionDxeModStrs.uni
+  MODULE_UNI_FILE                = SectionExtractionDxe.uni
 
 #
 # The following information is for reference only and not required by the build tools.

MdeModulePkg/Universal/SectionExtractionPei/SectionExtractionPei.inf

@@ -21,7 +21,7 @@
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
   ENTRY_POINT                    = SectionExtractionPeiEntry
-  MODULE_UNI_FILE                = SectionExtractionPeiModStrs.uni
+  MODULE_UNI_FILE                = SectionExtractionPei.uni
 
 #
 # The following information is for reference only and not required by the build tools.

MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf

@@ -1,8 +1,7 @@
 ## @file
-#  This driver produces security2 and security architectural protocol 
-#  based on SecurityManagementLib.
+#  This driver produces security2 and security architectural protocol based on SecurityManagementLib.
 #
-#  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
@@ -17,6 +16,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = SecurityStubDxe
+  MODULE_UNI_FILE                = SecurityStubDxe.uni
   FILE_GUID                      = F80697E9-7FD6-4665-8646-88E33EF71DFC
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -46,4 +46,6 @@
 
 [Depex]
   TRUE
-  
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  SecurityStubDxeExtra.uni

MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf

@@ -1,7 +1,9 @@
 ## @file
-# The DXE driver produces FORM BROWSER protocols defined in UEFI HII 2.1 specificatin.
+# The DXE driver produces FORM BROWSER2 protocol defined in UEFI specification.
 #
-# Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
+# It also produces FormBrowserEx(2) protocol to let user register the different Hot key service. 
+#
+# 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
@@ -17,6 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = SetupBrowser
+  MODULE_UNI_FILE                = SetupBrowser.uni
   FILE_GUID                      = EBf342FE-B1D3-4EF8-957C-8048606FF671
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 2.0
@@ -55,21 +58,23 @@
   UefiLib
 
 [Guids]
-  gEfiIfrFrameworkGuid                          ## CONSUMES  ## GUID
-  gEfiHiiPlatformSetupFormsetGuid
-  gEfiHiiStandardFormGuid                       ## SOMETIMES_CONSUMES ## GUID
+  gEfiIfrFrameworkGuid                          ## SOMETIMES_CONSUMES  ## GUID
+  gEfiHiiPlatformSetupFormsetGuid               ## SOMETIMES_CONSUMES  ## GUID
+  gEfiHiiStandardFormGuid                       ## SOMETIMES_CONSUMES  ## GUID
 
 [Protocols]
-  gEfiHiiConfigAccessProtocolGuid               ## CONSUMES
+  gEfiHiiConfigAccessProtocolGuid               ## SOMETIMES_CONSUMES
   gEfiFormBrowser2ProtocolGuid                  ## PRODUCES
   gEdkiiFormBrowserEx2ProtocolGuid              ## PRODUCES
   gEfiHiiConfigRoutingProtocolGuid              ## CONSUMES
   gEfiHiiDatabaseProtocolGuid                   ## CONSUMES
-  gEfiUnicodeCollation2ProtocolGuid             ## CONSUMES
+  gEfiUnicodeCollation2ProtocolGuid             ## SOMETIMES_CONSUMES
   gEfiUserManagerProtocolGuid                   ## SOMETIMES_CONSUMES
   gEfiDevicePathFromTextProtocolGuid            ## SOMETIMES_CONSUMES
-  gEdkiiFormDisplayEngineProtocolGuid           ## PRODUCE
-  gEfiFormBrowserExProtocolGuid                 ## PRODUCE
+  ## CONSUMES
+  ## NOTIFY
+  gEdkiiFormDisplayEngineProtocolGuid
+  gEfiFormBrowserExProtocolGuid                 ## PRODUCES
 
 [FeaturePcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport          ## CONSUMES
@@ -77,4 +82,5 @@
 [Depex]
   gEfiHiiDatabaseProtocolGuid AND gEfiHiiConfigRoutingProtocolGuid
 
-
+[UserExtensions.TianoCore."ExtraFiles"]
+  SetupBrowserExtra.uni

MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf

@@ -1,7 +1,6 @@
 ## @file
-# Component description file for Smbios module.
+# This driver initializes and installs the SMBIOS protocol, constructs SMBIOS table into system configuration table.
 #
-# This driver initializes and installs the SMBIOS protocol.
 # Copyright (c) 2009 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
@@ -17,6 +16,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = SmbiosDxe
+  MODULE_UNI_FILE                = SmbiosDxe.uni
   FILE_GUID                      = F9D88642-0737-49bc-81B5-6889CD57D9EA
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -48,14 +48,16 @@
   PcdLib
 
 [Protocols]
-  gEfiSmbiosProtocolGuid                       # PROTOCOL ALWAYS_PRODUCED
+  gEfiSmbiosProtocolGuid                            ## PRODUCES
   
 [Guids]
-  gEfiEventReadyToBootGuid                    # PROTOCOL ALWAYS_CONSUMED
-  gEfiSmbiosTableGuid                         # PROTOCOL ALWAYS_CONSUMED
+  gEfiSmbiosTableGuid                               ## PRODUCES ## SystemTable
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion   ## CONSUMES
 
 [Depex]
   TRUE
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  SmbiosDxeExtra.uni

MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf

@@ -1,8 +1,7 @@
 ## @file
-#  Report Status Code Handler PEIM which produces general handlers and hook them
-#  onto the PEI status code router.
+#  Report Status Code Handler PEIM which produces general handlers and hook them onto the PEI status code router.
 #
-#  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                      = StatusCodeHandlerPei
+  MODULE_UNI_FILE                = StatusCodeHandlerPei.uni
   FILE_GUID                      = 9D225237-FA01-464C-A949-BAABC02D31D0
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0  
@@ -50,18 +50,23 @@
   BaseMemoryLib
   
 [Guids]
-  gMemoryStatusCodeRecordGuid                   ## SOMETIMES_CONSUMES ## HOB
-  gEfiStatusCodeDataTypeStringGuid              ## CONSUMES
+  ## SOMETIMES_PRODUCES   ## HOB
+  ## SOMETIMES_CONSUMES   ## HOB
+  gMemoryStatusCodeRecordGuid
+  gEfiStatusCodeDataTypeStringGuid              ## SOMETIMES_CONSUMES   ## UNDEFINED
   
 [Ppis]
   gEfiPeiRscHandlerPpiGuid                      ## CONSUMES
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize|1|gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory    ## SOMETIMES_CONSUMES
 
 [Depex]
   gEfiPeiRscHandlerPpiGuid
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  StatusCodeHandlerPeiExtra.uni

MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

@@ -1,8 +1,7 @@
 ## @file
-#  Status Code Handler Driver which produces general handlers and hook them
-#  onto the DXE status code router.
+#  Status Code Handler Driver which produces general handlers and hook them onto the DXE status code router.
 #
-#  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 +16,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = StatusCodeHandlerRuntimeDxe
+  MODULE_UNI_FILE                = StatusCodeHandlerRuntimeDxe.uni
   FILE_GUID                      = 6C2004EF-4E0E-4BE4-B14C-340EB4AA5891
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER
   VERSION_STRING                 = 1.0
@@ -49,25 +49,27 @@
   PrintLib
   ReportStatusCodeLib
   DebugLib
-  SynchronizationLib
   BaseMemoryLib
   
 [Guids]
-  gMemoryStatusCodeRecordGuid                   ## CONSUMES ## HOB
+  gMemoryStatusCodeRecordGuid                   ## SOMETIMES_CONSUMES   ## HOB
+  gEfiStatusCodeDataTypeStringGuid              ## SOMETIMES_CONSUMES   ## UNDEFINED
   gEfiEventVirtualAddressChangeGuid             ## CONSUMES ## Event
   gEfiEventExitBootServicesGuid                 ## CONSUMES ## Event
-  gEfiStatusCodeDataTypeStringGuid              ## CONSUMES
 
 [Protocols]
   gEfiRscHandlerProtocolGuid                    ## CONSUMES
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeReplayIn  ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory   ## SOMETIMES_CONSUMES
 
 [Depex]
   gEfiRscHandlerProtocolGuid
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  StatusCodeHandlerRuntimeDxeExtra.uni

MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf

@@ -1,8 +1,7 @@
 ## @file
-#  Status Code Handler Driver which produces general handlers and hook them
-#  onto the SMM status code router.
+#  Status Code Handler Driver which produces general handlers and hook them onto the SMM status code router.
 #
-#  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                      = StatusCodeHandlerSmm
+  MODULE_UNI_FILE                = StatusCodeHandlerSmm.uni
   FILE_GUID                      = 79CD78D8-6EDC-4978-BD02-3299C387AB17
   MODULE_TYPE                    = DXE_SMM_DRIVER
   PI_SPECIFICATION_VERSION       = 0x0001000A
@@ -47,23 +47,24 @@
   PrintLib
   ReportStatusCodeLib
   DebugLib
-  SynchronizationLib
   MemoryAllocationLib
   BaseMemoryLib
   
 [Guids]
-  gMemoryStatusCodeRecordGuid                   ## CONSUMES ## HOB
-  gEfiStatusCodeDataTypeStringGuid              ## CONSUMES
+  gEfiStatusCodeDataTypeStringGuid              ## SOMETIMES_CONSUMES   ## UNDEFINED
 
 [Protocols]
   gEfiSmmRscHandlerProtocolGuid                 ## CONSUMES
 
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial ## CONSUMES
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory
+  gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeMemorySize |128| gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseMemory   ## SOMETIMES_CONSUMES
 
 [Depex]
   gEfiSmmRscHandlerProtocolGuid
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  StatusCodeHandlerSmmExtra.uni

MdeModulePkg/Universal/TimestampDxe/TimestampDxe.inf

@@ -1,7 +1,7 @@
 ## @file
-# Generic Timestamp driver produceing Timestamp Protocol using UEFI APIs.
+# Generic Timestamp driver producing Timestamp Protocol using UEFI APIs.
 #
-# 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
@@ -16,6 +16,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = TimestampDxe
+  MODULE_UNI_FILE                = TimestampDxe.uni
   FILE_GUID                      = C10194E7-DEB2-4AF4-9EEE-BFFDE4D7D4C7
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -46,4 +47,5 @@
 [depex]
   TRUE
 
-  
+[UserExtensions.TianoCore."ExtraFiles"]
+  TimestampDxeExtra.uni

MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf

@@ -1,8 +1,10 @@
 ## @file
 # Emulation Variable for EFI_RUNTIME_SERVICES.
 #
-# This module provides three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName
-# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
+# This module installs variable arch protocol and variable write arch protocol to provide
+# four EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName and QueryVariableInfo.
+#
+# 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 +19,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = EmuVariableRuntimeDxe
+  MODULE_UNI_FILE                = EmuVariableRuntimeDxe.uni
   FILE_GUID                      = 02B01AD5-7E59-43e8-A6D8-238180613A5A
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER
   VERSION_STRING                 = 1.0
@@ -56,25 +59,30 @@
   gEfiVariableWriteArchProtocolGuid             ## PRODUCES
 
 [Guids]
-  gEfiEventVirtualAddressChangeGuid             ## PRODUCES ## Event
-  gEfiGlobalVariableGuid                        ## PRODUCES ## Variable Guid
+  gEfiEventVirtualAddressChangeGuid             ## CONSUMES             ## Event
+  ## SOMETIMES_CONSUMES   ## Variable:L"PlatformLang"
+  ## SOMETIMES_PRODUCES   ## Variable:L"PlatformLang"
+  ## SOMETIMES_CONSUMES   ## Variable:L"Lang"
+  ## SOMETIMES_PRODUCES   ## Variable:L"Lang"
+  gEfiGlobalVariableGuid
+  ## PRODUCES             ## GUID # Signature of Variable store header
+  ## CONSUMES             ## GUID # Signature of Variable store header
+  ## SOMETIMES_CONSUMES   ## HOB
+  ## SOMETIMES_PRODUCES   ## SystemTable
   gEfiVariableGuid
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics
-  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize
+  gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved      ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize                 ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize               ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize                ## CONSUMES
+
+[FeaturePcd]
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics   ## CONSUMES # statistic the information of variable.
 
 [Depex]
   TRUE
 
-# [Event]
-#   ##
-#   # Event will be signaled for VIRTUAL_ADDRESS_CHANGE event.
-#   #
-#   EVENT_TYPE_NOTIFY_SIGNAL                    ## PRODUCES
-#
-#
+[UserExtensions.TianoCore."ExtraFiles"]
+  EmuVariableRuntimeDxeExtra.uni

MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

@@ -1,9 +1,7 @@
 ## @file
+#  Implement ReadOnly Variable Services required by PEIM and install PEI ReadOnly Varaiable2 PPI.
 #
-#  Implement ReadOnly Variable Services required by PEIM and install
-#  PEI ReadOnly Varaiable2 PPI. These services operates the non-volatile storage space.
-#
-#  Copyright (c) 2006 - 2013, 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
@@ -17,6 +15,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PeiVariable
+  MODULE_UNI_FILE                = PeiVariable.uni
   FILE_GUID                      = 34C8C28F-B61C-45a2-8F2E-89E46BECC63B
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
@@ -46,24 +45,30 @@
   PeiServicesLib
 
 [Guids]
+  ## CONSUMES             ## GUID # Variable store header
+  ## SOMETIMES_CONSUMES   ## HOB
   gEfiVariableGuid
+  ## SOMETIMES_PRODUCES   ## HOB
+  ## SOMETIMES_CONSUMES   ## HOB
   gEfiVariableIndexTableGuid
-  gEfiSystemNvDataFvGuid
+  gEfiSystemNvDataFvGuid            ## SOMETIMES_CONSUMES   ## GUID
+  ## SOMETIMES_CONSUMES   ## HOB
+  ## CONSUMES             ## GUID # Dependence
   gEdkiiFaultTolerantWriteGuid
 
 [Ppis]
-  gEfiPeiReadOnlyVariable2PpiGuid                ## PRODUCES
+  gEfiPeiReadOnlyVariable2PpiGuid   ## PRODUCES
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase      ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase      ## SOMETIMES_CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64    ## CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize      ## CONSUMES
 
 [Depex]
   gEdkiiFaultTolerantWriteGuid
 
-#
-#  [BootMode]
-#    RECOVERY          ## CONSUMES
-#
+# [BootMode]
+# RECOVERY_FULL             ## SOMETIMES_CONSUMES
 
+[UserExtensions.TianoCore."ExtraFiles"]
+  PeiVariableExtra.uni

MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf

@@ -1,7 +1,8 @@
 ## @file
-# Component description file for Variable module.
+# This module installs variable arch protocol and variable write arch protocol.
+#
+# It provides four EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName and QueryVariableInfo.
 #
-# This module installs three EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName.
 # Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
@@ -17,6 +18,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = VariableRuntimeDxe
+  MODULE_UNI_FILE                = VariableRuntimeDxe.uni
   FILE_GUID                      = CBD2E4D5-7068-4FF5-B462-9822B4AD8D60
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER
   VERSION_STRING                 = 1.0
@@ -55,29 +57,41 @@
   HobLib
 
 [Protocols]
-  gEfiFirmwareVolumeBlockProtocolGuid           ## SOMETIMES_CONSUMES
-  gEfiVariableWriteArchProtocolGuid             ## ALWAYS_PRODUCES
-  gEfiVariableArchProtocolGuid                  ## ALWAYS_PRODUCES
-  gEfiFaultTolerantWriteProtocolGuid            ## SOMETIMES_CONSUMES
-  gEdkiiVariableLockProtocolGuid                ## ALWAYS_PRODUCES
+  gEfiFirmwareVolumeBlockProtocolGuid           ## CONSUMES
+  ## CONSUMES
+  ## NOTIFY
+  gEfiFaultTolerantWriteProtocolGuid
+  gEfiVariableWriteArchProtocolGuid             ## PRODUCES
+  gEfiVariableArchProtocolGuid                  ## PRODUCES
+  gEdkiiVariableLockProtocolGuid                ## PRODUCES
 
 [Guids]
-  gEfiVariableGuid                              ## PRODUCES ## Configuration Table Guid 
-  gEfiGlobalVariableGuid                        ## PRODUCES ## Variable Guid
-  gEfiEventVirtualAddressChangeGuid             ## CONSUMES ## Event
-  gEfiSystemNvDataFvGuid                        ## CONSUMES
-  gEfiHardwareErrorVariableGuid                 ## SOMETIMES_CONSUMES
-  gEfiEndOfDxeEventGroupGuid                    ## CONSUMES ## Event
-  gEdkiiFaultTolerantWriteGuid                  ## CONSUMES
+  ## PRODUCES             ## GUID # Signature of Variable store header
+  ## CONSUMES             ## GUID # Signature of Variable store header
+  ## SOMETIMES_CONSUMES   ## HOB
+  ## SOMETIMES_PRODUCES   ## SystemTable
+  gEfiVariableGuid
+  ## SOMETIMES_CONSUMES   ## Variable:L"PlatformLang"
+  ## SOMETIMES_PRODUCES   ## Variable:L"PlatformLang"
+  ## SOMETIMES_CONSUMES   ## Variable:L"Lang"
+  ## SOMETIMES_PRODUCES   ## Variable:L"Lang"
+  ## SOMETIMES_CONSUMES   ## Variable:L"HwErrRecSupport"
+  gEfiGlobalVariableGuid
+  gEfiEventVirtualAddressChangeGuid             ## CONSUMES             ## Event
+  gEfiSystemNvDataFvGuid                        ## CONSUMES             ## GUID
+  gEfiHardwareErrorVariableGuid                 ## SOMETIMES_CONSUMES   ## Variable:L"HwErrRec####"
+  gEfiEndOfDxeEventGroupGuid                    ## CONSUMES             ## Event
+  ## SOMETIMES_CONSUMES   ## HOB
+  gEdkiiFaultTolerantWriteGuid
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize      ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase      ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize                 ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize               ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize                ## CONSUMES
   
 [FeaturePcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics  ## CONSUMES # statistic the information of variable.
@@ -86,11 +100,5 @@
 [Depex]
   TRUE
 
-# [Event]
-#   ##
-#   # Event will be signaled for VIRTUAL_ADDRESS_CHANGE event.
-#   #
-#   EVENT_TYPE_NOTIFY_SIGNAL                    ## PRODUCES
-#
-#
-    
+[UserExtensions.TianoCore."ExtraFiles"]
+  VariableRuntimeDxeExtra.uni

MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf

@@ -1,6 +1,4 @@
 ## @file
-#  Component description file for SMM Variable module.
-#
 #  This module installs SMM variable protocol into SMM protocol database,
 #  which can be used by SMM driver, and installs SMM variable protocol 
 #  into BS protocol database, which can be used to notify the SMM Runtime
@@ -28,6 +26,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = VariableSmm
+  MODULE_UNI_FILE                = VariableSmm.uni
   FILE_GUID                      = 23A089B3-EED5-4ac5-B2AB-43E3298C2343
   MODULE_TYPE                    = DXE_SMM_DRIVER
   VERSION_STRING                 = 1.0
@@ -65,34 +64,48 @@
   PcdLib
 
 [Protocols]
-  gEfiSmmFirmwareVolumeBlockProtocolGuid        ## SOMETIMES_CONSUMES
-  gEfiSmmVariableProtocolGuid                   ## ALWAYS_PRODUCES
-  gEfiSmmFaultTolerantWriteProtocolGuid         ## SOMETIMES_CONSUMES
-  gEfiSmmAccess2ProtocolGuid                    ## ALWAYS_CONSUMES
-  gEfiSmmEndOfDxeProtocolGuid                   ## ALWAYS_CONSUMES
+  gEfiSmmFirmwareVolumeBlockProtocolGuid        ## CONSUMES
+  ## CONSUMES
+  ## NOTIFY
+  gEfiSmmFaultTolerantWriteProtocolGuid
+  ## PRODUCES
+  ## UNDEFINED # SmiHandlerRegister
+  gEfiSmmVariableProtocolGuid
+  gEfiSmmAccess2ProtocolGuid                    ## CONSUMES
+  gEfiSmmEndOfDxeProtocolGuid                   ## CONSUMES
 
 [Guids]
-  gEfiVariableGuid                              ## PRODUCES ## Configuration Table Guid 
-  gEfiGlobalVariableGuid                        ## PRODUCES ## Variable Guid
-  gSmmVariableWriteGuid                         ## PRODUCES ## SMM Variable Write Guid 
-  gEfiSystemNvDataFvGuid                        ## CONSUMES
-  gEfiHardwareErrorVariableGuid                 ## SOMETIMES_CONSUMES
-  gEdkiiFaultTolerantWriteGuid                  ## CONSUMES
+  ## PRODUCES             ## GUID # Signature of Variable store header
+  ## CONSUMES             ## GUID # Signature of Variable store header
+  ## SOMETIMES_CONSUMES   ## HOB
+  gEfiVariableGuid
+  ## SOMETIMES_CONSUMES   ## Variable:L"PlatformLang"
+  ## SOMETIMES_PRODUCES   ## Variable:L"PlatformLang"
+  ## SOMETIMES_CONSUMES   ## Variable:L"Lang"
+  ## SOMETIMES_PRODUCES   ## Variable:L"Lang"
+  ## SOMETIMES_CONSUMES   ## Variable:L"HwErrRecSupport"
+  gEfiGlobalVariableGuid
+  gSmmVariableWriteGuid                         ## PRODUCES             ## UNDEFINED # Install protocol
+  gEfiSystemNvDataFvGuid                        ## CONSUMES             ## GUID
+  gEfiHardwareErrorVariableGuid                 ## SOMETIMES_CONSUMES   ## Variable:L"HwErrRec####"
+  ## SOMETIMES_CONSUMES   ## HOB
+  gEdkiiFaultTolerantWriteGuid
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize      ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase      ## SOMETIMES_CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize                 ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize    ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize               ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdHwErrStorageSize                ## CONSUMES
   
 [FeaturePcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics  ## CONSUMES # statistic the information of variable.
-  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics   ## CONSUMES # statistic the information of variable.
+  gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate  ## CONSUMES
 
 [Depex]
   TRUE
 
-    
+[UserExtensions.TianoCore."ExtraFiles"]
+  VariableSmmExtra.uni

MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf

@@ -1,10 +1,11 @@
 ## @file
-#  Component description file for Variable SmmRuntimeDxe module.
+#  This module is the Runtime DXE part correspond to SMM variable module.
 #
-#  This module is the Runtime DXE part correspond to SMM variable module. It 
-#  installs variable arch protocol and variable write arch protocol and works 
-#  with SMM variable module together. 
-# Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>
+#  It installs variable arch protocol and variable write arch protocol to provide
+#  four EFI_RUNTIME_SERVICES: SetVariable, GetVariable, GetNextVariableName and QueryVariableInfo
+#  and works with SMM variable module together.
+#
+# 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
@@ -19,6 +20,7 @@
 [Defines]
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = VariableSmmRuntimeDxe
+  MODULE_UNI_FILE                = VariableSmmRuntimeDxe.uni
   FILE_GUID                      = 9F7DCADE-11EA-448a-A46F-76E003657DD1
   MODULE_TYPE                    = DXE_RUNTIME_DRIVER
   VERSION_STRING                 = 1.0
@@ -50,20 +52,28 @@
   PcdLib  
 
 [Protocols]
-  gEfiVariableWriteArchProtocolGuid             ## ALWAYS_PRODUCES
-  gEfiVariableArchProtocolGuid                  ## ALWAYS_PRODUCES  
-  gEfiSmmCommunicationProtocolGuid
+  gEfiVariableWriteArchProtocolGuid             ## PRODUCES
+  gEfiVariableArchProtocolGuid                  ## PRODUCES
+  gEfiSmmCommunicationProtocolGuid              ## CONSUMES
+  ## CONSUMES
+  ## NOTIFY
+  ## UNDEFINED # Used to do smm communication
   gEfiSmmVariableProtocolGuid
-  gEdkiiVariableLockProtocolGuid                ## ALWAYS_PRODUCES
+  gEdkiiVariableLockProtocolGuid                ## PRODUCES
 
 [Guids]
-  gEfiEventVirtualAddressChangeGuid             ## PRODUCES ## Event
+  gEfiEventVirtualAddressChangeGuid             ## CONSUMES ## Event
+  gEfiEventExitBootServicesGuid                 ## CONSUMES ## Event
+  ## CONSUMES ## GUID # Locate protocol
+  ## CONSUMES ## GUID # Protocol notify
   gSmmVariableWriteGuid
 
 [Pcd]
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize                 ## CONSUMES
+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxHardwareErrorVariableSize    ## CONSUMES
   
 [Depex]
   gEfiSmmCommunicationProtocolGuid
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  VariableSmmRuntimeDxeExtra.uni

MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

@@ -1,7 +1,7 @@
 ## @file
-# Generic watchdog timer driver produceing Watchdog Timer Architectural Protocol using UEFI APIs.
+# Generic watchdog timer driver producing Watchdog Timer Architectural Protocol using UEFI APIs.
 #
-# 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                      = WatchdogTimer
+  MODULE_UNI_FILE                = WatchdogTimer.uni
   FILE_GUID                      = F099D67F-71AE-4c36-B2A3-DCEB0EB2B7D8
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
@@ -44,13 +45,12 @@
 [Protocols]
   gEfiWatchdogTimerArchProtocolGuid             ## PRODUCES
 
-[depex]
+[Depex]
   gEfiTimerArchProtocolGuid
-  
+
 # [Event]
-#   ##
-#   # Relative timer event set by EFI_WATCHDOG_TIMER_ARCH_PROTOCOL.SetTimerPeriod()
-#   #
-#   EVENT_TYPE_RELATIVE_TIMER                   ## PRODUCES
+# EVENT_TYPE_RELATIVE_TIMER ## CONSUMES
 #
-#
+
+[UserExtensions.TianoCore."ExtraFiles"]
+  WatchdogTimerExtra.uni