made some of sound devices use device callbacks instead of function callbacks part 1 (nw)

src/emu/sound/2608intf.c

@@ -24,6 +24,7 @@ struct ym2608_state
 	void *          psg;
 	const ym2608_interface *intf;
 	device_t *device;
+	devcb_resolved_write_line irqhandler;
 };
 
 
@@ -72,8 +73,9 @@ static const ssg_callbacks psgintf =
 /* IRQ Handler */
 static void IRQHandler(void *param,int irq)
 {
-	ym2608_state *info = (ym2608_state *)param;
-	if(info->intf->handler) info->intf->handler(info->device, irq);
+	ym2608_state *info = (ym2608_state *)param;	
+	if (!info->irqhandler.isnull())
+		info->irqhandler(irq);	
 }
 
 /* Timer overflow callback from timer.c */
@@ -133,7 +135,7 @@ static DEVICE_START( ym2608 )
 			AY8910_DEFAULT_LOADS,
 			DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
 		},
-		NULL
+		DEVCB_NULL
 	};
 	const ym2608_interface *intf = device->static_config() ? (const ym2608_interface *)device->static_config() : &generic_2608;
 	int rate = device->clock()/72;
@@ -145,6 +147,8 @@ static DEVICE_START( ym2608 )
 	info->intf = intf;
 	info->device = device;
 
+	info->irqhandler.resolve(intf->irqhandler, *device);
+	
 	/* FIXME: Force to use simgle output */
 	info->psg = ay8910_start_ym(NULL, YM2608, device, device->clock(), &intf->ay8910_intf);
 	assert_always(info->psg != NULL, "Error creating YM2608/AY8910 chip");

src/emu/sound/2608intf.h

@@ -13,7 +13,7 @@ void ym2608_update_request(void *param);
 struct ym2608_interface
 {
 	const ay8910_interface ay8910_intf;
-	void ( *handler )( device_t *device, int irq ); /* IRQ handler for the YM2608 */
+	devcb_write_line irqhandler; /* IRQ handler for the YM2608 */
 };
 
 DECLARE_READ8_DEVICE_HANDLER( ym2608_r );

src/emu/sound/2610intf.c

@@ -24,6 +24,7 @@ struct ym2610_state
 	void *          psg;
 	const ym2610_interface *intf;
 	device_t *device;
+	devcb_resolved_write_line irqhandler;
 };
 
 
@@ -72,7 +73,8 @@ static const ssg_callbacks psgintf =
 static void IRQHandler(void *param,int irq)
 {
 	ym2610_state *info = (ym2610_state *)param;
-	if(info->intf->handler) info->intf->handler(info->device, irq);
+	if (!info->irqhandler.isnull())
+		info->irqhandler(irq);
 }
 
 /* Timer overflow callback from timer.c */
