riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/cc430: timer: s/TIMER_DEV/TIMER_BASE/

Browse Source
This commit is contained in:
Hauke Petersen 2015-09-04 15:39:04 +02:00
parent 35aaa62c38
commit b49eb93249
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cpu/cc430/periph/timer.c
View File

@ -37,7 +37,7 @@ static void (*isr_cb)(int chan);
int timer_init(tim_t dev, unsigned int us_per_tick, void (*callback)(int)) int timer_init(tim_t dev, unsigned int us_per_tick, void (*callback)(int))
{ {
/* using fixed TIMER_DEV for now */ /* using fixed TIMER_BASE for now */
if (dev != 0) { if (dev != 0) {
return -1; return -1;
} }
@ -47,23 +47,23 @@ int timer_init(tim_t dev, unsigned int us_per_tick, void (*callback)(int))
} }
/* reset the timer A configuration */ /* reset the timer A configuration */
TIMER_DEV->CTL = CTL_CLR; TIMER_BASE->CTL = CTL_CLR;
/* save callback */ /* save callback */
isr_cb = callback; isr_cb = callback;
/* configure timer to use the SMCLK with prescaler of 8 */ /* configure timer to use the SMCLK with prescaler of 8 */
TIMER_DEV->CTL = (CTL_TASSEL_SMCLK | CTL_ID_DIV8); TIMER_BASE->CTL = (CTL_TASSEL_SMCLK | CTL_ID_DIV8);
/* configure CC channels */ /* configure CC channels */
for (int i = 0; i < TIMER_CHAN; i++) { for (int i = 0; i < TIMER_CHAN; i++) {
TIMER_DEV->CCTL[i] = 0; TIMER_BASE->CCTL[i] = 0;
} }
/* start the timer in continuous mode */ /* start the timer in continuous mode */
TIMER_DEV->CTL |= CTL_MC_CONT; TIMER_BASE->CTL |= CTL_MC_CONT;
return 0; return 0;
} }
int timer_set(tim_t dev, int channel, unsigned int timeout) int timer_set(tim_t dev, int channel, unsigned int timeout)
{ {
uint16_t target = TIMER_DEV->R + (uint16_t)timeout; uint16_t target = TIMER_BASE->R + (uint16_t)timeout;
return timer_set_absolute(dev, channel, (unsigned int)target); return timer_set_absolute(dev, channel, (unsigned int)target);
} }
@ -72,9 +72,9 @@ int timer_set_absolute(tim_t dev, int channel, unsigned int value)
if (dev != 0 || channel > TIMER_CHAN) { if (dev != 0 || channel > TIMER_CHAN) {
return -1; return -1;
} }
TIMER_DEV->CCR[channel] = value; TIMER_BASE->CCR[channel] = value;
TIMER_DEV->CCTL[channel] &= ~(CCTL_CCIFG); TIMER_BASE->CCTL[channel] &= ~(CCTL_CCIFG);
TIMER_DEV->CCTL[channel] |= (CCTL_CCIE); TIMER_BASE->CCTL[channel] |= (CCTL_CCIE);
return 0; return 0;
} }
@ -83,23 +83,23 @@ int timer_clear(tim_t dev, int channel)
if (dev != 0 || channel > TIMER_CHAN) { if (dev != 0 || channel > TIMER_CHAN) {
return -1; return -1;
} }
TIMER_DEV->CCTL[channel] &= ~(CCTL_CCIE); TIMER_BASE->CCTL[channel] &= ~(CCTL_CCIE);
return 0; return 0;
} }
unsigned int timer_read(tim_t dev) unsigned int timer_read(tim_t dev)
{ {
return (unsigned int)TIMER_DEV->R; return (unsigned int)TIMER_BASE->R;
} }
void timer_start(tim_t dev) void timer_start(tim_t dev)
{ {
TIMER_DEV->CTL |= CTL_MC_CONT; TIMER_BASE->CTL |= CTL_MC_CONT;
} }
void timer_stop(tim_t dev) void timer_stop(tim_t dev)
{ {
TIMER_DEV->CTL &= ~(CTL_MC_MASK); TIMER_BASE->CTL &= ~(CTL_MC_MASK);
} }
void timer_irq_enable(tim_t dev) void timer_irq_enable(tim_t dev)
@ -121,14 +121,14 @@ void timer_irq_disable(tim_t dev)
void timer_reset(tim_t dev) void timer_reset(tim_t dev)
{ {
TIMER_DEV->R = 0; TIMER_BASE->R = 0;
} }
ISR(TIMER_ISR_CC0, isr_timer_a_cc0) ISR(TIMER_ISR_CC0, isr_timer_a_cc0)
{ {
__enter_isr(); __enter_isr();
TIMER_DEV->CCTL[0] &= ~(CCTL_CCIE); TIMER_BASE->CCTL[0] &= ~(CCTL_CCIE);
isr_cb(0); isr_cb(0);
__exit_isr(); __exit_isr();
@ -138,8 +138,8 @@ ISR(TIMER_ISR_CCX, isr_timer_a_ccx_isr)
{ {
__enter_isr(); __enter_isr();
int chan = (int)(TIMER_DEV->IV >> 1); int chan = (int)(TIMER_BASE->IV >> 1);
TIMER_DEV->CCTL[chan] &= ~(CCTL_CCIE); TIMER_BASE->CCTL[chan] &= ~(CCTL_CCIE);
isr_cb(chan); isr_cb(chan);
__exit_isr(); __exit_isr();