From a1878955b29ad924761e165253e4ff3cfc4f6c1f Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Tue, 16 Nov 2021 19:21:20 -0800 Subject: EmbeddedPkg: 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 Cc: Leif Lindholm Cc: Michael Kubacki Signed-off-by: Michael D Kinney Reviewed-by: Ard Biesheuvel --- EmbeddedPkg/GdbStub/Arm/Processor.c | 11 +++++------ EmbeddedPkg/GdbStub/GdbStub.c | 8 ++++---- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'EmbeddedPkg/GdbStub') diff --git a/EmbeddedPkg/GdbStub/Arm/Processor.c b/EmbeddedPkg/GdbStub/Arm/Processor.c index f15d356c44..bb956b7e79 100644 --- a/EmbeddedPkg/GdbStub/Arm/Processor.c +++ b/EmbeddedPkg/GdbStub/Arm/Processor.c @@ -416,7 +416,7 @@ AddSingleStep ( } InvalidateInstructionCacheRange ((VOID *)mSingleStepPC, mSingleStepDataSize); - //DEBUG((EFI_D_ERROR, "AddSingleStep at 0x%08x (was: 0x%08x is:0x%08x)\n", SystemContext.SystemContextArm->PC, mSingleStepData, *(UINT32 *)mSingleStepPC)); + //DEBUG((DEBUG_ERROR, "AddSingleStep at 0x%08x (was: 0x%08x is:0x%08x)\n", SystemContext.SystemContextArm->PC, mSingleStepData, *(UINT32 *)mSingleStepPC)); } @@ -437,7 +437,7 @@ RemoveSingleStep ( if (mSingleStepDataSize == sizeof (UINT16)) { *(UINT16 *)mSingleStepPC = (UINT16)mSingleStepData; } else { - //DEBUG((EFI_D_ERROR, "RemoveSingleStep at 0x%08x (was: 0x%08x is:0x%08x)\n", SystemContext.SystemContextArm->PC, *(UINT32 *)mSingleStepPC, mSingleStepData)); + //DEBUG((DEBUG_ERROR, "RemoveSingleStep at 0x%08x (was: 0x%08x is:0x%08x)\n", SystemContext.SystemContextArm->PC, *(UINT32 *)mSingleStepPC, mSingleStepData)); *(UINT32 *)mSingleStepPC = mSingleStepData; } InvalidateInstructionCacheRange ((VOID *)mSingleStepPC, mSingleStepDataSize); @@ -556,7 +556,7 @@ SetBreakpoint ( *(UINT32 *)Address = GDB_ARM_BKPT; InvalidateInstructionCacheRange ((VOID *)Address, 4); - //DEBUG((EFI_D_ERROR, "SetBreakpoint at 0x%08x (was: 0x%08x is:0x%08x)\n", Address, Breakpoint->Instruction, *(UINT32 *)Address)); + //DEBUG((DEBUG_ERROR, "SetBreakpoint at 0x%08x (was: 0x%08x is:0x%08x)\n", Address, Breakpoint->Instruction, *(UINT32 *)Address)); } VOID @@ -579,7 +579,7 @@ ClearBreakpoint ( *(UINT32 *)Address = Breakpoint->Instruction; InvalidateInstructionCacheRange ((VOID *)Address, 4); - //DEBUG((EFI_D_ERROR, "ClearBreakpoint at 0x%08x (was: 0x%08x is:0x%08x)\n", Address, GDB_ARM_BKPT, *(UINT32 *)Address)); + //DEBUG((DEBUG_ERROR, "ClearBreakpoint at 0x%08x (was: 0x%08x is:0x%08x)\n", Address, GDB_ARM_BKPT, *(UINT32 *)Address)); FreePool (Breakpoint); } @@ -607,7 +607,7 @@ InsertBreakPoint ( break; default : - DEBUG((EFI_D_ERROR, "Insert breakpoint default: %x\n", Type)); + DEBUG((DEBUG_ERROR, "Insert breakpoint default: %x\n", Type)); SendError (GDB_EINVALIDBRKPOINTTYPE); return; } @@ -694,4 +694,3 @@ ValidateException ( return TRUE; } - diff --git a/EmbeddedPkg/GdbStub/GdbStub.c b/EmbeddedPkg/GdbStub/GdbStub.c index 7f2a5ed200..dd035271a7 100644 --- a/EmbeddedPkg/GdbStub/GdbStub.c +++ b/EmbeddedPkg/GdbStub/GdbStub.c @@ -91,7 +91,7 @@ GdbStubEntry ( &Handles ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Debug Support Protocol not found\n")); + DEBUG ((DEBUG_ERROR, "Debug Support Protocol not found\n")); return Status; } @@ -116,7 +116,7 @@ GdbStubEntry ( FreePool (Handles); if (!IsaSupported) { - DEBUG ((EFI_D_ERROR, "Debug Support Protocol does not support our ISA\n")); + DEBUG ((DEBUG_ERROR, "Debug Support Protocol does not support our ISA\n")); return EFI_NOT_FOUND; } @@ -124,8 +124,8 @@ GdbStubEntry ( Status = DebugSupport->GetMaximumProcessorIndex (DebugSupport, &gMaxProcessorIndex); ASSERT_EFI_ERROR (Status); - DEBUG ((EFI_D_INFO, "Debug Support Protocol ISA %x\n", DebugSupport->Isa)); - DEBUG ((EFI_D_INFO, "Debug Support Protocol Processor Index %d\n", gMaxProcessorIndex)); + DEBUG ((DEBUG_INFO, "Debug Support Protocol ISA %x\n", DebugSupport->Isa)); + DEBUG ((DEBUG_INFO, "Debug Support Protocol Processor Index %d\n", gMaxProcessorIndex)); // Call processor-specific init routine InitializeProcessor (); -- cgit v1.2.3