cleanup test point bit definition.

Cc: Michael A Kubacki <michael.a.kubacki@intel.com>
Cc: Amy Chan <amy.chan@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Brett Wang  <brett.wang@intel.com>
Cc: Daocheng Bu <daocheng.bu@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Amy Chan <amy.chan@intel.com>

25 files changed, 151 insertions, 151 deletions

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c
index e2ee1e201c..491d2fd162 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckAcpi.c
@@ -323,9 +323,9 @@ TestPointCheckAcpi (
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE3_READY_TO_BOOT_ACPI_TABLE_FUNCTIONAL_ERROR_CODE \

+      TEST_POINT_BYTE4_READY_TO_BOOT_ACPI_TABLE_FUNCTIONAL_ERROR_CODE \

         TEST_POINT_READY_TO_BOOT \

-        TEST_POINT_BYTE3_READY_TO_BOOT_ACPI_TABLE_FUNCTIONAL_ERROR_STRING

+        TEST_POINT_BYTE4_READY_TO_BOOT_ACPI_TABLE_FUNCTIONAL_ERROR_STRING

       );

   }

 

@@ -335,9 +335,9 @@ TestPointCheckAcpi (
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE2_DXE_SMM_READY_TO_LOCK_WSMT_TABLE_FUNCTIONAL_ERROR_CODE \

+      TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_WSMT_TABLE_FUNCTIONAL_ERROR_CODE \

         TEST_POINT_DXE_SMM_READY_TO_LOCK \

-        TEST_POINT_BYTE2_DXE_SMM_READY_TO_LOCK_WSMT_TABLE_FUNCTIONAL_ERROR_STRING

+        TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_WSMT_TABLE_FUNCTIONAL_ERROR_STRING

       );

     Status = EFI_INVALID_PARAMETER;

   }

@@ -347,9 +347,9 @@ TestPointCheckAcpi (
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE2_END_OF_DXE_DMAT_TABLE_FUNCTIONAL_ERROR_CODE \

+      TEST_POINT_BYTE3_END_OF_DXE_DMA_ACPI_TABLE_FUNCTIONAL_ERROR_CODE \

         TEST_POINT_END_OF_DXE \

-        TEST_POINT_BYTE2_END_OF_DXE_DMAT_TABLE_FUNCTIONAL_ERROR_STRING

+        TEST_POINT_BYTE3_END_OF_DXE_DMA_ACPI_TABLE_FUNCTIONAL_ERROR_STRING

       );

     Status = EFI_INVALID_PARAMETER;

   }

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckBootVariable.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckBootVariable.c
index 1c39b29b8e..968e7e47b0 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckBootVariable.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckBootVariable.c
@@ -149,9 +149,9 @@ TestPointCheckLoadOptionVariable (
           TestPointLibAppendErrorString (

             PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

             NULL,

-            TEST_POINT_BYTE3_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL_ERROR_CODE \

+            TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL_ERROR_CODE \

               TEST_POINT_READY_TO_BOOT \

-              TEST_POINT_BYTE3_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL_ERROR_STRING

+              TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL_ERROR_STRING

             );

           ReturnStatus = Status;

         }

