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

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Tcp4Dxe / Tcp4Driver.c

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
index 8102b321821cd0728d9f6633b0fcec022e1e3450..818b4e166203b576453774a2622e6b0f3462c8af 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Driver.c
@@ -98,7 +98,7 @@ Tcp4CreateTimer (
 \r
     Status = gBS->CreateEvent (\r
                     EVT_TIMER | EVT_NOTIFY_SIGNAL,\r
-                    NET_TPL_EVENT,\r
+                    TPL_NOTIFY,\r
                     TcpTicking,\r
                     NULL,\r
                     &mTcp4Timer.TimerEvent\r
@@ -283,10 +283,10 @@ Tcp4DriverBindingStart (
   TCP4_SERVICE_DATA        *TcpServiceData;\r
   IP_IO_OPEN_DATA          OpenData;\r
 \r
-  TcpServiceData = NetAllocateZeroPool (sizeof (TCP4_SERVICE_DATA));\r
+  TcpServiceData = AllocateZeroPool (sizeof (TCP4_SERVICE_DATA));\r
 \r
   if (NULL == TcpServiceData) {\r
-    TCP4_DEBUG_ERROR (("Tcp4DriverBindingStart: Have no enough"\r
+    DEBUG ((EFI_D_ERROR, "Tcp4DriverBindingStart: Have no enough"\r
       " resource to create a Tcp Servcie Data!\n"));\r
 \r
     return EFI_OUT_OF_RESOURCES;\r
@@ -298,7 +298,7 @@ Tcp4DriverBindingStart (
   TcpServiceData->IpIo = IpIoCreate (This->DriverBindingHandle, ControllerHandle);\r
   if (NULL == TcpServiceData->IpIo) {\r
 \r
-    TCP4_DEBUG_ERROR (("Tcp4DriverBindingStart: Have no enough"\r
+    DEBUG ((EFI_D_ERROR, "Tcp4DriverBindingStart: Have no enough"\r
       " resource to create an Ip Io!\n"));\r
 \r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -308,7 +308,7 @@ Tcp4DriverBindingStart (
   //\r
   // Configure and start IpIo.\r
   //\r
-  NetZeroMem (&OpenData, sizeof (IP_IO_OPEN_DATA));\r
+  ZeroMem (&OpenData, sizeof (IP_IO_OPEN_DATA));\r
 \r
   CopyMem (&OpenData.IpConfigData, &mIpIoDefaultIpConfigData, sizeof (OpenData.IpConfigData));\r
   OpenData.IpConfigData.DefaultProtocol = EFI_IP_PROTO_TCP;\r
@@ -326,7 +326,7 @@ Tcp4DriverBindingStart (
   Status = Tcp4CreateTimer ();\r
   if (EFI_ERROR (Status)) {\r
 \r
-    TCP4_DEBUG_ERROR (("Tcp4DriverBindingStart: Create TcpTimer"\r
+    DEBUG ((EFI_D_ERROR, "Tcp4DriverBindingStart: Create TcpTimer"\r
       " Event failed with %r\n", Status));\r
 \r
     goto ON_ERROR;\r
@@ -346,7 +346,7 @@ Tcp4DriverBindingStart (
                   );\r
   if (EFI_ERROR (Status)) {\r
 \r
-    TCP4_DEBUG_ERROR (("Tcp4DriverBindingStart: Install Tcp4 Service Binding"\r
+    DEBUG ((EFI_D_ERROR, "Tcp4DriverBindingStart: Install Tcp4 Service Binding"\r
       " Protocol failed for %r\n", Status));\r
 \r
     Tcp4DestroyTimer ();\r
@@ -360,7 +360,7 @@ Tcp4DriverBindingStart (
   TcpServiceData->Signature           = TCP4_DRIVER_SIGNATURE;\r
   TcpServiceData->DriverBindingHandle = This->DriverBindingHandle;\r
 \r
-  NetListInit (&TcpServiceData->SocketList);\r
+  InitializeListHead (&TcpServiceData->SocketList);\r
 \r
   TcpSetVariableData (TcpServiceData);\r
 \r
@@ -372,7 +372,7 @@ ON_ERROR:
     IpIoDestroy (TcpServiceData->IpIo);\r
   }\r
 \r
-  NetFreePool (TcpServiceData);\r
+  gBS->FreePool (TcpServiceData);\r
 \r
   return Status;\r
 }\r
@@ -426,7 +426,7 @@ Tcp4DriverBindingStop (
                   );\r
   if (EFI_ERROR (Status)) {\r
 \r
-    TCP4_DEBUG_ERROR (("Tcp4DriverBindingStop: Locate Tcp4 Service "\r
+    DEBUG ((EFI_D_ERROR, "Tcp4DriverBindingStop: Locate Tcp4 Service "\r
       " Binding Protocol failed with %r\n", Status));\r
 \r
     return EFI_DEVICE_ERROR;\r
@@ -463,10 +463,10 @@ Tcp4DriverBindingStop (
     //\r
     // Release the TCP service data\r
     //\r
-    NetFreePool (TcpServiceData);\r
+    gBS->FreePool (TcpServiceData);\r
   } else {\r
 \r
-    while (!NetListIsEmpty (&TcpServiceData->SocketList)) {\r
+    while (!IsListEmpty (&TcpServiceData->SocketList)) {\r
       Sock = NET_LIST_HEAD (&TcpServiceData->SocketList, SOCKET, Link);\r
 \r
       ServiceBinding->DestroyChild (ServiceBinding, Sock->SockHandle);\r
@@ -525,7 +525,7 @@ Tcp4CreateSocketCallback (
     //\r
     // Insert this socket into the SocketList.\r
     //\r
-    NetListInsertTail (&TcpServiceData->SocketList, &This->Link);\r
+    InsertTailList (&TcpServiceData->SocketList, &This->Link);\r
   }\r
 \r
   return Status;\r
@@ -544,7 +544,7 @@ Tcp4DestroySocketCallback (
   //\r
   // Remove this node from the list.\r
   //\r
-  NetListRemoveEntry (&This->Link);\r
+  RemoveEntryList (&This->Link);\r
 \r
   //\r
   // Close the device path protocol\r
@@ -599,7 +599,7 @@ Tcp4ServiceBindingCreateChild (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  OldTpl              = NET_RAISE_TPL (NET_TPL_LOCK);\r
+  OldTpl              = gBS->RaiseTPL (TPL_CALLBACK);\r
   Status              = EFI_SUCCESS;\r
   TcpServiceData      = TCP4_FROM_THIS (This);\r
   TcpProto.TcpService = TcpServiceData;\r
@@ -612,10 +612,10 @@ Tcp4ServiceBindingCreateChild (
   mTcp4DefaultSockData.ProtoData     = &TcpProto;\r
   mTcp4DefaultSockData.DataSize      = sizeof (TCP4_PROTO_DATA);\r
   mTcp4DefaultSockData.DriverBinding = TcpServiceData->DriverBindingHandle;\r
-  \r
+\r
   Sock = SockCreateChild (&mTcp4DefaultSockData);\r
   if (NULL == Sock) {\r
-    TCP4_DEBUG_ERROR (("Tcp4DriverBindingCreateChild: "\r
+    DEBUG ((EFI_D_ERROR, "Tcp4DriverBindingCreateChild: "\r
       "No resource to create a Tcp Child\n"));\r
 \r
     Status = EFI_OUT_OF_RESOURCES;\r
@@ -623,7 +623,7 @@ Tcp4ServiceBindingCreateChild (
     *ChildHandle = Sock->SockHandle;\r
   }\r
 \r
-  NET_RESTORE_TPL (OldTpl);\r
+  gBS->RestoreTPL (OldTpl);\r
   return Status;\r
 }\r
 \r
@@ -656,7 +656,7 @@ Tcp4ServiceBindingDestroyChild (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   //\r
   // retrieve the Tcp4 protocol from ChildHandle\r
@@ -681,7 +681,7 @@ Tcp4ServiceBindingDestroyChild (
     SockDestroyChild (Sock);\r
   }\r
 \r
-  NET_RESTORE_TPL (OldTpl);\r
+  gBS->RestoreTPL (OldTpl);\r
   return Status;\r
 }\r
 \r