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

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

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
index 2729c3b4292fdf374bd4cd053f97e420ae3a56da..697424ad72585075205599d399eb57aa49719268 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiExtScsiPassThru.c
@@ -101,17 +101,17 @@ Returns:
   Private       = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);\r
   ConfigNvData  = &Private->Session.ConfigData.NvData;\r
 \r
-  if ((*Target)[0] == 0 && (NetCompareMem (Lun, ConfigNvData->BootLun, sizeof (UINT64)) == 0)) {\r
+  if ((*Target)[0] == 0 && (CompareMem (Lun, ConfigNvData->BootLun, sizeof (UINT64)) == 0)) {\r
     //\r
     // Only one <Target, Lun> pair per iSCSI Driver instance.\r
     //\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  NetSetMem (TargetId, TARGET_MAX_BYTES, 0xFF);\r
-  if (NetCompareMem (*Target, TargetId, TARGET_MAX_BYTES) == 0) {\r
+  SetMem (TargetId, TARGET_MAX_BYTES, 0xFF);\r
+  if (CompareMem (*Target, TargetId, TARGET_MAX_BYTES) == 0) {\r
     (*Target)[0] = 0;\r
-    NetCopyMem (Lun, ConfigNvData->BootLun, sizeof (UINT64));\r
+    CopyMem (Lun, ConfigNvData->BootLun, sizeof (UINT64));\r
 \r
     return EFI_SUCCESS;\r
   }\r
@@ -181,12 +181,12 @@ Returns:
   ConfigNvData  = &Session->ConfigData.NvData;\r
   AuthConfig    = &Session->AuthData.AuthConfig;\r
 \r
-  if (NetCompareMem (&Lun, ConfigNvData->BootLun, sizeof (UINT64)) != 0) {\r
+  if (CompareMem (&Lun, ConfigNvData->BootLun, sizeof (UINT64)) != 0) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
   DevPathNodeLen  = sizeof (ISCSI_DEVICE_PATH) + AsciiStrLen (ConfigNvData->TargetName) + 1;\r
-  Node            = NetAllocatePool (DevPathNodeLen);\r
+  Node            = AllocatePool (DevPathNodeLen);\r
   if (Node == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -214,7 +214,7 @@ Returns:
     break;\r
   }\r
 \r
-  NetCopyMem (&Node->Iscsi.Lun, ConfigNvData->BootLun, sizeof (UINT64));\r
+  CopyMem (&Node->Iscsi.Lun, ConfigNvData->BootLun, sizeof (UINT64));\r
   Node->Iscsi.TargetPortalGroupTag = Session->TargetPortalGroupTag;\r
   AsciiStrCpy ((CHAR8 *) Node + sizeof (ISCSI_DEVICE_PATH), ConfigNvData->TargetName);\r
 \r
@@ -276,13 +276,13 @@ Returns:
   Private       = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);\r
   ConfigNvData  = &Private->Session.ConfigData.NvData;\r
 \r
-  NetZeroMem (*Target, TARGET_MAX_BYTES);\r
+  ZeroMem (*Target, TARGET_MAX_BYTES);\r
 \r
   if (AsciiStrCmp (ConfigNvData->TargetName, (CHAR8 *) DevicePath + sizeof (ISCSI_DEVICE_PATH)) != 0) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  NetCopyMem (Lun, ConfigNvData->BootLun, sizeof (UINT64));\r
+  CopyMem (Lun, ConfigNvData->BootLun, sizeof (UINT64));\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -377,9 +377,9 @@ Returns:
 {\r
   UINT8 TargetId[TARGET_MAX_BYTES];\r
 \r
-  NetSetMem (TargetId, TARGET_MAX_BYTES, 0xFF);\r
+  SetMem (TargetId, TARGET_MAX_BYTES, 0xFF);\r
 \r
-  if (NetCompareMem (*Target, TargetId, TARGET_MAX_BYTES) == 0) {\r
+  if (CompareMem (*Target, TargetId, TARGET_MAX_BYTES) == 0) {\r
     (*Target)[0] = 0;\r
     return EFI_SUCCESS;\r
   } else if ((*Target)[0] == 0) {\r