aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStapleButter <thetotalworm@gmail.com>2018-04-24 22:34:53 +0200
committerGitHub <noreply@github.com>2018-04-24 22:34:53 +0200
commit0bd9204cc1a6f8d1c89489fcb5284038eff99ea3 (patch)
tree610f59271acf8f1ad7c3841a58f38bb85bc0267c
parentaab0030137d70a7ef06c2d2e859f195dd06e0079 (diff)
parenta2c95f2dc33a5bca3ba6deeb079fe3b312004d52 (diff)
Merge pull request #241 from Dirbaio/master
Add 32bit IPCSYNC reads and writes.
-rw-r--r--src/NDS.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/NDS.cpp b/src/NDS.cpp
index 34eccf7..dfd7d80 100644
--- a/src/NDS.cpp
+++ b/src/NDS.cpp
@@ -1616,6 +1616,8 @@ u32 ARM9IORead32(u32 addr)
case 0x04000130: return (KeyInput & 0xFFFF) | (KeyCnt << 16);
+ case 0x04000180: return IPCSync9;
+
case 0x040001A0: return NDSCart::SPICnt | (NDSCart::ReadSPIData() << 16);
case 0x040001A4: return NDSCart::ROMCnt;
@@ -1983,6 +1985,9 @@ void ARM9IOWrite32(u32 addr, u32 val)
case 0x04000130:
KeyCnt = val >> 16;
return;
+ case 0x04000180:
+ ARM9IOWrite16(addr, val);
+ return;
case 0x04000188:
if (IPCFIFOCnt9 & 0x8000)
@@ -2235,6 +2240,8 @@ u32 ARM7IORead32(u32 addr)
case 0x04000134: return RCnt | (KeyCnt & 0xFFFF0000);
case 0x04000138: return RTC::Read();
+ case 0x04000180: return IPCSync7;
+
case 0x040001A0: return NDSCart::SPICnt | (NDSCart::ReadSPIData() << 16);
case 0x040001A4: return NDSCart::ROMCnt;
@@ -2521,6 +2528,9 @@ void ARM7IOWrite32(u32 addr, u32 val)
case 0x04000134: RCnt = val & 0xFFFF; return;
case 0x04000138: RTC::Write(val & 0xFFFF, false); return;
+ case 0x04000180:
+ ARM7IOWrite16(addr, val);
+ return;
case 0x04000188:
if (IPCFIFOCnt7 & 0x8000)
{