diff options
| author | Marvin Häuser <Marvin.Haeuser@outlook.com> | 2018-02-27 18:27:32 +0100 |
|---|---|---|
| committer | Jiewen Yao <jiewen.yao@intel.com> | 2018-02-28 09:14:29 +0800 |
| commit | 141e0bd9067cd06ad71996d3577770efb08e804e (patch) | |
| tree | 22735932670f3792f93f06257c0de1d1550b8f45 | |
| parent | 4ee50c4a6b2c65d55be6c0868ac6d17c5b5f6642 (diff) | |
| download | edk2-platforms-141e0bd9067cd06ad71996d3577770efb08e804e.tar.xz | |
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>
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,
|