diff options
author | Alex W. Jackson <alex.w.jackson@gmail.com> | 2015-01-27 07:40:41 -0500 |
---|---|---|
committer | Alex W. Jackson <alex.w.jackson@gmail.com> | 2015-01-27 07:40:41 -0500 |
commit | 7ce48633e0d2763a41468c5a391e4cb567e5f6ff (patch) | |
tree | 572d09d8e34d7d5a95d12374401b4be3d81fae59 | |
parent | c1aab420ca52e1b68fb3f625e8138f3ac5afc81d (diff) |
Remove lots of useless sound IRQ trampolines leftover from the pre-devcb era (nw)
66 files changed, 86 insertions, 398 deletions
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c index d128aac12a1..f19e0330a9b 100644 --- a/src/mame/drivers/actfancr.c +++ b/src/mame/drivers/actfancr.c @@ -273,32 +273,13 @@ GFXDECODE_END /******************************************************************************/ -WRITE_LINE_MEMBER(actfancr_state::sound_irq) -{ - m_audiocpu->set_input_line(0, state); /* IRQ */ -} - -/******************************************************************************/ - -MACHINE_START_MEMBER(actfancr_state,actfancr) -{ -} - MACHINE_START_MEMBER(actfancr_state,triothep) { - MACHINE_START_CALL_MEMBER(actfancr); - save_item(NAME(m_trio_control_select)); } -MACHINE_RESET_MEMBER(actfancr_state,actfancr) -{ - m_flipscreen = 0; -} - MACHINE_RESET_MEMBER(actfancr_state,triothep) { - MACHINE_RESET_CALL_MEMBER(actfancr); m_trio_control_select = 0; } @@ -314,9 +295,6 @@ static MACHINE_CONFIG_START( actfancr, actfancr_state ) MCFG_CPU_ADD("audiocpu",M6502, 1500000) /* Should be accurate */ MCFG_CPU_PROGRAM_MAP(dec0_s_map) - MCFG_MACHINE_START_OVERRIDE(actfancr_state,actfancr) - MCFG_MACHINE_RESET_OVERRIDE(actfancr_state,actfancr) - /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -353,7 +331,7 @@ static MACHINE_CONFIG_START( actfancr, actfancr_state ) MCFG_SOUND_ROUTE(3, "mono", 0.50) MCFG_SOUND_ADD("ym2", YM3812, 3000000) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(actfancr_state, sound_irq)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) MCFG_OKIM6295_ADD("oki", 1024188, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified @@ -409,7 +387,7 @@ static MACHINE_CONFIG_START( triothep, actfancr_state ) MCFG_SOUND_ROUTE(3, "mono", 0.50) MCFG_SOUND_ADD("ym2", YM3812, XTAL_12MHz/4) /* verified on pcb */ - MCFG_YM3812_IRQ_HANDLER(WRITELINE(actfancr_state, sound_irq)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90) MCFG_OKIM6295_ADD("oki", XTAL_1_056MHz, OKIM6295_PIN7_HIGH) /* verified on pcb */ diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index 0c9fed31053..8c47fbb323a 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -1271,11 +1271,6 @@ static GFXDECODE_START( wbbc97 ) GFXDECODE_ENTRY( "gfx2", 0, wbbc97_spritelayout, 1024, 64 ) /* colors 1024-2047 in 4 banks */ GFXDECODE_END -WRITE_LINE_MEMBER(aerofgt_state::irqhandler) -{ - m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); -} - MACHINE_START_MEMBER(aerofgt_state,common) { @@ -1343,7 +1338,7 @@ static MACHINE_CONFIG_START( pspikes, aerofgt_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymsnd", YM2610, 8000000) - MCFG_YM2610_IRQ_HANDLER(WRITELINE(aerofgt_state, irqhandler)) + MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) MCFG_SOUND_ROUTE(0, "rspeaker", 0.25) MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) @@ -1502,7 +1497,7 @@ static MACHINE_CONFIG_START( karatblz, aerofgt_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz ) /* verified on pcb */ - MCFG_YM2610_IRQ_HANDLER(WRITELINE(aerofgt_state, irqhandler)) + MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) MCFG_SOUND_ROUTE(0, "rspeaker", 0.25) MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) @@ -1556,7 +1551,7 @@ static MACHINE_CONFIG_START( spinlbrk, aerofgt_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */ - MCFG_YM2610_IRQ_HANDLER(WRITELINE(aerofgt_state, irqhandler)) + MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) MCFG_SOUND_ROUTE(0, "rspeaker", 0.25) MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) @@ -1609,7 +1604,7 @@ static MACHINE_CONFIG_START( turbofrc, aerofgt_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */ - MCFG_YM2610_IRQ_HANDLER(WRITELINE(aerofgt_state, irqhandler)) + MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) MCFG_SOUND_ROUTE(0, "rspeaker", 0.25) MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) @@ -1663,7 +1658,7 @@ static MACHINE_CONFIG_START( aerofgtb, aerofgt_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymsnd", YM2610, 8000000) - MCFG_YM2610_IRQ_HANDLER(WRITELINE(aerofgt_state, irqhandler)) + MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) MCFG_SOUND_ROUTE(0, "rspeaker", 0.25) MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) @@ -1711,7 +1706,7 @@ static MACHINE_CONFIG_START( aerofgt, aerofgt_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz) /* verified on pcb */ - MCFG_YM2610_IRQ_HANDLER(WRITELINE(aerofgt_state, irqhandler)) + MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) MCFG_SOUND_ROUTE(0, "rspeaker", 0.25) MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) @@ -1824,7 +1819,7 @@ static MACHINE_CONFIG_START( wbbc97, aerofgt_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, 3579545) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(aerofgt_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c index 0cc70ee6b8a..7f6ca6de772 100644 --- a/src/mame/drivers/alpha68k.c +++ b/src/mame/drivers/alpha68k.c @@ -1787,11 +1787,6 @@ WRITE8_MEMBER(alpha68k_state::porta_w) m_sound_pa_latch = data & 1; } -WRITE_LINE_MEMBER(alpha68k_state::ym3812_irq) -{ - m_audiocpu->set_input_line(0, (state) ? HOLD_LINE : CLEAR_LINE); -} - /******************************************************************************/ @@ -2061,7 +2056,7 @@ static MACHINE_CONFIG_START( alpha68k_I, alpha68k_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, 4000000) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(alpha68k_state, ym3812_irq)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -2296,7 +2291,7 @@ static MACHINE_CONFIG_START( tnextspc, alpha68k_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, 4000000) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(alpha68k_state, ym3812_irq)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c index 36477ab754c..427a087aa40 100644 --- a/src/mame/drivers/crospang.c +++ b/src/mame/drivers/crospang.c @@ -314,13 +314,6 @@ static GFXDECODE_START( crospang ) GFXDECODE_ENTRY( "gfx1", 0, tlayout, 0, 64 ) /* Sprites 16x16 */ GFXDECODE_END - -WRITE_LINE_MEMBER(crospang_state::irqhandler) -{ - m_audiocpu->set_input_line(0, state); -} - - void crospang_state::machine_start() { save_item(NAME(m_bestri_tilebank)); @@ -372,7 +365,7 @@ static MACHINE_CONFIG_START( crospang, crospang_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, 14318180/4) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(crospang_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c index 08418cd4868..89abd6e489a 100644 --- a/src/mame/drivers/dec8.c +++ b/src/mame/drivers/dec8.c @@ -1906,14 +1906,6 @@ GFXDECODE_END /******************************************************************************/ -/* handler called by the 3812 emulator when the internal timers cause an IRQ */ -WRITE_LINE_MEMBER(dec8_state::irqhandler) -{ - m_audiocpu->set_input_line(0, state); /* M6502_IRQ_LINE */ -} - -/******************************************************************************/ - INTERRUPT_GEN_MEMBER(dec8_state::gondo_interrupt) { if (m_nmi_enable) @@ -2254,7 +2246,7 @@ static MACHINE_CONFIG_START( ghostb, dec8_state ) MCFG_SOUND_ROUTE(3, "mono", 0.20) MCFG_SOUND_ADD("ym2", YM3812, 3000000) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(dec8_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MACHINE_CONFIG_END @@ -2418,7 +2410,7 @@ static MACHINE_CONFIG_START( srdarwin, dec8_state ) MCFG_SOUND_ROUTE(3, "mono", 0.20) MCFG_SOUND_ADD("ym2", YM3812, 3000000) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(dec8_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MACHINE_CONFIG_END @@ -2475,7 +2467,7 @@ static MACHINE_CONFIG_START( cobracom, dec8_state ) MCFG_SOUND_ROUTE(3, "mono", 0.50) MCFG_SOUND_ADD("ym2", YM3812, 3000000) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(dec8_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MACHINE_CONFIG_END diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c index 100cbfa39c2..8a3b09d11e2 100644 --- a/src/mame/drivers/deniam.c +++ b/src/mame/drivers/deniam.c @@ -221,15 +221,6 @@ static GFXDECODE_START( deniam ) GFXDECODE_END -WRITE_LINE_MEMBER(deniam_state::irqhandler) -{ - /* system 16c doesn't have the sound CPU */ - if (m_audiocpu != NULL) - m_audiocpu->set_input_line(0, state); -} - - - void deniam_state::machine_start() { save_item(NAME(m_display_enable)); @@ -289,7 +280,7 @@ static MACHINE_CONFIG_START( deniam16b, deniam_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_25MHz/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified */ - MCFG_YM3812_IRQ_HANDLER(WRITELINE(deniam_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MCFG_OKIM6295_ADD("oki", XTAL_25MHz/24, OKIM6295_PIN7_HIGH) /* 1.041620 measured, = 1.0416666Mhz verified */ @@ -322,7 +313,6 @@ static MACHINE_CONFIG_START( deniam16c, deniam_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_25MHz/6) /* "SM64" ym3812 clone; 4.166470 measured, = 4.166666Mhz verified) */ - MCFG_YM3812_IRQ_HANDLER(WRITELINE(deniam_state, irqhandler)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MCFG_OKIM6295_ADD("oki", XTAL_25MHz/24, OKIM6295_PIN7_HIGH) /* 1.041620 measured, = 1.0416666Mhz verified */ diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c index 5ac172d99e8..71172433c7b 100644 --- a/src/mame/drivers/fuukifg2.c +++ b/src/mame/drivers/fuukifg2.c @@ -381,11 +381,6 @@ GFXDECODE_END ***************************************************************************/ -WRITE_LINE_MEMBER(fuuki16_state::soundirq) -{ - m_audiocpu->set_input_line(0, state); -} - /* - Interrupts (pbancho) - @@ -475,7 +470,7 @@ static MACHINE_CONFIG_START( fuuki16, fuuki16_state ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.15) MCFG_SOUND_ADD("ym2", YM3812, XTAL_28_64MHz / 8) /* 3.58 MHz */ - MCFG_YM3812_IRQ_HANDLER(WRITELINE(fuuki16_state, soundirq)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.30) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.30) diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c index 9caf4fada14..1b895193d89 100644 --- a/src/mame/drivers/fuukifg3.c +++ b/src/mame/drivers/fuukifg3.c @@ -540,11 +540,6 @@ void fuuki32_state::machine_reset() } -WRITE_LINE_MEMBER(fuuki32_state::irqhandler) -{ - m_soundcpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); -} - static MACHINE_CONFIG_START(fuuki32, fuuki32_state) /* basic machine hardware */ @@ -575,7 +570,7 @@ static MACHINE_CONFIG_START(fuuki32, fuuki32_state) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymf1", YMF278B, YMF278B_STD_CLOCK) // 33.8688MHz - MCFG_YMF278B_IRQ_HANDLER(WRITELINE(fuuki32_state, irqhandler)) + MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c index e3ada61bbc8..27790a1cc46 100644 --- a/src/mame/drivers/galspnbl.c +++ b/src/mame/drivers/galspnbl.c @@ -204,13 +204,6 @@ static GFXDECODE_START( galspnbl ) GFXDECODE_END - -WRITE_LINE_MEMBER(galspnbl_state::irqhandler) -{ - m_audiocpu->set_input_line(0, state); -} - - void galspnbl_state::machine_start() { } @@ -252,7 +245,7 @@ static MACHINE_CONFIG_START( galspnbl, galspnbl_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* Use value from Super Pinball Action - NEEDS VERIFICATION!! */ - MCFG_YM3812_IRQ_HANDLER(WRITELINE(galspnbl_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, OKIM6295_PIN7_HIGH) /* Use value from Super Pinball Action - clock frequency & pin 7 not verified */ diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c index 010a295a0e3..257193cd7c4 100644 --- a/src/mame/drivers/hcastle.c +++ b/src/mame/drivers/hcastle.c @@ -152,11 +152,6 @@ GFXDECODE_END /*****************************************************************************/ -WRITE_LINE_MEMBER(hcastle_state::irqhandler) -{ -// m_audiocpu->set_input_line(state); -} - WRITE8_MEMBER(hcastle_state::volume_callback) { m_k007232->set_volume(0, (data >> 4) * 0x11, 0); @@ -229,7 +224,7 @@ static MACHINE_CONFIG_START( hcastle, hcastle_state ) MCFG_SOUND_ROUTE(1, "mono", 0.50) MCFG_SOUND_ADD("ymsnd", YM3812, 3579545) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(hcastle_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI)) /* from schematic; NMI handler is just a retn */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MCFG_K051649_ADD("k051649", 3579545/2) diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c index 65fe9f652db..514a31fbd1d 100644 --- a/src/mame/drivers/itech8.c +++ b/src/mame/drivers/itech8.c @@ -583,12 +583,6 @@ WRITE8_MEMBER(itech8_state::itech8_nmi_ack_w) } -WRITE_LINE_MEMBER(itech8_state::generate_sound_irq) -{ - m_soundcpu->set_input_line(M6809_FIRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); -} - - /************************************* * @@ -1655,7 +1649,7 @@ static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym2203 ) /* sound hardware */ MCFG_SOUND_ADD("ymsnd", YM2203, CLOCK_8MHz/2) - MCFG_YM2203_IRQ_HANDLER(WRITELINE(itech8_state, generate_sound_irq)) + MCFG_YM2203_IRQ_HANDLER(INPUTLINE("soundcpu", M6809_FIRQ_LINE)) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(itech8_state, ym2203_portb_out)) MCFG_SOUND_ROUTE(0, "mono", 0.07) MCFG_SOUND_ROUTE(1, "mono", 0.07) @@ -1675,7 +1669,7 @@ static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym2608b ) /* sound hardware */ MCFG_SOUND_ADD("ymsnd", YM2608, CLOCK_8MHz) - MCFG_YM2608_IRQ_HANDLER(WRITELINE(itech8_state, generate_sound_irq)) + MCFG_YM2608_IRQ_HANDLER(INPUTLINE("soundcpu", M6809_FIRQ_LINE)) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(itech8_state, ym2203_portb_out)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MACHINE_CONFIG_END @@ -1694,7 +1688,7 @@ static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym3812 ) /* sound hardware */ MCFG_SOUND_ADD("ymsnd", YM3812, CLOCK_8MHz/2) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(itech8_state, generate_sound_irq)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", M6809_FIRQ_LINE)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MCFG_OKIM6295_ADD("oki", CLOCK_8MHz/8, OKIM6295_PIN7_HIGH) // was /128, not /132, so unsure so pin 7 not verified @@ -1710,7 +1704,7 @@ static MACHINE_CONFIG_FRAGMENT( itech8_sound_ym3812_external ) /* sound hardware */ MCFG_SOUND_ADD("ymsnd", YM3812, CLOCK_8MHz/2) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(itech8_state, generate_sound_irq)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", M6809_FIRQ_LINE)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.75) MCFG_OKIM6295_ADD("oki", CLOCK_8MHz/8, OKIM6295_PIN7_HIGH) // was /128, not /132, so unsure so pin 7 not verified diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c index 6187d15102b..d091a181e67 100644 --- a/src/mame/drivers/lordgun.c +++ b/src/mame/drivers/lordgun.c @@ -622,11 +622,6 @@ INPUT_PORTS_END ***************************************************************************/ -WRITE_LINE_MEMBER(lordgun_state::soundirq) -{ - m_soundcpu->set_input_line(INPUT_LINE_IRQ0, state ? ASSERT_LINE : CLEAR_LINE); -} - static MACHINE_CONFIG_START( lordgun, lordgun_state ) MCFG_CPU_ADD("maincpu", M68000, XTAL_20MHz / 2) MCFG_CPU_PROGRAM_MAP(lordgun_map) @@ -668,7 +663,7 @@ static MACHINE_CONFIG_START( lordgun, lordgun_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_3_579545MHz) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(lordgun_state, soundirq)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 20, OKIM6295_PIN7_HIGH) // ? 5MHz can't be right! @@ -718,7 +713,7 @@ static MACHINE_CONFIG_START( aliencha, lordgun_state ) MCFG_SOUND_ADD("ymf", YMF278B, 26000000) // ? 26MHz matches video (decrease for faster music tempo) MCFG_DEVICE_ADDRESS_MAP(AS_0, ymf278_map) - MCFG_YMF278B_IRQ_HANDLER(WRITELINE(lordgun_state, soundirq)) + MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MCFG_OKIM6295_ADD("oki", XTAL_20MHz / 20, OKIM6295_PIN7_HIGH) // ? 5MHz can't be right diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c index 23f6698cc89..bdb284c7df2 100644 --- a/src/mame/drivers/metro.c +++ b/src/mame/drivers/metro.c @@ -255,12 +255,6 @@ INTERRUPT_GEN_MEMBER(metro_state::puzzlet_interrupt) update_irq_state(); } -WRITE_LINE_MEMBER(metro_state::ymf278b_interrupt) -{ - m_maincpu->set_input_line(2, state ? ASSERT_LINE : CLEAR_LINE); -} - - /*************************************************************************** @@ -1608,11 +1602,6 @@ WRITE8_MEMBER(metro_state::blzntrnd_sh_bankswitch_w) membank("bank1")->set_base(&RAM[bankaddress]); } -WRITE_LINE_MEMBER(metro_state::blzntrnd_irqhandler) -{ - m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); -} - static ADDRESS_MAP_START( blzntrnd_sound_map, AS_PROGRAM, 8, metro_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_ROMBANK("bank1") @@ -3660,7 +3649,7 @@ static MACHINE_CONFIG_START( msgogo, metro_state ) MCFG_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK) MCFG_DEVICE_ADDRESS_MAP(AS_0, ymf278_map) - MCFG_YMF278B_IRQ_HANDLER(WRITELINE(metro_state, ymf278b_interrupt)) + MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("maincpu", 2)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -4384,7 +4373,7 @@ static MACHINE_CONFIG_START( blzntrnd, metro_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_16MHz/2) - MCFG_YM2610_IRQ_HANDLER(WRITELINE(metro_state, blzntrnd_irqhandler)) + MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.25) MCFG_SOUND_ROUTE(0, "rspeaker", 0.25) MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c index ba115d139a4..a01bc9c6779 100644 --- a/src/mame/drivers/nemesis.c +++ b/src/mame/drivers/nemesis.c @@ -1425,12 +1425,6 @@ GFXDECODE_END /******************************************************************************/ -WRITE_LINE_MEMBER(nemesis_state::sound_irq) -{ -/* Interrupts _are_ generated, I wonder where they go.. */ -// m_audiocpu->set_input_line(0, HOLD_LINE); -} - WRITE8_MEMBER(nemesis_state::volume_callback) { m_k007232->set_volume(0, (data >> 4) * 0x11, 0); @@ -1821,7 +1815,7 @@ static MACHINE_CONFIG_START( citybomb, nemesis_state ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.30) MCFG_SOUND_ADD("ymsnd", YM3812, 3579545) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(nemesis_state, sound_irq)) +// MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) ... Interrupts _are_ generated, I wonder where they go MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) @@ -1868,7 +1862,7 @@ static MACHINE_CONFIG_START( nyanpani, nemesis_state ) MCFG_SOUND_ROUTE(1, "rspeaker", 0.30) MCFG_SOUND_ADD("ymsnd", YM3812, 3579545) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(nemesis_state, sound_irq)) +// MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) ... Interrupts _are_ generated, I wonder where they go MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index baff993b761..14f513d6995 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -287,7 +287,6 @@ public: virtual void video_start(); UINT32 screen_update_nmg5(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_bitmap( bitmap_ind16 &bitmap ); - DECLARE_WRITE_LINE_MEMBER(soundirq); }; @@ -952,11 +951,6 @@ static GFXDECODE_START( pclubys ) GFXDECODE_END -WRITE_LINE_MEMBER(nmg5_state::soundirq) -{ - m_soundcpu->set_input_line(0, state); -} - void nmg5_state::machine_start() { save_item(NAME(m_gfx_bank)); @@ -1011,7 +1005,7 @@ static MACHINE_CONFIG_START( nmg5, nmg5_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, 4000000) /* 4MHz */ - MCFG_YM3812_IRQ_HANDLER(WRITELINE(nmg5_state, soundirq)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", 1000000 , OKIM6295_PIN7_HIGH) diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c index 9b7ef5e7acc..dd38a203f97 100644 --- a/src/mame/drivers/oneshot.c +++ b/src/mame/drivers/oneshot.c @@ -327,11 +327,6 @@ static GFXDECODE_START( oneshot ) GFXDECODE_ENTRY( "gfx1", 0, oneshot8x8_layout, 0x00, 4 ) /* sprites */ GFXDECODE_END -WRITE_LINE_MEMBER(oneshot_state::irqhandler) -{ - m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); -} - void oneshot_state::machine_start() { save_item(NAME(m_gun_x_p1)); @@ -381,7 +376,7 @@ static MACHINE_CONFIG_START( oneshot, oneshot_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, 3500000) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(oneshot_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", 1056000, OKIM6295_PIN7_HIGH) // clock frequency & pin 7 not verified diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index e33080bddcf..5fbf6ebb667 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -84,7 +84,6 @@ public: virtual void video_start(); UINT32 screen_update_onetwo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void set_color(int offset); - DECLARE_WRITE_LINE_MEMBER(irqhandler); }; @@ -331,16 +330,6 @@ static GFXDECODE_START( onetwo ) GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x6_layout, 0, 2 ) GFXDECODE_END -/************************************* - * - * Sound interface - * - *************************************/ - -WRITE_LINE_MEMBER(onetwo_state::irqhandler) -{ - m_audiocpu->set_input_line(0, state); -} /************************************* * @@ -386,7 +375,7 @@ static MACHINE_CONFIG_START( onetwo, onetwo_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, MASTER_CLOCK) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(onetwo_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", 1056000*2, OKIM6295_PIN7_LOW) // clock frequency & pin 7 not verified diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c index f485ac61bf5..2704e0eee29 100644 --- a/src/mame/drivers/prehisle.c +++ b/src/mame/drivers/prehisle.c @@ -190,13 +190,6 @@ GFXDECODE_END /******************************************************************************/ -WRITE_LINE_MEMBER(prehisle_state::irqhandler) -{ - m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); -} - -/******************************************************************************/ - static MACHINE_CONFIG_START( prehisle, prehisle_state ) /* basic machine hardware */ @@ -226,7 +219,7 @@ static MACHINE_CONFIG_START( prehisle, prehisle_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* verified on pcb */ - MCFG_YM3812_IRQ_HANDLER(WRITELINE(prehisle_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK) diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index 8418253c20a..e94c6b2c122 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -378,11 +378,6 @@ ADDRESS_MAP_END ***************************************************************************/ -WRITE_LINE_MEMBER(psikyo_state::sound_irq) -{ - m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); -} - READ8_MEMBER(psikyo_state::psikyo_soundlatch_r) { return m_soundlatch; @@ -1061,7 +1056,7 @@ static MACHINE_CONFIG_START( sngkace, psikyo_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymsnd", YM2610, XTAL_32MHz/4) /* verified on pcb */ - MCFG_YM2610_IRQ_HANDLER(WRITELINE(psikyo_state, sound_irq)) + MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.2) MCFG_SOUND_ROUTE(0, "rspeaker", 1.2) MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) @@ -1107,7 +1102,7 @@ static MACHINE_CONFIG_START( gunbird, psikyo_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymsnd", YM2610, 8000000) - MCFG_YM2610_IRQ_HANDLER(WRITELINE(psikyo_state, sound_irq)) + MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.2) MCFG_SOUND_ROUTE(0, "rspeaker", 1.2) MCFG_SOUND_ROUTE(1, "lspeaker", 1.0) @@ -1153,11 +1148,6 @@ MACHINE_CONFIG_END ***************************************************************************/ -WRITE_LINE_MEMBER(psikyo_state::irqhandler) -{ - m_audiocpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); -} - static MACHINE_CONFIG_START( s1945, psikyo_state ) /* basic machine hardware */ @@ -1192,7 +1182,7 @@ static MACHINE_CONFIG_START( s1945, psikyo_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK) - MCFG_YMF278B_IRQ_HANDLER(WRITELINE(psikyo_state, irqhandler)) + MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -1231,9 +1221,8 @@ ROM_START( samuraia ) ROM_LOAD32_WORD_SWAP( "4-u127.bin", 0x000000, 0x040000, CRC(8c9911ca) SHA1(821ba648b9a1d495c600cbf4606f2dbddc6f9e6f) ) // 1&0 ROM_LOAD32_WORD_SWAP( "5-u126.bin", 0x000002, 0x040000, CRC(d20c3ef0) SHA1(264e5a7e45e130a9e7152468733337668dc5b65f) ) // 3&2 - ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU Code */ + ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU Code */ ROM_LOAD( "3-u58.bin", 0x00000, 0x20000, CRC(310f5c76) SHA1(dbfd1c5a7a514bccd89fc4f7191744cf76bb745d) ) - ROM_RELOAD( 0x10000, 0x20000 ) ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ ROM_LOAD( "u14.bin", 0x000000, 0x200000, CRC(00a546cb) SHA1(30a8679b49928d5fcbe58b5eecc2ebd08173adf8) ) @@ -1256,9 +1245,8 @@ ROM_START( sngkace ) ROM_LOAD32_WORD_SWAP( "1-u127.bin", 0x000000, 0x040000, CRC(6c45b2f8) SHA1(08473297e174f3a6d67043f3b16f4e6b9c68b826) ) // 1&0 ROM_LOAD32_WORD_SWAP( "2-u126.bin", 0x000002, 0x040000, CRC(845a6760) SHA1(3b8fed294e28d9d8ef5cb5ec88b9ade396146a48) ) // 3&2 - ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU Code */ + ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU Code */ ROM_LOAD( "3-u58.bin", 0x00000, 0x20000, CRC(310f5c76) SHA1(dbfd1c5a7a514bccd89fc4f7191744cf76bb745d) ) - ROM_RELOAD( 0x10000, 0x20000 ) ROM_REGION( 0x200000, "gfx1", 0 ) /* Sprites */ ROM_LOAD( "u14.bin", 0x000000, 0x200000, CRC(00a546cb) SHA1(30a8679b49928d5fcbe58b5eecc2ebd08173adf8) ) @@ -1300,9 +1288,8 @@ ROM_START( gunbird ) ROM_LOAD32_WORD_SWAP( "4.u46", 0x000000, 0x040000, CRC(b78ec99d) SHA1(399b79931652d9df1632cd4d7ec3d214e473a5c3) ) // 1&0 ROM_LOAD32_WORD_SWAP( "5.u39", 0x000002, 0x040000, CRC(925f095d) SHA1(301a536119a0320a756e9c6e51fb10e36b90ef16) ) // 3&2 - ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU Code */ + ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU Code */ ROM_LOAD( "3.u71", 0x00000, 0x20000, CRC(2168e4ba) SHA1(ca7ad6acb5f806ce2528e7b52c19e8cceecb8543) ) - ROM_RELOAD( 0x10000, 0x20000 ) ROM_REGION( 0x700000, "gfx1", 0 ) /* Sprites */ ROM_LOAD( "u14.bin", 0x000000, 0x200000, CRC(7d7e8a00) SHA1(9f35f5b54ae928e9bf2aa6ad4604f669857955ec) ) @@ -1333,9 +1320,8 @@ ROM_START( gunbirdk ) ROM_LOAD32_WORD_SWAP( "1k.u46", 0x000000, 0x080000, CRC(745cee52) SHA1(6c5bb92c92c55f882484417bc1aa580684019610) ) // 1&0 ROM_LOAD32_WORD_SWAP( "2k.u39", 0x000002, 0x080000, CRC(669632fb) SHA1(885dea42e6da35e9166a208b18dbd930642c26cd) ) // 3&2 - ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU Code */ + ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU Code */ ROM_LOAD( "k3.u71", 0x00000, 0x20000, CRC(11994055) SHA1(619776c178361f23de37ff14e87284ec0f1f4f10) ) - ROM_RELOAD( 0x10000, 0x20000 ) ROM_REGION( 0x700000, "gfx1", 0 ) /* Sprites */ ROM_LOAD( "u14.bin", 0x000000, 0x200000, CRC(7d7e8a00) SHA1(9f35f5b54ae928e9bf2aa6ad4604f669857955ec) ) @@ -1363,9 +1349,8 @@ ROM_START( gunbirdj ) ROM_LOAD32_WORD_SWAP( "1.u46", 0x000000, 0x040000, CRC(474abd69) SHA1(27f37333075f9c92849101aad4875e69004d747b) ) // 1&0 ROM_LOAD32_WORD_SWAP( "2.u39", 0x000002, 0x040000, CRC(3e3e661f) SHA1(b5648546f390539b0f727a9a62d1b9516254ae21) ) // 3&2 - ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU Code */ + ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU Code */ ROM_LOAD( "3.u71", 0x00000, 0x20000, CRC(2168e4ba) SHA1(ca7ad6acb5f806ce2528e7b52c19e8cceecb8543) ) - ROM_RELOAD( 0x10000, 0x20000 ) ROM_REGION( 0x700000, "gfx1", 0 ) /* Sprites */ ROM_LOAD( "u14.bin", 0x000000, 0x200000, CRC(7d7e8a00) SHA1(9f35f5b54ae928e9bf2aa6ad4604f669857955ec) ) @@ -1394,9 +1379,8 @@ ROM_START( btlkroad ) ROM_LOAD32_WORD_SWAP( "4-u46.bin", 0x000000, 0x040000, CRC(8a7a28b4) SHA1(f7197be673dfd0ddf46998af81792b81d8fe9fbf) ) // 1&0 ROM_LOAD32_WORD_SWAP( "5-u39.bin", 0x000002, 0x040000, CRC(933561fa) SHA1(f6f3b1e14b1cfeca26ef8260ac4771dc1531c357) ) // 3&2 - ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU Code */ + ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU Code */ ROM_LOAD( "3-u71.bin", 0x00000, 0x20000, CRC(22411fab) SHA1(1094cb51712e40ae65d0082b408572bdec06ae8b) ) - ROM_RELOAD( 0x10000, 0x20000 ) ROM_REGION( 0x700000, "gfx1", 0 ) /* Sprites */ ROM_LOAD( "u14.bin", 0x000000, 0x200000, CRC(282d89c3) SHA1(3b4b17f4a37efa2f7e232488aaba7c77d10c84d2) ) @@ -1443,9 +1427,8 @@ ROM_START( s1945jn ) ROM_LOAD32_WORD_SWAP( "1-u46.bin", 0x000000, 0x080000, CRC(45fa8086) SHA1(f1753b9420596f4b828c77e877a044ba5fb01b28) ) // 1&0 ROM_LOAD32_WORD_SWAP( "2-u39.bin", 0x000002, 0x080000, CRC(0152ab8c) SHA1(2aef4cb88341b35f20bb551716f1e5ac2731e9ba) ) // 3&2 - ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU Code */ + ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU Code */ ROM_LOAD( "3-u71.bin", 0x00000, 0x20000, CRC(e3e366bd) SHA1(1f5b5909745802e263a896265ea365df76d3eaa5) ) - ROM_RELOAD( 0x10000, 0x20000 ) ROM_REGION( 0x800000, "gfx1", 0 ) /* Sprites */ ROM_LOAD( "u20.bin", 0x000000, 0x200000, CRC(28a27fee) SHA1(913f3bc4d0c6fb6b776a020c8099bf96f16fd06f) ) @@ -1574,9 +1557,8 @@ ROM_START( s1945 ) ROM_LOAD32_WORD_SWAP( "2s.u40", 0x000000, 0x040000, CRC(9b10062a) SHA1(cf963bba157422b659d8d64b4493eb7d69cd07b7) ) // 1&0 ROM_LOAD32_WORD_SWAP( "3s.u41", 0x000002, 0x040000, CRC(f87e871a) SHA1(567167c7fcfb622f78e211d74b04060c3d29d6b7) ) // 3&2 - ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU Code */ + ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU Code */ ROM_LOAD( "3-u63.bin", 0x00000, 0x20000, CRC(42d40ae1) SHA1(530a5a3f78ac489b84a631ea6ce21010a4f4d31b) ) - ROM_RELOAD( 0x10000, 0x20000 ) ROM_REGION( 0x000100, "cpu2", 0 ) /* MCU? */ ROM_LOAD( "4-u59.bin", 0x00000, 0x00100, NO_DUMP ) @@ -1604,9 +1586,8 @@ ROM_START( s1945a ) ROM_LOAD32_WORD_SWAP( "4-u40.bin", 0x000000, 0x040000, CRC(29ffc217) SHA1(12dc3cb32253c3908f4c440c627a0e1b32ee7cac) ) // 1&0 ROM_LOAD32_WORD_SWAP( "5-u41.bin", 0x000002, 0x040000, CRC(c3d3fb64) SHA1(4388586bc0a6f3d62366b3c38b8b23f8a03dbf15) ) // 3&2 - ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU Code */ + ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU Code */ ROM_LOAD( "3-u63.bin", 0x00000, 0x20000, CRC(42d40ae1) SHA1(530a5a3f78ac489b84a631ea6ce21010a4f4d31b) ) - ROM_RELOAD( 0x10000, 0x20000 ) ROM_REGION( 0x000100, "cpu2", 0 ) /* MCU? */ ROM_LOAD( "4-u59.bin", 0x00000, 0x00100, NO_DUMP ) @@ -1634,9 +1615,8 @@ ROM_START( s1945j ) ROM_LOAD32_WORD_SWAP( "1-u40.bin", 0x000000, 0x040000, CRC(c00eb012) SHA1(080dae010ca83548ebdb3324585d15e48baf0541) ) // 1&0 ROM_LOAD32_WORD_SWAP( "2-u41.bin", 0x000002, 0x040000, CRC(3f5a134b) SHA1(18bb3bb1e1adadcf522795f5cf7d4dc5a5dd1f30) ) // 3&2 - ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU Code */ + ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU Code */ ROM_LOAD( "3-u63.bin", 0x00000, 0x20000, CRC(42d40ae1) SHA1(530a5a3f78ac489b84a631ea6ce21010a4f4d31b) ) - ROM_RELOAD( 0x10000, 0x20000 ) ROM_REGION( 0x000100, "cpu2", 0 ) /* MCU */ ROM_LOAD( "4-u59.bin", 0x00000, 0x00100, NO_DUMP ) @@ -1664,9 +1644,8 @@ ROM_START( s1945k ) /* Same MCU as the current parent set, region dip has no eff ROM_LOAD32_WORD_SWAP( "10.u40", 0x000000, 0x040000, CRC(5a32af36) SHA1(2eada37fd043c097a11bcf4e3e0bebb473bbc0df) ) // 1&0 ROM_LOAD32_WORD_SWAP( "9.u41", 0x000002, 0x040000, CRC(29cc6d7d) SHA1(aeee9e88922c25c75885483d115e064c6b71540b) ) // 3&2 - ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU Code */ + ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU Code */ ROM_LOAD( "3-u63.bin", 0x00000, 0x20000, CRC(42d40ae1) SHA1(530a5a3f78ac489b84a631ea6ce21010a4f4d31b) ) - ROM_RELOAD( 0x10000, 0x20000 ) ROM_REGION( 0x000100, "cpu2", 0 ) /* MCU */ ROM_LOAD( "4-u59.bin", 0x00000, 0x00100, NO_DUMP ) @@ -1716,9 +1695,8 @@ ROM_START( tengai ) ROM_LOAD32_WORD_SWAP( "5-u40.bin", 0x000000, 0x080000, CRC(90088195) SHA1(8ec48d581ecd14b3dad36edc65d5a273324cf3c1) ) // 1&0 ROM_LOAD32_WORD_SWAP( "4-u41.bin", 0x000002, 0x080000, CRC(0d53196c) SHA1(454bb4695b13ce44ca5dac7c6d4142a8b9afa798) ) // 3&2 - ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU Code */ + ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU Code */ ROM_LOAD( "1-u63.bin", 0x00000, 0x20000, CRC(2025e387) SHA1(334b0eb3b416d46ccaadff3eee6f1abba63285fb) ) - ROM_RELOAD( 0x10000, 0x20000 ) ROM_REGION( 0x000100, "cpu2", 0 ) /* MCU */ ROM_LOAD( "4-u59.bin", 0x00000, 0x00100, NO_DUMP ) @@ -1746,9 +1724,8 @@ ROM_START( tengaij ) ROM_LOAD32_WORD_SWAP( "2-u40.bin", 0x000000, 0x080000, CRC(ab6fe58a) SHA1(6687a3af192b3eab60d75ca286ebb8e0636297b5) ) // 1&0 ROM_LOAD32_WORD_SWAP( "3-u41.bin", 0x000002, 0x080000, CRC(02e42e39) SHA1(6cdb7b1cebab50c0a44cd60cd437f0e878ccac5c) ) // 3&2 - ROM_REGION( 0x030000, "audiocpu", 0 ) /* Sound CPU Code */ + ROM_REGION( 0x020000, "audiocpu", 0 ) /* Sound CPU Code */ ROM_LOAD( "1-u63.bin", 0x00000, 0x20000, CRC(2025e387) SHA1(334b0eb3b416d46ccaadff3eee6f1abba63285fb) ) - ROM_RELOAD( 0x10000, 0x20000 ) ROM_REGION( 0x000100, "cpu2", 0 ) /* MCU */ ROM_LOAD( "4-u59.bin", 0x00000, 0x00100, NO_DUMP ) @@ -1802,7 +1779,7 @@ DRIVER_INIT_MEMBER(psikyo_state,sngkace) m_ka302c_banking = 0; // SH201B doesn't have any gfx banking /* setup audiocpu banks */ - membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x10000, 0x8000); + membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base(), 0x8000); /* Enable other regions */ #if 0 @@ -1859,7 +1836,7 @@ DRIVER_INIT_MEMBER(psikyo_state,tengai) /* setup audiocpu banks */ /* The banked rom is seen at 8200-ffff, so the last 0x200 bytes of the rom not reachable. */ - membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x10000 + 0x200, 0x8000); + membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x200, 0x8000); } DRIVER_INIT_MEMBER(psikyo_state,gunbird) @@ -1874,7 +1851,7 @@ DRIVER_INIT_MEMBER(psikyo_state,gunbird) /* setup audiocpu banks */ /* The banked rom is seen at 8200-ffff, so the last 0x200 bytes of the rom not reachable. */ - membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x10000 + 0x200, 0x8000); + membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x200, 0x8000); } @@ -1896,7 +1873,7 @@ DRIVER_INIT_MEMBER(psikyo_state,s1945) /* setup audiocpu banks */ /* The banked rom is seen at 8200-ffff, so the last 0x200 bytes of the rom not reachable. */ - membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x10000 + 0x200, 0x8000); + membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x200, 0x8000); } DRIVER_INIT_MEMBER(psikyo_state,s1945a) @@ -1917,7 +1894,7 @@ DRIVER_INIT_MEMBER(psikyo_state,s1945a) /* setup audiocpu banks */ /* The banked rom is seen at 8200-ffff, so the last 0x200 bytes of the rom not reachable. */ - membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x10000 + 0x200, 0x8000); + membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x200, 0x8000); } DRIVER_INIT_MEMBER(psikyo_state,s1945j) @@ -1938,7 +1915,7 @@ DRIVER_INIT_MEMBER(psikyo_state,s1945j) /* setup audiocpu banks */ /* The banked rom is seen at 8200-ffff, so the last 0x200 bytes of the rom not reachable. */ - membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x10000 + 0x200, 0x8000); + membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x200, 0x8000); } DRIVER_INIT_MEMBER(psikyo_state,s1945jn) @@ -1953,7 +1930,7 @@ DRIVER_INIT_MEMBER(psikyo_state,s1945jn) /* setup audiocpu banks */ /* The banked rom is seen at 8200-ffff, so the last 0x200 bytes of the rom not reachable. */ - membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x10000 + 0x200, 0x8000); + membank("bank1")->configure_entries(0, 4, memregion("audiocpu")->base() + 0x200, 0x8000); } DRIVER_INIT_MEMBER(psikyo_state,s1945bl) diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c index 4df171d3115..b28f936a05b 100644 --- a/src/mame/drivers/psikyo4.c +++ b/src/mame/drivers/psikyo4.c @@ -616,12 +616,6 @@ static INPUT_PORTS_START( hotdebut ) INPUT_PORTS_END -WRITE_LINE_MEMBER(psikyo4_state::irqhandler) -{ - m_maincpu->set_input_line(12, state ? ASSERT_LINE : CLEAR_LINE); -} - - void psikyo4_state::machine_start() { // configure YMF ROM banks @@ -693,7 +687,7 @@ static MACHINE_CONFIG_START( ps4big, psikyo4_state ) MCFG_SOUND_ADD("ymf", YMF278B, MASTER_CLOCK/2) MCFG_DEVICE_ADDRESS_MAP(AS_0, ps4_ymf_map) - MCFG_YMF278B_IRQ_HANDLER(WRITELINE(psikyo4_state, irqhandler)) + MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("maincpu", 12)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c index d8dc9cf71d7..456f986cc10 100644 --- a/src/mame/drivers/psikyosh.c +++ b/src/mame/drivers/psikyosh.c @@ -756,12 +756,6 @@ static INPUT_PORTS_START( mjgtaste ) INPUT_PORTS_END -WRITE_LINE_MEMBER(psikyosh_state::irqhandler) -{ - m_maincpu->set_input_line(12, state ? ASSERT_LINE : CLEAR_LINE); -} - - void psikyosh_state::machine_start() { membank("gfxbank")->configure_entries(0, 0x1000, memregion("gfx1")->base(), 0x20000); @@ -799,7 +793,7 @@ static MACHINE_CONFIG_START( psikyo3v1, psikyosh_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymf", YMF278B, MASTER_CLOCK/2) - MCFG_YMF278B_IRQ_HANDLER(WRITELINE(psikyosh_state, irqhandler)) + MCFG_YMF278B_IRQ_HANDLER(INPUTLINE("maincpu", 12)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c index 9e4585a87ee..2e96e03c0e8 100644 --- a/src/mame/drivers/snk68.c +++ b/src/mame/drivers/snk68.c @@ -569,13 +569,6 @@ GFXDECODE_END /******************************************************************************/ -WRITE_LINE_MEMBER(snk68_state::irqhandler) -{ - m_soundcpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); -} - -/******************************************************************************/ - static MACHINE_CONFIG_START( pow, snk68_state ) /* basic machine hardware */ @@ -604,7 +597,7 @@ static MACHINE_CONFIG_START( pow, snk68_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_8MHz/2) /* verified on pcb */ - MCFG_YM3812_IRQ_HANDLER(WRITELINE(snk68_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_ADD("upd", UPD7759, UPD7759_STANDARD_CLOCK) diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c index 6ac624b5878..8e33fa04ddc 100644 --- a/src/mame/drivers/snowbros.c +++ b/src/mame/drivers/snowbros.c @@ -1542,12 +1542,6 @@ static GFXDECODE_START( hyperpac ) GFXDECODE_ENTRY( "gfx1", 0, hyperpac_tilelayout, 0, 16 ) GFXDECODE_END -/* handler called by the 3812/2151 emulator when the internal timers cause an IRQ */ -WRITE_LINE_MEMBER(snowbros_state::irqhandler) -{ - m_soundcpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE); -} - MACHINE_RESET_MEMBER(snowbros_state,semiprot) { UINT16 *PROTDATA = (UINT16*)memregion("user1")->base(); @@ -1599,7 +1593,7 @@ static MACHINE_CONFIG_START( snowbros, snowbros_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, 3000000) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(snowbros_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -1711,7 +1705,7 @@ static MACHINE_CONFIG_START( honeydol, snowbros_state ) /* sound hardware */ MCFG_SOUND_ADD("ymsnd", YM3812, 3000000) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(snowbros_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c index 9b79c66327f..ed1632e500f 100644 --- a/src/mame/drivers/spbactn.c +++ b/src/mame/drivers/spbactn.c @@ -402,11 +402,6 @@ static GFXDECODE_START( spbactnp ) GFXDECODE_END -WRITE_LINE_MEMBER(spbactn_state::irqhandler) -{ - m_audiocpu->set_input_line(0, state); -} - static MACHINE_CONFIG_START( spbactn, spbactn_state ) /* basic machine hardware */ @@ -443,7 +438,7 @@ static MACHINE_CONFIG_START( spbactn, spbactn_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* Was 3.579545MHz, a common clock, but no way to generate via on PCB OSCs */ - MCFG_YM3812_IRQ_HANDLER(WRITELINE(spbactn_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, OKIM6295_PIN7_HIGH) /* Was 1.056MHz, a common clock, but no way to generate via on PCB OSCs. clock frequency & pin 7 not verified */ @@ -494,7 +489,7 @@ static MACHINE_CONFIG_START( spbactnp, spbactn_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(spbactn_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_OKIM6295_ADD("oki", XTAL_4MHz/4, OKIM6295_PIN7_HIGH) diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c index 5e8c30a5ef9..77f93ae3bdd 100644 --- a/src/mame/drivers/spdodgeb.c +++ b/src/mame/drivers/spdodgeb.c @@ -378,11 +378,6 @@ static GFXDECODE_START( spdodgeb ) GFXDECODE_END -WRITE_LINE_MEMBER(spdodgeb_state::irqhandler) -{ - m_audiocpu->set_input_line(M6809_FIRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE); -} - void spdodgeb_state::machine_reset() { m_toggle = 0; @@ -421,7 +416,7 @@ static MACHINE_CONFIG_START( spdodgeb, spdodgeb_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_12MHz/4) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(spdodgeb_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6809_FIRQ_LINE)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c index 0fb93befc49..6e4f832661b 100644 --- a/src/mame/drivers/spy.c +++ b/src/mame/drivers/spy.c @@ -458,11 +458,6 @@ WRITE8_MEMBER(spy_state::volume_callback1) m_k007232_2->set_volume(1, 0, (data & 0x0f) * 0x11); } -WRITE_LINE_MEMBER(spy_state::irqhandler) -{ - m_audiocpu->set_input_line(INPUT_LINE_NMI, state); -} - void spy_state::machine_start() { @@ -528,7 +523,7 @@ static MACHINE_CONFIG_START( spy, spy_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, 3579545) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(spy_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_ADD("k007232_1", K007232, 3579545) diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c index 14e1f59fb40..1aebb845058 100644 --- a/src/mame/drivers/suna8.c +++ b/src/mame/drivers/suna8.c @@ -1779,11 +1779,6 @@ GFXDECODE_END ***************************************************************************/ -WRITE_LINE_MEMBER(suna8_state::soundirq) -{ - m_audiocpu->set_input_line(0, state); -} - /* In games with only 2 CPUs, port A&B of the AY8910 are used for sample playing. */ @@ -1950,7 +1945,7 @@ static MACHINE_CONFIG_START( brickzn, suna8_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymsnd", YM3812, SUNA8_MASTER_CLOCK / 6) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(suna8_state, soundirq)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c index 2e9357e23a2..2d461b34ee4 100644 --- a/src/mame/drivers/tbowl.c +++ b/src/mame/drivers/tbowl.c @@ -423,15 +423,6 @@ static GFXDECODE_START( tbowl ) GFXDECODE_END -/*** Sound Bits - -*/ - -WRITE_LINE_MEMBER(tbowl_state::irqhandler) -{ - m_audiocpu->set_input_line(0, state); -} - /*** Machine Driver @@ -500,7 +491,7 @@ static MACHINE_CONFIG_START( tbowl, tbowl_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ym1", YM3812, 4000000) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(tbowl_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MCFG_SOUND_ADD("ym2", YM3812, 4000000) diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c index bbf626df8c9..84d8afe05c8 100644 --- a/src/mame/drivers/tecmo.c +++ b/src/mame/drivers/tecmo.c @@ -600,12 +600,6 @@ static GFXDECODE_START( tecmo ) GFXDECODE_END - -WRITE_LINE_MEMBER(tecmo_state::irqhandler) -{ - m_soundcpu->set_input_line(0, state); -} - MACHINE_RESET_MEMBER(tecmo_state,rygar) { m_adpcm_pos = 0; @@ -647,7 +641,7 @@ static MACHINE_CONFIG_START( rygar, tecmo_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* verified on pcb */ - MCFG_YM3812_IRQ_HANDLER(WRITELINE(tecmo_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_SOUND_ADD("msm", MSM5205, XTAL_400kHz) /* verified on pcb, even if schematics shows a 384khz resonator */ @@ -710,7 +704,7 @@ static MACHINE_CONFIG_START( backfirt, tecmo_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_4MHz) /* verified on pcb */ - MCFG_YM3812_IRQ_HANDLER(WRITELINE(tecmo_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("soundcpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* no MSM on this PCB */ diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c index 1f36aa6d151..7490311c622 100644 --- a/src/mame/drivers/toaplan1.c +++ b/src/mame/drivers/toaplan1.c @@ -1760,11 +1760,6 @@ static GFXDECODE_START( rallybik ) GFXDECODE_END -WRITE_LINE_MEMBER(toaplan1_state::irqhandler) -{ - m_audiocpu->set_input_line(0, state); -} - #define PIXEL_CLOCK (XTAL_28MHz/4) // HTOTAL and VTOTAL taken from CRTC registers (toaplan1_bcu_control_w) @@ -1816,7 +1811,7 @@ static MACHINE_CONFIG_START( rallybik, toaplan1_rallybik_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(toaplan1_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -1854,7 +1849,7 @@ static MACHINE_CONFIG_START( truxton, toaplan1_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(toaplan1_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -1892,7 +1887,7 @@ static MACHINE_CONFIG_START( hellfire, toaplan1_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(toaplan1_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -1930,7 +1925,7 @@ static MACHINE_CONFIG_START( zerowing, toaplan1_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(toaplan1_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -1972,7 +1967,7 @@ static MACHINE_CONFIG_START( demonwld, toaplan1_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(toaplan1_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -2008,7 +2003,7 @@ static MACHINE_CONFIG_START( samesame, toaplan1_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(toaplan1_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -2046,7 +2041,7 @@ static MACHINE_CONFIG_START( outzone, toaplan1_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(toaplan1_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -2082,7 +2077,7 @@ static MACHINE_CONFIG_START( vimana, toaplan1_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8) /* verified on pcb */ - MCFG_YM3812_IRQ_HANDLER(WRITELINE(toaplan1_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index 31ff351c572..c0eba3547d3 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -3049,12 +3049,6 @@ static GFXDECODE_START( fixeightbl ) GFXDECODE_END -WRITE_LINE_MEMBER(toaplan2_state::irqhandler) -{ - if (m_audiocpu != NULL) // wouldn't tekipaki have problem without this? "mcu" is not generally added - m_audiocpu->set_input_line(0, state); -} - WRITE_LINE_MEMBER(toaplan2_state::bbakraid_irqhandler) { // Not used ??? Connected to a test pin (TP082) @@ -3100,7 +3094,9 @@ static MACHINE_CONFIG_START( tekipaki, toaplan2_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(toaplan2_state, irqhandler)) +#ifdef USE_HD64x180 + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) +#endif MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -3411,7 +3407,7 @@ static MACHINE_CONFIG_START( pipibibs, toaplan2_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8) /* verified on pcb */ - MCFG_YM3812_IRQ_HANDLER(WRITELINE(toaplan2_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -3454,7 +3450,7 @@ static MACHINE_CONFIG_START( pipibibsbl, toaplan2_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_27MHz/8) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(toaplan2_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c index 2015609cc48..e02214bec82 100644 --- a/src/mame/drivers/twincobr.c +++ b/src/mame/drivers/twincobr.c @@ -646,16 +646,6 @@ static GFXDECODE_START( twincobr ) GFXDECODE_END - - -/* handler called by the 3812 emulator when the internal timers cause an IRQ */ -WRITE_LINE_MEMBER(twincobr_state::irqhandler) -{ - m_audiocpu->set_input_line(0, state); -} - - - static MACHINE_CONFIG_START( twincobr, twincobr_state ) /* basic machine hardware */ @@ -702,7 +692,7 @@ static MACHINE_CONFIG_START( twincobr, twincobr_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_28MHz/8) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(twincobr_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c index 4e681bf541d..25a9bbfdbc6 100644 --- a/src/mame/drivers/wardner.c +++ b/src/mame/drivers/wardner.c @@ -146,7 +146,6 @@ public: DECLARE_WRITE8_MEMBER(wardner_bank_w); DECLARE_DRIVER_INIT(wardner); - DECLARE_WRITE_LINE_MEMBER(irqhandler); protected: virtual void driver_start(); @@ -337,13 +336,6 @@ static const gfx_layout tilelayout = }; -/* handler called by the 3812 emulator when the internal timers cause an IRQ */ -WRITE_LINE_MEMBER(wardner_state::irqhandler) -{ - m_audiocpu->set_input_line(0, state); -} - - static GFXDECODE_START( wardner ) GFXDECODE_ENTRY( "gfx1", 0x00000, charlayout, 1536, 32 ) /* colors 1536-1791 */ GFXDECODE_ENTRY( "gfx2", 0x00000, tilelayout, 1280, 16 ) /* colors 1280-1535 */ @@ -419,7 +411,7 @@ static MACHINE_CONFIG_START( wardner, wardner_state ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_14MHz/4) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(wardner_state, irqhandler)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c index d0022da8f8e..89958c6a7ba 100644 --- a/src/mame/drivers/yunsun16.c +++ b/src/mame/drivers/yunsun16.c @@ -582,11 +582,6 @@ MACHINE_RESET_MEMBER(yunsun16_state, shocking) Magic Bubble ***************************************************************************/ -WRITE_LINE_MEMBER(yunsun16_state::soundirq) -{ - m_audiocpu->set_input_line(0, state); -} - static MACHINE_CONFIG_START( magicbub, yunsun16_state ) /* basic machine hardware */ @@ -614,7 +609,7 @@ static MACHINE_CONFIG_START( magicbub, yunsun16_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_16MHz/4) - MCFG_YM3812_IRQ_HANDLER(WRITELINE(yunsun16_state, soundirq)) + MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.80) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.80) diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h index 3914972c6c3..82759e9bf43 100644 --- a/src/mame/includes/actfancr.h +++ b/src/mame/includes/actfancr.h @@ -23,9 +23,6 @@ public: required_shared_ptr<UINT8> m_main_ram; UINT16 m_spriteram16[0x800/2]; // a 16-bit copy of spriteram for use with the MXC06 code - /* video-related */ - int m_flipscreen; - /* misc */ int m_trio_control_select; @@ -39,12 +36,7 @@ public: DECLARE_READ8_MEMBER(triothep_control_r); DECLARE_WRITE8_MEMBER(actfancr_sound_w); DECLARE_WRITE8_MEMBER(actfancr_buffer_spriteram_w); - virtual void video_start(); - DECLARE_MACHINE_START(actfancr); - DECLARE_MACHINE_RESET(actfancr); DECLARE_MACHINE_START(triothep); DECLARE_MACHINE_RESET(triothep); UINT32 screen_update_actfancr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - void register_savestate( ); - DECLARE_WRITE_LINE_MEMBER(sound_irq); }; diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index 9ff4e087957..e1521cdc750 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -123,7 +123,6 @@ public: void spikes91_draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); void aerfboot_draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); void wbbc97_draw_bitmap( bitmap_rgb32 &bitmap ); - DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index 1179fb37eb0..0079388f5a1 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -115,7 +115,6 @@ public: void jongbou_video_banking(int *bank, int data); void kyros_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int c, int d ); void sstingry_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int c, int d ); - DECLARE_WRITE_LINE_MEMBER(ym3812_irq); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h index 17e18cb3cec..4e999cb86f6 100644 --- a/src/mame/includes/crospang.h +++ b/src/mame/includes/crospang.h @@ -15,7 +15,6 @@ public: m_bg_videoram(*this, "bg_videoram"), m_spriteram(*this, "spriteram"), m_sprgen(*this, "spritegen"), - m_audiocpu(*this, "audiocpu"), m_maincpu(*this, "maincpu"), m_gfxdecode(*this, "gfxdecode") { } @@ -32,7 +31,6 @@ public: int m_bestri_tilebank; /* devices */ - required_device<cpu_device> m_audiocpu; DECLARE_WRITE16_MEMBER(crospang_soundlatch_w); DECLARE_WRITE16_MEMBER(bestri_tilebank_w); DECLARE_WRITE16_MEMBER(bestri_bg_scrolly_w); @@ -53,7 +51,6 @@ public: virtual void video_start(); UINT32 screen_update_crospang(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void tumblepb_gfx1_rearrange(); - DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; }; diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index f5d8b2b6119..579d0c2d8a6 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -162,7 +162,6 @@ public: INTERRUPT_GEN_MEMBER(gondo_interrupt); INTERRUPT_GEN_MEMBER(oscar_interrupt); void srdarwin_draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect, int pri ); - DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(csilver_adpcm_int); protected: diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h index 2f77aa914bc..ea8a4a7fda4 100644 --- a/src/mame/includes/deniam.h +++ b/src/mame/includes/deniam.h @@ -69,7 +69,6 @@ public: void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); void set_bg_page( int page, int value ); void set_fg_page( int page, int value ); - DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; optional_device<cpu_device> m_audiocpu; // system 16c does not have sound CPU required_device<okim6295_device> m_oki; diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index 866e761dd32..411f2c07c3e 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -61,7 +61,6 @@ public: inline void get_tile_info(tile_data &tileinfo, tilemap_memory_index tile_index, int _N_); inline void fuuki16_vram_w(offs_t offset, UINT16 data, UINT16 mem_mask, int _N_); void fuuki16_draw_layer( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int i, int flag, int pri ); - DECLARE_WRITE_LINE_MEMBER(soundirq); required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; required_device<screen_device> m_screen; diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index 46dad3d0373..f02c98d28a4 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -26,7 +26,6 @@ public: m_priority(*this, "priority"), m_tilebank(*this, "tilebank"), m_maincpu(*this, "maincpu"), - m_soundcpu(*this, "soundcpu"), m_gfxdecode(*this, "gfxdecode"), m_screen(*this, "screen"), m_palette(*this, "palette"), @@ -51,7 +50,6 @@ public: /* devices */ required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_soundcpu; required_device<gfxdecode_device> m_gfxdecode; required_device<screen_device> m_screen; required_device<palette_device> m_palette; @@ -85,7 +83,6 @@ public: inline void fuuki32_vram_w(offs_t offset, UINT32 data, UINT32 mem_mask, int _N_); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); void fuuki32_draw_layer( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int i, int flag, int pri ); - DECLARE_WRITE_LINE_MEMBER(irqhandler); protected: virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index 88110459b30..d5536d19abe 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -39,7 +39,6 @@ public: DECLARE_PALETTE_INIT(galspnbl); UINT32 screen_update_galspnbl(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_background( bitmap_ind16 &bitmap, const rectangle &cliprect ); - DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index a94babd5720..27c41790ce6 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -65,7 +65,6 @@ public: DECLARE_PALETTE_INIT(hcastle); UINT32 screen_update_hcastle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, UINT8 *sbank, int bank ); - DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE8_MEMBER(volume_callback); required_device<cpu_device> m_maincpu; required_device<gfxdecode_device> m_gfxdecode; diff --git a/src/mame/includes/itech8.h b/src/mame/includes/itech8.h index 79387606007..7369ae79673 100644 --- a/src/mame/includes/itech8.h +++ b/src/mame/includes/itech8.h @@ -122,7 +122,6 @@ public: inline void consume_rle(int count); void perform_blit(address_space &space); void itech8_update_interrupts(int periodic, int tms34061, int blitter); - DECLARE_WRITE_LINE_MEMBER(generate_sound_irq); /*----------- defined in machine/slikshot.c -----------*/ diff --git a/src/mame/includes/lordgun.h b/src/mame/includes/lordgun.h index 4cefa3d8bd6..a9f4e9d3906 100644 --- a/src/mame/includes/lordgun.h +++ b/src/mame/includes/lordgun.h @@ -83,7 +83,6 @@ public: void lorddgun_calc_gun_scr(int i); void lordgun_update_gun(int i); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(soundirq); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<okim6295_device> m_oki; diff --git a/src/mame/includes/metro.h b/src/mame/includes/metro.h index 7c5c7d207c8..55899374b45 100644 --- a/src/mame/includes/metro.h +++ b/src/mame/includes/metro.h @@ -203,8 +203,6 @@ public: void metro_common( ); void draw_tilemap( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, UINT32 flags, UINT32 pcode, int sx, int sy, int wx, int wy, int big, UINT16 *tilemapram, int layer ); - DECLARE_WRITE_LINE_MEMBER(blzntrnd_irqhandler); - DECLARE_WRITE_LINE_MEMBER(ymf278b_interrupt); DECLARE_READ_LINE_MEMBER(metro_rxd_r); protected: diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index 3d4fe61743f..67b5c2eda19 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -121,6 +121,5 @@ public: void create_palette_lookups(); void nemesis_postload(); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); - DECLARE_WRITE_LINE_MEMBER(sound_irq); DECLARE_WRITE8_MEMBER(volume_callback); }; diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h index aa1f2df1a1e..fb8837b74f7 100644 --- a/src/mame/includes/oneshot.h +++ b/src/mame/includes/oneshot.h @@ -11,7 +11,6 @@ public: m_fg_videoram(*this, "fg_videoram"), m_scroll(*this, "scroll"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"), m_oki(*this, "oki"), m_gfxdecode(*this, "gfxdecode"), m_palette(*this, "palette") { } @@ -39,7 +38,6 @@ public: /* devices */ required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; DECLARE_READ16_MEMBER(oneshot_in0_word_r); DECLARE_READ16_MEMBER(oneshot_gun_x_p1_r); DECLARE_READ16_MEMBER(oneshot_gun_y_p1_r); @@ -59,7 +57,6 @@ public: UINT32 screen_update_maddonna(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_crosshairs( bitmap_ind16 &bitmap, const rectangle &cliprect ); void draw_sprites( bitmap_ind16 &bitmap, const rectangle &cliprect ); - DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; diff --git a/src/mame/includes/prehisle.h b/src/mame/includes/prehisle.h index a8ef345e4ed..55faab9796c 100644 --- a/src/mame/includes/prehisle.h +++ b/src/mame/includes/prehisle.h @@ -39,7 +39,6 @@ public: virtual void video_start(); UINT32 screen_update_prehisle(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index 441717311bf..d4bd0f4121f 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -105,8 +105,6 @@ public: void draw_sprites_bootleg( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int trans_pen ); int tilemap_width( int size ); void s1945_mcu_init( ); - DECLARE_WRITE_LINE_MEMBER(irqhandler); - DECLARE_WRITE_LINE_MEMBER(sound_irq); required_device<cpu_device> m_maincpu; optional_device<okim6295_device> m_oki; required_device<gfxdecode_device> m_gfxdecode; diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index c7da3f340af..34a86dd2b8e 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -73,5 +73,4 @@ public: UINT32 screen_update_psikyo4_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(psikyosh_interrupt); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, UINT32 scr); - DECLARE_WRITE_LINE_MEMBER(irqhandler); }; diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index 71e3f4d599d..b6d95f6ef09 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -84,5 +84,4 @@ public: void psikyosh_drawgfxzoom( bitmap_rgb32 &dest_bmp,const rectangle &clip,gfx_element *gfx, UINT32 code,UINT32 color,int flipx,int flipy,int offsx,int offsy, int alpha, int zoomx, int zoomy, int wide, int high, UINT32 z); - DECLARE_WRITE_LINE_MEMBER(irqhandler); }; diff --git a/src/mame/includes/snk68.h b/src/mame/includes/snk68.h index aea796f81ad..eb8aad877e9 100644 --- a/src/mame/includes/snk68.h +++ b/src/mame/includes/snk68.h @@ -54,7 +54,6 @@ public: UINT32 screen_update_pow(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void common_video_start(); void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int group); - DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; required_device<upd7759_device> m_upd7759; diff --git a/src/mame/includes/snowbros.h b/src/mame/includes/snowbros.h index 3c80b4eda12..b8a921b53fd 100644 --- a/src/mame/includes/snowbros.h +++ b/src/mame/includes/snowbros.h @@ -69,5 +69,4 @@ public: TIMER_DEVICE_CALLBACK_MEMBER(snowbros3_irq); void sb3_play_music(int data); void sb3_play_sound (okim6295_device *oki, int data); - DECLARE_WRITE_LINE_MEMBER(irqhandler); }; diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index 798b2627981..68171202393 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -72,7 +72,6 @@ public: { return 0xffff; } - DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_audiocpu; required_device<gfxdecode_device> m_gfxdecode; diff --git a/src/mame/includes/spdodgeb.h b/src/mame/includes/spdodgeb.h index 69b9a5d3a48..79c587b6fe2 100644 --- a/src/mame/includes/spdodgeb.h +++ b/src/mame/includes/spdodgeb.h @@ -64,7 +64,6 @@ public: void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect ); void mcu63705_update_inputs(); DECLARE_CUSTOM_INPUT_MEMBER(mcu63705_busy_r); - DECLARE_WRITE_LINE_MEMBER(irqhandler); void spd_adpcm_int(msm5205_device *device, int chip); DECLARE_WRITE_LINE_MEMBER(spd_adpcm_int_1); DECLARE_WRITE_LINE_MEMBER(spd_adpcm_int_2); diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h index 3125da3cec1..08bf177a8d7 100644 --- a/src/mame/includes/spy.h +++ b/src/mame/includes/spy.h @@ -59,7 +59,6 @@ public: UINT32 screen_update_spy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(spy_interrupt); void spy_collision( ); - DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE8_MEMBER(volume_callback0); DECLARE_WRITE8_MEMBER(volume_callback1); K052109_CB_MEMBER(tile_callback); diff --git a/src/mame/includes/suna8.h b/src/mame/includes/suna8.h index 7b4774de0cc..e87d1217a16 100644 --- a/src/mame/includes/suna8.h +++ b/src/mame/includes/suna8.h @@ -157,5 +157,4 @@ public: void draw_normal_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect, int which); void draw_text_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect); UINT8 *brickzn_decrypt(); - DECLARE_WRITE_LINE_MEMBER(soundirq); }; diff --git a/src/mame/includes/tbowl.h b/src/mame/includes/tbowl.h index 16f69891078..29b1038e29c 100644 --- a/src/mame/includes/tbowl.h +++ b/src/mame/includes/tbowl.h @@ -64,7 +64,6 @@ public: UINT32 screen_update_tbowl_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); UINT32 screen_update_tbowl_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void tbowl_draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect, int xscroll, UINT8* spriteram); - DECLARE_WRITE_LINE_MEMBER(irqhandler); void tbowl_adpcm_int(msm5205_device *device, int chip); DECLARE_WRITE_LINE_MEMBER(tbowl_adpcm_int_1); DECLARE_WRITE_LINE_MEMBER(tbowl_adpcm_int_2); diff --git a/src/mame/includes/tecmo.h b/src/mame/includes/tecmo.h index ae7ca5b9118..4508b200f2b 100644 --- a/src/mame/includes/tecmo.h +++ b/src/mame/includes/tecmo.h @@ -60,7 +60,6 @@ public: DECLARE_VIDEO_START(tecmo); UINT32 screen_update_tecmo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites(screen_device &screen, bitmap_ind16 &bitmap,const rectangle &cliprect); - DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(tecmo_adpcm_int); required_device<cpu_device> m_maincpu; required_device<cpu_device> m_soundcpu; diff --git a/src/mame/includes/toaplan1.h b/src/mame/includes/toaplan1.h index daa44248c78..d1fb3ffd17c 100644 --- a/src/mame/includes/toaplan1.h +++ b/src/mame/includes/toaplan1.h @@ -150,7 +150,6 @@ public: void toaplan1_driver_savestate(); void demonwld_driver_savestate(); void vimana_driver_savestate(); - DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(toaplan1_reset_callback); required_device<m68000_device> m_maincpu; required_device<cpu_device> m_audiocpu; diff --git a/src/mame/includes/toaplan2.h b/src/mame/includes/toaplan2.h index 38b7fe59dbb..d21176cd20d 100644 --- a/src/mame/includes/toaplan2.h +++ b/src/mame/includes/toaplan2.h @@ -153,7 +153,6 @@ public: void truxton2_postload(); void create_tx_tilemap(int dx = 0, int dx_flipped = 0); void toaplan2_vblank_irq(int irq_line); - DECLARE_WRITE_LINE_MEMBER(irqhandler); DECLARE_WRITE_LINE_MEMBER(bbakraid_irqhandler); UINT8 m_pwrkick_hopper; diff --git a/src/mame/includes/twincobr.h b/src/mame/includes/twincobr.h index 085612aaca2..6fff303bdac 100644 --- a/src/mame/includes/twincobr.h +++ b/src/mame/includes/twincobr.h @@ -16,7 +16,6 @@ public: m_spriteram8(*this, "spriteram8"), m_spriteram16(*this, "spriteram16"), m_maincpu(*this, "maincpu"), - m_audiocpu(*this, "audiocpu"), m_dsp(*this, "dsp"), m_spritegen(*this, "scu"), m_gfxdecode(*this, "gfxdecode"), @@ -119,9 +118,7 @@ public: void toaplan0_control_w(int offset, int data); void toaplan0_coin_dsp_w(address_space &space, int offset, int data); void twincobr_driver_savestate(); - DECLARE_WRITE_LINE_MEMBER(irqhandler); required_device<cpu_device> m_maincpu; - required_device<cpu_device> m_audiocpu; required_device<cpu_device> m_dsp; required_device<toaplan_scu_device> m_spritegen; required_device<gfxdecode_device> m_gfxdecode; diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index 3f230255c5e..568b3a32f9d 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -34,7 +34,6 @@ public: required_shared_ptr<UINT16> m_scrollram_0; required_shared_ptr<UINT16> m_scrollram_1; required_shared_ptr<UINT16> m_priorityram; -// UINT16 * m_paletteram; // currently this uses generic palette handling required_shared_ptr<UINT16> m_spriteram; /* other video-related elements */ @@ -58,5 +57,4 @@ public: virtual void video_start(); UINT32 screen_update_yunsun16(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); void draw_sprites( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect ); - DECLARE_WRITE_LINE_MEMBER(soundirq); }; diff --git a/src/mame/video/actfancr.c b/src/mame/video/actfancr.c index fbd1b96e942..589c86a8f56 100644 --- a/src/mame/video/actfancr.c +++ b/src/mame/video/actfancr.c @@ -9,18 +9,6 @@ /******************************************************************************/ -void actfancr_state::register_savestate() -{ - save_item(NAME(m_flipscreen)); -} - -void actfancr_state::video_start() -{ - register_savestate(); -} - -/******************************************************************************/ - UINT32 actfancr_state::screen_update_actfancr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) { /* Draw playfield */ |