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

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

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
index 8dee904babc48f20542da405096c5b6212c4e1f6..1683d88a9e9204484928a875719bb8e07c0aa0e7 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
@@ -198,8 +198,8 @@ Returns:
   CHAR8   Digit;\r
   UINTN   Temp;\r
 \r
-  NetZeroMem (Lun, 8);\r
-  NetZeroMem (LunUnitStr, sizeof (LunUnitStr));\r
+  ZeroMem (Lun, 8);\r
+  ZeroMem (LunUnitStr, sizeof (LunUnitStr));\r
 \r
   Index         = 0;\r
   LunUnitStr[0] = Str;\r
@@ -667,7 +667,7 @@ Returns:
   ISCSI_DRIVER_DATA *Private;\r
   EFI_STATUS        Status;\r
 \r
-  Private = NetAllocateZeroPool (sizeof (ISCSI_DRIVER_DATA));\r
+  Private = AllocateZeroPool (sizeof (ISCSI_DRIVER_DATA));\r
   if (Private == NULL) {\r
     return NULL;\r
   }\r
@@ -688,11 +688,11 @@ Returns:
                   &Private->ExitBootServiceEvent\r
                   );\r
   if (EFI_ERROR (Status)) {\r
-    NetFreePool (Private);\r
+    gBS->FreePool (Private);\r
     return NULL;\r
   }\r
 \r
-  NetCopyMem(&Private->IScsiExtScsiPassThru, &gIScsiExtScsiPassThruProtocolTemplate, sizeof(EFI_EXT_SCSI_PASS_THRU_PROTOCOL));\r
+  CopyMem(&Private->IScsiExtScsiPassThru, &gIScsiExtScsiPassThruProtocolTemplate, sizeof(EFI_EXT_SCSI_PASS_THRU_PROTOCOL));\r
 \r
   //\r
   // 0 is designated to the TargetId, so use another value for the AdapterId.\r
@@ -713,7 +713,7 @@ Returns:
                   );\r
   if (EFI_ERROR (Status)) {\r
     gBS->CloseEvent (Private->ExitBootServiceEvent);\r
-    NetFreePool (Private);\r
+    gBS->FreePool (Private);\r
 \r
     return NULL;\r
   }\r
@@ -750,7 +750,7 @@ Returns:
           Private->DevicePath\r
           );\r
 \r
-    NetFreePool (Private->DevicePath);\r
+    gBS->FreePool (Private->DevicePath);\r
   }\r
 \r
   if (Private->ExtScsiPassThruHandle != NULL) {\r
@@ -763,7 +763,7 @@ Returns:
 \r
   gBS->CloseEvent (Private->ExitBootServiceEvent);\r
 \r
-  NetFreePool (Private);\r
+  gBS->FreePool (Private);\r
 }\r
 \r
 EFI_STATUS\r