summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/leland.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/leland.cpp
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/leland.cpp')
-rw-r--r--src/mame/drivers/leland.cpp82
1 files changed, 40 insertions, 42 deletions
diff --git a/src/mame/drivers/leland.cpp b/src/mame/drivers/leland.cpp
index 2a287d86571..7f2a80da015 100644
--- a/src/mame/drivers/leland.cpp
+++ b/src/mame/drivers/leland.cpp
@@ -978,17 +978,17 @@ INPUT_PORTS_END
*
*************************************/
-void leland_state::leland(machine_config &config)
-{
+MACHINE_CONFIG_START(leland_state::leland)
+
/* basic machine hardware */
- Z80(config, m_master, MASTER_CLOCK/2);
- m_master->set_addrmap(AS_PROGRAM, &leland_state::master_map_program);
- m_master->set_addrmap(AS_IO, &leland_state::master_map_io);
- m_master->set_vblank_int("screen", FUNC(leland_state::leland_master_interrupt));
+ MCFG_DEVICE_ADD(m_master, Z80, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(master_map_program)
+ MCFG_DEVICE_IO_MAP(master_map_io)
+ MCFG_DEVICE_VBLANK_INT_DRIVER("screen", leland_state, leland_master_interrupt)
- Z80(config, m_slave, MASTER_CLOCK/2);
- m_slave->set_addrmap(AS_PROGRAM, &leland_state::slave_small_map_program);
- m_slave->set_addrmap(AS_IO, &leland_state::slave_map_io);
+ MCFG_DEVICE_ADD(m_slave, Z80, MASTER_CLOCK/2)
+ MCFG_DEVICE_PROGRAM_MAP(slave_small_map_program)
+ MCFG_DEVICE_IO_MAP(slave_map_io)
EEPROM_93C46_16BIT(config, m_eeprom);
NVRAM(config, "battery", nvram_device::DEFAULT_ALL_0);
@@ -1013,54 +1013,53 @@ void leland_state::leland(machine_config &config)
// m_ay8912->port_a_write_callback().set(FUNC(leland_state::leland_sound_port_w));
// m_ay8912->add_route(ALL_OUTPUTS, "speaker", 0.25);
- DAC_8BIT_BINARY_WEIGHTED(config, m_dac[0], 0).add_route(ALL_OUTPUTS, "speaker", 0.0625); // ls374.u79 + r17-r23 (24k,12k,6.2k,3k,1.5k,750,390,180)
- DAC_8BIT_BINARY_WEIGHTED(config, m_dac[1], 0).add_route(ALL_OUTPUTS, "speaker", 0.0625); // ls374.u88 + r27-r34 (24k,12k,6.2k,3k,1.5k,750,390,180)
- voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref"));
- vref.add_route(0, "dac0", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac0", -1.0, DAC_VREF_NEG_INPUT);
- vref.add_route(0, "dac1", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac1", -1.0, DAC_VREF_NEG_INPUT);
-}
+ MCFG_DEVICE_ADD(m_dac[0], DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625) // ls374.u79 + r17-r23 (24k,12k,6.2k,3k,1.5k,750,390,180)
+ MCFG_DEVICE_ADD(m_dac[1], DAC_8BIT_BINARY_WEIGHTED, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.0625) // ls374.u88 + r27-r34 (24k,12k,6.2k,3k,1.5k,750,390,180)
+ MCFG_DEVICE_ADD("vref", VOLTAGE_REGULATOR, 0) MCFG_VOLTAGE_REGULATOR_OUTPUT(5.0)
+ MCFG_SOUND_ROUTE(0, "dac0", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac0", -1.0, DAC_VREF_NEG_INPUT)
+ MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT)
+MACHINE_CONFIG_END
-void redline_state::redline(machine_config &config)
-{
+MACHINE_CONFIG_START(redline_state::redline)
leland(config);
/* basic machine hardware */
- m_master->set_addrmap(AS_IO, &redline_state::master_redline_map_io);
+ MCFG_DEVICE_MODIFY("master")
+ MCFG_DEVICE_IO_MAP(master_redline_map_io)
/* sound hardware */
- REDLINE_80186(config, m_sound, 0);
-}
+ MCFG_DEVICE_ADD(m_sound, REDLINE_80186, 0)
+MACHINE_CONFIG_END
-void redline_state::quarterb(machine_config &config)
-{
+MACHINE_CONFIG_START(redline_state::quarterb)
redline(config);
/* sound hardware */
- LELAND_80186(config.replace(), m_sound, 0);
-}
+ MCFG_DEVICE_REPLACE(m_sound, LELAND_80186, 0)
+MACHINE_CONFIG_END
-void redline_state::lelandi(machine_config &config)
-{
+MACHINE_CONFIG_START(redline_state::lelandi)
quarterb(config);
/* basic machine hardware */
- m_slave->set_addrmap(AS_PROGRAM, &redline_state::slave_large_map_program);
-}
+ MCFG_DEVICE_MODIFY("slave")
+ MCFG_DEVICE_PROGRAM_MAP(slave_large_map_program)
+MACHINE_CONFIG_END
-void ataxx_state::ataxx(machine_config &config)
-{
+MACHINE_CONFIG_START(ataxx_state::ataxx)
+
/* basic machine hardware */
- Z80(config, m_master, 6000000);
- m_master->set_addrmap(AS_PROGRAM, &ataxx_state::master_map_program_2);
- m_master->set_addrmap(AS_IO, &ataxx_state::master_map_io_2);
+ MCFG_DEVICE_ADD(m_master, Z80, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(master_map_program_2)
+ MCFG_DEVICE_IO_MAP(master_map_io_2)
- Z80(config, m_slave, 6000000);
- m_slave->set_addrmap(AS_PROGRAM, &ataxx_state::slave_map_program);
- m_slave->set_addrmap(AS_IO, &ataxx_state::slave_map_io_2);
+ MCFG_DEVICE_ADD(m_slave, Z80, 6000000)
+ MCFG_DEVICE_PROGRAM_MAP(slave_map_program)
+ MCFG_DEVICE_IO_MAP(slave_map_io_2)
EEPROM_93C56_16BIT(config, m_eeprom, eeprom_serial_streaming::ENABLE);
@@ -1070,16 +1069,15 @@ void ataxx_state::ataxx(machine_config &config)
ataxx_video(config);
/* sound hardware */
- ATAXX_80186(config, m_sound, 0);
-}
+ MCFG_DEVICE_ADD(m_sound, ATAXX_80186, 0)
+MACHINE_CONFIG_END
-void ataxx_state::wsf(machine_config &config)
-{
+MACHINE_CONFIG_START(ataxx_state::wsf)
ataxx(config);
- WSF_80186(config.replace(), m_sound, 0);
-}
+ MCFG_DEVICE_REPLACE(m_sound, WSF_80186, 0)
+MACHINE_CONFIG_END