diff --git a/pcsx2/IPU/IPU.cpp b/pcsx2/IPU/IPU.cpp index 899ed5407e..391d895c1f 100644 --- a/pcsx2/IPU/IPU.cpp +++ b/pcsx2/IPU/IPU.cpp @@ -21,9 +21,6 @@ #include "yuv2rgb.h" #include "mpeg2lib/Mpeg.h" -#include "Vif.h" -#include "Gif.h" -#include "Vif_Dma.h" #include #include "AppConfig.h" diff --git a/pcsx2/IPU/IPU.h b/pcsx2/IPU/IPU.h index 4c6ce67923..53d78509a3 100644 --- a/pcsx2/IPU/IPU.h +++ b/pcsx2/IPU/IPU.h @@ -23,8 +23,6 @@ #define IPU_INT_TO( cycles ) if(!(cpuRegs.interrupt & (1<<4))) CPU_INT( DMAC_TO_IPU, cycles ) #define IPU_INT_FROM( cycles ) CPU_INT( DMAC_FROM_IPU, cycles ) -#define IPU_FORCEINLINE __fi - // // Bitfield Structures // @@ -299,7 +297,6 @@ extern void IPUCMD_WRITE(u32 val); extern void ipuSoftReset(); extern void IPUProcessInterrupt(); -extern u8 getBits128(u8 *address, bool advance); extern u8 getBits64(u8 *address, bool advance); extern u8 getBits32(u8 *address, bool advance); extern u8 getBits16(u8 *address, bool advance); diff --git a/pcsx2/IPU/IPUdma.cpp b/pcsx2/IPU/IPUdma.cpp index d9cd6f2d02..ee4bb9b311 100644 --- a/pcsx2/IPU/IPUdma.cpp +++ b/pcsx2/IPU/IPUdma.cpp @@ -19,10 +19,6 @@ #include "IPU/IPUdma.h" #include "mpeg2lib/Mpeg.h" -#include "Vif.h" -#include "Gif.h" -#include "Vif_Dma.h" - static IPUStatus IPU1Status; static tIPU_DMA g_nDMATransfer; @@ -269,9 +265,6 @@ __fi void dmaIPU0() // fromIPU // but because our IPU is too quick, it messes up the sync between the DMA and IPU. // So this will do until (if) we sort the timing out of IPU, shouldn't cause any problems for games for now. IPU_INT_FROM( 160 ); - - - } __fi void dmaIPU1() // toIPU @@ -315,8 +308,6 @@ __fi void dmaIPU1() // toIPU } } -extern void GIFdma(); - void ipu0Interrupt() { IPU_LOG("ipu0Interrupt: %x", cpuRegs.cycle); @@ -369,7 +360,7 @@ void ipu0Interrupt() DMA_LOG("IPU0 DMA End"); } -IPU_FORCEINLINE void ipu1Interrupt() +__fi void ipu1Interrupt() { IPU_LOG("ipu1Interrupt %x:", cpuRegs.cycle);