/******************************************************************************/
-typedef struct Rcnt
-{
- u16 mode, target;
- u32 rate, irq, counterState, irqState;
- u32 cycle, cycleStart;
-} Rcnt;
-
enum
{
Rc0Gate = 0x0001, // 0 not implemented
static const u32 HSyncTotal[] = { 263, 313 };
static const u32 SpuUpdInterval[] = { 32, 32 };
-static const s32 VerboseLevel = 0;
+#define VERBOSE_LEVEL 0
+static const s32 VerboseLevel = VERBOSE_LEVEL;
/******************************************************************************/
-static Rcnt rcnts[ CounterQuantity ];
+Rcnt rcnts[ CounterQuantity ];
static u32 hSyncCount = 0;
static u32 spuSyncCount = 0;
static u32 hsync_steps = 0;
static u32 gpu_wants_hcnt = 0;
+static u32 base_cycle = 0;
u32 psxNextCounter = 0, psxNextsCounter = 0;
}
static
-void verboseLog( s32 level, const char *str, ... )
+void verboseLog( u32 level, const char *str, ... )
{
+#if VERBOSE_LEVEL > 0
if( level <= VerboseLevel )
{
va_list va;
printf( "%s", buf );
fflush( stdout );
}
+#endif
}
/******************************************************************************/
psxNextCounter = countToUpdate;
}
}
+
+ psxRegs.interrupt |= (1 << PSXINT_RCNT);
+ new_dyna_set_event(PSXINT_RCNT, psxNextCounter);
}
/******************************************************************************/
hsync_steps = 1;
rcnts[3].cycleStart = cycle - leftover_cycles;
- rcnts[3].cycle = hsync_steps * rcnts[3].target;
+ if (Config.PsxType)
+ // 20.12 precision, clk / 50 / 313 ~= 2164.14
+ base_cycle += hsync_steps * 8864320;
+ else
+ // clk / 60 / 263 ~= 2146.31
+ base_cycle += hsync_steps * 8791293;
+ rcnts[3].cycle = base_cycle >> 12;
+ base_cycle &= 0xfff;
psxRcntSet();
}
{
verboseLog( 2, "[RCNT %i] wcount: %x\n", index, value );
- psxRcntUpdate();
-
_psxRcntWcount( index, value );
psxRcntSet();
}
{
verboseLog( 1, "[RCNT %i] wmode: %x\n", index, value );
- psxRcntUpdate();
-
rcnts[index].mode = value;
rcnts[index].irqState = 0;
{
verboseLog( 1, "[RCNT %i] wtarget: %x\n", index, value );
- psxRcntUpdate();
-
rcnts[index].target = value;
_psxRcntWcount( index, _psxRcntRcount( index ) );
{
u32 count;
- psxRcntUpdate();
-
count = _psxRcntRcount( index );
// Parasite Eve 2 fix.
{
u16 mode;
- psxRcntUpdate();
-
mode = rcnts[index].mode;
rcnts[index].mode &= 0xe7ff;
if (Mode == 0)
hsync_steps = (psxRegs.cycle - rcnts[3].cycleStart) / rcnts[3].target;
+ base_cycle = 0;
+
return 0;
}