1)Global variables have been moved backward ahead of functions.

2)INF comments have been reviewed.

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

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
index 6260660f751527dc06f7b359dfb3419eb37b7de4..0ae943d62edf0977ea2a5a3f956b6277934a3fce 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
@@ -27,7 +27,11 @@
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
-#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
+#  VALID_ARCHITECTURES           = IA32 X64 IPF EBC#\r
+#\r
+#  DRIVER_BINDING                =  gEhciDriverBinding                        \r
+#  COMPONENT_NAME                =  gEhciComponentName\r
+#  COMPONENT_NAME2               =  gEhciComponentName2\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
index 34d64e6d2e15a9ea08902dfff0131eda9e297858..d2eb2bfeb7d778b75a63f0f2aa9e378259cfe805 100644 (file)
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
@@ -28,6 +28,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  gUhciDriverBinding                        \r
+#  COMPONENT_NAME                =  gUhciComponentName\r
+#  COMPONENT_NAME2               =  gUhciComponentName2\r
+#\r
 \r
 [Sources.common]\r
   UhciSched.c\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
index 412642a10b5ddb7b303690f8c869541c34452ee4..8107f66b99446141c017963250bfaed8116b9864 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf
@@ -28,6 +28,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  mUsbBusDriverBinding                        \r
+#  COMPONENT_NAME                =  mUsbBusComponentName\r
+#  COMPONENT_NAME2               =  mUsbBusComponentName2\r
+#\r
 \r
 [Sources.common]\r
   UsbDesc.c\r

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
index 39276fac0c0a89a924b28e60a84cb6f970a8d383..f7ef162381c446e2d6156a150700d8520445e497 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
@@ -29,6 +29,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  gUsbKeyboardDriverBinding                        \r
+#  COMPONENT_NAME                =  gUsbKeyboardComponentName\r
+#  COMPONENT_NAME2               =  gUsbKeyboardComponentName2\r
+#\r
 \r
 [Sources.common]\r
   EfiKey.c\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
index def24ee4ce516e1dd803f562e83cfbcb77e3a66a..e9bdf4ef27e90adb20808981361291bbe479a2e9 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
@@ -28,6 +28,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  gUSBMassDriverBinding                        \r
+#  COMPONENT_NAME                =  gUsbMassStorageComponentName\r
+#  COMPONENT_NAME2               =  gUsbMassStorageComponentName2\r
+#\r
 \r
 [Sources.common]\r
   UsbMassBoot.h\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
index d7d1b2c020da9d688c0ee3f7e04723c4f6dfa94c..7b85bf0dea609bc6a44e302a7bd26458bb80e872 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
@@ -29,7 +29,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
-\r
+#  DRIVER_BINDING                =  gUsbMouseAbsolutePointerDriverBinding                        \r
+#  COMPONENT_NAME                =  gUsbMouseAbsolutePointerComponentName\r
+#  COMPONENT_NAME2               =  gUsbMouseAbsolutePointerComponentName2\r
+#\r
 [Sources.common]\r
   mousehid.h\r
   ComponentName.c\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
index b980d0168adc225d7f9fd352acf48970bec24634..5945498914400a3fca19cd856111e9a85104274c 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
@@ -29,6 +29,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  gUsbMouseDriverBinding                        \r
+#  COMPONENT_NAME                =  gUsbMouseComponentName\r
+#  COMPONENT_NAME2               =  gUsbMouseComponentName2\r
+#\r
 \r
 [Sources.common]\r
   ComponentName.c\r

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
index 2ac99997a45023cef4dd43fec097eb4b5e8ff880..471f561abbbdcf2574bbce0882f5e688ac1f15d7 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf
@@ -26,10 +26,12 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
-#  DRIVER_BINDING                =  gConPlatformTextInDriverBinding              \r
-#  COMPONENT_NAME                =  gConPlatformComponentName                    \r
-#  DRIVER_BINDING                =  gConPlatformTextOutDriverBinding             \r
-#  COMPONENT_NAME                =  gConPlatformComponentName                    \r
+#  DRIVER_BINDING                =  gConPlatformTextInDriverBinding\r
+#  COMPONENT_NAME                =  gConPlatformComponentName\r
+#  COMPONENT_NAME2               =  gConPlatformComponentName2\r
+#  DRIVER_BINDING                =  gConPlatformTextOutDriverBinding\r
+#  COMPONENT_NAME                =  gConPlatformComponentName\r
+#  COMPONENT_NAME2               =  gConPlatformComponentName2\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
index 9aa8ba16e10f0fc2624b1900a10518700023a4cc..74bc157ad8629b59fd80f68120b6d782fcc8e836 100644 (file)
--- a/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+++ b/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
@@ -29,12 +29,16 @@
 #\r
 #  DRIVER_BINDING                =  gConSplitterConInDriverBinding\r
 #  COMPONENT_NAME                =  gConSplitterConInComponentName\r
