From f5872ce7a75e2b4c6bba56484c8f5333b114dfed Mon Sep 17 00:00:00 2001 From: ramapcsx2 Date: Fri, 14 Nov 2008 17:47:17 +0000 Subject: [PATCH] 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 --- pcsx2/Common.h | 4 ++-- pcsx2/Counters.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pcsx2/Common.h b/pcsx2/Common.h index c65b38c8eb..ca6f28e816 100644 --- a/pcsx2/Common.h +++ b/pcsx2/Common.h @@ -158,7 +158,7 @@ extern TESTRUNARGS g_TestRun; HBlank 15.73426573 KHz */ //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) //HBlanks per second @@ -168,7 +168,7 @@ extern TESTRUNARGS g_TestRun; //VBlank timers for EE, bit more accurate. #define VBLANKCNT(count) ((u32)((Config.PsxType & 1) ? (VBLANKPALSELECT * count) : (VBLANKNTSCSELECT * count))) #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 #define PS2VBLANK_NTSC_INT ((PS2CLK / 59.94005994)) diff --git a/pcsx2/Counters.h b/pcsx2/Counters.h index 40e70c1f40..ea8157b562 100644 --- a/pcsx2/Counters.h +++ b/pcsx2/Counters.h @@ -35,13 +35,13 @@ typedef struct { //------------------------------------------------------------------ // 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? // 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 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_HALF_NTSC (u32)(VSYNC_NTSC / 2) //hz //should be 2460058 but rounding puts it to 2460060 +#define VSYNC_NTSC (u32)(PS2CLK / 59.94) //hz //59.94005994 is more precise +#define VSYNC_HALF_NTSC (u32)(VSYNC_NTSC / 2) //hz #define SCANLINES_TOTAL_NTSC 525 // total number of scanlines #define SCANLINES_VSYNC_NTSC 3 // scanlines that are used for syncing every half-frame