X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_cmn.c;h=79606762b06076eceac7450c61e29a166cac3b07;hb=b8a1c09ad1ef0b807c2eb1632d34e6bfae14b633;hp=5f31694d5c9c945eb0e16a1254196dadff6f8e6c;hpb=c987bb5c36d92c1441e4dcfd9bded3e5dc1f1ff6;p=picodrive.git diff --git a/pico/pico_cmn.c b/pico/pico_cmn.c index 5f31694..7960676 100644 --- a/pico/pico_cmn.c +++ b/pico/pico_cmn.c @@ -5,6 +5,7 @@ #define CYCLES_M68K_VINT_LAG 68 #define CYCLES_M68K_ASD 148 #define CYCLES_S68K_LINE 795 +#define CYCLES_S68K_VINT_LAG 111 #define CYCLES_S68K_ASD 241 // pad delay (for 6 button pads) @@ -83,7 +84,7 @@ static int PicoFrameHints(void) check_cd_dma(); #endif #ifdef PICO_32X - p32x_pwm_irq_check(1); + p32x_timers_do(1); #endif // H-Interrupts: @@ -155,7 +156,7 @@ static int PicoFrameHints(void) check_cd_dma(); #endif #ifdef PICO_32X - p32x_pwm_irq_check(1); + p32x_timers_do(1); #endif // Last H-Int: @@ -178,7 +179,7 @@ static int PicoFrameHints(void) // there must be a delay after vblank bit is set and irq is asserted (Mazin Saga) // also delay between F bit (bit 7) is set in SR and IRQ happens (Ex-Mutants) // also delay between last H-int and V-int (Golden Axe 3) - SekRunM68k(CYCLES_M68K_VINT_LAG); + CPUS_RUN(CYCLES_M68K_VINT_LAG, CYCLES_S68K_VINT_LAG); if (pv->reg[1]&0x20) { elprintf(EL_INTS, "vint: @ %06x [%i]", SekPc, SekCycleCnt); @@ -201,7 +202,7 @@ static int PicoFrameHints(void) // Run scanline: if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA()); CPUS_RUN(CYCLES_M68K_LINE - CYCLES_M68K_VINT_LAG - CYCLES_M68K_ASD, - CYCLES_S68K_LINE - CYCLES_S68K_ASD); + CYCLES_S68K_LINE - CYCLES_S68K_VINT_LAG - CYCLES_S68K_ASD); #ifdef PICO_CD update_chips(); @@ -226,7 +227,7 @@ static int PicoFrameHints(void) check_cd_dma(); #endif #ifdef PICO_32X - p32x_pwm_irq_check(1); + p32x_timers_do(1); #endif // Run scanline: