X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_cmn.c;h=12f649f986409dfff290432d273c2959dc5ceb61;hb=d3524932fadaea45167f6feab8b8ef612f6a92de;hp=7178440d65bfa6f553e28e8c84b3c405bf7856f9;hpb=ed4402a7dfd12dbbf34c547b438a671ae8114197;p=picodrive.git diff --git a/pico/pico_cmn.c b/pico/pico_cmn.c index 7178440..12f649f 100644 --- a/pico/pico_cmn.c +++ b/pico/pico_cmn.c @@ -111,9 +111,6 @@ static int PicoFrameHints(void) #ifdef PICO_CD check_cd_dma(); #endif -#ifdef PICO_32X - p32x_timers_do(1); -#endif // H-Interrupts: if (--hint < 0) // y <= lines_vis: Comix Zone, Golden Axe @@ -146,6 +143,9 @@ static int PicoFrameHints(void) PicoSyncZ80(SekCycleCnt); if (ym2612.dacen && PsndDacLine <= y) PsndDoDAC(y); +#ifdef PICO_32X + p32x_sync_sh2s(SekCycleCntT + SekCycleCnt); +#endif PsndGetSamples(y); } @@ -183,9 +183,6 @@ static int PicoFrameHints(void) #ifdef PICO_CD check_cd_dma(); #endif -#ifdef PICO_32X - p32x_timers_do(1); -#endif // Last H-Int: if (--hint < 0) @@ -199,10 +196,6 @@ static int PicoFrameHints(void) pv->status|=0x08; // go into vblank pv->pending_ints|=0x20; -#ifdef PICO_32X - p32x_start_blank(); -#endif - // the following SekRun is there for several reasons: // 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) @@ -219,6 +212,11 @@ static int PicoFrameHints(void) z80_int(); } +#ifdef PICO_32X + p32x_sync_sh2s(SekCycleCntT + SekCycleCnt); + p32x_start_blank(); +#endif + // get samples from sound chips if (y == 224 && PsndOut) { @@ -254,9 +252,6 @@ static int PicoFrameHints(void) #ifdef PICO_CD check_cd_dma(); #endif -#ifdef PICO_32X - p32x_timers_do(1); -#endif // Run scanline: if (Pico.m.dma_xfers) SekCyclesBurn(CheckDMA()); @@ -275,6 +270,9 @@ static int PicoFrameHints(void) if (PsndOut && ym2612.dacen && PsndDacLine <= lines-1) PsndDoDAC(lines-1); +#ifdef PICO_32X + p32x_sync_sh2s(SekCycleCntT + SekCycleCnt); +#endif timers_cycle(); return 0;