From 141e0bd9067cd06ad71996d3577770efb08e804e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20H=C3=A4user?= <Marvin.Haeuser@outlook.com>
Date: Tue, 27 Feb 2018 18:27:32 +0100
Subject: MinPlatformPkg/TestPointLib: Prevent symbol duplication.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
---
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c  | 2 +-
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h  | 2 +-
 .../Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip.c    | 2 +-
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c  | 2 +-
 Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h  | 2 +-
 .../Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip.c    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
index 45b5b33bf7..812eb54af3 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
@@ -302,7 +302,7 @@ TestPointLibSetTable (
   }
 
   TestPointAip->Signature = TEST_POINT_AIP_PRIVATE_SIGNATURE;
-  CopyMem (&TestPointAip->Aip, &mAdapterInformationProtocol, sizeof(EFI_ADAPTER_INFORMATION_PROTOCOL));
+  CopyMem (&TestPointAip->Aip, &mDxeAdapterInformationProtocol, sizeof(EFI_ADAPTER_INFORMATION_PROTOCOL));
   TestPointAip->TestPointSize = TestPointSize;
   TestPointAip->TestPointMaxSize = TestPointSize;
   
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
index e152f95a13..2629e698b5 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
@@ -41,7 +41,7 @@ typedef struct {
       TEST_POINT_AIP_PRIVATE_SIGNATURE \
       )
 
-extern EFI_ADAPTER_INFORMATION_PROTOCOL mAdapterInformationProtocol;
+extern EFI_ADAPTER_INFORMATION_PROTOCOL mDxeAdapterInformationProtocol;
 
 /**
   Return if input TestPoint data is valid.
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip.c
index 2e807932f8..4f59727911 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAip.c
@@ -168,7 +168,7 @@ TestPointAipGetSupportedTypes (
   return EFI_SUCCESS;
 }
 
-EFI_ADAPTER_INFORMATION_PROTOCOL mAdapterInformationProtocol = {
+EFI_ADAPTER_INFORMATION_PROTOCOL mDxeAdapterInformationProtocol = {
   TestPointAipGetInfo,
   TestPointAipSetInfo,
   TestPointAipGetSupportedTypes,
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
index a55f6731b7..8603ea1608 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
@@ -321,7 +321,7 @@ TestPointLibSetTable (
   }
 
   TestPointAip->Signature = TEST_POINT_AIP_PRIVATE_SIGNATURE;
-  CopyMem (&TestPointAip->Aip, &mAdapterInformationProtocol, sizeof(EFI_ADAPTER_INFORMATION_PROTOCOL));
+  CopyMem (&TestPointAip->Aip, &mSmmAdapterInformationProtocol, sizeof(EFI_ADAPTER_INFORMATION_PROTOCOL));
   TestPointAip->TestPointSize = TestPointSize;
   TestPointAip->TestPointMaxSize = TestPointSize;
   
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
index 4a7429f569..6dc3077981 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
@@ -43,7 +43,7 @@ typedef struct {
       TEST_POINT_AIP_PRIVATE_SIGNATURE \
       )
 
-extern EFI_ADAPTER_INFORMATION_PROTOCOL mAdapterInformationProtocol;
+extern EFI_ADAPTER_INFORMATION_PROTOCOL mSmmAdapterInformationProtocol;
 
 /**
   Return if input TestPoint data is valid.
diff --git a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip.c b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip.c
index 11aea2c91f..075d67cb76 100644
--- a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip.c
+++ b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAip.c
@@ -168,7 +168,7 @@ TestPointAipGetSupportedTypes (
   return EFI_SUCCESS;
 }
 
-EFI_ADAPTER_INFORMATION_PROTOCOL mAdapterInformationProtocol = {
+EFI_ADAPTER_INFORMATION_PROTOCOL mSmmAdapterInformationProtocol = {
   TestPointAipGetInfo,
   TestPointAipSetInfo,
   TestPointAipGetSupportedTypes,
-- 
cgit v1.2.3