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

cpu/cc2538/timer: fix 32 bit timer reload value

Browse Source 
The interval load value was only set to 0xffff regardless of the counter
mode used which mad the 32bit timer apparently stop after 0xffff (it
would never reach values >0xffff).

When a GPTM is configured to one of the 32-bit modes, TAILR appears as a
32-bit register (the upper 16-bits correspond to the contents of the
GPTM Timer B Interval Load (TBILR) register). In a 16-bit mode, the
upper 16 bits of this register read as 0s and have no effect on the
state of TBILR.

Thsi commit set the correct value for TAILR depending on the configured
timer mode.
This commit is contained in:
Francisco Molina 2020-08-12 10:07:11 +02:00
parent 419ee52ddc
commit 8ed8daa493
No known key found for this signature in database
GPG Key ID: 3E94EAC3DBDEEDA8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cpu/cc2538/periph/timer.c
View File

@ -33,7 +33,8 @@
#define ENABLE_DEBUG (0)
#include "debug.h"
#define LOAD_VALUE (0xffff)
#define LOAD_VALUE_16_BIT (UINT16_MAX)
#define LOAD_VALUE_32_BIT (UINT32_MAX)
#define TIMER_A_IRQ_MASK (0x000000ff)
#define TIMER_B_IRQ_MASK (0x0000ff00)
@ -240,13 +241,14 @@ int timer_init(tim_t tim, unsigned long freq, timer_cb_t cb, void *arg)
dev(tim)->CFG = timer_config[tim].cfg;
/* enable and configure GPTM(tim) timer A */
dev(tim)->TAMR = chan_mode;
dev(tim)->TAILR = LOAD_VALUE;
dev(tim)->TAILR = (timer_config[tim].cfg == GPTMCFG_32_BIT_TIMER) ?
LOAD_VALUE_32_BIT : LOAD_VALUE_16_BIT;
dev(tim)->CTL |= GPTIMER_CTL_TAEN;
if (timer_config[tim].chn > 1) {
/* Enable and configure GPTM(tim) timer B */
dev(tim)->TBMR = chan_mode;
dev(tim)->TBILR = LOAD_VALUE;
dev(tim)->TBILR = LOAD_VALUE_16_BIT;
dev(tim)->CTL |= GPTIMER_CTL_TBEN;
}
@ -278,10 +280,10 @@ int timer_set_absolute(tim_t tim, int channel, unsigned int value)
dev(tim)->ICR = chn_isr_cfg[channel].flag;
if (channel == 0) {
dev(tim)->TAMATCHR = (timer_config[tim].cfg == GPTMCFG_32_BIT_TIMER) ?
value : (LOAD_VALUE - value);
value : (LOAD_VALUE_16_BIT - value);
}
else {
dev(tim)->TBMATCHR = (LOAD_VALUE - value);
dev(tim)->TBMATCHR = (LOAD_VALUE_16_BIT - value);
}
dev(tim)->IMR |= chn_isr_cfg[channel].flag;
@ -318,7 +320,7 @@ unsigned int timer_read(tim_t tim)
return dev(tim)->TAV;
}
else {
return LOAD_VALUE - (dev(tim)->TAV & 0xffff);
return LOAD_VALUE_16_BIT - (dev(tim)->TAV & 0xffff);
}
}