X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fpsxcounters.c;h=5056c70980ca7008d2b19e725156822a1d8c5229;hp=cd99842b6bf36357f659d72ee76c0128754f8c70;hb=0486fdc9bd313ce2f01dafa4d3c151f40e2c729b;hpb=c7945666b47fa5636762bfa52cd6328125d607c4 diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c index cd99842b..5056c709 100644 --- a/libpcsxcore/psxcounters.c +++ b/libpcsxcore/psxcounters.c @@ -60,9 +60,9 @@ static const u32 CountToOverflow = 0; static const u32 CountToTarget = 1; static const u32 FrameRate[] = { 60, 50 }; -static const u32 VBlankStart[] = { 240, 256 }; static const u32 HSyncTotal[] = { 263, 313 }; static const u32 SpuUpdInterval[] = { 32, 32 }; +#define VBlankStart 240 #define VERBOSE_LEVEL 0 static const s32 VerboseLevel = VERBOSE_LEVEL; @@ -288,10 +288,9 @@ void psxRcntUpdate() } // VSync irq. - if( hSyncCount == VBlankStart[Config.PsxType] ) + if( hSyncCount == VBlankStart ) { - if( !(HW_GPU_STATUS & PSXGPU_ILACE) ) - HW_GPU_STATUS |= PSXGPU_LCF; + HW_GPU_STATUS &= ~PSXGPU_LCF; setIrq( 0x01 ); @@ -305,14 +304,14 @@ void psxRcntUpdate() hSyncCount = 0; frame_counter++; - HW_GPU_STATUS &= ~PSXGPU_LCF; - if( HW_GPU_STATUS & PSXGPU_ILACE ) + gpuSyncPluginSR(); + if( (HW_GPU_STATUS & PSXGPU_ILACE_BITS) == PSXGPU_ILACE_BITS ) HW_GPU_STATUS |= frame_counter << 31; } // Schedule next call, in hsyncs hsync_steps = SpuUpdInterval[Config.PsxType] - spuSyncCount; - next_vsync = VBlankStart[Config.PsxType] - hSyncCount; // ok to overflow + next_vsync = VBlankStart - hSyncCount; // ok to overflow next_lace = HSyncTotal[Config.PsxType] - hSyncCount; if( next_vsync && next_vsync < hsync_steps ) hsync_steps = next_vsync;