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

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Ip4Dxe / Ip4Driver.c

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
index 589eca520801c1506ebd09d742c33dc28a8766e3..85cc6afb50fc876d313afaf930169cd6f5cf0889 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Driver.c
@@ -161,7 +161,7 @@ Ip4CreateService (
   // empty resources, so if any thing goes wrong when allocating\r
   // resources, Ip4CleanService can be called to clean it up.\r
   //\r
   // empty resources, so if any thing goes wrong when allocating\r
   // resources, Ip4CleanService can be called to clean it up.\r
   //\r

-  IpSb = NetAllocatePool (sizeof (IP4_SERVICE));\r
+  IpSb = AllocatePool (sizeof (IP4_SERVICE));\r

 \r
   if (IpSb == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
 \r
   if (IpSb == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r


@@ -174,16 +174,16 @@ Ip4CreateService (
   IpSb->InDestory                   = FALSE;\r
 \r
   IpSb->NumChildren                 = 0;\r
   IpSb->InDestory                   = FALSE;\r
 \r
   IpSb->NumChildren                 = 0;\r

-  NetListInit (&IpSb->Children);\r
+  InitializeListHead (&IpSb->Children);\r

 \r
 \r

-  NetListInit (&IpSb->Interfaces);\r
+  InitializeListHead (&IpSb->Interfaces);\r

   IpSb->DefaultInterface            = NULL;\r
   IpSb->DefaultRouteTable           = NULL;\r
 \r
   Ip4InitAssembleTable (&IpSb->Assemble);\r
 \r
   IpSb->IgmpCtrl.Igmpv1QuerySeen    = 0;\r
   IpSb->DefaultInterface            = NULL;\r
   IpSb->DefaultRouteTable           = NULL;\r
 \r
   Ip4InitAssembleTable (&IpSb->Assemble);\r
 \r
   IpSb->IgmpCtrl.Igmpv1QuerySeen    = 0;\r

-  NetListInit (&IpSb->IgmpCtrl.Groups);\r
+  InitializeListHead (&IpSb->IgmpCtrl.Groups);\r

 \r
   IpSb->Image                       = ImageHandle;\r
   IpSb->Controller                  = Controller;\r
 \r
   IpSb->Image                       = ImageHandle;\r
   IpSb->Controller                  = Controller;\r


@@ -202,7 +202,7 @@ Ip4CreateService (
   IpSb->MnpConfigData.EnableReceiveTimestamps   = FALSE;\r
   IpSb->MnpConfigData.DisableBackgroundPolling  = FALSE;\r
 \r
   IpSb->MnpConfigData.EnableReceiveTimestamps   = FALSE;\r
   IpSb->MnpConfigData.DisableBackgroundPolling  = FALSE;\r
 \r

-  NetZeroMem (&IpSb->SnpMode, sizeof (EFI_SIMPLE_NETWORK_MODE));\r
+  ZeroMem (&IpSb->SnpMode, sizeof (EFI_SIMPLE_NETWORK_MODE));\r

 \r
   IpSb->Timer                       = NULL;\r
   IpSb->Ip4Config                   = NULL;\r
 \r
   IpSb->Timer                       = NULL;\r
   IpSb->Ip4Config                   = NULL;\r


@@ -224,7 +224,7 @@ Ip4CreateService (
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL | EVT_TIMER,\r
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL | EVT_TIMER,\r

-                  NET_TPL_TIMER,\r
+                  TPL_CALLBACK,\r

                   Ip4TimerTicking,\r
                   IpSb,\r
                   &IpSb->Timer\r
                   Ip4TimerTicking,\r
                   IpSb,\r
                   &IpSb->Timer\r


@@ -283,7 +283,7 @@ Ip4CreateService (
     goto ON_ERROR;\r
   }\r
 \r
     goto ON_ERROR;\r
   }\r
 \r

-  NetListInsertHead (&IpSb->Interfaces, &IpSb->DefaultInterface->Link);\r
+  InsertHeadList (&IpSb->Interfaces, &IpSb->DefaultInterface->Link);\r

 \r
   IpSb->MacString = NULL;\r
 \r
 \r
   IpSb->MacString = NULL;\r
 \r


@@ -292,7 +292,7 @@ Ip4CreateService (
 \r
 ON_ERROR:\r
   Ip4CleanService (IpSb);\r
 \r
 ON_ERROR:\r
   Ip4CleanService (IpSb);\r

-  NetFreePool (IpSb);\r
+  gBS->FreePool (IpSb);\r

 \r
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r


@@ -477,7 +477,7 @@ UNINSTALL_PROTOCOL:
 \r
 FREE_SERVICE:\r
   Ip4CleanService (IpSb);\r
 \r
 FREE_SERVICE:\r
   Ip4CleanService (IpSb);\r

-  NetFreePool (IpSb);\r
+  gBS->FreePool (IpSb);\r

 \r
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r


@@ -555,7 +555,7 @@ Ip4DriverBindingStop (
 \r
     IpSb = IP4_SERVICE_FROM_PROTOCOL (ServiceBinding);\r
 \r
 \r
     IpSb = IP4_SERVICE_FROM_PROTOCOL (ServiceBinding);\r
 \r

-    OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);\r
+    OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r

 \r
     if (IpSb->Ip4Config && (IpSb->State != IP4_SERVICE_DESTORY)) {\r
 \r
 \r
     if (IpSb->Ip4Config && (IpSb->State != IP4_SERVICE_DESTORY)) {\r
 \r


@@ -569,7 +569,7 @@ Ip4DriverBindingStop (
                       );\r
 \r
       if (EFI_ERROR (Status)) {\r
                       );\r
 \r
       if (EFI_ERROR (Status)) {\r

-        NET_RESTORE_TPL (OldTpl);\r
+        gBS->RestoreTPL (OldTpl);\r

         return Status;\r
       }\r
 \r
         return Status;\r
       }\r
 \r


@@ -585,7 +585,7 @@ Ip4DriverBindingStop (
       gBS->CloseEvent (IpSb->ReconfigEvent);\r
     }\r
 \r
       gBS->CloseEvent (IpSb->ReconfigEvent);\r
     }\r
 \r

-    NET_RESTORE_TPL (OldTpl);\r
+    gBS->RestoreTPL (OldTpl);\r

     return EFI_SUCCESS;\r
   }\r
 \r
     return EFI_SUCCESS;\r
   }\r
 \r


@@ -625,15 +625,15 @@ Ip4DriverBindingStop (
 \r
   IpSb   = IP4_SERVICE_FROM_PROTOCOL (ServiceBinding);\r
 \r
 \r
   IpSb   = IP4_SERVICE_FROM_PROTOCOL (ServiceBinding);\r
 \r

-  OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r

 \r
   if (IpSb->InDestory) {\r
 \r
   if (IpSb->InDestory) {\r

-    NET_RESTORE_TPL (OldTpl);\r
+    gBS->RestoreTPL (OldTpl);\r

     return EFI_SUCCESS;\r
   }\r
 \r
   if (IsArp) {\r
     return EFI_SUCCESS;\r
   }\r
 \r
   if (IsArp) {\r

-    while (!NetListIsEmpty (&IpSb->Children)) {\r
+    while (!IsListEmpty (&IpSb->Children)) {\r

       IpInstance = NET_LIST_HEAD (&IpSb->Children, IP4_PROTOCOL, Link);\r
 \r
       ServiceBinding->DestroyChild (ServiceBinding, IpInstance->Handle);\r
       IpInstance = NET_LIST_HEAD (&IpSb->Children, IP4_PROTOCOL, Link);\r
 \r
       ServiceBinding->DestroyChild (ServiceBinding, IpInstance->Handle);\r


@@ -670,7 +670,7 @@ Ip4DriverBindingStop (
            ServiceBinding\r
            );\r
 \r
            ServiceBinding\r
            );\r
 \r

-    NetFreePool (IpSb);\r
+    gBS->FreePool (IpSb);\r

   } else if (NumberOfChildren == 0) {\r
     IpSb->InDestory = TRUE;\r
 \r
   } else if (NumberOfChildren == 0) {\r
     IpSb->InDestory = TRUE;\r
 \r


@@ -698,10 +698,10 @@ Ip4DriverBindingStop (
            ServiceBinding\r
            );\r
 \r
            ServiceBinding\r
            );\r
 \r

-    NetFreePool (IpSb);\r
+    gBS->FreePool (IpSb);\r

   } else {\r
 \r
   } else {\r
 \r

-    while (!NetListIsEmpty (&IpSb->Children)) {\r
+    while (!IsListEmpty (&IpSb->Children)) {\r

       IpInstance = NET_LIST_HEAD (&IpSb->Children, IP4_PROTOCOL, Link);\r
 \r
       ServiceBinding->DestroyChild (ServiceBinding, IpInstance->Handle);\r
       IpInstance = NET_LIST_HEAD (&IpSb->Children, IP4_PROTOCOL, Link);\r
 \r
       ServiceBinding->DestroyChild (ServiceBinding, IpInstance->Handle);\r


@@ -714,7 +714,7 @@ Ip4DriverBindingStop (
 \r
 ON_ERROR:\r
 \r
 \r
 ON_ERROR:\r
 \r

-  NET_RESTORE_TPL (OldTpl);\r
+  gBS->RestoreTPL (OldTpl);\r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r


@@ -752,7 +752,7 @@ Ip4ServiceBindingCreateChild (
   }\r
 \r
   IpSb       = IP4_SERVICE_FROM_PROTOCOL (This);\r
   }\r
 \r
   IpSb       = IP4_SERVICE_FROM_PROTOCOL (This);\r

-  IpInstance = NetAllocatePool (sizeof (IP4_PROTOCOL));\r
+  IpInstance = AllocatePool (sizeof (IP4_PROTOCOL));\r

 \r
   if (IpInstance == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
 \r
   if (IpInstance == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r


@@ -801,12 +801,12 @@ Ip4ServiceBindingCreateChild (
   //\r
   // Insert it into the service binding instance.\r
   //\r
   //\r
   // Insert it into the service binding instance.\r
   //\r

-  OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r

 \r
 \r

-  NetListInsertTail (&IpSb->Children, &IpInstance->Link);\r
+  InsertTailList (&IpSb->Children, &IpInstance->Link);\r

   IpSb->NumChildren++;\r
 \r
   IpSb->NumChildren++;\r
 \r

-  NET_RESTORE_TPL (OldTpl);\r
+  gBS->RestoreTPL (OldTpl);\r

 \r
 ON_ERROR:\r
 \r
 \r
 ON_ERROR:\r
 \r


@@ -814,7 +814,7 @@ ON_ERROR:
 \r
     Ip4CleanProtocol (IpInstance);\r
 \r
 \r
     Ip4CleanProtocol (IpInstance);\r
 \r

-    NetFreePool (IpInstance);\r
+    gBS->FreePool (IpInstance);\r

   }\r
 \r
   return Status;\r
   }\r
 \r
   return Status;\r


@@ -879,7 +879,7 @@ Ip4ServiceBindingDestroyChild (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r

-  OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r

 \r
   //\r
   // A child can be destoried more than once. For example,\r
 \r
   //\r
   // A child can be destoried more than once. For example,\r


@@ -888,7 +888,7 @@ Ip4ServiceBindingDestroyChild (
   // the IP child it opens.\r
   //\r
   if (IpInstance->State == IP4_STATE_DESTORY) {\r
   // the IP child it opens.\r
   //\r
   if (IpInstance->State == IP4_STATE_DESTORY) {\r

-    NET_RESTORE_TPL (OldTpl);\r
+    gBS->RestoreTPL (OldTpl);\r

     return EFI_SUCCESS;\r
   }\r
 \r
     return EFI_SUCCESS;\r
   }\r
 \r


@@ -944,17 +944,17 @@ Ip4ServiceBindingDestroyChild (
     goto ON_ERROR;\r
   }\r
 \r
     goto ON_ERROR;\r
   }\r
 \r

-  NetListRemoveEntry (&IpInstance->Link);\r
+  RemoveEntryList (&IpInstance->Link);\r

   IpSb->NumChildren--;\r
 \r
   IpSb->NumChildren--;\r
 \r

-  NET_RESTORE_TPL (OldTpl);\r
+  gBS->RestoreTPL (OldTpl);\r

 \r
 \r

-  NetFreePool (IpInstance);\r
+  gBS->FreePool (IpInstance);\r

   return EFI_SUCCESS;\r
 \r
 ON_ERROR:\r
   IpInstance->State = State;\r
   return EFI_SUCCESS;\r
 \r
 ON_ERROR:\r
   IpInstance->State = State;\r

-  NET_RESTORE_TPL (OldTpl);\r
+  gBS->RestoreTPL (OldTpl);\r

 \r
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r