Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PP: Make on-the-fly timer period changes glitch-free. Stop timer when not in use. * #ifdef cleanup

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10776 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2006-08-27 23:43:04 +00:00
parent ff6336f691
commit e9086e05ee
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
firmware/timer.c
View file

@ -28,6 +28,8 @@ static void (*pfn_timer)(void) = NULL; /* timer callback */
static void (*pfn_unregister)(void) = NULL; /* unregister callback */ static void (*pfn_unregister)(void) = NULL; /* unregister callback */
#ifdef CPU_COLDFIRE #ifdef CPU_COLDFIRE
static int base_prescale; static int base_prescale;
#elif defined CPU_PP
static long cycles_new = 0;
#endif #endif
/* interrupt handler */ /* interrupt handler */
@ -51,6 +53,11 @@ void TIMER1(void)
void TIMER2(void) void TIMER2(void)
{ {
TIMER2_VAL; /* ACK interrupt */ TIMER2_VAL; /* ACK interrupt */
if (cycles_new > 0)
{
TIMER2_CFG = 0xc0000000 | cycles_new;
cycles_new = 0;
}
if (pfn_timer != NULL) if (pfn_timer != NULL)
pfn_timer(); pfn_timer();
} }
@ -58,21 +65,10 @@ void TIMER2(void)
static bool timer_set(long cycles, bool start) static bool timer_set(long cycles, bool start)
{ {
#if (CONFIG_CPU == SH7034) || defined(CPU_COLDFIRE)
int phi = 0; /* bits for the prescaler */ int phi = 0; /* bits for the prescaler */
int prescale = 1; int prescale = 1;
#if (CONFIG_CPU==PP5002) || (CONFIG_CPU==PP5020) || (CONFIG_CPU==PNX0101)
/* TODO: Implement for iPod and iFP (if they have prescaler capabilities) */
(void)phi;
#endif
#if CONFIG_CPU == PNX0101
(void)start;
#endif
/* Don't do this on ipods, we don't know if these platforms have prescaler
capabilities on the timer we use. */
#if CONFIG_CPU != PP5020 && CONFIG_CPU != PP5002
while (cycles > 0x10000) while (cycles > 0x10000)
{ /* work out the smallest prescaler that makes it fit */ { /* work out the smallest prescaler that makes it fit */
#if CONFIG_CPU == SH7034 #if CONFIG_CPU == SH7034
@ -83,6 +79,10 @@ static bool timer_set(long cycles, bool start)
} }
#endif #endif
#if CONFIG_CPU == PNX0101 /* TODO: Implement for iFP */
(void)start;
#endif
#if CONFIG_CPU == SH7034 #if CONFIG_CPU == SH7034
if (prescale > 8) if (prescale > 8)
return false; return false;
@ -145,7 +145,9 @@ static bool timer_set(long cycles, bool start)
TCN1 = 0; /* reset the timer */ TCN1 = 0; /* reset the timer */
TER1 = 0xff; /* clear all events */ TER1 = 0xff; /* clear all events */
#elif CONFIG_CPU == PP5020 || CONFIG_CPU == PP5002 #elif CONFIG_CPU == PP5020 || CONFIG_CPU == PP5002
(void)prescale; if (cycles > 0x1fffffff)
return false;
if (start) if (start)
{ {
if (pfn_unregister != NULL) if (pfn_unregister != NULL)
@ -153,11 +155,14 @@ static bool timer_set(long cycles, bool start)
pfn_unregister(); pfn_unregister();
pfn_unregister = NULL; pfn_unregister = NULL;
} }
cycles_new = 0;
TIMER2_CFG = 0;
TIMER2_VAL;
TIMER2_CFG = 0xc0000000 | cycles; /* enable timer */
} }
TIMER2_CFG = 0x0; else
TIMER2_VAL; cycles_new = cycles;
/* enable timer */
TIMER2_CFG = 0xc0000000 | cycles;
#endif /* CONFIG_CPU */ #endif /* CONFIG_CPU */
return true; return true;
} }
@ -235,6 +240,7 @@ void timer_unregister(void)
TMR1 = 0; /* disable timer 1 */ TMR1 = 0; /* disable timer 1 */
or_l((1<<10), &IMR); /* disable interrupt */ or_l((1<<10), &IMR); /* disable interrupt */
#elif CONFIG_CPU == PP5020 || CONFIG_CPU == PP5002 #elif CONFIG_CPU == PP5020 || CONFIG_CPU == PP5002
TIMER2_CFG = 0; /* stop timer 2 */
CPU_INT_CLR = TIMER2_MASK; CPU_INT_CLR = TIMER2_MASK;
#endif #endif
pfn_timer = NULL; pfn_timer = NULL;