From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web12.12451.1592811677172024392 for ; Mon, 22 Jun 2020 00:41:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=LgrF11zs; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: eric.dong@intel.com) IronPort-SDR: Hr4xHxWLlqjydroalEIAzIwRnDp15HjcpFPSm0S1D3SyDln4nzlCnZdQjh3L1aSXKSrxi+Gh0W lf+SoJNK45Cw== X-IronPort-AV: E=McAfee;i="6000,8403,9659"; a="131074964" X-IronPort-AV: E=Sophos;i="5.75,266,1589266800"; d="scan'208";a="131074964" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2020 00:41:15 -0700 IronPort-SDR: W7XkFzjiIXxLWQkNdxXLpsbsBClYQ0n5o1J8YRQ2Usk/vPpBE2+Wvo2jTzHSdmoQJ16ketf0Us 8fgvlKQ0jbgw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,266,1589266800"; d="scan'208";a="278676032" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga006.jf.intel.com with ESMTP; 22 Jun 2020 00:41:15 -0700 Received: from fmsmsx601.amr.corp.intel.com (10.18.126.81) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 22 Jun 2020 00:41:15 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Mon, 22 Jun 2020 00:41:13 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Mon, 22 Jun 2020 00:41:13 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.169) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 22 Jun 2020 00:41:13 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n44Xh1iihaX2rGKFVFUqIf0R3WmR6Li0zz+aFZIfJT27iB/sAixvXDS95jOGRReabExS2BgOwMDbgvI1MQ/qgtvFj1jndD2X46LFa/Bf4Uc+YOzpxCZ/fqQi2tEMaTslcuRudu9IqomlqWW6wYAzEnwAL5utlnrQaoeCVwzif4xGOLTkD1/tyalbrW6h2GvQsr4FKVxArLYLNnCD6elyj8gHFzllxeUKo7gdnEK43vkO9SfeGt8yrc5DgCZLoeTqJITqG8ifiwfEAa2weeoazqxAZI7CkIorhE/AGFAl5/8x5rkoawz+h5CjQ3f/Jsjq38Z+Z27kRY90BbC9VYSTmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rU9Fb5tRzMgQrnV2W61Ckky+VZk9WYB1LcLlsyuacjo=; b=TK3KtN4xgITTCRH+tFaZH66RVWGhYEs3xWuGmGaaerTNJRQojsgu7P59seX90uIQVpMagu40EpSOod6YGCOq4X0pWehqvdYA0ZIghWqXUwl8TrLIZcwWxEVTR3pkrILB978ZVsLLDf+Re4+PkTz1ggTINTdNSGj74OyrR2HARaJ18aERCMKLi1/YBVWepN29ZZGl9gDktGKNQ+p/BtyehkApLNlXYUDJLrbYIjPrs922PSvlffggOQdr2Hp8eBOK/NVPjlmrSG3rMfr4BppJd7Cxx4o8Wb3ZNsjJXhG5DdJIOvcnETvKyqZb8+00pEkUmfhqd4vfQ5qiPwa8ttQHpA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rU9Fb5tRzMgQrnV2W61Ckky+VZk9WYB1LcLlsyuacjo=; b=LgrF11zsHZbqeefADx4JM4dKTI2p8dgVCM7ktwAtdw1Wum/y4t76fn19v+dyYcGe3M7upZIVsCHWl+sqQiSHTB06HzLqKiKfP13GG0XHgUBrNGYxRXoQtwMmmVrdsFAPfHFtxkumskAgb68WefTHtnk3EptsX8UYBvoy3nOLs5E= Received: from DM6PR11MB3274.namprd11.prod.outlook.com (2603:10b6:5:b::26) by DM6PR11MB2922.namprd11.prod.outlook.com (2603:10b6:5:63::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.22; Mon, 22 Jun 2020 07:41:11 +0000 Received: from DM6PR11MB3274.namprd11.prod.outlook.com ([fe80::cc01:6f05:1402:e7d7]) by DM6PR11MB3274.namprd11.prod.outlook.com ([fe80::cc01:6f05:1402:e7d7%6]) with mapi id 15.20.3109.027; Mon, 22 Jun 2020 07:41:11 +0000 From: "Dong, Eric" To: "devel@edk2.groups.io" , "Tan, Ming" CC: "Gao, Liming" Subject: Re: [edk2-devel] [PATCH] Features/Intel/Debugging: Fix build error when use Xcode Thread-Topic: [edk2-devel] [PATCH] Features/Intel/Debugging: Fix build error when use Xcode Thread-Index: AQHWSGdgnOuj4r7TnkCedrs0c79uGqjkP1Ag Date: Mon, 22 Jun 2020 07:41:11 +0000 Message-ID: References: <20200622073249.5329-1-ming.tan@intel.com> In-Reply-To: <20200622073249.5329-1-ming.tan@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.102.204.45] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0b892640-6ab2-462e-7c30-08d8167fa27a x-ms-traffictypediagnostic: DM6PR11MB2922: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3968; x-forefront-prvs: 0442E569BC x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: C0GZ7v0voVRtLOWxbToae+BDxXxGuitksh4Va3A4N+GNnlAjZpHRFICyTyHLgwQ07IMX6zKn4+hXerGRNzSmcRbFG8AP0IjSkR2LovhR91KTXQB1ATyDOpCQ7f0o43CHAssASwSxKoDa4A/MNGd/jgR4pmmANVOhNPXi3TqOBmXJgt++konxBja/W+8b2raHmjw74ZxTJYAEvE4UD5rD/CCFy4UJfAGwUIr25Vo1miEkGihqCBhqd3env35XJSeb2yAWhPLnx48lcge2w58puM0bvUzod6ieZaV8MET3Tz288AFeUFJx+P1dU+VPKVXMZ+YV1Jb+1QyV2K1Q+tv8um4wiCtZyPYGnkHoc6txfEZpscJxPMsmNCjHfPvaOg1RLMaCDFAsWOMW9WXsTd2Czw== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB3274.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(136003)(39860400002)(366004)(346002)(396003)(376002)(66556008)(66476007)(66446008)(66946007)(76116006)(26005)(83380400001)(4326008)(478600001)(186003)(33656002)(53546011)(5660300002)(7696005)(6506007)(2906002)(86362001)(52536014)(55016002)(64756008)(71200400001)(8676002)(110136005)(966005)(9686003)(107886003)(316002)(6636002)(8936002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: pSO9oPc1t3Sizd9fB0JXUFLWVR1ADwOXR+zeNqQQi/cawULyWlJlbhf0XghZVoVivrSaudK7pbpzHwxOO/w+cWZ2ssloRj21Sk4o72LoiQ3Ac7n9vw6Wqp6vKaTyi08FJBEKN44dHexb9DcSlUCidpSbUmDItLva6bGYX5W6SgHJFlCstJb+hYcvUeZ4e+Ka61Fo8Dtb0gpKdykWh/mHukcAeOgkQCcXE+H2sa/HSfTdFPUly+dax8QwB2OSSFgt4NDfRhEt0qcMPOSXc1uwnvBOEbyP0YTDLgTbjP133PgL1793qRqsrZj6FL8X6cSR3Nx3ojadV+A7MKH8lwzLroxJ9PcsEX4STwC6KER+Se41K+U02p7OGzFEJN17RSY2JppUZPR/pQ0U2s6PwMTd/0sWcR58PjRUJYnMmJCjVkXAxelHNxOH1Fg0djfc2sw8MTqaKVKlhbhK7uvJOnayjGoXU0/hZcMVmAgI3RadOKmsvRK7ui4tKGc+ed1VWIeL MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 0b892640-6ab2-462e-7c30-08d8167fa27a X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Jun 2020 07:41:11.4279 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: rScpBH4t9b4caED9IZ1S9WNFRXfFdq4X4m7WCjswghi/DWJjI68NQGljkMGLIuc7rQuZg1UqQAVsuQ2DP/lEtQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB2922 Return-Path: eric.dong@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Eric Dong > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Tan, > Ming > Sent: Monday, June 22, 2020 3:33 PM > To: devel@edk2.groups.io > Cc: Dong, Eric ; Gao, Liming > Subject: [edk2-devel] [PATCH] Features/Intel/Debugging: Fix build error > when use Xcode >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2822 >=20 > When use Xcode, it will report following compile error: > duplicate symbol _mRscHandlerProtocol in: >=20 > So in the Features/Intel/Debugging/, > change the global variable name in the following files > RuntimeDxeBeepStatusCodeHandlerLib.c > RuntimeDxePostCodeStatusCodeHandlerLib.c >=20 > Cc: Eric Dong > Cc: Liming Gao > Signed-off-by: Ming Tan > --- > .../RuntimeDxeBeepStatusCodeHandlerLib.c | 20 +++++++++---------- > .../RuntimeDxePostCodeStatusCodeHandlerLib.c | 20 +++++++++---------- > 2 files changed, 20 insertions(+), 20 deletions(-) >=20 > diff --git > a/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatusCod > eHandlerLib/RuntimeDxeBeepStatusCodeHandlerLib.c > b/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatusCod > eHandlerLib/RuntimeDxeBeepStatusCodeHandlerLib.c > index 631e2eecae..0bdc3f4575 100644 > --- > a/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatusCod > eHandlerLib/RuntimeDxeBeepStatusCodeHandlerLib.c > +++ > b/Features/Intel/Debugging/BeepDebugFeaturePkg/Library/BeepStatusCod > eHandlerLib/RuntimeDxeBeepStatusCodeHandlerLib.c > @@ -17,9 +17,9 @@ > #include >=20 > #include >=20 >=20 >=20 > -EFI_RSC_HANDLER_PROTOCOL *mRscHandlerProtocol =3D NULL; >=20 > -EFI_EVENT mExitBootServicesEvent =3D NULL; >=20 > -BOOLEAN mRegistered =3D FALSE; >=20 > +EFI_RSC_HANDLER_PROTOCOL *mBeepRscHandlerProtocol =3D NULL; >=20 > +EFI_EVENT mBeepExitBootServicesEvent =3D NULL; >=20 > +BOOLEAN mBeepRegistered =3D FALSE; >=20 >=20 >=20 > /** >=20 > Convert status code value to the times of beep. >=20 > @@ -79,8 +79,8 @@ UnregisterBeepBootTimeHandlers ( > IN VOID *Context >=20 > ) >=20 > { >=20 > - if (mRegistered) { >=20 > - mRscHandlerProtocol->Unregister (BeepStatusCodeReportWorker); >=20 > + if (mBeepRegistered) { >=20 > + mBeepRscHandlerProtocol->Unregister (BeepStatusCodeReportWorker); >=20 > } >=20 > } >=20 >=20 >=20 > @@ -105,13 +105,13 @@ RegisterBeepBootTimeHandlers ( > Status =3D gBS->LocateProtocol ( >=20 > &gEfiRscHandlerProtocolGuid, >=20 > NULL, >=20 > - (VOID **) &mRscHandlerProtocol >=20 > + (VOID **) &mBeepRscHandlerProtocol >=20 > ); >=20 > ASSERT_EFI_ERROR (Status); >=20 >=20 >=20 > - mRscHandlerProtocol->Register (BeepStatusCodeReportWorker, > TPL_HIGH_LEVEL); >=20 > + mBeepRscHandlerProtocol->Register (BeepStatusCodeReportWorker, > TPL_HIGH_LEVEL); >=20 > ASSERT_EFI_ERROR (Status); >=20 > - mRegistered =3D TRUE; >=20 > + mBeepRegistered =3D TRUE; >=20 >=20 >=20 > Status =3D gBS->CreateEventEx ( >=20 > EVT_NOTIFY_SIGNAL, >=20 > @@ -119,7 +119,7 @@ RegisterBeepBootTimeHandlers ( > UnregisterBeepBootTimeHandlers, >=20 > NULL, >=20 > &gEfiEventExitBootServicesGuid, >=20 > - &mExitBootServicesEvent >=20 > + &mBeepExitBootServicesEvent >=20 > ); >=20 > ASSERT_EFI_ERROR (Status); >=20 > } >=20 > @@ -154,7 +154,7 @@ RuntimeDxeBeepStatusCodeHandlerLibConstructor ( > Status =3D gBS->LocateProtocol ( >=20 > &gEfiRscHandlerProtocolGuid, >=20 > NULL, >=20 > - (VOID **) &mRscHandlerProtocol >=20 > + (VOID **) &mBeepRscHandlerProtocol >=20 > ); >=20 >=20 >=20 > if (!EFI_ERROR (Status)) { >=20 > diff --git > a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeS > tatusCodeHandlerLib/RuntimeDxePostCodeStatusCodeHandlerLib.c > b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeS > tatusCodeHandlerLib/RuntimeDxePostCodeStatusCodeHandlerLib.c > index 59b531fe7c..65fd555cc0 100644 > --- > a/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeS > tatusCodeHandlerLib/RuntimeDxePostCodeStatusCodeHandlerLib.c > +++ > b/Features/Intel/Debugging/PostCodeDebugFeaturePkg/Library/PostCodeS > tatusCodeHandlerLib/RuntimeDxePostCodeStatusCodeHandlerLib.c > @@ -18,9 +18,9 @@ > #include >=20 > #include >=20 >=20 >=20 > -EFI_RSC_HANDLER_PROTOCOL *mRscHandlerProtocol =3D NULL; >=20 > -EFI_EVENT mExitBootServicesEvent =3D NULL; >=20 > -BOOLEAN mRegisted =3D FALSE; >=20 > +EFI_RSC_HANDLER_PROTOCOL *mPostCodeRscHandlerProtocol =3D NULL; >=20 > +EFI_EVENT mPostCodeExitBootServicesEvent =3D NULL; >=20 > +BOOLEAN mPostCodeRegisted =3D FALSE; >=20 >=20 >=20 > /** >=20 > Convert status code value and write data to post code. >=20 > @@ -81,8 +81,8 @@ UnregisterPostCodeBootTimeHandlers ( > IN VOID *Context >=20 > ) >=20 > { >=20 > - if (mRegisted) { >=20 > - mRscHandlerProtocol->Unregister (PostCodeStatusCodeReportWorker); >=20 > + if (mPostCodeRegisted) { >=20 > + mPostCodeRscHandlerProtocol->Unregister > (PostCodeStatusCodeReportWorker); >=20 > } >=20 > } >=20 >=20 >=20 > @@ -109,13 +109,13 @@ RegisterPostCodeBootTimeHandlers ( > Status =3D gBS->LocateProtocol ( >=20 > &gEfiRscHandlerProtocolGuid, >=20 > NULL, >=20 > - (VOID **) &mRscHandlerProtocol >=20 > + (VOID **) &mPostCodeRscHandlerProtocol >=20 > ); >=20 > ASSERT_EFI_ERROR (Status); >=20 >=20 >=20 > - mRscHandlerProtocol->Register (PostCodeStatusCodeReportWorker, > TPL_HIGH_LEVEL); >=20 > + mPostCodeRscHandlerProtocol->Register > (PostCodeStatusCodeReportWorker, TPL_HIGH_LEVEL); >=20 > ASSERT_EFI_ERROR (Status); >=20 > - mRegisted =3D TRUE; >=20 > + mPostCodeRegisted =3D TRUE; >=20 >=20 >=20 > Status =3D gBS->CreateEventEx ( >=20 > EVT_NOTIFY_SIGNAL, >=20 > @@ -123,7 +123,7 @@ RegisterPostCodeBootTimeHandlers ( > UnregisterPostCodeBootTimeHandlers, >=20 > NULL, >=20 > &gEfiEventExitBootServicesGuid, >=20 > - &mExitBootServicesEvent >=20 > + &mPostCodeExitBootServicesEvent >=20 > ); >=20 > ASSERT_EFI_ERROR (Status); >=20 > } >=20 > @@ -158,7 +158,7 @@ > RuntimeDxePostCodeStatusCodeHandlerLibConstructor ( > Status =3D gBS->LocateProtocol ( >=20 > &gEfiRscHandlerProtocolGuid, >=20 > NULL, >=20 > - (VOID **) &mRscHandlerProtocol >=20 > + (VOID **) &mPostCodeRscHandlerProtocol >=20 > ); >=20 >=20 >=20 > if (!EFI_ERROR (Status)) { >=20 > -- > 2.24.0.windows.2 >=20 >=20 > -=3D-=3D-=3D-=3D-=3D-=3D > Groups.io Links: You receive all messages sent to this group. >=20 > View/Reply Online (#61552): https://edk2.groups.io/g/devel/message/61552 > Mute This Topic: https://groups.io/mt/75033993/1768733 > Group Owner: devel+owner@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub [eric.dong@intel.com] > -=3D-=3D-=3D-=3D-=3D-=3D