From: Atari Ace [mailto:atari_ace@verizon.net]

Subject: [patch] Small deprecat.h related cleanup

Hi mamedev,

While doing some work on eliminating some uses of deprecat.h, I came
across a few files that didn't have it that used deprecated features.
A little investigation revealed they were getting it through
debugger.h, typically by referencing m68000.h.  Since deprecat.h is
intended to document the files that need updating (otherwise it would
just be included in a common header), I reworked debugger.h to not
import it when the debugger is not enabled, and fixed the files that
broke as a result.

~aa

src/emu/cpu/g65816/g65816op.h

@@ -1,3 +1,5 @@
+#include "deprecat.h"
+
 /* ======================================================================== */
 /* ============================= CONFIGURATION ============================ */
 /* ======================================================================== */

src/emu/cpu/m37710/m37710.c

@@ -51,6 +51,7 @@
         added save state support.
 */
 
+#include "deprecat.h"
 #include "debugger.h"
 #include "m37710cm.h"
 

src/emu/cpu/m6502/m6502.c

@@ -29,6 +29,7 @@
 #define HAS_M65C02 1
 #endif
 
+#include "deprecat.h"
 #include "debugger.h"
 #include "m6502.h"
 #include "ops02.h"

src/emu/cpu/m6502/m6509.c

@@ -37,6 +37,7 @@ addresses take place.
 
 */
 
+#include "deprecat.h"
 #include "debugger.h"
 #include "m6509.h"
 

src/emu/cpu/m68000/m68kcpu.c

@@ -972,6 +972,8 @@ void m68k_set_context(void* src)
 
 #if M68K_COMPILE_FOR_MAME == OPT_ON
 
+#include "deprecat.h"
+
 static struct {
 	UINT16 sr;
 	UINT8 stopped;

src/emu/cpu/powerpc/ppc403.c

@@ -678,7 +678,7 @@ static void ppc403_spu_w(UINT32 a, UINT8 d)
 
 		case 0x9:
 			ppc.spu.sptb = d;
-			ppc403_spu_tx_callback(Machine, NULL, cpu_getactivecpu());
+			ppc403_spu_tx_callback(NULL/* Machine */, NULL, cpu_getactivecpu());
 			break;
 
 		default:

src/emu/debugger.h

@@ -16,7 +16,9 @@
 
 #include "mame.h"
 #include "memory.h"
+#ifdef ENABLE_DEBUGGER
 #include "deprecat.h"
+#endif
 
 
 /***************************************************************************

src/emu/deprecat.h

@@ -15,6 +15,7 @@
 #ifndef __DEPRECAT_H__
 #define __DEPRECAT_H__
 
+#include "mamecore.h"
 
 
 /*************************************

src/mame/drivers/armedf.c

@@ -152,6 +152,7 @@ Stephh's notes (based on the games M68000 code and some tests) :
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "cpu/z80/z80.h"
 #include "sound/dac.h"

src/mame/drivers/cps2.c

@@ -584,6 +584,7 @@ Stephh's inputs notes (based on some tests on the "parent" set) :
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "cpu/m68000/m68000.h"
 #include "sound/qsound.h"

src/mame/drivers/fcrash.c

@@ -33,6 +33,7 @@ from 2.bin to 9.bin program eproms
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68kmame.h"
 #include "cps1.h"
 #include "sound/2203intf.h"

src/mame/drivers/gaelco2.c

@@ -19,6 +19,7 @@
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "sound/gaelco.h"
 #include "rendlay.h"

src/mame/drivers/targeth.c

@@ -9,6 +9,7 @@ The DS5002FP has 32KB undumped gameplay code making the game unplayable :_(
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "sound/okim6295.h"
 

src/mame/drivers/xorworld.c

@@ -31,6 +31,7 @@ EEPROM chip: 93C46
 ***************************************************************************/
 
 #include "driver.h"
+#include "deprecat.h"
 #include "machine/eeprom.h"
 #include "cpu/m68000/m68000.h"
 #include "sound/saa1099.h"

src/mame/machine/s24fd.c

@@ -6,6 +6,7 @@ this could get messy if games change their own code after initial loading as we'
 */
 
 #include "driver.h"
+#include "deprecat.h"
 #include "cpu/m68000/m68000.h"
 #include "machine/fd1094.h"