From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web11.12589.1592811182450897868 for ; Mon, 22 Jun 2020 00:33:02 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: ming.tan@intel.com) IronPort-SDR: dpSTvOjEDURN1gryrBbZFGSjs6jMKliDw1C/sBZ0qHcWmDdF3GtaKu4o3iYGaMjxCu5BSAWask dE5ZYJB5LE5A== X-IronPort-AV: E=McAfee;i="6000,8403,9659"; a="141201395" X-IronPort-AV: E=Sophos;i="5.75,266,1589266800"; d="scan'208";a="141201395" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2020 00:32:56 -0700 IronPort-SDR: C8Xr421SNnZ9b6w+uD8nTD5fiAj6WRqORg8ChTdBaxFkVCYbVIh5zzxHE8QenxoiVF0Uo8I1Gn 4TkUVYgUl9bA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,266,1589266800"; d="scan'208";a="300749848" Received: from shwdejointlab96.ccr.corp.intel.com ([10.239.134.144]) by fmsmga004.fm.intel.com with ESMTP; 22 Jun 2020 00:32:55 -0700 From: "Tan, Ming" To: devel@edk2.groups.io Cc: Eric Dong , Liming Gao Subject: [PATCH] Features/Intel/Debugging: Fix build error when use Xcode Date: Mon, 22 Jun 2020 15:32:49 +0800 Message-Id: <20200622073249.5329-1-ming.tan@intel.com> X-Mailer: git-send-email 2.24.0.windows.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2822 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 Cc: Eric Dong Cc: Liming Gao Signed-off-by: Ming Tan --- .../RuntimeDxeBeepStatusCodeHandlerLib.c | 20 +++++++++---------- .../RuntimeDxePostCodeStatusCodeHandlerLib.c | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatu= sCodeHandlerLib/RuntimeDxeBeepStatusCodeHandlerLib.c b/Features/Intel/Debug= ging/BeepDebugFeaturePkg/Library/BeepStatusCodeHandlerLib/RuntimeDxeBeepSta= tusCodeHandlerLib.c index 631e2eecae..0bdc3f4575 100644 --- a/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHa= ndlerLib/RuntimeDxeBeepStatusCodeHandlerLib.c +++ b/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatusCodeHa= ndlerLib/RuntimeDxeBeepStatusCodeHandlerLib.c @@ -17,9 +17,9 @@ #include =0D #include =0D =0D -EFI_RSC_HANDLER_PROTOCOL *mRscHandlerProtocol =3D NULL;=0D -EFI_EVENT mExitBootServicesEvent =3D NULL;=0D -BOOLEAN mRegistered =3D FALSE;=0D +EFI_RSC_HANDLER_PROTOCOL *mBeepRscHandlerProtocol =3D NULL;=0D +EFI_EVENT mBeepExitBootServicesEvent =3D NULL;=0D +BOOLEAN mBeepRegistered =3D FALSE;=0D =0D /**=0D Convert status code value to the times of beep.=0D @@ -79,8 +79,8 @@ UnregisterBeepBootTimeHandlers ( IN VOID *Context=0D )=0D {=0D - if (mRegistered) {=0D - mRscHandlerProtocol->Unregister (BeepStatusCodeReportWorker);=0D + if (mBeepRegistered) {=0D + mBeepRscHandlerProtocol->Unregister (BeepStatusCodeReportWorker);=0D }=0D }=0D =0D @@ -105,13 +105,13 @@ RegisterBeepBootTimeHandlers ( Status =3D gBS->LocateProtocol (=0D &gEfiRscHandlerProtocolGuid,=0D NULL,=0D - (VOID **) &mRscHandlerProtocol=0D + (VOID **) &mBeepRscHandlerProtocol=0D );=0D ASSERT_EFI_ERROR (Status);=0D =0D - mRscHandlerProtocol->Register (BeepStatusCodeReportWorker, TPL_HIGH_LEVE= L);=0D + mBeepRscHandlerProtocol->Register (BeepStatusCodeReportWorker, TPL_HIGH_= LEVEL);=0D ASSERT_EFI_ERROR (Status);=0D - mRegistered =3D TRUE;=0D + mBeepRegistered =3D TRUE;=0D =0D Status =3D gBS->CreateEventEx (=0D EVT_NOTIFY_SIGNAL,=0D @@ -119,7 +119,7 @@ RegisterBeepBootTimeHandlers ( UnregisterBeepBootTimeHandlers,=0D NULL,=0D &gEfiEventExitBootServicesGuid,=0D - &mExitBootServicesEvent=0D + &mBeepExitBootServicesEvent=0D );=0D ASSERT_EFI_ERROR (Status);=0D }=0D @@ -154,7 +154,7 @@ RuntimeDxeBeepStatusCodeHandlerLibConstructor ( Status =3D gBS->LocateProtocol (=0D &gEfiRscHandlerProtocolGuid,=0D NULL,=0D - (VOID **) &mRscHandlerProtocol=0D + (VOID **) &mBeepRscHandlerProtocol=0D );=0D =0D if (!EFI_ERROR (Status)) {=0D diff --git a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostC= odeStatusCodeHandlerLib/RuntimeDxePostCodeStatusCodeHandlerLib.c b/Features= /Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeStatusCodeHandlerL= ib/RuntimeDxePostCodeStatusCodeHandlerLib.c index 59b531fe7c..65fd555cc0 100644 --- a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeStat= usCodeHandlerLib/RuntimeDxePostCodeStatusCodeHandlerLib.c +++ b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeStat= usCodeHandlerLib/RuntimeDxePostCodeStatusCodeHandlerLib.c @@ -18,9 +18,9 @@ #include =0D #include =0D =0D -EFI_RSC_HANDLER_PROTOCOL *mRscHandlerProtocol =3D NULL;=0D -EFI_EVENT mExitBootServicesEvent =3D NULL;=0D -BOOLEAN mRegisted =3D FALSE;=0D +EFI_RSC_HANDLER_PROTOCOL *mPostCodeRscHandlerProtocol =3D NULL;=0D +EFI_EVENT mPostCodeExitBootServicesEvent =3D NULL;=0D +BOOLEAN mPostCodeRegisted =3D FALSE;=0D =0D /**=0D Convert status code value and write data to post code.=0D @@ -81,8 +81,8 @@ UnregisterPostCodeBootTimeHandlers ( IN VOID *Context=0D )=0D {=0D - if (mRegisted) {=0D - mRscHandlerProtocol->Unregister (PostCodeStatusCodeReportWorker);=0D + if (mPostCodeRegisted) {=0D + mPostCodeRscHandlerProtocol->Unregister (PostCodeStatusCodeReportWorke= r);=0D }=0D }=0D =0D @@ -109,13 +109,13 @@ RegisterPostCodeBootTimeHandlers ( Status =3D gBS->LocateProtocol (=0D &gEfiRscHandlerProtocolGuid,=0D NULL,=0D - (VOID **) &mRscHandlerProtocol=0D + (VOID **) &mPostCodeRscHandlerProtocol=0D );=0D ASSERT_EFI_ERROR (Status);=0D =0D - mRscHandlerProtocol->Register (PostCodeStatusCodeReportWorker, TPL_HIGH_= LEVEL);=0D + mPostCodeRscHandlerProtocol->Register (PostCodeStatusCodeReportWorker, T= PL_HIGH_LEVEL);=0D ASSERT_EFI_ERROR (Status);=0D - mRegisted =3D TRUE;=0D + mPostCodeRegisted =3D TRUE;=0D =0D Status =3D gBS->CreateEventEx (=0D EVT_NOTIFY_SIGNAL,=0D @@ -123,7 +123,7 @@ RegisterPostCodeBootTimeHandlers ( UnregisterPostCodeBootTimeHandlers,=0D NULL,=0D &gEfiEventExitBootServicesGuid,=0D - &mExitBootServicesEvent=0D + &mPostCodeExitBootServicesEvent=0D );=0D ASSERT_EFI_ERROR (Status);=0D }=0D @@ -158,7 +158,7 @@ RuntimeDxePostCodeStatusCodeHandlerLibConstructor ( Status =3D gBS->LocateProtocol (=0D &gEfiRscHandlerProtocolGuid,=0D NULL,=0D - (VOID **) &mRscHandlerProtocol=0D + (VOID **) &mPostCodeRscHandlerProtocol=0D );=0D =0D if (!EFI_ERROR (Status)) {=0D --=20 2.24.0.windows.2