summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/stargame.cpp
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/drivers/stargame.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/stargame.cpp')
-rw-r--r--src/mame/drivers/stargame.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mame/drivers/stargame.cpp b/src/mame/drivers/stargame.cpp
index 12963c3030c..10b96f5fd3e 100644
--- a/src/mame/drivers/stargame.cpp
+++ b/src/mame/drivers/stargame.cpp
@@ -103,22 +103,21 @@ static const z80_daisy_config daisy_chain[] =
};
-void stargame_state::stargame(machine_config &config)
-{
+MACHINE_CONFIG_START(stargame_state::stargame)
/* basic machine hardware */
Z80(config, m_maincpu, 15000000 / 4); // clock line marked as CK4 and derived from 15MHz crystal
m_maincpu->set_addrmap(AS_PROGRAM, &stargame_state::maincpu_map);
m_maincpu->set_addrmap(AS_IO, &stargame_state::maincpu_io);
m_maincpu->set_daisy_config(daisy_chain);
- Z80(config, m_audiocpu, 15000000 / 3); // ? check divider - clock line marked as CK6 and derived from 15MHz crystal
- m_audiocpu->set_addrmap(AS_PROGRAM, &stargame_state::audiocpu_map);
- m_audiocpu->set_addrmap(AS_IO, &stargame_state::audiocpu_io);
+ MCFG_DEVICE_ADD("audiocpu", Z80, 15000000 / 3) // ? check divider - clock line marked as CK6 and derived from 15MHz crystal
+ MCFG_DEVICE_PROGRAM_MAP(audiocpu_map)
+ MCFG_DEVICE_IO_MAP(audiocpu_io)
MCFG_MACHINE_RESET_OVERRIDE(stargame_state, stargame)
/* video hardware */
- //config.set_default_layout();
+ //MCFG_DEFAULT_LAYOUT()
Z80CTC(config, m_ctc, 15000000 / 4);
m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
@@ -127,7 +126,8 @@ void stargame_state::stargame(machine_config &config)
/* sound hardware */
genpin_audio(config);
SPEAKER(config, "measnd").front_center();
- MEA8000(config, "mea8000", 15000000 / 4).add_route(ALL_OUTPUTS, "measnd", 1.0);
+ MCFG_DEVICE_ADD("mea8000", MEA8000, 15000000 / 4)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "measnd", 1.0)
SPEAKER(config, "aysnd").front_center();
AY8910(config, "ay", 15000000 / 8).add_route(ALL_OUTPUTS, "aysnd", 0.25); // clock line marked as CK2 and derived from 15MHz crystal
@@ -144,7 +144,7 @@ void stargame_state::stargame(machine_config &config)
GENERIC_LATCH_8(config, "soundlatch").data_pending_callback().set_inputline(m_audiocpu, INPUT_LINE_NMI);
WATCHDOG_TIMER(config, "watchdog");
-}
+MACHINE_CONFIG_END
ROM_START(spcship)
ROM_REGION(0x4000, "maincpu", 0)