summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c2
-rw-r--r--MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c2
-rw-r--r--MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c4
-rw-r--r--MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c4
-rw-r--r--MdeModulePkg/Core/Dxe/Image/Image.c2
-rw-r--r--MdeModulePkg/Core/Pei/Ppi/Ppi.c6
-rw-r--r--MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_loadfile.c2
-rw-r--r--MdeModulePkg/Universal/Network/SnpDxe/Snp.c10
-rw-r--r--MdeModulePkg/Universal/Network/SnpDxe/Transmit.c6
-rw-r--r--MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c64
-rw-r--r--MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c10
-rw-r--r--MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c16
-rw-r--r--MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c12
13 files changed, 70 insertions, 70 deletions
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
index 9dccd6f00d..44405b73ce 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
@@ -1595,7 +1595,7 @@ EhcDriverBindingStart (
);
- DEBUG ((EFI_D_INFO, "EhcDriverBindingStart: EHCI started for controller @ %x\n", Controller));
+ DEBUG ((EFI_D_INFO, "EhcDriverBindingStart: EHCI started for controller @ %p\n", Controller));
return EFI_SUCCESS;
UNINSTALL_USBHC:
diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
index bdc8f2ff03..ca3e2524db 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
@@ -145,7 +145,7 @@ EhcDumpQh (
DEBUG ((EFI_D_INFO, Msg));
}
- DEBUG ((EFI_D_INFO, "Queue head @ 0x%x, interval %d, next qh %x\n",
+ DEBUG ((EFI_D_INFO, "Queue head @ 0x%p, interval %d, next qh %x\n",
Qh, Qh->Interval, Qh->NextQh));
QhHw = &Qh->QhHw;
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
index b4231079ce..fc9bd5335f 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBus.c
@@ -994,7 +994,7 @@ UsbBusBuildProtocol (
UsbBus->Devices[0] = RootHub;
- DEBUG ((EFI_D_INFO, "UsbBusStart: usb bus started on %x, root hub %x\n", Controller, RootIf));
+ DEBUG ((EFI_D_INFO, "UsbBusStart: usb bus started on %p, root hub %p\n", Controller, RootIf));
return EFI_SUCCESS;
FREE_ROOTHUB:
@@ -1355,7 +1355,7 @@ UsbBusControllerDriverStop (
return EFI_SUCCESS;
}
- DEBUG (( EFI_D_INFO, "UsbBusStop: usb bus stopped on %x\n", Controller));
+ DEBUG (( EFI_D_INFO, "UsbBusStop: usb bus stopped on %p\n", Controller));
//
// Locate USB_BUS for the current host controller
diff --git a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
index 2a1ee0af10..4a2e382cd7 100644
--- a/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
+++ b/MdeModulePkg/Bus/Usb/UsbBusDxe/UsbHub.c
@@ -983,7 +983,7 @@ UsbRootHubInit (
return Status;
}
- DEBUG (( EFI_D_INFO, "UsbRootHubInit: root hub %x - max speed %d, %d ports\n",
+ DEBUG (( EFI_D_INFO, "UsbRootHubInit: root hub %p - max speed %d, %d ports\n",
HubIf, MaxSpeed, NumOfPort));
HubIf->IsHub = TRUE;
@@ -1274,7 +1274,7 @@ UsbRootHubRelease (
IN USB_INTERFACE *HubIf
)
{
- DEBUG (( EFI_D_INFO, "UsbRootHubRelease: root hub released for hub %x\n", HubIf));
+ DEBUG (( EFI_D_INFO, "UsbRootHubRelease: root hub released for hub %p\n", HubIf));
gBS->SetTimer (HubIf->HubNotify, TimerCancel, USB_ROOTHUB_POLL_INTERVAL);
gBS->CloseEvent (HubIf->HubNotify);
diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 6f89ddc24b..0719d4b690 100644
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -1197,7 +1197,7 @@ CoreStartImage (
DEBUG_CODE_BEGIN ();
if (Image->ExitDataSize != 0 || Image->ExitData != NULL) {
- DEBUG ((DEBUG_LOAD, "StartImage: ExitDataSize %d, ExitData %x", Image->ExitDataSize, Image->ExitData));
+ DEBUG ((DEBUG_LOAD, "StartImage: ExitDataSize %d, ExitData %p", Image->ExitDataSize, Image->ExitData));
if (Image->ExitData != NULL) {
DEBUG ((DEBUG_LOAD, " (%hs)", Image->ExitData));
}
diff --git a/MdeModulePkg/Core/Pei/Ppi/Ppi.c b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
index 13b1588177..90d5c925a0 100644
--- a/MdeModulePkg/Core/Pei/Ppi/Ppi.c
+++ b/MdeModulePkg/Core/Pei/Ppi/Ppi.c
@@ -162,7 +162,7 @@ PeiInstallPpi (
//
if ((PpiList->Flags & EFI_PEI_PPI_DESCRIPTOR_PPI) == 0) {
PrivateData->PpiData.PpiListEnd = LastCallbackInstall;
- DEBUG((EFI_D_ERROR, "ERROR -> InstallPpi: %g %x\n", PpiList->Guid, PpiList->Ppi));
+ DEBUG((EFI_D_ERROR, "ERROR -> InstallPpi: %g %p\n", PpiList->Guid, PpiList->Ppi));
return EFI_INVALID_PARAMETER;
}
@@ -401,7 +401,7 @@ PeiNotifyPpi (
//
if ((NotifyList->Flags & EFI_PEI_PPI_DESCRIPTOR_NOTIFY_TYPES) == 0) {
PrivateData->PpiData.NotifyListEnd = LastCallbackNotify;
- DEBUG((EFI_D_ERROR, "ERROR -> InstallNotify: %g %x\n", NotifyList->Guid, NotifyList->Notify));
+ DEBUG((EFI_D_ERROR, "ERROR -> InstallNotify: %g %p\n", NotifyList->Guid, NotifyList->Notify));
return EFI_INVALID_PARAMETER;
}
@@ -569,7 +569,7 @@ DispatchNotify (
(((INT32 *)SearchGuid)[1] == ((INT32 *)CheckGuid)[1]) &&
(((INT32 *)SearchGuid)[2] == ((INT32 *)CheckGuid)[2]) &&
(((INT32 *)SearchGuid)[3] == ((INT32 *)CheckGuid)[3])) {
- DEBUG ((EFI_D_INFO, "Notify: PPI Guid: %g, Peim notify entry point: %x\n",
+ DEBUG ((EFI_D_INFO, "Notify: PPI Guid: %g, Peim notify entry point: %p\n",
SearchGuid,
NotifyDescriptor->Notify
));
diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_loadfile.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_loadfile.c
index e430757ce4..9c4baef5e7 100644
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_loadfile.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_loadfile.c
@@ -1329,7 +1329,7 @@ LoadFile (
//
// The following line is only used for passing ICC build.
//
- DEBUG ((EFI_D_INFO, "FilePath = %x\n", FilePath));
+ DEBUG ((EFI_D_INFO, "FilePath = %p\n", FilePath));
//
//
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
index 31b5022bd0..e01a135708 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
@@ -221,7 +221,7 @@ del_v2p (
FreePool (v);
if (Status) {
- DEBUG ((EFI_D_ERROR, "Unmap failed with status = %x\n", Status));
+ DEBUG ((EFI_D_ERROR, "Unmap failed with status = %r\n", Status));
}
return Status;
}
@@ -233,7 +233,7 @@ del_v2p (
FreePool (t);
if (Status) {
- DEBUG ((EFI_D_ERROR, "Unmap failed with status = %x\n", Status));
+ DEBUG ((EFI_D_ERROR, "Unmap failed with status = %r\n", Status));
}
return Status;
}
@@ -353,12 +353,12 @@ SimpleNetworkDriverSupported (
if (EFI_ERROR (Status)) {
if (Status == EFI_ALREADY_STARTED) {
- DEBUG ((EFI_D_INFO, "Support(): Already Started. on handle %x\n", Controller));
+ DEBUG ((EFI_D_INFO, "Support(): Already Started. on handle %p\n", Controller));
}
return Status;
}
- DEBUG ((EFI_D_INFO, "Support(): UNDI3.1 found on handle %x\n", Controller));
+ DEBUG ((EFI_D_INFO, "Support(): UNDI3.1 found on handle %p\n", Controller));
//
// check the version, we don't want to connect to the undi16
@@ -422,7 +422,7 @@ SimpleNetworkDriverSupported (
}
Status = EFI_SUCCESS;
- DEBUG ((EFI_D_INFO, "Support(): supported on %x\n", Controller));
+ DEBUG ((EFI_D_INFO, "Support(): supported on %p\n", Controller));
Done:
gBS->CloseProtocol (
diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c b/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
index 8ee0cad566..1567e4b243 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Transmit.c
@@ -188,9 +188,9 @@ pxe_transmit (
//
DEBUG ((EFI_D_NET, "\nsnp->undi.transmit() "));
DEBUG ((EFI_D_NET, "\nsnp->cdb.OpCode == %x", snp->cdb.OpCode));
- DEBUG ((EFI_D_NET, "\nsnp->cdb.CPBaddr == %X", snp->cdb.CPBaddr));
- DEBUG ((EFI_D_NET, "\nsnp->cdb.DBaddr == %X", snp->cdb.DBaddr));
- DEBUG ((EFI_D_NET, "\ncpb->FrameAddr == %X\n", cpb->FrameAddr));
+ DEBUG ((EFI_D_NET, "\nsnp->cdb.CPBaddr == %LX", snp->cdb.CPBaddr));
+ DEBUG ((EFI_D_NET, "\nsnp->cdb.DBaddr == %LX", snp->cdb.DBaddr));
+ DEBUG ((EFI_D_NET, "\ncpb->FrameAddr == %LX\n", cpb->FrameAddr));
(*snp->issue_undi32_command) ((UINT64) (UINTN) &snp->cdb);
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Input.c
index a054a4a56d..3e6a6f547b 100644
--- 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;
DEBUG ((EFI_D_INFO, "TcpFastRecover: enter fast retransmission"
- " for TCB %x, recover point is %d\n", Tcb, Tcb->Recover));
+ " for TCB %p, recover point is %d\n", Tcb, Tcb->Recover));
return;
}
@@ -104,7 +104,7 @@ TcpFastRecover (
//
Tcb->CWnd += Tcb->SndMss;
DEBUG ((EFI_D_INFO, "TcpFastRecover: received another"
- " duplicated ACK (%d) for TCB %x\n", Seg->Ack, Tcb));
+ " duplicated ACK (%d) for TCB %p\n", Seg->Ack, Tcb));
} else {
@@ -124,7 +124,7 @@ TcpFastRecover (
Tcb->CongestState = TCP_CONGEST_OPEN;
DEBUG ((EFI_D_INFO, "TcpFastRecover: received a full ACK(%d)"
- " for TCB %x, exit fast recovery\n", Seg->Ack, Tcb));
+ " for TCB %p, exit fast recovery\n", Seg->Ack, Tcb));
} else {
@@ -149,7 +149,7 @@ TcpFastRecover (
Tcb->CWnd -= Acked;
DEBUG ((EFI_D_INFO, "TcpFastRecover: received a partial"
- " ACK(%d) for TCB %x\n", Seg->Ack, Tcb));
+ " ACK(%d) for TCB %p\n", Seg->Ack, Tcb));
}
}
@@ -186,7 +186,7 @@ TcpFastLossRecover (
Tcb->CongestState = TCP_CONGEST_OPEN;
DEBUG ((EFI_D_INFO, "TcpFastLossRecover: received a "
- "full ACK(%d) for TCB %x\n", Seg->Ack, Tcb));
+ "full ACK(%d) for TCB %p\n", Seg->Ack, Tcb));
} else {
@@ -196,7 +196,7 @@ TcpFastLossRecover (
//
TcpRetransmit (Tcb, Seg->Ack);
DEBUG ((EFI_D_INFO, "TcpFastLossRecover: received a "
- "partial ACK(%d) for TCB %x\n", Seg->Ack, Tcb));
+ "partial ACK(%d) for TCB %p\n", Seg->Ack, Tcb));
}
}
}
@@ -256,7 +256,7 @@ TcpComputeRtt (
}
- DEBUG ((EFI_D_INFO, "TcpComputeRtt: new RTT for TCB %x"
+ DEBUG ((EFI_D_INFO, "TcpComputeRtt: new RTT for TCB %p"
" computed SRTT: %d RTTVAR: %d RTO: %d\n",
Tcb, Tcb->SRtt, Tcb->RttVar, Tcb->Rto));
@@ -443,14 +443,14 @@ TcpDeliverData (
//
if (!IsListEmpty (&Tcb->RcvQue)) {
DEBUG ((EFI_D_ERROR, "TcpDeliverData: data received after"
- " FIN from peer of TCB %x, reset connection\n", Tcb));
+ " FIN from peer of TCB %p, reset connection\n", Tcb));
NetbufFree (Nbuf);
return -1;
}
DEBUG ((EFI_D_INFO, "TcpDeliverData: processing FIN "
- "from peer of TCB %x\n", Tcb));
+ "from peer of TCB %p\n", Tcb));
switch (Tcb->State) {
case TCP_SYN_RCVD:
@@ -481,7 +481,7 @@ TcpDeliverData (
} else {
DEBUG ((EFI_D_WARN, "Connection closed immediately "
- "because app disables TIME_WAIT timer for %x\n", Tcb));
+ "because app disables TIME_WAIT timer for %p\n", Tcb));
TcpSendAck (Tcb);
TcpClose (Tcb);
@@ -773,7 +773,7 @@ TcpInput (
//
if (TcpParseOption (Nbuf->Tcp, &Option) == -1) {
DEBUG ((EFI_D_ERROR, "TcpInput: reset the peer because"
- " of mal-format option for Tcb %x\n", Tcb));
+ " of mal-format option for Tcb %p\n", Tcb));
goto SEND_RESET;
}
@@ -797,7 +797,7 @@ TcpInput (
//
if (TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {
DEBUG ((EFI_D_WARN, "TcpInput: discard a reset segment "
- "for TCB %x in listening\n", Tcb));
+ "for TCB %p in listening\n", Tcb));
goto DISCARD;
}
@@ -808,7 +808,7 @@ TcpInput (
//
if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {
DEBUG ((EFI_D_WARN, "TcpInput: send reset because of"
- " segment with ACK for TCB %x in listening\n", Tcb));
+ " segment with ACK for TCB %p in listening\n", Tcb));
goto SEND_RESET;
}
@@ -830,7 +830,7 @@ TcpInput (
goto DISCARD;
}
- DEBUG ((EFI_D_INFO, "TcpInput: create a child for TCB %x"
+ DEBUG ((EFI_D_INFO, "TcpInput: create a child for TCB %p"
" in listening\n", Tcb));
//
@@ -860,7 +860,7 @@ TcpInput (
if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK) && (Seg->Ack != Tcb->Iss + 1)) {
DEBUG ((EFI_D_WARN, "TcpInput: send reset because of "
- "wrong ACK received for TCB %x in SYN_SENT\n", Tcb));
+ "wrong ACK received for TCB %p in SYN_SENT\n", Tcb));
goto SEND_RESET;
}
@@ -923,7 +923,7 @@ TcpInput (
TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW);
DEBUG ((EFI_D_INFO, "TcpInput: connection established"
- " for TCB %x in SYN_SENT\n", Tcb));
+ " for TCB %p in SYN_SENT\n", Tcb));
goto StepSix;
} else {
@@ -938,7 +938,7 @@ TcpInput (
TcpTrimInWnd (Tcb, Nbuf);
DEBUG ((EFI_D_WARN, "TcpInput: simultanous open "
- "for TCB %x in SYN_SENT\n", Tcb));
+ "for TCB %p in SYN_SENT\n", Tcb));
goto StepSix;
}
@@ -956,7 +956,7 @@ TcpInput (
//
if (!TcpSeqAcceptable (Tcb, Seg)) {
DEBUG ((EFI_D_WARN, "TcpInput: sequence acceptance"
- " test failed for segment of TCB %x\n", Tcb));
+ " test failed for segment of TCB %p\n", Tcb));
if (!TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {
TcpSendAck (Tcb);
@@ -977,7 +977,7 @@ TcpInput (
//
if (TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {
- DEBUG ((EFI_D_WARN, "TcpInput: connection reset for TCB %x\n", Tcb));
+ DEBUG ((EFI_D_WARN, "TcpInput: connection reset for TCB %p\n", Tcb));
if (Tcb->State == TCP_SYN_RCVD) {
@@ -1021,7 +1021,7 @@ TcpInput (
if (TCP_FLG_ON (Seg->Flag, TCP_FLG_SYN)) {
DEBUG ((EFI_D_WARN, "TcpInput: connection reset "
- "because received extra SYN for TCB %x\n", Tcb));
+ "because received extra SYN for TCB %p\n", Tcb));
SOCK_ERROR (Tcb->Sk, EFI_CONNECTION_RESET);
goto RESET_THEN_DROP;
@@ -1032,7 +1032,7 @@ TcpInput (
//
if (!TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {
DEBUG ((EFI_D_WARN, "TcpInput: segment discard because"
- " of no ACK for connected TCB %x\n", Tcb));
+ " of no ACK for connected TCB %p\n", Tcb));
goto DISCARD;
@@ -1053,14 +1053,14 @@ TcpInput (
TcpDeliverData (Tcb);
DEBUG ((EFI_D_INFO, "TcpInput: connection established "
- " for TCB %x in SYN_RCVD\n", Tcb));
+ " for TCB %p in SYN_RCVD\n", Tcb));
//
// Continue the process as ESTABLISHED state
//
} else {
DEBUG ((EFI_D_WARN, "TcpInput: send reset because of"
- " wrong ACK for TCB %x in SYN_RCVD\n", Tcb));
+ " wrong ACK for TCB %p in SYN_RCVD\n", Tcb));
goto SEND_RESET;
}
@@ -1069,14 +1069,14 @@ TcpInput (
if (TCP_SEQ_LT (Seg->Ack, Tcb->SndUna)) {
DEBUG ((EFI_D_WARN, "TcpInput: ignore the out-of-data"
- " ACK for connected TCB %x\n", Tcb));
+ " ACK for connected TCB %p\n", Tcb));
goto StepSix;
} else if (TCP_SEQ_GT (Seg->Ack, Tcb->SndNxt)) {
DEBUG ((EFI_D_WARN, "TcpInput: discard segment for "
- "future ACK for connected TCB %x\n", Tcb));
+ "future ACK for connected TCB %p\n", Tcb));
TcpSendAck (Tcb);
goto DISCARD;
@@ -1187,7 +1187,7 @@ TcpInput (
}
DEBUG ((EFI_D_WARN, "TcpInput: peer shrinks the"
- " window for connected TCB %x\n", Tcb));
+ " window for connected TCB %p\n", Tcb));
if ((Tcb->CongestState == TCP_CONGEST_RECOVER) &&
(TCP_SEQ_LT (Right, Tcb->Recover))) {
@@ -1225,7 +1225,7 @@ NO_UPDATE:
(Tcb->SndUna == Tcb->SndNxt)) {
DEBUG ((EFI_D_INFO, "TcpInput: local FIN is ACKed by"
- " peer for connected TCB %x\n", Tcb));
+ " peer for connected TCB %p\n", Tcb));
TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_FIN_ACKED);
}
@@ -1265,7 +1265,7 @@ NO_UPDATE:
} else {
DEBUG ((EFI_D_WARN, "Connection closed immediately "
- "because app disables TIME_WAIT timer for %x\n", Tcb));
+ "because app disables TIME_WAIT timer for %p\n", Tcb));
TcpClose (Tcb);
}
@@ -1291,7 +1291,7 @@ NO_UPDATE:
} else {
DEBUG ((EFI_D_WARN, "Connection closed immediately "
- "because app disables TIME_WAIT timer for %x\n", Tcb));
+ "because app disables TIME_WAIT timer for %p\n", Tcb));
TcpClose (Tcb);
}
@@ -1316,7 +1316,7 @@ StepSix:
!TCP_FIN_RCVD (Tcb->State)) {
DEBUG ((EFI_D_INFO, "TcpInput: received urgent data "
- "from peer for connected TCB %x\n", Tcb));
+ "from peer for connected TCB %p\n", Tcb));
Urg = Seg->Seq + Seg->Urg;
@@ -1339,14 +1339,14 @@ StepSix:
if (TCP_FIN_RCVD (Tcb->State)) {
DEBUG ((EFI_D_WARN, "TcpInput: connection reset because"
- " data is lost for connected TCB %x\n", Tcb));
+ " data is lost for connected TCB %p\n", Tcb));
goto RESET_THEN_DROP;
}
if (TCP_LOCAL_CLOSED (Tcb->State) && (Nbuf->TotalSize != 0)) {
DEBUG ((EFI_D_WARN, "TcpInput: connection reset because"
- " data is lost for connected TCB %x\n", Tcb));
+ " data is lost for connected TCB %p\n", Tcb));
goto RESET_THEN_DROP;
}
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
index 82e3a600db..446cb9b11c 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Misc.c
@@ -521,7 +521,7 @@ TcpSetState (
{
DEBUG (
(EFI_D_INFO,
- "Tcb (%x) state %s --> %s\n",
+ "Tcb (%p) state %s --> %s\n",
Tcb,
mTcpStateName[Tcb->State],
mTcpStateName[State])
@@ -726,7 +726,7 @@ TcpOnAppClose (
if (!IsListEmpty (&Tcb->RcvQue) || GET_RCV_DATASIZE (Tcb->Sk)) {
DEBUG ((EFI_D_WARN, "TcpOnAppClose: connection reset "
- "because data is lost for TCB %x\n", Tcb));
+ "because data is lost for TCB %p\n", Tcb));
TcpResetConnection (Tcb);
TcpClose (Tcb);
@@ -841,13 +841,13 @@ TcpOnAppConsume (
if (TcpOld < Tcb->RcvMss) {
DEBUG ((EFI_D_INFO, "TcpOnAppConsume: send a window"
- " update for a window closed Tcb(%x)\n", Tcb));
+ " update for a window closed Tcb(%p)\n", Tcb));
TcpSendAck (Tcb);
} else if (Tcb->DelayedAck == 0) {
DEBUG ((EFI_D_INFO, "TcpOnAppConsume: scheduled a delayed"
- " ACK to update window for Tcb(%x)\n", Tcb));
+ " ACK to update window for Tcb(%p)\n", Tcb));
Tcb->DelayedAck = 1;
}
@@ -887,7 +887,7 @@ TcpOnAppAbort (
)
{
DEBUG ((EFI_D_WARN, "TcpOnAppAbort: connection reset "
- "issued by application for TCB %x\n", Tcb));
+ "issued by application for TCB %p\n", Tcb));
switch (Tcb->State) {
case TCP_SYN_RCVD:
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
index 38694f9bf5..f1bc83e20b 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Output.c
@@ -273,7 +273,7 @@ SetPersistTimer:
DEBUG (
(EFI_D_WARN,
- "TcpDataToSend: enter persistent state for TCB %x\n",
+ "TcpDataToSend: enter persistent state for TCB %p\n",
Tcb)
);
@@ -580,7 +580,7 @@ TcpGetSegmentSock (
if (Nbuf == NULL) {
DEBUG ((EFI_D_ERROR, "TcpGetSegmentSock: failed to allocate "
- "a netbuf for TCB %x\n",Tcb));
+ "a netbuf for TCB %p\n",Tcb));
return NULL;
}
@@ -681,7 +681,7 @@ TcpRetransmit (
//
if (TCP_SEQ_LT (Tcb->SndWl2 + Tcb->SndWnd, Seq)) {
DEBUG ((EFI_D_WARN, "TcpRetransmit: retransmission cancelled "
- "because send window too small for TCB %x\n", Tcb));
+ "because send window too small for TCB %p\n", Tcb));
return 0;
}
@@ -783,7 +783,7 @@ SEND_AGAIN:
if (Nbuf == NULL) {
DEBUG (
(EFI_D_ERROR,
- "TcpToSendData: failed to get a segment for TCB %x\n",
+ "TcpToSendData: failed to get a segment for TCB %p\n",
Tcb)
);
@@ -812,7 +812,7 @@ SEND_AGAIN:
) {
DEBUG ((EFI_D_INFO, "TcpToSendData: send FIN "
- "to peer for TCB %x in state %d\n", Tcb, Tcb->State));
+ "to peer for TCB %p in state %d\n", Tcb, Tcb->State));
End++;
} else {
@@ -832,7 +832,7 @@ SEND_AGAIN:
//
if (Seg->End == Seg->Seq) {
DEBUG ((EFI_D_WARN, "TcpToSendData: created a empty"
- " segment for TCB %x, free it now\n", Tcb));
+ " segment for TCB %p, free it now\n", Tcb));
NetbufFree (Nbuf);
return Sent;
@@ -889,7 +889,7 @@ SEND_AGAIN:
!TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RTT_ON)) {
DEBUG ((EFI_D_INFO, "TcpToSendData: set RTT measure "
- "sequence %d for TCB %x\n", Seq, Tcb));
+ "sequence %d for TCB %p\n", Seq, Tcb));
TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_RTT_ON);
Tcb->RttSeq = Seq;
@@ -1023,7 +1023,7 @@ TcpToSendAck (
}
DEBUG ((EFI_D_INFO, "TcpToSendAck: scheduled a delayed"
- " ACK for TCB %x\n", Tcb));
+ " ACK for TCB %p\n", Tcb));
//
// schedule a delayed ACK
diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
index 0f728a8ab9..5e957dc918 100644
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
@@ -106,7 +106,7 @@ TcpConnectTimeout (
{
if (!TCP_CONNECTED (Tcb->State)) {
DEBUG ((EFI_D_ERROR, "TcpConnectTimeout: connection closed "
- "because conenction timer timeout for TCB %x\n", Tcb));
+ "because conenction timer timeout for TCB %p\n", Tcb));
if (EFI_ABORTED == Tcb->Sk->SockError) {
SOCK_ERROR (Tcb->Sk, EFI_TIMEOUT);
@@ -114,7 +114,7 @@ TcpConnectTimeout (
if (TCP_SYN_RCVD == Tcb->State) {
DEBUG ((EFI_D_WARN, "TcpConnectTimeout: send reset because "
- "connection timer timeout for TCB %x\n", Tcb));
+ "connection timer timeout for TCB %p\n", Tcb));
TcpResetConnection (Tcb);
@@ -142,7 +142,7 @@ TcpRexmitTimeout (
UINT32 FlightSize;
DEBUG ((EFI_D_WARN, "TcpRexmitTimeout: transmission "
- "timeout for TCB %x\n", Tcb));
+ "timeout for TCB %p\n", Tcb));
//
// Set the congestion window. FlightSize is the
@@ -160,7 +160,7 @@ TcpRexmitTimeout (
!TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_CONNECT)) {
DEBUG ((EFI_D_ERROR, "TcpRexmitTimeout: connection closed "
- "because too many timeouts for TCB %x\n", Tcb));
+ "because too many timeouts for TCB %p\n", Tcb));
if (EFI_ABORTED == Tcb->Sk->SockError) {
SOCK_ERROR (Tcb->Sk, EFI_TIMEOUT);
@@ -260,7 +260,7 @@ TcpFinwait2Timeout (
)
{
DEBUG ((EFI_D_WARN, "TcpFinwait2Timeout: connection closed "
- "because FIN_WAIT2 timer timeouts for TCB %x\n", Tcb));
+ "because FIN_WAIT2 timer timeouts for TCB %p\n", Tcb));
TcpClose (Tcb);
}
@@ -281,7 +281,7 @@ Tcp2MSLTimeout (
)
{
DEBUG ((EFI_D_WARN, "Tcp2MSLTimeout: connection closed "
- "because TIME_WAIT timer timeouts for TCB %x\n", Tcb));
+ "because TIME_WAIT timer timeouts for TCB %p\n", Tcb));
TcpClose (Tcb);
}