Make use of correct format String:

1) UINT64 should use %lx
2) POINTER type should use %p
3) EFI_STATUS should use %r

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6253 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
index 9dccd6f00d4b7179793304d1ce9c6091e153d32d..44405b73ce4b4562cc58b6624db5a20f9355df00 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
@@ -1595,7 +1595,7 @@ EhcDriverBindingStart (
     );\r
 \r
 \r
     );\r
 \r
 \r

-  DEBUG ((EFI_D_INFO, "EhcDriverBindingStart: EHCI started for controller @ %x\n", Controller));\r
+  DEBUG ((EFI_D_INFO, "EhcDriverBindingStart: EHCI started for controller @ %p\n", Controller));\r

   return EFI_SUCCESS;\r
 \r
 UNINSTALL_USBHC:\r
   return EFI_SUCCESS;\r
 \r
 UNINSTALL_USBHC:\r

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
index bdc8f2ff03f76aeb63df2f646b35a3684da173db..ca3e2524db2ea0f79c1b88c17188d27fe98a02f7 100644 (file)
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
@@ -145,7 +145,7 @@ EhcDumpQh (
     DEBUG ((EFI_D_INFO, Msg));\r
   }\r
 \r
     DEBUG ((EFI_D_INFO, Msg));\r
   }\r
 \r

-  DEBUG ((EFI_D_INFO, "Queue head @ 0x%x, interval %d, next qh %x\n",\r
+  DEBUG ((EFI_D_INFO, "Queue head @ 0x%p, interval %d, next qh %x\n",\r

                                 Qh, Qh->Interval, Qh->NextQh));\r
 \r
   QhHw = &Qh->QhHw;\r
                                 Qh, Qh->Interval, Qh->NextQh));\r
 \r
   QhHw = &Qh->QhHw;\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
index b4231079ce311ea1d368175782cfe5cb4c094a5b..fc9bd5335f38d6be5cd4d34734ecc721f1186fbe 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
@@ -994,7 +994,7 @@ UsbBusBuildProtocol (
 \r
   UsbBus->Devices[0] = RootHub;\r
 \r
 \r
   UsbBus->Devices[0] = RootHub;\r
 \r

-  DEBUG ((EFI_D_INFO, "UsbBusStart: usb bus started on %x, root hub %x\n", Controller, RootIf));\r
+  DEBUG ((EFI_D_INFO, "UsbBusStart: usb bus started on %p, root hub %p\n", Controller, RootIf));\r

   return EFI_SUCCESS;\r
 \r
 FREE_ROOTHUB:\r
   return EFI_SUCCESS;\r
 \r
 FREE_ROOTHUB:\r


@@ -1355,7 +1355,7 @@ UsbBusControllerDriverStop (
     return EFI_SUCCESS;\r
   }\r
 \r
     return EFI_SUCCESS;\r
   }\r
 \r

-  DEBUG (( EFI_D_INFO, "UsbBusStop: usb bus stopped on %x\n", Controller));\r
+  DEBUG (( EFI_D_INFO, "UsbBusStop: usb bus stopped on %p\n", Controller));\r

 \r
   //\r
   // Locate USB_BUS for the current host controller\r
 \r
   //\r
   // Locate USB_BUS for the current host controller\r

diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
index 2a1ee0af10b1e307abfb05c3bceb38b516de4cd1..4a2e382cd7a8b07f76c0ca5bc85443b72eba21ac 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
@@ -983,7 +983,7 @@ UsbRootHubInit (
     return Status;\r
   }\r
 \r
     return Status;\r
   }\r
 \r

-  DEBUG (( EFI_D_INFO, "UsbRootHubInit: root hub %x - max speed %d, %d ports\n",\r
+  DEBUG (( EFI_D_INFO, "UsbRootHubInit: root hub %p - max speed %d, %d ports\n",\r

               HubIf, MaxSpeed, NumOfPort));\r
 \r
   HubIf->IsHub      = TRUE;\r
               HubIf, MaxSpeed, NumOfPort));\r
 \r
   HubIf->IsHub      = TRUE;\r


