From bed103fa4c741d2c22764e45e496b3af5ea104ac Mon Sep 17 00:00:00 2001 From: spashabk-in Date: Thu, 9 Mar 2017 01:20:04 -0600 Subject: Consolidating globals in SBE Overall an increase in size of 88bytes Change-Id: I975ec1536bc2d8153772133d26f750688a849a70 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37714 Reviewed-by: Sachin Gupta Tested-by: Jenkins Server Tested-by: FSP CI Jenkins --- src/sbefw/sbeirq.C | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/sbefw/sbeirq.C') diff --git a/src/sbefw/sbeirq.C b/src/sbefw/sbeirq.C index 3c0a2ef0..b5c2328b 100644 --- a/src/sbefw/sbeirq.C +++ b/src/sbefw/sbeirq.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER sbe Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2016 */ +/* Contributors Listed Below - COPYRIGHT 2015,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -33,8 +33,7 @@ #include "sbeirq.H" #include "sbetrace.H" #include "assert.h" - -extern sbeIntrHandle_t g_sbeIntrSource ; +#include "sbeglobals.H" //////////////////////////////////////////////////////////////// // @brief: SBE control loop ISR: @@ -56,18 +55,18 @@ void sbe_interrupt_handler (void *i_pArg, PkIrqId i_irq) switch (i_irq) { case SBE_IRQ_HOST_PSU_INTR: - g_sbeIntrSource.setIntrSource(SBE_INTERRUPT_ROUTINE, + SBE_GLOBAL->sbeIntrSource.setIntrSource(SBE_INTERRUPT_ROUTINE, SBE_INTERFACE_PSU); break; case SBE_IRQ_SBEFIFO_DATA: - g_sbeIntrSource.setIntrSource(SBE_INTERRUPT_ROUTINE, + SBE_GLOBAL->sbeIntrSource.setIntrSource(SBE_INTERRUPT_ROUTINE, SBE_INTERFACE_FIFO); pk_irq_disable(SBE_IRQ_SBEFIFO_RESET); break; case SBE_IRQ_SBEFIFO_RESET: - g_sbeIntrSource.setIntrSource(SBE_INTERRUPT_ROUTINE, + SBE_GLOBAL->sbeIntrSource.setIntrSource(SBE_INTERRUPT_ROUTINE, SBE_INTERFACE_FIFO_RESET); pk_irq_disable(SBE_IRQ_SBEFIFO_DATA); break; @@ -81,7 +80,7 @@ void sbe_interrupt_handler (void *i_pArg, PkIrqId i_irq) pk_irq_disable(i_irq); // Unblock the command receiver thread - l_rc = pk_semaphore_post(&g_sbeSemCmdRecv); + l_rc = pk_semaphore_post(&SBE_GLOBAL->sbeSemCmdRecv); if (l_rc) { // If we received an error while posting the semaphore, -- cgit v1.2.1