@@ -133,7 +135,7 @@ static void ym2610_intf_postload(ym2610_state *info)
 
 static DEVICE_START( ym2610 )
 {
-	static const ym2610_interface generic_2610 = { 0 };
+	static const ym2610_interface generic_2610 = { DEVCB_NULL };
 	static const ay8910_interface generic_ay8910 =
 	{
 		AY8910_LEGACY_OUTPUT | AY8910_SINGLE_OUTPUT,
@@ -150,6 +152,7 @@ static DEVICE_START( ym2610 )
 
 	info->intf = intf;
 	info->device = device;
+	info->irqhandler.resolve(intf->irqhandler, *device);
 	info->psg = ay8910_start_ym(NULL, device->type(), device, device->clock(), &generic_ay8910);
 	assert_always(info->psg != NULL, "Error creating YM2610/AY8910 chip");
 

src/emu/sound/2610intf.h

@@ -11,7 +11,7 @@ void ym2610_update_request(void *param);
 
 struct ym2610_interface
 {
-	void ( *handler )( device_t *device, int irq ); /* IRQ handler for the YM2610 */
+	devcb_write_line irqhandler; /* IRQ handler for the YM2610 */
 };
 
 DECLARE_READ8_DEVICE_HANDLER( ym2610_r );

src/emu/sound/2612intf.c

@@ -23,6 +23,7 @@ struct ym2612_state
 	void *          chip;
 	const ym2612_interface *intf;
 	device_t *device;
+	devcb_resolved_write_line irqhandler;
 };
 
 
@@ -40,7 +41,8 @@ INLINE ym2612_state *get_safe_token(device_t *device)
 static void IRQHandler(void *param,int irq)
 {
 	ym2612_state *info = (ym2612_state *)param;
-	if(info->intf->handler) info->intf->handler(info->device, irq);
+	if (!info->irqhandler.isnull())
+		info->irqhandler(irq);
 }
 
 /* Timer overflow callback from timer.c */
@@ -97,12 +99,13 @@ static void ym2612_intf_postload(ym2612_state *info)
 
 static DEVICE_START( ym2612 )
 {
-	static const ym2612_interface dummy = { 0 };
+	static const ym2612_interface dummy = { DEVCB_NULL };
 	ym2612_state *info = get_safe_token(device);
 	int rate = device->clock()/72;
 
 	info->intf = device->static_config() ? (const ym2612_interface *)device->static_config() : &dummy;
 	info->device = device;
+	info->irqhandler.resolve(info->intf->irqhandler, *device);
 
 	/* FM init */
 	/* Timer Handler set */

src/emu/sound/2612intf.h

@@ -9,7 +9,7 @@ void ym2612_update_request(void *param);
 
 struct ym2612_interface
 {
-	void (*handler)(device_t *device, int irq);
+	devcb_write_line irqhandler;
 };
 
 DECLARE_READ8_DEVICE_HANDLER( ym2612_r );
@@ -56,7 +56,7 @@ extern const device_type YM2612;
 
 struct ym3438_interface
 {
-	void (*handler)(device_t *device, int irq);
+	devcb_write_line irqhandler;
 };
 
 

src/emu/sound/262intf.c

@@ -17,6 +17,7 @@ struct ymf262_state
 	void *          chip;
 	const ymf262_interface *intf;
 	device_t *device;
+	devcb_resolved_write_line irqhandler;
 };
 
 
@@ -33,7 +34,8 @@ INLINE ymf262_state *get_safe_token(device_t *device)
 static void IRQHandler_262(void *param,int irq)
 {
 	ymf262_state *info = (ymf262_state *)param;
-	if (info->intf->handler) (info->intf->handler)(info->device, irq);
+	if (!info->irqhandler.isnull())
+		info->irqhandler(irq);
 }
 
 static TIMER_CALLBACK( timer_callback_262_0 )
@@ -76,12 +78,13 @@ static void _stream_update(void *param, int interval)
 
 static DEVICE_START( ymf262 )
 {
-	static const ymf262_interface dummy = { 0 };
+	static const ymf262_interface dummy = { DEVCB_NULL };
 	ymf262_state *info = get_safe_token(device);
 	int rate = device->clock()/288;
 
 	info->intf = device->static_config() ? (const ymf262_interface *)device->static_config() : &dummy;
 	info->device = device;
+	info->irqhandler.resolve(info->intf->irqhandler, *device);
 
 	/* stream system initialize */
 	info->chip = ymf262_init(device,device->clock(),rate);

src/emu/sound/262intf.h

@@ -8,7 +8,7 @@
 
 struct ymf262_interface
 {
-	void (*handler)(device_t *device, int irq);
+	devcb_write_line irqhandler;
 };
 
 

src/emu/sound/3812intf.c

@@ -29,6 +29,7 @@ struct ym3812_state
 	void *          chip;
 	const ym3812_interface *intf;
 	device_t *device;
+	devcb_resolved_write_line irqhandler;
 };
 
 
@@ -44,7 +45,8 @@ INLINE ym3812_state *get_safe_token(device_t *device)
 static void IRQHandler(void *param,int irq)
 {
 	ym3812_state *info = (ym3812_state *)param;
-	if (info->intf->handler) (info->intf->handler)(info->device, irq ? ASSERT_LINE : CLEAR_LINE);
+	if (!info->irqhandler.isnull())
+		info->irqhandler(irq ? ASSERT_LINE : CLEAR_LINE);
 }
 static TIMER_CALLBACK( timer_callback_0 )
 {
@@ -87,12 +89,13 @@ static void _stream_update(void * param, int interval)
 
 static DEVICE_START( ym3812 )
 {
-	static const ym3812_interface dummy = { 0 };
+	static const ym3812_interface dummy = { DEVCB_NULL };
 	ym3812_state *info = get_safe_token(device);
 	int rate = device->clock()/72;
 
 	info->intf = device->static_config() ? (const ym3812_interface *)device->static_config() : &dummy;
 	info->device = device;
+	info->irqhandler.resolve(info->intf->irqhandler, *device);
 
 	/* stream system initialize */
 	info->chip = ym3812_init(device,device->clock(),rate);

src/emu/sound/3812intf.h

@@ -7,7 +7,7 @@
 
 struct ym3812_interface
 {
-	void (*handler)(device_t *device, int linestate);
+	devcb_write_line irqhandler;
 };
 
 DECLARE_READ8_DEVICE_HANDLER( ym3812_r );

src/mame/audio/seibu.c

@@ -447,7 +447,7 @@ WRITE16_HANDLER( seibu_main_mustb_w )
 
 const ym3812_interface seibu_ym3812_interface =
 {
-	seibu_ym3812_irqhandler
+	DEVCB_LINE(seibu_ym3812_irqhandler)
 };
 
 const ym2203_interface seibu_ym2203_interface =

src/mame/drivers/2mindril.c

@@ -416,7 +416,7 @@ static void irqhandler(device_t *device, int irq)
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/actfancr.c

@@ -283,7 +283,7 @@ static void sound_irq(device_t *device, int linestate)
 
 static const ym3812_interface ym3812_config =
 {
-	sound_irq
+	DEVCB_LINE(sound_irq)
 };
 
 /******************************************************************************/

src/mame/drivers/aerofgt.c

@@ -1283,12 +1283,12 @@ static void irqhandler( device_t *device, int irq )
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler  /* IRQ Line */
+	DEVCB_LINE(irqhandler)  /* IRQ Line */
 };
 
 

src/mame/drivers/alpha68k.c

@@ -1854,7 +1854,7 @@ static void YM3812_irq( device_t *device, int param )
 
 static const ym3812_interface ym3812_config =
 {
-	YM3812_irq
+	DEVCB_LINE(YM3812_irq)
 };
 
 

src/mame/drivers/amaticmg.c

@@ -793,7 +793,7 @@ GFXDECODE_END
 
 static const ym3812_interface ym3812_config =
 {
-	0
+	DEVCB_NULL
 };
 
 

src/mame/drivers/asuka.c

@@ -773,7 +773,7 @@ static void irq_handler(device_t *device, int irq)
 
 static const ym2610_interface ym2610_config =
 {
-	irq_handler
+	DEVCB_LINE(irq_handler)
 };
 
 

src/mame/drivers/bbusters.c

@@ -645,12 +645,12 @@ static const ym2608_interface ym2608_config =
 		AY8910_DEFAULT_LOADS,
 		DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
 	},
-	sound_irq
+	DEVCB_LINE(sound_irq)
 };
 
 static const ym2610_interface ym2610_config =
 {
-	sound_irq
+	DEVCB_LINE(sound_irq)
 };
 
 /******************************************************************************/

