RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

GPTIMER: move ISR install from init1

Browse Source 
To avoid install ISRs during init level 1 the ISR install is moved
to the opening/initialization of the timer.
This commit is contained in:
Daniel Hellstrom
2015-02-18 15:34:39 +01:00
parent f37a3c229e
commit e3c9937418
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
c/src/lib/libbsp/sparc/shared/timer/gptimer.c
View File

@@ -94,7 +94,8 @@ struct gptimer_priv {
struct gptimer_regs *regs; struct gptimer_regs *regs;
unsigned int base_clk; unsigned int base_clk;
unsigned int base_freq; unsigned int base_freq;
int separate_interrupt; char separate_interrupt;
char isr_installed;
/* Structure per Timer unit, the core supports up to 8 timers */ /* Structure per Timer unit, the core supports up to 8 timers */
int timer_cnt; int timer_cnt;
@@ -303,16 +304,6 @@ int gptimer_init1(struct drvmgr_dev *dev)
*/ */
priv->separate_interrupt = regs->cfg & GPTIMER_CFG_SI; priv->separate_interrupt = regs->cfg & GPTIMER_CFG_SI;
if ( priv->separate_interrupt == 0 ) {
/* Shared IRQ handler */
drvmgr_interrupt_register(
priv->dev,
0,
"gptimer_shared",
gptimer_isr,
priv);
}
/* Older HW */ /* Older HW */
@@ -461,6 +452,17 @@ static void gptimer_tlib_irq_reg(struct tlib_dev *hand, tlib_isr_t func, void *d
if ( priv->separate_interrupt ) { if ( priv->separate_interrupt ) {
drvmgr_interrupt_register(priv->dev, timer->tindex, drvmgr_interrupt_register(priv->dev, timer->tindex,
"gptimer", func, data); "gptimer", func, data);
} else {
if (priv->isr_installed == 0) {
/* Shared IRQ handler */
drvmgr_interrupt_register(
priv->dev,
0,
"gptimer_shared",
gptimer_isr,
priv);
}
priv->isr_installed++;
} }
timer->tregs->ctrl |= GPTIMER_CTRL_IE; timer->tregs->ctrl |= GPTIMER_CTRL_IE;
@@ -479,6 +481,11 @@ static void gptimer_tlib_irq_unreg(struct tlib_dev *hand, tlib_isr_t func, void
func, data); func, data);
} else { } else {
timer->tdev.isr_func = NULL; timer->tdev.isr_func = NULL;
priv->isr_installed--;
if (priv->isr_installed == 0) {
drvmgr_interrupt_unregister(priv->dev, 0,
gptimer_isr, priv);
}
} }
} }