diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/mame/drivers/abc80x.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/mame/drivers/abc80x.cpp')
-rw-r--r-- | src/mame/drivers/abc80x.cpp | 89 |
1 files changed, 46 insertions, 43 deletions
diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp index 581c5ee516c..2b5f0279ba1 100644 --- a/src/mame/drivers/abc80x.cpp +++ b/src/mame/drivers/abc80x.cpp @@ -1049,7 +1049,7 @@ QUICKLOAD_LOAD_MEMBER( abc800_state, bac ) //************************************************************************** //------------------------------------------------- -// machine_config( common ) +// MACHINE_CONFIG( common ) //------------------------------------------------- MACHINE_CONFIG_START(abc800_state::common) @@ -1065,7 +1065,7 @@ MACHINE_CONFIG_START(abc800_state::common) m_ctc->zc_callback<1>().set(FUNC(abc800_state::ctc_z1_w)); m_ctc->zc_callback<2>().set(m_dart, FUNC(z80dart_device::rxca_w)); m_ctc->zc_callback<2>().append(m_dart, FUNC(z80dart_device::txca_w)); - TIMER(config, TIMER_CTC_TAG).configure_periodic(FUNC(abc800_state::ctc_tick), attotime::from_hz(ABC800_X01/2/2/2)); + MCFG_TIMER_DRIVER_ADD_PERIODIC(TIMER_CTC_TAG, abc800_state, ctc_tick, attotime::from_hz(ABC800_X01/2/2/2)) Z80SIO(config, m_sio, ABC800_X01/2/2); m_sio->out_txda_callback().set(RS232_B_TAG, FUNC(rs232_port_device::write_txd)); @@ -1083,9 +1083,9 @@ MACHINE_CONFIG_START(abc800_state::common) m_dart->out_txdb_callback().set(ABC_KEYBOARD_PORT_TAG, FUNC(abc_keyboard_port_device::txd_w)); m_dart->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0); - CASSETTE(config, m_cassette); - m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED); - TIMER(config, TIMER_CASSETTE_TAG).configure_periodic(FUNC(abc800_state::cassette_input_tick), attotime::from_hz(44100)); + MCFG_CASSETTE_ADD(CASSETTE_TAG) + MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_MUTED) + MCFG_TIMER_DRIVER_ADD_PERIODIC(TIMER_CASSETTE_TAG, abc800_state, cassette_input_tick, attotime::from_hz(44100)) rs232_port_device &rs232a(RS232_PORT(config, RS232_A_TAG, default_rs232_devices, nullptr)); rs232a.rxd_handler().set(m_dart, FUNC(z80dart_device::rxa_w)); @@ -1097,32 +1097,32 @@ MACHINE_CONFIG_START(abc800_state::common) rs232b.dcd_handler().set(m_sio, FUNC(z80sio_device::dcda_w)); rs232b.cts_handler().set(m_sio, FUNC(z80sio_device::ctsa_w)); - abc_keyboard_port_device &kb(ABC_KEYBOARD_PORT(config, ABC_KEYBOARD_PORT_TAG, abc_keyboard_devices, nullptr)); - kb.out_rx_handler().set(m_dart, FUNC(z80dart_device::rxb_w)); - kb.out_trxc_handler().set(m_dart, FUNC(z80dart_device::rxtxcb_w)); - kb.out_keydown_handler().set(m_dart, FUNC(z80dart_device::dcdb_w)); + MCFG_ABC_KEYBOARD_PORT_ADD(ABC_KEYBOARD_PORT_TAG, nullptr) + MCFG_ABC_KEYBOARD_OUT_RX_HANDLER(WRITELINE(m_dart, z80dart_device, rxb_w)) + MCFG_ABC_KEYBOARD_OUT_TRXC_HANDLER(WRITELINE(m_dart, z80dart_device, rxtxcb_w)) + MCFG_ABC_KEYBOARD_OUT_KEYDOWN_HANDLER(WRITELINE(m_dart, z80dart_device, dcdb_w)) - ABCBUS_SLOT(config, ABCBUS_TAG, ABC800_X01/2/2, abcbus_cards, nullptr); + MCFG_ABCBUS_SLOT_ADD(ABCBUS_TAG, abcbus_cards, nullptr) // sound hardware SPEAKER(config, "mono").front_center(); - DISCRETE(config, m_discrete, abc800_discrete).add_route(ALL_OUTPUTS, "mono", 0.80); + MCFG_DEVICE_ADD(DISCRETE_TAG, DISCRETE, abc800_discrete) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) // software list - SOFTWARE_LIST(config, "flop_list").set_original("abc800"); - SOFTWARE_LIST(config, "hdd_list").set_original("abc800_hdd"); + MCFG_SOFTWARE_LIST_ADD("flop_list", "abc800") + MCFG_SOFTWARE_LIST_ADD("hdd_list", "abc800_hdd") // quickload - MCFG_QUICKLOAD_ADD("quickload", abc800_state, bac, "bac", attotime::from_seconds(2)) + MCFG_QUICKLOAD_ADD("quickload", abc800_state, bac, "bac", 2) MACHINE_CONFIG_END //------------------------------------------------- -// machine_config( abc800c ) +// MACHINE_CONFIG( abc800c ) //------------------------------------------------- -void abc800c_state::abc800c(machine_config &config) -{ +MACHINE_CONFIG_START(abc800c_state::abc800c) common(config); // basic machine hardware @@ -1133,23 +1133,23 @@ void abc800c_state::abc800c(machine_config &config) abc800c_video(config); // peripheral hardware - abc_keyboard_port_device &kb(*subdevice<abc_keyboard_port_device>(ABC_KEYBOARD_PORT_TAG)); - kb.set_default_option("abc800"); - kb.set_fixed(true); + MCFG_DEVICE_MODIFY(ABC_KEYBOARD_PORT_TAG) + MCFG_SLOT_DEFAULT_OPTION("abc800") + MCFG_SLOT_FIXED(true) - subdevice<abcbus_slot_device>(ABCBUS_TAG)->set_default_option("abc830"); + MCFG_DEVICE_MODIFY(ABCBUS_TAG) + MCFG_SLOT_DEFAULT_OPTION("abc830") // internal ram RAM(config, RAM_TAG).set_default_size("16K").set_extra_options("32K"); -} +MACHINE_CONFIG_END //------------------------------------------------- -// machine_config( abc800m ) +// MACHINE_CONFIG( abc800m ) //------------------------------------------------- -void abc800m_state::abc800m(machine_config &config) -{ +MACHINE_CONFIG_START(abc800m_state::abc800m) common(config); // basic machine hardware @@ -1160,23 +1160,23 @@ void abc800m_state::abc800m(machine_config &config) abc800m_video(config); // peripheral hardware - abc_keyboard_port_device &kb(*subdevice<abc_keyboard_port_device>(ABC_KEYBOARD_PORT_TAG)); - kb.set_default_option("abc800"); - kb.set_fixed(true); + MCFG_DEVICE_MODIFY(ABC_KEYBOARD_PORT_TAG) + MCFG_SLOT_DEFAULT_OPTION("abc800") + MCFG_SLOT_FIXED(true) - subdevice<abcbus_slot_device>(ABCBUS_TAG)->set_default_option("abc830"); + MCFG_DEVICE_MODIFY(ABCBUS_TAG) + MCFG_SLOT_DEFAULT_OPTION("abc830") // internal ram RAM(config, RAM_TAG).set_default_size("16K").set_extra_options("32K"); -} +MACHINE_CONFIG_END //------------------------------------------------- -// machine_config( abc802 ) +// MACHINE_CONFIG( abc802 ) //------------------------------------------------- -void abc802_state::abc802(machine_config &config) -{ +MACHINE_CONFIG_START(abc802_state::abc802) common(config); // basic machine hardware @@ -1190,21 +1190,22 @@ void abc802_state::abc802(machine_config &config) m_dart->out_dtrb_callback().set(FUNC(abc802_state::lrs_w)); m_dart->out_rtsb_callback().set(FUNC(abc802_state::mux80_40_w)); - subdevice<abc_keyboard_port_device>(ABC_KEYBOARD_PORT_TAG)->set_default_option("abc55"); + MCFG_DEVICE_MODIFY(ABC_KEYBOARD_PORT_TAG) + MCFG_SLOT_DEFAULT_OPTION("abc55") - subdevice<abcbus_slot_device>(ABCBUS_TAG)->set_default_option("abc834"); + MCFG_DEVICE_MODIFY(ABCBUS_TAG) + MCFG_SLOT_DEFAULT_OPTION("abc834") // internal ram RAM(config, RAM_TAG).set_default_size("64K"); -} +MACHINE_CONFIG_END //------------------------------------------------- -// machine_config( abc806 ) +// MACHINE_CONFIG( abc806 ) //------------------------------------------------- -void abc806_state::abc806(machine_config &config) -{ +MACHINE_CONFIG_START(abc806_state::abc806) common(config); // basic machine hardware @@ -1219,16 +1220,18 @@ void abc806_state::abc806(machine_config &config) m_dart->out_dtrb_callback().set(FUNC(abc806_state::keydtr_w)); - subdevice<abc_keyboard_port_device>(ABC_KEYBOARD_PORT_TAG)->set_default_option("abc77"); + MCFG_DEVICE_MODIFY(ABC_KEYBOARD_PORT_TAG) + MCFG_SLOT_DEFAULT_OPTION("abc77") - subdevice<abcbus_slot_device>(ABCBUS_TAG)->set_default_option("abc832"); + MCFG_DEVICE_MODIFY(ABCBUS_TAG) + MCFG_SLOT_DEFAULT_OPTION("abc832") // internal ram RAM(config, RAM_TAG).set_default_size("160K").set_extra_options("544K"); // software list - SOFTWARE_LIST(config, "flop_list2").set_original("abc806"); -} + MCFG_SOFTWARE_LIST_ADD("flop_list2", "abc806") +MACHINE_CONFIG_END |