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

53
MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
View File

@@ -85,7 +85,7 @@ EhcGetCapability (
*PortNumber = (UINT8) (Ehc->HcStructParams & HCSP_NPORTS);
*Is64BitCapable = (UINT8) Ehc->Support64BitDma;
DEBUG ((EFI_D_INFO, "EhcGetCapability: %d ports, 64 bit %d\n", *PortNumber, *Is64BitCapable));
DEBUG ((DEBUG_INFO, "EhcGetCapability: %d ports, 64 bit %d\n", *PortNumber, *Is64BitCapable));
gBS->RestoreTPL (OldTpl);
return EFI_SUCCESS;
@@ -181,7 +181,7 @@ EhcReset (
}
ON_EXIT:
DEBUG ((EFI_D_INFO, "EhcReset: exit status %r\n", Status));
DEBUG ((DEBUG_INFO, "EhcReset: exit status %r\n", Status));
gBS->RestoreTPL (OldTpl);
return Status;
}
@@ -225,7 +225,7 @@ EhcGetState (
gBS->RestoreTPL (OldTpl);
DEBUG ((EFI_D_INFO, "EhcGetState: current state %d\n", *State));
DEBUG ((DEBUG_INFO, "EhcGetState: current state %d\n", *State));
return EFI_SUCCESS;
}
@@ -299,7 +299,7 @@ EhcSetState (
Status = EFI_INVALID_PARAMETER;
}
DEBUG ((EFI_D_INFO, "EhcSetState: exit status %r\n", Status));
DEBUG ((DEBUG_INFO, "EhcSetState: exit status %r\n", Status));
gBS->RestoreTPL (OldTpl);
return Status;
}
@@ -470,7 +470,7 @@ EhcSetRootHubPortFeature (
Status = EhcRunHC (Ehc, EHC_GENERIC_TIMEOUT);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_INFO, "EhcSetRootHubPortFeature :failed to start HC - %r\n", Status));
DEBUG ((DEBUG_INFO, "EhcSetRootHubPortFeature :failed to start HC - %r\n", Status));
break;
}
}
@@ -503,7 +503,7 @@ EhcSetRootHubPortFeature (
}
ON_EXIT:
DEBUG ((EFI_D_INFO, "EhcSetRootHubPortFeature: exit status %r\n", Status));
DEBUG ((DEBUG_INFO, "EhcSetRootHubPortFeature: exit status %r\n", Status));
gBS->RestoreTPL (OldTpl);
return Status;
@@ -638,7 +638,7 @@ EhcClearRootHubPortFeature (
}
ON_EXIT:
DEBUG ((EFI_D_INFO, "EhcClearRootHubPortFeature: exit status %r\n", Status));
DEBUG ((DEBUG_INFO, "EhcClearRootHubPortFeature: exit status %r\n", Status));
gBS->RestoreTPL (OldTpl);
return Status;
}
@@ -729,7 +729,7 @@ EhcControlTransfer (
*TransferResult = EFI_USB_ERR_SYSTEM;
if (EhcIsHalt (Ehc) || EhcIsSysError (Ehc)) {
DEBUG ((EFI_D_ERROR, "EhcControlTransfer: HC halted at entrance\n"));
DEBUG ((DEBUG_ERROR, "EhcControlTransfer: HC halted at entrance\n"));
EhcAckAllInterrupt (Ehc);
goto ON_EXIT;
@@ -765,7 +765,7 @@ EhcControlTransfer (
);
if (Urb == NULL) {
DEBUG ((EFI_D_ERROR, "EhcControlTransfer: failed to create URB"));
DEBUG ((DEBUG_ERROR, "EhcControlTransfer: failed to create URB"));
Status = EFI_OUT_OF_RESOURCES;
goto ON_EXIT;
@@ -794,7 +794,7 @@ ON_EXIT:
gBS->RestoreTPL (OldTpl);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EhcControlTransfer: error - %r, transfer - %x\n", Status, *TransferResult));
DEBUG ((DEBUG_ERROR, "EhcControlTransfer: error - %r, transfer - %x\n", Status, *TransferResult));
}
return Status;
@@ -878,7 +878,7 @@ EhcBulkTransfer (
Status = EFI_DEVICE_ERROR;
if (EhcIsHalt (Ehc) || EhcIsSysError (Ehc)) {
DEBUG ((EFI_D_ERROR, "EhcBulkTransfer: HC is halted\n"));
DEBUG ((DEBUG_ERROR, "EhcBulkTransfer: HC is halted\n"));
EhcAckAllInterrupt (Ehc);
goto ON_EXIT;
@@ -908,7 +908,7 @@ EhcBulkTransfer (
);
if (Urb == NULL) {
DEBUG ((EFI_D_ERROR, "EhcBulkTransfer: failed to create URB\n"));
DEBUG ((DEBUG_ERROR, "EhcBulkTransfer: failed to create URB\n"));
Status = EFI_OUT_OF_RESOURCES;
goto ON_EXIT;
@@ -934,7 +934,7 @@ ON_EXIT:
gBS->RestoreTPL (OldTpl);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EhcBulkTransfer: error - %r, transfer - %x\n", Status, *TransferResult));
DEBUG ((DEBUG_ERROR, "EhcBulkTransfer: error - %r, transfer - %x\n", Status, *TransferResult));
}
return Status;
@@ -1023,14 +1023,14 @@ EhcAsyncInterruptTransfer (
if (!IsNewTransfer) {
Status = EhciDelAsyncIntTransfer (Ehc, DeviceAddress, EndPointAddress, DataToggle);
DEBUG ((EFI_D_INFO, "EhcAsyncInterruptTransfer: remove old transfer - %r\n", Status));
DEBUG ((DEBUG_INFO, "EhcAsyncInterruptTransfer: remove old transfer - %r\n", Status));
goto ON_EXIT;
}
Status = EFI_SUCCESS;
if (EhcIsHalt (Ehc) || EhcIsSysError (Ehc)) {
DEBUG ((EFI_D_ERROR, "EhcAsyncInterruptTransfer: HC is halt\n"));
DEBUG ((DEBUG_ERROR, "EhcAsyncInterruptTransfer: HC is halt\n"));
EhcAckAllInterrupt (Ehc);
Status = EFI_DEVICE_ERROR;
@@ -1139,7 +1139,7 @@ EhcSyncInterruptTransfer (
Status = EFI_DEVICE_ERROR;
if (EhcIsHalt (Ehc) || EhcIsSysError (Ehc)) {
DEBUG ((EFI_D_ERROR, "EhcSyncInterruptTransfer: HC is halt\n"));
DEBUG ((DEBUG_ERROR, "EhcSyncInterruptTransfer: HC is halt\n"));
EhcAckAllInterrupt (Ehc);
goto ON_EXIT;
@@ -1165,7 +1165,7 @@ EhcSyncInterruptTransfer (
);
if (Urb == NULL) {
DEBUG ((EFI_D_ERROR, "EhcSyncInterruptTransfer: failed to create URB\n"));
DEBUG ((DEBUG_ERROR, "EhcSyncInterruptTransfer: failed to create URB\n"));
Status = EFI_OUT_OF_RESOURCES;
goto ON_EXIT;
@@ -1189,7 +1189,7 @@ ON_EXIT:
gBS->RestoreTPL (OldTpl);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EhcSyncInterruptTransfer: error - %r, transfer - %x\n", Status, *TransferResult));
DEBUG ((DEBUG_ERROR, "EhcSyncInterruptTransfer: error - %r, transfer - %x\n", Status, *TransferResult));
}
return Status;
@@ -1562,7 +1562,7 @@ EhcCreateUsb2Hc (
Ehc->HcCapParams = EhcReadCapRegister (Ehc, EHC_HCCPARAMS_OFFSET);
Ehc->CapLen = EhcReadCapRegister (Ehc, EHC_CAPLENGTH_OFFSET) & 0x0FF;
DEBUG ((EFI_D_INFO, "EhcCreateUsb2Hc: capability length %d\n", Ehc->CapLen));
DEBUG ((DEBUG_INFO, "EhcCreateUsb2Hc: capability length %d\n", Ehc->CapLen));
//
// EHCI Controllers with a CapLen of 0 are ignored.
@@ -1723,7 +1723,7 @@ EhcDriverBindingStart (
}
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EhcDriverBindingStart: failed to enable controller\n"));
DEBUG ((DEBUG_ERROR, "EhcDriverBindingStart: failed to enable controller\n"));
goto CLOSE_PCIIO;
}
@@ -1834,7 +1834,7 @@ EhcDriverBindingStart (
Ehc = EhcCreateUsb2Hc (PciIo, HcDevicePath, OriginalPciAttributes);
if (Ehc == NULL) {
DEBUG ((EFI_D_ERROR, "EhcDriverBindingStart: failed to create USB2_HC\n"));
DEBUG ((DEBUG_ERROR, "EhcDriverBindingStart: failed to create USB2_HC\n"));
Status = EFI_OUT_OF_RESOURCES;
goto CLOSE_PCIIO;
@@ -1854,7 +1854,7 @@ EhcDriverBindingStart (
if (!EFI_ERROR (Status)) {
Ehc->Support64BitDma = TRUE;
} else {
DEBUG ((EFI_D_WARN,
DEBUG ((DEBUG_WARN,
"%a: failed to enable 64-bit DMA on 64-bit capable controller @ %p (%r)\n",
__FUNCTION__, Controller, Status));
}
@@ -1868,7 +1868,7 @@ EhcDriverBindingStart (
);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EhcDriverBindingStart: failed to install USB2_HC Protocol\n"));
DEBUG ((DEBUG_ERROR, "EhcDriverBindingStart: failed to install USB2_HC Protocol\n"));
goto FREE_POOL;
}
@@ -1887,7 +1887,7 @@ EhcDriverBindingStart (
Status = EhcInitHC (Ehc);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EhcDriverBindingStart: failed to init host controller\n"));
DEBUG ((DEBUG_ERROR, "EhcDriverBindingStart: failed to init host controller\n"));
goto UNINSTALL_USBHC;
}
@@ -1897,7 +1897,7 @@ EhcDriverBindingStart (
Status = gBS->SetTimer (Ehc->PollTimer, TimerPeriodic, EHC_ASYNC_POLL_INTERVAL);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EhcDriverBindingStart: failed to start async interrupt monitor\n"));
DEBUG ((DEBUG_ERROR, "EhcDriverBindingStart: failed to start async interrupt monitor\n"));
EhcHaltHC (Ehc, EHC_GENERIC_TIMEOUT);
goto UNINSTALL_USBHC;
@@ -1938,7 +1938,7 @@ EhcDriverBindingStart (
);
DEBUG ((EFI_D_INFO, "EhcDriverBindingStart: EHCI started for controller @ %p\n", Controller));
DEBUG ((DEBUG_INFO, "EhcDriverBindingStart: EHCI started for controller @ %p\n", Controller));
return EFI_SUCCESS;
UNINSTALL_USBHC:
@@ -2083,4 +2083,3 @@ EhcDriverBindingStop (
return EFI_SUCCESS;
}

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"));
}

14
MdeModulePkg/Bus/Pci/EhciDxe/EhciReg.c
View File

@@ -40,7 +40,7 @@ EhcReadCapRegister (
);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EhcReadCapRegister: Pci Io read error - %r at %d\n", Status, Offset));
DEBUG ((DEBUG_ERROR, "EhcReadCapRegister: Pci Io read error - %r at %d\n", Status, Offset));
Data = 0xFFFF;
}
@@ -76,7 +76,7 @@ EhcReadDbgRegister (
);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EhcReadDbgRegister: Pci Io read error - %r at %d\n", Status, Offset));
DEBUG ((DEBUG_ERROR, "EhcReadDbgRegister: Pci Io read error - %r at %d\n", Status, Offset));
Data = 0xFFFF;
}
@@ -168,7 +168,7 @@ EhcReadOpReg (
);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EhcReadOpReg: Pci Io Read error - %r at %d\n", Status, Offset));
DEBUG ((DEBUG_ERROR, "EhcReadOpReg: Pci Io Read error - %r at %d\n", Status, Offset));
Data = 0xFFFF;
}
@@ -205,7 +205,7 @@ EhcWriteOpReg (
);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EhcWriteOpReg: Pci Io Write error: %r at %d\n", Status, Offset));
DEBUG ((DEBUG_ERROR, "EhcWriteOpReg: Pci Io Write error: %r at %d\n", Status, Offset));
}
}
@@ -310,7 +310,7 @@ EhcClearLegacySupport (
UINT32 Value;
UINT32 TimeOut;
DEBUG ((EFI_D_INFO, "EhcClearLegacySupport: called to clear legacy support\n"));
DEBUG ((DEBUG_INFO, "EhcClearLegacySupport: called to clear legacy support\n"));
PciIo = Ehc->PciIo;
ExtendCap = (Ehc->HcCapParams >> 8) & 0xFF;
@@ -654,14 +654,14 @@ EhcInitHC (
Status = EhcEnablePeriodSchd (Ehc, EHC_GENERIC_TIMEOUT);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EhcInitHC: failed to enable period schedule\n"));
DEBUG ((DEBUG_ERROR, "EhcInitHC: failed to enable period schedule\n"));
return Status;
}
Status = EhcEnableAsyncSchd (Ehc, EHC_GENERIC_TIMEOUT);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EhcInitHC: failed to enable async schedule\n"));
DEBUG ((DEBUG_ERROR, "EhcInitHC: failed to enable async schedule\n"));
return Status;
}

12
MdeModulePkg/Bus/Pci/EhciDxe/EhciSched.c
View File

@@ -377,7 +377,7 @@ EhcUnlinkQhFromAsync (
Status = EhcSetAndWaitDoorBell (Ehc, EHC_GENERIC_TIMEOUT);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EhcUnlinkQhFromAsync: Failed to synchronize with doorbell\n"));
DEBUG ((DEBUG_ERROR, "EhcUnlinkQhFromAsync: Failed to synchronize with doorbell\n"));
}
}
@@ -636,13 +636,13 @@ EhcCheckUrbResult (
//
PciAddr = UsbHcGetPciAddressForHostMem (Ehc->MemPool, Ehc->ShortReadStop, sizeof (EHC_QTD));
if (QtdHw->AltNext == QTD_LINK (PciAddr, FALSE)) {
DEBUG ((EFI_D_VERBOSE, "EhcCheckUrbResult: Short packet read, break\n"));
DEBUG ((DEBUG_VERBOSE, "EhcCheckUrbResult: Short packet read, break\n"));
Finished = TRUE;
goto ON_EXIT;
}
DEBUG ((EFI_D_VERBOSE, "EhcCheckUrbResult: Short packet read, continue\n"));
DEBUG ((DEBUG_VERBOSE, "EhcCheckUrbResult: Short packet read, continue\n"));
}
}
}
@@ -713,13 +713,13 @@ EhcExecTransfer (
}
if (!Finished) {
DEBUG ((EFI_D_ERROR, "EhcExecTransfer: transfer not finished in %dms\n", (UINT32)TimeOut));
DEBUG ((DEBUG_ERROR, "EhcExecTransfer: transfer not finished in %dms\n", (UINT32)TimeOut));
EhcDumpQh (Urb->Qh, NULL, FALSE);
Status = EFI_TIMEOUT;
} else if (Urb->Result != EFI_USB_NOERROR) {
DEBUG ((EFI_D_ERROR, "EhcExecTransfer: transfer failed with %x\n", Urb->Result));
DEBUG ((DEBUG_ERROR, "EhcExecTransfer: transfer failed with %x\n", Urb->Result));
EhcDumpQh (Urb->Qh, NULL, FALSE);
Status = EFI_DEVICE_ERROR;
@@ -1069,7 +1069,7 @@ EhcMonitorAsyncRequests (
//
Status = EhcFlushAsyncIntMap (Ehc, Urb);
if (EFI_ERROR (Status)) {
DEBUG ((EFI_D_ERROR, "EhcMonitorAsyncRequests: Fail to Flush AsyncInt Mapped Memeory\n"));
DEBUG ((DEBUG_ERROR, "EhcMonitorAsyncRequests: Fail to Flush AsyncInt Mapped Memeory\n"));
}
//

2
MdeModulePkg/Bus/Pci/EhciDxe/UsbHcMem.c
View File

@@ -470,7 +470,7 @@ UsbHcAllocateMem (
NewBlock = UsbHcAllocMemBlock (Pool, Pages);
if (NewBlock == NULL) {
DEBUG ((EFI_D_ERROR, "UsbHcAllocateMem: failed to allocate block\n"));
DEBUG ((DEBUG_ERROR, "UsbHcAllocateMem: failed to allocate block\n"));
return NULL;
}