Use Mde library and definition instead of some native definitions in NetLib, to simpl...

[mirror_edk2.git] / MdeModulePkg / Universal / Network / IScsiDxe / IScsiDhcp.c

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
index c7e8e8d661b694a4cf5142ab2706ae2a8c6a01ce..df4772b8c4b3ec9544da4a4c05f8edf96405ff24 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDhcp.c
@@ -62,7 +62,7 @@ Returns:
   //\r
   IScsiRootPathIdLen = (UINT8) AsciiStrLen (ISCSI_ROOT_PATH_ID);\r
 \r
-  if ((Length <= IScsiRootPathIdLen) || (NetCompareMem (RootPath, ISCSI_ROOT_PATH_ID, IScsiRootPathIdLen) != 0)) {\r
+  if ((Length <= IScsiRootPathIdLen) || (CompareMem (RootPath, ISCSI_ROOT_PATH_ID, IScsiRootPathIdLen) != 0)) {\r
     return EFI_NOT_FOUND;\r
   }\r
   //\r
@@ -71,17 +71,17 @@ Returns:
   RootPath += IScsiRootPathIdLen;\r
   Length  = (UINT8) (Length - IScsiRootPathIdLen);\r
 \r
-  TmpStr  = (CHAR8 *) NetAllocatePool (Length + 1);\r
+  TmpStr  = (CHAR8 *) AllocatePool (Length + 1);\r
   if (TmpStr == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  NetCopyMem (TmpStr, RootPath, Length);\r
+  CopyMem (TmpStr, RootPath, Length);\r
   TmpStr[Length]  = '\0';\r
 \r
   Index           = 0;\r
   FieldIndex      = 0;\r
-  NetZeroMem (&Fields[0], sizeof (Fields));\r
+  ZeroMem (&Fields[0], sizeof (Fields));\r
 \r
   //\r
   // Extract the fields in the Root Path option string.\r
@@ -155,7 +155,7 @@ Returns:
       goto ON_EXIT;\r
     }\r
   } else {\r
-    NetZeroMem (ConfigNvData->BootLun, sizeof (ConfigNvData->BootLun));\r
+    ZeroMem (ConfigNvData->BootLun, sizeof (ConfigNvData->BootLun));\r
   }\r
   //\r
   // Get the target iSCSI Name.\r
@@ -178,7 +178,7 @@ Returns:
 \r
 ON_EXIT:\r
 \r
-  NetFreePool (TmpStr);\r
+  gBS->FreePool (TmpStr);\r
 \r
   return Status;\r
 }\r
@@ -233,14 +233,14 @@ Returns:
     return EFI_NOT_READY;\r
   }\r
 \r
-  OptionList = NetAllocatePool (OptionCount * sizeof (EFI_DHCP4_PACKET_OPTION *));\r
+  OptionList = AllocatePool (OptionCount * sizeof (EFI_DHCP4_PACKET_OPTION *));\r
   if (OptionList == NULL) {\r
     return EFI_NOT_READY;\r
   }\r
 \r
   Status = This->Parse (This, Packet, &OptionCount, OptionList);\r
   if (EFI_ERROR (Status)) {\r
-    NetFreePool (OptionList);\r
+    gBS->FreePool (OptionList);\r
     return EFI_NOT_READY;\r
   }\r
 \r
@@ -262,7 +262,7 @@ Returns:
     Status = EFI_NOT_READY;\r
   }\r
 \r
-  NetFreePool (OptionList);\r
+  gBS->FreePool (OptionList);\r
 \r
   return Status;\r
 }\r
@@ -307,9 +307,9 @@ Returns:
     return EFI_NO_MAPPING;\r
   }\r
 \r
