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

games/gba: fix dma repeat bit and eeprom addresses

Browse source
This commit is contained in:
aiju 2014-09-30 15:48:32 +02:00
parent 4f264cedfb
commit 74b7abe95c
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sys/src/games/gba/mem.c
View file

@ -20,6 +20,7 @@ enum {
}; };
u32int dmar[16]; u32int dmar[16];
u8int waitst[16] = {5, 5, 5, 5, 3, 5, 5, 9, 8, 10, 10, 14}; u8int waitst[16] = {5, 5, 5, 5, 3, 5, 5, 9, 8, 10, 10, 14};
u32int eepstart;
extern int cyc; extern int cyc;
@ -260,7 +261,7 @@ memread(u32int a, int n, int seq)
b = a & 0x1ffffff; b = a & 0x1ffffff;
cyc += waitst[(a >> 25) - 4 | seq << 2 | (n > 2) << 3]; cyc += waitst[(a >> 25) - 4 | seq << 2 | (n > 2) << 3];
if(b >= nrom){ if(b >= nrom){
if(backup == EEPROM && b >= 0x1000000 && (nrom < 16*KB*KB || b >= 0x1ffff00)) if(b >= eepstart)
return eepromread(); return eepromread();
return 0; return 0;
} }
@ -326,7 +327,7 @@ memwrite(u32int a, u32int v, int n)
case 8: case 9: case 10: case 11: case 12: case 13: case 8: case 9: case 10: case 11: case 12: case 13:
if(backup == EEPROM){ if(backup == EEPROM){
b = a & 0x01ffffff; b = a & 0x01ffffff;
if(b >= 0x1000000 && (nrom < 16*KB*KB || b >= 0x1ffff00)) if(b >= eepstart)
eepromwrite(v & 1); eepromwrite(v & 1);
} }
return; return;
@ -352,6 +353,13 @@ void
memreset(void) memreset(void)
{ {
reg[0x88/2] = 0x200; reg[0x88/2] = 0x200;
if(backup == EEPROM)
if(nrom <= 16*KB*KB)
eepstart = 0x1000000;
else
eepstart = 0x1ffff00;
else
eepstart = -1;
} }
void void
@ -442,9 +450,9 @@ dmastep(void)
if(--dr[DMACNT] == 0){ if(--dr[DMACNT] == 0){
dmaact &= ~(1<<i); dmaact &= ~(1<<i);
if((cnt & DMAREP) != 0){ if((cnt & DMAREP) != 0){
dmar[DMACNT] = cntp[-1]; dr[DMACNT] = cntp[-1];
if((cnt >> DMADCNT & 3) == DMAINCREL) if((cnt >> DMADCNT & 3) == DMAINCREL)
dmar[DMADST] = cntp[-3] | cntp[-2] << 16; dr[DMADST] = cntp[-3] | cntp[-2] << 16;
}else }else
*cntp &= ~DMAEN; *cntp &= ~DMAEN;
if((cnt & DMAIRQ) != 0) if((cnt & DMAIRQ) != 0)

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

@ -132,7 +132,7 @@ tile(bg *b)
} }
void void
bginit(bg *b, int scal, int bit) bginit(bg *b, int scal, int)
{ {
u16int cnt, x, y; u16int cnt, x, y;
u16int *rr; u16int *rr;