No it works

microsoft · Dec 18, 2023 · f30f7c5 · f30f7c5
1 parent fc7d780
commit f30f7c5
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 5 deletions.
diff --git a/AdvLoggerPkg/Library/AdvancedLoggerLib/AdvancedLoggerCommon.c b/AdvLoggerPkg/Library/AdvancedLoggerLib/AdvancedLoggerCommon.c
@@ -65,15 +65,15 @@ AdvancedLoggerMemoryLoggerWrite (
 
   if (LoggerInfo != NULL) {
     MessagePrefix     = (CHAR8 *)FixedPcdGetPtr (PcdAdvancedLoggerMessagePrefix);
-    MessagePrefixSize = FixedPcdGetSize (PcdAdvancedLoggerMessageBaseArmPrefix);
+    MessagePrefixSize = FixedPcdGetSize (PcdAdvancedLoggerMessagePrefix);
 
     if ((MessagePrefix == NULL) || (MessagePrefixSize <= 1) || (MessagePrefix[MessagePrefixSize - 1] != '\0')) {
       // Do not take null pointers, strings with only a null terminator, or string without terminator
       MessagePrefix     = NULL;
       MessagePrefixSize = 0;
     } else {
       // Remove the null terminator from the size
-      MessagePrefixSize --;
+      MessagePrefixSize--;
     }
 
     NumberOfBytes += MessagePrefixSize;

diff --git a/AdvLoggerPkg/Library/AdvancedLoggerLib/BaseArm/AdvancedLoggerLib.inf b/AdvLoggerPkg/Library/AdvancedLoggerLib/BaseArm/AdvancedLoggerLib.inf
@@ -39,6 +39,7 @@
 [Pcd]
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerBase                         ## CONSUMES
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerHdwPortDebugPrintErrorLevel  ## SOMETIMES_CONSUMES
+  gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerMessagePrefix                ## CONSUMES
 
 [Depex]
   TRUE
diff --git a/AdvLoggerPkg/Library/AdvancedLoggerLib/DxeCore/AdvancedLoggerLib.inf b/AdvLoggerPkg/Library/AdvancedLoggerLib/DxeCore/AdvancedLoggerLib.inf
@@ -57,6 +57,7 @@
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerPages
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerBase
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerHdwPortDebugPrintErrorLevel
+  gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerMessagePrefix
 
 [FeaturePcd]
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerLocator

diff --git a/AdvLoggerPkg/Library/AdvancedLoggerLib/MmCore/AdvancedLoggerLib.inf b/AdvLoggerPkg/Library/AdvancedLoggerLib/MmCore/AdvancedLoggerLib.inf
@@ -42,7 +42,7 @@
 
 [Pcd]
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerHdwPortDebugPrintErrorLevel       ## SOMETIMES_CONSUMES
-  gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerMessageMmCorePrefix              ## CONSUMES
+  gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerMessagePrefix                     ## CONSUMES
 
 [Depex]
   TRUE
diff --git a/AdvLoggerPkg/Library/AdvancedLoggerLib/MmCoreArm/AdvancedLoggerLib.inf b/AdvLoggerPkg/Library/AdvancedLoggerLib/MmCoreArm/AdvancedLoggerLib.inf
@@ -48,7 +48,7 @@
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerBase
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerPages
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerHdwPortDebugPrintErrorLevel
-  gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerMessageMmCoreArmPrefix
+  gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerMessagePrefix
 
 [Depex]
   TRUE
diff --git a/AdvLoggerPkg/Library/AdvancedLoggerLib/Pei64/AdvancedLoggerLib.inf b/AdvLoggerPkg/Library/AdvancedLoggerLib/Pei64/AdvancedLoggerLib.inf
@@ -40,4 +40,4 @@
 [Pcd]
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerBase                         ## CONSUMES
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerHdwPortDebugPrintErrorLevel  ## SOMETIMES_CONSUMES
-  gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerMessagePei64Prefix           ## CONSUMES
+  gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerMessagePrefix                ## CONSUMES
diff --git a/AdvLoggerPkg/Library/AdvancedLoggerLib/PeiCore/AdvancedLoggerLib.inf b/AdvLoggerPkg/Library/AdvancedLoggerLib/PeiCore/AdvancedLoggerLib.inf
@@ -60,3 +60,4 @@
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerPreMemPages                  ## CONSUMES
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerPages                        ## CONSUMES
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerHdwPortDebugPrintErrorLevel  ## CONSUMES
+  gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerMessagePrefix                ## CONSUMES
diff --git a/AdvLoggerPkg/Library/AdvancedLoggerLib/Runtime/AdvancedLoggerLib.inf b/AdvLoggerPkg/Library/AdvancedLoggerLib/Runtime/AdvancedLoggerLib.inf
@@ -44,3 +44,4 @@
 
 [Pcd]
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerHdwPortDebugPrintErrorLevel  ## SOMETIMES_CONSUMES
+  gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerMessagePrefix                ## CONSUMES
diff --git a/AdvLoggerPkg/Library/AdvancedLoggerLib/Sec/AdvancedLoggerLib.inf b/AdvLoggerPkg/Library/AdvancedLoggerLib/Sec/AdvancedLoggerLib.inf
@@ -46,6 +46,7 @@
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerPreMemPages                  ## CONSUMES
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerPages                        ## CONSUMES
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerHdwPortDebugPrintErrorLevel  ## CONSUMES
+  gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerMessagePrefix                ## CONSUMES
 
 [BuildOptions]
   *_*_*_CC_FLAGS  = -D ADVANCED_LOGGER_SEC=1
diff --git a/AdvLoggerPkg/Library/AdvancedLoggerLib/SmmCore/AdvancedLoggerLib.inf b/AdvLoggerPkg/Library/AdvancedLoggerLib/SmmCore/AdvancedLoggerLib.inf
@@ -46,3 +46,4 @@
 
 [Pcd]
   gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerHdwPortDebugPrintErrorLevel  ## SOMETIMES_CONSUMES
+  gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerMessagePrefix                ## CONSUMES
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,3 +44,4 @@

		[Pcd]
		gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerHdwPortDebugPrintErrorLevel ## SOMETIMES_CONSUMES
		gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerMessagePrefix ## CONSUMES
Original file line number	Diff line number	Diff line change
Expand Up		@@ -46,3 +46,4 @@

		[Pcd]
		gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerHdwPortDebugPrintErrorLevel ## SOMETIMES_CONSUMES
		gAdvLoggerPkgTokenSpaceGuid.PcdAdvancedLoggerMessagePrefix ## CONSUMES