Clean up Network Components to support GCC build.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Ip4ConfigDxe / Ip4ConfigDriver.c

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
index 265135a1177fef45d3dd24681080498d2631cf58..081db47d49caf1146547d48641f0723ddbca5dd0 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDriver.c
@@ -60,7 +60,6 @@ EfiIp4ConfigUnload (
   return NetLibDefaultUnload (ImageHandle);\r
 }\r
 \r
-//@MT: EFI_DRIVER_ENTRY_POINT (Ip4ConfigDriverEntryPoint)\r
 \r
 EFI_STATUS\r
 Ip4ConfigDriverEntryPoint (\r
@@ -86,15 +85,13 @@ Returns:
 \r
 --*/\r
 {\r
-  return NetLibInstallAllDriverProtocolsWithUnload (\r
+  return EfiLibInstallDriverBindingComponentName2 (\r
            ImageHandle,\r
            SystemTable,\r
            &gIp4ConfigDriverBinding,\r
            ImageHandle,\r
            &gIp4ConfigComponentName,\r
-           NULL,\r
-           NULL,\r
-           EfiIp4ConfigUnload\r
+           &gIp4ConfigComponentName2\r
            );\r
 }\r
 \r
@@ -228,8 +225,8 @@ Ip4ConfigDriverBindingStart (
   Instance->Controller        = ControllerHandle;\r
   Instance->Image             = This->DriverBindingHandle;\r
 \r
-  Instance->Ip4ConfigProtocol = mIp4ConfigProtocolTemplate;\r
-  Instance->NicIp4Protocol    = mNicIp4ConfigProtocolTemplate;\r
+  CopyMem (&Instance->Ip4ConfigProtocol, &mIp4ConfigProtocolTemplate, sizeof (mIp4ConfigProtocolTemplate));\r
+  CopyMem (&Instance->NicIp4Protocol, &mNicIp4ConfigProtocolTemplate, sizeof (mNicIp4ConfigProtocolTemplate));\r
 \r
   Instance->State             = IP4_CONFIG_STATE_IDLE;\r
   Instance->Mnp               = Mnp;\r
@@ -252,7 +249,7 @@ Ip4ConfigDriverBindingStart (
 \r
   Instance->NicAddr.Type    = (UINT16) SnpMode.IfType;\r
   Instance->NicAddr.Len     = (UINT8) SnpMode.HwAddressSize;\r
-  CopyMem (&Instance->NicAddr.MacAddr, &SnpMode.CurrentAddress, sizeof (EFI_MAC_ADDRESS));\r
+  CopyMem (&Instance->NicAddr.MacAddr, &SnpMode.CurrentAddress, sizeof (Instance->NicAddr.MacAddr));\r
 \r
   //\r
   // Add it to the global list, and compose the name\r