The-Homebrew-Cloud/uae-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/uae-wii.git synced 2024-11-15 07:15:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed TOD CIA hack (gettimeofday is buggy in libogc). Used with synchronized_clock=true

Browse Source
This commit is contained in:
fabio.olimpieri 2015-01-02 14:49:16 +00:00
parent 4d454cb4a3
commit 864f1b21ce
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cia.c
View File

@ -37,6 +37,10 @@
# include "arcadia.h" # include "arcadia.h"
#endif #endif
#ifdef GEKKO
# include "ogc/lwp_watchdog.h"
#endif
//#define CIA_DEBUG_R //#define CIA_DEBUG_R
//#define CIA_DEBUG_W //#define CIA_DEBUG_W
//#define DONGLE_DEBUG //#define DONGLE_DEBUG
@ -408,8 +412,12 @@ static void tod_hack_reset (void)
{ {
struct timeval tv; struct timeval tv;
uae_u32 rate = currprefs.ntscmode ? 60 : 50; uae_u32 rate = currprefs.ntscmode ? 60 : 50;
#ifdef GEKKO //gettimeofday is buggy in libogc
tod_hack = (uae_u32) ((ticks_to_microsecs(gettick())/(1000000 / rate)));
#else
gettimeofday (&tv, NULL); gettimeofday (&tv, NULL);
tod_hack = (uae_u32)(((uae_u64)tv.tv_sec) * rate + tv.tv_usec / (1000000 / rate)); tod_hack = (uae_u32)(((uae_u64)tv.tv_sec) * rate + tv.tv_usec / (1000000 / rate));
#endif
tod_hack -= ciaatod; tod_hack -= ciaatod;
tod_hack_delay = 10 * 50; tod_hack_delay = 10 * 50;
} }
@ -431,8 +439,12 @@ void CIA_vsync_handler ()
} }
} }
if (tod_hack_delay == 0) { if (tod_hack_delay == 0) {
#ifdef GEKKO //gettimeofday is buggy in libogc
t = (uae_u32) ((ticks_to_microsecs(gettick())/(1000000 / rate)));
#else
gettimeofday (&tv, NULL); gettimeofday (&tv, NULL);
t = (uae_u32)(((uae_u64)tv.tv_sec) * rate + tv.tv_usec / (1000000 / rate)); t = (uae_u32)(((uae_u64)tv.tv_sec) * rate + tv.tv_usec / (1000000 / rate));
#endif
nt = t - tod_hack; nt = t - tod_hack;
if ((nt < ciaatod && ciaatod - nt < 10) || nt == ciaatod) if ((nt < ciaatod && ciaatod - nt < 10) || nt == ciaatod)
return; /* try not to count backwards */ return; /* try not to count backwards */