diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/ieee488/softbox.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/ieee488/softbox.cpp')
-rw-r--r-- | src/devices/bus/ieee488/softbox.cpp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/devices/bus/ieee488/softbox.cpp b/src/devices/bus/ieee488/softbox.cpp index e2041d3e4e2..63208f7ce9e 100644 --- a/src/devices/bus/ieee488/softbox.cpp +++ b/src/devices/bus/ieee488/softbox.cpp @@ -232,12 +232,11 @@ DEVICE_INPUT_DEFAULTS_END // device_add_mconfig - add device configuration //------------------------------------------------- -void softbox_device::device_add_mconfig(machine_config &config) -{ +MACHINE_CONFIG_START(softbox_device::device_add_mconfig) // basic machine hardware - Z80(config, m_maincpu, XTAL(8'000'000)/2); - m_maincpu->set_addrmap(AS_PROGRAM, &softbox_device::softbox_mem); - m_maincpu->set_addrmap(AS_IO, &softbox_device::softbox_io); + MCFG_DEVICE_ADD(Z80_TAG, Z80, XTAL(8'000'000)/2) + MCFG_DEVICE_PROGRAM_MAP(softbox_mem) + MCFG_DEVICE_IO_MAP(softbox_io) // devices i8251_device &i8251(I8251(config, I8251_TAG, 0)); @@ -265,13 +264,17 @@ void softbox_device::device_add_mconfig(machine_config &config) m_dbrg->fr_handler().set(I8251_TAG, FUNC(i8251_device::write_rxc)); m_dbrg->ft_handler().set(I8251_TAG, FUNC(i8251_device::write_txc)); - CORVUS_HDC(config, m_hdc, 0); - HARDDISK(config, "harddisk1", "corvus_hdd"); - HARDDISK(config, "harddisk2", "corvus_hdd"); - HARDDISK(config, "harddisk3", "corvus_hdd"); - HARDDISK(config, "harddisk4", "corvus_hdd"); - //imi7000_bus_device::add_config(config, "imi5000h", nullptr, nullptr, nullptr); -} + MCFG_DEVICE_ADD(m_hdc, CORVUS_HDC, 0) + MCFG_HARDDISK_ADD("harddisk1") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + MCFG_HARDDISK_ADD("harddisk2") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + MCFG_HARDDISK_ADD("harddisk3") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + MCFG_HARDDISK_ADD("harddisk4") + MCFG_HARDDISK_INTERFACE("corvus_hdd") + //MCFG_IMI7000_BUS_ADD("imi5000h", nullptr, nullptr, nullptr) +MACHINE_CONFIG_END //------------------------------------------------- @@ -378,6 +381,6 @@ void softbox_device::ieee488_ifc(int state) WRITE8_MEMBER( softbox_device::dbrg_w ) { - m_dbrg->str_w(data & 0x0f); - m_dbrg->stt_w(data >> 4); + m_dbrg->write_str(data & 0x0f); + m_dbrg->write_stt(data >> 4); } |