ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sdsdfs

This commit is contained in:
Arisotura 2021-08-31 00:33:16 +02:00
parent 778d5468ec
commit b60684e094
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/DMA.cpp
View File

@ -297,6 +297,7 @@ u32 DMA::UnitTimings9_16(bool burststart)
} }
else else
{ {
// TODO: not quite right for GBA slot
return (((CurSrcAddr & 0x1F) == 0x1E) ? 7 : 8) + return (((CurSrcAddr & 0x1F) == 0x1E) ? 7 : 8) +
(burststart ? dst_n : dst_s); (burststart ? dst_n : dst_s);
} }
@ -384,7 +385,8 @@ u32 DMA::UnitTimings9_32(bool burststart)
} }
else else
{ {
return (((CurSrcAddr & 0x1F) == 0x1C) ? 8 : 9) + // TODO: not quite right for GBA slot
return (((CurSrcAddr & 0x1F) == 0x1C) ? (dst_n==2 ? 7:8) : 9) +
(burststart ? dst_n : dst_s); (burststart ? dst_n : dst_s);
} }
} }

2
src/DSi.cpp
View File

@ -739,7 +739,7 @@ void Set_SCFG_Clock9(u16 val)
NDS::ARM9Timestamp <<= NDS::ARM9ClockShift; NDS::ARM9Timestamp <<= NDS::ARM9ClockShift;
NDS::ARM9Target <<= NDS::ARM9ClockShift; NDS::ARM9Target <<= NDS::ARM9ClockShift;
NDS::ARM9->UpdateRegionTimings(0x00000000, 0xFFFFFFFF); NDS::ARM9->UpdateRegionTimings(0x00000, 0x100000);
} }
void Set_SCFG_MC(u32 val) void Set_SCFG_MC(u32 val)

4
src/NDS.cpp
View File

@ -2011,7 +2011,7 @@ u16 ARM9Read16(u32 addr)
(GBACart::SRAMRead(addr+1) << 8); (GBACart::SRAMRead(addr+1) << 8);
} }
if (addr) printf("unknown arm9 read16 %08X %08X\n", addr, ARM9->R[15]); //if (addr) printf("unknown arm9 read16 %08X %08X\n", addr, ARM9->R[15]);
return 0; return 0;
} }
@ -2072,7 +2072,7 @@ u32 ARM9Read32(u32 addr)
(GBACart::SRAMRead(addr+3) << 24); (GBACart::SRAMRead(addr+3) << 24);
} }
printf("unknown arm9 read32 %08X | %08X %08X\n", addr, ARM9->R[15], ARM9->R[12]); //printf("unknown arm9 read32 %08X | %08X %08X\n", addr, ARM9->R[15], ARM9->R[12]);
return 0; return 0;
} }