From 5ddebf5d812450e1d35cb345036aa513a2a749b6 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Sat, 7 Nov 2015 23:03:57 -0800 Subject: [PATCH] GBA Memory: Fix allowed DMA addresses --- src/gba/memory.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gba/memory.c b/src/gba/memory.c index 4a2f99a37..14a203d58 100644 --- a/src/gba/memory.c +++ b/src/gba/memory.c @@ -1330,14 +1330,11 @@ static bool _isValidDMASAD(int dma, uint32_t address) { if (dma == 0 && address >= BASE_CART0 && address < BASE_CART_SRAM) { return false; } - return address >= BASE_WORKING_RAM && address < 0x10000000; + return address >= BASE_WORKING_RAM; } static bool _isValidDMADAD(int dma, uint32_t address) { - if (dma < 3 && address >= BASE_CART0 && address < 0x10000000) { - return false; - } - return address >= BASE_WORKING_RAM && address < 0x10000000; + return dma == 3 || address < BASE_CART0; } uint32_t GBAMemoryWriteDMASAD(struct GBA* gba, int dma, uint32_t address) {