Merge branch 'release/202311' into fix_morlock_test

microsoft · May 14, 2024 · 6f3ae2b · 6f3ae2b
2 parents 226bd31 + 927dbf8
commit 6f3ae2b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/AdvLoggerPkg/Library/AdvancedLoggerAccessLib/AdvancedLoggerAccessLib.c b/AdvLoggerPkg/Library/AdvancedLoggerAccessLib/AdvancedLoggerAccessLib.c
@@ -439,7 +439,7 @@ AdvancedLoggerAccessLibUnitTestInitialize (
   if (!EFI_ERROR (Status)) {
     mLoggerInfo  = LOGGER_INFO_FROM_PROTOCOL (LoggerProtocol);
     mLowAddress  = PA_FROM_PTR (LOG_BUFFER_FROM_ALI (mLoggerInfo));
-    mHighAddress = PA_FROM_PTR (TOTAL_LOG_SIZE_WITH_ALI (mLoggerInfo));
+    mHighAddress = PA_FROM_PTR (LOG_MAX_ADDRESS (mLoggerInfo));
   }
 
   return Status;
@@ -466,7 +466,7 @@ AdvancedLoggerAccessLibConstructor (
   if (!EFI_ERROR (Status)) {
     mLoggerInfo  = LOGGER_INFO_FROM_PROTOCOL (LoggerProtocol);
     mLowAddress  = PA_FROM_PTR (LOG_BUFFER_FROM_ALI (mLoggerInfo));
-    mHighAddress = PA_FROM_PTR (TOTAL_LOG_SIZE_WITH_ALI (mLoggerInfo));
+    mHighAddress = PA_FROM_PTR (LOG_MAX_ADDRESS (mLoggerInfo));
 
     // Leave this debug message as ERROR.
 

diff --git a/AdvLoggerPkg/Library/AdvancedLoggerLib/DxeCore/AdvancedLoggerLib.c b/AdvLoggerPkg/Library/AdvancedLoggerLib/DxeCore/AdvancedLoggerLib.c
@@ -392,7 +392,7 @@ DxeCoreAdvancedLoggerLibConstructor (
         LoggerInfo->HdwPortInitialized = TRUE;
       }
 
-      mMaxAddress = TOTAL_LOG_SIZE_WITH_ALI (LoggerInfo);
+      mMaxAddress = LOG_MAX_ADDRESS (LoggerInfo);
       mBufferSize = LoggerInfo->LogBufferSize;
     } else {
       DEBUG ((DEBUG_ERROR, "%a: Error allocating Advanced Logger Buffer\n", __FUNCTION__));

diff --git a/AdvLoggerPkg/UnitTests/AdvancedLoggerWrapper/AdvancedLoggerWrapperTestApp.c b/AdvLoggerPkg/UnitTests/AdvancedLoggerWrapper/AdvancedLoggerWrapperTestApp.c
@@ -179,7 +179,7 @@ InitializeInMemoryLog (
   if (!EFI_ERROR (Status)) {
     mLoggerInfo = LOGGER_INFO_FROM_PROTOCOL (LoggerProtocol);
     if (mLoggerInfo != NULL) {
-      mMaxAddress = TOTAL_LOG_SIZE_WITH_ALI (mLoggerInfo);
+      mMaxAddress = LOG_MAX_ADDRESS (mLoggerInfo);
       mBufferSize = mLoggerInfo->LogBufferSize;
     }