Fcalva/gint
1
0
Fork 0
mirror of https://git.planet-casio.com/Lephenixnoir/gint.git synced 2025-01-01 06:23:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tmu: safer restore order

Browse source 
The previous setup made it possible for TCNT to underflow to an
uncontroller value of TCOR during the restore.
This commit is contained in:
Lephe 2020-07-08 19:49:09 +02:00
parent e2886d2bd7
commit 03715344a4
No known key found for this signature in database
GPG key ID: 1BBA026E13FC0495
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/tmu/tmu.c
View file

@ -335,12 +335,12 @@ static void init(void)
/* Clear every timer to avoid surprises */ /* Clear every timer to avoid surprises */
for(int id = 0; id < 3; id++) for(int id = 0; id < 3; id++)
{ {
TMU[id].TCOR = 0xffffffff;
TMU[id].TCNT = 0xffffffff;
do TMU[id].TCR.word = 0; do TMU[id].TCR.word = 0;
while(TMU[id].TCR.word); while(TMU[id].TCR.word);
TMU[id].TCOR = 0xffffffff;
TMU[id].TCNT = 0xffffffff;
/* Standard timers: TCR is provided to the interrupt handler */ /* Standard timers: TCR is provided to the interrupt handler */
timers[id]->TCR = &TMU[id].TCR; timers[id]->TCR = &TMU[id].TCR;
} }
@ -455,13 +455,13 @@ static void ctx_save(void *buf)
static void ctx_restore(void *buf) static void ctx_restore(void *buf)
{ {
ctx_t *ctx = buf; ctx_t *ctx = buf;
*TSTR = ctx->TSTR; *TSTR = 0;
for(int i = 0; i < 3; i++) for(int i = 0; i < 3; i++)
{ {
tmu_t *c = &ctx->std[i]; tmu_t *c = &ctx->std[i];
TMU[i].TCNT = c->TCNT;
TMU[i].TCOR = c->TCOR; TMU[i].TCOR = c->TCOR;
TMU[i].TCNT = c->TCNT;
TMU[i].TCR.word = c->TCR.word; TMU[i].TCR.word = c->TCR.word;
} }
for(int i = 0; i < timer_count() - 3; i++) for(int i = 0; i < timer_count() - 3; i++)
@ -480,6 +480,8 @@ static void ctx_restore(void *buf)
do T->TCR.byte = c->TCR.byte; do T->TCR.byte = c->TCR.byte;
while(T->TCR.byte != c->TCR.byte); while(T->TCR.byte != c->TCR.byte);
} }
*TSTR = ctx->TSTR;
} }
//--- //---