diff --git a/pcsx2/Tags.h b/pcsx2/Tags.h index 0de3f9ff3f..11d664a566 100644 --- a/pcsx2/Tags.h +++ b/pcsx2/Tags.h @@ -293,19 +293,19 @@ namespace D_CTRL { static __forceinline bool DMAE() { return !!(psHu32(DMAC_CTRL) & CTRL_DMAE); } static __forceinline bool RELE() { return !!(psHu32(DMAC_CTRL) & CTRL_RELE); } - static __forceinline bool MFD() + static __forceinline mfd_type MFD() { return (mfd_type)((psHu32(DMAC_CTRL) & CTRL_MFD) >> 2); } - static __forceinline bool STS() + static __forceinline sts_type STS() { - return (sts_type)((psHu32(DMAC_CTRL) & CTRL_STS) >> 2); + return (sts_type)((psHu32(DMAC_CTRL) & CTRL_STS) >> 4); } - static __forceinline bool STD() + static __forceinline std_type STD() { - return (std_type)((psHu32(DMAC_CTRL) & CTRL_STD) >> 2); + return (std_type)((psHu32(DMAC_CTRL) & CTRL_STD) >> 6); } - static __forceinline bool RCLC() + static __forceinline int RCLC() { return ((((psHu32(DMAC_CTRL) & CTRL_RCYC) >> 3) + 1) * 8); } diff --git a/pcsx2/Vif.cpp b/pcsx2/Vif.cpp index 2cf78d4192..99409a647f 100644 --- a/pcsx2/Vif.cpp +++ b/pcsx2/Vif.cpp @@ -469,14 +469,14 @@ void mfifoVIF1transfer(int qwc) } Tag::UnsafeTransfer(vif1ch, ptag); - - SPR_LOG("dmaChain %8.8x_%8.8x size=%d, id=%d, madr=%lx, tadr=%lx mfifo qwc = %x spr0 madr = %x", - ptag[1], ptag[0], vif1ch->qwc, id, vif1ch->madr, vif1ch->tadr, vifqwc, spr0->madr); vif1ch->madr = ptag[1]; id =Tag::Id(ptag); vifqwc--; + SPR_LOG("dmaChain %8.8x_%8.8x size=%d, id=%d, madr=%lx, tadr=%lx mfifo qwc = %x spr0 madr = %x", + ptag[1], ptag[0], vif1ch->qwc, id, vif1ch->madr, vif1ch->tadr, vifqwc, spr0->madr); + switch (id) { case TAG_REFE: // Refe - Transfer Packet According to ADDR field