+#  COMPONENT_NAME2               =  gConSplitterConInComponentName2\r
 #  DRIVER_BINDING                =  gConSplitterSimplePointerDriverBinding\r
 #  COMPONENT_NAME                =  gConSplitterSimplePointerComponentName\r
+#  COMPONENT_NAME2               =  gConSplitterSimplePointerComponentName2\r
 #  DRIVER_BINDING                =  gConSplitterConOutDriverBinding\r
 #  COMPONENT_NAME                =  gConSplitterConOutComponentName\r
+#  COMPONENT_NAME2               =  gConSplitterConOutComponentName2\r
 #  DRIVER_BINDING                =  gConSplitterStdErrDriverBinding\r
 #  COMPONENT_NAME                =  gConSplitterStdErrComponentName\r
+#  COMPONENT_NAME2               =  gConSplitterStdErrComponentName2\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
index 0b450d47fe6ded44d51aa592b3bec0ebcc96274d..6a585190abc6ef56577e5e7719ec50808350446b 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
@@ -29,6 +29,7 @@
 #\r
 #  DRIVER_BINDING                =  gGraphicsConsoleDriverBinding\r
 #  COMPONENT_NAME                =  gGraphicsConsoleComponentName\r
+#  COMPONENT_NAME2               =  gGraphicsConsoleComponentName2\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
index ec39f5bcbcb38321332d236bec953e7a68aa7dd6..e9228a0bb7240af8c2bc1d4688e168be0b7647db 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
@@ -27,8 +27,9 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
-#  DRIVER_BINDING                =  gTerminalDriverBinding                       \r
-#  COMPONENT_NAME                =  gTerminalComponentName                       \r
+#  DRIVER_BINDING                =  gTerminalDriverBinding\r
+#  COMPONENT_NAME                =  gTerminalComponentName\r
+#  COMPONENT_NAME2               =  gTerminalComponentName2\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf b/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf
index 5df78992268972ddcc1784e1c482a0459ac244d6..0be24ffa058905b4887d1107c7376fb8851fecd4 100644 (file)
--- a/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf
+++ b/MdeModulePkg/Universal/DebugPortDxe/DebugPortDxe.inf
@@ -29,8 +29,9 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
-#  DRIVER_BINDING                =  gDebugPortDriverBinding                      \r
-#  COMPONENT_NAME                =  gDebugPortComponentName                      \r
+#  DRIVER_BINDING                =  gDebugPortDriverBinding\r
+#  COMPONENT_NAME                =  gDebugPortComponentName\r
+#  COMPONENT_NAME2               =  gDebugPortComponentName2\r
 #  Variable Guid C Name: gEfiDebugPortProtocolGuid Variable Name: L"DEBUGPORT"\r
 #\r
 #\r

diff --git a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
index 732d8b000d4cab7dbb8c3a4f98a0d49cc519e6a3..c27650e88646310c131d36bb7381d75c1720f984 100644 (file)
--- a/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
+++ b/MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf
@@ -29,6 +29,7 @@
 #\r
 #  DRIVER_BINDING                =  gDiskIoDriverBinding\r
 #  COMPONENT_NAME                =  gDiskIoComponentName\r
+#  COMPONENT_NAME2               =  gDiskIoComponentName2\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
index ec20fa6ece51533c2db3855d13650240790047e5..d187a91185495537bde610cbca2cbee10700f0c2 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf
@@ -33,6 +33,7 @@
 #\r
 #  DRIVER_BINDING                =  gPartitionDriverBinding\r
 #  COMPONENT_NAME                =  gPartitionComponentName\r
+#  COMPONENT_NAME2               =  gPartitionComponentName2\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h
index aa22cc1433a17563f811899583c6bf2689000c9c..73b7f0804205e559cf6b520fc2371edebb77ad05 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDriver.h
@@ -151,5 +151,136 @@ ArpServiceBindingDestroyChild (
   IN EFI_HANDLE                    ChildHandle\r
   );\r
 \r