@@ -190,9 +190,9 @@ TestPointCheckPlatformRecoveryOptionVariable (
           TestPointLibAppendErrorString (

             PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

             NULL,

-            TEST_POINT_BYTE3_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL_ERROR_CODE \

+            TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL_ERROR_CODE \

               TEST_POINT_READY_TO_BOOT \

-              TEST_POINT_BYTE3_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL_ERROR_STRING

+              TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL_ERROR_STRING

             );

         }

       } else {

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckConsoleVariable.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckConsoleVariable.c
index 635ca3c48e..312dc643f4 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckConsoleVariable.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckConsoleVariable.c
@@ -73,9 +73,9 @@ TestPointCheckConsoleVariable (
         TestPointLibAppendErrorString (

           PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

           NULL,

-          TEST_POINT_BYTE3_READY_TO_BOOT_UEFI_CONSOLE_VARIABLE_FUNCTIONAL_ERROR_CODE \

+          TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_CONSOLE_VARIABLE_FUNCTIONAL_ERROR_CODE \

             TEST_POINT_READY_TO_BOOT \

-            TEST_POINT_BYTE3_READY_TO_BOOT_UEFI_CONSOLE_VARIABLE_FUNCTIONAL_ERROR_STRING

+            TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_CONSOLE_VARIABLE_FUNCTIONAL_ERROR_STRING

           );

       }

     }

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEsrt.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEsrt.c
index 37ed123457..371b162ab8 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEsrt.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckEsrt.c
@@ -111,9 +111,9 @@ TestPointCheckEsrt (
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE4_READY_TO_BOOT_ESRT_TABLE_FUNCTIONAL_ERROR_CODE \

+      TEST_POINT_BYTE8_READY_TO_BOOT_ESRT_TABLE_FUNCTIONAL_ERROR_CODE \

         TEST_POINT_READY_TO_BOOT \

-        TEST_POINT_BYTE4_READY_TO_BOOT_ESRT_TABLE_FUNCTIONAL_ERROR_STRING

+        TEST_POINT_BYTE8_READY_TO_BOOT_ESRT_TABLE_FUNCTIONAL_ERROR_STRING

       );

   }

   DEBUG ((DEBUG_INFO, "==== TestPointCheckEsrt - Exit\n"));

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHsti.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHsti.c
index 909d84ac68..34b2083d4e 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHsti.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckHsti.c
@@ -108,9 +108,9 @@ TestPointCheckHsti (
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE3_READY_TO_BOOT_HSTI_TABLE_FUNCTIONAL_ERROR_CODE \

+      TEST_POINT_BYTE8_READY_TO_BOOT_HSTI_TABLE_FUNCTIONAL_ERROR_CODE \

         TEST_POINT_READY_TO_BOOT \

-        TEST_POINT_BYTE3_READY_TO_BOOT_HSTI_TABLE_FUNCTIONAL_ERROR_STRING

+        TEST_POINT_BYTE8_READY_TO_BOOT_HSTI_TABLE_FUNCTIONAL_ERROR_STRING

       );

     return EFI_NOT_FOUND;

   }

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c
index 7aa93d0976..efcf7c9ae8 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c
@@ -230,9 +230,9 @@ TestPointCheckLoadedImage (
       TestPointLibAppendErrorString (

         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

         NULL,

-        TEST_POINT_BYTE2_END_OF_DXE_NO_THIRD_PARTY_PCI_OPTION_ROM_ERROR_CODE \

+        TEST_POINT_BYTE3_END_OF_DXE_NO_THIRD_PARTY_PCI_OPTION_ROM_ERROR_CODE \

           TEST_POINT_END_OF_DXE \

-          TEST_POINT_BYTE2_END_OF_DXE_NO_THIRD_PARTY_PCI_OPTION_ROM_ERROR_STRING

+          TEST_POINT_BYTE3_END_OF_DXE_NO_THIRD_PARTY_PCI_OPTION_ROM_ERROR_STRING

         );

     }

   }

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c
index af48eb1b43..d945d6e9f1 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryAttribute.c
@@ -335,9 +335,9 @@ TestPointCheckUefiMemAttribute (
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE3_READY_TO_BOOT_UEFI_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL_ERROR_CODE \

+      TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL_ERROR_CODE \

         TEST_POINT_READY_TO_BOOT \

-        TEST_POINT_BYTE3_READY_TO_BOOT_UEFI_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL_ERROR_STRING

+        TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL_ERROR_STRING

       );

   }

   DEBUG ((DEBUG_INFO, "==== TestPointCheckUefiMemAttribute - Exit\n"));

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c
index ab4aa99b01..67b8108139 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c
@@ -285,9 +285,9 @@ TestPointCheckUefiMemoryMap (
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE3_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL_ERROR_CODE \

+      TEST_POINT_BYTE4_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL_ERROR_CODE \

         TEST_POINT_READY_TO_BOOT \

-        TEST_POINT_BYTE3_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL_ERROR_STRING

+        TEST_POINT_BYTE4_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL_ERROR_STRING

       );

     Status = EFI_INVALID_PARAMETER;

   } else {

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
index e2f4792977..3c9342c893 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckMemoryTypeInformation.c
@@ -151,9 +151,9 @@ Done:
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE3_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL_ERROR_CODE \

+      TEST_POINT_BYTE4_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL_ERROR_CODE \

         TEST_POINT_READY_TO_BOOT \

-        TEST_POINT_BYTE3_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL_ERROR_STRING

+        TEST_POINT_BYTE4_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL_ERROR_STRING

       );

   }

   return Status;

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
index 3c7e3e3672..cfa8c425f2 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckPci.c
@@ -378,9 +378,9 @@ Done:
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE2_PCI_ENUMERATION_DONE_PCI_RESOURCE_ALLOCATED_ERROR_CODE \

+      TEST_POINT_BYTE3_PCI_ENUMERATION_DONE_RESOURCE_ALLOCATED_ERROR_CODE \

         TEST_POINT_PCI_ENUMERATION_DONE \

-        TEST_POINT_BYTE2_PCI_ENUMERATION_DONE_PCI_RESOURCE_ALLOCATED_ERROR_STRING

+        TEST_POINT_BYTE3_PCI_ENUMERATION_DONE_RESOURCE_ALLOCATED_ERROR_STRING

       );

   }

 

@@ -432,9 +432,9 @@ TestPointCheckPciBusMaster (
               TestPointLibAppendErrorString (

                 PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

                 NULL,

-                TEST_POINT_BYTE2_PCI_ENUMERATION_DONE_PCI_BUS_MASTER_DISABLED_ERROR_CODE \

+                TEST_POINT_BYTE3_PCI_ENUMERATION_DONE_BUS_MASTER_DISABLED_ERROR_CODE \

                   TEST_POINT_PCI_ENUMERATION_DONE \

-                  TEST_POINT_BYTE2_PCI_ENUMERATION_DONE_PCI_BUS_MASTER_DISABLED_ERROR_STRING

+                  TEST_POINT_BYTE3_PCI_ENUMERATION_DONE_BUS_MASTER_DISABLED_ERROR_STRING

                 );

               Status = EFI_INVALID_PARAMETER;

             }

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c
index 59a59921e4..3300a33f45 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c
@@ -85,9 +85,9 @@ CheckSmramDescriptor (
         TestPointLibAppendErrorString (

           PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

           NULL,

-          TEST_POINT_BYTE2_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED_ERROR_CODE \

+          TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED_ERROR_CODE \

             TEST_POINT_DXE_SMM_READY_TO_LOCK 

-            TEST_POINT_BYTE2_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED_ERROR_STRING

+            TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED_ERROR_STRING

           );

         return EFI_INVALID_PARAMETER;

       }