src/mame/drivers/crospang.c

@@ -323,7 +323,7 @@ static void irqhandler( device_t *device, int linestate )
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler  /* IRQ Line */
+	DEVCB_LINE(irqhandler)  /* IRQ Line */
 };
 
 

src/mame/drivers/crshrace.c

@@ -428,7 +428,7 @@ static void irqhandler( device_t *device, int irq )
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 static const k053936_interface crshrace_k053936_intf =

src/mame/drivers/dec0.c

@@ -1306,12 +1306,12 @@ static void sound_irq2(device_t *device, int linestate)
 
 static const ym3812_interface ym3812_config =
 {
-	sound_irq
+	DEVCB_LINE(sound_irq)
 };
 
 static const ym3812_interface ym3812b_interface =
 {
-	sound_irq2
+	DEVCB_LINE(sound_irq2)
 };
 
 /******************************************************************************/

src/mame/drivers/dec8.c

@@ -1918,7 +1918,7 @@ static const ym3526_interface ym3526_config =
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 static const msm5205_interface msm5205_config =

src/mame/drivers/deniam.c

@@ -236,7 +236,7 @@ static void irqhandler( device_t *device, int linestate )
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/f1gp.c

@@ -398,7 +398,7 @@ static void irqhandler( device_t *device, int irq )
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 static const k053936_interface f1gp_k053936_intf =

