From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1D1A2223972A9 for ; Tue, 6 Feb 2018 04:15:17 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Feb 2018 04:21:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,468,1511856000"; d="scan'208";a="28505095" Received: from shwdeopenpsi068.ccr.corp.intel.com ([10.239.158.46]) by fmsmga001.fm.intel.com with ESMTP; 06 Feb 2018 04:20:59 -0800 From: Star Zeng To: edk2-devel@lists.01.org Cc: Star Zeng , Ruiyu Ni , Hao Wu Date: Tue, 6 Feb 2018 20:20:57 +0800 Message-Id: <1517919657-9016-1-git-send-email-star.zeng@intel.com> X-Mailer: git-send-email 2.7.0.windows.1 Subject: [PATCH] SourceLevelDebugPkg DebugAgentLib: Rename IsBsp to DebugAgentIsBsp X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Feb 2018 12:15:18 -0000 For avoiding function name confliction, rename IsBsp to DebugAgentIsBsp. Cc: Ruiyu Ni Cc: Hao Wu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Star Zeng --- SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c | 4 ++-- SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.c | 4 ++-- SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c index 36b1ef924cd2..7c05ce2f2806 100644 --- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c +++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c @@ -2485,7 +2485,7 @@ InterruptProcess ( AcquireMpSpinLock (&mDebugMpContext.DebugPortSpinLock); if (MultiProcessorDebugSupport()) { - if (IsBsp (ProcessorIndex)) { + if (DebugAgentIsBsp (ProcessorIndex)) { // // If current processor is BSP, check Apic timer's init count if changed, // it may be re-written when switching BSP. @@ -2498,7 +2498,7 @@ InterruptProcess ( } } - if (!IsBsp (ProcessorIndex) || mDebugMpContext.IpiSentByAp) { + if (!DebugAgentIsBsp (ProcessorIndex) || mDebugMpContext.IpiSentByAp) { ReleaseMpSpinLock (&mDebugMpContext.DebugPortSpinLock); // // If current processor is not BSP or this is one IPI sent by AP diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.c b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.c index d49d4ee32347..51f40cb56b77 100644 --- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.c +++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.c @@ -75,7 +75,7 @@ HaltOtherProcessors ( ) { DebugAgentMsgPrint (DEBUG_AGENT_INFO, "processor[%x]:Try to halt other processors.\n", CurrentProcessorIndex); - if (!IsBsp (CurrentProcessorIndex)) { + if (!DebugAgentIsBsp (CurrentProcessorIndex)) { SetIpiSentByApFlag (TRUE);; } @@ -137,7 +137,7 @@ GetProcessorIndex ( **/ BOOLEAN -IsBsp ( +DebugAgentIsBsp ( IN UINT32 ProcessorIndex ) { diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.h b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.h index 5bb50960ca72..d9c21efdaad1 100644 --- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.h +++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugMp.h @@ -96,7 +96,7 @@ ReleaseMpSpinLock ( **/ BOOLEAN -IsBsp ( +DebugAgentIsBsp ( IN UINT32 ProcessorIndex ); -- 2.7.0.windows.1