From 2c8bede679533f27df3497aafbac73db4d033952 Mon Sep 17 00:00:00 2001 From: arcum42 Date: Thu, 8 Oct 2009 18:47:32 +0000 Subject: [PATCH] Revert one of my changes from r1970. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1985 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/Vif1Dma.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pcsx2/Vif1Dma.cpp b/pcsx2/Vif1Dma.cpp index c7c916371..19495f01c 100644 --- a/pcsx2/Vif1Dma.cpp +++ b/pcsx2/Vif1Dma.cpp @@ -679,7 +679,7 @@ int VIF1transfer(u32 *data, int size, int istag) } vif1Regs->stat.VPS = 0; //Vif goes idle as the stall happened between commands; - if (vif1.cmd) vif1Regs->stat.VPS |= VPS_WAITING; //Otherwise we wait for the data + if (vif1.cmd) vif1Regs->stat.VPS = VPS_WAITING; //Otherwise we wait for the data if (!istag) { @@ -1127,21 +1127,21 @@ void vif1Write32(u32 mem, u32 value) } #endif - vif1Regs->stat._u32 = (vif1Regs->stat.test(~VIF1_STAT_FDR)) | (value & VIF1_STAT_FDR); + vif1Regs->stat._u32 = (vif1Regs->stat._u32 & ~VIF1_STAT_FDR) | (value & VIF1_STAT_FDR); if (vif1Regs->stat.FDR) { - vif1Regs->stat.FQC = 1; // FQC=1 - hack but it checks this is true before transfer? (fatal frame) + vif1Regs->stat.FQC = 1; // Hack but it checks this is true before transfer? (fatal frame) } else { vif1ch->qwc = 0; vif1.vifstalled = false; vif1.done = true; - vif1Regs->stat.FQC = 0; // FQC=0 + vif1Regs->stat.FQC = 0; } break; - case VIF1_MODE: // MODE + case VIF1_MODE: vif1Regs->mode = value; break;