src/mame/drivers/fromanc2.c

@@ -490,7 +490,7 @@ static void irqhandler(device_t *device, int irq)
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/fuukifg2.c

@@ -399,7 +399,7 @@ static void soundirq( device_t *device, int state )
 
 static const ym3812_interface fuuki16_ym3812_intf =
 {
-	soundirq    /* IRQ Line */
+	DEVCB_LINE(soundirq)    /* IRQ Line */
 };
 
 /*

src/mame/drivers/fuukifg3.c

@@ -582,7 +582,7 @@ static const ymf278b_interface fuuki32_ymf278b_interface =
 
 static const ymf262_interface fuuki32_ymf262_interface =
 {
-	NULL            /* irq, already hooked up via ymf278b */
+	DEVCB_NULL            /* irq, already hooked up via ymf278b */
 };
 
 static MACHINE_CONFIG_START( fuuki32, fuuki32_state )

src/mame/drivers/galspnbl.c

@@ -213,7 +213,7 @@ static void irqhandler( device_t *device, int linestate )
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/gstriker.c

@@ -269,7 +269,7 @@ static void gs_ym2610_irq(device_t *device, int irq)
 
 static const ym2610_interface ym2610_config =
 {
-	gs_ym2610_irq
+	DEVCB_LINE(gs_ym2610_irq)
 };
 
 /*** MEMORY LAYOUTS **********************************************************/

src/mame/drivers/hcastle.c

@@ -174,7 +174,7 @@ static const k007232_interface k007232_config =
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 void hcastle_state::machine_start()

src/mame/drivers/inufuku.c

@@ -328,7 +328,7 @@ static void irqhandler( device_t *device, int irq )
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/itech8.c

@@ -1659,13 +1659,13 @@ static const ym2608_interface ym2608b_config =
 		DEVCB_NULL,
 		DEVCB_DRIVER_MEMBER(itech8_state,ym2203_portb_out),
 	},
-	generate_sound_irq
+	DEVCB_LINE(generate_sound_irq)
 };
 
 
 static const ym3812_interface ym3812_config =
 {
-	generate_sound_irq
+	DEVCB_LINE(generate_sound_irq)
 };
 
 

src/mame/drivers/lordgun.c

@@ -671,7 +671,7 @@ static void soundirq(device_t *device, int state)
 
 static const ym3812_interface lordgun_ym3812_interface =
 {
-	soundirq
+	DEVCB_LINE(soundirq)
 };
 
 static MACHINE_CONFIG_START( lordgun, lordgun_state )

src/mame/drivers/mcatadv.c

@@ -420,7 +420,7 @@ static void sound_irq( device_t *device, int irq )
 
 static const ym2610_interface mcatadv_ym2610_interface =
 {
-	sound_irq   /* irq */
+	DEVCB_LINE(sound_irq)   /* irq */
 };
 
 

src/mame/drivers/metro.c

@@ -1628,7 +1628,7 @@ static void blzntrnd_irqhandler(device_t *device, int irq)
 
 static const ym2610_interface blzntrnd_ym2610_interface =
 {
-	blzntrnd_irqhandler
+	DEVCB_LINE(blzntrnd_irqhandler)
 };
 
 static ADDRESS_MAP_START( blzntrnd_sound_map, AS_PROGRAM, 8, metro_state )

src/mame/drivers/nemesis.c

@@ -1489,7 +1489,7 @@ static void sound_irq(device_t *device, int state)
 
 static const ym3812_interface ym3812_config =
 {
-	sound_irq
+	DEVCB_LINE(sound_irq)
 };
 
 static void volume_callback(device_t *device, int v)

src/mame/drivers/neogeo.c

@@ -1148,7 +1148,7 @@ ADDRESS_MAP_END
 
 static const ym2610_interface ym2610_config =
 {
-	audio_cpu_irq
+	DEVCB_LINE(audio_cpu_irq)
 };
 
 

src/mame/drivers/neoprint.c

@@ -455,7 +455,7 @@ static void audio_cpu_irq(device_t *device, int assert)
 
 static const ym2610_interface ym2610_config =
 {
-	audio_cpu_irq
+	DEVCB_LINE(audio_cpu_irq)
 };
 
 

src/mame/drivers/ninjaw.c

@@ -643,7 +643,7 @@ static void irqhandler( device_t *device, int irq )
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/nmg5.c

