sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg: Change use of EFI_D_* to DEBUG_*

Browse Source 
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: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
Michael D Kinney
2021-11-16 19:21:29 -08:00
committed by mergify[bot]
parent 917e98f3e5
commit 87000d7708
146 changed files with 1560 additions and 1619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
MdeModulePkg/Bus/Pci/EhciDxe/EhciDebug.c
View File

@@ -23,38 +23,38 @@ EhcDumpStatus (
)
{
if (EHC_BIT_IS_SET (State, QTD_STAT_DO_PING)) {
DEBUG ((EFI_D_VERBOSE, " Do_Ping"));
DEBUG ((DEBUG_VERBOSE, " Do_Ping"));
} else {
DEBUG ((EFI_D_VERBOSE, " Do_Out"));
DEBUG ((DEBUG_VERBOSE, " Do_Out"));
}
if (EHC_BIT_IS_SET (State, QTD_STAT_DO_CS)) {
DEBUG ((EFI_D_VERBOSE, " Do_CS"));
DEBUG ((DEBUG_VERBOSE, " Do_CS"));
} else {
DEBUG ((EFI_D_VERBOSE, " Do_SS"));
DEBUG ((DEBUG_VERBOSE, " Do_SS"));
}
if (EHC_BIT_IS_SET (State, QTD_STAT_TRANS_ERR)) {
DEBUG ((EFI_D_VERBOSE, " Transfer_Error"));
DEBUG ((DEBUG_VERBOSE, " Transfer_Error"));
}
if (EHC_BIT_IS_SET (State, QTD_STAT_BABBLE_ERR)) {
DEBUG ((EFI_D_VERBOSE, " Babble_Error"));
DEBUG ((DEBUG_VERBOSE, " Babble_Error"));
}
if (EHC_BIT_IS_SET (State, QTD_STAT_BUFF_ERR)) {
DEBUG ((EFI_D_VERBOSE, " Buffer_Error"));
DEBUG ((DEBUG_VERBOSE, " Buffer_Error"));
}
if (EHC_BIT_IS_SET (State, QTD_STAT_HALTED)) {
DEBUG ((EFI_D_VERBOSE, " Halted"));
DEBUG ((DEBUG_VERBOSE, " Halted"));
}
if (EHC_BIT_IS_SET (State, QTD_STAT_ACTIVE)) {
DEBUG ((EFI_D_VERBOSE, " Active"));
DEBUG ((DEBUG_VERBOSE, " Active"));
}
DEBUG ((EFI_D_VERBOSE, "\n"));
DEBUG ((DEBUG_VERBOSE, "\n"));
}
@@ -75,37 +75,37 @@ EhcDumpQtd (
UINTN Index;
if (Msg != NULL) {
DEBUG ((EFI_D_VERBOSE, Msg));
DEBUG ((DEBUG_VERBOSE, Msg));
}
DEBUG ((EFI_D_VERBOSE, "Queue TD @ 0x%p, data length %d\n", Qtd, (UINT32)Qtd->DataLen));
DEBUG ((DEBUG_VERBOSE, "Queue TD @ 0x%p, data length %d\n", Qtd, (UINT32)Qtd->DataLen));
QtdHw = &Qtd->QtdHw;
DEBUG ((EFI_D_VERBOSE, "Next QTD : %x\n", QtdHw->NextQtd));
DEBUG ((EFI_D_VERBOSE, "AltNext QTD : %x\n", QtdHw->AltNext));
DEBUG ((EFI_D_VERBOSE, "Status : %x\n", QtdHw->Status));
DEBUG ((DEBUG_VERBOSE, "Next QTD : %x\n", QtdHw->NextQtd));
DEBUG ((DEBUG_VERBOSE, "AltNext QTD : %x\n", QtdHw->AltNext));
DEBUG ((DEBUG_VERBOSE, "Status : %x\n", QtdHw->Status));
EhcDumpStatus (QtdHw->Status);
if (QtdHw->Pid == QTD_PID_SETUP) {
DEBUG ((EFI_D_VERBOSE, "PID : Setup\n"));
DEBUG ((DEBUG_VERBOSE, "PID : Setup\n"));
} else if (QtdHw->Pid == QTD_PID_INPUT) {
DEBUG ((EFI_D_VERBOSE, "PID : IN\n"));
DEBUG ((DEBUG_VERBOSE, "PID : IN\n"));
} else if (QtdHw->Pid == QTD_PID_OUTPUT) {
DEBUG ((EFI_D_VERBOSE, "PID : OUT\n"));
DEBUG ((DEBUG_VERBOSE, "PID : OUT\n"));
}
DEBUG ((EFI_D_VERBOSE, "Error Count : %d\n", QtdHw->ErrCnt));
DEBUG ((EFI_D_VERBOSE, "Current Page : %d\n", QtdHw->CurPage));
DEBUG ((EFI_D_VERBOSE, "IOC : %d\n", QtdHw->Ioc));
DEBUG ((EFI_D_VERBOSE, "Total Bytes : %d\n", QtdHw->TotalBytes));
DEBUG ((EFI_D_VERBOSE, "Data Toggle : %d\n", QtdHw->DataToggle));
DEBUG ((DEBUG_VERBOSE, "Error Count : %d\n", QtdHw->ErrCnt));
DEBUG ((DEBUG_VERBOSE, "Current Page : %d\n", QtdHw->CurPage));
DEBUG ((DEBUG_VERBOSE, "IOC : %d\n", QtdHw->Ioc));
DEBUG ((DEBUG_VERBOSE, "Total Bytes : %d\n", QtdHw->TotalBytes));
DEBUG ((DEBUG_VERBOSE, "Data Toggle : %d\n", QtdHw->DataToggle));
for (Index = 0; Index < 5; Index++) {
DEBUG ((EFI_D_VERBOSE, "Page[%d] : 0x%x\n", (UINT32)Index, QtdHw->Page[Index]));
DEBUG ((DEBUG_VERBOSE, "Page[%d] : 0x%x\n", (UINT32)Index, QtdHw->Page[Index]));
}
}
@@ -131,60 +131,60 @@ EhcDumpQh (
UINTN Index;
if (Msg != NULL) {
DEBUG ((EFI_D_VERBOSE, Msg));
DEBUG ((DEBUG_VERBOSE, Msg));
}
DEBUG ((EFI_D_VERBOSE, "Queue head @ 0x%p, interval %ld, next qh %p\n",
DEBUG ((DEBUG_VERBOSE, "Queue head @ 0x%p, interval %ld, next qh %p\n",
Qh, (UINT64)Qh->Interval, Qh->NextQh));
QhHw = &Qh->QhHw;
DEBUG ((EFI_D_VERBOSE, "Hoziontal link: %x\n", QhHw->HorizonLink));
DEBUG ((EFI_D_VERBOSE, "Device address: %d\n", QhHw->DeviceAddr));
DEBUG ((EFI_D_VERBOSE, "Inactive : %d\n", QhHw->Inactive));
DEBUG ((EFI_D_VERBOSE, "EP number : %d\n", QhHw->EpNum));
DEBUG ((EFI_D_VERBOSE, "EP speed : %d\n", QhHw->EpSpeed));
DEBUG ((EFI_D_VERBOSE, "DT control : %d\n", QhHw->DtCtrl));
DEBUG ((EFI_D_VERBOSE, "Reclaim head : %d\n", QhHw->ReclaimHead));
DEBUG ((EFI_D_VERBOSE, "Max packet len: %d\n", QhHw->MaxPacketLen));
DEBUG ((EFI_D_VERBOSE, "Ctrl EP : %d\n", QhHw->CtrlEp));
DEBUG ((EFI_D_VERBOSE, "Nak reload : %d\n", QhHw->NakReload));
DEBUG ((DEBUG_VERBOSE, "Hoziontal link: %x\n", QhHw->HorizonLink));
DEBUG ((DEBUG_VERBOSE, "Device address: %d\n", QhHw->DeviceAddr));
DEBUG ((DEBUG_VERBOSE, "Inactive : %d\n", QhHw->Inactive));
DEBUG ((DEBUG_VERBOSE, "EP number : %d\n", QhHw->EpNum));
DEBUG ((DEBUG_VERBOSE, "EP speed : %d\n", QhHw->EpSpeed));
DEBUG ((DEBUG_VERBOSE, "DT control : %d\n", QhHw->DtCtrl));
DEBUG ((DEBUG_VERBOSE, "Reclaim head : %d\n", QhHw->ReclaimHead));
DEBUG ((DEBUG_VERBOSE, "Max packet len: %d\n", QhHw->MaxPacketLen));
DEBUG ((DEBUG_VERBOSE, "Ctrl EP : %d\n", QhHw->CtrlEp));
DEBUG ((DEBUG_VERBOSE, "Nak reload : %d\n", QhHw->NakReload));
DEBUG ((EFI_D_VERBOSE, "SMask : %x\n", QhHw->SMask));
DEBUG ((EFI_D_VERBOSE, "CMask : %x\n", QhHw->CMask));
DEBUG ((EFI_D_VERBOSE, "Hub address : %d\n", QhHw->HubAddr));
DEBUG ((EFI_D_VERBOSE, "Hub port : %d\n", QhHw->PortNum));
DEBUG ((EFI_D_VERBOSE, "Multiplier : %d\n", QhHw->Multiplier));
DEBUG ((DEBUG_VERBOSE, "SMask : %x\n", QhHw->SMask));
DEBUG ((DEBUG_VERBOSE, "CMask : %x\n", QhHw->CMask));
DEBUG ((DEBUG_VERBOSE, "Hub address : %d\n", QhHw->HubAddr));
DEBUG ((DEBUG_VERBOSE, "Hub port : %d\n", QhHw->PortNum));
DEBUG ((DEBUG_VERBOSE, "Multiplier : %d\n", QhHw->Multiplier));
DEBUG ((EFI_D_VERBOSE, "Cur QTD : %x\n", QhHw->CurQtd));
DEBUG ((DEBUG_VERBOSE, "Cur QTD : %x\n", QhHw->CurQtd));
DEBUG ((EFI_D_VERBOSE, "Next QTD : %x\n", QhHw->NextQtd));
DEBUG ((EFI_D_VERBOSE, "AltNext QTD : %x\n", QhHw->AltQtd));
DEBUG ((EFI_D_VERBOSE, "Status : %x\n", QhHw->Status));
DEBUG ((DEBUG_VERBOSE, "Next QTD : %x\n", QhHw->NextQtd));
DEBUG ((DEBUG_VERBOSE, "AltNext QTD : %x\n", QhHw->AltQtd));
DEBUG ((DEBUG_VERBOSE, "Status : %x\n", QhHw->Status));
EhcDumpStatus (QhHw->Status);
if (QhHw->Pid == QTD_PID_SETUP) {
DEBUG ((EFI_D_VERBOSE, "PID : Setup\n"));
DEBUG ((DEBUG_VERBOSE, "PID : Setup\n"));
} else if (QhHw->Pid == QTD_PID_INPUT) {
DEBUG ((EFI_D_VERBOSE, "PID : IN\n"));
DEBUG ((DEBUG_VERBOSE, "PID : IN\n"));
} else if (QhHw->Pid == QTD_PID_OUTPUT) {
DEBUG ((EFI_D_VERBOSE, "PID : OUT\n"));
DEBUG ((DEBUG_VERBOSE, "PID : OUT\n"));
}
DEBUG ((EFI_D_VERBOSE, "Error Count : %d\n", QhHw->ErrCnt));
DEBUG ((EFI_D_VERBOSE, "Current Page : %d\n", QhHw->CurPage));
DEBUG ((EFI_D_VERBOSE, "IOC : %d\n", QhHw->Ioc));
DEBUG ((EFI_D_VERBOSE, "Total Bytes : %d\n", QhHw->TotalBytes));
DEBUG ((EFI_D_VERBOSE, "Data Toggle : %d\n", QhHw->DataToggle));
DEBUG ((DEBUG_VERBOSE, "Error Count : %d\n", QhHw->ErrCnt));
DEBUG ((DEBUG_VERBOSE, "Current Page : %d\n", QhHw->CurPage));
DEBUG ((DEBUG_VERBOSE, "IOC : %d\n", QhHw->Ioc));
DEBUG ((DEBUG_VERBOSE, "Total Bytes : %d\n", QhHw->TotalBytes));
DEBUG ((DEBUG_VERBOSE, "Data Toggle : %d\n", QhHw->DataToggle));
for (Index = 0; Index < 5; Index++) {
DEBUG ((EFI_D_VERBOSE, "Page[%d] : 0x%x\n", Index, QhHw->Page[Index]));
DEBUG ((DEBUG_VERBOSE, "Page[%d] : 0x%x\n", Index, QhHw->Page[Index]));
}
DEBUG ((EFI_D_VERBOSE, "\n"));
DEBUG ((DEBUG_VERBOSE, "\n"));
BASE_LIST_FOR_EACH (Entry, &Qh->Qtds) {
Qtd = EFI_LIST_CONTAINER (Entry, EHC_QTD, QtdList);
@@ -214,13 +214,11 @@ EhcDumpBuf (
for (Index = 0; Index < Len; Index++) {
if (Index % 16 == 0) {
DEBUG ((EFI_D_VERBOSE,"\n"));
DEBUG ((DEBUG_VERBOSE,"\n"));
}
DEBUG ((EFI_D_VERBOSE, "%02x ", Buf[Index]));
DEBUG ((DEBUG_VERBOSE, "%02x ", Buf[Index]));
}
DEBUG ((EFI_D_VERBOSE, "\n"));
DEBUG ((DEBUG_VERBOSE, "\n"));
}