diff options
| -rw-r--r-- | firmware/SOURCES | 1 | ||||
| -rw-r--r-- | firmware/target/arm/as3525/timer-as3525.c | 68 | ||||
| -rw-r--r-- | firmware/timer.c | 35 |
3 files changed, 69 insertions, 35 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index f6bc547f45..11f09e7062 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -372,6 +372,7 @@ target/arm/pnx0101/system-pnx0101.c #if CONFIG_CPU == AS3525 target/arm/as3525/system-as3525.c target/arm/as3525/kernel-as3525.c +target/arm/as3525/timer-as3525.c target/arm/as3525/ata_sd_as3525.c target/arm/as3525/power-as3525.c target/arm/as3525/usb-as3525.c diff --git a/firmware/target/arm/as3525/timer-as3525.c b/firmware/target/arm/as3525/timer-as3525.c new file mode 100644 index 0000000000..755438a1f8 --- /dev/null +++ b/firmware/target/arm/as3525/timer-as3525.c @@ -0,0 +1,68 @@ +/*************************************************************************** +* __________ __ ___. +* Open \______ \ ____ ____ | | _\_ |__ _______ ___ +* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / +* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < +* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ +* \/ \/ \/ \/ \/ +* $Id$ +* +* Copyright (C) 2008 Rafaël Carré +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +* KIND, either express or implied. +* +****************************************************************************/ + +#include "as3525.h" +#include "timer.h" +#include "stdlib.h" + +void INT_TIMER1(void) +{ + if (pfn_timer != NULL) + pfn_timer(); + + TIMER1_INTCLR = 0; /* clear interrupt */ +} + +bool __timer_set(long cycles, bool start) +{ + if (start) + { + if (pfn_unregister != NULL) + { + pfn_unregister(); + pfn_unregister = NULL; + } + } + + TIMER1_LOAD = TIMER1_BGLOAD = cycles; + /* /!\ bit 4 (reserved) must not be modified + * periodic mode, interrupt enabled, no prescale, 32 bits counter */ + TIMER1_CONTROL = (TIMER1_CONTROL & (1<<4)) | + TIMER_ENABLE | + TIMER_PERIODIC | + TIMER_INT_ENABLE | + TIMER_32_BIT; + return true; +} + +bool __timer_register(void) +{ + CGU_PERI |= CGU_TIMER1_CLOCK_ENABLE; /* enable peripheral */ + VIC_INT_ENABLE |= INTERRUPT_TIMER1; + return true; +} + +void __timer_unregister(void) +{ + TIMER1_CONTROL &= 0x10; /* disable timer 1 (don't modify bit 4) */ + VIC_INT_EN_CLEAR = INTERRUPT_TIMER1; /* disable interrupt */ + CGU_PERI &= ~CGU_TIMER1_CLOCK_ENABLE; /* disable peripheral */ +} diff --git a/firmware/timer.c b/firmware/timer.c index 1cd913bb35..bcaacba307 100644 --- a/firmware/timer.c +++ b/firmware/timer.c @@ -61,14 +61,6 @@ void TIMER1(void) pfn_timer(); TER1 = 0xff; /* clear all events */ } -#elif CONFIG_CPU == AS3525 -void INT_TIMER1(void) -{ - if (pfn_timer != NULL) - pfn_timer(); - - TIMER1_INTCLR = 0; /* clear interrupt */ -} #elif defined(CPU_PP) void TIMER2(void) { @@ -171,25 +163,6 @@ static bool timer_set(long cycles, bool start) and_b(~0x01, &TSR4); /* clear an eventual interrupt */ return true; -#elif CONFIG_CPU == AS3525 - if (start) - { - if (pfn_unregister != NULL) - { - pfn_unregister(); - pfn_unregister = NULL; - } - } - - TIMER1_LOAD = TIMER1_BGLOAD = cycles; - /* /!\ bit 4 (reserved) must not be modified - * periodic mode, interrupt enabled, no prescale, 32 bits counter */ - TIMER1_CONTROL = (TIMER1_CONTROL & (1<<4)) | - TIMER_ENABLE | - TIMER_PERIODIC | - TIMER_INT_ENABLE | - TIMER_32_BIT; - return true; #elif defined CPU_COLDFIRE if (prescale > 4096/CPUFREQ_MAX_MULT) return false; @@ -314,10 +287,6 @@ bool timer_register(int reg_prio, void (*unregister_callback)(void), irq_set_int_handler(IRQ_TIMER1, TIMER1_ISR); irq_enable_int(IRQ_TIMER1); return true; -#elif CONFIG_CPU == AS3525 - CGU_PERI |= CGU_TIMER1_CLOCK_ENABLE; /* enable peripheral */ - VIC_INT_ENABLE |= INTERRUPT_TIMER1; - return true; #else return __TIMER_REGISTER(reg_prio, unregister_callback, cycles, int_prio, timer_callback); @@ -351,10 +320,6 @@ void timer_unregister(void) #elif CONFIG_CPU == PNX0101 TIMER1.ctrl &= ~0x80; /* disable timer 1 */ irq_disable_int(IRQ_TIMER1); -#elif CONFIG_CPU == AS3525 - TIMER1_CONTROL &= 0x10; /* disable timer 1 (don't modify bit 4) */ - VIC_INT_EN_CLEAR = INTERRUPT_TIMER1; /* disable interrupt */ - CGU_PERI &= ~CGU_TIMER1_CLOCK_ENABLE; /* disable peripheral */ #else __TIMER_UNREGISTER(); #endif |