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

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Mtftp4Dxe / Mtftp4Support.c

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
index 7cdbddc32d1b495be429b86aa9deb92590269a5b..b17e31c103a82868ce910430690e10cc3d6f2e51 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
@@ -42,13 +42,13 @@ Mtftp4AllocateRange (
 {\r
   MTFTP4_BLOCK_RANGE        *Range;\r
 \r
-  Range = NetAllocatePool (sizeof (MTFTP4_BLOCK_RANGE));\r
+  Range = AllocatePool (sizeof (MTFTP4_BLOCK_RANGE));\r
 \r
   if (Range == NULL) {\r
     return NULL;\r
   }\r
 \r
-  NetListInit (&Range->Link);\r
+  InitializeListHead (&Range->Link);\r
   Range->Start  = Start;\r
   Range->End    = End;\r
 \r
@@ -78,7 +78,7 @@ Mtftp4AllocateRange (
 **/\r
 EFI_STATUS\r
 Mtftp4InitBlockRange (\r
-  IN NET_LIST_ENTRY         *Head,\r
+  IN LIST_ENTRY             *Head,\r
   IN UINT16                 Start,\r
   IN UINT16                 End\r
   )\r
@@ -91,7 +91,7 @@ Mtftp4InitBlockRange (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  NetListInsertTail (Head, &Range->Link);\r
+  InsertTailList (Head, &Range->Link);\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -106,12 +106,12 @@ Mtftp4InitBlockRange (
 **/\r
 INTN\r
 Mtftp4GetNextBlockNum (\r
-  IN NET_LIST_ENTRY         *Head\r
+  IN LIST_ENTRY             *Head\r
   )\r
 {\r
   MTFTP4_BLOCK_RANGE  *Range;\r
 \r
-  if (NetListIsEmpty (Head)) {\r
+  if (IsListEmpty (Head)) {\r
     return -1;\r
   }\r
 \r
@@ -135,7 +135,7 @@ Mtftp4GetNextBlockNum (
 **/\r
 VOID\r
 Mtftp4SetLastBlockNum (\r
-  IN NET_LIST_ENTRY         *Head,\r
+  IN LIST_ENTRY             *Head,\r
   IN UINT16                 Last\r
   )\r
 {\r
@@ -145,12 +145,12 @@ Mtftp4SetLastBlockNum (
   // Iterate from the tail to head to remove the block number\r
   // after the last.\r
   //\r
-  while (!NetListIsEmpty (Head)) {\r
+  while (!IsListEmpty (Head)) {\r
     Range = NET_LIST_TAIL (Head, MTFTP4_BLOCK_RANGE, Link);\r
 \r
     if (Range->Start > Last) {\r
-      NetListRemoveEntry (&Range->Link);\r
-      NetFreePool (Range);\r
+      RemoveEntryList (&Range->Link);\r
+      gBS->FreePool (Range);\r
       continue;\r
     }\r
 \r
@@ -176,13 +176,13 @@ Mtftp4SetLastBlockNum (
 **/\r
 EFI_STATUS\r
 Mtftp4RemoveBlockNum (\r
-  IN NET_LIST_ENTRY         *Head,\r
+  IN LIST_ENTRY             *Head,\r
   IN UINT16                 Num\r
   )\r
 {\r
   MTFTP4_BLOCK_RANGE        *Range;\r
   MTFTP4_BLOCK_RANGE        *NewRange;\r
-  NET_LIST_ENTRY            *Entry;\r
+  LIST_ENTRY                *Entry;\r
 \r
   NET_LIST_FOR_EACH (Entry, Head) {\r
 \r
@@ -219,8 +219,8 @@ Mtftp4RemoveBlockNum (
       Range->Start++;\r
 \r
       if (Range->Start > Range->End) {\r
-        NetListRemoveEntry (&Range->Link);\r
-        NetFreePool (Range);\r
+        RemoveEntryList (&Range->Link);\r
+        gBS->FreePool (Range);\r
       }\r
 \r
       return EFI_SUCCESS;\r
@@ -554,8 +554,8 @@ Mtftp4OnTimerTick (
   )\r
 {\r
   MTFTP4_SERVICE            *MtftpSb;\r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *Next;\r
   MTFTP4_PROTOCOL           *Instance;\r
   EFI_MTFTP4_TOKEN          *Token;\r
 \r