@@ -1274,7 +1274,7 @@ UsbRootHubRelease (
   IN USB_INTERFACE        *HubIf\r
   )\r
 {\r
   IN USB_INTERFACE        *HubIf\r
   )\r
 {\r

-  DEBUG (( EFI_D_INFO, "UsbRootHubRelease: root hub released for hub %x\n", HubIf));\r
+  DEBUG (( EFI_D_INFO, "UsbRootHubRelease: root hub released for hub %p\n", HubIf));\r

 \r
   gBS->SetTimer (HubIf->HubNotify, TimerCancel, USB_ROOTHUB_POLL_INTERVAL);\r
   gBS->CloseEvent (HubIf->HubNotify);\r
 \r
   gBS->SetTimer (HubIf->HubNotify, TimerCancel, USB_ROOTHUB_POLL_INTERVAL);\r
   gBS->CloseEvent (HubIf->HubNotify);\r

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 6f89ddc24b3a905f63d327448f0078ee11aa5c9a..0719d4b690f9162a71a4b29e7057561dd07c59e3 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -1197,7 +1197,7 @@ CoreStartImage (
   DEBUG_CODE_BEGIN ();\r
     if (Image->ExitDataSize != 0 || Image->ExitData != NULL) {\r
 \r
   DEBUG_CODE_BEGIN ();\r
     if (Image->ExitDataSize != 0 || Image->ExitData != NULL) {\r
 \r

-      DEBUG ((DEBUG_LOAD, "StartImage: ExitDataSize %d, ExitData %x", Image->ExitDataSize, Image->ExitData));\r
+      DEBUG ((DEBUG_LOAD, "StartImage: ExitDataSize %d, ExitData %p", Image->ExitDataSize, Image->ExitData));\r

       if (Image->ExitData != NULL) {\r
         DEBUG ((DEBUG_LOAD, " (%hs)", Image->ExitData));\r
       }\r
       if (Image->ExitData != NULL) {\r
         DEBUG ((DEBUG_LOAD, " (%hs)", Image->ExitData));\r
       }\r

diff --git a/MdeModulePkg/Core/Pei/Ppi/Ppi.c b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
index 13b1588177185c356c191b873032a631daf63689..90d5c925a0c73d480e0c70befa7ecfd8db9bdd39 100644 (file)
--- a/MdeModulePkg/Core/Pei/Ppi/Ppi.c
+++ b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
@@ -162,7 +162,7 @@ PeiInstallPpi (
     //\r
     if ((PpiList->Flags & EFI_PEI_PPI_DESCRIPTOR_PPI) == 0) {\r
       PrivateData->PpiData.PpiListEnd = LastCallbackInstall;\r
     //\r
     if ((PpiList->Flags & EFI_PEI_PPI_DESCRIPTOR_PPI) == 0) {\r
       PrivateData->PpiData.PpiListEnd = LastCallbackInstall;\r

-      DEBUG((EFI_D_ERROR, "ERROR -> InstallPpi: %g %x\n", PpiList->Guid, PpiList->Ppi));\r
+      DEBUG((EFI_D_ERROR, "ERROR -> InstallPpi: %g %p\n", PpiList->Guid, PpiList->Ppi));\r

       return  EFI_INVALID_PARAMETER;\r
     }\r
 \r
       return  EFI_INVALID_PARAMETER;\r
     }\r
 \r


@@ -401,7 +401,7 @@ PeiNotifyPpi (
     //\r
     if ((NotifyList->Flags & EFI_PEI_PPI_DESCRIPTOR_NOTIFY_TYPES) == 0) {\r
         PrivateData->PpiData.NotifyListEnd = LastCallbackNotify;\r
     //\r
     if ((NotifyList->Flags & EFI_PEI_PPI_DESCRIPTOR_NOTIFY_TYPES) == 0) {\r
         PrivateData->PpiData.NotifyListEnd = LastCallbackNotify;\r

-        DEBUG((EFI_D_ERROR, "ERROR -> InstallNotify: %g %x\n", NotifyList->Guid, NotifyList->Notify));\r
+        DEBUG((EFI_D_ERROR, "ERROR -> InstallNotify: %g %p\n", NotifyList->Guid, NotifyList->Notify));\r

       return  EFI_INVALID_PARAMETER;\r
     }\r
 \r
       return  EFI_INVALID_PARAMETER;\r
     }\r
 \r


@@ -569,7 +569,7 @@ DispatchNotify (
           (((INT32 *)SearchGuid)[1] == ((INT32 *)CheckGuid)[1]) &&\r
           (((INT32 *)SearchGuid)[2] == ((INT32 *)CheckGuid)[2]) &&\r
           (((INT32 *)SearchGuid)[3] == ((INT32 *)CheckGuid)[3])) {\r
           (((INT32 *)SearchGuid)[1] == ((INT32 *)CheckGuid)[1]) &&\r
           (((INT32 *)SearchGuid)[2] == ((INT32 *)CheckGuid)[2]) &&\r
           (((INT32 *)SearchGuid)[3] == ((INT32 *)CheckGuid)[3])) {\r

-        DEBUG ((EFI_D_INFO, "Notify: PPI Guid: %g, Peim notify entry point: %x\n",\r
+        DEBUG ((EFI_D_INFO, "Notify: PPI Guid: %g, Peim notify entry point: %p\n",\r

           SearchGuid,\r
           NotifyDescriptor->Notify\r
           ));\r
           SearchGuid,\r
           NotifyDescriptor->Notify\r
           ));\r

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_loadfile.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_loadfile.c
index e430757ce4603f713f2241242169c0799bd95cdf..9c4baef5e785ad3a59c684df20684154298039e1 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_loadfile.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_loadfile.c
@@ -1329,7 +1329,7 @@ LoadFile (
   //\r
   // The following line is only used for passing ICC build.\r
   //\r
   //\r
   // The following line is only used for passing ICC build.\r
   //\r

-  DEBUG ((EFI_D_INFO, "FilePath = %x\n", FilePath));\r
+  DEBUG ((EFI_D_INFO, "FilePath = %p\n", FilePath));\r

 \r
   //\r
   //\r
 \r
   //\r
   //\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
index 31b5022bd08f9f5d2c15f116262891447de7e67d..e01a135708bd2eab013fe67e79c06e875156aa45 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
@@ -221,7 +221,7 @@ del_v2p (
     FreePool (v);\r
 \r
     if (Status) {\r
     FreePool (v);\r
 \r
     if (Status) {\r

-      DEBUG ((EFI_D_ERROR, "Unmap failed with status = %x\n", Status));\r
+      DEBUG ((EFI_D_ERROR, "Unmap failed with status = %r\n", Status));\r

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


@@ -233,7 +233,7 @@ del_v2p (
       FreePool (t);\r
 \r
       if (Status) {\r
       FreePool (t);\r
 \r
       if (Status) {\r

-        DEBUG ((EFI_D_ERROR, "Unmap failed with status = %x\n", Status));\r
+        DEBUG ((EFI_D_ERROR, "Unmap failed with status = %r\n", Status));\r

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


@@ -353,12 +353,12 @@ SimpleNetworkDriverSupported (
 \r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_ALREADY_STARTED) {\r
 \r
   if (EFI_ERROR (Status)) {\r
     if (Status == EFI_ALREADY_STARTED) {\r

-      DEBUG ((EFI_D_INFO, "Support(): Already Started. on handle %x\n", Controller));\r
+      DEBUG ((EFI_D_INFO, "Support(): Already Started. on handle %p\n", Controller));\r

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

-  DEBUG ((EFI_D_INFO, "Support(): UNDI3.1 found on handle %x\n", Controller));\r
+  DEBUG ((EFI_D_INFO, "Support(): UNDI3.1 found on handle %p\n", Controller));\r

 \r
   //\r
   // check the version, we don't want to connect to the undi16\r
 \r
   //\r
   // check the version, we don't want to connect to the undi16\r


@@ -422,7 +422,7 @@ SimpleNetworkDriverSupported (
   }\r
 \r
   Status = EFI_SUCCESS;\r
   }\r
 \r
   Status = EFI_SUCCESS;\r

-  DEBUG ((EFI_D_INFO, "Support(): supported on %x\n", Controller));\r
+  DEBUG ((EFI_D_INFO, "Support(): supported on %p\n", Controller));\r

 \r
 Done:\r
   gBS->CloseProtocol (\r
 \r
 Done:\r
   gBS->CloseProtocol (\r

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c b/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
index 8ee0cad566632a2aeffac06347233d8670be9172..1567e4b243b9209aa0bac9c6dff2593c4e01e468 100644 (file)
--- a/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
@@ -188,9 +188,9 @@ pxe_transmit (
   //\r
   DEBUG ((EFI_D_NET, "\nsnp->undi.transmit()  "));\r
   DEBUG ((EFI_D_NET, "\nsnp->cdb.OpCode  == %x", snp->cdb.OpCode));\r
   //\r
   DEBUG ((EFI_D_NET, "\nsnp->undi.transmit()  "));\r
   DEBUG ((EFI_D_NET, "\nsnp->cdb.OpCode  == %x", snp->cdb.OpCode));\r

-  DEBUG ((EFI_D_NET, "\nsnp->cdb.CPBaddr == %X", snp->cdb.CPBaddr));\r
-  DEBUG ((EFI_D_NET, "\nsnp->cdb.DBaddr  == %X", snp->cdb.DBaddr));\r
-  DEBUG ((EFI_D_NET, "\ncpb->FrameAddr   == %X\n", cpb->FrameAddr));\r
+  DEBUG ((EFI_D_NET, "\nsnp->cdb.CPBaddr == %LX", snp->cdb.CPBaddr));\r
+  DEBUG ((EFI_D_NET, "\nsnp->cdb.DBaddr  == %LX", snp->cdb.DBaddr));\r
+  DEBUG ((EFI_D_NET, "\ncpb->FrameAddr   == %LX\n", cpb->FrameAddr));\r

 \r
   (*snp->issue_undi32_command) ((UINT64) (UINTN) &snp->cdb);\r
 \r
 \r
   (*snp->issue_undi32_command) ((UINT64) (UINTN) &snp->cdb);\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
index a054a4a56d03528144ac0a0fdf50805f475d6c12..3e6a6f547b8f7398b93fe81e783890c19b813e8b 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
@@ -85,7 +85,7 @@ TcpFastRecover (
     Tcb->CWnd = Tcb->Ssthresh + 3 * Tcb->SndMss;\r
 \r
     DEBUG ((EFI_D_INFO, "TcpFastRecover: enter fast retransmission"\r
     Tcb->CWnd = Tcb->Ssthresh + 3 * Tcb->SndMss;\r
 \r
     DEBUG ((EFI_D_INFO, "TcpFastRecover: enter fast retransmission"\r

-      " for TCB %x, recover point is %d\n", Tcb, Tcb->Recover));\r
+      " for TCB %p, recover point is %d\n", Tcb, Tcb->Recover));\r

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


@@ -104,7 +104,7 @@ TcpFastRecover (
     //\r
     Tcb->CWnd += Tcb->SndMss;\r
     DEBUG ((EFI_D_INFO, "TcpFastRecover: received another"\r
     //\r
     Tcb->CWnd += Tcb->SndMss;\r
     DEBUG ((EFI_D_INFO, "TcpFastRecover: received another"\r

-      " duplicated ACK (%d) for TCB %x\n", Seg->Ack, Tcb));\r
+      " duplicated ACK (%d) for TCB %p\n", Seg->Ack, Tcb));\r

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


@@ -124,7 +124,7 @@ TcpFastRecover (
 \r
       Tcb->CongestState = TCP_CONGEST_OPEN;\r
       DEBUG ((EFI_D_INFO, "TcpFastRecover: received a full ACK(%d)"\r
 \r
       Tcb->CongestState = TCP_CONGEST_OPEN;\r
       DEBUG ((EFI_D_INFO, "TcpFastRecover: received a full ACK(%d)"\r

-        " for TCB %x, exit fast recovery\n", Seg->Ack, Tcb));\r
+        " for TCB %p, exit fast recovery\n", Seg->Ack, Tcb));\r

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


@@ -149,7 +149,7 @@ TcpFastRecover (
       Tcb->CWnd -= Acked;\r
 \r
       DEBUG ((EFI_D_INFO, "TcpFastRecover: received a partial"\r
       Tcb->CWnd -= Acked;\r
 \r
       DEBUG ((EFI_D_INFO, "TcpFastRecover: received a partial"\r

-        " ACK(%d) for TCB %x\n", Seg->Ack, Tcb));\r
+        " ACK(%d) for TCB %p\n", Seg->Ack, Tcb));\r

 \r
     }\r
   }\r
 \r
     }\r
   }\r


@@ -186,7 +186,7 @@ TcpFastLossRecover (
       Tcb->CongestState = TCP_CONGEST_OPEN;\r
 \r
       DEBUG ((EFI_D_INFO, "TcpFastLossRecover: received a "\r
       Tcb->CongestState = TCP_CONGEST_OPEN;\r
 \r
       DEBUG ((EFI_D_INFO, "TcpFastLossRecover: received a "\r

-        "full ACK(%d) for TCB %x\n", Seg->Ack, Tcb));\r
+        "full ACK(%d) for TCB %p\n", Seg->Ack, Tcb));\r

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


@@ -196,7 +196,7 @@ TcpFastLossRecover (
       //\r
       TcpRetransmit (Tcb, Seg->Ack);\r
       DEBUG ((EFI_D_INFO, "TcpFastLossRecover: received a "\r
       //\r
       TcpRetransmit (Tcb, Seg->Ack);\r
       DEBUG ((EFI_D_INFO, "TcpFastLossRecover: received a "\r

-        "partial ACK(%d) for TCB %x\n", Seg->Ack, Tcb));\r
+        "partial ACK(%d) for TCB %p\n", Seg->Ack, Tcb));\r

     }\r
   }\r
 }\r
     }\r
   }\r
 }\r


@@ -256,7 +256,7 @@ TcpComputeRtt (
 \r
   }\r
 \r
 \r
   }\r
 \r

-  DEBUG ((EFI_D_INFO, "TcpComputeRtt: new RTT for TCB %x"\r
+  DEBUG ((EFI_D_INFO, "TcpComputeRtt: new RTT for TCB %p"\r

     " computed SRTT: %d RTTVAR: %d RTO: %d\n",\r
     Tcb, Tcb->SRtt, Tcb->RttVar, Tcb->Rto));\r
 \r
     " computed SRTT: %d RTTVAR: %d RTO: %d\n",\r
     Tcb, Tcb->SRtt, Tcb->RttVar, Tcb->Rto));\r
 \r


@@ -443,14 +443,14 @@ TcpDeliverData (
       //\r
       if (!IsListEmpty (&Tcb->RcvQue)) {\r
         DEBUG ((EFI_D_ERROR, "TcpDeliverData: data received after"\r
       //\r
       if (!IsListEmpty (&Tcb->RcvQue)) {\r
         DEBUG ((EFI_D_ERROR, "TcpDeliverData: data received after"\r

-          " FIN from peer of TCB %x, reset connection\n", Tcb));\r
+          " FIN from peer of TCB %p, reset connection\n", Tcb));\r

 \r
         NetbufFree (Nbuf);\r
         return -1;\r
       }\r
 \r
       DEBUG ((EFI_D_INFO, "TcpDeliverData: processing FIN "\r
 \r
         NetbufFree (Nbuf);\r
         return -1;\r
       }\r
 \r
       DEBUG ((EFI_D_INFO, "TcpDeliverData: processing FIN "\r

-        "from peer of TCB %x\n", Tcb));\r
+        "from peer of TCB %p\n", Tcb));\r

 \r
       switch (Tcb->State) {\r
       case TCP_SYN_RCVD:\r
 \r
       switch (Tcb->State) {\r
       case TCP_SYN_RCVD:\r


@@ -481,7 +481,7 @@ TcpDeliverData (
         } else {\r
 \r
           DEBUG ((EFI_D_WARN, "Connection closed immediately "\r
         } else {\r
 \r
           DEBUG ((EFI_D_WARN, "Connection closed immediately "\r

-            "because app disables TIME_WAIT timer for %x\n", Tcb));\r
+            "because app disables TIME_WAIT timer for %p\n", Tcb));\r

 \r
           TcpSendAck (Tcb);\r
           TcpClose (Tcb);\r
 \r
           TcpSendAck (Tcb);\r
           TcpClose (Tcb);\r


@@ -773,7 +773,7 @@ TcpInput (
   //\r
   if (TcpParseOption (Nbuf->Tcp, &Option) == -1) {\r
     DEBUG ((EFI_D_ERROR, "TcpInput: reset the peer because"\r
   //\r
   if (TcpParseOption (Nbuf->Tcp, &Option) == -1) {\r
     DEBUG ((EFI_D_ERROR, "TcpInput: reset the peer because"\r

-      " of mal-format option for Tcb %x\n", Tcb));\r
+      " of mal-format option for Tcb %p\n", Tcb));\r

 \r
     goto SEND_RESET;\r
   }\r
 \r
     goto SEND_RESET;\r
   }\r


@@ -797,7 +797,7 @@ TcpInput (
     //\r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {\r
       DEBUG ((EFI_D_WARN, "TcpInput: discard a reset segment "\r
     //\r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {\r
       DEBUG ((EFI_D_WARN, "TcpInput: discard a reset segment "\r

-        "for TCB %x in listening\n", Tcb));\r
+        "for TCB %p in listening\n", Tcb));\r

 \r
       goto DISCARD;\r
     }\r
 \r
       goto DISCARD;\r
     }\r


@@ -808,7 +808,7 @@ TcpInput (
     //\r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {\r
       DEBUG ((EFI_D_WARN, "TcpInput: send reset because of"\r
     //\r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {\r
       DEBUG ((EFI_D_WARN, "TcpInput: send reset because of"\r

-        " segment with ACK for TCB %x in listening\n", Tcb));\r
+        " segment with ACK for TCB %p in listening\n", Tcb));\r

 \r
       goto SEND_RESET;\r
     }\r
 \r
       goto SEND_RESET;\r
     }\r


@@ -830,7 +830,7 @@ TcpInput (
         goto DISCARD;\r
       }\r
 \r
         goto DISCARD;\r
       }\r
 \r

-      DEBUG ((EFI_D_INFO, "TcpInput: create a child for TCB %x"\r
+      DEBUG ((EFI_D_INFO, "TcpInput: create a child for TCB %p"\r

         " in listening\n", Tcb));\r
 \r
       //\r
         " in listening\n", Tcb));\r
 \r
       //\r


@@ -860,7 +860,7 @@ TcpInput (
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK) && (Seg->Ack != Tcb->Iss + 1)) {\r
 \r
       DEBUG ((EFI_D_WARN, "TcpInput: send reset because of "\r
     if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK) && (Seg->Ack != Tcb->Iss + 1)) {\r
 \r
       DEBUG ((EFI_D_WARN, "TcpInput: send reset because of "\r

-        "wrong ACK received for TCB %x in SYN_SENT\n", Tcb));\r
+        "wrong ACK received for TCB %p in SYN_SENT\n", Tcb));\r

 \r
       goto SEND_RESET;\r
     }\r
 \r
       goto SEND_RESET;\r
     }\r


@@ -923,7 +923,7 @@ TcpInput (
         TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW);\r
 \r
         DEBUG ((EFI_D_INFO, "TcpInput: connection established"\r
         TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW);\r
 \r
         DEBUG ((EFI_D_INFO, "TcpInput: connection established"\r

-          " for TCB %x in SYN_SENT\n", Tcb));\r
+          " for TCB %p in SYN_SENT\n", Tcb));\r

 \r
         goto StepSix;\r
       } else {\r
 \r
         goto StepSix;\r
       } else {\r


@@ -938,7 +938,7 @@ TcpInput (
         TcpTrimInWnd (Tcb, Nbuf);\r
 \r
         DEBUG ((EFI_D_WARN, "TcpInput: simultanous open "\r
         TcpTrimInWnd (Tcb, Nbuf);\r
 \r
         DEBUG ((EFI_D_WARN, "TcpInput: simultanous open "\r

-          "for TCB %x in SYN_SENT\n", Tcb));\r
+          "for TCB %p in SYN_SENT\n", Tcb));\r

 \r
         goto StepSix;\r
       }\r
 \r
         goto StepSix;\r
       }\r


@@ -956,7 +956,7 @@ TcpInput (
   //\r
   if (!TcpSeqAcceptable (Tcb, Seg)) {\r
     DEBUG ((EFI_D_WARN, "TcpInput: sequence acceptance"\r
   //\r
   if (!TcpSeqAcceptable (Tcb, Seg)) {\r
     DEBUG ((EFI_D_WARN, "TcpInput: sequence acceptance"\r

-      " test failed for segment of TCB %x\n", Tcb));\r
+      " test failed for segment of TCB %p\n", Tcb));\r

 \r
     if (!TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {\r
       TcpSendAck (Tcb);\r
 \r
     if (!TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {\r
       TcpSendAck (Tcb);\r


@@ -977,7 +977,7 @@ TcpInput (
   //\r
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {\r
 \r
   //\r
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {\r
 \r

-    DEBUG ((EFI_D_WARN, "TcpInput: connection reset for TCB %x\n", Tcb));\r
+    DEBUG ((EFI_D_WARN, "TcpInput: connection reset for TCB %p\n", Tcb));\r

 \r
     if (Tcb->State == TCP_SYN_RCVD) {\r
 \r
 \r
     if (Tcb->State == TCP_SYN_RCVD) {\r
 \r


@@ -1021,7 +1021,7 @@ TcpInput (
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_SYN)) {\r
 \r
     DEBUG ((EFI_D_WARN, "TcpInput: connection reset "\r
   if (TCP_FLG_ON (Seg->Flag, TCP_FLG_SYN)) {\r
 \r
     DEBUG ((EFI_D_WARN, "TcpInput: connection reset "\r

-      "because received extra SYN for TCB %x\n", Tcb));\r
+      "because received extra SYN for TCB %p\n", Tcb));\r

 \r
     SOCK_ERROR (Tcb->Sk, EFI_CONNECTION_RESET);\r
     goto RESET_THEN_DROP;\r
 \r
     SOCK_ERROR (Tcb->Sk, EFI_CONNECTION_RESET);\r
     goto RESET_THEN_DROP;\r


@@ -1032,7 +1032,7 @@ TcpInput (
   //\r
   if (!TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {\r
     DEBUG ((EFI_D_WARN, "TcpInput: segment discard because"\r
   //\r
   if (!TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {\r
     DEBUG ((EFI_D_WARN, "TcpInput: segment discard because"\r

-      " of no ACK for connected TCB %x\n", Tcb));\r
+      " of no ACK for connected TCB %p\n", Tcb));\r

 \r
     goto DISCARD;\r
 \r
 \r
     goto DISCARD;\r
 \r


@@ -1053,14 +1053,14 @@ TcpInput (
       TcpDeliverData (Tcb);\r
 \r
       DEBUG ((EFI_D_INFO, "TcpInput: connection established "\r
       TcpDeliverData (Tcb);\r
 \r
       DEBUG ((EFI_D_INFO, "TcpInput: connection established "\r

-        " for TCB %x in SYN_RCVD\n", Tcb));\r
+        " for TCB %p in SYN_RCVD\n", Tcb));\r

 \r
       //\r
       // Continue the process as ESTABLISHED state\r
       //\r
     } else {\r
       DEBUG ((EFI_D_WARN, "TcpInput: send reset because of"\r
 \r
       //\r
       // Continue the process as ESTABLISHED state\r
       //\r
     } else {\r
       DEBUG ((EFI_D_WARN, "TcpInput: send reset because of"\r

-        " wrong ACK for TCB %x in SYN_RCVD\n", Tcb));\r
+        " wrong ACK for TCB %p in SYN_RCVD\n", Tcb));\r

 \r
       goto SEND_RESET;\r
     }\r
 \r
       goto SEND_RESET;\r
     }\r


@@ -1069,14 +1069,14 @@ TcpInput (
   if (TCP_SEQ_LT (Seg->Ack, Tcb->SndUna)) {\r
 \r
     DEBUG ((EFI_D_WARN, "TcpInput: ignore the out-of-data"\r
   if (TCP_SEQ_LT (Seg->Ack, Tcb->SndUna)) {\r
 \r
     DEBUG ((EFI_D_WARN, "TcpInput: ignore the out-of-data"\r

-      " ACK for connected TCB %x\n", Tcb));\r
+      " ACK for connected TCB %p\n", Tcb));\r

 \r
     goto StepSix;\r
 \r
   } else if (TCP_SEQ_GT (Seg->Ack, Tcb->SndNxt)) {\r
 \r
     DEBUG ((EFI_D_WARN, "TcpInput: discard segment for "\r
 \r
     goto StepSix;\r
 \r
   } else if (TCP_SEQ_GT (Seg->Ack, Tcb->SndNxt)) {\r
 \r
     DEBUG ((EFI_D_WARN, "TcpInput: discard segment for "\r

-      "future ACK for connected TCB %x\n", Tcb));\r
+      "future ACK for connected TCB %p\n", Tcb));\r

 \r
     TcpSendAck (Tcb);\r
     goto DISCARD;\r
 \r
     TcpSendAck (Tcb);\r
     goto DISCARD;\r


@@ -1187,7 +1187,7 @@ TcpInput (
       }\r
 \r
       DEBUG ((EFI_D_WARN, "TcpInput: peer shrinks the"\r
       }\r
 \r
       DEBUG ((EFI_D_WARN, "TcpInput: peer shrinks the"\r

-        " window  for connected TCB %x\n", Tcb));\r
+        " window  for connected TCB %p\n", Tcb));\r

 \r
       if ((Tcb->CongestState == TCP_CONGEST_RECOVER) &&\r
           (TCP_SEQ_LT (Right, Tcb->Recover))) {\r
 \r
       if ((Tcb->CongestState == TCP_CONGEST_RECOVER) &&\r
           (TCP_SEQ_LT (Right, Tcb->Recover))) {\r


@@ -1225,7 +1225,7 @@ NO_UPDATE:
       (Tcb->SndUna == Tcb->SndNxt)) {\r
 \r
     DEBUG ((EFI_D_INFO, "TcpInput: local FIN is ACKed by"\r
       (Tcb->SndUna == Tcb->SndNxt)) {\r
 \r
     DEBUG ((EFI_D_INFO, "TcpInput: local FIN is ACKed by"\r

-      " peer for connected TCB %x\n", Tcb));\r
+      " peer for connected TCB %p\n", Tcb));\r

 \r
     TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_FIN_ACKED);\r
   }\r
 \r
     TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_FIN_ACKED);\r
   }\r


@@ -1265,7 +1265,7 @@ NO_UPDATE:
       } else {\r
 \r
         DEBUG ((EFI_D_WARN, "Connection closed immediately "\r
       } else {\r
 \r
         DEBUG ((EFI_D_WARN, "Connection closed immediately "\r

-          "because app disables TIME_WAIT timer for %x\n", Tcb));\r
+          "because app disables TIME_WAIT timer for %p\n", Tcb));\r

 \r
         TcpClose (Tcb);\r
       }\r
 \r
         TcpClose (Tcb);\r
       }\r


@@ -1291,7 +1291,7 @@ NO_UPDATE:
     } else {\r
 \r
       DEBUG ((EFI_D_WARN, "Connection closed immediately "\r
     } else {\r
 \r
       DEBUG ((EFI_D_WARN, "Connection closed immediately "\r

-        "because app disables TIME_WAIT timer for %x\n", Tcb));\r
+        "because app disables TIME_WAIT timer for %p\n", Tcb));\r

 \r
       TcpClose (Tcb);\r
     }\r
 \r
       TcpClose (Tcb);\r
     }\r


@@ -1316,7 +1316,7 @@ StepSix:
       !TCP_FIN_RCVD (Tcb->State)) {\r
 \r
     DEBUG ((EFI_D_INFO, "TcpInput: received urgent data "\r
       !TCP_FIN_RCVD (Tcb->State)) {\r
 \r
     DEBUG ((EFI_D_INFO, "TcpInput: received urgent data "\r

-      "from peer for connected TCB %x\n", Tcb));\r
+      "from peer for connected TCB %p\n", Tcb));\r

 \r
     Urg = Seg->Seq + Seg->Urg;\r
 \r
 \r
     Urg = Seg->Seq + Seg->Urg;\r
 \r


@@ -1339,14 +1339,14 @@ StepSix:
     if (TCP_FIN_RCVD (Tcb->State)) {\r
 \r
       DEBUG ((EFI_D_WARN, "TcpInput: connection reset because"\r
     if (TCP_FIN_RCVD (Tcb->State)) {\r
 \r
       DEBUG ((EFI_D_WARN, "TcpInput: connection reset because"\r

-        " data is lost for connected TCB %x\n", Tcb));\r
+        " data is lost for connected TCB %p\n", Tcb));\r

 \r
       goto RESET_THEN_DROP;\r
     }\r
 \r
     if (TCP_LOCAL_CLOSED (Tcb->State) && (Nbuf->TotalSize != 0)) {\r
       DEBUG ((EFI_D_WARN, "TcpInput: connection reset because"\r
 \r
       goto RESET_THEN_DROP;\r
     }\r
 \r
     if (TCP_LOCAL_CLOSED (Tcb->State) && (Nbuf->TotalSize != 0)) {\r
       DEBUG ((EFI_D_WARN, "TcpInput: connection reset because"\r

-        " data is lost for connected TCB %x\n", Tcb));\r
+        " data is lost for connected TCB %p\n", Tcb));\r

 \r
       goto RESET_THEN_DROP;\r
     }\r
 \r
       goto RESET_THEN_DROP;\r
     }\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
index 82e3a600db0ea86326b601bbc8ef315f20df3b33..446cb9b11c7c4409dd518c7908bc483bb9a6e020 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
@@ -521,7 +521,7 @@ TcpSetState (
 {\r
   DEBUG (\r
     (EFI_D_INFO,\r
 {\r
   DEBUG (\r
     (EFI_D_INFO,\r

-    "Tcb (%x) state %s --> %s\n",\r
+    "Tcb (%p) state %s --> %s\n",\r

     Tcb,\r
     mTcpStateName[Tcb->State],\r
     mTcpStateName[State])\r
     Tcb,\r
     mTcpStateName[Tcb->State],\r
     mTcpStateName[State])\r


@@ -726,7 +726,7 @@ TcpOnAppClose (
   if (!IsListEmpty (&Tcb->RcvQue) || GET_RCV_DATASIZE (Tcb->Sk)) {\r
 \r
     DEBUG ((EFI_D_WARN, "TcpOnAppClose: connection reset "\r
   if (!IsListEmpty (&Tcb->RcvQue) || GET_RCV_DATASIZE (Tcb->Sk)) {\r
 \r
     DEBUG ((EFI_D_WARN, "TcpOnAppClose: connection reset "\r

-      "because data is lost for TCB %x\n", Tcb));\r
+      "because data is lost for TCB %p\n", Tcb));\r

 \r
     TcpResetConnection (Tcb);\r
     TcpClose (Tcb);\r
 \r
     TcpResetConnection (Tcb);\r
     TcpClose (Tcb);\r


@@ -841,13 +841,13 @@ TcpOnAppConsume (
       if (TcpOld < Tcb->RcvMss) {\r
 \r
         DEBUG ((EFI_D_INFO, "TcpOnAppConsume: send a window"\r
       if (TcpOld < Tcb->RcvMss) {\r
 \r
         DEBUG ((EFI_D_INFO, "TcpOnAppConsume: send a window"\r

-          " update for a window closed Tcb(%x)\n", Tcb));\r
+          " update for a window closed Tcb(%p)\n", Tcb));\r

 \r
         TcpSendAck (Tcb);\r
       } else if (Tcb->DelayedAck == 0) {\r
 \r
         DEBUG ((EFI_D_INFO, "TcpOnAppConsume: scheduled a delayed"\r
 \r
         TcpSendAck (Tcb);\r
       } else if (Tcb->DelayedAck == 0) {\r
 \r
         DEBUG ((EFI_D_INFO, "TcpOnAppConsume: scheduled a delayed"\r

-          " ACK to update window for Tcb(%x)\n", Tcb));\r
+          " ACK to update window for Tcb(%p)\n", Tcb));\r

 \r
         Tcb->DelayedAck = 1;\r
       }\r
 \r
         Tcb->DelayedAck = 1;\r
       }\r


@@ -887,7 +887,7 @@ TcpOnAppAbort (
   )\r
 {\r
   DEBUG ((EFI_D_WARN, "TcpOnAppAbort: connection reset "\r
   )\r
 {\r
   DEBUG ((EFI_D_WARN, "TcpOnAppAbort: connection reset "\r

-    "issued by application for TCB %x\n", Tcb));\r
+    "issued by application for TCB %p\n", Tcb));\r

 \r
   switch (Tcb->State) {\r
   case TCP_SYN_RCVD:\r
 \r
   switch (Tcb->State) {\r
   case TCP_SYN_RCVD:\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
index 38694f9bf5abe7fdaf7fda5fa7195082c6c89f37..f1bc83e20bd89eb6518e99623809f17485231bf0 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
@@ -273,7 +273,7 @@ SetPersistTimer:
 \r
     DEBUG (\r
       (EFI_D_WARN,\r
 \r
     DEBUG (\r
       (EFI_D_WARN,\r

-      "TcpDataToSend: enter persistent state for TCB %x\n",\r
+      "TcpDataToSend: enter persistent state for TCB %p\n",\r

       Tcb)\r
       );\r
 \r
       Tcb)\r
       );\r
 \r


@@ -580,7 +580,7 @@ TcpGetSegmentSock (
 \r
   if (Nbuf == NULL) {\r
     DEBUG ((EFI_D_ERROR, "TcpGetSegmentSock: failed to allocate "\r
 \r
   if (Nbuf == NULL) {\r
     DEBUG ((EFI_D_ERROR, "TcpGetSegmentSock: failed to allocate "\r

-      "a netbuf for TCB %x\n",Tcb));\r
+      "a netbuf for TCB %p\n",Tcb));\r

 \r
     return NULL;\r
   }\r
 \r
     return NULL;\r
   }\r


@@ -681,7 +681,7 @@ TcpRetransmit (
   //\r
   if (TCP_SEQ_LT (Tcb->SndWl2 + Tcb->SndWnd, Seq)) {\r
     DEBUG ((EFI_D_WARN, "TcpRetransmit: retransmission cancelled "\r
   //\r
   if (TCP_SEQ_LT (Tcb->SndWl2 + Tcb->SndWnd, Seq)) {\r
     DEBUG ((EFI_D_WARN, "TcpRetransmit: retransmission cancelled "\r

-      "because send window too small for TCB %x\n", Tcb));\r
+      "because send window too small for TCB %p\n", Tcb));\r

 \r
     return 0;\r
   }\r
 \r
     return 0;\r
   }\r


@@ -783,7 +783,7 @@ SEND_AGAIN:
   if (Nbuf == NULL) {\r
     DEBUG (\r
       (EFI_D_ERROR,\r
   if (Nbuf == NULL) {\r
     DEBUG (\r
       (EFI_D_ERROR,\r

-      "TcpToSendData: failed to get a segment for TCB %x\n",\r
+      "TcpToSendData: failed to get a segment for TCB %p\n",\r

       Tcb)\r
       );\r
 \r
       Tcb)\r
       );\r
 \r


@@ -812,7 +812,7 @@ SEND_AGAIN:
           ) {\r
 \r
       DEBUG ((EFI_D_INFO, "TcpToSendData: send FIN "\r
           ) {\r
 \r
       DEBUG ((EFI_D_INFO, "TcpToSendData: send FIN "\r

-        "to peer for TCB %x in state %d\n", Tcb, Tcb->State));\r
+        "to peer for TCB %p in state %d\n", Tcb, Tcb->State));\r

 \r
       End++;\r
     } else {\r
 \r
       End++;\r
     } else {\r


@@ -832,7 +832,7 @@ SEND_AGAIN:
   //\r
   if (Seg->End == Seg->Seq) {\r
     DEBUG ((EFI_D_WARN, "TcpToSendData: created a empty"\r
   //\r
   if (Seg->End == Seg->Seq) {\r
     DEBUG ((EFI_D_WARN, "TcpToSendData: created a empty"\r

-      " segment for TCB %x, free it now\n", Tcb));\r
+      " segment for TCB %p, free it now\n", Tcb));\r

 \r
     NetbufFree (Nbuf);\r
     return Sent;\r
 \r
     NetbufFree (Nbuf);\r
     return Sent;\r


@@ -889,7 +889,7 @@ SEND_AGAIN:
       !TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RTT_ON)) {\r
 \r
     DEBUG ((EFI_D_INFO, "TcpToSendData: set RTT measure "\r
       !TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RTT_ON)) {\r
 \r
     DEBUG ((EFI_D_INFO, "TcpToSendData: set RTT measure "\r

-      "sequence %d for TCB %x\n", Seq, Tcb));\r
+      "sequence %d for TCB %p\n", Seq, Tcb));\r

 \r
     TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_RTT_ON);\r
     Tcb->RttSeq     = Seq;\r
 \r
     TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_RTT_ON);\r
     Tcb->RttSeq     = Seq;\r


@@ -1023,7 +1023,7 @@ TcpToSendAck (
   }\r
 \r
   DEBUG ((EFI_D_INFO, "TcpToSendAck: scheduled a delayed"\r
   }\r
 \r
   DEBUG ((EFI_D_INFO, "TcpToSendAck: scheduled a delayed"\r

-    " ACK for TCB %x\n", Tcb));\r
+    " ACK for TCB %p\n", Tcb));\r

 \r
   //\r
   // schedule a delayed ACK\r
 \r
   //\r
   // schedule a delayed ACK\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
index 0f728a8ab9119ca9daffe4add3046c88304dce4d..5e957dc91894b39ebf5bbe6bc9aab00f1958b3a1 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
@@ -106,7 +106,7 @@ TcpConnectTimeout (
 {\r
   if (!TCP_CONNECTED (Tcb->State)) {\r
     DEBUG ((EFI_D_ERROR, "TcpConnectTimeout: connection closed "\r
 {\r
   if (!TCP_CONNECTED (Tcb->State)) {\r
     DEBUG ((EFI_D_ERROR, "TcpConnectTimeout: connection closed "\r

-      "because conenction timer timeout for TCB %x\n", Tcb));\r
+      "because conenction timer timeout for TCB %p\n", Tcb));\r

 \r
     if (EFI_ABORTED == Tcb->Sk->SockError) {\r
       SOCK_ERROR (Tcb->Sk, EFI_TIMEOUT);\r
 \r
     if (EFI_ABORTED == Tcb->Sk->SockError) {\r
       SOCK_ERROR (Tcb->Sk, EFI_TIMEOUT);\r


@@ -114,7 +114,7 @@ TcpConnectTimeout (
 \r
     if (TCP_SYN_RCVD == Tcb->State) {\r
       DEBUG ((EFI_D_WARN, "TcpConnectTimeout: send reset because "\r
 \r
     if (TCP_SYN_RCVD == Tcb->State) {\r
       DEBUG ((EFI_D_WARN, "TcpConnectTimeout: send reset because "\r

-        "connection timer timeout for TCB %x\n", Tcb));\r
+        "connection timer timeout for TCB %p\n", Tcb));\r

 \r
       TcpResetConnection (Tcb);\r
 \r
 \r
       TcpResetConnection (Tcb);\r
 \r


@@ -142,7 +142,7 @@ TcpRexmitTimeout (
   UINT32  FlightSize;\r
 \r
   DEBUG ((EFI_D_WARN, "TcpRexmitTimeout: transmission "\r
   UINT32  FlightSize;\r
 \r
   DEBUG ((EFI_D_WARN, "TcpRexmitTimeout: transmission "\r

-    "timeout for TCB %x\n", Tcb));\r
+    "timeout for TCB %p\n", Tcb));\r

 \r
   //\r
   // Set the congestion window. FlightSize is the\r
 \r
   //\r
   // Set the congestion window. FlightSize is the\r


@@ -160,7 +160,7 @@ TcpRexmitTimeout (
       !TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_CONNECT)) {\r
 \r
     DEBUG ((EFI_D_ERROR, "TcpRexmitTimeout: connection closed "\r
       !TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_CONNECT)) {\r
 \r
     DEBUG ((EFI_D_ERROR, "TcpRexmitTimeout: connection closed "\r

-      "because too many timeouts for TCB %x\n", Tcb));\r
+      "because too many timeouts for TCB %p\n", Tcb));\r

 \r
     if (EFI_ABORTED == Tcb->Sk->SockError) {\r
       SOCK_ERROR (Tcb->Sk, EFI_TIMEOUT);\r
 \r
     if (EFI_ABORTED == Tcb->Sk->SockError) {\r
       SOCK_ERROR (Tcb->Sk, EFI_TIMEOUT);\r


@@ -260,7 +260,7 @@ TcpFinwait2Timeout (
   )\r
 {\r
   DEBUG ((EFI_D_WARN, "TcpFinwait2Timeout: connection closed "\r
   )\r
 {\r
   DEBUG ((EFI_D_WARN, "TcpFinwait2Timeout: connection closed "\r

-    "because FIN_WAIT2 timer timeouts for TCB %x\n", Tcb));\r
+    "because FIN_WAIT2 timer timeouts for TCB %p\n", Tcb));\r

 \r
   TcpClose (Tcb);\r
 }\r
 \r
   TcpClose (Tcb);\r
 }\r


@@ -281,7 +281,7 @@ Tcp2MSLTimeout (
   )\r
 {\r
   DEBUG ((EFI_D_WARN, "Tcp2MSLTimeout: connection closed "\r
   )\r
 {\r
   DEBUG ((EFI_D_WARN, "Tcp2MSLTimeout: connection closed "\r

-    "because TIME_WAIT timer timeouts for TCB %x\n", Tcb));\r
+    "because TIME_WAIT timer timeouts for TCB %p\n", Tcb));\r

 \r
   TcpClose (Tcb);\r
 }\r
 \r
   TcpClose (Tcb);\r
 }\r