From fee495ae58eca50d45e93d3dc725405d9038996b Mon Sep 17 00:00:00 2001
From: Barry Harris <44396066+barry65536@users.noreply.github.com>
Date: Tue, 13 Dec 2011 16:21:02 +0000
Subject: [PATCH] Removed idle skipping hacks in Cave drivers

---
 src/burn/drivers/cave/d_dodonpachi.cpp | 19 -----------------
 src/burn/drivers/cave/d_donpachi.cpp   | 13 ------------
 src/burn/drivers/cave/d_esprade.cpp    | 28 --------------------------
 src/burn/drivers/cave/d_feversos.cpp   | 18 -----------------
 src/burn/drivers/cave/d_guwange.cpp    | 12 -----------
 src/burn/drivers/cave/d_hotdogst.cpp   |  4 ----
 src/burn/drivers/cave/d_mazinger.cpp   |  4 ----
 src/burn/drivers/cave/d_metmqstr.cpp   |  4 ----
 src/burn/drivers/cave/d_pwrinst2.cpp   |  8 --------
 src/burn/drivers/cave/d_sailormn.cpp   |  6 ------
 10 files changed, 116 deletions(-)

diff --git a/src/burn/drivers/cave/d_dodonpachi.cpp b/src/burn/drivers/cave/d_dodonpachi.cpp
index 3ac5ecc62..833581d30 100644
--- a/src/burn/drivers/cave/d_dodonpachi.cpp
+++ b/src/burn/drivers/cave/d_dodonpachi.cpp
@@ -18,8 +18,6 @@ static UINT8 DrvReset = 0;
 static UINT8 bDrawScreen;
 static bool bVBlank;
 
-static INT32 nSpeedhack;
-
 static INT8 nVideoIRQ;
 static INT8 nSoundIRQ;
 static INT8 nUnknownIRQ;
@@ -296,14 +294,6 @@ static INT32 DrvDraw()
 
 inline static INT32 CheckSleep(INT32)
 {
-#if 1 && defined USE_SPEEDHACKS
-	INT32 nCurrentPC = SekGetPC(-1) - nSpeedhack;
-
-	if (!nIRQPending && nCurrentPC >= 0 && nCurrentPC <= 12) {
-		return 1;
-	}
-#endif
-
 	return 0;
 }
 
@@ -582,15 +572,6 @@ static INT32 DrvInit()
 
 	bDrawScreen = true;
 
-	// US version:    0x0571AC - 0x0571B8
-	// Japan version: 0x056DF4 - 0x056E00
-
-	nSpeedhack = (strcmp(BurnDrvGetTextA(DRV_NAME), "ddonpach") == 0) ? 0x0571AC : 0x056DF4;
-
-#if defined FBA_DEBUG && defined USE_SPEEDHACKS
-	bprintf(PRINT_IMPORTANT, _T("  * Using speed-hacks (detecting idle loops).\n"));
-#endif
-
 	DrvDoReset(); // Reset machine
 
 	return 0;
diff --git a/src/burn/drivers/cave/d_donpachi.cpp b/src/burn/drivers/cave/d_donpachi.cpp
index b239bc1e6..e55404711 100644
--- a/src/burn/drivers/cave/d_donpachi.cpp
+++ b/src/burn/drivers/cave/d_donpachi.cpp
@@ -370,15 +370,6 @@ static INT32 DrvDraw()
 
 inline static INT32 CheckSleep(INT32)
 {
-#if 1 && defined USE_SPEEDHACKS
-	INT32 nCurrentPC = SekGetPC(-1);
-
-	// All versions are the same
-	if (!nIRQPending && nCurrentPC >= 0x002ED6 && nCurrentPC <= 0x002EE2) {
-		return 1;
-	}
-#endif
-
 	return 0;
 }
 
@@ -641,10 +632,6 @@ static INT32 DrvInit()
 
 	bDrawScreen = true;
 
-#if defined FBA_DEBUG && defined USE_SPEEDHACKS
-	bprintf(PRINT_IMPORTANT, _T("  * Using speed-hacks (detecting idle loops).\n"));
-#endif
-
 	DrvDoReset(); // Reset machine
 
 	return 0;
diff --git a/src/burn/drivers/cave/d_esprade.cpp b/src/burn/drivers/cave/d_esprade.cpp
index 8efd43cfa..bd3e89c79 100644
--- a/src/burn/drivers/cave/d_esprade.cpp
+++ b/src/burn/drivers/cave/d_esprade.cpp
@@ -18,8 +18,6 @@ static UINT8 DrvReset = 0;
 static UINT8 bDrawScreen;
 static bool bVBlank;
 
