From c0cbb937bce880bd2649475c927e8cd693f20e3b Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 28 Mar 2013 15:15:11 +0000 Subject: made some of sound devices use device callbacks instead of function callbacks part 1 (nw) --- src/mame/drivers/2mindril.c | 2 +- src/mame/drivers/actfancr.c | 2 +- src/mame/drivers/aerofgt.c | 4 ++-- src/mame/drivers/alpha68k.c | 2 +- src/mame/drivers/amaticmg.c | 2 +- src/mame/drivers/asuka.c | 2 +- src/mame/drivers/bbusters.c | 4 ++-- src/mame/drivers/crospang.c | 2 +- src/mame/drivers/crshrace.c | 2 +- src/mame/drivers/dec0.c | 4 ++-- src/mame/drivers/dec8.c | 2 +- src/mame/drivers/deniam.c | 2 +- src/mame/drivers/f1gp.c | 2 +- src/mame/drivers/fromanc2.c | 2 +- src/mame/drivers/fuukifg2.c | 2 +- src/mame/drivers/fuukifg3.c | 2 +- src/mame/drivers/galspnbl.c | 2 +- src/mame/drivers/gstriker.c | 2 +- src/mame/drivers/hcastle.c | 2 +- src/mame/drivers/inufuku.c | 2 +- src/mame/drivers/itech8.c | 4 ++-- src/mame/drivers/lordgun.c | 2 +- src/mame/drivers/mcatadv.c | 2 +- src/mame/drivers/metro.c | 2 +- src/mame/drivers/nemesis.c | 2 +- src/mame/drivers/neogeo.c | 2 +- src/mame/drivers/neoprint.c | 2 +- src/mame/drivers/ninjaw.c | 2 +- src/mame/drivers/nmg5.c | 2 +- src/mame/drivers/oneshot.c | 2 +- src/mame/drivers/onetwo.c | 2 +- src/mame/drivers/othunder.c | 2 +- src/mame/drivers/pipedrm.c | 4 ++-- src/mame/drivers/prehisle.c | 2 +- src/mame/drivers/psikyo.c | 4 ++-- src/mame/drivers/segac2.c | 2 +- src/mame/drivers/segas32.c | 2 +- src/mame/drivers/seta.c | 2 +- src/mame/drivers/shangha3.c | 2 +- src/mame/drivers/slapshot.c | 2 +- src/mame/drivers/snk.c | 2 +- src/mame/drivers/snk68.c | 2 +- src/mame/drivers/snowbros.c | 2 +- src/mame/drivers/spbactn.c | 2 +- src/mame/drivers/spdodgeb.c | 2 +- src/mame/drivers/spy.c | 2 +- src/mame/drivers/stadhero.c | 2 +- src/mame/drivers/suna8.c | 2 +- src/mame/drivers/suprslam.c | 2 +- src/mame/drivers/tail2nos.c | 2 +- src/mame/drivers/taito_b.c | 2 +- src/mame/drivers/taito_f2.c | 2 +- src/mame/drivers/taito_h.c | 2 +- src/mame/drivers/taito_l.c | 2 +- src/mame/drivers/taito_x.c | 2 +- src/mame/drivers/taito_z.c | 4 ++-- src/mame/drivers/taitoair.c | 2 +- src/mame/drivers/taotaido.c | 2 +- src/mame/drivers/tbowl.c | 2 +- src/mame/drivers/tecmo.c | 2 +- src/mame/drivers/tecmosys.c | 2 +- src/mame/drivers/toaplan1.c | 2 +- src/mame/drivers/toaplan2.c | 2 +- src/mame/drivers/twincobr.c | 2 +- src/mame/drivers/wardner.c | 2 +- src/mame/drivers/warriorb.c | 2 +- src/mame/drivers/wc90.c | 2 +- src/mame/drivers/welltris.c | 2 +- src/mame/drivers/wgp.c | 2 +- src/mame/drivers/yunsun16.c | 2 +- src/mame/drivers/zn.c | 2 +- 71 files changed, 78 insertions(+), 78 deletions(-) (limited to 'src/mame/drivers') diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c index 8cc3cb9f7e3..5fdc4b3f475 100644 --- a/src/mame/drivers/2mindril.c +++ b/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) }; diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c index c0a7340ae7d..71ae8cdc83a 100644 --- a/src/mame/drivers/actfancr.c +++ b/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) }; /******************************************************************************/ diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index 85404f4920a..ecefef573e9 100644 --- a/src/mame/drivers/aerofgt.c +++ b/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 */ }; diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c index 32229343fb9..ea374a7bdab 100644 --- a/src/mame/drivers/alpha68k.c +++ b/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) }; diff --git a/src/mame/drivers/amaticmg.c b/src/mame/drivers/amaticmg.c index fe3fc461259..10c718be08e 100644 --- a/src/mame/drivers/amaticmg.c +++ b/src/mame/drivers/amaticmg.c @@ -793,7 +793,7 @@ GFXDECODE_END static const ym3812_interface ym3812_config = { - 0 + DEVCB_NULL }; diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c index 4452e4ed29a..262667eb8db 100644 --- a/src/mame/drivers/asuka.c +++ b/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) }; diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c index c1444e526a3..fb2996618e6 100644 --- a/src/mame/drivers/bbusters.c +++ b/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) }; /******************************************************************************/ diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c index b704be6706d..a1d0f217da1 100644 --- a/src/mame/drivers/crospang.c +++ b/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 */ }; diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c index 338e630b039..c024f61a48a 100644 --- a/src/mame/drivers/crshrace.c +++ b/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 = diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index d38e7a56aa1..5592021ffad 100644 --- a/src/mame/drivers/dec0.c +++ b/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) }; /******************************************************************************/ diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c index 07e54250766..db9ab1cd3a4 100644 --- a/src/mame/drivers/dec8.c +++ b/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 = diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c index ad5f1fc4bf6..657c50ea1fa 100644 --- a/src/mame/drivers/deniam.c +++ b/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) }; diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c index a1ea11649fd..17de750af83 100644 --- a/src/mame/drivers/f1gp.c +++ b/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 = diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index bffda3de66f..ad9220a2c11 100644 --- a/src/mame/drivers/fromanc2.c +++ b/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) }; diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c index 5c6138e83f5..075a4f898d5 100644 --- a/src/mame/drivers/fuukifg2.c +++ b/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 */ }; /* diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c index 1b1ebfbd3a2..e917dc735a8 100644 --- a/src/mame/drivers/fuukifg3.c +++ b/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 ) diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c index 57cef1de53a..2aa4ec683c1 100644 --- a/src/mame/drivers/galspnbl.c +++ b/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) }; diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c index 0b62125e9bc..1880dd9ef56 100644 --- a/src/mame/drivers/gstriker.c +++ b/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 **********************************************************/ diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c index fa1d0eb5af6..e3f5cd01972 100644 --- a/src/mame/drivers/hcastle.c +++ b/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() diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index 26a6c03a139..5895576f392 100644 --- a/src/mame/drivers/inufuku.c +++ b/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) }; diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c index 8d45a690530..e7271f07b40 100644 --- a/src/mame/drivers/itech8.c +++ b/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) }; diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c index 89a51465908..9deb7a42103 100644 --- a/src/mame/drivers/lordgun.c +++ b/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 ) diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c index 37cb586a10a..90003ba570c 100644 --- a/src/mame/drivers/mcatadv.c +++ b/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 */ }; diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 3df8935eff7..9435a15ce59 100644 --- a/src/mame/drivers/metro.c +++ b/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 ) diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c index a840d62e791..94443641b02 100644 --- a/src/mame/drivers/nemesis.c +++ b/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) diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c index 2f043e18cc7..f30f61bd696 100644 --- a/src/mame/drivers/neogeo.c +++ b/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) }; diff --git a/src/mame/drivers/neoprint.c b/src/mame/drivers/neoprint.c index 9ce8101bf18..455a4002281 100644 --- a/src/mame/drivers/neoprint.c +++ b/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) }; diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c index 88b94a52932..191376faf01 100644 --- a/src/mame/drivers/ninjaw.c +++ b/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) }; diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index 3520f88bd5d..7161f682397 100644 --- a/src/mame/drivers/nmg5.c +++ b/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() diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c index 375b74e523a..7e78d3e94e4 100644 --- a/src/mame/drivers/oneshot.c +++ b/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() diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index ca6ad8359ca..0cf4c234cd8 100644 --- a/src/mame/drivers/onetwo.c +++ b/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 */ }; /************************************* diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c index 3e789e71a04..a73eb32b511 100644 --- a/src/mame/drivers/othunder.c +++ b/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) }; diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c index 066f6498586..8d35e66b04e 100644 --- a/src/mame/drivers/pipedrm.c +++ b/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) }; diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c index 17e1a9b3aa5..cb27a92db94 100644 --- a/src/mame/drivers/prehisle.c +++ b/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) }; /******************************************************************************/ diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index 84e6019a634..9fd7cb7be66 100644 --- a/src/mame/drivers/psikyo.c +++ b/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 ) diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c index 4111a4bc21b..7745163acec 100644 --- a/src/mame/drivers/segac2.c +++ b/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 */ }; diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c index 9d0df5e5674..8a5e9923e6c 100644 --- a/src/mame/drivers/segas32.c +++ b/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) }; diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 9ce254b9af7..cfc4aae0fd1 100644 --- a/src/mame/drivers/seta.c +++ b/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 }; /*************************************************************************** diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c index 1467a8a2505..51b24bf8259 100644 --- a/src/mame/drivers/shangha3.c +++ b/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) }; diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c index 27ed56b22f2..93123c76051 100644 --- a/src/mame/drivers/slapshot.c +++ b/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) }; diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c index b162bb16f59..7e75fa7918d 100644 --- a/src/mame/drivers/snk.c +++ b/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 = diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c index 972aad7a11d..39b809b6efe 100644 --- a/src/mame/drivers/snk68.c +++ b/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) }; /******************************************************************************/ diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c index bc8be417d7e..b20e04b3048 100644 --- a/src/mame/drivers/snowbros.c +++ b/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) }; diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c index 26d6c538f28..914ac48e83a 100644 --- a/src/mame/drivers/spbactn.c +++ b/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 ) diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c index 30c02038f65..a8341158ece 100644 --- a/src/mame/drivers/spdodgeb.c +++ b/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 = diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index 96243081cc4..0ecd5229dbf 100644 --- a/src/mame/drivers/spy.c +++ b/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) }; diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c index 23042eb0554..5dfa2287488 100644 --- a/src/mame/drivers/stadhero.c +++ b/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) }; /******************************************************************************/ diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c index 5474bfe636c..2f51f9fc6f3 100644 --- a/src/mame/drivers/suna8.c +++ b/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) diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c index edcc4e3a97b..7de23857ce4 100644 --- a/src/mame/drivers/suprslam.c +++ b/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 **********************************************************/ diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c index bb6d2152bcc..306d647585c 100644 --- a/src/mame/drivers/tail2nos.c +++ b/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) }; diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c index d4bfecb705b..91522f0a422 100644 --- a/src/mame/drivers/taito_b.c +++ b/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 = diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c index 5648ef6dcbc..ffa979737b6 100644 --- a/src/mame/drivers/taito_f2.c +++ b/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) }; diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c index 12ab680d72a..104f78f35f5 100644 --- a/src/mame/drivers/taito_h.c +++ b/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) }; diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c index 5f8018beba4..d036b8456fe 100644 --- a/src/mame/drivers/taito_l.c +++ b/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 = diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c index b5bf5e80ee0..1e79777ca59 100644 --- a/src/mame/drivers/taito_x.c +++ b/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) diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index ad3f7b4905e..ee34b2ba301 100644 --- a/src/mame/drivers/taito_z.c +++ b/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) }; diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c index 665657b3b5a..68011208c9f 100644 --- a/src/mame/drivers/taitoair.c +++ b/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) }; diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c index 92864600bfc..36d7d0564e0 100644 --- a/src/mame/drivers/taotaido.c +++ b/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) }; diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c index 345c5e1417d..fec50f9a2cd 100644 --- a/src/mame/drivers/tbowl.c +++ b/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 = diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c index 0975b1d51a2..e87d8a036b4 100644 --- a/src/mame/drivers/tecmo.c +++ b/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 = diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c index 291440ce387..76eebea3cf3 100644 --- a/src/mame/drivers/tecmosys.c +++ b/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() diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c index 27554b9aa16..b005aca3a77 100644 --- a/src/mame/drivers/toaplan1.c +++ b/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) }; diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index 653626471d1..3a4034d8ae4 100644 --- a/src/mame/drivers/toaplan2.c +++ b/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) }; diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c index d93056b2fe9..74ae64a3285 100644 --- a/src/mame/drivers/twincobr.c +++ b/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) }; diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c index f3f7478c620..929a5cca87d 100644 --- a/src/mame/drivers/wardner.c +++ b/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) }; diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c index b17cbbe49b1..d767c8b9a9c 100644 --- a/src/mame/drivers/warriorb.c +++ b/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) }; /*********************************************************** diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c index d395cc5233d..7aa100e8a91 100644 --- a/src/mame/drivers/wc90.c +++ b/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 ) diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c index f469d7184c0..2e57d3bf0a9 100644 --- a/src/mame/drivers/welltris.c +++ b/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) }; diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c index 8d87af5f37b..9a87e8d5811 100644 --- a/src/mame/drivers/wgp.c +++ b/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) }; diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c index 5ee5bc894ea..3f00fa49d8a 100644 --- a/src/mame/drivers/yunsun16.c +++ b/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 ) diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c index 14089d8c890..8b8f49f583e 100644 --- a/src/mame/drivers/zn.c +++ b/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 = -- cgit v1.2.3