+\r
+//\r
+// EFI Component Name Functions\r
+//\r
+/**\r
+  Retrieves a Unicode string that is the user readable name of the driver.\r
+\r
+  This function retrieves the user readable name of a driver in the form of a\r
+  Unicode string. If the driver specified by This has a user readable name in\r
+  the language specified by Language, then a pointer to the driver name is\r
+  returned in DriverName, and EFI_SUCCESS is returned. If the driver specified\r
+  by This does not support the language specified by Language,\r
+  then EFI_UNSUPPORTED is returned.\r
+\r
+  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or\r
+                                EFI_COMPONENT_NAME_PROTOCOL instance.\r
+\r
+  @param  Language[in]          A pointer to a Null-terminated ASCII string\r
+                                array indicating the language. This is the\r
+                                language of the driver name that the caller is\r
+                                requesting, and it must match one of the\r
+                                languages specified in SupportedLanguages. The\r
+                                number of languages supported by a driver is up\r
+                                to the driver writer. Language is specified\r
+                                in RFC 3066 or ISO 639-2 language code format.\r
+\r
+  @param  DriverName[out]       A pointer to the Unicode string to return.\r
+                                This Unicode string is the name of the\r
+                                driver specified by This in the language\r
+                                specified by Language.\r
+\r
+  @retval EFI_SUCCESS           The Unicode string for the Driver specified by\r
+                                This and the language specified by Language was\r
+                                returned in DriverName.\r
+\r
+  @retval EFI_INVALID_PARAMETER Language is NULL.\r
+\r
+  @retval EFI_INVALID_PARAMETER DriverName is NULL.\r
+\r
+  @retval EFI_UNSUPPORTED       The driver specified by This does not support\r
+                                the language specified by Language.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+ArpComponentNameGetDriverName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
+  IN  CHAR8                        *Language,\r
+  OUT CHAR16                       **DriverName\r
+  );\r
+\r
+\r
+/**\r
+  Retrieves a Unicode string that is the user readable name of the controller\r
+  that is being managed by a driver.\r
+\r
+  This function retrieves the user readable name of the controller specified by\r
+  ControllerHandle and ChildHandle in the form of a Unicode string. If the\r
+  driver specified by This has a user readable name in the language specified by\r
+  Language, then a pointer to the controller name is returned in ControllerName,\r
+  and EFI_SUCCESS is returned.  If the driver specified by This is not currently\r
+  managing the controller specified by ControllerHandle and ChildHandle,\r
+  then EFI_UNSUPPORTED is returned.  If the driver specified by This does not\r
+  support the language specified by Language, then EFI_UNSUPPORTED is returned.\r
+\r
+  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or\r
+                                EFI_COMPONENT_NAME_PROTOCOL instance.\r
+\r
+  @param  ControllerHandle[in]  The handle of a controller that the driver\r
+                                specified by This is managing.  This handle\r
+                                specifies the controller whose name is to be\r
+                                returned.\r
+\r
+  @param  ChildHandle[in]       The handle of the child controller to retrieve\r
+                                the name of.  This is an optional parameter that\r
+                                may be NULL.  It will be NULL for device\r
+                                drivers.  It will also be NULL for a bus drivers\r
+                                that wish to retrieve the name of the bus\r
+                                controller.  It will not be NULL for a bus\r
+                                driver that wishes to retrieve the name of a\r
+                                child controller.\r
+\r
+  @param  Language[in]          A pointer to a Null-terminated ASCII string\r
+                                array indicating the language.  This is the\r
+                                language of the driver name that the caller is\r
+                                requesting, and it must match one of the\r
+                                languages specified in SupportedLanguages. The\r
+                                number of languages supported by a driver is up\r
+                                to the driver writer. Language is specified in\r
+                                RFC 3066 or ISO 639-2 language code format.\r
+\r
+  @param  ControllerName[out]   A pointer to the Unicode string to return.\r
+                                This Unicode string is the name of the\r
+                                controller specified by ControllerHandle and\r
+                                ChildHandle in the language specified by\r
+                                Language from the point of view of the driver\r
+                                specified by This.\r
+\r
+  @retval EFI_SUCCESS           The Unicode string for the user readable name in\r
+                                the language specified by Language for the\r
+                                driver specified by This was returned in\r
+                                DriverName.\r
+\r
+  @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE.\r
+\r
+  @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid\r
+                                EFI_HANDLE.\r
+\r
+  @retval EFI_INVALID_PARAMETER Language is NULL.\r
+\r
+  @retval EFI_INVALID_PARAMETER ControllerName is NULL.\r
+\r
+  @retval EFI_UNSUPPORTED       The driver specified by This is not currently\r
+                                managing the controller specified by\r
+                                ControllerHandle and ChildHandle.\r
+\r
+  @retval EFI_UNSUPPORTED       The driver specified by This does not support\r
+                                the language specified by Language.\r
+\r
+**/\r
+EFI_STATUS\r
+EFIAPI\r
+ArpComponentNameGetControllerName (\r
+  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
+  IN  EFI_HANDLE                                      ControllerHandle,\r
+  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
+  IN  CHAR8                                           *Language,\r
+  OUT CHAR16                                          **ControllerName\r
+  );\r
+\r
+\r
 #endif\r
 \r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
