diff options
Diffstat (limited to 'src/mame/drivers/divebomb.cpp')
-rw-r--r-- | src/mame/drivers/divebomb.cpp | 59 |
1 files changed, 33 insertions, 26 deletions
diff --git a/src/mame/drivers/divebomb.cpp b/src/mame/drivers/divebomb.cpp index c33052b34a1..842a7cb903a 100644 --- a/src/mame/drivers/divebomb.cpp +++ b/src/mame/drivers/divebomb.cpp @@ -114,12 +114,12 @@ void divebomb_state::divebomb_fgcpu_map(address_map &map) void divebomb_state::divebomb_fgcpu_iomap(address_map &map) { map.global_mask(0xff); - map(0x00, 0x00).w("sn0", FUNC(sn76489_device::write)); - map(0x01, 0x01).w("sn1", FUNC(sn76489_device::write)); - map(0x02, 0x02).w("sn2", FUNC(sn76489_device::write)); - map(0x03, 0x03).w("sn3", FUNC(sn76489_device::write)); - map(0x04, 0x04).w("sn4", FUNC(sn76489_device::write)); - map(0x05, 0x05).w("sn5", FUNC(sn76489_device::write)); + map(0x00, 0x00).w("sn0", FUNC(sn76489_device::command_w)); + map(0x01, 0x01).w("sn1", FUNC(sn76489_device::command_w)); + map(0x02, 0x02).w("sn2", FUNC(sn76489_device::command_w)); + map(0x03, 0x03).w("sn3", FUNC(sn76489_device::command_w)); + map(0x04, 0x04).w("sn4", FUNC(sn76489_device::command_w)); + map(0x05, 0x05).w("sn5", FUNC(sn76489_device::command_w)); map(0x10, 0x10).r(m_roz2fg_latch, FUNC(generic_latch_8_device::read)).w("fg2roz", FUNC(generic_latch_8_device::write)); map(0x20, 0x20).r(m_spr2fg_latch, FUNC(generic_latch_8_device::read)).w("fg2spr", FUNC(generic_latch_8_device::write)); map(0x30, 0x30).portr("IN0"); @@ -386,23 +386,24 @@ GFXDECODE_END * *************************************/ -void divebomb_state::divebomb(machine_config &config) -{ - Z80(config, m_fgcpu, XTAL1/4); // ? - m_fgcpu->set_addrmap(AS_PROGRAM, &divebomb_state::divebomb_fgcpu_map); - m_fgcpu->set_addrmap(AS_IO, &divebomb_state::divebomb_fgcpu_iomap); +MACHINE_CONFIG_START(divebomb_state::divebomb) + + MCFG_DEVICE_ADD("fgcpu", Z80,XTAL1/4) // ? + MCFG_DEVICE_PROGRAM_MAP(divebomb_fgcpu_map) + MCFG_DEVICE_IO_MAP(divebomb_fgcpu_iomap) - Z80(config, m_spritecpu, XTAL1/4); // ? - m_spritecpu->set_addrmap(AS_PROGRAM, &divebomb_state::divebomb_spritecpu_map); - m_spritecpu->set_addrmap(AS_IO, &divebomb_state::divebomb_spritecpu_iomap); + MCFG_DEVICE_ADD("spritecpu", Z80,XTAL1/4) // ? + MCFG_DEVICE_PROGRAM_MAP(divebomb_spritecpu_map) + MCFG_DEVICE_IO_MAP(divebomb_spritecpu_iomap) - Z80(config, m_rozcpu, XTAL1/4); // ? - m_rozcpu->set_addrmap(AS_PROGRAM, &divebomb_state::divebomb_rozcpu_map); - m_rozcpu->set_addrmap(AS_IO, &divebomb_state::divebomb_rozcpu_iomap); + MCFG_DEVICE_ADD("rozcpu", Z80,XTAL1/4) // ? + MCFG_DEVICE_PROGRAM_MAP(divebomb_rozcpu_map) + MCFG_DEVICE_IO_MAP(divebomb_rozcpu_iomap) - config.m_perfect_cpu_quantum = subtag("fgcpu"); + MCFG_QUANTUM_PERFECT_CPU("fgcpu") - INPUT_MERGER_ANY_HIGH(config, m_fgcpu_irq).output_handler().set_inputline(m_fgcpu, INPUT_LINE_IRQ0); + MCFG_INPUT_MERGER_ANY_HIGH("fgcpu_irq") + MCFG_INPUT_MERGER_OUTPUT_HANDLER(INPUTLINE("fgcpu", INPUT_LINE_IRQ0)) GENERIC_LATCH_8(config, "fg2spr").data_pending_callback().set_inputline(m_spritecpu, INPUT_LINE_IRQ0); @@ -452,13 +453,19 @@ void divebomb_state::divebomb(machine_config &config) SPEAKER(config, "mono").front_center(); // All frequencies unverified - SN76489(config, "sn0", XTAL1/8).add_route(ALL_OUTPUTS, "mono", 0.15); - SN76489(config, "sn1", XTAL1/8).add_route(ALL_OUTPUTS, "mono", 0.15); - SN76489(config, "sn2", XTAL1/8).add_route(ALL_OUTPUTS, "mono", 0.15); - SN76489(config, "sn3", XTAL1/8).add_route(ALL_OUTPUTS, "mono", 0.15); - SN76489(config, "sn4", XTAL1/8).add_route(ALL_OUTPUTS, "mono", 0.15); - SN76489(config, "sn5", XTAL1/8).add_route(ALL_OUTPUTS, "mono", 0.15); -} + MCFG_DEVICE_ADD("sn0", SN76489, XTAL1/8) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) + MCFG_DEVICE_ADD("sn1", SN76489, XTAL1/8) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) + MCFG_DEVICE_ADD("sn2", SN76489, XTAL1/8) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) + MCFG_DEVICE_ADD("sn3", SN76489, XTAL1/8) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) + MCFG_DEVICE_ADD("sn4", SN76489, XTAL1/8) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) + MCFG_DEVICE_ADD("sn5", SN76489, XTAL1/8) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) +MACHINE_CONFIG_END |