4 files changed, 15 insertions, 15 deletions
diff --git a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlFieldListParser.c b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlFieldListParser.c
index b9403efe3c..24460f9c80 100644
--- a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlFieldListParser.c
+++ b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlFieldListParser.c
@@ -82,7 +82,7 @@ AmlParseFieldElement (
   }
 
   // Skip the field opcode (1 byte) as it is already in the FieldByteEncoding.
-  DumpRaw (CurrPos, 1);
+  AMLDBG_DUMP_RAW (CurrPos, 1);
   Status = AmlStreamProgress (FStream, 1);
   if (EFI_ERROR (Status)) {
     ASSERT (0);
@@ -106,7 +106,7 @@ AmlParseFieldElement (
     }
 
     // Move stream forward as the PkgLen has been read.
-    DumpRaw (CurrPos, PkgLenOffset);
+    AMLDBG_DUMP_RAW (CurrPos, PkgLenOffset);
     Status = AmlStreamProgress (FStream, PkgLenOffset);
     if (EFI_ERROR (Status)) {
       ASSERT (0);
diff --git a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlMethodParser.c b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlMethodParser.c
index 4797fa11ed..53e91dd627 100644
--- a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlMethodParser.c
+++ b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlMethodParser.c
@@ -173,7 +173,7 @@ AmlDbgPrintNameSpaceRefList (
   while (CurrLink != NameSpaceRefList) {
     CurrNameSpaceNode = (AML_NAMESPACE_REF_NODE*)CurrLink;
 
-    AmlDbgPrintChars (
+    AMLDBG_PRINT_CHARS (
       DEBUG_INFO,
       CurrNameSpaceNode->RawAbsolutePath,
       CurrNameSpaceNode->RawAbsolutePathSize
@@ -749,7 +749,7 @@ AmlFindMethodDefinition (
   }
 
   DEBUG ((DEBUG_VERBOSE, "AmlMethodParser: Checking absolute name: "));
-  AmlDbgPrintChars (
+  AMLDBG_PRINT_CHARS (
     DEBUG_VERBOSE,
     (CONST CHAR8*)AmlStreamGetCurrPos (RawAbsolutePathFStream),
     AmlStreamGetMaxBufferSize (RawAbsolutePathFStream)
@@ -768,7 +768,7 @@ AmlFindMethodDefinition (
     ProbedNameSpaceRefNode = (AML_NAMESPACE_REF_NODE*)NextLink;
 
     // Print the raw absolute path of the probed node.
-    AmlDbgPrintChars (
+    AMLDBG_PRINT_CHARS (
       DEBUG_VERBOSE,
       ProbedNameSpaceRefNode->RawAbsolutePath,
       ProbedNameSpaceRefNode->RawAbsolutePathSize
@@ -1067,7 +1067,7 @@ AmlIsMethodInvocation (
       DEBUG_VERBOSE,
       "AmlMethodParser: Corresponding method definition: "
       ));
-    AmlDbgPrintChars (
+    AMLDBG_PRINT_CHARS (
       DEBUG_VERBOSE,
       NameSpaceRefNode->RawAbsolutePath,
       NameSpaceRefNode->RawAbsolutePathSize
@@ -1230,7 +1230,7 @@ AmlAddNameSpaceReference (
     DEBUG_VERBOSE,
     "AmlMethodParser: Adding namespace reference with name:\n"
     ));
-  AmlDbgPrintChars (
+  AMLDBG_PRINT_CHARS (
     DEBUG_VERBOSE,
     (CONST CHAR8*)AmlStreamGetCurrPos (&RawAbsolutePathBStream),
     AmlStreamGetIndex (&RawAbsolutePathBStream)
diff --git a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlParser.c b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlParser.c
index 4f6623de02..e3b9f24905 100644
--- a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlParser.c
+++ b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlParser.c
@@ -182,7 +182,7 @@ AmlParseUIntX (
     return Status;
   }
 
-  DumpRaw (AmlStreamGetCurrPos (FStream), UIntXSize);
+  AMLDBG_DUMP_RAW (AmlStreamGetCurrPos (FStream), UIntXSize);
 
   // Move stream forward by the size of UIntX.
   Status = AmlStreamProgress (FStream, UIntXSize);
@@ -266,7 +266,7 @@ AmlParseNameString (
     return Status;
   }
 
-  DumpRaw (AmlStreamGetCurrPos (FStream), StrSize);
+  AMLDBG_DUMP_RAW (AmlStreamGetCurrPos (FStream), StrSize);
 
   // Move the stream forward by StrSize.
   Status = AmlStreamProgress (FStream, StrSize);
@@ -335,7 +335,7 @@ AmlParseString (
     StrSize++;
   } while (Byte != '\0');
 
-  DumpRaw (Buffer, StrSize);
+  AMLDBG_DUMP_RAW (Buffer, StrSize);
 
   Status = AmlCreateDataNode (
              AmlTypeToNodeDataType (ExpectedFormat),
@@ -441,7 +441,7 @@ AmlParseObject (
   }
 
   // Print the opcode.
-  DumpRaw (Buffer, OpCodeSize);
+  AMLDBG_DUMP_RAW (Buffer, OpCodeSize);
 
   if (!IS_END_OF_STREAM (FStream)) {
     // 3. Parse the PkgLength field, if present.
@@ -454,7 +454,7 @@ AmlParseObject (
       }
 
       // Print the package length.
-      DumpRaw (Buffer, PkgOffset);
+      AMLDBG_DUMP_RAW (Buffer, PkgOffset);
 
       // Adjust the size of the stream if it is valid  package length.
       FreeSpace = AmlStreamGetFreeSpace (FStream);
@@ -559,7 +559,7 @@ AmlParseFieldPkgLen (
     return Status;
   }
 
-  DumpRaw (Buffer, PkgOffset);
+  AMLDBG_DUMP_RAW (Buffer, PkgOffset);
 
   Status = AmlStreamProgress (FStream, PkgOffset);
   if (EFI_ERROR (Status)) {
@@ -844,7 +844,7 @@ AmlParseByteList (
       return Status;
     }
 
-    DumpRaw (Buffer, BufferSize);
+    AMLDBG_DUMP_RAW (Buffer, BufferSize);
 
     // Move the stream forward as we have consumed the Buffer.
     Status = AmlStreamProgress (FStream, BufferSize);
diff --git a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlResourceDataParser.c b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlResourceDataParser.c
index 0f41c68b28..7f78ed51bf 100644
--- a/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlResourceDataParser.c
+++ b/DynamicTablesPkg/Library/Common/AmlLib/Parser/AmlResourceDataParser.c
@@ -310,7 +310,7 @@ AmlParseResourceData (
       return Status;
     }
 
-    DumpRaw (CurrRdElement, CurrRdElementSize);
+    AMLDBG_DUMP_RAW (CurrRdElement, CurrRdElementSize);
 
     // Exit the loop when finding the resource data end tag.
     if (AmlRdCompareDescId (