index a66c69b277bf5e9d0d44c4d04631be2709069c29..21ad6e16e4411f86cdf53f8b1d20a56c3a5b394e 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
@@ -27,6 +27,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  gArpDriverBinding                       \r
+#  COMPONENT_NAME                =  gArpComponentName\r
+#  COMPONENT_NAME2               =  gArpComponentName2\r
+#\r
 \r
 [Sources.common]\r
   ArpMain.c\r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c b/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
index f263f6124bd4b98580d2c451a9148644230b57db..97bab4ed8b382937e807939ba6d42c3caf9117ab 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ComponentName.c
@@ -20,135 +20,6 @@ Abstract:
 \r
 #include "ArpDriver.h"\r
 \r
-//\r
-// EFI Component Name Functions\r
-//\r
-/**\r
-  Retrieves a Unicode string that is the user readable name of the driver.\r
-\r
-  This function retrieves the user readable name of a driver in the form of a\r
-  Unicode string. If the driver specified by This has a user readable name in\r
-  the language specified by Language, then a pointer to the driver name is\r
-  returned in DriverName, and EFI_SUCCESS is returned. If the driver specified\r
-  by This does not support the language specified by Language,\r
-  then EFI_UNSUPPORTED is returned.\r
-\r
-  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or\r
-                                EFI_COMPONENT_NAME_PROTOCOL instance.\r
-\r
-  @param  Language[in]          A pointer to a Null-terminated ASCII string\r
-                                array indicating the language. This is the\r
-                                language of the driver name that the caller is\r
-                                requesting, and it must match one of the\r
-                                languages specified in SupportedLanguages. The\r
-                                number of languages supported by a driver is up\r
-                                to the driver writer. Language is specified\r
-                                in RFC 3066 or ISO 639-2 language code format.\r
-\r
-  @param  DriverName[out]       A pointer to the Unicode string to return.\r
-                                This Unicode string is the name of the\r
-                                driver specified by This in the language\r
-                                specified by Language.\r
-\r
-  @retval EFI_SUCCESS           The Unicode string for the Driver specified by\r
-                                This and the language specified by Language was\r
-                                returned in DriverName.\r
-\r
-  @retval EFI_INVALID_PARAMETER Language is NULL.\r
-\r
-  @retval EFI_INVALID_PARAMETER DriverName is NULL.\r
-\r
-  @retval EFI_UNSUPPORTED       The driver specified by This does not support\r
-                                the language specified by Language.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-ArpComponentNameGetDriverName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL  *This,\r
-  IN  CHAR8                        *Language,\r
-  OUT CHAR16                       **DriverName\r
-  );\r
-\r
-\r
-/**\r
-  Retrieves a Unicode string that is the user readable name of the controller\r
-  that is being managed by a driver.\r
-\r
-  This function retrieves the user readable name of the controller specified by\r
-  ControllerHandle and ChildHandle in the form of a Unicode string. If the\r
-  driver specified by This has a user readable name in the language specified by\r
-  Language, then a pointer to the controller name is returned in ControllerName,\r
-  and EFI_SUCCESS is returned.  If the driver specified by This is not currently\r
-  managing the controller specified by ControllerHandle and ChildHandle,\r
-  then EFI_UNSUPPORTED is returned.  If the driver specified by This does not\r
-  support the language specified by Language, then EFI_UNSUPPORTED is returned.\r
-\r
-  @param  This[in]              A pointer to the EFI_COMPONENT_NAME2_PROTOCOL or\r
-                                EFI_COMPONENT_NAME_PROTOCOL instance.\r
-\r
-  @param  ControllerHandle[in]  The handle of a controller that the driver\r
-                                specified by This is managing.  This handle\r
-                                specifies the controller whose name is to be\r
-                                returned.\r
-\r
-  @param  ChildHandle[in]       The handle of the child controller to retrieve\r
-                                the name of.  This is an optional parameter that\r
-                                may be NULL.  It will be NULL for device\r
-                                drivers.  It will also be NULL for a bus drivers\r
-                                that wish to retrieve the name of the bus\r
-                                controller.  It will not be NULL for a bus\r
-                                driver that wishes to retrieve the name of a\r
-                                child controller.\r
-\r
-  @param  Language[in]          A pointer to a Null-terminated ASCII string\r
-                                array indicating the language.  This is the\r
-                                language of the driver name that the caller is\r
-                                requesting, and it must match one of the\r
-                                languages specified in SupportedLanguages. The\r
-                                number of languages supported by a driver is up\r
-                                to the driver writer. Language is specified in\r
-                                RFC 3066 or ISO 639-2 language code format.\r
-\r
-  @param  ControllerName[out]   A pointer to the Unicode string to return.\r
-                                This Unicode string is the name of the\r
-                                controller specified by ControllerHandle and\r
-                                ChildHandle in the language specified by\r
-                                Language from the point of view of the driver\r
-                                specified by This.\r
-\r
-  @retval EFI_SUCCESS           The Unicode string for the user readable name in\r
-                                the language specified by Language for the\r
-                                driver specified by This was returned in\r
-                                DriverName.\r
-\r
-  @retval EFI_INVALID_PARAMETER ControllerHandle is not a valid EFI_HANDLE.\r
-\r
-  @retval EFI_INVALID_PARAMETER ChildHandle is not NULL and it is not a valid\r
-                                EFI_HANDLE.\r
-\r
-  @retval EFI_INVALID_PARAMETER Language is NULL.\r
-\r
-  @retval EFI_INVALID_PARAMETER ControllerName is NULL.\r
-\r
-  @retval EFI_UNSUPPORTED       The driver specified by This is not currently\r
-                                managing the controller specified by\r
-                                ControllerHandle and ChildHandle.\r
-\r
-  @retval EFI_UNSUPPORTED       The driver specified by This does not support\r
-                                the language specified by Language.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-ArpComponentNameGetControllerName (\r
-  IN  EFI_COMPONENT_NAME_PROTOCOL                     *This,\r
-  IN  EFI_HANDLE                                      ControllerHandle,\r
-  IN  EFI_HANDLE                                      ChildHandle        OPTIONAL,\r
-  IN  CHAR8                                           *Language,\r
-  OUT CHAR16                                          **ControllerName\r
-  );\r
-\r
 \r
 //\r
 // EFI Component Name Protocol\r

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
index 8e76dae8fcf0dfd156432941964f83ed017faf7d..f95dfed5acea594b285cc6f707f3da710b35a289 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
@@ -27,6 +27,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  gDhcp4DriverBinding                        \r
+#  COMPONENT_NAME                =  gDhcp4ComponentName\r
+#  COMPONENT_NAME2               =  gDhcp4ComponentName2\r
+#\r
 \r
 [Sources.common]\r
   Dhcp4Impl.c\r

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index eed566ffa464a532a1b8b84ab6c4e0d15899a3b3..1dfa222a16202238cd9816cadf02bfb77bfa7a24 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
@@ -29,6 +29,7 @@
 #\r
 #  DRIVER_BINDING                =  gIScsiDriverBinding\r
 #  COMPONENT_NAME                =  gIScsiComponentName\r
+#  COMPONENT_NAME2               =  gIScsiComponentName2\r
 #\r
 \r
 [Sources.common]\r

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
index 3ca193946f681d6c5b4fa7df60b2f5f0a1ff4f2d..e7e509a8b63758cb06ba0f1392ccdd90d982ab69 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
@@ -28,6 +28,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  gIp4ConfigDriverBinding                        \r
+#  COMPONENT_NAME                =  gIp4ConfigComponentName\r
+#  COMPONENT_NAME2               =  gIp4ConfigComponentName2\r
+#\r
 \r
 [Sources.common]\r
   ComponentName.c\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
index 6f691f4a39e86759852f27519ba58b4326440e26..bd9946dd5fb5a21baf28a79103c3a026f33ec802 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
@@ -28,6 +28,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  gIp4DriverBinding                        \r
+#  COMPONENT_NAME                =  gIp4ComponentName\r
+#  COMPONENT_NAME2               =  gIp4ComponentName2\r
+#\r
 \r
 [Sources.common]\r
   Ip4Driver.c\r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
index 6b969ba10f54035dd447b71dd7187b17bd5d90a2..f875b9c1860f9978064681902c1632862d7e206d 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
@@ -28,6 +28,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  gMnpDriverBinding                        \r
+#  COMPONENT_NAME                =  gMnpComponentName\r
+#  COMPONENT_NAME2               =  gMnpComponentName2\r
+#\r
 \r
 [Sources.common]\r
   MnpMain.c\r

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
index 45ab0258cbe2bfe2a405ee043e4f410754f59c37..1880d526a3ecb3fcf27e5874fdd8841418e2317f 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
@@ -27,6 +27,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  gMtftp4DriverBinding                        \r
+#  COMPONENT_NAME                =  gMtftp4ComponentName\r
+#  COMPONENT_NAME2               =  gMtftp4ComponentName2\r
+#\r
 \r
 [Sources.common]\r
   Mtftp4Option.c\r

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf b/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf
index b64a9b00718aee316e40508ef857778280e01e7f..025df324f6b8c49bd25e9bbf8ab96af6c80eb4c6 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/PxeBcDxe.inf
@@ -27,6 +27,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  mPxeBcDriverBinding                        \r
+#  COMPONENT_NAME                =  gPxeBcComponentName\r
+#  COMPONENT_NAME2               =  gPxeBcComponentName2\r
+#\r
 \r
 [Sources.common]\r
   Pxe_bc_mtftp.c\r

diff --git a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4Dxe.inf b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4Dxe.inf
index 53b463914cf9aad430da1072baae23731975e7cb..ab5fd969b7165f53ef07b44900efcab18da3de33 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/PxeDhcp4Dxe/PxeDhcp4Dxe.inf
@@ -27,6 +27,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  gPxeDhcp4DriverBinding                        \r
+#  COMPONENT_NAME                =  gPxeDhcp4ComponentName\r
+#  COMPONENT_NAME2               =  gPxeDhcp4ComponentName2\r
+#\r
 \r
 [Sources.common]\r
   Support.c\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
index f6e076a7f4d399c1e2f9136030aa6d89477a4b0b..6d38368549ed824a874c61d43529d95b25f806d3 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
+++ b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
@@ -28,6 +28,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  mSimpleNetworkDriverBinding                        \r
+#  COMPONENT_NAME                =  gSimpleNetworkComponentName\r
+#  COMPONENT_NAME2               =  gSimpleNetworkComponentName2\r
+#\r
 \r
 [Sources.common]\r
   Receive.c\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
index 456910ce8cfd34145e158c410543be11fe083b4c..691c52b27b5a20f49b7a0e12963a0a7f5b29e47b 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
@@ -28,6 +28,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  mTcp4DriverBinding                        \r
+#  COMPONENT_NAME                =  gTcp4ComponentName\r
+#  COMPONENT_NAME2               =  gTcp4ComponentName2\r
+#\r
 \r
 [Sources.common]\r
   SockImpl.c\r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
index 76b5a1220147b819f40e2be548c015aba3296651..c39ac1350b7cfa55b34270d0234b4e010885cee7 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
@@ -28,6 +28,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
+#  DRIVER_BINDING                =  gUdp4DriverBinding                        \r
+#  COMPONENT_NAME                =  gUdp4ComponentName\r
+#  COMPONENT_NAME2               =  gUdp4ComponentName2\r
+#\r
 \r
 [Sources.common]\r
   Udp4Impl.h\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
index c3b1b27a96e5da012c217e33220ed4deecf180a9..1350df40a185630dbe0a8e1b45f850b86ab9d916 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
@@ -28,7 +28,10 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32 X64 IPF EBC\r
 #\r
-\r
+#  DRIVER_BINDING                =  gPxeBcDriverBinding                        \r
+#  COMPONENT_NAME                =  gPxeBcComponentName\r
+#  COMPONENT_NAME2               =  gPxeBcComponentName2\r
+#\r
 \r
 [Sources.common]\r
   PxeBcMtftp.c\r