diff options
Diffstat (limited to 'src/mame/drivers/tsamurai.cpp')
-rw-r--r-- | src/mame/drivers/tsamurai.cpp | 133 |
1 files changed, 66 insertions, 67 deletions
diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp index 11816fbd3b6..bdbae8cbf5e 100644 --- a/src/mame/drivers/tsamurai.cpp +++ b/src/mame/drivers/tsamurai.cpp @@ -717,18 +717,18 @@ GFXDECODE_END /*******************************************************************************/ -void tsamurai_state::tsamurai(machine_config &config) -{ +MACHINE_CONFIG_START(tsamurai_state::tsamurai) + /* basic machine hardware */ - 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("maincpu", Z80, XTAL(24'000'000)/8) + MCFG_DEVICE_PROGRAM_MAP(main_map) + MCFG_DEVICE_IO_MAP(z80_io_map) - Z80(config, m_audiocpu, XTAL(24'000'000)/8); - m_audiocpu->set_addrmap(AS_PROGRAM, &tsamurai_state::sound1_map); + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/8) + MCFG_DEVICE_PROGRAM_MAP(sound1_map) - Z80(config, m_audio2, XTAL(24'000'000)/8); - m_audio2->set_addrmap(AS_PROGRAM, &tsamurai_state::sound2_map); + MCFG_DEVICE_ADD("audio2", Z80, XTAL(24'000'000)/8) + MCFG_DEVICE_PROGRAM_MAP(sound2_map) MCFG_MACHINE_START_OVERRIDE(tsamurai_state,tsamurai) @@ -740,16 +740,16 @@ void tsamurai_state::tsamurai(machine_config &config) mainlatch.q_out_cb<4>().set(FUNC(tsamurai_state::coin2_counter_w)); /* video hardware */ - 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); + 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)) + + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tsamurai) PALETTE(config, m_palette, palette_device::RGB_444_PROMS, "proms", 256); MCFG_VIDEO_START_OVERRIDE(tsamurai_state,tsamurai) @@ -758,24 +758,24 @@ void tsamurai_state::tsamurai(machine_config &config) AY8910(config,"aysnd", XTAL(24'000'000)/8).add_route(ALL_OUTPUTS, "speaker", 0.1); - DAC_8BIT_R2R(config, "dac1", 0).add_route(ALL_OUTPUTS, "speaker", 0.1); // unknown DAC - DAC_8BIT_R2R(config, "dac2", 0).add_route(ALL_OUTPUTS, "speaker", 0.1); // unknown DAC - 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); -} + MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC + MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC + MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) + MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) + MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) +MACHINE_CONFIG_END -void tsamurai_state::vsgongf(machine_config &config) -{ +MACHINE_CONFIG_START(tsamurai_state::vsgongf) + /* basic machine hardware */ - Z80(config, m_maincpu, XTAL(24'000'000)/8); - m_maincpu->set_addrmap(AS_PROGRAM, &tsamurai_state::vsgongf_map); + MCFG_DEVICE_ADD("maincpu", Z80, XTAL(24'000'000)/8) + MCFG_DEVICE_PROGRAM_MAP(vsgongf_map) - 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_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) MCFG_MACHINE_START_OVERRIDE(tsamurai_state,vsgongf) @@ -787,16 +787,16 @@ void tsamurai_state::vsgongf(machine_config &config) mainlatch.q_out_cb<4>().set(FUNC(tsamurai_state::textbank1_w)); /* video hardware */ - 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); + 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)) + + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tsamurai) PALETTE(config, m_palette, palette_device::RGB_444_PROMS, "proms", 256); MCFG_VIDEO_START_OVERRIDE(tsamurai_state,vsgongf) @@ -807,29 +807,28 @@ void tsamurai_state::vsgongf(machine_config &config) AY8910(config,"aysnd", XTAL(24'000'000)/8).add_route(ALL_OUTPUTS, "speaker", 0.1); - DAC_8BIT_R2R(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.1); // unknown DAC - 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); -} + MCFG_DEVICE_ADD("dac", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC + MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) + MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) +MACHINE_CONFIG_END -void tsamurai_state::m660(machine_config &config) -{ +MACHINE_CONFIG_START(tsamurai_state::m660) + /* basic machine hardware */ - Z80(config, m_maincpu, XTAL(24'000'000)/8); - m_maincpu->set_addrmap(AS_PROGRAM, &tsamurai_state::m660_map); - m_maincpu->set_addrmap(AS_IO, &tsamurai_state::z80_m660_io_map); + 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_audiocpu, XTAL(24'000'000)/8); - m_audiocpu->set_addrmap(AS_PROGRAM, &tsamurai_state::sound1_m660_map); + MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(24'000'000)/8) + MCFG_DEVICE_PROGRAM_MAP(sound1_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("audio2", Z80, XTAL(24'000'000)/8) + MCFG_DEVICE_PROGRAM_MAP(sound2_m660_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_DEVICE_ADD("audio3", Z80, XTAL(24'000'000)/8) + MCFG_DEVICE_PROGRAM_MAP(sound3_m660_map) + MCFG_DEVICE_IO_MAP(sound3_m660_io_map) MCFG_MACHINE_START_OVERRIDE(tsamurai_state,m660) @@ -852,7 +851,7 @@ void tsamurai_state::m660(machine_config &config) screen.screen_vblank().set(FUNC(tsamurai_state::vblank_irq)); screen.screen_vblank().append_inputline(m_audio3, INPUT_LINE_NMI); - GFXDECODE(config, m_gfxdecode, m_palette, gfx_tsamurai); + MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_tsamurai) PALETTE(config, m_palette, palette_device::RGB_444_PROMS, "proms", 256); MCFG_VIDEO_START_OVERRIDE(tsamurai_state,m660) @@ -861,12 +860,12 @@ void tsamurai_state::m660(machine_config &config) AY8910(config,"aysnd", XTAL(24'000'000)/8).add_route(ALL_OUTPUTS, "speaker", 0.1); - DAC_8BIT_R2R(config, "dac1", 0).add_route(ALL_OUTPUTS, "speaker", 0.1); // unknown DAC - DAC_8BIT_R2R(config, "dac2", 0).add_route(ALL_OUTPUTS, "speaker", 0.1); // unknown DAC - 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); -} + MCFG_DEVICE_ADD("dac1", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC + MCFG_DEVICE_ADD("dac2", DAC_8BIT_R2R, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.1) // unknown DAC + MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0) + MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) + MCFG_SOUND_ROUTE(0, "dac2", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac2", -1.0, DAC_VREF_NEG_INPUT) +MACHINE_CONFIG_END /*******************************************************************************/ |