@@ -979,7 +979,7 @@ static void soundirq( device_t *device, int state )
 
 static const ym3812_interface ym3812_intf =
 {
-	soundirq    /* IRQ Line */
+	DEVCB_LINE(soundirq)    /* IRQ Line */
 };
 
 void nmg5_state::machine_start()

src/mame/drivers/oneshot.c

@@ -335,7 +335,7 @@ static void irq_handler(device_t *device, int irq)
 
 static const ym3812_interface ym3812_config =
 {
-	irq_handler
+	DEVCB_LINE(irq_handler)
 };
 
 void oneshot_state::machine_start()

src/mame/drivers/onetwo.c

@@ -337,7 +337,7 @@ static void irqhandler(device_t *device, int linestate)
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler  /* IRQ Line */
+	DEVCB_LINE(irqhandler)  /* IRQ Line */
 };
 
 /*************************************

src/mame/drivers/othunder.c

@@ -626,7 +626,7 @@ static void irqhandler( device_t *device, int irq )
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/pipedrm.c

@@ -588,13 +588,13 @@ static const ym2608_interface ym2608_config =
 		AY8910_DEFAULT_LOADS,
 		DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
 	},
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/prehisle.c

@@ -200,7 +200,7 @@ static void irqhandler(device_t *device, int irq)
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 /******************************************************************************/

src/mame/drivers/psikyo.c

@@ -1036,7 +1036,7 @@ void psikyo_state::machine_reset()
 
 static const ym2610_interface sngkace_ym2610_interface =
 {
-	sound_irq
+	DEVCB_LINE(sound_irq)
 };
 
 static MACHINE_CONFIG_START( sngkace, psikyo_state )
@@ -1085,7 +1085,7 @@ MACHINE_CONFIG_END
 
 static const ym2610_interface gunbird_ym2610_interface =
 {
-	sound_irq   /* irq */
+	DEVCB_LINE(sound_irq)   /* irq */
 };
 
 static MACHINE_CONFIG_START( gunbird, psikyo_state )

src/mame/drivers/segac2.c

@@ -1230,7 +1230,7 @@ static void  segac2_irq2_interrupt(device_t *device, int state)
 }
 static const ym3438_interface ym3438_intf =
 {
-	segac2_irq2_interrupt,      /* IRQ handler */
+	DEVCB_LINE(segac2_irq2_interrupt)      /* IRQ handler */
 };
 
 

src/mame/drivers/segas32.c

@@ -2138,7 +2138,7 @@ GFXDECODE_END
 
 static const ym3438_interface ym3438_config =
 {
-	ym3438_irq_handler
+	DEVCB_LINE(ym3438_irq_handler)
 };
 
 

src/mame/drivers/seta.c

@@ -1494,7 +1494,7 @@ static void utoukond_ym3438_interrupt(device_t *device, int linestate)
 
 static const ym3438_interface utoukond_ym3438_intf =
 {
-	utoukond_ym3438_interrupt   // IRQ handler
+	DEVCB_LINE(utoukond_ym3438_interrupt)   // IRQ handler
 };
 
 /***************************************************************************

src/mame/drivers/shangha3.c

@@ -472,7 +472,7 @@ static void irqhandler(device_t *device, int linestate)
 
 static const ym3438_interface ym3438_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/slapshot.c

@@ -484,7 +484,7 @@ static void irqhandler( device_t *device, int irq )
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/snk.c

@@ -473,7 +473,7 @@ static const ym3526_interface ym3526_config_2 =
 
 static const ym3812_interface ym3812_config_1 =
 {
-	ymirq_callback_1
+	DEVCB_LINE(ymirq_callback_1)
 };
 
 static const y8950_interface y8950_config_2 =

src/mame/drivers/snk68.c

@@ -581,7 +581,7 @@ static void irqhandler(device_t *device, int irq)
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 /******************************************************************************/

src/mame/drivers/snowbros.c

@@ -1500,7 +1500,7 @@ static void irqhandler(device_t *device, int irq)
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/spbactn.c

@@ -409,7 +409,7 @@ static void irqhandler(device_t *device, int linestate)
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 static MACHINE_CONFIG_START( spbactn, spbactn_state )

src/mame/drivers/spdodgeb.c

