From nobody Tue Nov 26 00:53:57 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+61552+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+61552+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1592811183; cv=none; d=zohomail.com; s=zohoarc; b=Qfkmtd4gMskwYnaOhFzgkdjvfhLYAEdqFb7U4/2nFzM0tIQiZ4QU+fjkxWXFEh9mI2xsBCKh1nnJgATzl+ud4RNfLWponEdBteoUnKXZopKHWNPOb8CtBGl6ef5gZKMbuowqI8LjAzxo1ik6AH3aZgM4K6XTyfVnBdW8DJEfmXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592811183; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=aIPYi7BRbwc24DFXCwpP0Hr1u3WIP3nsO84OeiGC+7M=; b=Gy0hEvtI+SPVW5zHSbRersc41uL1rt2JAoaAbdKNs56GkkF3Jlfo4I6kf4r3KLrIjFxsLxKvX2iHbi30lcmZocczS50qOj3a3ldBGFcCA1OfQf4oD9k3HDRC0D/63EEFIgYfNWJv6i9iHech8norMxUvf5pUbwqMuIY0mtT3GUY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+61552+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1592811183305336.8074054479456; Mon, 22 Jun 2020 00:33:03 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id ADYgYY1788612x2G6O0SEX7F; Mon, 22 Jun 2020 00:33:02 -0700 X-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 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 X-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" X-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: [edk2-devel] [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> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,ming.tan@intel.com X-Gm-Message-State: CINSyD3OUNu5Jxs40spZRnfox1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1592811182; bh=kHuKYzQod8oYpHBMGruW5lAhdjeq0epkTHaD+gL+/CU=; h=Cc:Date:From:Reply-To:Subject:To; b=LfGX8ix9rmlMPNv0Zu4fCoKKuNbBRBN6ugE8RTIB48k87NxvKxUBLm0w634wfzRQWTN HKXivWO07g/NlzCcDVdvL36qw66hKB6cGBd2uhO3PnnSMJ7JyGtpC6bsooN63dJbFB2Rx JdVt/37ZO28g8GACKZC0LGdlekGcjf99k2w= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Eric Dong --- .../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 #include =20 -EFI_RSC_HANDLER_PROTOCOL *mRscHandlerProtocol =3D NULL; -EFI_EVENT mExitBootServicesEvent =3D NULL; -BOOLEAN mRegistered =3D FALSE; +EFI_RSC_HANDLER_PROTOCOL *mBeepRscHandlerProtocol =3D NULL; +EFI_EVENT mBeepExitBootServicesEvent =3D NULL; +BOOLEAN mBeepRegistered =3D FALSE; =20 /** Convert status code value to the times of beep. @@ -79,8 +79,8 @@ UnregisterBeepBootTimeHandlers ( IN VOID *Context ) { - if (mRegistered) { - mRscHandlerProtocol->Unregister (BeepStatusCodeReportWorker); + if (mBeepRegistered) { + mBeepRscHandlerProtocol->Unregister (BeepStatusCodeReportWorker); } } =20 @@ -105,13 +105,13 @@ RegisterBeepBootTimeHandlers ( Status =3D gBS->LocateProtocol ( &gEfiRscHandlerProtocolGuid, NULL, - (VOID **) &mRscHandlerProtocol + (VOID **) &mBeepRscHandlerProtocol ); ASSERT_EFI_ERROR (Status); =20 - mRscHandlerProtocol->Register (BeepStatusCodeReportWorker, TPL_HIGH_LEVE= L); + mBeepRscHandlerProtocol->Register (BeepStatusCodeReportWorker, TPL_HIGH_= LEVEL); ASSERT_EFI_ERROR (Status); - mRegistered =3D TRUE; + mBeepRegistered =3D TRUE; =20 Status =3D gBS->CreateEventEx ( EVT_NOTIFY_SIGNAL, @@ -119,7 +119,7 @@ RegisterBeepBootTimeHandlers ( UnregisterBeepBootTimeHandlers, NULL, &gEfiEventExitBootServicesGuid, - &mExitBootServicesEvent + &mBeepExitBootServicesEvent ); ASSERT_EFI_ERROR (Status); } @@ -154,7 +154,7 @@ RuntimeDxeBeepStatusCodeHandlerLibConstructor ( Status =3D gBS->LocateProtocol ( &gEfiRscHandlerProtocolGuid, NULL, - (VOID **) &mRscHandlerProtocol + (VOID **) &mBeepRscHandlerProtocol ); =20 if (!EFI_ERROR (Status)) { 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 #include =20 -EFI_RSC_HANDLER_PROTOCOL *mRscHandlerProtocol =3D NULL; -EFI_EVENT mExitBootServicesEvent =3D NULL; -BOOLEAN mRegisted =3D FALSE; +EFI_RSC_HANDLER_PROTOCOL *mPostCodeRscHandlerProtocol =3D NULL; +EFI_EVENT mPostCodeExitBootServicesEvent =3D NULL; +BOOLEAN mPostCodeRegisted =3D FALSE; =20 /** 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 (PostCodeStatusCodeReportWorke= r); } } =20 @@ -109,13 +109,13 @@ RegisterPostCodeBootTimeHandlers ( Status =3D gBS->LocateProtocol ( &gEfiRscHandlerProtocolGuid, NULL, - (VOID **) &mRscHandlerProtocol + (VOID **) &mPostCodeRscHandlerProtocol ); ASSERT_EFI_ERROR (Status); =20 - mRscHandlerProtocol->Register (PostCodeStatusCodeReportWorker, TPL_HIGH_= LEVEL); + mPostCodeRscHandlerProtocol->Register (PostCodeStatusCodeReportWorker, T= PL_HIGH_LEVEL); ASSERT_EFI_ERROR (Status); - mRegisted =3D TRUE; + mPostCodeRegisted =3D TRUE; =20 Status =3D 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 =3D gBS->LocateProtocol ( &gEfiRscHandlerProtocolGuid, NULL, - (VOID **) &mRscHandlerProtocol + (VOID **) &mPostCodeRscHandlerProtocol ); =20 if (!EFI_ERROR (Status)) { --=20 2.24.0.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#61552): https://edk2.groups.io/g/devel/message/61552 Mute This Topic: https://groups.io/mt/75033993/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-