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

add SCFG_MC

This commit is contained in:
Arisotura 2019-06-20 23:34:32 +02:00
parent 1bd7243edc
commit 1d138c0589
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/DSi.cpp
View File

@ -44,6 +44,8 @@ namespace DSi
u32 BootAddr[2]; u32 BootAddr[2];
u32 SCFG_MC;
u32 MBK[2][9]; u32 MBK[2][9];
u8 NWRAM_A[0x40000]; u8 NWRAM_A[0x40000];
@ -121,6 +123,8 @@ void Reset()
SDMMC->Reset(); SDMMC->Reset();
SDIO->Reset(); SDIO->Reset();
SCFG_MC = 0x0011;
// LCD init flag // LCD init flag
GPU::DispStat[0] |= (1<<6); GPU::DispStat[0] |= (1<<6);
GPU::DispStat[1] |= (1<<6); GPU::DispStat[1] |= (1<<6);
@ -1004,6 +1008,7 @@ u16 ARM9IORead16(u32 addr)
switch (addr) switch (addr)
{ {
case 0x04004004: return 0; // TODO case 0x04004004: return 0; // TODO
case 0x04004010: return SCFG_MC & 0xFFFF;
CASE_READ16_32BIT(0x04004040, MBK[0][0]) CASE_READ16_32BIT(0x04004040, MBK[0][0])
CASE_READ16_32BIT(0x04004044, MBK[0][1]) CASE_READ16_32BIT(0x04004044, MBK[0][1])
@ -1024,7 +1029,7 @@ u32 ARM9IORead32(u32 addr)
switch (addr) switch (addr)
{ {
case 0x04004008: return 0x8307F100; case 0x04004008: return 0x8307F100;
case 0x04004010: return 1; // todo case 0x04004010: return SCFG_MC & 0xFFFF;
case 0x04004040: return MBK[0][0]; case 0x04004040: return MBK[0][0];
case 0x04004044: return MBK[0][1]; case 0x04004044: return MBK[0][1];
@ -1264,6 +1269,7 @@ u16 ARM7IORead16(u32 addr)
case 0x04004004: return 0x0187; case 0x04004004: return 0x0187;
case 0x04004006: return 0; // JTAG register case 0x04004006: return 0; // JTAG register
case 0x04004010: return SCFG_MC & 0xFFFF;
CASE_READ16_32BIT(0x04004040, MBK[1][0]) CASE_READ16_32BIT(0x04004040, MBK[1][0])
CASE_READ16_32BIT(0x04004044, MBK[1][1]) CASE_READ16_32BIT(0x04004044, MBK[1][1])
@ -1302,6 +1308,7 @@ u32 ARM7IORead32(u32 addr)
case 0x0400021C: return NDS::IF2; case 0x0400021C: return NDS::IF2;
case 0x04004008: return 0x80000000; // HAX case 0x04004008: return 0x80000000; // HAX
case 0x04004010: return SCFG_MC;
case 0x04004040: return MBK[1][0]; case 0x04004040: return MBK[1][0];
case 0x04004044: return MBK[1][1]; case 0x04004044: return MBK[1][1];
@ -1382,6 +1389,13 @@ void ARM7IOWrite16(u32 addr, u16 val)
{ {
case 0x04000218: NDS::IE2 = (val & 0x7FF7); NDS::UpdateIRQ(1); return; case 0x04000218: NDS::IE2 = (val & 0x7FF7); NDS::UpdateIRQ(1); return;
case 0x0400021C: NDS::IF2 &= ~(val & 0x7FF7); NDS::UpdateIRQ(1); return; case 0x0400021C: NDS::IF2 &= ~(val & 0x7FF7); NDS::UpdateIRQ(1); return;
case 0x04004010:
val &= 0x800C;
if ((val & 0xC) == 0xC) val &= ~0xC; // hax
if (val & 0x8000) printf("SCFG_MC: weird NDS slot swap\n");
SCFG_MC = (SCFG_MC & ~0x800C) | val;
return;
} }
if (addr >= 0x04004800 && addr < 0x04004A00) if (addr >= 0x04004800 && addr < 0x04004A00)
@ -1405,6 +1419,13 @@ void ARM7IOWrite32(u32 addr, u32 val)
case 0x04000218: NDS::IE2 = (val & 0x7FF7); NDS::UpdateIRQ(1); return; case 0x04000218: NDS::IE2 = (val & 0x7FF7); NDS::UpdateIRQ(1); return;
case 0x0400021C: NDS::IF2 &= ~(val & 0x7FF7); NDS::UpdateIRQ(1); return; case 0x0400021C: NDS::IF2 &= ~(val & 0x7FF7); NDS::UpdateIRQ(1); return;
case 0x04004010:
val &= 0xFFFF800C;
if ((val & 0xC) == 0xC) val &= ~0xC; // hax
if (val & 0x8000) printf("SCFG_MC: weird NDS slot swap\n");
SCFG_MC = (SCFG_MC & ~0xFFFF800C) | val;
return;
case 0x04004054: MapNWRAMRange(1, 0, val); return; case 0x04004054: MapNWRAMRange(1, 0, val); return;
case 0x04004058: MapNWRAMRange(1, 1, val); return; case 0x04004058: MapNWRAMRange(1, 1, val); return;
case 0x0400405C: MapNWRAMRange(1, 2, val); return; case 0x0400405C: MapNWRAMRange(1, 2, val); return;