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/electron/rombox.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/electron/rombox.cpp')
-rw-r--r-- | src/devices/bus/electron/rombox.cpp | 65 |
1 files changed, 34 insertions, 31 deletions
diff --git a/src/devices/bus/electron/rombox.cpp b/src/devices/bus/electron/rombox.cpp index 35f94b08d13..2ae1967c743 100644 --- a/src/devices/bus/electron/rombox.cpp +++ b/src/devices/bus/electron/rombox.cpp @@ -51,31 +51,36 @@ ioport_constructor electron_rombox_device::device_input_ports() const // device_add_mconfig - add device configuration //------------------------------------------------- -void electron_rombox_device::device_add_mconfig(machine_config &config) -{ +MACHINE_CONFIG_START(electron_rombox_device::device_add_mconfig) /* rom sockets */ - GENERIC_SOCKET(config, m_rom[0], generic_plain_slot, "electron_rom", "bin,rom"); - m_rom[0]->set_device_load(device_image_load_delegate(&electron_rombox_device::device_image_load_rom1_load, this)); - GENERIC_SOCKET(config, m_rom[1], generic_plain_slot, "electron_rom", "bin,rom"); - m_rom[1]->set_device_load(device_image_load_delegate(&electron_rombox_device::device_image_load_rom2_load, this)); - GENERIC_SOCKET(config, m_rom[2], generic_plain_slot, "electron_rom", "bin,rom"); - m_rom[2]->set_device_load(device_image_load_delegate(&electron_rombox_device::device_image_load_rom3_load, this)); - GENERIC_SOCKET(config, m_rom[3], generic_plain_slot, "electron_rom", "bin,rom"); - m_rom[3]->set_device_load(device_image_load_delegate(&electron_rombox_device::device_image_load_rom4_load, this)); - GENERIC_SOCKET(config, m_rom[4], generic_plain_slot, "electron_rom", "bin,rom"); - m_rom[4]->set_device_load(device_image_load_delegate(&electron_rombox_device::device_image_load_rom5_load, this)); - GENERIC_SOCKET(config, m_rom[5], generic_plain_slot, "electron_rom", "bin,rom"); - m_rom[5]->set_device_load(device_image_load_delegate(&electron_rombox_device::device_image_load_rom6_load, this)); - GENERIC_SOCKET(config, m_rom[6], generic_plain_slot, "electron_rom", "bin,rom"); - m_rom[6]->set_device_load(device_image_load_delegate(&electron_rombox_device::device_image_load_rom7_load, this)); - GENERIC_SOCKET(config, m_rom[7], generic_plain_slot, "electron_rom", "bin,rom"); - m_rom[7]->set_device_load(device_image_load_delegate(&electron_rombox_device::device_image_load_rom8_load, this)); + MCFG_GENERIC_SOCKET_ADD("rom1", generic_plain_slot, "electron_rom") + MCFG_GENERIC_EXTENSIONS("bin,rom") + MCFG_GENERIC_LOAD(electron_rombox_device, rom1_load) + MCFG_GENERIC_SOCKET_ADD("rom2", generic_plain_slot, "electron_rom") + MCFG_GENERIC_EXTENSIONS("bin,rom") + MCFG_GENERIC_LOAD(electron_rombox_device, rom2_load) + MCFG_GENERIC_SOCKET_ADD("rom3", generic_plain_slot, "electron_rom") + MCFG_GENERIC_EXTENSIONS("bin,rom") + MCFG_GENERIC_LOAD(electron_rombox_device, rom3_load) + MCFG_GENERIC_SOCKET_ADD("rom4", generic_plain_slot, "electron_rom") + MCFG_GENERIC_EXTENSIONS("bin,rom") + MCFG_GENERIC_LOAD(electron_rombox_device, rom4_load) + MCFG_GENERIC_SOCKET_ADD("rom5", generic_plain_slot, "electron_rom") + MCFG_GENERIC_EXTENSIONS("bin,rom") + MCFG_GENERIC_LOAD(electron_rombox_device, rom5_load) + MCFG_GENERIC_SOCKET_ADD("rom6", generic_plain_slot, "electron_rom") + MCFG_GENERIC_EXTENSIONS("bin,rom") + MCFG_GENERIC_LOAD(electron_rombox_device, rom6_load) + MCFG_GENERIC_SOCKET_ADD("rom7", generic_plain_slot, "electron_rom") + MCFG_GENERIC_EXTENSIONS("bin,rom") + MCFG_GENERIC_LOAD(electron_rombox_device, rom7_load) + MCFG_GENERIC_SOCKET_ADD("rom8", generic_plain_slot, "electron_rom") + MCFG_GENERIC_EXTENSIONS("bin,rom") + MCFG_GENERIC_LOAD(electron_rombox_device, rom8_load) /* pass-through */ - ELECTRON_EXPANSION_SLOT(config, m_exp, DERIVED_CLOCK(1, 1), electron_expansion_devices, nullptr); - m_exp->irq_handler().set(DEVICE_SELF_OWNER, FUNC(electron_expansion_slot_device::irq_w)); - m_exp->nmi_handler().set(DEVICE_SELF_OWNER, FUNC(electron_expansion_slot_device::nmi_w)); -} + MCFG_ELECTRON_PASSTHRU_EXPANSION_SLOT_ADD(nullptr) +MACHINE_CONFIG_END //************************************************************************** // LIVE DEVICE @@ -117,10 +122,8 @@ void electron_rombox_device::device_reset() // expbus_r - expansion data read //------------------------------------------------- -uint8_t electron_rombox_device::expbus_r(offs_t offset) +uint8_t electron_rombox_device::expbus_r(address_space &space, offs_t offset, uint8_t data) { - uint8_t data = 0xff; - if (offset >= 0x8000 && offset < 0xc000) { switch (m_romsel) @@ -131,7 +134,7 @@ uint8_t electron_rombox_device::expbus_r(offs_t offset) case 3: if (m_rom_base == 0 && m_rom[m_romsel + 4]->exists()) { - data = m_rom[m_romsel + 4]->read_rom(offset & 0x3fff); + data = m_rom[m_romsel + 4]->read_rom(space, offset & 0x3fff); } break; case 4: @@ -140,7 +143,7 @@ uint8_t electron_rombox_device::expbus_r(offs_t offset) case 7: if (m_rom[m_romsel - 4]->exists()) { - data = m_rom[m_romsel - 4]->read_rom(offset & 0x3fff); + data = m_rom[m_romsel - 4]->read_rom(space, offset & 0x3fff); } break; case 12: @@ -149,13 +152,13 @@ uint8_t electron_rombox_device::expbus_r(offs_t offset) case 15: if (m_rom_base == 12 && m_rom[m_romsel - 8]->exists()) { - data = m_rom[m_romsel - 8]->read_rom(offset & 0x3fff); + data = m_rom[m_romsel - 8]->read_rom(space, offset & 0x3fff); } break; } } - data &= m_exp->expbus_r(offset); + data &= m_exp->expbus_r(space, offset, data); return data; } @@ -164,9 +167,9 @@ uint8_t electron_rombox_device::expbus_r(offs_t offset) // expbus_w - expansion data write //------------------------------------------------- -void electron_rombox_device::expbus_w(offs_t offset, uint8_t data) +void electron_rombox_device::expbus_w(address_space &space, offs_t offset, uint8_t data) { - m_exp->expbus_w(offset, data); + m_exp->expbus_w(space, offset, data); if (offset == 0xfe05) { |