diff options
Diffstat (limited to 'OvmfPkg/Csm')
-rw-r--r-- | OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c | 16 | ||||
-rw-r--r-- | OvmfPkg/Csm/CsmSupportLib/LegacyInterrupt.c | 2 | ||||
-rw-r--r-- | OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c | 2 | ||||
-rw-r--r-- | OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c | 2 | ||||
-rw-r--r-- | OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c | 18 | ||||
-rw-r--r-- | OvmfPkg/Csm/LegacyBiosDxe/LegacyBootSupport.c | 80 | ||||
-rw-r--r-- | OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c | 62 | ||||
-rw-r--r-- | OvmfPkg/Csm/LegacyBiosDxe/LegacySio.c | 2 | ||||
-rw-r--r-- | OvmfPkg/Csm/LegacyBiosDxe/Thunk.c | 2 | ||||
-rw-r--r-- | OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.c | 2 | ||||
-rw-r--r-- | OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c | 6 |
11 files changed, 97 insertions, 97 deletions
diff --git a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c b/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c index 0a189bc592..5a52298983 100644 --- a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c +++ b/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c @@ -711,7 +711,7 @@ BiosVideoChildHandleInstall ( //
if (FeaturePcdGet (PcdBiosVideoCheckVbeEnable)) {
Status = BiosVideoCheckForVbe (BiosVideoPrivate);
- DEBUG ((EFI_D_INFO, "BiosVideoCheckForVbe - %r\n", Status));
+ DEBUG ((DEBUG_INFO, "BiosVideoCheckForVbe - %r\n", Status));
} else {
Status = EFI_UNSUPPORTED;
}
@@ -720,11 +720,11 @@ BiosVideoChildHandleInstall ( // The VESA BIOS Extensions are not compatible with Graphics Output, so check for support
// for the standard 640x480 16 color VGA mode
//
- DEBUG ((EFI_D_INFO, "VgaCompatible - %x\n", BiosVideoPrivate->VgaCompatible));
+ DEBUG ((DEBUG_INFO, "VgaCompatible - %x\n", BiosVideoPrivate->VgaCompatible));
if (BiosVideoPrivate->VgaCompatible) {
if (FeaturePcdGet (PcdBiosVideoCheckVgaEnable)) {
Status = BiosVideoCheckForVga (BiosVideoPrivate);
- DEBUG ((EFI_D_INFO, "BiosVideoCheckForVga - %r\n", Status));
+ DEBUG ((DEBUG_INFO, "BiosVideoCheckForVga - %r\n", Status));
} else {
Status = EFI_UNSUPPORTED;
}
@@ -1122,7 +1122,7 @@ ParseEdidData ( ((EdidDataBlock->EstablishedTimings[2] & 0x80) << 9) ;
for (Index = 0; Index < VESA_BIOS_EXTENSIONS_EDID_ESTABLISHED_TIMING_MAX_NUMBER; Index ++) {
if ((TimingBits & 0x1) != 0) {
- DEBUG ((EFI_D_INFO, "Established Timing: %d x %d\n",
+ DEBUG ((DEBUG_INFO, "Established Timing: %d x %d\n",
mEstablishedEdidTiming[Index].HorizontalResolution, mEstablishedEdidTiming[Index].VerticalResolution));
ValidEdidTiming->Key[ValidNumber] = CalculateEdidKey (&mEstablishedEdidTiming[Index]);
ValidNumber ++;
@@ -1164,7 +1164,7 @@ ParseEdidData ( break;
}
RefreshRate = (UINT8) ((BufferIndex[1] & 0x1f) + 60);
- DEBUG ((EFI_D_INFO, "Standard Timing: %d x %d\n", HorizontalResolution, VerticalResolution));
+ DEBUG ((DEBUG_INFO, "Standard Timing: %d x %d\n", HorizontalResolution, VerticalResolution));
TempTiming.HorizontalResolution = HorizontalResolution;
TempTiming.VerticalResolution = VerticalResolution;
TempTiming.RefreshRate = RefreshRate;
@@ -1191,7 +1191,7 @@ ParseEdidData ( //
TempTiming.HorizontalResolution = ((UINT16)(BufferIndex[4] & 0xF0) << 4) | (BufferIndex[2]);
TempTiming.VerticalResolution = ((UINT16)(BufferIndex[7] & 0xF0) << 4) | (BufferIndex[5]);
- DEBUG ((EFI_D_INFO, "Detailed Timing %d: %d x %d\n",
+ DEBUG ((DEBUG_INFO, "Detailed Timing %d: %d x %d\n",
Index, TempTiming.HorizontalResolution, TempTiming.VerticalResolution));
ValidEdidTiming->Key[ValidNumber] = CalculateEdidKey (&TempTiming);
ValidNumber ++;
@@ -1572,7 +1572,7 @@ BiosVideoCheckForVbe ( continue;
}
- DEBUG ((EFI_D_INFO, "Video Controller Mode 0x%x: %d x %d\n",
+ DEBUG ((DEBUG_INFO, "Video Controller Mode 0x%x: %d x %d\n",
VbeModeNumber, BiosVideoPrivate->VbeModeInformationBlock->XResolution, BiosVideoPrivate->VbeModeInformationBlock->YResolution));
if (EdidFound && (ValidEdidTiming.ValidNumber > 0)) {
@@ -1737,7 +1737,7 @@ BiosVideoCheckForVbe ( DEBUG_CODE (
BIOS_VIDEO_MODE_DATA *ModeData;
ModeData = &BiosVideoPrivate->ModeData[HighestResolutionMode];
- DEBUG ((EFI_D_INFO, "BiosVideo set highest resolution %d x %d\n",
+ DEBUG ((DEBUG_INFO, "BiosVideo set highest resolution %d x %d\n",
ModeData->HorizontalResolution, ModeData->VerticalResolution));
);
PreferMode = HighestResolutionMode;
diff --git a/OvmfPkg/Csm/CsmSupportLib/LegacyInterrupt.c b/OvmfPkg/Csm/CsmSupportLib/LegacyInterrupt.c index 2928e26329..97ca21945f 100644 --- a/OvmfPkg/Csm/CsmSupportLib/LegacyInterrupt.c +++ b/OvmfPkg/Csm/CsmSupportLib/LegacyInterrupt.c @@ -192,7 +192,7 @@ LegacyInterruptInstall ( mLegacyInterruptDevice = LEGACY_INT_DEV_Q35;
break;
default:
- DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",
+ DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",
__FUNCTION__, HostBridgeDevId));
ASSERT (FALSE);
return EFI_UNSUPPORTED;
diff --git a/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c b/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c index 9c60c4a4cf..96f9934b20 100644 --- a/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c +++ b/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c @@ -309,7 +309,7 @@ GetSelectedVgaDeviceInfo ( if (!IS_PCI_VGA (&Pci)) {
continue;
}
- DEBUG ((EFI_D_INFO,
+ DEBUG ((DEBUG_INFO,
"PCI VGA: 0x%04x:0x%04x\n",
Pci.Hdr.VendorId,
Pci.Hdr.DeviceId
diff --git a/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c b/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c index 73276dc228..fe9ae27c9d 100644 --- a/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c +++ b/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c @@ -477,7 +477,7 @@ LegacyRegionInit ( mRegisterValues = mRegisterValuesQ35;
break;
default:
- DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",
+ DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",
__FUNCTION__, HostBridgeDevId));
ASSERT (FALSE);
return RETURN_UNSUPPORTED;
diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c index dd3608a64e..3ce19496b0 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c @@ -364,7 +364,7 @@ ShadowAndStartLegacy16 ( }
if (Table == NULL) {
- DEBUG ((EFI_D_ERROR, "No Legacy16 table found\n"));
+ DEBUG ((DEBUG_ERROR, "No Legacy16 table found\n"));
return EFI_NOT_FOUND;
}
@@ -372,7 +372,7 @@ ShadowAndStartLegacy16 ( //
// Legacy16 table header checksum error.
//
- DEBUG ((EFI_D_ERROR, "Legacy16 table found with bad talbe header checksum\n"));
+ DEBUG ((DEBUG_ERROR, "Legacy16 table found with bad talbe header checksum\n"));
}
//
@@ -483,7 +483,7 @@ ShadowAndStartLegacy16 ( Table->E820Pointer = (UINT32) (Regs.X.DS * 16 + Regs.X.BX);
Table->E820Length = (UINT32) E820Size;
if (Regs.X.AX != 0) {
- DEBUG ((EFI_D_ERROR, "Legacy16 E820 length insufficient\n"));
+ DEBUG ((DEBUG_ERROR, "Legacy16 E820 length insufficient\n"));
} else {
TempData = Table->E820Pointer;
CopyMem ((VOID *) TempData, Private->E820Table, E820Size);
@@ -543,7 +543,7 @@ ShadowAndStartLegacy16 ( TpmPointer = (UINT32) (Regs.X.DS * 16 + Regs.X.BX);
if (Regs.X.AX != 0) {
- DEBUG ((EFI_D_ERROR, "TPM cannot be loaded\n"));
+ DEBUG ((DEBUG_ERROR, "TPM cannot be loaded\n"));
} else {
CopyMem ((VOID *) (UINTN)TpmPointer, TpmBinaryImage, TpmBinaryImageSize);
Table->TpmSegment = Regs.X.DS;
@@ -738,7 +738,7 @@ InstallSmbiosEventCallback ( mReserveSmbiosEntryPoint = 0;
return;
}
- DEBUG ((EFI_D_INFO, "Allocate memory for Smbios Entry Point Structure\n"));
+ DEBUG ((DEBUG_INFO, "Allocate memory for Smbios Entry Point Structure\n"));
}
if ((mStructureTableAddress != 0) &&
@@ -749,7 +749,7 @@ InstallSmbiosEventCallback ( gBS->FreePages (mStructureTableAddress, mStructureTablePages);
mStructureTableAddress = 0;
mStructureTablePages = 0;
- DEBUG ((EFI_D_INFO, "Original size is not enough. Re-allocate the memory.\n"));
+ DEBUG ((DEBUG_INFO, "Original size is not enough. Re-allocate the memory.\n"));
}
if (mStructureTableAddress == 0) {
@@ -775,7 +775,7 @@ InstallSmbiosEventCallback ( mStructureTablePages = 0;
return;
}
- DEBUG ((EFI_D_INFO, "Allocate memory for Smbios Structure Table\n"));
+ DEBUG ((DEBUG_INFO, "Allocate memory for Smbios Structure Table\n"));
}
}
@@ -1051,7 +1051,7 @@ LegacyBiosInstall ( MemoryPtr = (VOID *) ((UINTN) StartAddress);
ZeroMem (MemoryPtr, 0x1000);
} else {
- DEBUG ((EFI_D_ERROR, "WARNING: Allocate legacy memory fail for SCSI card - %x\n", MemStart));
+ DEBUG ((DEBUG_ERROR, "WARNING: Allocate legacy memory fail for SCSI card - %x\n", MemStart));
}
}
@@ -1206,7 +1206,7 @@ LegacyBiosInstall ( );
Private->Csm16PciInterfaceVersion = GetPciInterfaceVersion (Private);
- DEBUG ((EFI_D_INFO, "CSM16 PCI BIOS Interface Version: %02x.%02x\n",
+ DEBUG ((DEBUG_INFO, "CSM16 PCI BIOS Interface Version: %02x.%02x\n",
(UINT8) (Private->Csm16PciInterfaceVersion >> 8),
(UINT8) Private->Csm16PciInterfaceVersion
));
diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBootSupport.c b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBootSupport.c index 20784504d5..9a09d72307 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBootSupport.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBootSupport.c @@ -46,9 +46,9 @@ PrintBbsTable ( UINT16 SubIndex;
CHAR8 *String;
- DEBUG ((EFI_D_INFO, "\n"));
- DEBUG ((EFI_D_INFO, " NO Prio bb/dd/ff cl/sc Type Stat segm:offs mfgs:mfgo dess:deso\n"));
- DEBUG ((EFI_D_INFO, "=================================================================\n"));
+ DEBUG ((DEBUG_INFO, "\n"));
+ DEBUG ((DEBUG_INFO, " NO Prio bb/dd/ff cl/sc Type Stat segm:offs mfgs:mfgo dess:deso\n"));
+ DEBUG ((DEBUG_INFO, "=================================================================\n"));
for (Index = 0; Index < MAX_BBS_ENTRIES; Index++) {
//
// Filter
@@ -58,7 +58,7 @@ PrintBbsTable ( }
DEBUG ((
- EFI_D_INFO,
+ DEBUG_INFO,
" %02x: %04x %02x/%02x/%02x %02x/%02x %04x %04x",
(UINTN) Index,
(UINTN) BbsTable[Index].BootPriority,
@@ -71,7 +71,7 @@ PrintBbsTable ( (UINTN) * (UINT16 *) &BbsTable[Index].StatusFlags
));
DEBUG ((
- EFI_D_INFO,
+ DEBUG_INFO,
" %04x:%04x %04x:%04x %04x:%04x",
(UINTN) BbsTable[Index].BootHandlerSegment,
(UINTN) BbsTable[Index].BootHandlerOffset,
@@ -86,16 +86,16 @@ PrintBbsTable ( //
String = (CHAR8 *)(((UINTN)BbsTable[Index].DescStringSegment << 4) + BbsTable[Index].DescStringOffset);
if (String != NULL) {
- DEBUG ((EFI_D_INFO," ("));
+ DEBUG ((DEBUG_INFO," ("));
for (SubIndex = 0; String[SubIndex] != 0; SubIndex++) {
- DEBUG ((EFI_D_INFO, "%c", String[SubIndex]));
+ DEBUG ((DEBUG_INFO, "%c", String[SubIndex]));
}
- DEBUG ((EFI_D_INFO,")"));
+ DEBUG ((DEBUG_INFO,")"));
}
- DEBUG ((EFI_D_INFO,"\n"));
+ DEBUG ((DEBUG_INFO,"\n"));
}
- DEBUG ((EFI_D_INFO, "\n"));
+ DEBUG ((DEBUG_INFO, "\n"));
return ;
}
@@ -114,20 +114,20 @@ PrintHddInfo ( {
UINTN Index;
- DEBUG ((EFI_D_INFO, "\n"));
+ DEBUG ((DEBUG_INFO, "\n"));
for (Index = 0; Index < MAX_IDE_CONTROLLER; Index++) {
- DEBUG ((EFI_D_INFO, "Index - %04x\n", Index));
- DEBUG ((EFI_D_INFO, " Status - %04x\n", (UINTN)HddInfo[Index].Status));
- DEBUG ((EFI_D_INFO, " B/D/F - %02x/%02x/%02x\n", (UINTN)HddInfo[Index].Bus, (UINTN)HddInfo[Index].Device, (UINTN)HddInfo[Index].Function));
- DEBUG ((EFI_D_INFO, " Command - %04x\n", HddInfo[Index].CommandBaseAddress));
- DEBUG ((EFI_D_INFO, " Control - %04x\n", HddInfo[Index].ControlBaseAddress));
- DEBUG ((EFI_D_INFO, " BusMaster - %04x\n", HddInfo[Index].BusMasterAddress));
- DEBUG ((EFI_D_INFO, " HddIrq - %02x\n", HddInfo[Index].HddIrq));
- DEBUG ((EFI_D_INFO, " IdentifyDrive[0].Raw[0] - %x\n", HddInfo[Index].IdentifyDrive[0].Raw[0]));
- DEBUG ((EFI_D_INFO, " IdentifyDrive[1].Raw[0] - %x\n", HddInfo[Index].IdentifyDrive[1].Raw[0]));
+ DEBUG ((DEBUG_INFO, "Index - %04x\n", Index));
+ DEBUG ((DEBUG_INFO, " Status - %04x\n", (UINTN)HddInfo[Index].Status));
+ DEBUG ((DEBUG_INFO, " B/D/F - %02x/%02x/%02x\n", (UINTN)HddInfo[Index].Bus, (UINTN)HddInfo[Index].Device, (UINTN)HddInfo[Index].Function));
+ DEBUG ((DEBUG_INFO, " Command - %04x\n", HddInfo[Index].CommandBaseAddress));
+ DEBUG ((DEBUG_INFO, " Control - %04x\n", HddInfo[Index].ControlBaseAddress));
+ DEBUG ((DEBUG_INFO, " BusMaster - %04x\n", HddInfo[Index].BusMasterAddress));
+ DEBUG ((DEBUG_INFO, " HddIrq - %02x\n", HddInfo[Index].HddIrq));
+ DEBUG ((DEBUG_INFO, " IdentifyDrive[0].Raw[0] - %x\n", HddInfo[Index].IdentifyDrive[0].Raw[0]));
+ DEBUG ((DEBUG_INFO, " IdentifyDrive[1].Raw[0] - %x\n", HddInfo[Index].IdentifyDrive[1].Raw[0]));
}
- DEBUG ((EFI_D_INFO, "\n"));
+ DEBUG ((DEBUG_INFO, "\n"));
return ;
}
@@ -163,9 +163,9 @@ PrintPciInterruptRegister ( Device = 0;
Function = 0;
- DEBUG ((EFI_D_INFO, "\n"));
- DEBUG ((EFI_D_INFO, " bb/dd/ff interrupt line interrupt pin\n"));
- DEBUG ((EFI_D_INFO, "======================================\n"));
+ DEBUG ((DEBUG_INFO, "\n"));
+ DEBUG ((DEBUG_INFO, " bb/dd/ff interrupt line interrupt pin\n"));
+ DEBUG ((DEBUG_INFO, "======================================\n"));
for (Index = 0; Index < HandleNum; Index++) {
Status = gBS->HandleProtocol (Handles[Index], &gEfiPciIoProtocolGuid, (VOID **) &PciIo);
if (!EFI_ERROR (Status)) {
@@ -187,11 +187,11 @@ PrintPciInterruptRegister ( );
}
if (!EFI_ERROR (Status)) {
- DEBUG ((EFI_D_INFO, " %02x/%02x/%02x 0x%02x 0x%02x\n",
+ DEBUG ((DEBUG_INFO, " %02x/%02x/%02x 0x%02x 0x%02x\n",
Bus, Device, Function, Interrupt[0], Interrupt[1]));
}
}
- DEBUG ((EFI_D_INFO, "\n"));
+ DEBUG ((DEBUG_INFO, "\n"));
if (Handles != NULL) {
FreePool (Handles);
@@ -667,8 +667,8 @@ LegacyGetDataOrTable ( 0,
0
);
- DEBUG ((EFI_D_INFO, "LegacyGetDataOrTable - ID: %x, %r\n", (UINTN)Id, Status));
- DEBUG ((EFI_D_INFO, " Table - %x, Size - %x, Location - %x, Alignment - %x\n", (UINTN)Table, (UINTN)TableSize, (UINTN)Location, (UINTN)Alignment));
+ DEBUG ((DEBUG_INFO, "LegacyGetDataOrTable - ID: %x, %r\n", (UINTN)Id, Status));
+ DEBUG ((DEBUG_INFO, " Table - %x, Size - %x, Location - %x, Alignment - %x\n", (UINTN)Table, (UINTN)TableSize, (UINTN)Location, (UINTN)Alignment));
break;
}
@@ -697,7 +697,7 @@ LegacyGetDataOrTable ( );
if (Regs.X.AX != 0) {
- DEBUG ((EFI_D_ERROR, "Table ID %x length insufficient\n", Id));
+ DEBUG ((DEBUG_ERROR, "Table ID %x length insufficient\n", Id));
return EFI_OUT_OF_RESOURCES;
} else {
break;
@@ -721,7 +721,7 @@ LegacyGetDataOrTable ( {
Legacy16Table->MpTablePtr = (UINT32) (Regs.X.DS * 16 + Regs.X.BX);
Legacy16Table->MpTableLength = (UINT32)TableSize;
- DEBUG ((EFI_D_INFO, "MP table in legacy region - %x\n", (UINTN)Legacy16Table->MpTablePtr));
+ DEBUG ((DEBUG_INFO, "MP table in legacy region - %x\n", (UINTN)Legacy16Table->MpTablePtr));
break;
}
@@ -730,7 +730,7 @@ LegacyGetDataOrTable ( Legacy16Table->OemIntSegment = Regs.X.DS;
Legacy16Table->OemIntOffset = Regs.X.BX;
- DEBUG ((EFI_D_INFO, "OemInt table in legacy region - %04x:%04x\n", (UINTN)Legacy16Table->OemIntSegment, (UINTN)Legacy16Table->OemIntOffset));
+ DEBUG ((DEBUG_INFO, "OemInt table in legacy region - %04x:%04x\n", (UINTN)Legacy16Table->OemIntSegment, (UINTN)Legacy16Table->OemIntOffset));
break;
}
@@ -738,7 +738,7 @@ LegacyGetDataOrTable ( {
Legacy16Table->Oem32Segment = Regs.X.DS;
Legacy16Table->Oem32Offset = Regs.X.BX;
- DEBUG ((EFI_D_INFO, "Oem32 table in legacy region - %04x:%04x\n", (UINTN)Legacy16Table->Oem32Segment, (UINTN)Legacy16Table->Oem32Offset));
+ DEBUG ((DEBUG_INFO, "Oem32 table in legacy region - %04x:%04x\n", (UINTN)Legacy16Table->Oem32Segment, (UINTN)Legacy16Table->Oem32Offset));
break;
}
@@ -747,7 +747,7 @@ LegacyGetDataOrTable ( //
// Legacy16Table->Oem16Segment = Regs.X.DS;
// Legacy16Table->Oem16Offset = Regs.X.BX;
- DEBUG ((EFI_D_INFO, "Oem16 table in legacy region - %04x:%04x\n", (UINTN)Legacy16Table->Oem16Segment, (UINTN)Legacy16Table->Oem16Offset));
+ DEBUG ((DEBUG_INFO, "Oem16 table in legacy region - %04x:%04x\n", (UINTN)Legacy16Table->Oem16Segment, (UINTN)Legacy16Table->Oem16Offset));
break;
}
@@ -880,7 +880,7 @@ GenericLegacyBoot ( Private = LEGACY_BIOS_INSTANCE_FROM_THIS (This);
DEBUG_CODE (
- DEBUG ((EFI_D_ERROR, "Start of legacy boot\n"));
+ DEBUG ((DEBUG_ERROR, "Start of legacy boot\n"));
);
Legacy16Table = Private->Legacy16Table;
@@ -943,7 +943,7 @@ GenericLegacyBoot ( Private->Legacy16Table->E820Pointer = (UINT32) (Regs.X.DS * 16 + Regs.X.BX);
Private->Legacy16Table->E820Length = (UINT32) CopySize;
if (Regs.X.AX != 0) {
- DEBUG ((EFI_D_ERROR, "Legacy16 E820 length insufficient\n"));
+ DEBUG ((DEBUG_ERROR, "Legacy16 E820 length insufficient\n"));
return EFI_OUT_OF_RESOURCES;
} else {
CopyMem (
@@ -965,7 +965,7 @@ GenericLegacyBoot ( // We do not ASSERT if SmbiosTable not found. It is possible that a platform does not produce SmbiosTable.
//
if (mReserveSmbiosEntryPoint == 0) {
- DEBUG ((EFI_D_INFO, "Smbios table is not found!\n"));
+ DEBUG ((DEBUG_INFO, "Smbios table is not found!\n"));
}
CreateSmbiosTableInReservedMemory ();
EfiToLegacy16BootTable->SmbiosTable = (UINT32)(UINTN)mReserveSmbiosEntryPoint;
@@ -985,7 +985,7 @@ GenericLegacyBoot ( // We do not ASSERT if AcpiTable not found. It is possible that a platform does not produce AcpiTable.
//
if (AcpiTable == NULL) {
- DEBUG ((EFI_D_INFO, "ACPI table is not found!\n"));
+ DEBUG ((DEBUG_INFO, "ACPI table is not found!\n"));
}
EfiToLegacy16BootTable->AcpiTable = (UINT32)(UINTN)AcpiTable;
@@ -1245,7 +1245,7 @@ GenericLegacyBoot ( // Here we could reduce UmaAddress down as far as Private->OptionRom, taking into
// account the granularity of the access control.
//
- DEBUG((EFI_D_INFO, "Unlocking UMB RAM region 0x%x-0x%x\n", Private->Legacy16Table->UmaAddress,
+ DEBUG((DEBUG_INFO, "Unlocking UMB RAM region 0x%x-0x%x\n", Private->Legacy16Table->UmaAddress,
Private->Legacy16Table->UmaAddress + Private->Legacy16Table->UmaSize));
Private->LegacyRegion->UnLock (
@@ -1285,7 +1285,7 @@ GenericLegacyBoot ( (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_LEGACY_BOOT_EVENT)
);
- DEBUG ((EFI_D_INFO, "Legacy INT19 Boot...\n"));
+ DEBUG ((DEBUG_INFO, "Legacy INT19 Boot...\n"));
//
// Disable DXE Timer while executing in real mode
@@ -1944,7 +1944,7 @@ LegacyBiosBuildE820 ( // Print DEBUG information
//
for (TempIndex = 0; TempIndex < Index; TempIndex++) {
- DEBUG((EFI_D_INFO, "E820[%2d]: 0x%016lx - 0x%016lx, Type = %d\n",
+ DEBUG((DEBUG_INFO, "E820[%2d]: 0x%016lx - 0x%016lx, Type = %d\n",
TempIndex,
E820Table[TempIndex].BaseAddr,
(E820Table[TempIndex].BaseAddr + E820Table[TempIndex].Length),
diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c index 2656dafde9..746b366448 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c @@ -374,7 +374,7 @@ GetPciLegacyRom ( }
}
} else {
- DEBUG ((EFI_D_ERROR, "GetPciLegacyRom - OpRom not match (%04x-%04x)\n", (UINTN)VendorId, (UINTN)DeviceId));
+ DEBUG ((DEBUG_ERROR, "GetPciLegacyRom - OpRom not match (%04x-%04x)\n", (UINTN)VendorId, (UINTN)DeviceId));
}
}
@@ -752,7 +752,7 @@ Rotate (B,C,D,A) by 1 giving C,D,A,B. Translated PIRQ is C. // In case we fail to find the Bridge just above us, this is some potential error and we want to warn the user
//
if(BridgeIndex >= NumberOfBridges){
- DEBUG ((EFI_D_ERROR, "Cannot Find IRQ Routing for Bus %d, Device %d, Function %d\n", *PciBus, *PciDevice, *PciFunction));
+ DEBUG ((DEBUG_ERROR, "Cannot Find IRQ Routing for Bus %d, Device %d, Function %d\n", *PciBus, *PciDevice, *PciFunction));
}
*PirqIndex = LocalPirqIndex;
@@ -823,9 +823,9 @@ CopyPirqTable ( Private->Legacy16Table->IrqRoutingTablePointer = (UINT32) (Regs.X.DS * 16 + Regs.X.BX);
if (Regs.X.AX != 0) {
- DEBUG ((EFI_D_ERROR, "PIRQ table length insufficient - %x\n", PirqTableSize));
+ DEBUG ((DEBUG_ERROR, "PIRQ table length insufficient - %x\n", PirqTableSize));
} else {
- DEBUG ((EFI_D_INFO, "PIRQ table in legacy region - %x\n", Private->Legacy16Table->IrqRoutingTablePointer));
+ DEBUG ((DEBUG_INFO, "PIRQ table in legacy region - %x\n", Private->Legacy16Table->IrqRoutingTablePointer));
Private->Legacy16Table->IrqRoutingTableLength = (UINT32)PirqTableSize;
CopyMem (
(VOID *) (UINTN)Private->Legacy16Table->IrqRoutingTablePointer,
@@ -858,24 +858,24 @@ DumpPciHandle ( IN EFI_LEGACY_INSTALL_PCI_HANDLER *PciHandle
)
{
- DEBUG ((EFI_D_INFO, "PciBus - %02x\n", (UINTN)PciHandle->PciBus));
- DEBUG ((EFI_D_INFO, "PciDeviceFun - %02x\n", (UINTN)PciHandle->PciDeviceFun));
- DEBUG ((EFI_D_INFO, "PciSegment - %02x\n", (UINTN)PciHandle->PciSegment));
- DEBUG ((EFI_D_INFO, "PciClass - %02x\n", (UINTN)PciHandle->PciClass));
- DEBUG ((EFI_D_INFO, "PciSubclass - %02x\n", (UINTN)PciHandle->PciSubclass));
- DEBUG ((EFI_D_INFO, "PciInterface - %02x\n", (UINTN)PciHandle->PciInterface));
-
- DEBUG ((EFI_D_INFO, "PrimaryIrq - %02x\n", (UINTN)PciHandle->PrimaryIrq));
- DEBUG ((EFI_D_INFO, "PrimaryReserved - %02x\n", (UINTN)PciHandle->PrimaryReserved));
- DEBUG ((EFI_D_INFO, "PrimaryControl - %04x\n", (UINTN)PciHandle->PrimaryControl));
- DEBUG ((EFI_D_INFO, "PrimaryBase - %04x\n", (UINTN)PciHandle->PrimaryBase));
- DEBUG ((EFI_D_INFO, "PrimaryBusMaster - %04x\n", (UINTN)PciHandle->PrimaryBusMaster));
-
- DEBUG ((EFI_D_INFO, "SecondaryIrq - %02x\n", (UINTN)PciHandle->SecondaryIrq));
- DEBUG ((EFI_D_INFO, "SecondaryReserved - %02x\n", (UINTN)PciHandle->SecondaryReserved));
- DEBUG ((EFI_D_INFO, "SecondaryControl - %04x\n", (UINTN)PciHandle->SecondaryControl));
- DEBUG ((EFI_D_INFO, "SecondaryBase - %04x\n", (UINTN)PciHandle->SecondaryBase));
- DEBUG ((EFI_D_INFO, "SecondaryBusMaster - %04x\n", (UINTN)PciHandle->SecondaryBusMaster));
+ DEBUG ((DEBUG_INFO, "PciBus - %02x\n", (UINTN)PciHandle->PciBus));
+ DEBUG ((DEBUG_INFO, "PciDeviceFun - %02x\n", (UINTN)PciHandle->PciDeviceFun));
+ DEBUG ((DEBUG_INFO, "PciSegment - %02x\n", (UINTN)PciHandle->PciSegment));
+ DEBUG ((DEBUG_INFO, "PciClass - %02x\n", (UINTN)PciHandle->PciClass));
+ DEBUG ((DEBUG_INFO, "PciSubclass - %02x\n", (UINTN)PciHandle->PciSubclass));
+ DEBUG ((DEBUG_INFO, "PciInterface - %02x\n", (UINTN)PciHandle->PciInterface));
+
+ DEBUG ((DEBUG_INFO, "PrimaryIrq - %02x\n", (UINTN)PciHandle->PrimaryIrq));
+ DEBUG ((DEBUG_INFO, "PrimaryReserved - %02x\n", (UINTN)PciHandle->PrimaryReserved));
+ DEBUG ((DEBUG_INFO, "PrimaryControl - %04x\n", (UINTN)PciHandle->PrimaryControl));
+ DEBUG ((DEBUG_INFO, "PrimaryBase - %04x\n", (UINTN)PciHandle->PrimaryBase));
+ DEBUG ((DEBUG_INFO, "PrimaryBusMaster - %04x\n", (UINTN)PciHandle->PrimaryBusMaster));
+
+ DEBUG ((DEBUG_INFO, "SecondaryIrq - %02x\n", (UINTN)PciHandle->SecondaryIrq));
+ DEBUG ((DEBUG_INFO, "SecondaryReserved - %02x\n", (UINTN)PciHandle->SecondaryReserved));
+ DEBUG ((DEBUG_INFO, "SecondaryControl - %04x\n", (UINTN)PciHandle->SecondaryControl));
+ DEBUG ((DEBUG_INFO, "SecondaryBase - %04x\n", (UINTN)PciHandle->SecondaryBase));
+ DEBUG ((DEBUG_INFO, "SecondaryBusMaster - %04x\n", (UINTN)PciHandle->SecondaryBusMaster));
return;
}
@@ -1254,7 +1254,7 @@ PciProgramAllInterruptLineRegisters ( // If it does return failure status, check your PIRQ routing table to see if some item is missing or incorrect
//
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "Translate Pirq Failed - Status = %r\n ", Status));
+ DEBUG ((DEBUG_ERROR, "Translate Pirq Failed - Status = %r\n ", Status));
continue;
}
@@ -2110,7 +2110,7 @@ LegacyBiosInstallVgaRom ( // This should be video thunk driver which is managing video device
// So it need not start again
//
- DEBUG ((EFI_D_INFO, "Video thunk driver already start! Return!\n"));
+ DEBUG ((DEBUG_INFO, "Video thunk driver already start! Return!\n"));
Private->VgaInstalled = TRUE;
return EFI_SUCCESS;
}
@@ -2321,7 +2321,7 @@ LegacyBiosInstallRom ( );
if (EFI_ERROR (Status)) {
- DEBUG ((EFI_D_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__));
+ DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__));
//
// Report Status Code to indicate that there is no enough space for OpROM
//
@@ -2337,7 +2337,7 @@ LegacyBiosInstallRom ( //
RuntimeAddress = Private->OptionRom;
if (RuntimeAddress + *RuntimeImageLength > MaxRomAddr) {
- DEBUG ((EFI_D_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__));
+ DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__));
gBS->FreePages (PhysicalAddress, EFI_SIZE_TO_PAGES (ImageSize));
//
// Report Status Code to indicate that there is no enough space for OpROM
@@ -2355,7 +2355,7 @@ LegacyBiosInstallRom ( //
InitAddress = PCI_START_ADDRESS (Private->OptionRom);
if (InitAddress + ImageSize > MaxRomAddr) {
- DEBUG ((EFI_D_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__));
+ DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__));
//
// Report Status Code to indicate that there is no enough space for OpROM
//
@@ -2383,7 +2383,7 @@ LegacyBiosInstallRom ( &Granularity
);
- DEBUG ((EFI_D_INFO, " Shadowing OpROM init/runtime/isize = %x/%x/%x\n", InitAddress, RuntimeAddress, ImageSize));
+ DEBUG ((DEBUG_INFO, " Shadowing OpROM init/runtime/isize = %x/%x/%x\n", InitAddress, RuntimeAddress, ImageSize));
CopyMem ((VOID *) InitAddress, RomImage, ImageSize);
@@ -2501,7 +2501,7 @@ LegacyBiosInstallRom ( &Device,
&Function
);
- DEBUG ((EFI_D_INFO, "Shadowing OpROM on the PCI device %x/%x/%x\n", Bus, Device, Function));
+ DEBUG ((DEBUG_INFO, "Shadowing OpROM on the PCI device %x/%x/%x\n", Bus, Device, Function));
}
mIgnoreBbsUpdateFlag = FALSE;
@@ -2526,7 +2526,7 @@ LegacyBiosInstallRom ( // Otherwise, it may cause the system to hang in some cases
//
if (!EFI_ERROR (PciEnableStatus)) {
- DEBUG ((EFI_D_INFO, " Legacy16DispatchOprom - %02x/%02x/%02x\n", Bus, Device, Function));
+ DEBUG ((DEBUG_INFO, " Legacy16DispatchOprom - %02x/%02x/%02x\n", Bus, Device, Function));
Private->LegacyBios.FarCall86 (
&Private->LegacyBios,
Private->Legacy16CallSegment,
@@ -2594,7 +2594,7 @@ LegacyBiosInstallRom ( *RuntimeImageLength = ((EFI_LEGACY_EXPANSION_ROM_HEADER *) RuntimeAddress)->Size512 * 512;
}
- DEBUG ((EFI_D_INFO, " fsize = %x\n", *RuntimeImageLength));
+ DEBUG ((DEBUG_INFO, " fsize = %x\n", *RuntimeImageLength));
//
// If OpROM runs in 2.0 mode
diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacySio.c b/OvmfPkg/Csm/LegacyBiosDxe/LegacySio.c index 17720a74f7..6b9bb5ed8b 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacySio.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacySio.c @@ -117,7 +117,7 @@ LegacyBiosBuildSioDataFromSio ( }
}
- DEBUG ((EFI_D_INFO, "LegacySio: Address/Dma/Irq = %x/%d/%d\n", Address, Dma, Irq));
+ DEBUG ((DEBUG_INFO, "LegacySio: Address/Dma/Irq = %x/%d/%d\n", Address, Dma, Irq));
DevicePath = DevicePathFromHandle (HandleBuffer[Index]);
if (DevicePath == NULL) {
diff --git a/OvmfPkg/Csm/LegacyBiosDxe/Thunk.c b/OvmfPkg/Csm/LegacyBiosDxe/Thunk.c index 6432030a23..d9828bb2f8 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/Thunk.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/Thunk.c @@ -242,7 +242,7 @@ InternalLegacyBiosFarCall ( }
}
if (Count >= 2) {
- DEBUG ((EFI_D_ERROR, "ERROR: More than one HW interrupt active with CSM enabled\n"));
+ DEBUG ((DEBUG_ERROR, "ERROR: More than one HW interrupt active with CSM enabled\n"));
}
ASSERT (Count < 2);
);
diff --git a/OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.c b/OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.c index 35470abf91..31e211a7b9 100644 --- a/OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.c +++ b/OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.c @@ -808,7 +808,7 @@ UpdateLegacyDeviceOrderPage ( break;
default:
- DEBUG ((EFI_D_ERROR, "Invalid command ID for updating page!\n"));
+ DEBUG ((DEBUG_ERROR, "Invalid command ID for updating page!\n"));
return;
}
diff --git a/OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c b/OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c index 6ed45785be..cd0e02060f 100644 --- a/OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c +++ b/OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c @@ -440,7 +440,7 @@ LegacyBmDeleteAllInvalidBootOptions ( BbsIndex = LegacyBmFuzzyMatch (&BootOption[Index], BbsTable, BbsCount, BbsIndexUsed);
if (BbsIndex == BbsCount) {
- DEBUG ((EFI_D_INFO, "[LegacyBds] Delete Boot Option Boot%04x: %s\n", (UINTN) BootOption[Index].OptionNumber, BootOption[Index].Description));
+ DEBUG ((DEBUG_INFO, "[LegacyBds] Delete Boot Option Boot%04x: %s\n", (UINTN) BootOption[Index].OptionNumber, BootOption[Index].Description));
//
// Delete entry from LegacyDevOrder
//
@@ -454,7 +454,7 @@ LegacyBmDeleteAllInvalidBootOptions ( EfiBootManagerDeleteLoadOptionVariable (BootOption[Index].OptionNumber, BootOption[Index].OptionType);
} else {
if (((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOption[Index].OptionalData)->BbsIndex != BbsIndex) {
- DEBUG ((EFI_D_INFO, "[LegacyBds] Update Boot Option Boot%04x: %s Bbs0x%04x->Bbs0x%04x\n", (UINTN) BootOption[Index].OptionNumber, BootOption[Index].Description,
+ DEBUG ((DEBUG_INFO, "[LegacyBds] Update Boot Option Boot%04x: %s Bbs0x%04x->Bbs0x%04x\n", (UINTN) BootOption[Index].OptionNumber, BootOption[Index].Description,
(UINTN) ((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOption[Index].OptionalData)->BbsIndex, (UINTN) BbsIndex));
//
// Update the BBS index in LegacyDevOrder
@@ -1506,7 +1506,7 @@ LegacyBmRefreshAllBootOption ( if (LegacyBmFindBootOption (&BootOptions[Index], ExistingBootOptions, ExistingBootOptionCount) == -1) {
Status = EfiBootManagerAddLoadOptionVariable (&BootOptions[Index], (UINTN) -1);
DEBUG ((
- EFI_D_INFO, "[LegacyBds] New Boot Option: Boot%04x Bbs0x%04x %s %r\n",
+ DEBUG_INFO, "[LegacyBds] New Boot Option: Boot%04x Bbs0x%04x %s %r\n",
(UINTN) BootOptions[Index].OptionNumber,
(UINTN) ((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOptions[Index].OptionalData)->BbsIndex,
BootOptions[Index].Description,
|