From a83ac2582f3d0f70831e9af96e385a98d772c1bf Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 13 Aug 2017 16:43:09 -0400 Subject: [PATCH] royalmah.cpp: HOLD_LINE cleanup (nw) --- src/mame/drivers/royalmah.cpp | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/src/mame/drivers/royalmah.cpp b/src/mame/drivers/royalmah.cpp index 06d3ac77a5d..f2ca43ab44b 100644 --- a/src/mame/drivers/royalmah.cpp +++ b/src/mame/drivers/royalmah.cpp @@ -205,8 +205,6 @@ public: DECLARE_WRITE8_MEMBER(mjvegasa_12400_w); DECLARE_READ8_MEMBER(mjvegasa_12500_r); - DECLARE_WRITE_LINE_MEMBER(mjtensin_rtc_irq); - DECLARE_DRIVER_INIT(tahjong); DECLARE_DRIVER_INIT(dynax); DECLARE_DRIVER_INIT(jansou); @@ -221,7 +219,6 @@ public: uint32_t screen_update_royalmah(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); INTERRUPT_GEN_MEMBER(suzume_irq); - INTERRUPT_GEN_MEMBER(mjtensin_interrupt); protected: virtual void machine_start() override; @@ -3573,10 +3570,10 @@ static MACHINE_CONFIG_DERIVED( mjifb, mjderngr ) MCFG_TLCS90_PORT_P7_READ_CB(READ8(royalmah_state, mjifb_p7_r)) MCFG_TLCS90_PORT_P8_READ_CB(READ8(royalmah_state, mjifb_p8_r)) MCFG_TLCS90_PORT_P8_WRITE_CB(WRITE8(royalmah_state, mjifb_p8_w)) - MCFG_CPU_VBLANK_INT_DRIVER("screen", royalmah_state, irq0_line_hold) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8) + MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MACHINE_CONFIG_END @@ -3591,37 +3588,26 @@ static MACHINE_CONFIG_DERIVED( mjdejavu, mjderngr ) MCFG_TLCS90_PORT_P7_READ_CB(READ8(royalmah_state, mjifb_p7_r)) MCFG_TLCS90_PORT_P8_READ_CB(READ8(royalmah_state, mjifb_p8_r)) MCFG_TLCS90_PORT_P8_WRITE_CB(WRITE8(royalmah_state, mjifb_p8_w)) - MCFG_CPU_VBLANK_INT_DRIVER("screen", royalmah_state, irq0_line_hold) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8) + MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MACHINE_CONFIG_END -INTERRUPT_GEN_MEMBER(royalmah_state::mjtensin_interrupt) -{ - m_maincpu->set_input_line(INPUT_LINE_IRQ0, HOLD_LINE); // vblank -} - -WRITE_LINE_MEMBER(royalmah_state::mjtensin_rtc_irq) -{ - m_maincpu->set_input_line(INPUT_LINE_IRQ1, HOLD_LINE); // rtc -} - - static MACHINE_CONFIG_DERIVED( mjtensin, mjderngr ) MCFG_CPU_REPLACE("maincpu",TMP90841, 12000000) /* ? */ MCFG_CPU_PROGRAM_MAP(mjtensin_map) MCFG_TLCS90_PORT_P3_READ_CB(READ8(royalmah_state, mjtensin_p3_r)) MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(royalmah_state, mjtensin_p4_w)) - MCFG_CPU_VBLANK_INT_DRIVER("screen", royalmah_state, mjtensin_interrupt) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8) + MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) /* devices */ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz) - MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(royalmah_state, mjtensin_rtc_irq)) + MCFG_MSM6242_OUT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_IRQ1)) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( cafetime, mjderngr ) @@ -3629,14 +3615,14 @@ static MACHINE_CONFIG_DERIVED( cafetime, mjderngr ) MCFG_CPU_PROGRAM_MAP(cafetime_map) MCFG_TLCS90_PORT_P3_WRITE_CB(WRITE8(royalmah_state, cafetime_p3_w)) MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(royalmah_state, cafetime_p4_w)) - MCFG_CPU_VBLANK_INT_DRIVER("screen", royalmah_state, mjtensin_interrupt) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8) + MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) /* devices */ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz) - MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(royalmah_state, mjtensin_rtc_irq)) + MCFG_MSM6242_OUT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_IRQ1)) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( mjvegasa, mjderngr ) @@ -3645,14 +3631,14 @@ static MACHINE_CONFIG_DERIVED( mjvegasa, mjderngr ) MCFG_TLCS90_PORT_P3_READ_CB(READ8(royalmah_state, mjtensin_p3_r)) MCFG_TLCS90_PORT_P3_WRITE_CB(WRITE8(royalmah_state, mjvegasa_p3_w)) MCFG_TLCS90_PORT_P4_WRITE_CB(WRITE8(royalmah_state, mjvegasa_p4_w)) - MCFG_CPU_VBLANK_INT_DRIVER("screen", royalmah_state, mjtensin_interrupt) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VISIBLE_AREA(0, 255, 8, 255-8) + MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) /* devices */ MCFG_DEVICE_ADD("rtc", MSM6242, XTAL_32_768kHz) - MCFG_MSM6242_OUT_INT_HANDLER(WRITELINE(royalmah_state, mjtensin_rtc_irq)) + MCFG_MSM6242_OUT_INT_HANDLER(INPUTLINE("maincpu", INPUT_LINE_IRQ1)) MACHINE_CONFIG_END