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

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

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index 9f3c4fe6f1de3b8e52a77c192eccd2881ab361ae..92169cb9b284043cedf0d8d692537e2aa88ea9ce 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -24,7 +24,7 @@ BOOLEAN         mIScsiDeviceListUpdated = FALSE;
 UINTN           mNumberOfIScsiDevices   = 0;\r
 ISCSI_FORM_CALLBACK_INFO  *mCallbackInfo;\r
 \r
-NET_LIST_ENTRY  mIScsiConfigFormList = {\r
+LIST_ENTRY      mIScsiConfigFormList = {\r
   &mIScsiConfigFormList,\r
   &mIScsiConfigFormList\r
 };\r
@@ -138,7 +138,7 @@ Returns:
                   NULL\r
                   );\r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
-    DeviceList = (ISCSI_DEVICE_LIST *) NetAllocatePool (DataSize);\r
+    DeviceList = (ISCSI_DEVICE_LIST *) AllocatePool (DataSize);\r
 \r
     gRT->GetVariable (\r
           L"iSCSIDeviceList",\r
@@ -168,9 +168,9 @@ Returns:
             // Swap the current MAC address entry with the one indexed by\r
             // LastDeviceIndex.\r
             //\r
-            NetCopyMem (&TempMacInfo, CurMacInfo, sizeof (ISCSI_MAC_INFO));\r
-            NetCopyMem (CurMacInfo, &DeviceList->MacInfo[LastDeviceIndex], sizeof (ISCSI_MAC_INFO));\r
-            NetCopyMem (&DeviceList->MacInfo[LastDeviceIndex], &TempMacInfo, sizeof (ISCSI_MAC_INFO));\r
+            CopyMem (&TempMacInfo, CurMacInfo, sizeof (ISCSI_MAC_INFO));\r
+            CopyMem (CurMacInfo, &DeviceList->MacInfo[LastDeviceIndex], sizeof (ISCSI_MAC_INFO));\r
+            CopyMem (&DeviceList->MacInfo[LastDeviceIndex], &TempMacInfo, sizeof (ISCSI_MAC_INFO));\r
           }\r
 \r
           LastDeviceIndex++;\r
@@ -192,16 +192,16 @@ Returns:
       gRT->SetVariable (MacString, &mIScsiCHAPAuthInfoGuid, 0, 0, NULL);\r
     }\r
 \r
-    NetFreePool (DeviceList);\r
+    gBS->FreePool (DeviceList);\r
   } else if (Status != EFI_NOT_FOUND) {\r
-    NetFreePool (Handles);\r
+    gBS->FreePool (Handles);\r
     return Status;\r
   }\r
   //\r
   // Construct the new iSCSI device list.\r
   //\r
   DeviceListSize        = sizeof (ISCSI_DEVICE_LIST) + (NumHandles - 1) * sizeof (ISCSI_MAC_INFO);\r
-  DeviceList            = (ISCSI_DEVICE_LIST *) NetAllocatePool (DeviceListSize);\r
+  DeviceList            = (ISCSI_DEVICE_LIST *) AllocatePool (DeviceListSize);\r
   DeviceList->NumDevice = (UINT8) NumHandles;\r
 \r
   for (Index = 0; Index < NumHandles; Index++) {\r
@@ -209,7 +209,7 @@ Returns:
     Mode        = Snp->Mode;\r
 \r
     CurMacInfo  = &DeviceList->MacInfo[Index];\r
-    NetCopyMem (&CurMacInfo->Mac, &Mode->PermanentAddress, Mode->HwAddressSize);\r
+    CopyMem (&CurMacInfo->Mac, &Mode->PermanentAddress, Mode->HwAddressSize);\r
     CurMacInfo->Len = (UINT8) Mode->HwAddressSize;\r
   }\r
 \r
@@ -221,7 +221,7 @@ Returns:
         DeviceList\r
         );\r
 \r
-  NetFreePool (DeviceList);\r
+  gBS->FreePool (DeviceList);\r
 \r
   return Status;\r
 }\r
@@ -248,7 +248,7 @@ Returns:
 --*/\r
 {\r
   UINT32                  CurrentIndex;\r
-  NET_LIST_ENTRY          *Entry;\r
+  LIST_ENTRY              *Entry;\r
   ISCSI_CONFIG_FORM_ENTRY *ConfigFormEntry;\r
 \r
   CurrentIndex    = 0;\r
@@ -402,7 +402,7 @@ IScsiFormExtractConfig (
                                Results,\r
                                Progress\r
                                );\r
-  NetFreePool (IfrNvData);\r
+  gBS->FreePool (IfrNvData);\r
   return Status;\r
 }\r
 \r
@@ -516,7 +516,7 @@ IScsiFormCallback (
       PopUpInvalidNotify (L"Invalid IP address!");\r
       Status = EFI_INVALID_PARAMETER;\r
     } else {\r
-      NetCopyMem (&Private->Current->SessionConfigData.LocalIp, &HostIp.v4, sizeof (HostIp.v4));\r
+      CopyMem (&Private->Current->SessionConfigData.LocalIp, &HostIp.v4, sizeof (HostIp.v4));\r
     }\r
 \r
     break;\r