@@ -382,7 +382,7 @@ static void irq_handler(device_t *device, int irq)
 
 static const ym3812_interface ym3812_config =
 {
-	irq_handler
+	DEVCB_LINE(irq_handler)
 };
 
 static const msm5205_interface msm5205_config =

src/mame/drivers/spy.c

@@ -467,7 +467,7 @@ static void irqhandler( device_t *device, int linestate )
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/stadhero.c

@@ -219,7 +219,7 @@ static void irqhandler(device_t *device, int linestate)
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 /******************************************************************************/

src/mame/drivers/suna8.c

@@ -1910,7 +1910,7 @@ MACHINE_CONFIG_END
 
 static const ym3812_interface brickzn_ym3812_interface =
 {
-	soundirq    /* IRQ Line */
+	DEVCB_LINE(soundirq)    /* IRQ Line */
 };
 
 MACHINE_RESET_MEMBER(suna8_state,brickzn)

src/mame/drivers/suprslam.c

@@ -284,7 +284,7 @@ static void irqhandler(device_t *device, int irq)
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 /*** MACHINE DRIVER **********************************************************/

src/mame/drivers/tail2nos.c

@@ -192,7 +192,7 @@ static const ym2608_interface ym2608_config =
 		DEVCB_NULL,
 		DEVCB_DRIVER_MEMBER(tail2nos_state,sound_bankswitch_w)
 	},
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/taito_b.c

@@ -1898,7 +1898,7 @@ static void irqhandler( device_t *device, int irq )
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 static const ym2203_interface ym2203_config =

src/mame/drivers/taito_f2.c

@@ -2810,7 +2810,7 @@ static void irq_handler( device_t *device, int irq )
 
 static const ym2610_interface ym2610_config =
 {
-	irq_handler
+	DEVCB_LINE(irq_handler)
 };
 
 

src/mame/drivers/taito_h.c

@@ -164,7 +164,7 @@ static void irqhandler( device_t *device, int irq )
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/taito_l.c

@@ -1798,7 +1798,7 @@ static const msm5205_interface msm5205_config =
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 static const ym2203_interface ym2203_interface_single =

src/mame/drivers/taito_x.c

@@ -798,7 +798,7 @@ static void irqhandler(device_t *device, int irq)
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 MACHINE_START_MEMBER(taitox_state,taitox)

src/mame/drivers/taito_z.c

@@ -2915,12 +2915,12 @@ static void irqhandlerb(device_t *device, int irq)
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 static const ym2610_interface ym2610_interfaceb =
 {
-	irqhandlerb
+	DEVCB_LINE(irqhandlerb)
 };
 
 

src/mame/drivers/taitoair.c

@@ -634,7 +634,7 @@ static void irqhandler( device_t *device, int irq )
 
 static const ym2610_interface airsys_ym2610_interface =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/taotaido.c

@@ -327,7 +327,7 @@ static void irqhandler(device_t *device, int irq)
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/tbowl.c

@@ -426,7 +426,7 @@ static void irqhandler(device_t *device, int linestate)
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 static const msm5205_interface msm5205_config =

src/mame/drivers/tecmo.c

@@ -611,7 +611,7 @@ static void irqhandler(device_t *device, int linestate)
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 static const msm5205_interface msm5205_config =

src/mame/drivers/tecmosys.c

@@ -444,7 +444,7 @@ static void sound_irq(device_t *device, int irq)
 
 static const ymf262_interface tecmosys_ymf262_interface =
 {
-	sound_irq       /* irq */
+	DEVCB_LINE(sound_irq)       /* irq */
 };
 
 void tecmosys_state::machine_start()

src/mame/drivers/toaplan1.c

@@ -1522,7 +1522,7 @@ static void irqhandler(device_t *device, int linestate)
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/toaplan2.c

@@ -2983,7 +2983,7 @@ static void irqhandler(device_t *device, int linestate)
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/twincobr.c

@@ -554,7 +554,7 @@ static void irqhandler(device_t *device, int linestate)
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/wardner.c

@@ -371,7 +371,7 @@ static void irqhandler(device_t *device, int linestate)
 
 static const ym3812_interface ym3812_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/warriorb.c

