diff options
| author | Tan, Ming <ming.tan@intel.com> | 2020-06-22 10:32:49 +0300 |
|---|---|---|
| committer | Eric Dong <eric.dong@intel.com> | 2020-06-23 04:05:35 +0300 |
| commit | 66adbd35df58c788134d2caaf6538b15e22d62b8 (patch) | |
| tree | e308bb71c2bf60f56686732740d76e8d2b7d316c /Features/Intel/Debugging/PostCodeDebugFeaturePkg | |
| parent | 14e47144ffc66292417fbbe0fd98883ec310821c (diff) | |
| download | edk2-platforms-66adbd35df58c788134d2caaf6538b15e22d62b8.tar.xz | |
Features/Intel/Debugging: Fix build error when use Xcode
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2822
When use Xcode, it will report following compile error:
duplicate symbol _mRscHandlerProtocol in:
So in the Features/Intel/Debugging/,
change the global variable name in the following files
RuntimeDxeBeepStatusCodeHandlerLib.c
RuntimeDxePostCodeStatusCodeHandlerLib.c
Reviewed-by: Eric Dong <eric.dong@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Ming Tan <ming.tan@intel.com>
Diffstat (limited to 'Features/Intel/Debugging/PostCodeDebugFeaturePkg')
| -rw-r--r-- | Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/RuntimeDxePostCodeStatusCodeHandlerLib.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/RuntimeDxePostCodeStatusCodeHandlerLib.c b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/RuntimeDxePostCodeStatusCodeHandlerLib.c index 59b531fe7c..65fd555cc0 100644 --- a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/RuntimeDxePostCodeStatusCodeHandlerLib.c +++ b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerLib/RuntimeDxePostCodeStatusCodeHandlerLib.c @@ -18,9 +18,9 @@ #include <Library/PostCodeMapLib.h>
#include <Library/PostCodeLib.h>
-EFI_RSC_HANDLER_PROTOCOL *mRscHandlerProtocol = NULL;
-EFI_EVENT mExitBootServicesEvent = NULL;
-BOOLEAN mRegisted = FALSE;
+EFI_RSC_HANDLER_PROTOCOL *mPostCodeRscHandlerProtocol = NULL;
+EFI_EVENT mPostCodeExitBootServicesEvent = NULL;
+BOOLEAN mPostCodeRegisted = FALSE;
/**
Convert status code value and write data to post code.
@@ -81,8 +81,8 @@ UnregisterPostCodeBootTimeHandlers ( IN VOID *Context
)
{
- if (mRegisted) {
- mRscHandlerProtocol->Unregister (PostCodeStatusCodeReportWorker);
+ if (mPostCodeRegisted) {
+ mPostCodeRscHandlerProtocol->Unregister (PostCodeStatusCodeReportWorker);
}
}
@@ -109,13 +109,13 @@ RegisterPostCodeBootTimeHandlers ( Status = gBS->LocateProtocol (
&gEfiRscHandlerProtocolGuid,
NULL,
- (VOID **) &mRscHandlerProtocol
+ (VOID **) &mPostCodeRscHandlerProtocol
);
ASSERT_EFI_ERROR (Status);
- mRscHandlerProtocol->Register (PostCodeStatusCodeReportWorker, TPL_HIGH_LEVEL);
+ mPostCodeRscHandlerProtocol->Register (PostCodeStatusCodeReportWorker, TPL_HIGH_LEVEL);
ASSERT_EFI_ERROR (Status);
- mRegisted = TRUE;
+ mPostCodeRegisted = TRUE;
Status = gBS->CreateEventEx (
EVT_NOTIFY_SIGNAL,
@@ -123,7 +123,7 @@ RegisterPostCodeBootTimeHandlers ( UnregisterPostCodeBootTimeHandlers,
NULL,
&gEfiEventExitBootServicesGuid,
- &mExitBootServicesEvent
+ &mPostCodeExitBootServicesEvent
);
ASSERT_EFI_ERROR (Status);
}
@@ -158,7 +158,7 @@ RuntimeDxePostCodeStatusCodeHandlerLibConstructor ( Status = gBS->LocateProtocol (
&gEfiRscHandlerProtocolGuid,
NULL,
- (VOID **) &mRscHandlerProtocol
+ (VOID **) &mPostCodeRscHandlerProtocol
);
if (!EFI_ERROR (Status)) {
|