@@ -99,9 +99,9 @@ CheckSmramDescriptor (
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE2_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED_ERROR_CODE \

+      TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED_ERROR_CODE \

         TEST_POINT_DXE_SMM_READY_TO_LOCK 

-        TEST_POINT_BYTE2_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED_ERROR_STRING

+        TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED_ERROR_STRING

       );

     return EFI_INVALID_PARAMETER;

   }

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgMor.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgMor.c
index 4570367d92..b612f9c7b9 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgMor.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgMor.c
@@ -55,9 +55,9 @@ TestPointCheckTcgMor (
       TestPointLibAppendErrorString (

         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

         NULL,

-        TEST_POINT_BYTE4_READY_TO_BOOT_TCG_MOR_ENABLED_ERROR_CODE \

+        TEST_POINT_BYTE5_READY_TO_BOOT_TCG_MOR_ENABLED_ERROR_CODE \

           TEST_POINT_READY_TO_BOOT \

-          TEST_POINT_BYTE4_READY_TO_BOOT_TCG_MOR_ENABLED_ERROR_STRING

+          TEST_POINT_BYTE5_READY_TO_BOOT_TCG_MOR_ENABLED_ERROR_STRING

         );

     } else {

       FreePool (Variable);

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c
index d2fbc4ef36..b0f99f47e7 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c
@@ -70,9 +70,9 @@ Done:
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE4_READY_TO_BOOT_TCG_TRUSTED_BOOT_ENABLED_ERROR_CODE \

+      TEST_POINT_BYTE5_READY_TO_BOOT_TCG_TRUSTED_BOOT_ENABLED_ERROR_CODE \

         TEST_POINT_READY_TO_BOOT \

-        TEST_POINT_BYTE4_READY_TO_BOOT_TCG_TRUSTED_BOOT_ENABLED_ERROR_STRING

+        TEST_POINT_BYTE5_READY_TO_BOOT_TCG_TRUSTED_BOOT_ENABLED_ERROR_STRING

       );

   }

   DEBUG ((DEBUG_INFO, "==== TestPointCheckTcgTrustedBoot - Exit\n"));

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c
index af674ec925..8915adfc3e 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c
@@ -64,9 +64,9 @@ TestPointCheckUefiSecureBoot (
       TestPointLibAppendErrorString (

         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

         NULL,

-        TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_CODE \

+        TEST_POINT_BYTE5_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_CODE \

           TEST_POINT_READY_TO_BOOT \

-          TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_STRING

+          TEST_POINT_BYTE5_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_STRING

         );

     } else {

       FreePool (Variable);

@@ -81,9 +81,9 @@ TestPointCheckUefiSecureBoot (
       TestPointLibAppendErrorString (

         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

         NULL,

-        TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_CODE \

+        TEST_POINT_BYTE5_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_CODE \

           TEST_POINT_READY_TO_BOOT \

-          TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_STRING

+          TEST_POINT_BYTE5_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_STRING

         );

     } else {

       if ((Size != mUefiSecureBootModeVariable[Index].ExpectedSize) ||

@@ -93,9 +93,9 @@ TestPointCheckUefiSecureBoot (
         TestPointLibAppendErrorString (

           PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

           NULL,

-          TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_CODE \

+          TEST_POINT_BYTE5_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_CODE \

             TEST_POINT_READY_TO_BOOT \

-            TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_STRING

+            TEST_POINT_BYTE5_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED_ERROR_STRING

           );

       }

       FreePool (Variable);

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c
index d64e98d5bf..dc42722e3d 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestPointCheckLib.c
@@ -161,7 +161,7 @@ TestPointPciEnumerationDonePciBusMasterDisabled (
   EFI_STATUS  Status;

   BOOLEAN     Result;

 

-  if ((mFeatureImplemented[2] & TEST_POINT_BYTE2_PCI_ENUMERATION_DONE_PCI_BUS_MASTER_DISABLED) == 0) {

+  if ((mFeatureImplemented[3] & TEST_POINT_BYTE3_PCI_ENUMERATION_DONE_BUS_MASTER_DISABLED) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -177,8 +177,8 @@ TestPointPciEnumerationDonePciBusMasterDisabled (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      2,

-      TEST_POINT_BYTE2_PCI_ENUMERATION_DONE_PCI_BUS_MASTER_DISABLED

+      3,

+      TEST_POINT_BYTE3_PCI_ENUMERATION_DONE_BUS_MASTER_DISABLED

       );

   }

 

@@ -195,7 +195,7 @@ TestPointPciEnumerationDonePciResourceAllocated (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[2] & TEST_POINT_BYTE2_PCI_ENUMERATION_DONE_RESOURCE_ALLOCATED) == 0) {

+  if ((mFeatureImplemented[3] & TEST_POINT_BYTE3_PCI_ENUMERATION_DONE_RESOURCE_ALLOCATED) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -211,8 +211,8 @@ TestPointPciEnumerationDonePciResourceAllocated (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      2,

-      TEST_POINT_BYTE2_PCI_ENUMERATION_DONE_RESOURCE_ALLOCATED

+      3,

+      TEST_POINT_BYTE3_PCI_ENUMERATION_DONE_RESOURCE_ALLOCATED

       );

   }

 

@@ -222,7 +222,7 @@ TestPointPciEnumerationDonePciResourceAllocated (
 

 EFI_STATUS

 EFIAPI

-TestPointEndOfDxeDmarTableFuntional (

+TestPointEndOfDxeDmaAcpiTableFuntional (

   VOID

   )

 {

@@ -230,11 +230,11 @@ TestPointEndOfDxeDmarTableFuntional (
   BOOLEAN     Result;

   UINT32      Signature;

   

-  if ((mFeatureImplemented[2] & TEST_POINT_BYTE2_END_OF_DXE_DMAT_TABLE_FUNCTIONAL) == 0) {

+  if ((mFeatureImplemented[3] & TEST_POINT_BYTE3_END_OF_DXE_DMA_ACPI_TABLE_FUNCTIONAL) == 0) {

     return EFI_SUCCESS;

   }

 

-  DEBUG ((DEBUG_INFO, "======== TestPointEndOfDxeDmarTableFuntional - Enter\n"));

+  DEBUG ((DEBUG_INFO, "======== TestPointEndOfDxeDmaAcpiTableFuntional - Enter\n"));

   

   Signature = EFI_ACPI_4_0_DMA_REMAPPING_TABLE_SIGNATURE;

   Result = TRUE;

@@ -247,12 +247,12 @@ TestPointEndOfDxeDmarTableFuntional (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      2,

-      TEST_POINT_BYTE2_END_OF_DXE_DMAT_TABLE_FUNCTIONAL

+      3,

+      TEST_POINT_BYTE3_END_OF_DXE_DMA_ACPI_TABLE_FUNCTIONAL

       );

   }

 

-  DEBUG ((DEBUG_INFO, "======== TestPointEndOfDxeDmarTableFuntional - Exit\n"));

+  DEBUG ((DEBUG_INFO, "======== TestPointEndOfDxeDmaAcpiTableFuntional - Exit\n"));

   return EFI_SUCCESS;

 }

 

@@ -265,7 +265,7 @@ TestPointEndOfDxeNoThirdPartyPciOptionRom (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[2] & TEST_POINT_BYTE2_END_OF_DXE_NO_THIRD_PARTY_PCI_OPTION_ROM) == 0) {

+  if ((mFeatureImplemented[3] & TEST_POINT_BYTE3_END_OF_DXE_NO_THIRD_PARTY_PCI_OPTION_ROM) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -281,8 +281,8 @@ TestPointEndOfDxeNoThirdPartyPciOptionRom (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      2,

-      TEST_POINT_BYTE2_END_OF_DXE_NO_THIRD_PARTY_PCI_OPTION_ROM

+      3,

+      TEST_POINT_BYTE3_END_OF_DXE_NO_THIRD_PARTY_PCI_OPTION_ROM

       );

   }

 

@@ -299,7 +299,7 @@ TestPointDxeSmmReadyToLockSmramAligned (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[2] & TEST_POINT_BYTE2_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED) == 0) {

+  if ((mFeatureImplemented[7] & TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -315,8 +315,8 @@ TestPointDxeSmmReadyToLockSmramAligned (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      2,

-      TEST_POINT_BYTE2_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED

+      7,

+      TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_SMRAM_ALIGNED

       );

   }

 

@@ -334,7 +334,7 @@ TestPointDxeSmmReadyToLockWsmtTableFuntional (
   BOOLEAN     Result;

   UINT32      Signature;

   

-  if ((mFeatureImplemented[2] & TEST_POINT_BYTE2_DXE_SMM_READY_TO_LOCK_WSMT_TABLE_FUNCTIONAL) == 0) {

+  if ((mFeatureImplemented[7] & TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_WSMT_TABLE_FUNCTIONAL) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -351,8 +351,8 @@ TestPointDxeSmmReadyToLockWsmtTableFuntional (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      2,

-      TEST_POINT_BYTE2_DXE_SMM_READY_TO_LOCK_WSMT_TABLE_FUNCTIONAL

+      7,

+      TEST_POINT_BYTE7_DXE_SMM_READY_TO_LOCK_WSMT_TABLE_FUNCTIONAL

       );

   }

 

@@ -385,7 +385,7 @@ TestPointDxeSmmReadyToBootSmmPageProtection (
   UINTN                                               Size;

   TEST_POINT_SMM_COMMUNICATION_UEFI_GCD_MAP_INFO      *CommData;

   

-  if ((mFeatureImplemented[5] & TEST_POINT_BYTE5_SMM_READY_TO_BOOT_SMM_PAGE_LEVEL_PROTECTION) == 0) {

+  if ((mFeatureImplemented[6] & TEST_POINT_BYTE6_SMM_READY_TO_BOOT_SMM_PAGE_LEVEL_PROTECTION) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -472,18 +472,18 @@ TestPointDxeSmmReadyToBootSmmPageProtection (
 

 EFI_STATUS

 EFIAPI

-TestPointReadyToBootSmiHandlerInstrument (

+TestPointDxeSmmReadyToBootSmiHandlerInstrument (

   VOID

   )

 {

   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[3] & TEST_POINT_BYTE3_READY_TO_BOOT_SMI_HANDLER_INSTRUMENT) == 0) {

+  if ((mFeatureImplemented[7] & TEST_POINT_BYTE7_DXE_SMM_READY_TO_BOOT_SMI_HANDLER_INSTRUMENT) == 0) {

     return EFI_SUCCESS;

   }

 

-  DEBUG ((DEBUG_INFO, "======== TestPointReadyToBootSmiHandlerInstrument - Enter\n"));

+  DEBUG ((DEBUG_INFO, "======== TestPointDxeSmmReadyToBootSmiHandlerInstrument - Enter\n"));

   

   Result = TRUE;

   Status = TestPointCheckSmiHandlerInstrument ();

@@ -495,12 +495,12 @@ TestPointReadyToBootSmiHandlerInstrument (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      3,

-      TEST_POINT_BYTE3_READY_TO_BOOT_SMI_HANDLER_INSTRUMENT

+      7,

+      TEST_POINT_BYTE7_DXE_SMM_READY_TO_BOOT_SMI_HANDLER_INSTRUMENT

       );

   }

 

-  DEBUG ((DEBUG_INFO, "======== TestPointReadyToBootSmiHandlerInstrument - Exit\n"));

+  DEBUG ((DEBUG_INFO, "======== TestPointDxeSmmReadyToBootSmiHandlerInstrument - Exit\n"));

   return EFI_SUCCESS;

 }

 

@@ -513,7 +513,7 @@ TestPointReadyToBootAcpiTableFuntional (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[3] & TEST_POINT_BYTE3_READY_TO_BOOT_ACPI_TABLE_FUNCTIONAL) == 0) {

+  if ((mFeatureImplemented[4] & TEST_POINT_BYTE4_READY_TO_BOOT_ACPI_TABLE_FUNCTIONAL) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -529,8 +529,8 @@ TestPointReadyToBootAcpiTableFuntional (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      3,

-      TEST_POINT_BYTE3_READY_TO_BOOT_ACPI_TABLE_FUNCTIONAL

+      4,

+      TEST_POINT_BYTE4_READY_TO_BOOT_ACPI_TABLE_FUNCTIONAL

       );

   }

 

@@ -547,7 +547,7 @@ TestPointReadyToBootMemoryTypeInformationFunctional (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[3] & TEST_POINT_BYTE3_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL) == 0) {

+  if ((mFeatureImplemented[4] & TEST_POINT_BYTE4_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -568,8 +568,8 @@ TestPointReadyToBootMemoryTypeInformationFunctional (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      3,

-      TEST_POINT_BYTE3_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL

+      4,

+      TEST_POINT_BYTE4_READY_TO_BOOT_MEMORY_TYPE_INFORMATION_FUNCTIONAL

       );

   }

 

@@ -586,7 +586,7 @@ TestPointReadyToBootUefiMemoryAttributeTableFunctional (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[3] & TEST_POINT_BYTE3_READY_TO_BOOT_UEFI_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL) == 0) {

+  if ((mFeatureImplemented[4] & TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -604,8 +604,8 @@ TestPointReadyToBootUefiMemoryAttributeTableFunctional (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      3,

-      TEST_POINT_BYTE3_READY_TO_BOOT_UEFI_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL

+      4,

+      TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL

       );

   }

 

@@ -622,7 +622,7 @@ TestPointReadyToBootUefiBootVariableFunctional (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[3] & TEST_POINT_BYTE3_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL) == 0) {

+  if ((mFeatureImplemented[4] & TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -640,8 +640,8 @@ TestPointReadyToBootUefiBootVariableFunctional (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      3,

-      TEST_POINT_BYTE3_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL

+      4,

+      TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_BOOT_VARIABLE_FUNCTIONAL

       );

   }

 

@@ -658,7 +658,7 @@ TestPointReadyToBootUefiConsoleVariableFunctional (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[3] & TEST_POINT_BYTE3_READY_TO_BOOT_UEFI_CONSOLE_VARIABLE_FUNCTIONAL) == 0) {

+  if ((mFeatureImplemented[4] & TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_CONSOLE_VARIABLE_FUNCTIONAL) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -676,8 +676,8 @@ TestPointReadyToBootUefiConsoleVariableFunctional (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      3,

-      TEST_POINT_BYTE3_READY_TO_BOOT_UEFI_CONSOLE_VARIABLE_FUNCTIONAL

+      4,

+      TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_CONSOLE_VARIABLE_FUNCTIONAL

       );

   }

 

@@ -694,7 +694,7 @@ TestPointReadyToBootHstiTableFunctional (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[3] & TEST_POINT_BYTE3_READY_TO_BOOT_HSTI_TABLE_FUNCTIONAL) == 0) {

+  if ((mFeatureImplemented[8] & TEST_POINT_BYTE8_READY_TO_BOOT_HSTI_TABLE_FUNCTIONAL) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -710,8 +710,8 @@ TestPointReadyToBootHstiTableFunctional (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      3,

-      TEST_POINT_BYTE3_READY_TO_BOOT_HSTI_TABLE_FUNCTIONAL

+      8,

+      TEST_POINT_BYTE8_READY_TO_BOOT_HSTI_TABLE_FUNCTIONAL

       );

   }

 

@@ -728,7 +728,7 @@ TestPointReadyToBootEsrtTableFunctional (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[4] & TEST_POINT_BYTE4_READY_TO_BOOT_ESRT_TABLE_FUNCTIONAL) == 0) {

+  if ((mFeatureImplemented[8] & TEST_POINT_BYTE8_READY_TO_BOOT_ESRT_TABLE_FUNCTIONAL) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -744,8 +744,8 @@ TestPointReadyToBootEsrtTableFunctional (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      4,

-      TEST_POINT_BYTE4_READY_TO_BOOT_ESRT_TABLE_FUNCTIONAL

+      8,

+      TEST_POINT_BYTE8_READY_TO_BOOT_ESRT_TABLE_FUNCTIONAL

       );

   }

 

@@ -762,7 +762,7 @@ TestPointReadyToBootUefiSecureBootEnabled (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[4] & TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED) == 0) {

+  if ((mFeatureImplemented[5] & TEST_POINT_BYTE5_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -778,8 +778,8 @@ TestPointReadyToBootUefiSecureBootEnabled (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      4,

-      TEST_POINT_BYTE4_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED

+      5,

+      TEST_POINT_BYTE5_READY_TO_BOOT_UEFI_SECURE_BOOT_ENABLED

       );

   }

 

@@ -796,7 +796,7 @@ TestPointReadyToBootPiSignedFvBootEnabled (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[4] & TEST_POINT_BYTE4_READY_TO_BOOT_PI_SIGNED_FV_BOOT_ENABLED) == 0) {

+  if ((mFeatureImplemented[5] & TEST_POINT_BYTE5_READY_TO_BOOT_PI_SIGNED_FV_BOOT_ENABLED) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -812,8 +812,8 @@ TestPointReadyToBootPiSignedFvBootEnabled (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      4,

-      TEST_POINT_BYTE4_READY_TO_BOOT_PI_SIGNED_FV_BOOT_ENABLED

+      5,

+      TEST_POINT_BYTE5_READY_TO_BOOT_PI_SIGNED_FV_BOOT_ENABLED

       );

   }

 

@@ -830,7 +830,7 @@ TestPointReadyToBootTcgTrustedBootEnabled (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[4] & TEST_POINT_BYTE4_READY_TO_BOOT_TCG_TRUSTED_BOOT_ENABLED) == 0) {

+  if ((mFeatureImplemented[5] & TEST_POINT_BYTE5_READY_TO_BOOT_TCG_TRUSTED_BOOT_ENABLED) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -846,8 +846,8 @@ TestPointReadyToBootTcgTrustedBootEnabled (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      4,

-      TEST_POINT_BYTE4_READY_TO_BOOT_TCG_TRUSTED_BOOT_ENABLED

+      5,

+      TEST_POINT_BYTE5_READY_TO_BOOT_TCG_TRUSTED_BOOT_ENABLED

       );

   }

 

@@ -864,7 +864,7 @@ TestPointReadyToBootTcgMorEnabled (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[4] & TEST_POINT_BYTE4_READY_TO_BOOT_TCG_MOR_ENABLED) == 0) {

+  if ((mFeatureImplemented[5] & TEST_POINT_BYTE5_READY_TO_BOOT_TCG_MOR_ENABLED) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -880,8 +880,8 @@ TestPointReadyToBootTcgMorEnabled (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      4,

-      TEST_POINT_BYTE4_READY_TO_BOOT_TCG_MOR_ENABLED

+      5,

+      TEST_POINT_BYTE5_READY_TO_BOOT_TCG_MOR_ENABLED

       );

   }

 

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMtrr.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMtrr.c
index f4e666900c..ea176511f8 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMtrr.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckMtrr.c
@@ -423,9 +423,9 @@ TestPointCheckMtrr (
       TestPointLibAppendErrorString (

         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

         NULL,

-        TEST_POINT_BYTE1_END_OF_PEI_MTRR_FUNCTIONAL_ERROR_CODE \

+        TEST_POINT_BYTE2_END_OF_PEI_MTRR_FUNCTIONAL_ERROR_CODE \

           TEST_POINT_END_OF_PEI \

-          TEST_POINT_BYTE1_END_OF_PEI_MTRR_FUNCTIONAL_ERROR_STRING

+          TEST_POINT_BYTE2_END_OF_PEI_MTRR_FUNCTIONAL_ERROR_STRING

         );

     } else {

       TestPointLibAppendErrorString (

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci.c
index ae07e5425c..5ea13a407d 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckPci.c
@@ -65,9 +65,9 @@ TestPointCheckPciBusMaster (
               TestPointLibAppendErrorString (

                 PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

                 NULL,

-                TEST_POINT_BYTE1_END_OF_PEI_PCI_BUS_MASTER_DISABLED_ERROR_CODE \

+                TEST_POINT_BYTE2_END_OF_PEI_PCI_BUS_MASTER_DISABLED_ERROR_CODE \

                   TEST_POINT_END_OF_PEI \

-                  TEST_POINT_BYTE1_END_OF_PEI_PCI_BUS_MASTER_DISABLED_ERROR_STRING

+                  TEST_POINT_BYTE2_END_OF_PEI_PCI_BUS_MASTER_DISABLED_ERROR_STRING

                 );

               Status = EFI_INVALID_PARAMETER;

             }

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c
index a65a2555cd..e93e4123a3 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c
@@ -89,9 +89,9 @@ CheckSmramDescriptor (
         TestPointLibAppendErrorString (

           PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

           NULL,

-          TEST_POINT_BYTE1_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_CODE \

+          TEST_POINT_BYTE2_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_CODE \

             TEST_POINT_END_OF_PEI \

-            TEST_POINT_BYTE1_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_STRING

+            TEST_POINT_BYTE2_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_STRING

           );

         return EFI_INVALID_PARAMETER;

       }

@@ -103,9 +103,9 @@ CheckSmramDescriptor (
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE1_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_CODE \

+      TEST_POINT_BYTE2_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_CODE \

         TEST_POINT_MEMORY_DISCOVERED \

-        TEST_POINT_BYTE1_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_STRING

+        TEST_POINT_BYTE2_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_STRING

       );

     return EFI_INVALID_PARAMETER;

   }

@@ -161,9 +161,9 @@ TestPointCheckSmramHob (
               TestPointLibAppendErrorString (

                 PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

                 NULL,

-                TEST_POINT_BYTE1_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_CODE \

+                TEST_POINT_BYTE2_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_CODE \

                   TEST_POINT_END_OF_PEI \

-                  TEST_POINT_BYTE1_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_STRING

+                  TEST_POINT_BYTE2_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL_ERROR_STRING

                 );

               return EFI_INVALID_PARAMETER;

             }

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.c
index ff1d250266..07ec3d1972 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.c
@@ -103,7 +103,7 @@ TestPointDebugInitDone (
     TEST_POINT_BYTE0_TEMP_INIT_DONE

     );

 

-  if ((FeatureImplemented[1] & TEST_POINT_BYTE1_DEBUG_INIT_DONE) == 0) {

+  if ((FeatureImplemented[0] & TEST_POINT_BYTE0_DEBUG_INIT_DONE) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -113,8 +113,8 @@ TestPointDebugInitDone (
   TestPointLibSetFeaturesVerified (

     PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

     NULL,

-    1,

-    TEST_POINT_BYTE1_DEBUG_INIT_DONE

+    0,

+    TEST_POINT_BYTE0_DEBUG_INIT_DONE

     );

   DEBUG ((DEBUG_INFO, "======== TestPointDebugInitDone - Exit\n"));

   return EFI_SUCCESS;

@@ -244,7 +244,7 @@ TestPointEndOfPeiSystemResourceFunctional (
 

   FeatureImplemented = GetFeatureImplemented ();

   

-  if ((FeatureImplemented[1] & TEST_POINT_BYTE1_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL) == 0) {

+  if ((FeatureImplemented[2] & TEST_POINT_BYTE2_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -262,8 +262,8 @@ TestPointEndOfPeiSystemResourceFunctional (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      1,

-      TEST_POINT_BYTE1_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL

+      2,

+      TEST_POINT_BYTE2_END_OF_PEI_SYSTEM_RESOURCE_FUNCTIONAL

       );

   }

 

@@ -283,7 +283,7 @@ TestPointEndOfPeiMtrrFunctional (
 

   FeatureImplemented = GetFeatureImplemented ();

   

-  if ((FeatureImplemented[1] & TEST_POINT_BYTE1_END_OF_PEI_MTRR_FUNCTIONAL) == 0) {

+  if ((FeatureImplemented[2] & TEST_POINT_BYTE2_END_OF_PEI_MTRR_FUNCTIONAL) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -298,8 +298,8 @@ TestPointEndOfPeiMtrrFunctional (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      1,

-      TEST_POINT_BYTE1_END_OF_PEI_MTRR_FUNCTIONAL

+      2,

+      TEST_POINT_BYTE2_END_OF_PEI_MTRR_FUNCTIONAL

       );

   }

 

@@ -319,7 +319,7 @@ TestPointEndOfPeiPciBusMasterDisabled (
 

   FeatureImplemented = GetFeatureImplemented ();

   

-  if ((FeatureImplemented[1] & TEST_POINT_BYTE1_END_OF_PEI_PCI_BUS_MASTER_DISABLED) == 0) {

+  if ((FeatureImplemented[2] & TEST_POINT_BYTE2_END_OF_PEI_PCI_BUS_MASTER_DISABLED) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -334,8 +334,8 @@ TestPointEndOfPeiPciBusMasterDisabled (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      1,

-      TEST_POINT_BYTE1_END_OF_PEI_PCI_BUS_MASTER_DISABLED

+      2,

+      TEST_POINT_BYTE2_END_OF_PEI_PCI_BUS_MASTER_DISABLED

       );

   }

 

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckCommunicationBuffer.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckCommunicationBuffer.c
index bf0817ea40..027354c0bc 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckCommunicationBuffer.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckCommunicationBuffer.c
@@ -94,9 +94,9 @@ TestPointCheckSmmCommunicationBuffer (
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE5_SMM_READY_TO_LOCK_SECURE_SMM_COMMUNICATION_BUFFER_ERROR_CODE \

+      TEST_POINT_BYTE6_SMM_READY_TO_LOCK_SECURE_SMM_COMMUNICATION_BUFFER_ERROR_CODE \

         TEST_POINT_SMM_READY_TO_BOOT \

-        TEST_POINT_BYTE5_SMM_READY_TO_LOCK_SECURE_SMM_COMMUNICATION_BUFFER_ERROR_STRING

+        TEST_POINT_BYTE6_SMM_READY_TO_LOCK_SECURE_SMM_COMMUNICATION_BUFFER_ERROR_STRING

       );

   }

 

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckMemoryAttribute.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckMemoryAttribute.c
index a30edb0bdd..7011d77c7b 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckMemoryAttribute.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckMemoryAttribute.c
@@ -163,9 +163,9 @@ TestPointCheckSmmMemAttribute (
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE5_SMM_READY_TO_LOCK_SMM_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL_ERROR_CODE \

+      TEST_POINT_BYTE6_SMM_READY_TO_LOCK_SMM_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL_ERROR_CODE \

         TEST_POINT_SMM_READY_TO_LOCK \

-        TEST_POINT_BYTE5_SMM_READY_TO_LOCK_SMM_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL_ERROR_STRING

+        TEST_POINT_BYTE6_SMM_READY_TO_LOCK_SMM_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL_ERROR_STRING

       );

   }

   DEBUG ((DEBUG_INFO, "==== TestPointCheckSmmMemAttribute - Exit\n"));

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckPaging.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckPaging.c
index d41e8f860f..42f487d9d2 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckPaging.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckPaging.c
@@ -359,9 +359,9 @@ TestPointCheckSmmPaging (
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE5_SMM_READY_TO_BOOT_SMM_PAGE_LEVEL_PROTECTION_ERROR_CODE \

+      TEST_POINT_BYTE6_SMM_READY_TO_BOOT_SMM_PAGE_LEVEL_PROTECTION_ERROR_CODE \

         TEST_POINT_SMM_READY_TO_BOOT \

-        TEST_POINT_BYTE5_SMM_READY_TO_BOOT_SMM_PAGE_LEVEL_PROTECTION_ERROR_STRING

+        TEST_POINT_BYTE6_SMM_READY_TO_BOOT_SMM_PAGE_LEVEL_PROTECTION_ERROR_STRING

       );

   }

 

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckSmrr.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckSmrr.c
index 5205472533..6d9fc3be2b 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckSmrr.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmCheckSmrr.c
@@ -128,9 +128,9 @@ TestPointCheckSmrr (
     TestPointLibAppendErrorString (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      TEST_POINT_BYTE5_SMM_END_OF_DXE_SMRR_FUNCTIONAL_ERROR_CODE \

+      TEST_POINT_BYTE6_SMM_END_OF_DXE_SMRR_FUNCTIONAL_ERROR_CODE \

         TEST_POINT_SMM_END_OF_DXE \

-        TEST_POINT_BYTE5_SMM_END_OF_DXE_SMRR_FUNCTIONAL_ERROR_STRING

+        TEST_POINT_BYTE6_SMM_END_OF_DXE_SMRR_FUNCTIONAL_ERROR_STRING

       );

     return EFI_INVALID_PARAMETER;

   }

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.c
index 3225f139e6..e722538244 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTestPointCheckLib.c
@@ -96,7 +96,7 @@ TestPointSmmEndOfDxeSmrrFunctional (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[5] & TEST_POINT_BYTE5_SMM_END_OF_DXE_SMRR_FUNCTIONAL) == 0) {

+  if ((mFeatureImplemented[5] & TEST_POINT_BYTE6_SMM_END_OF_DXE_SMRR_FUNCTIONAL) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -113,7 +113,7 @@ TestPointSmmEndOfDxeSmrrFunctional (
       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

       5,

-      TEST_POINT_BYTE5_SMM_END_OF_DXE_SMRR_FUNCTIONAL

+      TEST_POINT_BYTE6_SMM_END_OF_DXE_SMRR_FUNCTIONAL

       );

   }

 

@@ -130,7 +130,7 @@ TestPointSmmReadyToLockSmmMemoryAttributeTableFunctional (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[5] & TEST_POINT_BYTE5_SMM_READY_TO_LOCK_SMM_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL) == 0) {

+  if ((mFeatureImplemented[6] & TEST_POINT_BYTE6_SMM_READY_TO_LOCK_SMM_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -147,8 +147,8 @@ TestPointSmmReadyToLockSmmMemoryAttributeTableFunctional (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      5,

-      TEST_POINT_BYTE5_SMM_READY_TO_LOCK_SMM_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL

+      6,

+      TEST_POINT_BYTE6_SMM_READY_TO_LOCK_SMM_MEMORY_ATTRIBUTE_TABLE_FUNCTIONAL

       );

   }

 

@@ -163,7 +163,7 @@ TestPointSmmReadyToLockSecureSmmCommunicationBuffer (
   )

 {

   

-  if ((mFeatureImplemented[5] & TEST_POINT_BYTE5_SMM_READY_TO_LOCK_SECURE_SMM_COMMUNICATION_BUFFER) == 0) {

+  if ((mFeatureImplemented[6] & TEST_POINT_BYTE6_SMM_READY_TO_LOCK_SECURE_SMM_COMMUNICATION_BUFFER) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -191,7 +191,7 @@ TestPointSmmReadyToBootSmmPageProtection (
   EFI_STATUS  Status;

   BOOLEAN     Result;

   

-  if ((mFeatureImplemented[5] & TEST_POINT_BYTE5_SMM_READY_TO_BOOT_SMM_PAGE_LEVEL_PROTECTION) == 0) {

+  if ((mFeatureImplemented[6] & TEST_POINT_BYTE6_SMM_READY_TO_BOOT_SMM_PAGE_LEVEL_PROTECTION) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -207,8 +207,8 @@ TestPointSmmReadyToBootSmmPageProtection (
     TestPointLibSetFeaturesVerified (

       PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

       NULL,

-      5,

-      TEST_POINT_BYTE5_SMM_READY_TO_BOOT_SMM_PAGE_LEVEL_PROTECTION

+      6,

+      TEST_POINT_BYTE6_SMM_READY_TO_BOOT_SMM_PAGE_LEVEL_PROTECTION

       );

   }

   

@@ -223,8 +223,8 @@ TestPointSmmReadyToBootSmmPageProtection (
       TestPointLibSetFeaturesVerified (

         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

         NULL,

-        5,

-        TEST_POINT_BYTE5_SMM_READY_TO_LOCK_SECURE_SMM_COMMUNICATION_BUFFER

+        6,

+        TEST_POINT_BYTE6_SMM_READY_TO_LOCK_SECURE_SMM_COMMUNICATION_BUFFER

         );

     }

   }

@@ -255,7 +255,7 @@ TestPointSmmReadyToBootSmmPageProtectionHandler (
   TEST_POINT_SMM_COMMUNICATION_UEFI_GCD_MAP_INFO      *CommData;

   UINTN                                               TempCommBufferSize;

   

-  if ((mFeatureImplemented[5] & TEST_POINT_BYTE5_SMM_READY_TO_BOOT_SMM_PAGE_LEVEL_PROTECTION) == 0) {

+  if ((mFeatureImplemented[6] & TEST_POINT_BYTE6_SMM_READY_TO_BOOT_SMM_PAGE_LEVEL_PROTECTION) == 0) {

     return EFI_SUCCESS;

   }

 

@@ -318,15 +318,15 @@ TestPointSmmReadyToBootSmmPageProtectionHandler (
       TestPointLibSetFeaturesVerified (

         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

         NULL,

-        5,

-        TEST_POINT_BYTE5_SMM_READY_TO_LOCK_SECURE_SMM_COMMUNICATION_BUFFER

+        6,

+        TEST_POINT_BYTE6_SMM_READY_TO_LOCK_SECURE_SMM_COMMUNICATION_BUFFER

         );

     } else {

       TestPointLibClearFeaturesVerified (

         PLATFORM_TEST_POINT_ROLE_PLATFORM_IBV,

         NULL,

-        5,

-        TEST_POINT_BYTE5_SMM_READY_TO_LOCK_SECURE_SMM_COMMUNICATION_BUFFER

+        6,

+        TEST_POINT_BYTE6_SMM_READY_TO_LOCK_SECURE_SMM_COMMUNICATION_BUFFER

         );

     }

   }

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.c
index 2234272e16..9e83c76b11 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestPointCheckLibNull.c
@@ -116,7 +116,7 @@ TestPointEndOfDxeNoThirdPartyPciOptionRom (
 

 EFI_STATUS

 EFIAPI

-TestPointEndOfDxeDmarTableFuntional (

+TestPointEndOfDxeDmaAcpiTableFuntional (

   VOID

   )

 {

@@ -152,7 +152,7 @@ TestPointDxeSmmReadyToBootSmmPageProtection (
 

 EFI_STATUS

 EFIAPI

-TestPointReadyToBootSmiHandlerInstrument (

+TestPointDxeSmmReadyToBootSmiHandlerInstrument (

   VOID

   )

 {