@@ -528,7 +528,7 @@ IScsiFormCallback (
       PopUpInvalidNotify (L"Invalid Subnet Mask!");\r
       Status = EFI_INVALID_PARAMETER;\r
     } else {\r
-      NetCopyMem (&Private->Current->SessionConfigData.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));\r
+      CopyMem (&Private->Current->SessionConfigData.SubnetMask, &SubnetMask.v4, sizeof (SubnetMask.v4));\r
     }\r
 \r
     break;\r
@@ -540,7 +540,7 @@ IScsiFormCallback (
       PopUpInvalidNotify (L"Invalid Gateway!");\r
       Status = EFI_INVALID_PARAMETER;\r
     } else {\r
-      NetCopyMem (&Private->Current->SessionConfigData.Gateway, &Gateway.v4, sizeof (Gateway.v4));\r
+      CopyMem (&Private->Current->SessionConfigData.Gateway, &Gateway.v4, sizeof (Gateway.v4));\r
     }\r
 \r
     break;\r
@@ -552,7 +552,7 @@ IScsiFormCallback (
       PopUpInvalidNotify (L"Invalid IP address!");\r
       Status = EFI_INVALID_PARAMETER;\r
     } else {\r
-      NetCopyMem (&Private->Current->SessionConfigData.TargetIp, &HostIp.v4, sizeof (HostIp.v4));\r
+      CopyMem (&Private->Current->SessionConfigData.TargetIp, &HostIp.v4, sizeof (HostIp.v4));\r
     }\r
 \r
     break;\r
