xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge

Browse source
This commit is contained in:
cinap_lenrek 2015-03-28 14:12:35 +01:00
parent feb92fedb1 5a34ad16cd
commit eff2a40c16
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/games/gba/apu.c
View file

@ -209,7 +209,7 @@ sampletick(void *)
s16int s[2];
int i;
addevent(&evsamp, sratediv + evsamp.time);
addevent(&evsamp, sratediv);
if(--envctr == 0){
envctr = envrel;

6
sys/src/games/gba/ev.c
View file

@ -185,9 +185,11 @@ timertick(void *aux)
Timer *t;
u32int v;
int to;
ulong clock0;
t = aux;
t->clock = clock + t->time & -(1 << t->sh);
clock0 = clock + t->time;
t->clock = clock0 & -(1 << t->sh);
t->val = -t->time >> t->sh;
do{
to = 0;
@ -196,7 +198,7 @@ timertick(void *aux)
to++;
}while(v >= 0x10000);
if(t == aux)
addevent(t, (0x10000 - t->val << t->sh) + (-clock & (1 << t->sh) - 1));
addevent(t, (0x10000 - t->val << t->sh) + (-clock0 & (1 << t->sh) - 1));
if((*t->cnt & TIMERIRQ) != 0)
setif(IRQTIM0 << t->i);
if(t->snd)

4
sys/src/games/gba/ppu.c
View file

@ -733,7 +733,7 @@ hblanktick(void *)
stat = reg[DISPSTAT];
if(hblank){
hblclock = clock + evhblank.time;
addevent(&evhblank, 240*4 + evhblank.time);
addevent(&evhblank, 240*4);
hblank = 0;
ppux0 = 0;
memset(pixpri, VACANT, sizeof(pixpri));
@ -755,7 +755,7 @@ hblanktick(void *)
}else{
syncppu(240);
linecopy();
addevent(&evhblank, 68*4 + evhblank.time);
addevent(&evhblank, 68*4);
hblank = 1;
if((stat & IRQHBLEN) != 0)
setif(IRQHBL);