-static INT32 nSpeedhack;
-
 static INT8 nVideoIRQ;
 static INT8 nSoundIRQ;
 static INT8 nUnknownIRQ;
@@ -305,14 +303,6 @@ static INT32 DrvDraw()
 
 inline static INT32 CheckSleep(INT32)
 {
-#if 1 && defined USE_SPEEDHACKS
-	INT32 nCurrentPC = SekGetPC(-1) - nSpeedhack;
-
-	if (!nIRQPending && nCurrentPC >= 0 && nCurrentPC <= 12) {
-		return 1;
-	}
-#endif
-
 	return 0;
 }
 
@@ -592,24 +582,6 @@ static INT32 DrvInit()
 
 	bDrawScreen = true;
 
-	// 4/22 version: 0x04F37C - 0x04F388
-	// 4/21 version: 0x04F150 - 0x04F15C
-	// 4/14 version: 0x04F152 - 0x04F15E
-
-	if (strcmp(BurnDrvGetTextA(DRV_NAME), "esprade") == 0) {
-		nSpeedhack = 0x04F37C;
-	} else {
-		if (strcmp(BurnDrvGetTextA(DRV_NAME), "espradej") == 0) {
-			nSpeedhack = 0x04F152;
-		} else {
-			nSpeedhack = 0x04F150;
-		}
-	}
-
-#if defined FBA_DEBUG && defined USE_SPEEDHACKS
-	bprintf(PRINT_IMPORTANT, _T("  * Using speed-hacks (detecting idle loops).\n"));
-#endif
-
 	DrvDoReset(); // Reset machine
 
 	return 0;
diff --git a/src/burn/drivers/cave/d_feversos.cpp b/src/burn/drivers/cave/d_feversos.cpp
index 0234c7297..f799faefa 100644
--- a/src/burn/drivers/cave/d_feversos.cpp
+++ b/src/burn/drivers/cave/d_feversos.cpp
@@ -18,8 +18,6 @@ static UINT8 DrvReset = 0;
 static UINT8 bDrawScreen;
 static bool bVBlank;
 
-static INT32 nSpeedhack;
-
 static INT8 nVideoIRQ;
 static INT8 nSoundIRQ;
 static INT8 nUnknownIRQ;
@@ -284,13 +282,6 @@ static INT32 DrvDraw()
 
 inline static INT32 CheckSleep(INT32)
 {
-#if 0 && defined USE_SPEEDHACKS
-	UINT32 nCurrentPC = SekGetPC(-1);
-
-	if (!nIRQPending && nCurrentPC >= nSpeedhack && nCurrentPC <= nSpeedhack + 0x18) {
-		return 1;
-	}
-#endif
 	return 0;
 }
 
@@ -559,15 +550,6 @@ static INT32 DrvInit()
 
 	bDrawScreen = true;
 
-	// Fever SOS:      0x07766C - 0x077684
-	// Dangun Feveron: 0x0772F2 - 0x07730A
-
-	nSpeedhack = (strcmp(BurnDrvGetTextA(DRV_NAME), "feversos") == 0) ? 0x07766C : 0x0772F2;
-
-#if defined FBA_DEBUG && defined USE_SPEEDHACKS
-	bprintf(PRINT_IMPORTANT, _T("  * Using speed-hacks (detecting idle loops).\n"));
-#endif
-
 	DrvDoReset(); // Reset machine
 
 	return 0;
diff --git a/src/burn/drivers/cave/d_guwange.cpp b/src/burn/drivers/cave/d_guwange.cpp
index 636cd45ec..6f386f37f 100644
--- a/src/burn/drivers/cave/d_guwange.cpp
+++ b/src/burn/drivers/cave/d_guwange.cpp
@@ -316,14 +316,6 @@ inline static void guwangeClearOpposites(UINT8* nJoystickInputs)
 
 inline static INT32 CheckSleep(INT32)
 {
-#if 1 && defined USE_SPEEDHACKS
-	INT32 nCurrentPC = SekGetPC(-1);
-
-	if (!nIRQPending && nCurrentPC >= 0x06D6DE && nCurrentPC <= 0x06D6F4) {
-		return 1;
-	}
-#endif
-
 	return 0;
 }
 
