From: Toni Wilen <twilen@winuae.net>
Date: Sun, 6 Nov 2022 17:29:18 +0000 (+0200)
Subject: Temporarily disabled.
X-Git-Tag: 41000~79
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=9cae6dd8ef405db4e00f16f149ce08d3d7011034;p=francis%2Fwinuae.git

Temporarily disabled.
---

diff --git a/custom.cpp b/custom.cpp
index e0ad5d65..2aad24a6 100644
--- a/custom.cpp
+++ b/custom.cpp
@@ -7532,7 +7532,7 @@ static void COPJMP(int num, int vblank)
 			}
 		}
 		int hp = current_hpos();
-		if ((hp & 1) && currprefs.cpu_model == 68000 && currprefs.cpu_cycle_exact) {
+		if (0 && (hp & 1) && currprefs.cpu_model == 68000 && currprefs.cpu_cycle_exact) {
 			// CPU unaligned COPJMP while waiting
 			cop_state.state = COP_strobe_delay1x;
 			copper_bad_cycle_start = get_cycles();
@@ -10047,10 +10047,7 @@ static void update_copper(int until_hpos)
 			// If Blitter uses this cycle = Copper's new PC gets copied to blitter DMA pointer..
 			if (!copper_cant_read(hpos, CYCLE_PIPE_COPPER | 0x09)) {
 				copper_bad_cycle = get_cycles();
-				// conflict also does not happen if previous cycle was used by bitplane
-				// (if bitplane DMA is allocated, copper internal operations are also stopped)
-				int bpl = 0;// get_bitplane_dma_rel(hpos, -1);
-				if (copper_bad_cycle - copper_bad_cycle_start != 3 * CYCLE_UNIT || bpl) {
+				if (copper_bad_cycle - copper_bad_cycle_start != 3 * CYCLE_UNIT) {
 					copper_bad_cycle = 0;
 				} else {
 					if (debug_dma) {