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

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

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
index f6f431de68ca8ab7fbaa8ca683b4ae49edce0551..5886b94351a9d55bfddb3c614be38cb2d6cb61d3 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
@@ -151,7 +151,7 @@ Mtftp4CreateService (
   EFI_STATUS                Status;\r
 \r
   *Service  = NULL;\r
-  MtftpSb   = NetAllocatePool (sizeof (MTFTP4_SERVICE));\r
+  MtftpSb   = AllocatePool (sizeof (MTFTP4_SERVICE));\r
 \r
   if (MtftpSb == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
@@ -161,7 +161,7 @@ Mtftp4CreateService (
   MtftpSb->ServiceBinding = gMtftp4ServiceBindingTemplete;\r
   MtftpSb->InDestory      = FALSE;\r
   MtftpSb->ChildrenNum    = 0;\r
-  NetListInit (&MtftpSb->Children);\r
+  InitializeListHead (&MtftpSb->Children);\r
 \r
   MtftpSb->Timer          = NULL;\r
   MtftpSb->TimerToGetMap  = NULL;\r
@@ -174,14 +174,14 @@ Mtftp4CreateService (
   //\r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL | EVT_TIMER,\r
-                  NET_TPL_TIMER,\r
+                  TPL_CALLBACK,\r
                   Mtftp4OnTimerTick,\r
                   MtftpSb,\r
                   &MtftpSb->Timer\r
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    NetFreePool (MtftpSb);\r
+    gBS->FreePool (MtftpSb);\r
     return Status;\r
   }\r
 \r
@@ -191,14 +191,14 @@ Mtftp4CreateService (
   //\r
   Status = gBS->CreateEvent (\r
                   EVT_TIMER,\r
-                  NET_TPL_TIMER,\r
+                  TPL_CALLBACK,\r
                   NULL,\r
                   NULL,\r
                   &MtftpSb->TimerToGetMap\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     gBS->CloseEvent (MtftpSb->Timer);\r
-    NetFreePool (MtftpSb);\r
+    gBS->FreePool (MtftpSb);\r
     return Status;\r
   }\r
 \r
@@ -207,7 +207,7 @@ Mtftp4CreateService (
   if (MtftpSb->ConnectUdp == NULL) {\r
     gBS->CloseEvent (MtftpSb->TimerToGetMap);\r
     gBS->CloseEvent (MtftpSb->Timer);\r
-    NetFreePool (MtftpSb);\r
+    gBS->FreePool (MtftpSb);\r
     return EFI_DEVICE_ERROR;\r
   }\r
 \r
@@ -306,7 +306,7 @@ Mtftp4DriverBindingStart (
 \r
 ON_ERROR:\r
   Mtftp4CleanService (MtftpSb);\r
-  NetFreePool (MtftpSb);\r
+  gBS->FreePool (MtftpSb);\r
 \r
   return Status;\r
 }\r
@@ -370,7 +370,7 @@ Mtftp4DriverBindingStop (
     return EFI_SUCCESS;\r
   }\r
 \r
-  OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   if (NumberOfChildren == 0) {\r
 \r
@@ -384,10 +384,10 @@ Mtftp4DriverBindingStop (
 \r
     Mtftp4CleanService (MtftpSb);\r
 \r
-    NetFreePool (MtftpSb);\r
+    gBS->FreePool (MtftpSb);\r
   } else {\r
 \r
-    while (!NetListIsEmpty (&MtftpSb->Children)) {\r
+    while (!IsListEmpty (&MtftpSb->Children)) {\r
       Instance = NET_LIST_HEAD (&MtftpSb->Children, MTFTP4_PROTOCOL, Link);\r
       Mtftp4ServiceBindingDestroyChild (ServiceBinding, Instance->Handle);\r
     }\r
@@ -397,7 +397,7 @@ Mtftp4DriverBindingStop (
     }\r
   }\r
 \r
-  NET_RESTORE_TPL (OldTpl);\r
+  gBS->RestoreTPL (OldTpl);\r
   return Status;\r
 }\r
 \r
@@ -417,16 +417,16 @@ Mtftp4InitProtocol (
   IN MTFTP4_PROTOCOL        *Instance\r
   )\r
 {\r
-  NetZeroMem (Instance, sizeof (MTFTP4_PROTOCOL));\r
+  ZeroMem (Instance, sizeof (MTFTP4_PROTOCOL));\r
 \r
   Instance->Signature = MTFTP4_PROTOCOL_SIGNATURE;\r
-  NetListInit (&Instance->Link);\r
+  InitializeListHead (&Instance->Link);\r
   CopyMem (&Instance->Mtftp4, &gMtftp4ProtocolTemplate, sizeof (Instance->Mtftp4));\r
   Instance->State     = MTFTP4_STATE_UNCONFIGED;\r
   Instance->Indestory = FALSE;\r
   Instance->Service   = MtftpSb;\r
 \r
-  NetListInit (&Instance->Blocks);\r
+  InitializeListHead (&Instance->Blocks);\r
 }\r
 \r
 \r
@@ -458,7 +458,7 @@ Mtftp4ServiceBindingCreateChild (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  Instance = NetAllocatePool (sizeof (*Instance));\r
+  Instance = AllocatePool (sizeof (*Instance));\r
 \r
   if (Instance == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
@@ -476,7 +476,7 @@ Mtftp4ServiceBindingCreateChild (
                             );\r
 \r
   if (Instance->UnicastPort == NULL) {\r
-    NetFreePool (Instance);\r
+    gBS->FreePool (Instance);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
@@ -521,18 +521,18 @@ Mtftp4ServiceBindingCreateChild (
   //\r
   // Add it to the parent's child list.\r
   //\r
-  OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
-  NetListInsertTail (&MtftpSb->Children, &Instance->Link);\r
+  InsertTailList (&MtftpSb->Children, &Instance->Link);\r
   MtftpSb->ChildrenNum++;\r
 \r
-  NET_RESTORE_TPL (OldTpl);\r
+  gBS->RestoreTPL (OldTpl);\r
 \r
 ON_ERROR:\r
 \r
   if (EFI_ERROR (Status)) {\r
     UdpIoFreePort (Instance->UnicastPort);\r
-    NetFreePool (Instance);\r
+    gBS->FreePool (Instance);\r
   }\r
 \r
   return Status;\r
@@ -620,16 +620,16 @@ Mtftp4ServiceBindingDestroyChild (
     return Status;\r
   }\r
 \r
-  OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   Mtftp4CleanOperation (Instance, EFI_DEVICE_ERROR);\r
   UdpIoFreePort (Instance->UnicastPort);\r
 \r
-  NetListRemoveEntry (&Instance->Link);\r
+  RemoveEntryList (&Instance->Link);\r
   MtftpSb->ChildrenNum--;\r
 \r
-  NET_RESTORE_TPL (OldTpl);\r
+  gBS->RestoreTPL (OldTpl);\r
 \r
-  NetFreePool (Instance);\r
+  gBS->FreePool (Instance);\r
   return EFI_SUCCESS;\r
 }\r