diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2021-11-16 19:21:32 -0800 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2021-12-07 17:24:28 +0000 |
| commit | c49ca4a29ed6076bc2a8fc443130f98c0ed69eda (patch) | |
| tree | 5530a5b3627701c42e834ae3aced4cd23ab8fe6c | |
| parent | 5f289f3ae3e9fbe6ff5b82d0e25e87bfb7899766 (diff) | |
| download | edk2-c49ca4a29ed6076bc2a8fc443130f98c0ed69eda.tar.gz edk2-c49ca4a29ed6076bc2a8fc443130f98c0ed69eda.tar.bz2 edk2-c49ca4a29ed6076bc2a8fc443130f98c0ed69eda.zip | |
NetworkPkg: Change use of EFI_D_* to DEBUG_*
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3739
Update all use of EFI_D_* defines in DEBUG() macros to DEBUG_* defines.
Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Maciej Rabeda <maciej.rabeda@linux.intel.com>
42 files changed, 274 insertions, 286 deletions
diff --git a/NetworkPkg/ArpDxe/ArpDriver.c b/NetworkPkg/ArpDxe/ArpDriver.c index 2b8da5a2ba..eeef7f68e1 100644 --- a/NetworkPkg/ArpDxe/ArpDriver.c +++ b/NetworkPkg/ArpDxe/ArpDriver.c @@ -492,7 +492,7 @@ ArpDriverBindingStop ( EFI_OPEN_PROTOCOL_GET_PROTOCOL
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "ArpDriverBindingStop: Open ArpSb failed, %r.\n", Status));
+ DEBUG ((DEBUG_ERROR, "ArpDriverBindingStop: Open ArpSb failed, %r.\n", Status));
return EFI_DEVICE_ERROR;
}
@@ -578,7 +578,7 @@ ArpServiceBindingCreateChild ( //
Instance = AllocateZeroPool (sizeof(ARP_INSTANCE_DATA));
if (Instance == NULL) {
- DEBUG ((EFI_D_ERROR, "ArpSBCreateChild: Failed to allocate memory for Instance.\n"));
+ DEBUG ((DEBUG_ERROR, "ArpSBCreateChild: Failed to allocate memory for Instance.\n"));
return EFI_OUT_OF_RESOURCES;
}
@@ -746,7 +746,7 @@ ArpServiceBindingDestroyChild ( NULL
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "ArpSBDestroyChild: Failed to uninstall the arp protocol, %r.\n",
+ DEBUG ((DEBUG_ERROR, "ArpSBDestroyChild: Failed to uninstall the arp protocol, %r.\n",
Status));
Instance->InDestroy = FALSE;
@@ -808,4 +808,3 @@ ArpDriverEntryPoint ( &gArpComponentName2
);
}
-
diff --git a/NetworkPkg/ArpDxe/ArpImpl.c b/NetworkPkg/ArpDxe/ArpImpl.c index ed2d756d3e..fe92a9855c 100644 --- a/NetworkPkg/ArpDxe/ArpImpl.c +++ b/NetworkPkg/ArpDxe/ArpImpl.c @@ -306,7 +306,7 @@ RESTART_RECEIVE: DEBUG_CODE (
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "ArpOnFrameRcvd: ArpService->Mnp->Receive "
+ DEBUG ((DEBUG_ERROR, "ArpOnFrameRcvd: ArpService->Mnp->Receive "
"failed, %r\n.", Status));
}
);
@@ -360,7 +360,7 @@ ArpOnFrameSentDpc ( DEBUG_CODE (
if (EFI_ERROR (TxToken->Status)) {
- DEBUG ((EFI_D_ERROR, "ArpOnFrameSent: TxToken->Status, %r.\n", TxToken->Status));
+ DEBUG ((DEBUG_ERROR, "ArpOnFrameSent: TxToken->Status, %r.\n", TxToken->Status));
}
);
@@ -952,7 +952,7 @@ ArpConfigureInstance ( OldConfigData->StationAddress = AllocatePool (OldConfigData->SwAddressLength);
if (OldConfigData->StationAddress == NULL) {
- DEBUG ((EFI_D_ERROR, "ArpConfigInstance: AllocatePool for the StationAddress "
+ DEBUG ((DEBUG_ERROR, "ArpConfigInstance: AllocatePool for the StationAddress "
"failed.\n"));
return EFI_OUT_OF_RESOURCES;
}
@@ -1044,7 +1044,7 @@ ArpSendFrame ( //
TxToken = AllocatePool (sizeof(EFI_MANAGED_NETWORK_COMPLETION_TOKEN));
if (TxToken == NULL) {
- DEBUG ((EFI_D_ERROR, "ArpSendFrame: Allocate memory for TxToken failed.\n"));
+ DEBUG ((DEBUG_ERROR, "ArpSendFrame: Allocate memory for TxToken failed.\n"));
return;
}
@@ -1063,7 +1063,7 @@ ArpSendFrame ( &TxToken->Event
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "ArpSendFrame: CreateEvent failed for TxToken->Event.\n"));
+ DEBUG ((DEBUG_ERROR, "ArpSendFrame: CreateEvent failed for TxToken->Event.\n"));
goto CLEAN_EXIT;
}
@@ -1072,7 +1072,7 @@ ArpSendFrame ( //
TxData = AllocatePool (sizeof(EFI_MANAGED_NETWORK_TRANSMIT_DATA));
if (TxData == NULL) {
- DEBUG ((EFI_D_ERROR, "ArpSendFrame: Allocate memory for TxData failed.\n"));
+ DEBUG ((DEBUG_ERROR, "ArpSendFrame: Allocate memory for TxData failed.\n"));
goto CLEAN_EXIT;
}
@@ -1091,7 +1091,7 @@ ArpSendFrame ( //
Packet = AllocatePool (TotalLength);
if (Packet == NULL) {
- DEBUG ((EFI_D_ERROR, "ArpSendFrame: Allocate memory for Packet failed.\n"));
+ DEBUG ((DEBUG_ERROR, "ArpSendFrame: Allocate memory for Packet failed.\n"));
ASSERT (Packet != NULL);
}
@@ -1189,7 +1189,7 @@ ArpSendFrame ( //
Status = ArpService->Mnp->Transmit (ArpService->Mnp, TxToken);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "Mnp->Transmit failed, %r.\n", Status));
+ DEBUG ((DEBUG_ERROR, "Mnp->Transmit failed, %r.\n", Status));
goto CLEAN_EXIT;
}
@@ -1604,7 +1604,7 @@ ArpFindCacheEntry ( //
FindData = AllocatePool (FoundCount * FoundEntryLength);
if (FindData == NULL) {
- DEBUG ((EFI_D_ERROR, "ArpFindCacheEntry: Failed to allocate memory.\n"));
+ DEBUG ((DEBUG_ERROR, "ArpFindCacheEntry: Failed to allocate memory.\n"));
Status = EFI_OUT_OF_RESOURCES;
goto CLEAN_EXIT;
}
@@ -1664,4 +1664,3 @@ CLEAN_EXIT: return Status;
}
-
diff --git a/NetworkPkg/ArpDxe/ArpMain.c b/NetworkPkg/ArpDxe/ArpMain.c index 6e8690a936..1398cdda5e 100644 --- a/NetworkPkg/ArpDxe/ArpMain.c +++ b/NetworkPkg/ArpDxe/ArpMain.c @@ -229,7 +229,7 @@ ArpAdd ( CacheEntry = ArpAllocCacheEntry (Instance);
if (CacheEntry == NULL) {
- DEBUG ((EFI_D_ERROR, "ArpAdd: Failed to allocate pool for CacheEntry.\n"));
+ DEBUG ((DEBUG_ERROR, "ArpAdd: Failed to allocate pool for CacheEntry.\n"));
Status = EFI_OUT_OF_RESOURCES;
goto UNLOCK_EXIT;
}
@@ -590,7 +590,7 @@ ArpRequest ( //
RequestContext = AllocatePool (sizeof(USER_REQUEST_CONTEXT));
if (RequestContext == NULL) {
- DEBUG ((EFI_D_ERROR, "ArpRequest: Allocate memory for RequestContext failed.\n"));
+ DEBUG ((DEBUG_ERROR, "ArpRequest: Allocate memory for RequestContext failed.\n"));
Status = EFI_OUT_OF_RESOURCES;
goto UNLOCK_EXIT;
@@ -621,7 +621,7 @@ ArpRequest ( //
CacheEntry = ArpAllocCacheEntry (Instance);
if (CacheEntry == NULL) {
- DEBUG ((EFI_D_ERROR, "ArpRequest: Allocate memory for CacheEntry failed.\n"));
+ DEBUG ((DEBUG_ERROR, "ArpRequest: Allocate memory for CacheEntry failed.\n"));
FreePool (RequestContext);
Status = EFI_OUT_OF_RESOURCES;
diff --git a/NetworkPkg/HttpBootDxe/HttpBootClient.c b/NetworkPkg/HttpBootDxe/HttpBootClient.c index aa0a153019..d12076b220 100644 --- a/NetworkPkg/HttpBootDxe/HttpBootClient.c +++ b/NetworkPkg/HttpBootDxe/HttpBootClient.c @@ -231,7 +231,7 @@ HttpBootDhcp4ExtractUriInfo ( //
Status = HttpBootCheckUriScheme (Private->BootFileUri);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "HttpBootDhcp4ExtractUriInfo: %r.\n", Status));
+ DEBUG ((DEBUG_ERROR, "HttpBootDhcp4ExtractUriInfo: %r.\n", Status));
if (Status == EFI_INVALID_PARAMETER) {
AsciiPrint ("\n Error: Invalid URI address.\n");
} else if (Status == EFI_ACCESS_DENIED) {
@@ -371,7 +371,7 @@ HttpBootDhcp6ExtractUriInfo ( //
Status = HttpBootCheckUriScheme (Private->BootFileUri);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "HttpBootDhcp6ExtractUriInfo: %r.\n", Status));
+ DEBUG ((DEBUG_ERROR, "HttpBootDhcp6ExtractUriInfo: %r.\n", Status));
if (Status == EFI_INVALID_PARAMETER) {
AsciiPrint ("\n Error: Invalid URI address.\n");
} else if (Status == EFI_ACCESS_DENIED) {
@@ -1309,4 +1309,3 @@ ERROR_1: return Status;
}
-
diff --git a/NetworkPkg/HttpBootDxe/HttpBootConfig.c b/NetworkPkg/HttpBootDxe/HttpBootConfig.c index 646c907b12..795e61b5b4 100644 --- a/NetworkPkg/HttpBootDxe/HttpBootConfig.c +++ b/NetworkPkg/HttpBootDxe/HttpBootConfig.c @@ -489,7 +489,7 @@ HttpBootFormCallback ( if (Status == EFI_INVALID_PARAMETER) {
- DEBUG ((EFI_D_ERROR, "HttpBootFormCallback: %r.\n", Status));
+ DEBUG ((DEBUG_ERROR, "HttpBootFormCallback: %r.\n", Status));
CreatePopUp (
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
@@ -500,7 +500,7 @@ HttpBootFormCallback ( );
} else if (Status == EFI_ACCESS_DENIED) {
- DEBUG ((EFI_D_ERROR, "HttpBootFormCallback: %r.\n", Status));
+ DEBUG ((DEBUG_ERROR, "HttpBootFormCallback: %r.\n", Status));
CreatePopUp (
EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
diff --git a/NetworkPkg/HttpBootDxe/HttpBootSupport.c b/NetworkPkg/HttpBootDxe/HttpBootSupport.c index a91411db7d..99d7fb39c7 100644 --- a/NetworkPkg/HttpBootDxe/HttpBootSupport.c +++ b/NetworkPkg/HttpBootDxe/HttpBootSupport.c @@ -528,7 +528,7 @@ HttpBootCheckUriScheme ( // Return EFI_INVALID_PARAMETER if the URI is not HTTP or HTTPS.
//
if ((AsciiStrnCmp (Uri, "http://", 7) != 0) && (AsciiStrnCmp (Uri, "https://", 8) != 0)) {
- DEBUG ((EFI_D_ERROR, "HttpBootCheckUriScheme: Invalid Uri.\n"));
+ DEBUG ((DEBUG_ERROR, "HttpBootCheckUriScheme: Invalid Uri.\n"));
return EFI_INVALID_PARAMETER;
}
@@ -536,7 +536,7 @@ HttpBootCheckUriScheme ( // HTTP is disabled, return EFI_ACCESS_DENIED if the URI is HTTP.
//
if (!PcdGetBool (PcdAllowHttpConnections) && (AsciiStrnCmp (Uri, "http://", 7) == 0)) {
- DEBUG ((EFI_D_ERROR, "HttpBootCheckUriScheme: HTTP is disabled.\n"));
+ DEBUG ((DEBUG_ERROR, "HttpBootCheckUriScheme: HTTP is disabled.\n"));
return EFI_ACCESS_DENIED;
}
@@ -729,7 +729,7 @@ HttpBootRegisterRamDisk ( Status = gBS->LocateProtocol (&gEfiRamDiskProtocolGuid, NULL, (VOID**) &RamDisk);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "HTTP Boot: Couldn't find the RAM Disk protocol - %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "HTTP Boot: Couldn't find the RAM Disk protocol - %r\n", Status));
return Status;
}
@@ -749,7 +749,7 @@ HttpBootRegisterRamDisk ( &DevicePath
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "HTTP Boot: Failed to register RAM Disk - %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "HTTP Boot: Failed to register RAM Disk - %r\n", Status));
}
return Status;
diff --git a/NetworkPkg/HttpDxe/HttpImpl.c b/NetworkPkg/HttpDxe/HttpImpl.c index 7285b0fbeb..7024821515 100644 --- a/NetworkPkg/HttpDxe/HttpImpl.c +++ b/NetworkPkg/HttpDxe/HttpImpl.c @@ -362,7 +362,7 @@ EfiHttpRequest ( //
if (!PcdGetBool (PcdAllowHttpConnections) && !(HttpInstance->UseHttps)) {
- DEBUG ((EFI_D_ERROR, "EfiHttpRequest: HTTP is disabled.\n"));
+ DEBUG ((DEBUG_ERROR, "EfiHttpRequest: HTTP is disabled.\n"));
return EFI_ACCESS_DENIED;
}
@@ -531,7 +531,7 @@ EfiHttpRequest ( FreePool (HostNameStr);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "Error: Could not retrieve the host address from DNS server.\n"));
+ DEBUG ((DEBUG_ERROR, "Error: Could not retrieve the host address from DNS server.\n"));
goto Error1;
}
}
diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c index affa916bd6..227c093f20 100644 --- a/NetworkPkg/HttpDxe/HttpProto.c +++ b/NetworkPkg/HttpDxe/HttpProto.c @@ -145,7 +145,7 @@ HttpTcpReceiveNotifyDpc ( Wrap->TcpWrap.Rx6Token.CompletionToken.Event = NULL;
if (EFI_ERROR (Wrap->TcpWrap.Rx6Token.CompletionToken.Status)) {
- DEBUG ((EFI_D_ERROR, "HttpTcpReceiveNotifyDpc: %r!\n", Wrap->TcpWrap.Rx6Token.CompletionToken.Status));
+ DEBUG ((DEBUG_ERROR, "HttpTcpReceiveNotifyDpc: %r!\n", Wrap->TcpWrap.Rx6Token.CompletionToken.Status));
Wrap->HttpToken->Status = Wrap->TcpWrap.Rx6Token.CompletionToken.Status;
gBS->SignalEvent (Wrap->HttpToken->Event);
@@ -165,7 +165,7 @@ HttpTcpReceiveNotifyDpc ( Wrap->TcpWrap.Rx4Token.CompletionToken.Event = NULL;
if (EFI_ERROR (Wrap->TcpWrap.Rx4Token.CompletionToken.Status)) {
- DEBUG ((EFI_D_ERROR, "HttpTcpReceiveNotifyDpc: %r!\n", Wrap->TcpWrap.Rx4Token.CompletionToken.Status));
+ DEBUG ((DEBUG_ERROR, "HttpTcpReceiveNotifyDpc: %r!\n", Wrap->TcpWrap.Rx4Token.CompletionToken.Status));
Wrap->HttpToken->Status = Wrap->TcpWrap.Rx4Token.CompletionToken.Status;
gBS->SignalEvent (Wrap->HttpToken->Event);
@@ -968,7 +968,7 @@ HttpCreateConnection ( Status = HttpInstance->Tcp4->Connect (HttpInstance->Tcp4, &HttpInstance->Tcp4ConnToken);
HttpNotify (HttpEventConnectTcp, Status);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "HttpCreateConnection: Tcp4->Connect() = %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "HttpCreateConnection: Tcp4->Connect() = %r\n", Status));
return Status;
}
@@ -984,7 +984,7 @@ HttpCreateConnection ( Status = HttpInstance->Tcp6->Connect (HttpInstance->Tcp6, &HttpInstance->Tcp6ConnToken);
HttpNotify (HttpEventConnectTcp, Status);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "HttpCreateConnection: Tcp6->Connect() = %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "HttpCreateConnection: Tcp6->Connect() = %r\n", Status));
return Status;
}
@@ -1109,7 +1109,7 @@ HttpConfigureTcp4 ( Status = HttpInstance->Tcp4->Configure (HttpInstance->Tcp4, Tcp4CfgData);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "HttpConfigureTcp4 - %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "HttpConfigureTcp4 - %r\n", Status));
return Status;
}
@@ -1179,7 +1179,7 @@ HttpConfigureTcp6 ( Status = HttpInstance->Tcp6->Configure (HttpInstance->Tcp6, Tcp6CfgData);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "HttpConfigureTcp6 - %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "HttpConfigureTcp6 - %r\n", Status));
return Status;
}
@@ -1232,7 +1232,7 @@ HttpConnectTcp4 ( NULL
);
if (EFI_ERROR(Status)){
- DEBUG ((EFI_D_ERROR, "Tcp4 GetModeData fail - %x\n", Status));
+ DEBUG ((DEBUG_ERROR, "Tcp4 GetModeData fail - %x\n", Status));
return Status;
}
@@ -1244,7 +1244,7 @@ HttpConnectTcp4 ( Status = HttpCreateConnection (HttpInstance);
if (EFI_ERROR(Status)){
- DEBUG ((EFI_D_ERROR, "Tcp4 Connection fail - %x\n", Status));
+ DEBUG ((DEBUG_ERROR, "Tcp4 Connection fail - %x\n", Status));
return Status;
}
@@ -1325,7 +1325,7 @@ HttpConnectTcp6 ( );
if (EFI_ERROR(Status)){
- DEBUG ((EFI_D_ERROR, "Tcp6 GetModeData fail - %x\n", Status));
+ DEBUG ((DEBUG_ERROR, "Tcp6 GetModeData fail - %x\n", Status));
return Status;
}
@@ -1337,7 +1337,7 @@ HttpConnectTcp6 ( Status = HttpCreateConnection (HttpInstance);
if (EFI_ERROR(Status)){
- DEBUG ((EFI_D_ERROR, "Tcp6 Connection fail - %x\n", Status));
+ DEBUG ((DEBUG_ERROR, "Tcp6 Connection fail - %x\n", Status));
return Status;
}
@@ -1587,7 +1587,7 @@ HttpTransmitTcp ( Wrap->TcpWrap.IsTxDone = FALSE;
Status = Tcp4->Transmit (Tcp4, Tx4Token);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "Transmit failed: %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "Transmit failed: %r\n", Status));
goto ON_ERROR;
}
@@ -1610,7 +1610,7 @@ HttpTransmitTcp ( Wrap->TcpWrap.IsTxDone = FALSE;
Status = Tcp6->Transmit (Tcp6, Tx6Token);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "Transmit failed: %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "Transmit failed: %r\n", Status));
goto ON_ERROR;
}
}
@@ -1875,7 +1875,7 @@ HttpTcpReceiveHeader ( Rx4Token->Packet.RxData->FragmentTable[0].FragmentLength = DEF_BUF_LEN;
Status = Tcp4->Receive (Tcp4, Rx4Token);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "Tcp4 receive failed: %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "Tcp4 receive failed: %r\n", Status));
return Status;
}
@@ -1907,7 +1907,7 @@ HttpTcpReceiveHeader ( Status = HttpsReceive (HttpInstance, &Fragment, Timeout);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "Tcp4 receive failed: %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "Tcp4 receive failed: %r\n", Status));
return Status;
}
}
@@ -1975,7 +1975,7 @@ HttpTcpReceiveHeader ( Rx6Token->Packet.RxData->FragmentTable[0].FragmentLength = DEF_BUF_LEN;
Status = Tcp6->Receive (Tcp6, Rx6Token);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "Tcp6 receive failed: %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "Tcp6 receive failed: %r\n", Status));
return Status;
}
@@ -2007,7 +2007,7 @@ HttpTcpReceiveHeader ( Status = HttpsReceive (HttpInstance, &Fragment, Timeout);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "Tcp6 receive failed: %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "Tcp6 receive failed: %r\n", Status));
return Status;
}
}
@@ -2111,7 +2111,7 @@ HttpTcpReceiveBody ( Status = Tcp6->Receive (Tcp6, Rx6Token);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "Tcp6 receive failed: %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "Tcp6 receive failed: %r\n", Status));
return Status;
}
} else {
@@ -2123,7 +2123,7 @@ HttpTcpReceiveBody ( Rx4Token->CompletionToken.Status = EFI_NOT_READY;
Status = Tcp4->Receive (Tcp4, Rx4Token);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "Tcp4 receive failed: %r\n", Status));
+ DEBUG ((DEBUG_ERROR, "Tcp4 receive failed: %r\n", Status));
return Status;
}
}
diff --git a/NetworkPkg/HttpDxe/HttpsSupport.c b/NetworkPkg/HttpDxe/HttpsSupport.c index 0f28ae9447..d503e38515 100644 --- a/NetworkPkg/HttpDxe/HttpsSupport.c +++ b/NetworkPkg/HttpDxe/HttpsSupport.c @@ -680,7 +680,7 @@ TlsConfigureSession ( //
Status = TlsConfigCipherList (HttpInstance);
if (EFI_ERROR (Status) && Status != EFI_NOT_FOUND) {
- DEBUG ((EFI_D_ERROR, "TlsConfigCipherList: return %r error.\n", Status));
+ DEBUG ((DEBUG_ERROR, "TlsConfigCipherList: return %r error.\n", Status));
return Status;
}
@@ -689,7 +689,7 @@ TlsConfigureSession ( //
Status = TlsConfigCertificate (HttpInstance);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "TLS Certificate Config Error!\n"));
+ DEBUG ((DEBUG_ERROR, "TLS Certificate Config Error!\n"));
return Status;
}
@@ -1874,7 +1874,7 @@ HttpsReceive ( FreePool (GetSessionDataBuffer);
if(HttpInstance->TlsSessionState == EfiTlsSessionError) {
- DEBUG ((EFI_D_ERROR, "TLS Session State Error!\n"));
+ DEBUG ((DEBUG_ERROR, "TLS Session State Error!\n"));
return EFI_ABORTED;
}
@@ -1887,4 +1887,3 @@ HttpsReceive ( return Status;
}
-
diff --git a/NetworkPkg/IScsiDxe/IScsiProto.c b/NetworkPkg/IScsiDxe/IScsiProto.c index e62736bc04..ebb4551b04 100644 --- a/NetworkPkg/IScsiDxe/IScsiProto.c +++ b/NetworkPkg/IScsiDxe/IScsiProto.c @@ -260,7 +260,7 @@ IScsiCreateConnection ( }
if (EFI_ERROR(Status)) {
- DEBUG ((EFI_D_ERROR, "The configuration of Target address or DNS server address is invalid!\n"));
+ DEBUG ((DEBUG_ERROR, "The configuration of Target address or DNS server address is invalid!\n"));
FreePool (Conn);
return NULL;
}
diff --git a/NetworkPkg/Ip6Dxe/Ip6Driver.c b/NetworkPkg/Ip6Dxe/Ip6Driver.c index 7c13d6a3d4..80ce5b5d0a 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Driver.c +++ b/NetworkPkg/Ip6Dxe/Ip6Driver.c @@ -591,7 +591,7 @@ Ip6DriverBindingStart ( 0,
NULL
);
- DEBUG ((EFI_D_WARN, "Ip6DriverBindingStart: Clean the invalid ManualAddress configuration.\n"));
+ DEBUG ((DEBUG_WARN, "Ip6DriverBindingStart: Clean the invalid ManualAddress configuration.\n"));
}
}
@@ -616,7 +616,7 @@ Ip6DriverBindingStart ( 0,
NULL
);
- DEBUG ((EFI_D_WARN, "Ip6DriverBindingStart: Clean the invalid Gateway configuration.\n"));
+ DEBUG ((DEBUG_WARN, "Ip6DriverBindingStart: Clean the invalid Gateway configuration.\n"));
}
}
diff --git a/NetworkPkg/MnpDxe/MnpConfig.c b/NetworkPkg/MnpDxe/MnpConfig.c index 3a51210060..b27bc2e1f6 100644 --- a/NetworkPkg/MnpDxe/MnpConfig.c +++ b/NetworkPkg/MnpDxe/MnpConfig.c @@ -67,7 +67,7 @@ MnpAddFreeNbuf ( for (Index = 0; Index < Count; Index++) {
Nbuf = NetbufAlloc (MnpDeviceData->BufferLength + MnpDeviceData->PaddingSize);
if (Nbuf == NULL) {
- DEBUG ((EFI_D_ERROR, "MnpAddFreeNbuf: NetBufAlloc failed.\n"));
+ DEBUG ((DEBUG_ERROR, "MnpAddFreeNbuf: NetBufAlloc failed.\n"));
Status = EFI_OUT_OF_RESOURCES;
break;
@@ -121,7 +121,7 @@ MnpAllocNbuf ( if (FreeNbufQue->BufNum == 0) {
if ((MnpDeviceData->NbufCnt + MNP_NET_BUFFER_INCREASEMENT) > MNP_MAX_NET_BUFFER_NUM) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"MnpAllocNbuf: The maximum NET_BUF size is reached for MNP driver instance %p.\n",
MnpDeviceData)
);
@@ -133,7 +133,7 @@ MnpAllocNbuf ( Status = MnpAddFreeNbuf (MnpDeviceData, MNP_NET_BUFFER_INCREASEMENT);
if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"MnpAllocNbuf: Failed to add NET_BUFs into the FreeNbufQue, %r.\n",
Status)
);
@@ -230,12 +230,12 @@ MnpAddFreeTxBuf ( for (Index = 0; Index < Count; Index++) {
TxBufWrap = (MNP_TX_BUF_WRAP*) AllocatePool (OFFSET_OF (MNP_TX_BUF_WRAP, TxBuf) + MnpDeviceData->BufferLength );
if (TxBufWrap == NULL) {
- DEBUG ((EFI_D_ERROR, "MnpAddFreeTxBuf: TxBuf Alloc failed.\n"));
+ DEBUG ((DEBUG_ERROR, "MnpAddFreeTxBuf: TxBuf Alloc failed.\n"));
Status = EFI_OUT_OF_RESOURCES;
break;
}
- DEBUG ((EFI_D_INFO, "MnpAddFreeTxBuf: Add TxBufWrap %p, TxBuf %p\n", TxBufWrap, TxBufWrap->TxBuf));
+ DEBUG ((DEBUG_INFO, "MnpAddFreeTxBuf: Add TxBufWrap %p, TxBuf %p\n", TxBufWrap, TxBufWrap->TxBuf));
TxBufWrap->Signature = MNP_TX_BUF_WRAP_SIGNATURE;
TxBufWrap->InUse = FALSE;
InsertTailList (&MnpDeviceData->FreeTxBufList, &TxBufWrap->WrapEntry);
@@ -288,7 +288,7 @@ MnpAllocTxBuf ( if (IsListEmpty (&MnpDeviceData->FreeTxBufList)) {
if ((MnpDeviceData->TxBufCount + MNP_TX_BUFFER_INCREASEMENT) > MNP_MAX_TX_BUFFER_NUM) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"MnpAllocTxBuf: The maximum TxBuf size is reached for MNP driver instance %p.\n",
MnpDeviceData)
);
@@ -300,7 +300,7 @@ MnpAllocTxBuf ( Status = MnpAddFreeTxBuf (MnpDeviceData, MNP_TX_BUFFER_INCREASEMENT);
if (IsListEmpty (&MnpDeviceData->FreeTxBufList)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"MnpAllocNbuf: Failed to add TxBuf into the FreeTxBufList, %r.\n",
Status)
);
@@ -349,7 +349,7 @@ MnpFreeTxBuf ( TxBufWrap = NET_LIST_USER_STRUCT (TxBuf, MNP_TX_BUF_WRAP, TxBuf);
if (TxBufWrap->Signature != MNP_TX_BUF_WRAP_SIGNATURE) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"MnpFreeTxBuf: Signature check failed in MnpFreeTxBuf.\n")
);
return;
@@ -357,7 +357,7 @@ MnpFreeTxBuf ( if (!TxBufWrap->InUse) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"MnpFreeTxBuf: Duplicated recycle report from SNP.\n")
);
return;
@@ -491,7 +491,7 @@ MnpInitializeDeviceData ( NetbufQueInit (&MnpDeviceData->FreeNbufQue);
Status = MnpAddFreeNbuf (MnpDeviceData, MNP_INIT_NET_BUFFER_NUM);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "MnpInitializeDeviceData: MnpAddFreeNbuf failed, %r.\n", Status));
+ DEBUG ((DEBUG_ERROR, "MnpInitializeDeviceData: MnpAddFreeNbuf failed, %r.\n", Status));
goto ERROR;
}
@@ -524,7 +524,7 @@ MnpInitializeDeviceData ( &MnpDeviceData->PollTimer
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "MnpInitializeDeviceData: CreateEvent for poll timer failed.\n"));
+ DEBUG ((DEBUG_ERROR, "MnpInitializeDeviceData: CreateEvent for poll timer failed.\n"));
goto ERROR;
}
@@ -540,7 +540,7 @@ MnpInitializeDeviceData ( &MnpDeviceData->TimeoutCheckTimer
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "MnpInitializeDeviceData: CreateEvent for packet timeout check failed.\n"));
+ DEBUG ((DEBUG_ERROR, "MnpInitializeDeviceData: CreateEvent for packet timeout check failed.\n"));
goto ERROR;
}
@@ -556,7 +556,7 @@ MnpInitializeDeviceData ( &MnpDeviceData->MediaDetectTimer
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "MnpInitializeDeviceData: CreateEvent for media detection failed.\n"));
+ DEBUG ((DEBUG_ERROR, "MnpInitializeDeviceData: CreateEvent for media detection failed.\n"));
goto ERROR;
}
@@ -1222,7 +1222,7 @@ MnpStart ( //
Status = MnpStartSnp (MnpDeviceData->Snp);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "MnpStart: MnpStartSnp failed, %r.\n", Status));
+ DEBUG ((DEBUG_ERROR, "MnpStart: MnpStartSnp failed, %r.\n", Status));
goto ErrorExit;
}
@@ -1237,7 +1237,7 @@ MnpStart ( );
if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"MnpStart, gBS->SetTimer for TimeoutCheckTimer %r.\n",
Status)
);
@@ -1255,7 +1255,7 @@ MnpStart ( );
if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"MnpStart, gBS->SetTimer for MediaDetectTimer %r.\n",
Status)
);
@@ -1274,7 +1274,7 @@ MnpStart ( Status = gBS->SetTimer (MnpDeviceData->PollTimer, TimerOpType, MNP_SYS_POLL_INTERVAL);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "MnpStart: gBS->SetTimer for PollTimer failed, %r.\n", Status));
+ DEBUG ((DEBUG_ERROR, "MnpStart: gBS->SetTimer for PollTimer failed, %r.\n", Status));
goto ErrorExit;
}
@@ -1610,7 +1610,7 @@ MnpConfigReceiveFilters ( MCastFilterCnt = MnpDeviceData->GroupAddressCount;
MCastFilter = AllocatePool (sizeof (EFI_MAC_ADDRESS) * MCastFilterCnt);
if (MCastFilter == NULL) {
- DEBUG ((EFI_D_ERROR, "MnpConfigReceiveFilters: Failed to allocate memory resource for MCastFilter.\n"));
+ DEBUG ((DEBUG_ERROR, "MnpConfigReceiveFilters: Failed to allocate memory resource for MCastFilter.\n"));
return EFI_OUT_OF_RESOURCES;
}
@@ -1672,7 +1672,7 @@ MnpConfigReceiveFilters ( DEBUG_CODE (
if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"MnpConfigReceiveFilters: Snp->ReceiveFilters failed, %r.\n",
Status)
);
@@ -1729,7 +1729,7 @@ MnpGroupOpAddCtrlBlk ( GroupAddress = AllocatePool (sizeof (MNP_GROUP_ADDRESS));
if (GroupAddress == NULL) {
- DEBUG ((EFI_D_ERROR, "MnpGroupOpFormCtrlBlk: Failed to allocate memory resource.\n"));
+ DEBUG ((DEBUG_ERROR, "MnpGroupOpFormCtrlBlk: Failed to allocate memory resource.\n"));
return EFI_OUT_OF_RESOURCES;
}
@@ -1861,7 +1861,7 @@ MnpGroupOp ( //
NewCtrlBlk = AllocatePool (sizeof (MNP_GROUP_CONTROL_BLOCK));
if (NewCtrlBlk == NULL) {
- DEBUG ((EFI_D_ERROR, "MnpGroupOp: Failed to allocate memory resource.\n"));
+ DEBUG ((DEBUG_ERROR, "MnpGroupOp: Failed to allocate memory resource.\n"));
return EFI_OUT_OF_RESOURCES;
}
diff --git a/NetworkPkg/MnpDxe/MnpDriver.c b/NetworkPkg/MnpDxe/MnpDriver.c index dfcdec5d31..4c906eae39 100644 --- a/NetworkPkg/MnpDxe/MnpDriver.c +++ b/NetworkPkg/MnpDxe/MnpDriver.c @@ -164,14 +164,14 @@ MnpDriverBindingStart ( //
MnpDeviceData = AllocateZeroPool (sizeof (MNP_DEVICE_DATA));
if (MnpDeviceData == NULL) {
- DEBUG ((EFI_D_ERROR, "MnpDriverBindingStart(): Failed to allocate the Mnp Device Data.\n"));
+ DEBUG ((DEBUG_ERROR, "MnpDriverBindingStart(): Failed to allocate the Mnp Device Data.\n"));
return EFI_OUT_OF_RESOURCES;
}
Status = MnpInitializeDeviceData (MnpDeviceData, This->DriverBindingHandle, ControllerHandle);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "MnpDriverBindingStart: MnpInitializeDeviceData failed, %r.\n", Status));
+ DEBUG ((DEBUG_ERROR, "MnpDriverBindingStart: MnpInitializeDeviceData failed, %r.\n", Status));
FreePool (MnpDeviceData);
return Status;
@@ -342,7 +342,7 @@ MnpDriverBindingStop ( EFI_OPEN_PROTOCOL_GET_PROTOCOL
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "MnpDriverBindingStop: try to stop unknown Controller.\n"));
+ DEBUG ((DEBUG_ERROR, "MnpDriverBindingStop: try to stop unknown Controller.\n"));
return EFI_DEVICE_ERROR;
}
@@ -468,7 +468,7 @@ MnpServiceBindingCreateChild ( );
if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"MnpServiceBindingCreateChild: Failed to install the MNP protocol, %r.\n",
Status)
);
@@ -614,7 +614,7 @@ MnpServiceBindingDestroyChild ( );
if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"MnpServiceBindingDestroyChild: Failed to uninstall the ManagedNetwork protocol, %r.\n",
Status)
);
diff --git a/NetworkPkg/MnpDxe/MnpIo.c b/NetworkPkg/MnpDxe/MnpIo.c index ae4a18fd81..1f8d2e2504 100644 --- a/NetworkPkg/MnpDxe/MnpIo.c +++ b/NetworkPkg/MnpDxe/MnpIo.c @@ -40,7 +40,7 @@ MnpIsValidTxToken ( // The token is invalid if the Event is NULL, or the TxData is NULL, or
// the fragment count is zero.
//
- DEBUG ((EFI_D_WARN, "MnpIsValidTxToken: Invalid Token.\n"));
+ DEBUG ((DEBUG_WARN, "MnpIsValidTxToken: Invalid Token.\n"));
return FALSE;
}
@@ -49,7 +49,7 @@ MnpIsValidTxToken ( // The token is invalid if the HeaderLength isn't zero while the DestinationAddress
// is NULL (The destination address is already put into the packet).
//
- DEBUG ((EFI_D_WARN, "MnpIsValidTxToken: DestinationAddress isn't NULL, HeaderLength must be 0.\n"));
+ DEBUG ((DEBUG_WARN, "MnpIsValidTxToken: DestinationAddress isn't NULL, HeaderLength must be 0.\n"));
return FALSE;
}
@@ -61,7 +61,7 @@ MnpIsValidTxToken ( //
// The token is invalid if any FragmentLength is zero or any FragmentBuffer is NULL.
//
- DEBUG ((EFI_D_WARN, "MnpIsValidTxToken: Invalid FragmentLength or FragmentBuffer.\n"));
+ DEBUG ((DEBUG_WARN, "MnpIsValidTxToken: Invalid FragmentLength or FragmentBuffer.\n"));
return FALSE;
}
@@ -80,7 +80,7 @@ MnpIsValidTxToken ( // The length calculated from the fragment information doesn't equal to the
// sum of the DataLength and the HeaderLength.
//
- DEBUG ((EFI_D_WARN, "MnpIsValidTxData: Invalid Datalength compared with the sum of fragment length.\n"));
+ DEBUG ((DEBUG_WARN, "MnpIsValidTxData: Invalid Datalength compared with the sum of fragment length.\n"));
return FALSE;
}
@@ -88,7 +88,7 @@ MnpIsValidTxToken ( //
// The total length is larger than the MTU.
//
- DEBUG ((EFI_D_WARN, "MnpIsValidTxData: TxData->DataLength exceeds Mtu.\n"));
+ DEBUG ((DEBUG_WARN, "MnpIsValidTxData: TxData->DataLength exceeds Mtu.\n"));
return FALSE;
}
@@ -233,7 +233,7 @@ MnpSyncSendPacket ( //
// Media not present, skip packet transmit and report EFI_NO_MEDIA
//
- DEBUG ((EFI_D_WARN, "MnpSyncSendPacket: No network cable detected.\n"));
+ DEBUG ((DEBUG_WARN, "MnpSyncSendPacket: No network cable detected.\n"));
Token->Status = EFI_NO_MEDIA;
goto SIGNAL_TOKEN;
}
@@ -338,7 +338,7 @@ MnpInstanceDeliverPacket ( //
DupNbuf = MnpAllocNbuf (MnpDeviceData);
if (DupNbuf == NULL) {
- DEBUG ((EFI_D_WARN, "MnpDeliverPacket: Failed to allocate a free Nbuf.\n"));
+ DEBUG ((DEBUG_WARN, "MnpDeliverPacket: Failed to allocate a free Nbuf.\n"));
return EFI_OUT_OF_RESOURCES;
}
@@ -488,7 +488,7 @@ MnpQueueRcvdPacket ( //
if (Instance->RcvdPacketQueueSize == MNP_MAX_RCVD_PACKET_QUE_SIZE) {
- DEBUG ((EFI_D_WARN, "MnpQueueRcvdPacket: Drop one packet bcz queue size limit reached.\n"));
+ DEBUG ((DEBUG_WARN, "MnpQueueRcvdPacket: Drop one packet bcz queue size limit reached.\n"));
//
// Get the oldest packet.
@@ -724,7 +724,7 @@ MnpWrapRxData ( //
RxDataWrap = AllocatePool (sizeof (MNP_RXDATA_WRAP));
if (RxDataWrap == NULL) {
- DEBUG ((EFI_D_ERROR, "MnpDispatchPacket: Failed to allocate a MNP_RXDATA_WRAP.\n"));
+ DEBUG ((DEBUG_ERROR, "MnpDispatchPacket: Failed to allocate a MNP_RXDATA_WRAP.\n"));
return NULL;
}
@@ -746,7 +746,7 @@ MnpWrapRxData ( &RxDataWrap->RxData.RecycleEvent
);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "MnpDispatchPacket: gBS->CreateEvent failed, %r.\n", Status));
+ DEBUG ((DEBUG_ERROR, "MnpDispatchPacket: gBS->CreateEvent failed, %r.\n", Status));
FreePool (RxDataWrap);
return NULL;
@@ -900,7 +900,7 @@ MnpReceivePacket ( if (EFI_ERROR (Status)) {
DEBUG_CODE (
if (Status != EFI_NOT_READY) {
- DEBUG ((EFI_D_WARN, "MnpReceivePacket: Snp->Receive() = %r.\n", Status));
+ DEBUG ((DEBUG_WARN, "MnpReceivePacket: Snp->Receive() = %r.\n", Status));
}
);
@@ -912,7 +912,7 @@ MnpReceivePacket ( //
if ((HeaderSize != Snp->Mode->MediaHeaderSize) || (BufLen < HeaderSize)) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"MnpReceivePacket: Size error, HL:TL = %d:%d.\n",
HeaderSize,
BufLen)
@@ -970,7 +970,7 @@ MnpReceivePacket ( Nbuf = MnpAllocNbuf (MnpDeviceData);
MnpDeviceData->RxNbufCache = Nbuf;
if (Nbuf == NULL) {
- DEBUG ((EFI_D_ERROR, "MnpReceivePacket: Alloc packet for receiving cache failed.\n"));
+ DEBUG ((DEBUG_ERROR, "MnpReceivePacket: Alloc packet for receiving cache failed.\n"));
return EFI_DEVICE_ERROR;
}
@@ -1059,7 +1059,7 @@ MnpCheckPacketTimeout ( //
// Drop the timeout packet.
//
- DEBUG ((EFI_D_WARN, "MnpCheckPacketTimeout: Received packet timeout.\n"));
+ DEBUG ((DEBUG_WARN, "MnpCheckPacketTimeout: Received packet timeout.\n"));
MnpRecycleRxData (NULL, RxDataWrap);
Instance->RcvdPacketQueueSize--;
}
diff --git a/NetworkPkg/Mtftp4Dxe/Mtftp4Impl.c b/NetworkPkg/Mtftp4Dxe/Mtftp4Impl.c index 990a9ef030..4bb37224cd 100644 --- a/NetworkPkg/Mtftp4Dxe/Mtftp4Impl.c +++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Impl.c @@ -130,9 +130,9 @@ Mtftp4GetInfoCheckPacket ( case EFI_MTFTP4_OPCODE_ERROR:
ErrorHeader = (EFI_MTFTP4_ERROR_HEADER *) Packet;
if (ErrorHeader->ErrorCode == EFI_MTFTP4_ERRORCODE_FILE_NOT_FOUND) {
- DEBUG ((EFI_D_ERROR, "TFTP error code 1 (File Not Found)\n"));
+ DEBUG ((DEBUG_ERROR, "TFTP error code 1 (File Not Found)\n"));
} else {
- DEBUG ((EFI_D_ERROR, "TFTP error code %d\n", ErrorHeader->ErrorCode));
+ DEBUG ((DEBUG_ERROR, "TFTP error code %d\n", ErrorHeader->ErrorCode));
}
State->Status = EFI_TFTP_ERROR;
break;
diff --git a/NetworkPkg/SnpDxe/Callback.c b/NetworkPkg/SnpDxe/Callback.c index 99b7fd3ef8..1b70b935d0 100644 --- a/NetworkPkg/SnpDxe/Callback.c +++ b/NetworkPkg/SnpDxe/Callback.c @@ -246,7 +246,7 @@ SnpUndi32CallbackMap ( }
if (Index >= MAX_MAP_LENGTH) {
- DEBUG ((EFI_D_INFO, "SNP maplist is FULL\n"));
+ DEBUG ((DEBUG_INFO, "SNP maplist is FULL\n"));
*DevAddrPtr = 0;
return ;
}
@@ -306,7 +306,7 @@ SnpUndi32CallbackUnmap ( }
if (Index >= MAX_MAP_LENGTH) {
- DEBUG ((EFI_D_ERROR, "SNP could not find a mapping, failed to unmap.\n"));
+ DEBUG ((DEBUG_ERROR, "SNP could not find a mapping, failed to unmap.\n"));
return ;
}
diff --git a/NetworkPkg/SnpDxe/Get_status.c b/NetworkPkg/SnpDxe/Get_status.c index be6608a0b3..e958ae2575 100644 --- a/NetworkPkg/SnpDxe/Get_status.c +++ b/NetworkPkg/SnpDxe/Get_status.c @@ -71,13 +71,13 @@ PxeGetStatus ( //
// Issue UNDI command and check result.
//
- DEBUG ((EFI_D_NET, "\nSnp->undi.get_status() "));
+ DEBUG ((DEBUG_NET, "\nSnp->undi.get_status() "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"\nSnp->undi.get_status() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
diff --git a/NetworkPkg/SnpDxe/Initialize.c b/NetworkPkg/SnpDxe/Initialize.c index 4d33154241..5ff9d72f1d 100644 --- a/NetworkPkg/SnpDxe/Initialize.c +++ b/NetworkPkg/SnpDxe/Initialize.c @@ -46,7 +46,7 @@ PxeInit ( if (Status != EFI_SUCCESS) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"\nSnp->PxeInit() AllocateBuffer %xh (%r)\n",
Status,
Status)
@@ -91,7 +91,7 @@ PxeInit ( Snp->Cdb.IFnum = Snp->IfNum;
Snp->Cdb.Control = PXE_CONTROL_LAST_CDB_IN_LIST;
- DEBUG ((EFI_D_NET, "\nSnp->undi.initialize() "));
+ DEBUG ((DEBUG_NET, "\nSnp->undi.initialize() "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
@@ -121,7 +121,7 @@ PxeInit ( Status = EFI_SUCCESS;
} else {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"\nSnp->undi.initialize() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
diff --git a/NetworkPkg/SnpDxe/Mcast_ip_to_mac.c b/NetworkPkg/SnpDxe/Mcast_ip_to_mac.c index 9863c1f9ea..e8fa077ee9 100644 --- a/NetworkPkg/SnpDxe/Mcast_ip_to_mac.c +++ b/NetworkPkg/SnpDxe/Mcast_ip_to_mac.c @@ -55,7 +55,7 @@ PxeIp2Mac ( //
// Issue UNDI command and check result.
//
- DEBUG ((EFI_D_NET, "\nSnp->undi.mcast_ip_to_mac() "));
+ DEBUG ((DEBUG_NET, "\nSnp->undi.mcast_ip_to_mac() "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
@@ -68,7 +68,7 @@ PxeIp2Mac ( case PXE_STATCODE_UNSUPPORTED:
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"\nSnp->undi.mcast_ip_to_mac() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
@@ -81,7 +81,7 @@ PxeIp2Mac ( // to caller.
//
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"\nSnp->undi.mcast_ip_to_mac() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
diff --git a/NetworkPkg/SnpDxe/Nvdata.c b/NetworkPkg/SnpDxe/Nvdata.c index 7010b63a54..2ffe1c75a2 100644 --- a/NetworkPkg/SnpDxe/Nvdata.c +++ b/NetworkPkg/SnpDxe/Nvdata.c @@ -53,7 +53,7 @@ PxeNvDataRead ( //
// Issue UNDI command and check result.
//
- DEBUG ((EFI_D_NET, "\nsnp->undi.nvdata () "));
+ DEBUG ((DEBUG_NET, "\nsnp->undi.nvdata () "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
@@ -63,7 +63,7 @@ PxeNvDataRead ( case PXE_STATCODE_UNSUPPORTED:
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"\nsnp->undi.nvdata() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
@@ -73,7 +73,7 @@ PxeNvDataRead ( default:
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"\nsnp->undi.nvdata() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
diff --git a/NetworkPkg/SnpDxe/Receive.c b/NetworkPkg/SnpDxe/Receive.c index 28cea0d2e9..1efb2ad8db 100644 --- a/NetworkPkg/SnpDxe/Receive.c +++ b/NetworkPkg/SnpDxe/Receive.c @@ -76,7 +76,7 @@ PxeReceive ( //
// Issue UNDI command and check result.
//
- DEBUG ((EFI_D_NET, "\nsnp->undi.receive () "));
+ DEBUG ((DEBUG_NET, "\nsnp->undi.receive () "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
@@ -86,7 +86,7 @@ PxeReceive ( case PXE_STATCODE_NO_DATA:
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"\nsnp->undi.receive () %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
@@ -96,7 +96,7 @@ PxeReceive ( default:
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"\nsnp->undi.receive() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
diff --git a/NetworkPkg/SnpDxe/Receive_filters.c b/NetworkPkg/SnpDxe/Receive_filters.c index 494d2709b6..ec18b74b35 100644 --- a/NetworkPkg/SnpDxe/Receive_filters.c +++ b/NetworkPkg/SnpDxe/Receive_filters.c @@ -73,7 +73,7 @@ PxeRecvFilterEnable ( //
// Issue UNDI command and check result.
//
- DEBUG ((EFI_D_NET, "\nsnp->undi.receive_filters() "));
+ DEBUG ((DEBUG_NET, "\nsnp->undi.receive_filters() "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
@@ -82,7 +82,7 @@ PxeRecvFilterEnable ( // UNDI command failed. Return UNDI status to caller.
//
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"\nsnp->undi.receive_filters() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
@@ -161,7 +161,7 @@ PxeRecvFilterDisable ( //
// Issue UNDI command and check result.
//
- DEBUG ((EFI_D_NET, "\nsnp->undi.receive_filters() "));
+ DEBUG ((DEBUG_NET, "\nsnp->undi.receive_filters() "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
@@ -170,7 +170,7 @@ PxeRecvFilterDisable ( // UNDI command failed. Return UNDI status to caller.
//
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"\nsnp->undi.receive_filters() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
@@ -213,7 +213,7 @@ PxeRecvFilterRead ( Snp->Cdb.IFnum = Snp->IfNum;
Snp->Cdb.Control = PXE_CONTROL_LAST_CDB_IN_LIST;
- DEBUG ((EFI_D_NET, "\nsnp->undi.receive_filters() "));
+ DEBUG ((DEBUG_NET, "\nsnp->undi.receive_filters() "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
@@ -222,7 +222,7 @@ PxeRecvFilterRead ( // UNDI command failed. Return UNDI status to caller.
//
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"\nsnp->undi.receive_filters() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
diff --git a/NetworkPkg/SnpDxe/Reset.c b/NetworkPkg/SnpDxe/Reset.c index 3069bfde66..40069c8722 100644 --- a/NetworkPkg/SnpDxe/Reset.c +++ b/NetworkPkg/SnpDxe/Reset.c @@ -37,13 +37,13 @@ PxeReset ( //
// Issue UNDI command and check result.
//
- DEBUG ((EFI_D_NET, "\nsnp->undi.reset() "));
+ DEBUG ((DEBUG_NET, "\nsnp->undi.reset() "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"\nsnp->undi32.reset() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
@@ -98,7 +98,7 @@ SnpUndi32Reset ( // Resolve Warning 4 unreferenced parameter problem
//
ExtendedVerification = 0;
- DEBUG ((EFI_D_WARN, "ExtendedVerification = %d is not implemented!\n", ExtendedVerification));
+ DEBUG ((DEBUG_WARN, "ExtendedVerification = %d is not implemented!\n", ExtendedVerification));
if (This == NULL) {
return EFI_INVALID_PARAMETER;
diff --git a/NetworkPkg/SnpDxe/Shutdown.c b/NetworkPkg/SnpDxe/Shutdown.c index ae823fd352..ae6c93a00b 100644 --- a/NetworkPkg/SnpDxe/Shutdown.c +++ b/NetworkPkg/SnpDxe/Shutdown.c @@ -37,7 +37,7 @@ PxeShutdown ( //
// Issue UNDI command and check result.
//
- DEBUG ((EFI_D_NET, "\nsnp->undi.shutdown() "));
+ DEBUG ((DEBUG_NET, "\nsnp->undi.shutdown() "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
@@ -45,7 +45,7 @@ PxeShutdown ( //
// UNDI could not be shutdown. Return UNDI error.
//
- DEBUG ((EFI_D_WARN, "\nsnp->undi.shutdown() %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));
+ DEBUG ((DEBUG_WARN, "\nsnp->undi.shutdown() %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));
return EFI_DEVICE_ERROR;
}
diff --git a/NetworkPkg/SnpDxe/Snp.c b/NetworkPkg/SnpDxe/Snp.c index 69e74132ed..d0d086e578 100644 --- a/NetworkPkg/SnpDxe/Snp.c +++ b/NetworkPkg/SnpDxe/Snp.c @@ -50,7 +50,7 @@ IssueHwUndiCommand ( UINT64 Cdb
)
{
- DEBUG ((EFI_D_ERROR, "\nIssueHwUndiCommand() - This should not be called!"));
+ DEBUG ((DEBUG_ERROR, "\nIssueHwUndiCommand() - This should not be called!"));
if (Cdb == 0) {
return EFI_INVALID_PARAMETER;
@@ -149,12 +149,12 @@ SimpleNetworkDriverSupported ( if (EFI_ERROR (Status)) {
if (Status == EFI_ALREADY_STARTED) {
- DEBUG ((EFI_D_INFO, "Support(): Already Started. on handle %p\n", Controller));
+ DEBUG ((DEBUG_INFO, "Support(): Already Started. on handle %p\n", Controller));
}
return Status;
}
- DEBUG ((EFI_D_INFO, "Support(): UNDI3.1 found on handle %p\n", Controller));
+ DEBUG ((DEBUG_INFO, "Support(): UNDI3.1 found on handle %p\n", Controller));
//
// check the version, we don't want to connect to the undi16
@@ -167,7 +167,7 @@ SimpleNetworkDriverSupported ( // Check to see if !PXE structure is valid. Paragraph alignment of !PXE structure is required.
//
if ((NiiProtocol->Id & 0x0F) != 0) {
- DEBUG ((EFI_D_NET, "\n!PXE structure is not paragraph aligned.\n"));
+ DEBUG ((DEBUG_NET, "\n!PXE structure is not paragraph aligned.\n"));
Status = EFI_UNSUPPORTED;
goto Done;
}
@@ -178,25 +178,25 @@ SimpleNetworkDriverSupported ( // Verify !PXE revisions.
//
if (Pxe->hw.Signature != PXE_ROMID_SIGNATURE) {
- DEBUG ((EFI_D_NET, "\n!PXE signature is not valid.\n"));
+ DEBUG ((DEBUG_NET, "\n!PXE signature is not valid.\n"));
Status = EFI_UNSUPPORTED;
goto Done;
}
if (Pxe->hw.Rev < PXE_ROMID_REV) {
- DEBUG ((EFI_D_NET, "\n!PXE.Rev is not supported.\n"));
+ DEBUG ((DEBUG_NET, "\n!PXE.Rev is not supported.\n"));
Status = EFI_UNSUPPORTED;
goto Done;
}
if (Pxe->hw.MajorVer < PXE_ROMID_MAJORVER) {
- DEBUG ((EFI_D_NET, "\n!PXE.MajorVer is not supported.\n"));
+ DEBUG ((DEBUG_NET, "\n!PXE.MajorVer is not supported.\n"));
Status = EFI_UNSUPPORTED;
goto Done;
} else if (Pxe->hw.MajorVer == PXE_ROMID_MAJORVER && Pxe->hw.MinorVer < PXE_ROMID_MINORVER) {
- DEBUG ((EFI_D_NET, "\n!PXE.MinorVer is not supported."));
+ DEBUG ((DEBUG_NET, "\n!PXE.MinorVer is not supported."));
Status = EFI_UNSUPPORTED;
goto Done;
}
@@ -205,20 +205,20 @@ SimpleNetworkDriverSupported ( //
if ((Pxe->hw.Implementation & PXE_ROMID_IMP_HW_UNDI) == 0) {
if (Pxe->sw.EntryPoint < Pxe->sw.Len) {
- DEBUG ((EFI_D_NET, "\n!PXE S/W entry point is not valid."));
+ DEBUG ((DEBUG_NET, "\n!PXE S/W entry point is not valid."));
Status = EFI_UNSUPPORTED;
goto Done;
}
if (Pxe->sw.BusCnt == 0) {
- DEBUG ((EFI_D_NET, "\n!PXE.BusCnt is zero."));
+ DEBUG ((DEBUG_NET, "\n!PXE.BusCnt is zero."));
Status = EFI_UNSUPPORTED;
goto Done;
}
}
Status = EFI_SUCCESS;
- DEBUG ((EFI_D_INFO, "Support(): supported on %p\n", Controller));
+ DEBUG ((DEBUG_INFO, "Support(): supported on %p\n", Controller));
Done:
gBS->CloseProtocol (
@@ -271,7 +271,7 @@ SimpleNetworkDriverStart ( BOOLEAN FoundIoBar;
BOOLEAN FoundMemoryBar;
- DEBUG ((EFI_D_NET, "\nSnpNotifyNetworkInterfaceIdentifier() "));
+ DEBUG ((DEBUG_NET, "\nSnpNotifyNetworkInterfaceIdentifier() "));
Status = gBS->OpenProtocol (
Controller,
@@ -328,12 +328,12 @@ SimpleNetworkDriverStart ( return Status;
}
- DEBUG ((EFI_D_INFO, "Start(): UNDI3.1 found\n"));
+ DEBUG ((DEBUG_INFO, "Start(): UNDI3.1 found\n"));
Pxe = (PXE_UNDI *) (UINTN) (Nii->Id);
if (Calc8BitCksum (Pxe, Pxe->hw.Len) != 0) {
- DEBUG ((EFI_D_NET, "\n!PXE checksum is not correct.\n"));
+ DEBUG ((DEBUG_NET, "\n!PXE checksum is not correct.\n"));
goto NiiError;
}
@@ -348,7 +348,7 @@ SimpleNetworkDriverStart ( // broadcast support or we cannot do DHCP!
//
} else {
- DEBUG ((EFI_D_NET, "\nUNDI does not have promiscuous or broadcast support."));
+ DEBUG ((DEBUG_NET, "\nUNDI does not have promiscuous or broadcast support."));
goto NiiError;
}
//
@@ -365,7 +365,7 @@ SimpleNetworkDriverStart ( );
if (Status != EFI_SUCCESS) {
- DEBUG ((EFI_D_NET, "\nCould not allocate SNP_DRIVER structure.\n"));
+ DEBUG ((DEBUG_NET, "\nCould not allocate SNP_DRIVER structure.\n"));
goto NiiError;
}
@@ -452,7 +452,7 @@ SimpleNetworkDriverStart ( );
if (Status != EFI_SUCCESS) {
- DEBUG ((EFI_D_NET, "\nCould not allocate CPB and DB structures.\n"));
+ DEBUG ((DEBUG_NET, "\nCould not allocate CPB and DB structures.\n"));
goto Error_DeleteSNP;
}
@@ -519,7 +519,7 @@ SimpleNetworkDriverStart ( Snp->Cdb.IFnum = Snp->IfNum;
Snp->Cdb.Control = PXE_CONTROL_LAST_CDB_IN_LIST;
- DEBUG ((EFI_D_NET, "\nSnp->undi.get_init_info() "));
+ DEBUG ((DEBUG_NET, "\nSnp->undi.get_init_info() "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
@@ -529,7 +529,7 @@ SimpleNetworkDriverStart ( InitStatFlags = Snp->Cdb.StatFlags;
if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {
- DEBUG ((EFI_D_NET, "\nSnp->undi.init_info() %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));
+ DEBUG ((DEBUG_NET, "\nSnp->undi.init_info() %xh:%xh\n", Snp->Cdb.StatFlags, Snp->Cdb.StatCode));
PxeStop (Snp);
goto Error_DeleteSNP;
}
@@ -627,7 +627,7 @@ SimpleNetworkDriverStart ( Status = PxeGetStnAddr (Snp);
if (Status != EFI_SUCCESS) {
- DEBUG ((EFI_D_ERROR, "\nSnp->undi.get_station_addr() failed.\n"));
+ DEBUG ((DEBUG_ERROR, "\nSnp->undi.get_station_addr() failed.\n"));
PxeShutdown (Snp);
PxeStop (Snp);
goto Error_DeleteSNP;
diff --git a/NetworkPkg/SnpDxe/Start.c b/NetworkPkg/SnpDxe/Start.c index 033ca22f66..596610d1a9 100644 --- a/NetworkPkg/SnpDxe/Start.c +++ b/NetworkPkg/SnpDxe/Start.c @@ -66,7 +66,7 @@ PxeStart ( //
// Issue UNDI command and check result.
//
- DEBUG ((EFI_D_NET, "\nsnp->undi.start() "));
+ DEBUG ((DEBUG_NET, "\nsnp->undi.start() "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
@@ -75,7 +75,7 @@ PxeStart ( // UNDI could not be started. Return UNDI error.
//
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"\nsnp->undi.start() %xh:%xh\n",
Snp->Cdb.StatCode,
Snp->Cdb.StatFlags)
diff --git a/NetworkPkg/SnpDxe/Station_address.c b/NetworkPkg/SnpDxe/Station_address.c index a5c87d4799..c88601e456 100644 --- a/NetworkPkg/SnpDxe/Station_address.c +++ b/NetworkPkg/SnpDxe/Station_address.c @@ -44,13 +44,13 @@ PxeGetStnAddr ( //
// Issue UNDI command and check result.
//
- DEBUG ((EFI_D_NET, "\nsnp->undi.station_addr() "));
+ DEBUG ((DEBUG_NET, "\nsnp->undi.station_addr() "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"\nsnp->undi.station_addr() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
@@ -132,13 +132,13 @@ PxeSetStnAddr ( //
// Issue UNDI command and check result.
//
- DEBUG ((EFI_D_NET, "\nsnp->undi.station_addr() "));
+ DEBUG ((DEBUG_NET, "\nsnp->undi.station_addr() "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"\nsnp->undi.station_addr() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
diff --git a/NetworkPkg/SnpDxe/Statistics.c b/NetworkPkg/SnpDxe/Statistics.c index 480e261780..0928eae1c4 100644 --- a/NetworkPkg/SnpDxe/Statistics.c +++ b/NetworkPkg/SnpDxe/Statistics.c @@ -133,7 +133,7 @@ SnpUndi32Statistics ( //
// Issue UNDI command and check result.
//
- DEBUG ((EFI_D_NET, "\nsnp->undi.statistics() "));
+ DEBUG ((DEBUG_NET, "\nsnp->undi.statistics() "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
@@ -143,7 +143,7 @@ SnpUndi32Statistics ( case PXE_STATCODE_UNSUPPORTED:
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"\nsnp->undi.statistics() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
@@ -154,7 +154,7 @@ SnpUndi32Statistics ( default:
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"\nsnp->undi.statistics() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
diff --git a/NetworkPkg/SnpDxe/Stop.c b/NetworkPkg/SnpDxe/Stop.c index f1c1bd847c..b45b87cf9c 100644 --- a/NetworkPkg/SnpDxe/Stop.c +++ b/NetworkPkg/SnpDxe/Stop.c @@ -37,13 +37,13 @@ PxeStop ( //
// Issue UNDI command
//
- DEBUG ((EFI_D_NET, "\nsnp->undi.stop() "));
+ DEBUG ((DEBUG_NET, "\nsnp->undi.stop() "));
(*Snp->IssueUndi32Command) ((UINT64)(UINTN) &Snp->Cdb);
if (Snp->Cdb.StatCode != PXE_STATCODE_SUCCESS) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"\nsnp->undi.stop() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
diff --git a/NetworkPkg/SnpDxe/Transmit.c b/NetworkPkg/SnpDxe/Transmit.c index 44fdd71f41..0f8d79ac7e 100644 --- a/NetworkPkg/SnpDxe/Transmit.c +++ b/NetworkPkg/SnpDxe/Transmit.c @@ -95,7 +95,7 @@ PxeFillHeader ( //
// Issue UNDI command and check result.
//
- DEBUG ((EFI_D_NET, "\nSnp->undi.fill_header() "));
+ DEBUG ((DEBUG_NET, "\nSnp->undi.fill_header() "));
(*Snp->IssueUndi32Command) ((UINT64) (UINTN) &Snp->Cdb);
@@ -105,7 +105,7 @@ PxeFillHeader ( case PXE_STATCODE_INVALID_PARAMETER:
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"\nSnp->undi.fill_header() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
@@ -115,7 +115,7 @@ PxeFillHeader ( default:
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"\nSnp->undi.fill_header() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
@@ -171,15 +171,15 @@ PxeTransmit ( //
// Issue UNDI command and check result.
//
- 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 == %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));
+ DEBUG ((DEBUG_NET, "\nSnp->undi.transmit() "));
+ DEBUG ((DEBUG_NET, "\nSnp->Cdb.OpCode == %x", Snp->Cdb.OpCode));
+ DEBUG ((DEBUG_NET, "\nSnp->Cdb.CPBaddr == %LX", Snp->Cdb.CPBaddr));
+ DEBUG ((DEBUG_NET, "\nSnp->Cdb.DBaddr == %LX", Snp->Cdb.DBaddr));
+ DEBUG ((DEBUG_NET, "\nCpb->FrameAddr == %LX\n", Cpb->FrameAddr));
(*Snp->IssueUndi32Command) ((UINT64) (UINTN) &Snp->Cdb);
- DEBUG ((EFI_D_NET, "\nexit Snp->undi.transmit() "));
+ DEBUG ((DEBUG_NET, "\nexit Snp->undi.transmit() "));
//
// we will unmap the buffers in get_status call, not here
@@ -193,7 +193,7 @@ PxeTransmit ( case PXE_STATCODE_BUSY:
Status = EFI_NOT_READY;
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"\nSnp->undi.transmit() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
@@ -202,7 +202,7 @@ PxeTransmit ( default:
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"\nSnp->undi.transmit() %xh:%xh\n",
Snp->Cdb.StatFlags,
Snp->Cdb.StatCode)
diff --git a/NetworkPkg/TcpDxe/SockImpl.c b/NetworkPkg/TcpDxe/SockImpl.c index 564e621ef9..2ab0b69140 100644 --- a/NetworkPkg/TcpDxe/SockImpl.c +++ b/NetworkPkg/TcpDxe/SockImpl.c @@ -381,7 +381,7 @@ SockProcessTcpSndData ( if (NULL == SndData) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockKProcessSndData: Failed to call NetBufferFromExt\n")
);
@@ -516,7 +516,7 @@ SockWakeListenToken ( Parent->ConnCnt--;
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"SockWakeListenToken: accept a socket, now conncnt is %d",
Parent->ConnCnt)
);
@@ -667,7 +667,7 @@ SockCreate ( if ((Parent != NULL) && (Parent->ConnCnt == Parent->BackLog)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockCreate: Socket parent has reached its connection limit with %d ConnCnt and %d BackLog\n",
Parent->ConnCnt,
Parent->BackLog)
@@ -679,7 +679,7 @@ SockCreate ( Sock = AllocateZeroPool (sizeof (SOCKET));
if (NULL == Sock) {
- DEBUG ((EFI_D_ERROR, "SockCreate: No resource to create a new socket\n"));
+ DEBUG ((DEBUG_ERROR, "SockCreate: No resource to create a new socket\n"));
return NULL;
}
@@ -695,7 +695,7 @@ SockCreate ( Sock->SndBuffer.DataQueue = NetbufQueAlloc ();
if (NULL == Sock->SndBuffer.DataQueue) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockCreate: No resource to allocate SndBuffer for new socket\n")
);
@@ -705,7 +705,7 @@ SockCreate ( Sock->RcvBuffer.DataQueue = NetbufQueAlloc ();
if (NULL == Sock->RcvBuffer.DataQueue) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockCreate: No resource to allocate RcvBuffer for new socket\n")
);
@@ -751,7 +751,7 @@ SockCreate ( if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockCreate: Install TCP protocol in socket failed with %r\n",
Status)
);
@@ -770,7 +770,7 @@ SockCreate ( Parent->ConnCnt++;
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"SockCreate: Create a new socket and add to parent, now conncnt is %d\n",
Parent->ConnCnt)
);
@@ -850,7 +850,7 @@ SockDestroy ( (Sock->Parent->ConnCnt)--;
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"SockDestroy: Delete a unaccepted socket from parent now conncnt is %d\n",
Sock->Parent->ConnCnt)
);
@@ -975,7 +975,7 @@ SockClone ( ClonedSock = SockCreate (&InitData);
if (NULL == ClonedSock) {
- DEBUG ((EFI_D_ERROR, "SockClone: no resource to create a cloned sock\n"));
+ DEBUG ((DEBUG_ERROR, "SockClone: no resource to create a cloned sock\n"));
return NULL;
}
@@ -1230,4 +1230,3 @@ SockNoMoreData ( }
}
-
diff --git a/NetworkPkg/TcpDxe/SockInterface.c b/NetworkPkg/TcpDxe/SockInterface.c index 6217eb52da..6cf31e0a0a 100644 --- a/NetworkPkg/TcpDxe/SockInterface.c +++ b/NetworkPkg/TcpDxe/SockInterface.c @@ -107,7 +107,7 @@ SockBufferToken ( if (NULL == SockToken) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockBufferIOToken: No Memory to allocate SockToken\n")
);
@@ -192,7 +192,7 @@ SockDestroyChild ( if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockDestroyChild: Open protocol installed on socket failed with %r\n",
Status)
);
@@ -213,7 +213,7 @@ SockDestroyChild ( if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockDestroyChild: Get the lock to access socket failed with %r\n",
Status)
);
@@ -229,7 +229,7 @@ SockDestroyChild ( if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockDestroyChild: Protocol detach socket failed with %r\n",
Status)
);
@@ -280,7 +280,7 @@ SockCreateChild ( if (NULL == Sock) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockCreateChild: No resource to create a new socket\n")
);
@@ -291,7 +291,7 @@ SockCreateChild ( if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockCreateChild: Get the lock to access socket failed with %r\n",
Status)
);
@@ -306,7 +306,7 @@ SockCreateChild ( if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockCreateChild: Protocol failed to attach a socket with %r\n",
Status)
);
@@ -371,7 +371,7 @@ SockConfigure ( if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockConfigure: Get the access for socket failed with %r",
Status)
);
@@ -425,7 +425,7 @@ SockConnect ( if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockConnect: Get the access for socket failed with %r",
Status)
);
@@ -504,7 +504,7 @@ SockAccept ( if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockAccept: Get the access for socket failed with %r",
Status)
);
@@ -557,7 +557,7 @@ SockAccept ( Socket->Parent->ConnCnt--;
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"SockAccept: Accept a socket, now conncount is %d",
Socket->Parent->ConnCnt)
);
@@ -619,7 +619,7 @@ SockSend ( if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockSend: Get the access for socket failed with %r",
Status)
);
@@ -686,7 +686,7 @@ SockSend ( if (NULL == SockToken) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockSend: Failed to buffer IO token into socket processing SndToken List\n",
Status)
);
@@ -699,7 +699,7 @@ SockSend ( if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockSend: Failed to process Snd Data\n",
Status)
);
@@ -750,7 +750,7 @@ SockRcv ( if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockRcv: Get the access for socket failed with %r",
Status)
);
@@ -848,7 +848,7 @@ SockFlush ( if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockFlush: Get the access for socket failed with %r",
Status)
);
@@ -866,7 +866,7 @@ SockFlush ( if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockFlush: Protocol failed handling SOCK_FLUSH with %r",
Status)
);
@@ -919,7 +919,7 @@ SockClose ( Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockClose: Get the access for socket failed with %r",
Status)
);
@@ -990,7 +990,7 @@ SockCancel ( Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockCancel: Get the access for socket failed with %r",
Status)
);
@@ -1099,7 +1099,7 @@ SockRoute ( Status = EfiAcquireLockOrFail (&(Sock->Lock));
if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"SockRoute: Get the access for socket failed with %r",
Status)
);
@@ -1123,4 +1123,3 @@ Exit: EfiReleaseLock (&(Sock->Lock));
return Status;
}
-
diff --git a/NetworkPkg/TcpDxe/TcpDispatcher.c b/NetworkPkg/TcpDxe/TcpDispatcher.c index 544817866f..a04646ce49 100644 --- a/NetworkPkg/TcpDxe/TcpDispatcher.c +++ b/NetworkPkg/TcpDxe/TcpDispatcher.c @@ -269,7 +269,7 @@ TcpBind ( if (*RandomPort <= TCP_PORT_KNOWN) {
if (Cycle) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpBind: no port can be allocated for this pcb\n")
);
return EFI_OUT_OF_RESOURCES;
@@ -359,7 +359,7 @@ TcpAttachPcb ( if (Tcb == NULL) {
- DEBUG ((EFI_D_ERROR, "TcpConfigurePcb: failed to allocate a TCB\n"));
+ DEBUG ((DEBUG_ERROR, "TcpConfigurePcb: failed to allocate a TCB\n"));
return EFI_OUT_OF_RESOURCES;
}
@@ -540,7 +540,7 @@ TcpConfigurePcb ( if (EFI_ERROR (Status)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpConfigurePcb: Bind endpoint failed with %r\n",
Status)
);
diff --git a/NetworkPkg/TcpDxe/TcpDriver.c b/NetworkPkg/TcpDxe/TcpDriver.c index c4dcb5e193..c57725f0b5 100644 --- a/NetworkPkg/TcpDxe/TcpDriver.c +++ b/NetworkPkg/TcpDxe/TcpDriver.c @@ -905,7 +905,7 @@ TcpServiceBindingCreateChild ( Sock = SockCreateChild (&mTcpDefaultSockData);
if (NULL == Sock) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpDriverBindingCreateChild: No resource to create a Tcp Child\n")
);
diff --git a/NetworkPkg/TcpDxe/TcpInput.c b/NetworkPkg/TcpDxe/TcpInput.c index 5e6c8c54ca..efa41d637e 100644 --- a/NetworkPkg/TcpDxe/TcpInput.c +++ b/NetworkPkg/TcpDxe/TcpInput.c @@ -68,7 +68,7 @@ TcpFastRecover ( Tcb->CWnd = Tcb->Ssthresh + 3 * Tcb->SndMss;
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpFastRecover: enter fast retransmission for TCB %p, recover point is %d\n",
Tcb,
Tcb->Recover)
@@ -91,7 +91,7 @@ TcpFastRecover ( //
Tcb->CWnd += Tcb->SndMss;
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpFastRecover: received another duplicated ACK (%d) for TCB %p\n",
Seg->Ack,
Tcb)
@@ -115,7 +115,7 @@ TcpFastRecover ( Tcb->CongestState = TCP_CONGEST_OPEN;
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpFastRecover: received a full ACK(%d) for TCB %p, exit fast recovery\n",
Seg->Ack,
Tcb)
@@ -144,7 +144,7 @@ TcpFastRecover ( Tcb->CWnd -= Acked;
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpFastRecover: received a partial ACK(%d) for TCB %p\n",
Seg->Ack,
Tcb)
@@ -182,7 +182,7 @@ TcpFastLossRecover ( Tcb->CongestState = TCP_CONGEST_OPEN;
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpFastLossRecover: received a full ACK(%d) for TCB %p\n",
Seg->Ack,
Tcb)
@@ -196,7 +196,7 @@ TcpFastLossRecover ( //
TcpRetransmit (Tcb, Seg->Ack);
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpFastLossRecover: received a partial ACK(%d) for TCB %p\n",
Seg->Ack,
Tcb)
@@ -258,7 +258,7 @@ TcpComputeRtt ( }
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpComputeRtt: new RTT for TCB %p computed SRTT: %d RTTVAR: %d RTO: %d\n",
Tcb,
Tcb->SRtt,
@@ -423,7 +423,7 @@ TcpDeliverData ( if (TcpVerifySegment (Nbuf) == 0) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpToSendData: discard a broken segment for TCB %p\n",
Tcb)
);
@@ -454,7 +454,7 @@ TcpDeliverData ( //
if (!IsListEmpty (&Tcb->RcvQue)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpDeliverData: data received after FIN from peer of TCB %p, reset connection\n",
Tcb)
);
@@ -464,7 +464,7 @@ TcpDeliverData ( }
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpDeliverData: processing FIN from peer of TCB %p\n",
Tcb)
);
@@ -498,7 +498,7 @@ TcpDeliverData ( } else {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"Connection closed immediately because app disables TIME_WAIT timer for %p\n",
Tcb)
);
@@ -771,7 +771,7 @@ TcpInput ( ASSERT (Head != NULL);
if (Nbuf->TotalSize < sizeof (TCP_HEAD)) {
- DEBUG ((EFI_D_NET, "TcpInput: received a malformed packet\n"));
+ DEBUG ((DEBUG_NET, "TcpInput: received a malformed packet\n"));
goto DISCARD;
}
@@ -779,7 +779,7 @@ TcpInput ( if ((Head->HeadLen < 5) || (Len < 0)) {
- DEBUG ((EFI_D_NET, "TcpInput: received a malformed packet\n"));
+ DEBUG ((DEBUG_NET, "TcpInput: received a malformed packet\n"));
goto DISCARD;
}
@@ -793,7 +793,7 @@ TcpInput ( Checksum = TcpChecksum (Nbuf, Checksum);
if (Checksum != 0) {
- DEBUG ((EFI_D_ERROR, "TcpInput: received a checksum error packet\n"));
+ DEBUG ((DEBUG_ERROR, "TcpInput: received a checksum error packet\n"));
goto DISCARD;
}
@@ -815,7 +815,7 @@ TcpInput ( );
if ((Tcb == NULL) || (Tcb->State == TCP_CLOSED)) {
- DEBUG ((EFI_D_NET, "TcpInput: send reset because no TCB found\n"));
+ DEBUG ((DEBUG_NET, "TcpInput: send reset because no TCB found\n"));
Tcb = NULL;
goto SEND_RESET;
@@ -829,7 +829,7 @@ TcpInput ( //
if (TcpParseOption (Nbuf->Tcp, &Option) == -1) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpInput: reset the peer because of malformed option for TCB %p\n",
Tcb)
);
@@ -852,7 +852,7 @@ TcpInput ( //
if (TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: discard a reset segment for TCB %p in listening\n",
Tcb)
);
@@ -866,7 +866,7 @@ TcpInput ( //
if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: send reset because of segment with ACK for TCB %p in listening\n",
Tcb)
);
@@ -886,7 +886,7 @@ TcpInput ( Tcb = TcpCloneTcb (Parent);
if (Tcb == NULL) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpInput: discard a segment because failed to clone a child for TCB %p\n",
Tcb)
);
@@ -895,7 +895,7 @@ TcpInput ( }
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpInput: create a child for TCB %p in listening\n",
Tcb)
);
@@ -915,7 +915,7 @@ TcpInput ( TcpSetTimer (Tcb, TCP_TIMER_CONNECT, Tcb->ConnectTimeout);
if (TcpTrimInWnd (Tcb, Nbuf) == 0) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpInput: discard a broken segment for TCB %p\n",
Tcb)
);
@@ -935,7 +935,7 @@ TcpInput ( if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK) && (Seg->Ack != Tcb->Iss + 1)) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: send reset because of wrong ACK received for TCB %p in SYN_SENT\n",
Tcb)
);
@@ -951,7 +951,7 @@ TcpInput ( if (TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: connection reset by peer for TCB %p in SYN_SENT\n",
Tcb)
);
@@ -961,7 +961,7 @@ TcpInput ( } else {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: discard a reset segment because of no ACK for TCB %p in SYN_SENT\n",
Tcb)
);
@@ -1005,7 +1005,7 @@ TcpInput ( if (TcpTrimInWnd (Tcb, Nbuf) == 0) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpInput: discard a broken segment for TCB %p\n",
Tcb)
);
@@ -1016,7 +1016,7 @@ TcpInput ( TCP_SET_FLG (Tcb->CtrlFlag, TCP_CTRL_ACK_NOW);
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpInput: connection established for TCB %p in SYN_SENT\n",
Tcb)
);
@@ -1032,7 +1032,7 @@ TcpInput ( if (TcpAdjustSndQue (Tcb, Tcb->SndNxt) == 0 || TcpTrimInWnd (Tcb, Nbuf) == 0) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpInput: discard a broken segment for TCB %p\n",
Tcb)
);
@@ -1041,7 +1041,7 @@ TcpInput ( }
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: simultaneous open for TCB %p in SYN_SENT\n",
Tcb)
);
@@ -1070,7 +1070,7 @@ TcpInput ( //
if (TcpSeqAcceptable (Tcb, Seg) == 0) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: sequence acceptance test failed for segment of TCB %p\n",
Tcb)
);
@@ -1095,7 +1095,7 @@ TcpInput ( //
if (TCP_FLG_ON (Seg->Flag, TCP_FLG_RST)) {
- DEBUG ((EFI_D_WARN, "TcpInput: connection reset for TCB %p\n", Tcb));
+ DEBUG ((DEBUG_WARN, "TcpInput: connection reset for TCB %p\n", Tcb));
if (Tcb->State == TCP_SYN_RCVD) {
@@ -1126,7 +1126,7 @@ TcpInput ( //
if (TcpTrimInWnd (Tcb, Nbuf) == 0) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpInput: discard a broken segment for TCB %p\n",
Tcb)
);
@@ -1144,7 +1144,7 @@ TcpInput ( if (TCP_FLG_ON (Seg->Flag, TCP_FLG_SYN)) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: connection reset because received extra SYN for TCB %p\n",
Tcb)
);
@@ -1157,7 +1157,7 @@ TcpInput ( //
if (!TCP_FLG_ON (Seg->Flag, TCP_FLG_ACK)) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: segment discard because of no ACK for connected TCB %p\n",
Tcb)
);
@@ -1186,7 +1186,7 @@ TcpInput ( TcpDeliverData (Tcb);
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpInput: connection established for TCB %p in SYN_RCVD\n",
Tcb)
);
@@ -1196,7 +1196,7 @@ TcpInput ( //
} else {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: send reset because of wrong ACK for TCB %p in SYN_RCVD\n",
Tcb)
);
@@ -1208,7 +1208,7 @@ TcpInput ( if (TCP_SEQ_LT (Seg->Ack, Tcb->SndUna)) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: ignore the out-of-data ACK for connected TCB %p\n",
Tcb)
);
@@ -1218,7 +1218,7 @@ TcpInput ( } else if (TCP_SEQ_GT (Seg->Ack, Tcb->SndNxt)) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: discard segment for future ACK for connected TCB %p\n",
Tcb)
);
@@ -1309,7 +1309,7 @@ TcpInput ( if (TcpAdjustSndQue (Tcb, Seg->Ack) == 0) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpInput: discard a broken segment for TCB %p\n",
Tcb)
);
@@ -1347,7 +1347,7 @@ TcpInput ( }
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: peer shrinks the window for connected TCB %p\n",
Tcb)
);
@@ -1375,14 +1375,14 @@ TcpInput ( // 2^Rcv.Wind.Shift before moving the SndNxt to the left.
//
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: peer advise negative useable window for connected TCB %p\n",
Tcb)
);
Usable = TCP_SUB_SEQ (Tcb->SndNxt, Right);
if ((Usable >> Tcb->SndWndScale) > 0) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: SndNxt is out of window by more than window scale for TCB %p\n",
Tcb)
);
@@ -1409,7 +1409,7 @@ NO_UPDATE: {
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpInput: local FIN is ACKed by peer for connected TCB %p\n",
Tcb)
);
@@ -1452,7 +1452,7 @@ NO_UPDATE: } else {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"Connection closed immediately because app disables TIME_WAIT timer for %p\n",
Tcb)
);
@@ -1481,7 +1481,7 @@ NO_UPDATE: } else {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"Connection closed immediately because app disables TIME_WAIT timer for %p\n",
Tcb)
);
@@ -1505,7 +1505,7 @@ StepSix: if (TCP_FLG_ON (Seg->Flag, TCP_FLG_URG) && !TCP_FIN_RCVD (Tcb->State)) {
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpInput: received urgent data from peer for connected TCB %p\n",
Tcb)
);
@@ -1531,7 +1531,7 @@ StepSix: if (TCP_FIN_RCVD (Tcb->State)) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: connection reset because data is lost for connected TCB %p\n",
Tcb)
);
@@ -1541,7 +1541,7 @@ StepSix: if (TCP_LOCAL_CLOSED (Tcb->State) && (Nbuf->TotalSize != 0)) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpInput: connection reset because data is lost for connected TCB %p\n",
Tcb)
);
@@ -1551,7 +1551,7 @@ StepSix: if (TcpQueueData (Tcb, Nbuf) == 0) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpInput: discard a broken segment for TCB %p\n",
Tcb)
);
@@ -1615,7 +1615,7 @@ DISCARD: //
// Tcb is a child of Parent, and it doesn't survive
//
- DEBUG ((EFI_D_WARN, "TcpInput: Discard a packet\n"));
+ DEBUG ((DEBUG_WARN, "TcpInput: Discard a packet\n"));
NetbufFree (Nbuf);
if ((Parent != NULL) && (Tcb != NULL)) {
diff --git a/NetworkPkg/TcpDxe/TcpIo.c b/NetworkPkg/TcpDxe/TcpIo.c index c7c2977f51..5504c30cee 100644 --- a/NetworkPkg/TcpDxe/TcpIo.c +++ b/NetworkPkg/TcpDxe/TcpIo.c @@ -80,7 +80,7 @@ TcpSendIpPacket ( IpSender = IpIoFindSender (&IpIo, Version, Src);
if (IpSender == NULL) {
- DEBUG ((EFI_D_WARN, "TcpSendIpPacket: No appropriate IpSender.\n"));
+ DEBUG ((DEBUG_WARN, "TcpSendIpPacket: No appropriate IpSender.\n"));
return -1;
}
@@ -130,7 +130,7 @@ TcpSendIpPacket ( Status = IpIoSend (IpIo, Nbuf, IpSender, NULL, NULL, Dest, &Override);
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "TcpSendIpPacket: return %r error\n", Status));
+ DEBUG ((DEBUG_ERROR, "TcpSendIpPacket: return %r error\n", Status));
return -1;
}
@@ -171,7 +171,7 @@ Tcp6RefreshNeighbor ( IpIoFindSender (&IpIo, IP_VERSION_6, Neighbor);
if (IpIo == NULL) {
- DEBUG ((EFI_D_WARN, "Tcp6AddNeighbor: No appropriate IpIo.\n"));
+ DEBUG ((DEBUG_WARN, "Tcp6AddNeighbor: No appropriate IpIo.\n"));
return EFI_NOT_STARTED;
}
@@ -183,4 +183,3 @@ Tcp6RefreshNeighbor ( return IpIoRefreshNeighbor (IpIo, Neighbor, Timeout);
}
-
diff --git a/NetworkPkg/TcpDxe/TcpMisc.c b/NetworkPkg/TcpDxe/TcpMisc.c index 73ed33de85..c454efefe3 100644 --- a/NetworkPkg/TcpDxe/TcpMisc.c +++ b/NetworkPkg/TcpDxe/TcpMisc.c @@ -501,7 +501,7 @@ TcpCloneTcb ( Clone->Sk = SockClone (Tcb->Sk);
if (Clone->Sk == NULL) {
- DEBUG ((EFI_D_ERROR, "TcpCloneTcb: failed to clone a sock\n"));
+ DEBUG ((DEBUG_ERROR, "TcpCloneTcb: failed to clone a sock\n"));
FreePool (Clone);
return NULL;
}
@@ -608,7 +608,7 @@ TcpSetState ( ASSERT (State < (sizeof (mTcpStateName) / sizeof (CHAR16 *)));
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"Tcb (%p) state %s --> %s\n",
Tcb,
mTcpStateName[Tcb->State],
@@ -757,7 +757,7 @@ TcpOnAppClose ( if (!IsListEmpty (&Tcb->RcvQue) || GET_RCV_DATASIZE (Tcb->Sk) != 0) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpOnAppClose: connection reset because data is lost for TCB %p\n",
Tcb)
);
@@ -857,7 +857,7 @@ TcpOnAppConsume ( if (TcpOld < Tcb->RcvMss) {
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpOnAppConsume: send a window update for a window closed Tcb %p\n",
Tcb)
);
@@ -866,7 +866,7 @@ TcpOnAppConsume ( } else if (Tcb->DelayedAck == 0) {
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpOnAppConsume: scheduled a delayed ACK to update window for Tcb %p\n",
Tcb)
);
@@ -895,7 +895,7 @@ TcpOnAppAbort ( )
{
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpOnAppAbort: connection reset issued by application for TCB %p\n",
Tcb)
);
@@ -1039,4 +1039,3 @@ TcpInstallDevicePath ( return Status;
}
-
diff --git a/NetworkPkg/TcpDxe/TcpOutput.c b/NetworkPkg/TcpDxe/TcpOutput.c index 7d0cf0900a..50ea9460ad 100644 --- a/NetworkPkg/TcpDxe/TcpOutput.c +++ b/NetworkPkg/TcpDxe/TcpOutput.c @@ -250,7 +250,7 @@ SetPersistTimer: if (!TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_REXMIT)) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpDataToSend: enter persistent state for TCB %p\n",
Tcb)
);
@@ -562,7 +562,7 @@ TcpGetSegmentSock ( if (Nbuf == NULL) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpGetSegmentSock: failed to allocate a netbuf for TCB %p\n",
Tcb)
);
@@ -678,7 +678,7 @@ TcpRetransmit ( (TCP_SEQ_GT (Seq, Tcb->RetxmitSeqMax) || TCP_SEQ_BETWEEN (Tcb->SndWl2 + Tcb->SndWnd, Seq, Tcb->SndWl2 + Tcb->SndWnd + (1 << Tcb->SndWndScale)))) {
Len = TCP_SUB_SEQ (Tcb->SndNxt, Seq);
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpRetransmit: retransmission without regard to the receiver window for TCB %p\n",
Tcb)
);
@@ -688,7 +688,7 @@ TcpRetransmit ( } else {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpRetransmit: retransmission cancelled because send window too small for TCB %p\n",
Tcb)
);
@@ -845,7 +845,7 @@ TcpToSendData ( if (Nbuf == NULL) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpToSendData: failed to get a segment for TCB %p\n",
Tcb)
);
@@ -874,7 +874,7 @@ TcpToSendData ( TCP_SEQ_LT (End + 1, Tcb->SndWnd + Tcb->SndWl2)
) {
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpToSendData: send FIN to peer for TCB %p in state %s\n",
Tcb,
mTcpStateName[Tcb->State])
@@ -892,7 +892,7 @@ TcpToSendData ( if (TcpVerifySegment (Nbuf) == 0 || TcpCheckSndQue (&Tcb->SndQue) == 0) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpToSendData: discard a broken segment for TCB %p\n",
Tcb)
);
@@ -904,7 +904,7 @@ TcpToSendData ( //
if (Seg->End == Seg->Seq) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpToSendData: created a empty segment for TCB %p, free it now\n",
Tcb)
);
@@ -959,7 +959,7 @@ TcpToSendData ( if ((Tcb->CongestState == TCP_CONGEST_OPEN) && !TCP_FLG_ON (Tcb->CtrlFlag, TCP_CTRL_RTT_ON)) {
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpToSendData: set RTT measure sequence %d for TCB %p\n",
Seq,
Tcb)
@@ -1090,7 +1090,7 @@ TcpToSendAck ( }
DEBUG (
- (EFI_D_NET,
+ (DEBUG_NET,
"TcpToSendAck: scheduled a delayed ACK for TCB %p\n",
Tcb)
);
@@ -1248,4 +1248,3 @@ TcpVerifySegment ( return 1;
}
-
diff --git a/NetworkPkg/TcpDxe/TcpTimer.c b/NetworkPkg/TcpDxe/TcpTimer.c index 106d9470db..04caf8e509 100644 --- a/NetworkPkg/TcpDxe/TcpTimer.c +++ b/NetworkPkg/TcpDxe/TcpTimer.c @@ -148,7 +148,7 @@ TcpConnectTimeout ( {
if (!TCP_CONNECTED (Tcb->State)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpConnectTimeout: connection closed because connection timer timeout for TCB %p\n",
Tcb)
);
@@ -159,7 +159,7 @@ TcpConnectTimeout ( if (TCP_SYN_RCVD == Tcb->State) {
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpConnectTimeout: send reset because connection timer timeout for TCB %p\n",
Tcb)
);
@@ -187,7 +187,7 @@ TcpRexmitTimeout ( UINT32 FlightSize;
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpRexmitTimeout: transmission timeout for TCB %p\n",
Tcb)
);
@@ -207,7 +207,7 @@ TcpRexmitTimeout ( if ((Tcb->LossTimes > Tcb->MaxRexmit) && !TCP_TIMER_ON (Tcb->EnabledTimer, TCP_TIMER_CONNECT)) {
DEBUG (
- (EFI_D_ERROR,
+ (DEBUG_ERROR,
"TcpRexmitTimeout: connection closed because too many timeouts for TCB %p\n",
Tcb)
);
@@ -299,7 +299,7 @@ TcpFinwait2Timeout ( )
{
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"TcpFinwait2Timeout: connection closed because FIN_WAIT2 timer timeouts for TCB %p\n",
Tcb)
);
@@ -319,7 +319,7 @@ Tcp2MSLTimeout ( )
{
DEBUG (
- (EFI_D_WARN,
+ (DEBUG_WARN,
"Tcp2MSLTimeout: connection closed because TIME_WAIT timer timeouts for TCB %p\n",
Tcb)
);
@@ -584,4 +584,3 @@ TcpTicking ( {
QueueDpc (TPL_CALLBACK, TcpTickingDpc, Context);
}
-
diff --git a/NetworkPkg/TlsDxe/TlsImpl.c b/NetworkPkg/TlsDxe/TlsImpl.c index 637fad2398..352465b7e8 100644 --- a/NetworkPkg/TlsDxe/TlsImpl.c +++ b/NetworkPkg/TlsDxe/TlsImpl.c @@ -130,7 +130,7 @@ TlsEncryptPacket ( //
// No data was successfully encrypted, continue to encrypt other messages.
//
- DEBUG ((EFI_D_WARN, "TlsEncryptPacket: No data read from TLS object.\n"));
+ DEBUG ((DEBUG_WARN, "TlsEncryptPacket: No data read from TLS object.\n"));
ThisMessageSize = 0;
}
@@ -301,7 +301,7 @@ TlsDecryptPacket ( //
// No data was successfully decrypted, continue to decrypt other messages.
//
- DEBUG ((EFI_D_WARN, "TlsDecryptPacket: No data read from TLS object.\n"));
+ DEBUG ((DEBUG_WARN, "TlsDecryptPacket: No data read from TLS object.\n"));
ThisPlainMessageSize = 0;
}
@@ -346,4 +346,3 @@ ERROR: return Status;
}
-
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c index fb63cf61a9..0edf7cc799 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c @@ -314,7 +314,7 @@ PxeBcBuildDhcp4Options ( //
// Zero the Guid to indicate NOT programmable if failed to get system Guid.
//
- DEBUG ((EFI_D_WARN, "PXE: Failed to read system GUID from the smbios table!\n"));
+ DEBUG ((DEBUG_WARN, "PXE: Failed to read system GUID from the smbios table!\n"));
ZeroMem (OptEnt.Uuid->Guid, sizeof (EFI_GUID));
}
@@ -1277,7 +1277,7 @@ PxeBcDhcp4CallBack ( //
// Zero the Guid to indicate NOT programmable if failed to get system Guid.
//
- DEBUG ((EFI_D_WARN, "PXE: Failed to read system GUID from the smbios table!\n"));
+ DEBUG ((DEBUG_WARN, "PXE: Failed to read system GUID from the smbios table!\n"));
ZeroMem (Packet->Dhcp4.Header.ClientHwAddr, sizeof (EFI_GUID));
}
Packet->Dhcp4.Header.HwAddrLen = (UINT8) sizeof (EFI_GUID);
@@ -1466,7 +1466,7 @@ PxeBcDhcp4Discover ( //
// Zero the Guid to indicate NOT programmable if failed to get system Guid.
//
- DEBUG ((EFI_D_WARN, "PXE: Failed to read system GUID from the smbios table!\n"));
+ DEBUG ((DEBUG_WARN, "PXE: Failed to read system GUID from the smbios table!\n"));
ZeroMem (Token.Packet->Dhcp4.Header.ClientHwAddr, sizeof (EFI_GUID));
}
Token.Packet->Dhcp4.Header.HwAddrLen = (UINT8) sizeof (EFI_GUID);
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c index 5d18207b6c..2e9d31547d 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c @@ -1951,7 +1951,7 @@ EfiPxeBcSetParameters ( if (NewSendGUID != NULL) {
if (*NewSendGUID && EFI_ERROR (NetLibGetSystemGuid (&SystemGuid))) {
- DEBUG ((EFI_D_WARN, "PXE: Failed to read system GUID from the smbios table!\n"));
+ DEBUG ((DEBUG_WARN, "PXE: Failed to read system GUID from the smbios table!\n"));
return EFI_INVALID_PARAMETER;
}
Mode->SendGUID = *NewSendGUID;
@@ -2418,4 +2418,3 @@ EfiPxeLoadFile ( }
EFI_LOAD_FILE_PROTOCOL gLoadFileProtocolTemplate = { EfiPxeLoadFile };
-
|