diff options
Diffstat (limited to 'src/mame/drivers/jantotsu.cpp')
-rw-r--r-- | src/mame/drivers/jantotsu.cpp | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/src/mame/drivers/jantotsu.cpp b/src/mame/drivers/jantotsu.cpp index 95ab9ddb4f9..92bf725bbad 100644 --- a/src/mame/drivers/jantotsu.cpp +++ b/src/mame/drivers/jantotsu.cpp @@ -348,8 +348,8 @@ void jantotsu_state::jantotsu_map(address_map &map) void jantotsu_state::jantotsu_io(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).portr("DSW1").w("sn1", FUNC(sn76489a_device::command_w)); - map(0x01, 0x01).r(FUNC(jantotsu_state::jantotsu_dsw2_r)).w("sn2", FUNC(sn76489a_device::command_w)); + map(0x00, 0x00).portr("DSW1").w("sn1", FUNC(sn76489a_device::write)); + map(0x01, 0x01).r(FUNC(jantotsu_state::jantotsu_dsw2_r)).w("sn2", FUNC(sn76489a_device::write)); map(0x02, 0x03).w(FUNC(jantotsu_state::jan_adpcm_w)); map(0x04, 0x04).rw(FUNC(jantotsu_state::jantotsu_mux_r), FUNC(jantotsu_state::jantotsu_mux_w)); map(0x07, 0x07).w(FUNC(jantotsu_state::bankaddr_w)); @@ -503,38 +503,35 @@ void jantotsu_state::machine_reset() m_adpcm_trigger = 0; } -MACHINE_CONFIG_START(jantotsu_state::jantotsu) - +void jantotsu_state::jantotsu(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80,MAIN_CLOCK/4) - MCFG_DEVICE_PROGRAM_MAP(jantotsu_map) - MCFG_DEVICE_IO_MAP(jantotsu_io) + Z80(config, m_maincpu, MAIN_CLOCK/4); + m_maincpu->set_addrmap(AS_PROGRAM, &jantotsu_state::jantotsu_map); + m_maincpu->set_addrmap(AS_IO, &jantotsu_state::jantotsu_io); /* video hardware */ - MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(60) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) //not accurate - MCFG_SCREEN_SIZE(256, 256) - MCFG_SCREEN_VISIBLE_AREA(0, 256-1, 16, 240-1) - MCFG_SCREEN_UPDATE_DRIVER(jantotsu_state, screen_update_jantotsu) - MCFG_SCREEN_VBLANK_CALLBACK(INPUTLINE("maincpu", INPUT_LINE_NMI)) + screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); + screen.set_refresh_hz(60); + screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); //not accurate + screen.set_size(256, 256); + screen.set_visarea(0, 256-1, 16, 240-1); + screen.set_screen_update(FUNC(jantotsu_state::screen_update_jantotsu)); + screen.screen_vblank().set_inputline(m_maincpu, INPUT_LINE_NMI); PALETTE(config, m_palette, FUNC(jantotsu_state::jantotsu_palette), 0x20); /* sound hardware */ SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD("sn1", SN76489A, MAIN_CLOCK/4) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) + SN76489A(config, "sn1", MAIN_CLOCK/4).add_route(ALL_OUTPUTS, "mono", 0.50); + SN76489A(config, "sn2", MAIN_CLOCK/4).add_route(ALL_OUTPUTS, "mono", 0.50); - MCFG_DEVICE_ADD("sn2", SN76489A, MAIN_CLOCK/4) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - - MCFG_DEVICE_ADD("adpcm", MSM5205, XTAL(384'000)) - MCFG_MSM5205_VCLK_CB(WRITELINE(*this, jantotsu_state, jan_adpcm_int)) /* interrupt function */ - MCFG_MSM5205_PRESCALER_SELECTOR(S64_4B) /* 6 KHz */ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) -MACHINE_CONFIG_END + MSM5205(config, m_adpcm, XTAL(384'000)); + m_adpcm->vck_legacy_callback().set(FUNC(jantotsu_state::jan_adpcm_int)); /* interrupt function */ + m_adpcm->set_prescaler_selector(msm5205_device::S64_4B); /* 6 KHz */ + m_adpcm->add_route(ALL_OUTPUTS, "mono", 1.00); +} /************************************* |