@@ -621,10 +613,6 @@ static INT32 DrvInit()
 
 	bDrawScreen = true;
 
-#if defined FBA_DEBUG && defined USE_SPEEDHACKS
-	bprintf(PRINT_IMPORTANT, _T("  * Using speed-hacks (detecting idle loops).\n"));
-#endif
-
 	DrvDoReset(); // Reset machine
 
 	return 0;
diff --git a/src/burn/drivers/cave/d_hotdogst.cpp b/src/burn/drivers/cave/d_hotdogst.cpp
index 99c895d01..ee77134a3 100644
--- a/src/burn/drivers/cave/d_hotdogst.cpp
+++ b/src/burn/drivers/cave/d_hotdogst.cpp
@@ -697,10 +697,6 @@ static INT32 DrvInit()
 	
 	bDrawScreen = true;
 
-#if defined FBA_DEBUG && defined USE_SPEEDHACKS
-	bprintf(PRINT_IMPORTANT, _T("  * Using speed-hacks (detecting idle loops).\n"));
-#endif
-
 	DrvDoReset(); // Reset machine
 
 	return 0;
diff --git a/src/burn/drivers/cave/d_mazinger.cpp b/src/burn/drivers/cave/d_mazinger.cpp
index 38cd731a2..3b57161cd 100644
--- a/src/burn/drivers/cave/d_mazinger.cpp
+++ b/src/burn/drivers/cave/d_mazinger.cpp
@@ -746,10 +746,6 @@ static INT32 DrvInit()
 	
 	bDrawScreen = true;
 
-#if defined FBA_DEBUG && defined USE_SPEEDHACKS
-	bprintf(PRINT_IMPORTANT, _T("  * Using speed-hacks (detecting idle loops).\n"));
-#endif
-
 	DrvDoReset(); // Reset machine
 
 	return 0;
diff --git a/src/burn/drivers/cave/d_metmqstr.cpp b/src/burn/drivers/cave/d_metmqstr.cpp
index cbcd97887..42f76cb16 100644
--- a/src/burn/drivers/cave/d_metmqstr.cpp
+++ b/src/burn/drivers/cave/d_metmqstr.cpp
@@ -765,10 +765,6 @@ static INT32 DrvInit()
 	
 	bDrawScreen = true;
 
-#if defined FBA_DEBUG && defined USE_SPEEDHACKS
-	bprintf(PRINT_IMPORTANT, _T("  * Using speed-hacks (detecting idle loops).\n"));
-#endif
-
 	DrvDoReset(); // Reset machine
 
 	return 0;
diff --git a/src/burn/drivers/cave/d_pwrinst2.cpp b/src/burn/drivers/cave/d_pwrinst2.cpp
index 36e79646d..1a9b56231 100644
--- a/src/burn/drivers/cave/d_pwrinst2.cpp
+++ b/src/burn/drivers/cave/d_pwrinst2.cpp
@@ -929,10 +929,6 @@ static INT32 DrvInit()
 	
 	bDrawScreen = true;
 
-#if defined FBA_DEBUG && defined USE_SPEEDHACKS
-	bprintf(PRINT_IMPORTANT, _T("  * Using speed-hacks (detecting idle loops).\n"));
-#endif
-
 	DrvDoReset(); // Reset machine
 
 	return 0;
@@ -1006,10 +1002,6 @@ static INT32 PlegendsInit()
 	
 	bDrawScreen = true;
 
-#if defined FBA_DEBUG && defined USE_SPEEDHACKS
-	bprintf(PRINT_IMPORTANT, _T("  * Using speed-hacks (detecting idle loops).\n"));
-#endif
-
 	DrvDoReset(); // Reset machine
 
 	return 0;
diff --git a/src/burn/drivers/cave/d_sailormn.cpp b/src/burn/drivers/cave/d_sailormn.cpp
index bce8d96be..92cac8316 100644
--- a/src/burn/drivers/cave/d_sailormn.cpp
+++ b/src/burn/drivers/cave/d_sailormn.cpp
@@ -956,12 +956,6 @@ static INT32 gameInit()
 
 	bDrawScreen = true;
 
-#if 0
-#if defined FBA_DEBUG && defined USE_SPEEDHACKS
-	bprintf(PRINT_IMPORTANT, "  * Using speed-hacks (detecting idle loops).\n");
-#endif
-#endif
-
 	DrvDoReset();
 
 	return 0;