From 4f6b8e9d91b8a3441b7d88b2d1e6fa53e3798f91 Mon Sep 17 00:00:00 2001
From: Nathan Woods <npwoods@mess.org>
Date: Fri, 23 May 2008 11:22:34 +0000
Subject: [PATCH] Passing more running_machine* parameters around

---
 src/emu/video/v9938.c     | 6 +++---
 src/emu/video/v9938.h     | 2 +-
 src/mame/drivers/meritm.c | 4 ++--
 src/mame/drivers/sangho.c | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/emu/video/v9938.c b/src/emu/video/v9938.c
index 1bb113141be..72a52a3dd90 100644
--- a/src/emu/video/v9938.c
+++ b/src/emu/video/v9938.c
@@ -40,7 +40,7 @@ typedef struct {
 	int vram_size;
     /* interrupt */
     UINT8 INT;
-    void (*INTCallback)(int);
+    void (*INTCallback)(running_machine *, int);
 	int scanline;
     /* blinking */
     int blink, blink_count;
@@ -483,7 +483,7 @@ WRITE8_HANDLER (v9938_1_command_w)
 
 ***************************************************************************/
 
-void v9938_init (running_machine *machine, int which, const device_config *screen, bitmap_t *bitmap, int model, int vram_size, void (*callback)(int) )
+void v9938_init (running_machine *machine, int which, const device_config *screen, bitmap_t *bitmap, int model, int vram_size, void (*callback)(running_machine *, int) )
 {
 	vdp = &vdps[which];
 
@@ -610,7 +610,7 @@ static void v9938_check_int (void)
     ** called; because of this Mr. Ghost, Xevious and SD Snatcher don't
     ** run. As a patch it's called every scanline
     */
-	vdp->INTCallback (n);
+	vdp->INTCallback (Machine, n);
 	}
 
 void v9938_set_sprite_limit (int which, int i)
diff --git a/src/emu/video/v9938.h b/src/emu/video/v9938.h
index 533b56498bb..7d60645d28d 100644
--- a/src/emu/video/v9938.h
+++ b/src/emu/video/v9938.h
@@ -14,7 +14,7 @@
 #define RENDER_LOW	(1)
 #define RENDER_AUTO	(2)
 
-void v9938_init (running_machine *machine, int which, const device_config *screen, bitmap_t *bitmap, int model, int vram_size, void (*callback)(int) );
+void v9938_init (running_machine *machine, int which, const device_config *screen, bitmap_t *bitmap, int model, int vram_size, void (*callback)(running_machine *, int) );
 void v9938_reset (int which);
 int v9938_interrupt (int which);
 void v9938_set_sprite_limit (int which, int);
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index b8bf71d8ed6..4f5a62c76e5 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -271,7 +271,7 @@ static INTERRUPT_GEN( meritm_interrupt )
 	v9938_interrupt(1);
 }
 
-static void meritm_vdp0_interrupt(int i)
+static void meritm_vdp0_interrupt(running_machine *machine, int i)
 {
 	if ( meritm_interrupt_vdp0_state != i )
 	{
@@ -286,7 +286,7 @@ static void meritm_vdp0_interrupt(int i)
 	}
 }
 
-static void meritm_vdp1_interrupt(int i)
+static void meritm_vdp1_interrupt(running_machine *machine, int i)
 {
 	if ( meritm_interrupt_vdp1_state != i )
 	{
diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c
index 9489ccc8a16..7c3057b9369 100644
--- a/src/mame/drivers/sangho.c
+++ b/src/mame/drivers/sangho.c
@@ -212,9 +212,9 @@ static MACHINE_RESET(sexyboom)
 	sangho_common_machine_reset();
 }
 
-static void msx_vdp_interrupt(int i)
+static void msx_vdp_interrupt(running_machine *machine, int i)
 {
-	cpunum_set_input_line (Machine, 0, 0, (i ? HOLD_LINE : CLEAR_LINE));
+	cpunum_set_input_line (machine, 0, 0, (i ? HOLD_LINE : CLEAR_LINE));
 }
 
 static INTERRUPT_GEN( sangho_interrupt )