-  NetCopyMem (&ConfigData->NvData.LocalIp, &Dhcp4ModeData.ClientAddress, sizeof (EFI_IPv4_ADDRESS));\r
-  NetCopyMem (&ConfigData->NvData.SubnetMask, &Dhcp4ModeData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
-  NetCopyMem (&ConfigData->NvData.Gateway, &Dhcp4ModeData.RouterAddress, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&ConfigData->NvData.LocalIp, &Dhcp4ModeData.ClientAddress, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&ConfigData->NvData.SubnetMask, &Dhcp4ModeData.SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&ConfigData->NvData.Gateway, &Dhcp4ModeData.RouterAddress, sizeof (EFI_IPv4_ADDRESS));\r
 \r
   OptionCount = 0;\r
   OptionList  = NULL;\r
@@ -319,14 +319,14 @@ Returns:
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
-  OptionList = NetAllocatePool (OptionCount * sizeof (EFI_DHCP4_PACKET_OPTION *));\r
+  OptionList = AllocatePool (OptionCount * sizeof (EFI_DHCP4_PACKET_OPTION *));\r
   if (OptionList == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   Status = Dhcp4->Parse (Dhcp4, Dhcp4ModeData.ReplyPacket, &OptionCount, OptionList);\r
   if (EFI_ERROR (Status)) {\r
-    NetFreePool (OptionList);\r
+    gBS->FreePool (OptionList);\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -343,13 +343,13 @@ Returns:
       //\r
       // Primary DNS server address.\r
       //\r
-      NetCopyMem (&ConfigData->PrimaryDns, &OptionList[Index]->Data[0], sizeof (EFI_IPv4_ADDRESS));\r
+      CopyMem (&ConfigData->PrimaryDns, &OptionList[Index]->Data[0], sizeof (EFI_IPv4_ADDRESS));\r
 \r
       if (OptionList[Index]->Length > 4) {\r
         //\r
         // Secondary DNS server address\r
         //\r
-        NetCopyMem (&ConfigData->SecondaryDns, &OptionList[Index]->Data[4], sizeof (EFI_IPv4_ADDRESS));\r
+        CopyMem (&ConfigData->SecondaryDns, &OptionList[Index]->Data[4], sizeof (EFI_IPv4_ADDRESS));\r
       }\r
     } else if (OptionList[Index]->OpCode == DHCP4_TAG_SERVER_ID) {\r
       if (OptionList[Index]->Length != 4) {\r
@@ -357,11 +357,11 @@ Returns:
         break;\r
       }\r
 \r
-      NetCopyMem (&ConfigData->DhcpServer, &OptionList[Index]->Data[0], sizeof (EFI_IPv4_ADDRESS));\r
+      CopyMem (&ConfigData->DhcpServer, &OptionList[Index]->Data[0], sizeof (EFI_IPv4_ADDRESS));\r
     }\r
   }\r
 \r
-  NetFreePool (OptionList);\r
+  gBS->FreePool (OptionList);\r
 \r
   return Status;\r
 }\r
@@ -428,7 +428,7 @@ Returns:
     goto ON_EXIT;\r
   }\r
 \r
-  ParaList = NetAllocatePool (sizeof (EFI_DHCP4_PACKET_OPTION) + 3);\r
+  ParaList = AllocatePool (sizeof (EFI_DHCP4_PACKET_OPTION) + 3);\r
   if (ParaList == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto ON_EXIT;\r
@@ -443,7 +443,7 @@ Returns:
   ParaList->Data[2] = DHCP4_TAG_DNS;\r
   ParaList->Data[3] = DHCP4_TAG_ROOT_PATH;\r
 \r
-  NetZeroMem (&Dhcp4ConfigData, sizeof (EFI_DHCP4_CONFIG_DATA));\r
+  ZeroMem (&Dhcp4ConfigData, sizeof (EFI_DHCP4_CONFIG_DATA));\r
   Dhcp4ConfigData.OptionCount = 1;\r
   Dhcp4ConfigData.OptionList  = &ParaList;\r
 \r
@@ -472,7 +472,7 @@ Returns:
 ON_EXIT:\r
 \r
   if (ParaList != NULL) {\r
-    NetFreePool (ParaList);\r
+    gBS->FreePool (ParaList);\r
   }\r
 \r
   if (Dhcp4 != NULL) {\r