Fixed rebuild failure issue when un-recognized macro is used in "#include" directive.

[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..7f0149fa009bf0efcba0fd84fc3aa48a1db4c29d 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
@@ -217,7 +214,7 @@ Ip4ConfigDriverBindingStart (
   //\r
   // Allocate an instance then initialize it\r
   //\r
-  Instance = NetAllocatePool (sizeof (IP4_CONFIG_INSTANCE));\r
+  Instance = AllocatePool (sizeof (IP4_CONFIG_INSTANCE));\r
 \r
   if (Instance == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\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
@@ -335,7 +332,7 @@ Ip4ConfigDriverBindingStart (
     NewVariable = Ip4ConfigModifyVariable (Variable, &Instance->NicAddr, NULL);\r
 \r
   } else if (NicConfig->Source == IP4_CONFIG_SOURCE_DHCP) {\r
-    NetZeroMem (&NicConfig->Ip4Info, sizeof (EFI_IP4_IPCONFIG_DATA));\r
+    ZeroMem (&NicConfig->Ip4Info, sizeof (EFI_IP4_IPCONFIG_DATA));\r
     NewVariable = Ip4ConfigModifyVariable (Variable, &Instance->NicAddr, NicConfig);\r
 \r
   }\r
@@ -343,21 +340,21 @@ Ip4ConfigDriverBindingStart (
   Ip4ConfigWriteVariable (NewVariable);\r
 \r
   if (NewVariable != NULL) {\r
-    NetFreePool (NewVariable);\r
+    gBS->FreePool (NewVariable);\r
   }\r
 \r
 ON_EXIT:\r
-  NetFreePool (Variable);\r
+  gBS->FreePool (Variable);\r
 \r
   if (NicConfig != NULL) {\r
-    NetFreePool (NicConfig);\r
+    gBS->FreePool (NicConfig);\r
   }\r
 \r
   return EFI_SUCCESS;\r
 \r
 ON_ERROR:\r
   if (Instance != NULL) {\r
-    NetFreePool (Instance);\r
+    gBS->FreePool (Instance);\r
   }\r
 \r
   if (Mnp != NULL) {\r
@@ -514,7 +511,7 @@ Ip4ConfigDriverBindingStop (
 \r
   Ip4ConfigCleanConfig (Instance);\r
   mIp4ConfigNicList[Instance->NicIndex] = NULL;\r
-  NetFreePool (Instance);\r
+  gBS->FreePool (Instance);\r
 \r
   return EFI_SUCCESS;\r
 }\r