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

This should un-break the Linux build, yes some guys are using Linux! :p 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@327 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
ramapcsx2 2008-11-14 17:47:17 +00:00 committed by Gregory Hainaut
parent 7c054f247a
commit f5872ce7a7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2/Common.h
View File

@ -158,7 +158,7 @@ extern TESTRUNARGS g_TestRun;
HBlank 15.73426573 KHz */ HBlank 15.73426573 KHz */
//VBlanks per second //VBlanks per second
#define VBLANK_NTSC ((Config.PsxType & 2) ? 59.94005994 : 59.82) #define VBLANK_NTSC ((Config.PsxType & 2) ? 59.94 : 59.82) //59.94005994 is more precise
#define VBLANK_PAL ((Config.PsxType & 2) ? 50.00 : 49.76) #define VBLANK_PAL ((Config.PsxType & 2) ? 50.00 : 49.76)
//HBlanks per second //HBlanks per second
@ -168,7 +168,7 @@ extern TESTRUNARGS g_TestRun;
//VBlank timers for EE, bit more accurate. //VBlank timers for EE, bit more accurate.
#define VBLANKCNT(count) ((u32)((Config.PsxType & 1) ? (VBLANKPALSELECT * count) : (VBLANKNTSCSELECT * count))) #define VBLANKCNT(count) ((u32)((Config.PsxType & 1) ? (VBLANKPALSELECT * count) : (VBLANKNTSCSELECT * count)))
#define VBLANKPALSELECT ((Config.PsxType & 2) ? (PS2CLK / 50.00) : (PS2CLK / 49.76)) #define VBLANKPALSELECT ((Config.PsxType & 2) ? (PS2CLK / 50.00) : (PS2CLK / 49.76))
#define VBLANKNTSCSELECT ((Config.PsxType & 2) ? (PS2CLK / 59.94005994) : (PS2CLK / 59.82)) #define VBLANKNTSCSELECT ((Config.PsxType & 2) ? (PS2CLK / 59.94) : (PS2CLK / 59.82)) //59.94005994 is more precise
//EE VBlank speeds //EE VBlank speeds
#define PS2VBLANK_NTSC_INT ((PS2CLK / 59.94005994)) #define PS2VBLANK_NTSC_INT ((PS2CLK / 59.94005994))

6
pcsx2/Counters.h
View File

@ -35,13 +35,13 @@ typedef struct {
//------------------------------------------------------------------ //------------------------------------------------------------------
// NTSC Timing Information!!! (some scanline info is guessed) // NTSC Timing Information!!! (some scanline info is guessed)
//------------------------------------------------------------------ //------------------------------------------------------------------
#define SCANLINE_NTSC (u32)(PS2CLK / 15734.27)//18743 #define SCANLINE_NTSC (u32)(PS2CLK / 15734.25)//18743 //when using 59.94005994 it rounds to 15734.27 :p (rama)
// fixme : Both, HRENDER_TIME_NTSC and HBLANK_TIME_NTSC the same? // fixme : Both, HRENDER_TIME_NTSC and HBLANK_TIME_NTSC the same?
// also see cpuRcntSet() and possibly hScanline() for this issue (rama) // also see cpuRcntSet() and possibly hScanline() for this issue (rama)
#define HRENDER_TIME_NTSC (u32)(SCANLINE_NTSC / 2)//15528 //time from hblank end to hblank start (PS2CLK / 18991.368423051722991900181367568) #define HRENDER_TIME_NTSC (u32)(SCANLINE_NTSC / 2)//15528 //time from hblank end to hblank start (PS2CLK / 18991.368423051722991900181367568)
#define HBLANK_TIME_NTSC (u32)(SCANLINE_NTSC / 2)//3215 //time from hblank start to hblank end (PS2CLK / 91738.91105912572817760653181028) #define HBLANK_TIME_NTSC (u32)(SCANLINE_NTSC / 2)//3215 //time from hblank start to hblank end (PS2CLK / 91738.91105912572817760653181028)
#define VSYNC_NTSC (u32)(PS2CLK / 59.94005994) //hz #define VSYNC_NTSC (u32)(PS2CLK / 59.94) //hz //59.94005994 is more precise
#define VSYNC_HALF_NTSC (u32)(VSYNC_NTSC / 2) //hz //should be 2460058 but rounding puts it to 2460060 #define VSYNC_HALF_NTSC (u32)(VSYNC_NTSC / 2) //hz
#define SCANLINES_TOTAL_NTSC 525 // total number of scanlines #define SCANLINES_TOTAL_NTSC 525 // total number of scanlines
#define SCANLINES_VSYNC_NTSC 3 // scanlines that are used for syncing every half-frame #define SCANLINES_VSYNC_NTSC 3 // scanlines that are used for syncing every half-frame