From 39740422598fba88e0b8598263432c30f339dc3f Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sun, 24 May 2015 22:50:21 -0700
Subject: [PATCH] GBA Memory: Remove incorrect hack

---
 CHANGES          | 1 -
 src/gba/memory.c | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/CHANGES b/CHANGES
index 218f71738..07e9b1d73 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,7 +22,6 @@ Features:
 Bugfixes:
  - ARM7: Fix SWI and IRQ timings
  - GBA Audio: Force audio FIFOs to 32-bit
- - GBA Memory: Ensure changing the timing of a DMA reschedules it
  - GBA Memory: Improve Thumb open bus behavior
  - VFS: Fix resource leaks if some allocations fail
  - Video: Fix an issue with very long filenames
diff --git a/src/gba/memory.c b/src/gba/memory.c
index 599a94cb6..d15894105 100644
--- a/src/gba/memory.c
+++ b/src/gba/memory.c
@@ -1313,12 +1313,6 @@ uint16_t GBAMemoryWriteDMACNT_HI(struct GBA* gba, int dma, uint16_t control) {
 	struct GBAMemory* memory = &gba->memory;
 	struct GBADMA* currentDma = &memory->dma[dma];
 	int wasEnabled = GBADMARegisterIsEnable(currentDma->reg);
-	int oldTiming = GBADMARegisterGetTiming(currentDma->reg);
-	int newTiming = GBADMARegisterGetTiming(control);
-	// This is probably a huge hack...verify what this does on hardware
-	if (oldTiming && oldTiming != DMA_TIMING_CUSTOM && oldTiming != newTiming) {
-		wasEnabled = false;
-	}
 	currentDma->reg = control;
 
 	if (GBADMARegisterIsDRQ(currentDma->reg)) {