diff options
Diffstat (limited to 'src/mame/drivers/sms.cpp')
-rw-r--r-- | src/mame/drivers/sms.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/mame/drivers/sms.cpp b/src/mame/drivers/sms.cpp index d3302bc1bd4..83fb94fd733 100644 --- a/src/mame/drivers/sms.cpp +++ b/src/mame/drivers/sms.cpp @@ -384,7 +384,7 @@ void sms_state::gg_io(address_map &map) static INPUT_PORTS_START( sms ) PORT_START("PAUSE") PORT_BIT( 0x7f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME(DEF_STR(Pause)) PORT_CODE(KEYCODE_1) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME(DEF_STR(Pause)) PORT_CODE(KEYCODE_1) PORT_WRITE_LINE_DEVICE_MEMBER("sms_vdp", sega315_5124_device, n_nmi_in_write) INPUT_PORTS_END static INPUT_PORTS_START( sg1000m3 ) @@ -587,8 +587,8 @@ void sms_state::sms2_ntsc(machine_config &config) SEGA315_5246(config, m_vdp, XTAL(10'738'635)); m_vdp->set_screen(m_main_scr); m_vdp->set_is_pal(false); - m_vdp->irq().set_inputline(m_maincpu, 0); - m_vdp->pause().set(FUNC(sms_state::sms_pause_callback)); + m_vdp->n_int().set_inputline(m_maincpu, 0); + m_vdp->n_nmi().set_inputline(m_maincpu, INPUT_LINE_NMI); m_vdp->add_route(ALL_OUTPUTS, "mono", 1.00); m_has_bios_full = true; @@ -624,8 +624,8 @@ void sms_state::sms1_ntsc(machine_config &config) SEGA315_5124(config, m_vdp, XTAL(10'738'635)); m_vdp->set_screen(m_main_scr); m_vdp->set_is_pal(false); - m_vdp->irq().set_inputline(m_maincpu, 0); - m_vdp->pause().set(FUNC(sms_state::sms_pause_callback)); + m_vdp->n_int().set_inputline(m_maincpu, 0); + m_vdp->n_nmi().set_inputline(m_maincpu, INPUT_LINE_NMI); m_vdp->add_route(ALL_OUTPUTS, "mono", 1.00); // card and expansion slots, not present in Master System II @@ -640,7 +640,7 @@ void smssdisp_state::sms_sdisp(machine_config &config) { sms1_ntsc(config); - m_vdp->irq().set(FUNC(smssdisp_state::sms_store_int_callback)); + m_vdp->n_int().set(FUNC(smssdisp_state::sms_store_int_callback)); Z80(config, m_control_cpu, XTAL(10'738'635)/3); m_control_cpu->set_addrmap(AS_PROGRAM, &smssdisp_state::sms_store_mem); @@ -682,8 +682,8 @@ void sms_state::sms2_pal(machine_config &config) SEGA315_5246(config, m_vdp, MASTER_CLOCK_PAL/5); m_vdp->set_screen(m_main_scr); m_vdp->set_is_pal(true); - m_vdp->irq().set_inputline(m_maincpu, 0); - m_vdp->pause().set(FUNC(sms_state::sms_pause_callback)); + m_vdp->n_int().set_inputline(m_maincpu, 0); + m_vdp->n_nmi().set_inputline(m_maincpu, INPUT_LINE_NMI); m_vdp->add_route(ALL_OUTPUTS, "mono", 1.00); m_has_bios_full = true; @@ -718,8 +718,8 @@ void sms_state::sms1_pal(machine_config &config) SEGA315_5124(config, m_vdp, MASTER_CLOCK_PAL/5); m_vdp->set_screen(m_main_scr); m_vdp->set_is_pal(true); - m_vdp->irq().set_inputline(m_maincpu, 0); - m_vdp->pause().set(FUNC(sms_state::sms_pause_callback)); + m_vdp->n_int().set_inputline(m_maincpu, 0); + m_vdp->n_nmi().set_inputline(m_maincpu, INPUT_LINE_NMI); m_vdp->add_route(ALL_OUTPUTS, "mono", 1.00); // card and expansion slots, not present in Master System II @@ -754,8 +754,8 @@ void sms_state::sms3_paln(machine_config &config) SEGA315_5246(config, m_vdp, MASTER_CLOCK_PALN); m_vdp->set_screen(m_main_scr); m_vdp->set_is_pal(true); - m_vdp->irq().set_inputline(m_maincpu, 0); - m_vdp->pause().set(FUNC(sms_state::sms_pause_callback)); + m_vdp->n_int().set_inputline(m_maincpu, 0); + m_vdp->n_nmi().set_inputline(m_maincpu, INPUT_LINE_NMI); m_vdp->add_route(ALL_OUTPUTS, "mono", 1.00); m_has_bios_full = true; @@ -790,8 +790,8 @@ void sms_state::sms1_paln(machine_config &config) SEGA315_5124(config, m_vdp, MASTER_CLOCK_PALN); m_vdp->set_screen(m_main_scr); m_vdp->set_is_pal(true); - m_vdp->irq().set_inputline(m_maincpu, 0); - m_vdp->pause().set(FUNC(sms_state::sms_pause_callback)); + m_vdp->n_int().set_inputline(m_maincpu, 0); + m_vdp->n_nmi().set_inputline(m_maincpu, INPUT_LINE_NMI); m_vdp->add_route(ALL_OUTPUTS, "mono", 1.00); // card and expansion slots, not present in Tec Toy Master System III @@ -827,8 +827,8 @@ void sms_state::sms3_br(machine_config &config) SEGA315_5246(config, m_vdp, MASTER_CLOCK_PALM); m_vdp->set_screen(m_main_scr); m_vdp->set_is_pal(false); // PAL-M has same line count of NTSC - m_vdp->irq().set_inputline(m_maincpu, 0); - m_vdp->pause().set(FUNC(sms_state::sms_pause_callback)); + m_vdp->n_int().set_inputline(m_maincpu, 0); + m_vdp->n_nmi().set_inputline(m_maincpu, INPUT_LINE_NMI); m_vdp->add_route(ALL_OUTPUTS, "mono", 1.00); m_has_bios_full = true; @@ -864,8 +864,8 @@ void sms_state::sms1_br(machine_config &config) SEGA315_5124(config, m_vdp, MASTER_CLOCK_PALM); m_vdp->set_screen(m_main_scr); m_vdp->set_is_pal(false); // PAL-M has same line count of NTSC - m_vdp->irq().set_inputline(m_maincpu, 0); - m_vdp->pause().set(FUNC(sms_state::sms_pause_callback)); + m_vdp->n_int().set_inputline(m_maincpu, 0); + m_vdp->n_nmi().set_inputline(m_maincpu, INPUT_LINE_NMI); m_vdp->add_route(ALL_OUTPUTS, "mono", 1.00); // card and expansion slots, not present in Tec Toy Master System III @@ -908,7 +908,7 @@ void sms_state::sms1_kr(machine_config &config) SOFTWARE_LIST(config, "cart_list2").set_original("sg1000"); - m_vdp->csync().set(FUNC(sms_state::sms_csync_callback)); + m_vdp->n_csync().set(FUNC(sms_state::sms_n_csync_callback)); m_has_bios_full = false; m_has_bios_2000 = true; @@ -981,8 +981,8 @@ void sms_state::gamegear(machine_config &config) SEGA315_5377(config, m_vdp, MASTER_CLOCK_GG/3); m_vdp->set_screen(m_main_scr); m_vdp->set_is_pal(false); - m_vdp->irq().set_inputline(m_maincpu, 0); - m_vdp->pause().set(FUNC(sms_state::sms_pause_callback)); + m_vdp->n_int().set_inputline(m_maincpu, 0); + m_vdp->vblank().set(FUNC(sms_state::gg_pause_callback)); m_vdp->add_route(0, "lspeaker", 1.00); m_vdp->add_route(1, "rspeaker", 1.00); |