diff options
Diffstat (limited to 'src/mame/drivers/fantland.c')
-rw-r--r-- | src/mame/drivers/fantland.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c index 471a1edde6d..8083f4a840f 100644 --- a/src/mame/drivers/fantland.c +++ b/src/mame/drivers/fantland.c @@ -829,16 +829,15 @@ MACHINE_RESET_MEMBER(fantland_state,fantland) m_nmi_enable = 0; } -static INTERRUPT_GEN( fantland_irq ) +INTERRUPT_GEN_MEMBER(fantland_state::fantland_irq) { - fantland_state *state = device->machine().driver_data<fantland_state>(); - if (state->m_nmi_enable & 8) - device->execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); + if (m_nmi_enable & 8) + device.execute().set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static INTERRUPT_GEN( fantland_sound_irq ) +INTERRUPT_GEN_MEMBER(fantland_state::fantland_sound_irq) { - device->execute().set_input_line_and_vector(0, HOLD_LINE, 0x80 / 4); + device.execute().set_input_line_and_vector(0, HOLD_LINE, 0x80 / 4); } static MACHINE_CONFIG_START( fantland, fantland_state ) @@ -846,12 +845,12 @@ static MACHINE_CONFIG_START( fantland, fantland_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8086, 8000000) // ? MCFG_CPU_PROGRAM_MAP(fantland_map) - MCFG_CPU_VBLANK_INT("screen", fantland_irq) + MCFG_CPU_VBLANK_INT_DRIVER("screen", fantland_state, fantland_irq) MCFG_CPU_ADD("audiocpu", I8088, 8000000) // ? MCFG_CPU_PROGRAM_MAP(fantland_sound_map) MCFG_CPU_IO_MAP(fantland_sound_iomap) - MCFG_CPU_PERIODIC_INT(fantland_sound_irq, 8000) + MCFG_CPU_PERIODIC_INT_DRIVER(fantland_state, fantland_sound_irq, 8000) // NMI when soundlatch is written MCFG_MACHINE_START_OVERRIDE(fantland_state,fantland) @@ -899,7 +898,7 @@ static MACHINE_CONFIG_START( galaxygn, fantland_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", I8088, 8000000) // ? MCFG_CPU_PROGRAM_MAP(galaxygn_map) - MCFG_CPU_VBLANK_INT("screen", fantland_irq) + MCFG_CPU_VBLANK_INT_DRIVER("screen", fantland_state, fantland_irq) MCFG_CPU_ADD("audiocpu", I8088, 8000000) // ? MCFG_CPU_PROGRAM_MAP(fantland_sound_map) @@ -1005,7 +1004,7 @@ static MACHINE_CONFIG_START( borntofi, fantland_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V20, 16000000/2) // D701080C-8 - NEC D70108C-8 V20 CPU, running at 8.000MHz [16/2] MCFG_CPU_PROGRAM_MAP(borntofi_map) - MCFG_CPU_VBLANK_INT("screen", fantland_irq) + MCFG_CPU_VBLANK_INT_DRIVER("screen", fantland_state, fantland_irq) MCFG_CPU_ADD("audiocpu", I8088, 18432000/3) // 8088 - AMD P8088-2 CPU, running at 6.144MHz [18.432/3] MCFG_CPU_PROGRAM_MAP(borntofi_sound_map) @@ -1044,7 +1043,7 @@ static MACHINE_CONFIG_START( wheelrun, fantland_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", V20, XTAL_18MHz/2) // D701080C-8 (V20) MCFG_CPU_PROGRAM_MAP(wheelrun_map) - MCFG_CPU_VBLANK_INT("screen", fantland_irq) + MCFG_CPU_VBLANK_INT_DRIVER("screen", fantland_state, fantland_irq) MCFG_CPU_ADD("audiocpu", Z80, XTAL_18MHz/2) // Z8400BB1 (Z80B) MCFG_CPU_PROGRAM_MAP(wheelrun_sound_map) |