ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1720 from ssakash/rtc 

PCSX2-Counters: Fix RTC counting in Progressive modes
This commit is contained in:
refractionpcsx2 2016-12-27 00:00:00 +00:00 committed by GitHub
parent af3c1fc510 c92830b103
commit c88cd1b065
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/CDVD/CDVD.cpp
View File

@ -975,7 +975,7 @@ u8 monthmap[13] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
void cdvdVsync() {
cdvd.RTCcount++;
if (cdvd.RTCcount < ((gsVideoMode == GS_VideoMode::NTSC) ? 60 : 50)) return;
if (cdvd.RTCcount < (GetVerticalFrequency().ToIntRounded())) return;
cdvd.RTCcount = 0;
if ( cdvd.Status == CDVD_STATUS_TRAY_OPEN )

2
pcsx2/CDVD/CDVD.h
View File

@ -100,6 +100,8 @@ struct cdvdStruct {
u8 CReadWrite;
u8 CNumBlocks;
// Calculates the number of Vsyncs and once it reaches a total number of Vsyncs worth a second with respect to
// the videomode's vertical frequency, it updates the real time clock.
int RTCcount;
cdvdRTC RTC;

1
pcsx2/Counters.h
View File

@ -123,7 +123,6 @@ struct SyncCounter
#define MODE_HBLANK 0x1 //Set for the remaining ~1/6 of 1 Scanline
extern Fixed100 GetVerticalFrequency();
extern Counter counters[4];
extern SyncCounter hsyncCounter;
extern SyncCounter vsyncCounter;

1
pcsx2/GS.h
View File

@ -19,6 +19,7 @@
#include "System/SysThreads.h"
#include "Gif.h"
extern Fixed100 GetVerticalFrequency();
extern __aligned16 u8 g_RealGSMem[Ps2MemSize::GSregs];
enum CSR_FifoState