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

13 files changed, 249 insertions, 135 deletions

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
index b6335e9ccd..9dff604a94 100644
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+++ b/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

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
index f78d17347a..9b6c9c1dcc 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
+++ b/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

diff --git a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf b/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
index d69eb829c5..8a1f8baf79 100644
--- a/MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
+++ b/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
\ No newline at end of file
+  TRUE

+[UserExtensions.TianoCore."ExtraFiles"]

+  DpcDxeExtra.uni

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index 436ac6ef9f..4fd2a62af9 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+++ b/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
\ No newline at end of file
+  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
\ No newline at end of file
diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
index 83133d6187..c1199828b6 100644
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
+++ b/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

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
index 02699248e9..90fb83ae80 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+++ b/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

-  
\ No newline at end of file
+  ## 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

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
index cc26ce2ec4..07e62f5ba2 100644
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+++ b/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

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
index e8153a771d..3d7c8c00e0 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+++ b/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

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
index a7f81c83c5..90fd8d5475 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
+++ b/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

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
index 97cf90f460..ba3c377b5f 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
+++ b/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

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
index aaddcd871c..e1b4898c31 100644
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+++ b/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

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
index 3849b83227..a1265637c3 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+++ b/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

diff --git a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf b/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
index e9f081d855..a36c57871e 100644
--- a/MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
+++ b/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