@@ -581,7 +581,7 @@ IScsiFormCallback (
     if (EFI_ERROR (Status)) {\r
       PopUpInvalidNotify (L"Invalid LUN string!");\r
     } else {\r
-      NetCopyMem (Private->Current->SessionConfigData.BootLun, &Lun, sizeof (Lun));\r
+      CopyMem (Private->Current->SessionConfigData.BootLun, &Lun, sizeof (Lun));\r
     }\r
 \r
     break;\r
@@ -625,9 +625,9 @@ IScsiFormCallback (
       // deployed.\r
       //\r
       if (!Private->Current->SessionConfigData.InitiatorInfoFromDhcp) {\r
-        NetCopyMem (&HostIp.v4, &Private->Current->SessionConfigData.LocalIp, sizeof (HostIp.v4));\r
-        NetCopyMem (&SubnetMask.v4, &Private->Current->SessionConfigData.SubnetMask, sizeof (SubnetMask.v4));\r
-        NetCopyMem (&Gateway.v4, &Private->Current->SessionConfigData.Gateway, sizeof (Gateway.v4));\r
+        CopyMem (&HostIp.v4, &Private->Current->SessionConfigData.LocalIp, sizeof (HostIp.v4));\r
+        CopyMem (&SubnetMask.v4, &Private->Current->SessionConfigData.SubnetMask, sizeof (SubnetMask.v4));\r
+        CopyMem (&Gateway.v4, &Private->Current->SessionConfigData.Gateway, sizeof (Gateway.v4));\r
 \r
         if ((Gateway.Addr[0] != 0)) {\r
           if (SubnetMask.Addr[0] == 0) {\r
@@ -645,7 +645,7 @@ IScsiFormCallback (
       // Validate target configuration if DHCP isn't deployed.\r
       //\r
       if (!Private->Current->SessionConfigData.TargetInfoFromDhcp) {\r
-        NetCopyMem (&HostIp.v4, &Private->Current->SessionConfigData.TargetIp, sizeof (HostIp.v4));\r
+        CopyMem (&HostIp.v4, &Private->Current->SessionConfigData.TargetIp, sizeof (HostIp.v4));\r
         if (!Ip4IsUnicast (NTOHL (HostIp.Addr[0]), 0)) {\r
           PopUpInvalidNotify (L"Target IP is invalid!");\r
           Status = EFI_INVALID_PARAMETER;\r
@@ -718,7 +718,7 @@ IScsiFormCallback (
     Status = SetBrowserData (NULL, NULL, BufferSize, (UINT8 *) IfrNvData, NULL);\r
   }\r
 \r
-  NetFreePool (IfrNvData);\r
+  gBS->FreePool (IfrNvData);\r
   return Status;\r
 }\r
 \r
@@ -749,7 +749,7 @@ Returns:
 \r
 --*/\r
 {\r
-  NET_LIST_ENTRY              *Entry;\r
+  LIST_ENTRY                  *Entry;\r
   ISCSI_CONFIG_FORM_ENTRY     *ConfigFormEntry;\r
   BOOLEAN                     EntryExisted;\r
   EFI_STATUS                  Status;\r
@@ -779,12 +779,12 @@ Returns:
       //\r
       // Add a new form.\r
       //\r
-      ConfigFormEntry = (ISCSI_CONFIG_FORM_ENTRY *) NetAllocateZeroPool (sizeof (ISCSI_CONFIG_FORM_ENTRY));\r
+      ConfigFormEntry = (ISCSI_CONFIG_FORM_ENTRY *) AllocateZeroPool (sizeof (ISCSI_CONFIG_FORM_ENTRY));\r
       if (ConfigFormEntry == NULL) {\r
         return EFI_OUT_OF_RESOURCES;\r
       }\r
 \r
-      NetListInit (&ConfigFormEntry->Link);\r
+      InitializeListHead (&ConfigFormEntry->Link);\r
       ConfigFormEntry->Controller = Controller;\r
 \r
       //\r
@@ -812,7 +812,7 @@ Returns:
                       &ConfigFormEntry->SessionConfigData\r
                       );\r
       if (EFI_ERROR (Status)) {\r
-        NetZeroMem (&ConfigFormEntry->SessionConfigData, sizeof (ConfigFormEntry->SessionConfigData));\r
+        ZeroMem (&ConfigFormEntry->SessionConfigData, sizeof (ConfigFormEntry->SessionConfigData));\r
       }\r
       //\r
       // Get the CHAP authentication configuration data.\r
@@ -826,7 +826,7 @@ Returns:
                       &ConfigFormEntry->AuthConfigData\r
                       );\r
       if (EFI_ERROR (Status)) {\r
-        NetZeroMem (&ConfigFormEntry->AuthConfigData, sizeof (ConfigFormEntry->AuthConfigData));\r
+        ZeroMem (&ConfigFormEntry->AuthConfigData, sizeof (ConfigFormEntry->AuthConfigData));\r
       }\r
       //\r
       // Compose the Port string and create a new STRING_REF.\r
@@ -840,21 +840,21 @@ Returns:
       UnicodeSPrint (PortString, 128, L"Set the iSCSI parameters on port %s", ConfigFormEntry->MacString);\r
       HiiLibNewString (mCallbackInfo->RegisteredHandle, &ConfigFormEntry->PortTitleHelpToken, PortString);\r
 \r
-      NetListInsertTail (&mIScsiConfigFormList, &ConfigFormEntry->Link);\r
+      InsertTailList (&mIScsiConfigFormList, &ConfigFormEntry->Link);\r
       mNumberOfIScsiDevices++;\r
     }\r
   } else {\r
     ASSERT (EntryExisted);\r
 \r
     mNumberOfIScsiDevices--;\r
-    NetListRemoveEntry (&ConfigFormEntry->Link);\r
-    NetFreePool (ConfigFormEntry);\r
+    RemoveEntryList (&ConfigFormEntry->Link);\r
+    gBS->FreePool (ConfigFormEntry);\r
   }\r
   //\r
   // Allocate space for creation of Buffer\r
   //\r
   UpdateData.BufferSize = 0x1000;\r
-  UpdateData.Data = NetAllocateZeroPool (0x1000);\r
+  UpdateData.Data = AllocateZeroPool (0x1000);\r
   UpdateData.Offset = 0;\r
 \r
   FormIndex = 0;\r
@@ -882,7 +882,7 @@ Returns:
     &UpdateData\r
     );\r
 \r
-  NetFreePool (UpdateData.Data);\r
+  gBS->FreePool (UpdateData.Data);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -918,7 +918,7 @@ Returns:
     return Status;\r
   }\r
 \r
-  CallbackInfo = (ISCSI_FORM_CALLBACK_INFO *) NetAllocatePool (sizeof (ISCSI_FORM_CALLBACK_INFO));\r
+  CallbackInfo = (ISCSI_FORM_CALLBACK_INFO *) AllocatePool (sizeof (ISCSI_FORM_CALLBACK_INFO));\r
   if (CallbackInfo == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -967,7 +967,7 @@ Returns:
                            CallbackInfo->DriverHandle,\r
                            &CallbackInfo->RegisteredHandle\r
                            );\r
-  NetFreePool (PackageList);\r
+  gBS->FreePool (PackageList);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1002,7 +1002,7 @@ Returns:
 {\r
   ISCSI_CONFIG_FORM_ENTRY     *ConfigFormEntry;\r
 \r
-  while (!NetListIsEmpty (&mIScsiConfigFormList)) {\r
+  while (!IsListEmpty (&mIScsiConfigFormList)) {\r
     //\r
     // Uninstall the device forms as the iSCSI driver instance may fail to\r
     // control the controller but still install the device configuration form.\r
@@ -1032,7 +1032,7 @@ Returns:
         );\r
   HiiLibDestroyHiiDriverHandle (mCallbackInfo->DriverHandle);\r
 \r
-  NetFreePool (mCallbackInfo);\r
+  gBS->FreePool (mCallbackInfo);\r
 \r
   return EFI_SUCCESS;\r
 }\r