persistent tmr_time_t _tmr_ticks;
tmr_bitno_t _tmr_on;
tmr_bitno_t _tmr_periodic;
-static tmr_bitno_t _tmr_fired;
+static tmr_bitno_t _tmr_flag;
static tmr_time_t _tmr_t0[TMR_COUNT];
static tmr_time_t _tmr_elapsed[TMR_COUNT];
void tmr_init()
{
- /* Configure Timer0 to overflow every 32 msec. Adjust with
+ /* Configure Timer0 to overflow every 32 msec. Adjust for
* Fosc as set in picinit.[ch]. At 4 MHz, prescale is 1:128.
* TMR0CS = 0, PSA = 0, PS = 0b110
*/
ndi();
bit_set(_tmr_on, t);
bit_clr(_tmr_periodic, t);
- bit_clr(_tmr_fired, t);
+ bit_clr(_tmr_flag, t);
_tmr_t0[t] = _tmr_ticks;
_tmr_elapsed[t] = elapsed;
nei();
ndi();
bit_set(_tmr_on, t);
bit_clr(_tmr_periodic, t);
- bit_clr(_tmr_fired, t);
- _tmr_t0[t] = t0 + elapsed;
+ bit_clr(_tmr_flag, t);
+ _tmr_t0[t] = t0;
nei();
}
ndi();
bit_set(_tmr_on, t);
bit_set(_tmr_periodic, t);
- bit_clr(_tmr_fired, t);
- _tmr_t0[t] = _tmr_ticks + elapsed;
+ bit_clr(_tmr_flag, t);
+ _tmr_t0[t] = _tmr_ticks;
_tmr_elapsed[t] = elapsed;
nei();
}
ndi();
bit_set(_tmr_on, t);
bit_set(_tmr_periodic, t);
- bit_clr(_tmr_fired, t);
- _tmr_t0[t] = t0 + elapsed;
+ bit_clr(_tmr_flag, t);
+ _tmr_t0[t] = t0;
_tmr_elapsed[t] = elapsed;
nei();
}
bit tmr_fired(tmr_bitno_t t)
{
- /* FIXME: if called from ISR ndi()/nei() is not required */
- static unsigned char last_fired;
unsigned char fired;
ndi();
- fired = bit_get(_tmr_fired, t) != 0;
+ fired = bit_get(_tmr_flag, t);
if (fired)
- bit_clr(_tmr_fired, t);
+ bit_clr(_tmr_flag, t);
nei();
- return fired;
+ return fired != 0;
}
void tmr_isr()
TMR0IF = 0;
_tmr_ticks++;
for (tmr_bitno_t t = 0; t < TMR_COUNT; t++) {
- if (_tmr_ticks - _tmr_t0[t] <= 0) {
- bit_set(_tmr_fired, t);
+ if (bit_get(_tmr_on, t) && _tmr_ticks - _tmr_t0[t] >= _tmr_elapsed[t]) {
+ bit_set(_tmr_flag, t);
if (bit_get(_tmr_periodic, t))
_tmr_t0[t] += _tmr_elapsed[t];
else
}
}
-/* Wait for a specific timer value t */
-#define tmr_wait(t) while (TMR0 != t);
-
void tmr_uwait(unsigned us)
{
- unsigned t0 = TMR0;
-
- while (us >= 32768) {
- tmr_wait(t0);
- us -= 32768;
- }
while (us >= 16384) {
tmr_cwait(128);
us -= 16384;
void tmr_mwait(unsigned ms)
{
- unsigned t0 = TMR0;
-
- while (ms >= 32) {
- tmr_wait(t0);
- ms -= 32;
- }
while (ms >= 16) {
tmr_cwait(128);
ms -= 16;