diff options
Diffstat (limited to 'src/mame/drivers/tsamurai.cpp')
-rw-r--r-- | src/mame/drivers/tsamurai.cpp | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp index 63f4277b236..dab0db07855 100644 --- a/src/mame/drivers/tsamurai.cpp +++ b/src/mame/drivers/tsamurai.cpp @@ -717,18 +717,18 @@ GFXDECODE_END /*******************************************************************************/ -MACHINE_CONFIG_START(tsamurai_state::tsamurai) - +void tsamurai_state::tsamurai(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000)/8) - MCFG_DEVICE_PROGRAM_MAP(main_map) - MCFG_DEVICE_IO_MAP(z80_io_map) + Z80(config, m_maincpu, XTAL(24'000'000)/8); + m_maincpu->set_addrmap(AS_PROGRAM, &tsamurai_state::main_map); + m_maincpu->set_addrmap(AS_IO, &tsamurai_state::z80_io_map); - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/8) - MCFG_DEVICE_PROGRAM_MAP(sound1_map) + Z80(config, m_audiocpu, XTAL(24'000'000)/8); + m_audiocpu->set_addrmap(AS_PROGRAM, &tsamurai_state::sound1_map); - MCFG_DEVICE_ADD("audio2", Z80, XTAL(24'000'000)/8) - MCFG_DEVICE_PROGRAM_MAP(sound2_map) + Z80(config, m_audio2, XTAL(24'000'000)/8); + m_audio2->set_addrmap(AS_PROGRAM, &tsamurai_state::sound2_map); MCFG_MACHINE_START_OVERRIDE(tsamurai_state,tsamurai) @@ -740,14 +740,14 @@ MACHINE_CONFIG_START(tsamurai_state::tsamurai) mainlatch.q_out_cb<4>().set(FUNC(tsamurai_state::coin2_counter_w)); /* 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(32*8, 32*8) - MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 255-16) - MCFG_SCREEN_UPDATE_DRIVER(tsamurai_state, screen_update) - MCFG_SCREEN_PALETTE(m_palette) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tsamurai_state, vblank_irq)) + 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(32*8, 32*8); + screen.set_visarea(0, 255, 16, 255-16); + screen.set_screen_update(FUNC(tsamurai_state::screen_update)); + screen.set_palette(m_palette); + screen.screen_vblank().set(FUNC(tsamurai_state::vblank_irq)); GFXDECODE(config, m_gfxdecode, m_palette, gfx_tsamurai); PALETTE(config, m_palette, palette_device::RGB_444_PROMS, "proms", 256); @@ -763,19 +763,19 @@ MACHINE_CONFIG_START(tsamurai_state::tsamurai) voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref")); vref.add_route(0, "dac1", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac1", -1.0, DAC_VREF_NEG_INPUT); vref.add_route(0, "dac2", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac2", -1.0, DAC_VREF_NEG_INPUT); -MACHINE_CONFIG_END - +} -MACHINE_CONFIG_START(tsamurai_state::vsgongf) +void tsamurai_state::vsgongf(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000)/8) - MCFG_DEVICE_PROGRAM_MAP(vsgongf_map) + Z80(config, m_maincpu, XTAL(24'000'000)/8); + m_maincpu->set_addrmap(AS_PROGRAM, &tsamurai_state::vsgongf_map); - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/8) - MCFG_DEVICE_PROGRAM_MAP(sound_vsgongf_map) - MCFG_DEVICE_IO_MAP(vsgongf_audio_io_map) - MCFG_DEVICE_PERIODIC_INT_DRIVER(tsamurai_state, vsgongf_sound_interrupt, 3*60) + Z80(config, m_audiocpu, XTAL(24'000'000)/8); + m_audiocpu->set_addrmap(AS_PROGRAM, &tsamurai_state::sound_vsgongf_map); + m_audiocpu->set_addrmap(AS_IO, &tsamurai_state::vsgongf_audio_io_map); + m_audiocpu->set_periodic_int(FUNC(tsamurai_state::vsgongf_sound_interrupt), attotime::from_hz(3*60)); MCFG_MACHINE_START_OVERRIDE(tsamurai_state,vsgongf) @@ -787,14 +787,14 @@ MACHINE_CONFIG_START(tsamurai_state::vsgongf) mainlatch.q_out_cb<4>().set(FUNC(tsamurai_state::textbank1_w)); /* 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(32*8, 32*8) - MCFG_SCREEN_VISIBLE_AREA(0, 255, 16, 255-16) - MCFG_SCREEN_UPDATE_DRIVER(tsamurai_state, screen_update_vsgongf) - MCFG_SCREEN_PALETTE(m_palette) - MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, tsamurai_state, vblank_irq)) + 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(32*8, 32*8); + screen.set_visarea(0, 255, 16, 255-16); + screen.set_screen_update(FUNC(tsamurai_state::screen_update_vsgongf)); + screen.set_palette(m_palette); + screen.screen_vblank().set(FUNC(tsamurai_state::vblank_irq)); GFXDECODE(config, m_gfxdecode, m_palette, gfx_tsamurai); PALETTE(config, m_palette, palette_device::RGB_444_PROMS, "proms", 256); @@ -811,25 +811,25 @@ MACHINE_CONFIG_START(tsamurai_state::vsgongf) voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref")); vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT); -MACHINE_CONFIG_END - +} -MACHINE_CONFIG_START(tsamurai_state::m660) +void tsamurai_state::m660(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000)/8) - MCFG_DEVICE_PROGRAM_MAP(m660_map) - MCFG_DEVICE_IO_MAP(z80_m660_io_map) + Z80(config, m_maincpu, XTAL(24'000'000)/8); + m_maincpu->set_addrmap(AS_PROGRAM, &tsamurai_state::m660_map); + m_maincpu->set_addrmap(AS_PROGRAM, &tsamurai_state::z80_m660_io_map); - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/8) - MCFG_DEVICE_PROGRAM_MAP(sound1_m660_map) + Z80(config, m_audiocpu, XTAL(24'000'000)/8); + m_audiocpu->set_addrmap(AS_PROGRAM, &tsamurai_state::sound1_m660_map); - MCFG_DEVICE_ADD("audio2", Z80, XTAL(24'000'000)/8) - MCFG_DEVICE_PROGRAM_MAP(sound2_m660_map) + Z80(config, m_audio2, XTAL(24'000'000)/8); + m_audio2->set_addrmap(AS_PROGRAM, &tsamurai_state::sound2_m660_map); - MCFG_DEVICE_ADD("audio3", Z80, XTAL(24'000'000)/8) - MCFG_DEVICE_PROGRAM_MAP(sound3_m660_map) - MCFG_DEVICE_IO_MAP(sound3_m660_io_map) + Z80(config, m_audio3, XTAL(24'000'000)/8); + m_audio3->set_addrmap(AS_PROGRAM, &tsamurai_state::sound3_m660_map); + m_audio3->set_addrmap(AS_IO, &tsamurai_state::sound3_m660_io_map); MCFG_MACHINE_START_OVERRIDE(tsamurai_state,m660) @@ -866,7 +866,7 @@ MACHINE_CONFIG_START(tsamurai_state::m660) voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref")); vref.add_route(0, "dac1", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac1", -1.0, DAC_VREF_NEG_INPUT); vref.add_route(0, "dac2", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac2", -1.0, DAC_VREF_NEG_INPUT); -MACHINE_CONFIG_END +} /*******************************************************************************/ |