@@ -427,7 +427,7 @@ static void irqhandler( device_t *device, int irq )
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 /***********************************************************

src/mame/drivers/wc90.c

@@ -302,7 +302,7 @@ static const ym2608_interface ym2608_config =
 		AY8910_DEFAULT_LOADS,
 		DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL
 	},
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 static MACHINE_CONFIG_START( wc90, wc90_state )

src/mame/drivers/welltris.c

@@ -678,7 +678,7 @@ static void irqhandler(device_t *device, int irq)
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/wgp.c

@@ -896,7 +896,7 @@ static void irqhandler( device_t *device, int irq ) // assumes Z80 sandwiched be
 
 static const ym2610_interface ym2610_config =
 {
-	irqhandler
+	DEVCB_LINE(irqhandler)
 };
 
 

src/mame/drivers/yunsun16.c

@@ -580,7 +580,7 @@ static void soundirq(device_t *device, int state)
 
 static const ym3812_interface magicbub_ym3812_intf =
 {
-	soundirq    /* IRQ Line */
+	DEVCB_LINE(soundirq)    /* IRQ Line */
 };
 
 static MACHINE_CONFIG_START( magicbub, yunsun16_state )

src/mame/drivers/zn.c

@@ -1163,7 +1163,7 @@ static void irq_handler(device_t *device, int irq)
 
 static const ym2610_interface ym2610_config =
 {
-	irq_handler
+	DEVCB_LINE(irq_handler)
 };
 
 static const tc0140syt_interface coh1000ta_tc0140syt_intf =

src/mess/drivers/fmtowns.c

@@ -2766,7 +2766,7 @@ static const upd71071_intf towns_dma_config =
 
 static const ym3438_interface ym3438_intf =
 {
-	towns_fm_irq
+	DEVCB_LINE(towns_fm_irq)
 };
 
 static const rf5c68_interface rf5c68_intf =

src/mess/drivers/pc8801.c

@@ -2609,7 +2609,7 @@ static const ym2608_interface pc88_ym2608_intf =
 		DEVCB_NULL,
 		DEVCB_NULL
 	},
-	pc8801_sound_irq
+	DEVCB_LINE(pc8801_sound_irq)
 };
 
 /* Cassette Configuration */

src/mess/machine/isa_adlib.c

@@ -13,7 +13,7 @@
 
 static const ym3812_interface pc_ym3812_interface =
 {
-	NULL
+	DEVCB_NULL
 };
 
 static MACHINE_CONFIG_FRAGMENT( adlib_config )

src/mess/machine/isa_sblaster.c

@@ -63,12 +63,12 @@ static const int protection_magic[4] = { 0x96, 0xa5, 0x69, 0x5a };
 
 static const ym3812_interface pc_ym3812_interface =
 {
-	NULL
+	DEVCB_NULL
 };
 
 static const ymf262_interface pc_ymf262_interface =
 {
-	NULL
+	DEVCB_NULL
 };
 
 static SLOT_INTERFACE_START(midiin_slot)

src/mess/machine/isa_stereo_fx.c

@@ -8,7 +8,7 @@ const device_type ISA8_STEREO_FX = &device_creator<stereo_fx_device>;
 
 static const ym3812_interface pc_ym3812_interface =
 {
-	NULL
+	DEVCB_NULL
 };
 
 READ8_MEMBER( stereo_fx_device::dev_dsp_data_r )

src/mess/machine/pc9801_118.c

@@ -53,7 +53,7 @@ static const ym2608_interface pc98_ym2608_intf =
 		DEVCB_NULL,//(pc9801_state,opn_porta_w),
 		DEVCB_DEVICE_MEMBER(DEVICE_SELF_OWNER, pc9801_118_device,opn_portb_w),
 	},
-	pc9801_sound_irq
+	DEVCB_LINE(pc9801_sound_irq)
 };
 
 static MACHINE_CONFIG_FRAGMENT( pc9801_118_config )

src/mess/machine/pc9801_86.c

@@ -53,7 +53,7 @@ static const ym2608_interface pc98_ym2608_intf =
 		DEVCB_NULL,//(pc9801_state,opn_porta_w),
 		DEVCB_DEVICE_MEMBER(DEVICE_SELF_OWNER, pc9801_86_device,opn_portb_w),
 	},
-	pc9801_sound_irq
+	DEVCB_LINE(pc9801_sound_irq)
 };
 
 static MACHINE_CONFIG_FRAGMENT( pc9801_86_config )