From e0bbb8f59d482d5d27f7c0814c479962856e534a Mon Sep 17 00:00:00 2001 From: ramapcsx2 Date: Thu, 15 Apr 2010 10:14:42 +0000 Subject: [PATCH] Fix typo that broke a few games in r2853. Thanks for spotting it, arcum :) git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2855 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/HwWrite.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pcsx2/HwWrite.cpp b/pcsx2/HwWrite.cpp index 0ef807d528..8d37cde3b9 100644 --- a/pcsx2/HwWrite.cpp +++ b/pcsx2/HwWrite.cpp @@ -98,14 +98,18 @@ static void DmaExec( void (*func)(), u32 mem, u32 value ) //It's invalid for the hardware to write a DMA while it is active, not without Suspending the DMAC if (chcr.STR && reg->chcr.STR && dmacRegs->ctrl.DMAE) { if((reg->chcr._u32 & 0xff) == (chcr._u32 & 0xff)) //Tried to start another DMA in the same mode + { DevCon.Warning(L"DMAExec32 Attempt to run DMA while one is already active in %s(%x)", ChcrName(mem), mem); + } else //Just trying to change mode without stopping the DMA, so we dont care really :P + { HW_LOG("Attempted to change modes while DMA active, ignoring"); - // When DMA is active only STR field is writable, so we just - // call the dma transfer function w/o modifying CHCR contents... - //func(); - Registers::Thaw(); - return; // Test with Gust games and fatal frame + // When DMA is active only STR field is writable, so we just + // call the dma transfer function w/o modifying CHCR contents... + //func(); + Registers::Thaw(); + return; // Test with Gust games and fatal frame + } } // Note: pad is the padding right above qwc, so we're testing whether qwc