From 7590c48471be202d522a5b8674953e677ae143b1 Mon Sep 17 00:00:00 2001
From: Jaklyy <102590697+Jaklyy@users.noreply.github.com>
Date: Mon, 16 Dec 2024 11:45:14 -0500
Subject: [PATCH] Revert "revert arm9 main ram dma again (again (again))"

This reverts commit c90f10d056219130d0b481eea3b9e0a9586861e9.
---
 src/DMA.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/DMA.cpp b/src/DMA.cpp
index dc78ee35..fd961d89 100644
--- a/src/DMA.cpp
+++ b/src/DMA.cpp
@@ -215,7 +215,7 @@ u32 DMA::UnitTimings9_16(int burststart)
     dst_n = NDS.ARM9MemTimings[dst_id][4];
     dst_s = NDS.ARM9MemTimings[dst_id][5];
     
-    if (src_rgn == Mem9_MainRAM)
+    /*if (src_rgn == Mem9_MainRAM)
     {
         if (dst_rgn == Mem9_MainRAM)
         {
@@ -276,7 +276,7 @@ u32 DMA::UnitTimings9_16(int burststart)
             return ((burststart == 2) ? src_n : src_s) + 7;
         }
     }
-    else if (src_rgn & dst_rgn)
+    else*/ if (src_rgn & dst_rgn)
     {
         if (burststart != 1)
             return src_n + dst_n + (src_n == 1 || burststart <= 0);
@@ -306,7 +306,7 @@ u32 DMA::UnitTimings9_32(int burststart)
     dst_n = NDS.ARM9MemTimings[dst_id][6];
     dst_s = NDS.ARM9MemTimings[dst_id][7];
 
-    if (src_rgn == Mem9_MainRAM)
+    /*if (src_rgn == Mem9_MainRAM)
     {
         if (dst_rgn == Mem9_MainRAM)
             return (burststart == 2) ? 13 : 18;
@@ -369,7 +369,7 @@ u32 DMA::UnitTimings9_32(int burststart)
             return ((burststart == 2) ? src_n : src_s) + 8;
         }
     }
-    else if (src_rgn & dst_rgn)
+    else*/ if (src_rgn & dst_rgn)
     {
         if (burststart != 1)
             return src_n + dst_n + (src_n == 1 || burststart <= 0);
@@ -584,14 +584,14 @@ void DMA::Run9()
     if (!(Cnt & (1<<26)))
     {
         while (IterCount > 0 && !Stall)
-        {/*
+        {
             u32 rgn = NDS.ARM9Regions[CurSrcAddr>>14] | NDS.ARM9Regions[CurDstAddr>>14];
             if (rgn & Mem9_MainRAM)
             {
                 NDS.ARM9.MRTrack.Type = MainRAMType::DMA16;
                 NDS.ARM9.MRTrack.Var = Num;
                 break;
-            }*/
+            }
 
             NDS.DMA9Timestamp += (UnitTimings9_16(burststart) << NDS.ARM9ClockShift);
             burststart -= 1;
@@ -609,14 +609,14 @@ void DMA::Run9()
     else
     {
         while (IterCount > 0 && !Stall)
-        {/*
+        {
             u32 rgn = NDS.ARM9Regions[CurSrcAddr>>14] | NDS.ARM9Regions[CurDstAddr>>14];
             if (rgn & Mem9_MainRAM)
             {
                 NDS.ARM9.MRTrack.Type = MainRAMType::DMA32;
                 NDS.ARM9.MRTrack.Var = Num;
                 break;
-            }*/
+            }
 
             NDS.DMA9Timestamp += (UnitTimings9_32(burststart) << NDS.ARM9ClockShift);
             burststart -= 1;