diff --git a/builds/genesis_plus_gx_libretro.dll b/builds/genesis_plus_gx_libretro.dll index 09bd350..0d5000d 100644 Binary files a/builds/genesis_plus_gx_libretro.dll and b/builds/genesis_plus_gx_libretro.dll differ diff --git a/builds/genplus_cube.dol b/builds/genplus_cube.dol index 3057618..edbdaf7 100644 Binary files a/builds/genplus_cube.dol and b/builds/genplus_cube.dol differ diff --git a/builds/genplus_wii.dol b/builds/genplus_wii.dol index 5f7d60c..27445bb 100644 Binary files a/builds/genplus_wii.dol and b/builds/genplus_wii.dol differ diff --git a/core/vdp_ctrl.c b/core/vdp_ctrl.c index 9932679..0b62bfb 100644 --- a/core/vdp_ctrl.c +++ b/core/vdp_ctrl.c @@ -593,7 +593,7 @@ int vdp_context_load(uint8 *state) void vdp_dma_update(unsigned int cycles) { - unsigned int dma_cycles, dma_bytes; + int dma_cycles, dma_bytes; /* DMA transfer rate (bytes per line) @@ -630,6 +630,12 @@ void vdp_dma_update(unsigned int cycles) else if (rate == 204) rate = 198; /* 6 refresh slots per line in H40 mode when display is off */ } + /* Adjust DMA start cycle for DMA fill to take in account intial data port write */ + else if (dmafill) + { + cycles += (2 * (MCYCLES_PER_LINE / rate)); + } + /* Available DMA cycles */ if (status & 8) { @@ -692,7 +698,7 @@ void vdp_dma_update(unsigned int cycles) } /* Process DMA */ - if (dma_bytes) + if (dma_bytes > 0) { /* Update DMA length */ dma_length -= dma_bytes; @@ -2452,9 +2458,6 @@ static void vdp_68k_data_w_m5(unsigned int data) /* Check if DMA Fill is pending */ if (dmafill) { - /* Clear DMA Fill pending flag */ - dmafill = 0; - /* DMA length */ dma_length = (reg[20] << 8) | reg[19]; @@ -2466,6 +2469,9 @@ static void vdp_68k_data_w_m5(unsigned int data) /* Trigger DMA */ vdp_dma_update(m68k.cycles); + + /* Clear DMA Fill pending flag */ + dmafill = 0; } }