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

tmu: fix dreadful omission of timer ID in ETMU handler

Browse source 
This change fixes a never-should-have-worked problem where the ETMU
interrupt handler loses track of the timer ID before attempting to call
timer_stop(), resulting in complete nonsense.

And also a similar problem in timer_wait().
This commit is contained in:
Lephe 2020-06-18 20:20:55 +02:00
parent 230b796196
commit bf2d407f1d
No known key found for this signature in database
GPG key ID: 1BBA026E13FC0495
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/tmu/inth.s
View file

@ -147,6 +147,7 @@ _inth_etmu2:
mov #5, r1 mov #5, r1
.shared4: .shared4:
mov.l r1, @-r15
sts.l pr, @-r15 sts.l pr, @-r15
mov.l r0, @-r15 mov.l r0, @-r15
@ -158,9 +159,8 @@ _inth_etmu2:
/* Prepare invoking the callback function */ /* Prepare invoking the callback function */
mov.l @r15+, r0 mov.l @r15+, r0
mov.l .gint_inth_callback_2, r1 mov.l .gint_inth_callback_2, r1
mov.l @r0, r4
bra _inth_etmu_help bra _inth_etmu_help
mov.l @(4, r0), r5 mov.l @r0, r4
.storage_etmu2: .storage_etmu2:
.long 0 /* Callback: Configured dynamically */ .long 0 /* Callback: Configured dynamically */
@ -171,19 +171,19 @@ _inth_etmu_help:
/* Invoke callback; if return value is non-zero, stop timer */ /* Invoke callback; if return value is non-zero, stop timer */
jsr @r1 jsr @r1
nop mov.l @(4, r0), r5
tst r0, r0 tst r0, r0
bt .shared5 bt .shared5
mov.l .timer_stop_2, r1 mov.l .timer_stop_2, r1
jsr @r1 jsr @r1
nop mov.l @(4, r15), r4
/* Clear the flag and possibly stop the timer */ /* Clear the flag and possibly stop the timer */
.shared5: .shared5:
lds.l @r15+, pr lds.l @r15+, pr
rts rts
nop add #4, r15
.gint_inth_callback_2: .gint_inth_callback_2:
.long _gint_inth_callback .long _gint_inth_callback

2
src/tmu/tmu.c
View file

@ -173,7 +173,7 @@ void timer_wait(int id)
} }
else else
{ {
etmu_t *T = &ETMU[id]; etmu_t *T = &ETMU[id-3];
while(T->TSTR) if(T->TCR.UNIE) sleep(); while(T->TSTR) if(T->TCR.UNIE) sleep();
} }
} }