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

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

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
index 707bc3ada3b08727c5c67b2ab355ae07b4e455ec..38694f9bf5abe7fdaf7fda5fa7195082c6c89f37 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
@@ -162,10 +162,10 @@ TcpGetMaxSndNxt (
   IN TCP_CB *Tcb\r
   )\r
 {\r
-  NET_LIST_ENTRY  *Entry;\r
+  LIST_ENTRY      *Entry;\r
   NET_BUF         *Nbuf;\r
 \r
-  if (NetListIsEmpty (&Tcb->SndQue)) {\r
+  if (IsListEmpty (&Tcb->SndQue)) {\r
     return Tcb->SndNxt;\r
   }\r
 \r
@@ -271,8 +271,9 @@ TcpDataToSend (
 SetPersistTimer:\r
   if (!TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_REXMIT)) {\r
 \r
-    TCP4_DEBUG_WARN (\r
-      ("TcpDataToSend: enter persistent state for TCB %x\n",\r
+    DEBUG (\r
+      (EFI_D_WARN,\r
+      "TcpDataToSend: enter persistent state for TCB %x\n",\r
       Tcb)\r
       );\r
 \r
@@ -425,8 +426,8 @@ TcpGetSegmentSndQue (
   IN UINT32    Len\r
   )\r
 {\r
-  NET_LIST_ENTRY  *Head;\r
-  NET_LIST_ENTRY  *Cur;\r
+  LIST_ENTRY      *Head;\r
+  LIST_ENTRY      *Cur;\r
   NET_BUF         *Node;\r
   TCP_SEG         *Seg;\r
   NET_BUF         *Nbuf;\r
@@ -538,7 +539,7 @@ TcpGetSegmentSndQue (
     }\r
   }\r
 \r
-  NetCopyMem (TCPSEG_NETBUF (Nbuf), Seg, sizeof (TCP_SEG));\r
+  CopyMem (TCPSEG_NETBUF (Nbuf), Seg, sizeof (TCP_SEG));\r
 \r
   TCPSEG_NETBUF (Nbuf)->Seq   = Seq;\r
   TCPSEG_NETBUF (Nbuf)->End   = End;\r
@@ -578,7 +579,7 @@ TcpGetSegmentSock (
   Nbuf = NetbufAlloc (Len + TCP_MAX_HEAD);\r
 \r
   if (Nbuf == NULL) {\r
-    TCP4_DEBUG_ERROR (("TcpGetSegmentSock: failed to allocate "\r
+    DEBUG ((EFI_D_ERROR, "TcpGetSegmentSock: failed to allocate "\r
       "a netbuf for TCB %x\n",Tcb));\r
 \r
     return NULL;\r
@@ -603,7 +604,7 @@ TcpGetSegmentSock (
   TCPSEG_NETBUF (Nbuf)->Seq = Seq;\r
   TCPSEG_NETBUF (Nbuf)->End = Seq + Len;\r
 \r
-  NetListInsertTail (&(Tcb->SndQue), &(Nbuf->List));\r
+  InsertTailList (&(Tcb->SndQue), &(Nbuf->List));\r
 \r
   if (DataGet != 0) {\r
 \r
@@ -679,7 +680,7 @@ TcpRetransmit (
   // 3. will not change the boundaries of queued segments.\r
   //\r
   if (TCP_SEQ_LT (Tcb->SndWl2 + Tcb->SndWnd, Seq)) {\r
-    TCP4_DEBUG_WARN (("TcpRetransmit: retransmission cancelled "\r
+    DEBUG ((EFI_D_WARN, "TcpRetransmit: retransmission cancelled "\r
       "because send window too small for TCB %x\n", Tcb));\r
 \r
     return 0;\r
@@ -780,8 +781,9 @@ SEND_AGAIN:
   Nbuf = TcpGetSegment (Tcb, Seq, Len);\r
 \r
   if (Nbuf == NULL) {\r
-    TCP4_DEBUG_ERROR (\r
-      ("TcpToSendData: failed to get a segment for TCB %x\n",\r
+    DEBUG (\r
+      (EFI_D_ERROR,\r
+      "TcpToSendData: failed to get a segment for TCB %x\n",\r
       Tcb)\r
       );\r
 \r
@@ -809,7 +811,7 @@ SEND_AGAIN:
         TCP_SEQ_LT (End + 1, Tcb->SndWnd + Tcb->SndWl2)\r
           ) {\r
 \r
-      TCP4_DEBUG_TRACE (("TcpToSendData: send FIN "\r
+      DEBUG ((EFI_D_INFO, "TcpToSendData: send FIN "\r
         "to peer for TCB %x in state %d\n", Tcb, Tcb->State));\r
 \r
       End++;\r
@@ -829,7 +831,7 @@ SEND_AGAIN:
   // don't send an empty segment here.\r
   //\r
   if (Seg->End == Seg->Seq) {\r
-    TCP4_DEBUG_WARN (("TcpToSendData: created a empty"\r
+    DEBUG ((EFI_D_WARN, "TcpToSendData: created a empty"\r
       " segment for TCB %x, free it now\n", Tcb));\r
 \r
     NetbufFree (Nbuf);\r
@@ -886,7 +888,7 @@ SEND_AGAIN:
   if ((Tcb->CongestState == TCP_CONGEST_OPEN) &&\r
       !TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RTT_ON)) {\r
 \r
-    TCP4_DEBUG_TRACE (("TcpToSendData: set RTT measure "\r
+    DEBUG ((EFI_D_INFO, "TcpToSendData: set RTT measure "\r
       "sequence %d for TCB %x\n", Seq, Tcb));\r
 \r
     TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_RTT_ON);\r
@@ -1020,7 +1022,7 @@ TcpToSendAck (
     return;\r
   }\r
 \r
-  TCP4_DEBUG_TRACE (("TcpToSendAck: scheduled a delayed"\r
+  DEBUG ((EFI_D_INFO, "TcpToSendAck: scheduled a delayed"\r
     " ACK for TCB %x\n", Tcb));\r
 \r
   //\r
@@ -1182,14 +1184,14 @@ TcpVerifySegment (
 **/\r
 INTN\r
 TcpCheckSndQue (\r
-  IN NET_LIST_ENTRY *Head\r
+  IN LIST_ENTRY     *Head\r
   )\r
 {\r
-  NET_LIST_ENTRY  *Entry;\r
+  LIST_ENTRY      *Entry;\r
   NET_BUF         *Nbuf;\r
   TCP_SEQNO       Seq;\r
 \r
-  if (NetListIsEmpty (Head)) {\r
+  if (IsListEmpty (Head)) {\r
     return 1;\r
   }\r
   //\r