Mercurial > repos > blastem
comparison blastem.c @ 679:7dd83295193a
Removed some code that tried to deal with the 68K not using master clocks that is no longer necessary
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Sun, 04 Jan 2015 12:25:33 -0800 |
parents | 687c1dd3bcb9 |
children | 4996369f1463 |
comparison
equal
deleted
inserted
replaced
678:a7971650c04e | 679:7dd83295193a |
---|---|
215 gen->ym->current_cycle -= mclk_target; | 215 gen->ym->current_cycle -= mclk_target; |
216 gen->psg->cycles -= mclk_target; | 216 gen->psg->cycles -= mclk_target; |
217 if (gen->ym->write_cycle != CYCLE_NEVER) { | 217 if (gen->ym->write_cycle != CYCLE_NEVER) { |
218 gen->ym->write_cycle = gen->ym->write_cycle >= mclk_target ? gen->ym->write_cycle - mclk_target : 0; | 218 gen->ym->write_cycle = gen->ym->write_cycle >= mclk_target ? gen->ym->write_cycle - mclk_target : 0; |
219 } | 219 } |
220 //printf("reached frame end | 68K Cycles: %d, MCLK Cycles: %d\n", context->current_cycle, mclks); | |
221 vdp_run_context(v_context, mclk_target); | 220 vdp_run_context(v_context, mclk_target); |
221 //printf("reached frame end | MCLK Cycles: %d, Target: %d, VDP cycles: %d\n", mclks, mclk_target, v_context->cycles); | |
222 | 222 |
223 if (!headless) { | 223 if (!headless) { |
224 break_on_sync |= wait_render_frame(v_context, frame_limit); | 224 break_on_sync |= wait_render_frame(v_context, frame_limit); |
225 } else if(exit_after){ | 225 } else if(exit_after){ |
226 --exit_after; | 226 --exit_after; |
288 while (vdp_data_port_write(v_context, value) < 0) { | 288 while (vdp_data_port_write(v_context, value) < 0) { |
289 while(v_context->flags & FLAG_DMA_RUN) { | 289 while(v_context->flags & FLAG_DMA_RUN) { |
290 vdp_run_dma_done(v_context, mclk_target); | 290 vdp_run_dma_done(v_context, mclk_target); |
291 if (v_context->cycles >= mclk_target) { | 291 if (v_context->cycles >= mclk_target) { |
292 context->current_cycle = v_context->cycles; | 292 context->current_cycle = v_context->cycles; |
293 if (context->current_cycle < mclk_target) { | |
294 context->current_cycle += MCLKS_PER_68K; | |
295 } | |
296 sync_components(context, 0); | 293 sync_components(context, 0); |
297 } | 294 } |
298 } | 295 } |
299 //context->current_cycle = v_context->cycles; | 296 //context->current_cycle = v_context->cycles; |
300 } | 297 } |
305 while (blocked) { | 302 while (blocked) { |
306 while(v_context->flags & FLAG_DMA_RUN) { | 303 while(v_context->flags & FLAG_DMA_RUN) { |
307 vdp_run_dma_done(v_context, mclk_target); | 304 vdp_run_dma_done(v_context, mclk_target); |
308 if (v_context->cycles >= mclk_target) { | 305 if (v_context->cycles >= mclk_target) { |
309 context->current_cycle = v_context->cycles; | 306 context->current_cycle = v_context->cycles; |
310 if (context->current_cycle < mclk_target) { | |
311 context->current_cycle += MCLKS_PER_68K; | |
312 } | |
313 sync_components(context, 0); | 307 sync_components(context, 0); |
314 } | 308 } |
315 } | 309 } |
316 if (blocked < 0) { | 310 if (blocked < 0) { |
317 blocked = vdp_control_port_write(v_context, value); | 311 blocked = vdp_control_port_write(v_context, value); |