diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 3b1a1560b25f5..0108aa5b147ee 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -1896,6 +1896,8 @@ if (BUSES["ISA"]~=null) then MAME_DIR .. "src/devices/bus/isa/xsu_cards.h", MAME_DIR .. "src/devices/bus/isa/xtide.cpp", MAME_DIR .. "src/devices/bus/isa/xtide.h", + MAME_DIR .. "src/devices/bus/isa/zxbus_adapter.cpp", + MAME_DIR .. "src/devices/bus/isa/zxbus_adapter.h", } end diff --git a/src/devices/bus/isa/isa_cards.cpp b/src/devices/bus/isa/isa_cards.cpp index 786c9bf10107d..50db577cbfcc1 100644 --- a/src/devices/bus/isa/isa_cards.cpp +++ b/src/devices/bus/isa/isa_cards.cpp @@ -90,6 +90,7 @@ #include "finalchs.h" #include "hpblp.h" #include "opus100pm.h" +#include "zxbus_adapter.h" void pc_isa8_cards(device_slot_interface &device) @@ -148,6 +149,7 @@ void pc_isa8_cards(device_slot_interface &device) device.option_add("acb2072", ACB2072); device.option_add("3xtwin", ISA8_3XTWIN); device.option_add("opus108pm", ISA8_OPUS108PM); + device.option_add("zxbus_adapter", ISA8_ZXBUS); } void pc_isa16_cards(device_slot_interface &device) diff --git a/src/devices/bus/isa/zxbus_adapter.cpp b/src/devices/bus/isa/zxbus_adapter.cpp new file mode 100644 index 0000000000000..c65ea81bc74af --- /dev/null +++ b/src/devices/bus/isa/zxbus_adapter.cpp @@ -0,0 +1,28 @@ +// license:BSD-3-Clause +// copyright-holders:Andrei I. Holub +#include "emu.h" +#include "zxbus_adapter.h" + +DEFINE_DEVICE_TYPE(ISA8_ZXBUS, zxbus_adapter_device, "zxbus_adapter", "ISA8 to ZXBUS Adapter") + +zxbus_adapter_device::zxbus_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, ISA8_ZXBUS, tag, owner, clock) + , device_isa8_card_interface(mconfig, *this) + , m_isa_io_view(*this, "isa_io_view") + , m_zxbus(*this, "zxbus") +{ +} + +void zxbus_adapter_device::device_start() +{ + set_isa_device(); + m_isa->space(isa8_device::AS_ISA_IO).install_view(0x0000, 0xffff, m_isa_io_view); + m_zxbus->set_io_space(m_isa_io_view[0], m_isa_io_view[0]); + m_isa_io_view.select(0); +} + +void zxbus_adapter_device::device_add_mconfig(machine_config &config) +{ + ZXBUS(config, m_zxbus, 0); + ZXBUS_SLOT(config, "card", 0, m_zxbus, zxbus_cards, nullptr); +} diff --git a/src/devices/bus/isa/zxbus_adapter.h b/src/devices/bus/isa/zxbus_adapter.h new file mode 100644 index 0000000000000..00fd353e75af7 --- /dev/null +++ b/src/devices/bus/isa/zxbus_adapter.h @@ -0,0 +1,27 @@ +// license:BSD-3-Clause +// copyright-holders:Andrei I. Holub +#ifndef MAME_BUS_ISA_ZXBUS_ADAPTER_H +#define MAME_BUS_ISA_ZXBUS_ADAPTER_H + +#include "isa.h" + +#include "bus/spectrum/zxbus.h" + +class zxbus_adapter_device: public device_t, public device_isa8_card_interface +{ +public: + zxbus_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + +protected: + virtual void device_start() override ATTR_COLD; + virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; + +private: + memory_view m_isa_io_view; + required_device m_zxbus; + +}; + +DECLARE_DEVICE_TYPE(ISA8_ZXBUS, zxbus_adapter_device) + +#endif // MAME_BUS_ISA_ZXBUS_ADAPTER_H diff --git a/src/devices/bus/spectrum/nemoide.cpp b/src/devices/bus/spectrum/nemoide.cpp index 75c83bc31fe78..4aef90df5540f 100644 --- a/src/devices/bus/spectrum/nemoide.cpp +++ b/src/devices/bus/spectrum/nemoide.cpp @@ -21,12 +21,13 @@ class nemoide_device : public device_t, public device_zxbus_card_interface , m_ata(*this, "ata") { } + virtual void io_map(address_map &map) override ATTR_COLD; + protected: virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; virtual void device_start() override ATTR_COLD; private: - void map_io(address_map &map) ATTR_COLD; u8 ata_r(offs_t offset); void ata_w(offs_t offset, u8 data); @@ -51,7 +52,7 @@ void nemoide_device::ata_w(offs_t offset, u8 data) m_ata->cs0_w((offset >> 5) & 7, ata_data); } -void nemoide_device::map_io(address_map &map) +void nemoide_device::io_map(address_map &map) { map(0x0011, 0x0011).mirror(0xff00).lrw8(NAME([this]() { return m_ata_data_latch; }) , NAME([this](offs_t offset, u8 data) { m_ata_data_latch = data; })); @@ -74,8 +75,6 @@ void nemoide_device::device_add_mconfig(machine_config &config) void nemoide_device::device_start() { save_item(NAME(m_ata_data_latch)); - - m_zxbus->install_device(0x0000, 0xffff, *this, &nemoide_device::map_io); } } // anonymous namespace diff --git a/src/devices/bus/spectrum/neogs.cpp b/src/devices/bus/spectrum/neogs.cpp index 156c2e2895cc0..32fc939b5096d 100644 --- a/src/devices/bus/spectrum/neogs.cpp +++ b/src/devices/bus/spectrum/neogs.cpp @@ -85,6 +85,8 @@ class neogs_device : public device_t, public device_zxbus_card_interface , m_neogs_led(*this, "neogs_led") { } + virtual void io_map(address_map &map) override ATTR_COLD; + protected: // device_t implementation virtual void device_start() override ATTR_COLD; @@ -92,8 +94,6 @@ class neogs_device : public device_t, public device_zxbus_card_interface virtual const tiny_rom_entry *device_rom_region() const override ATTR_COLD; virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; - void neogsmap(address_map &map) ATTR_COLD; - INTERRUPT_GEN_MEMBER(irq0_line_assert); void map_memory(address_map &map) ATTR_COLD; @@ -438,7 +438,7 @@ const tiny_rom_entry *neogs_device::device_rom_region() const return ROM_NAME( neogs ); } -void neogs_device::neogsmap(address_map &map) +void neogs_device::io_map(address_map &map) { map(0x00bb, 0x00bb).mirror(0xff00).rw(FUNC(neogs_device::neogs_status_r), FUNC(neogs_device::neogs_command_w)); map(0x00b3, 0x00b3).mirror(0xff00).rw(FUNC(neogs_device::neogs_data_r), FUNC(neogs_device::neogs_data_w)); @@ -466,8 +466,6 @@ void neogs_device::device_start() } }); - m_zxbus->install_device(0x0000, 0xffff, *this, &neogs_device::neogsmap); - m_neogs_led.resolve(); save_item(NAME(m_data_in)); diff --git a/src/devices/bus/spectrum/smuc.cpp b/src/devices/bus/spectrum/smuc.cpp index d2ac18278a449..f44cb7a6106d4 100644 --- a/src/devices/bus/spectrum/smuc.cpp +++ b/src/devices/bus/spectrum/smuc.cpp @@ -25,7 +25,7 @@ class smuc_device : public device_t, public device_zxbus_card_interface , m_ata(*this, "ata") { } - virtual void map_shadow_io(address_map &map) override ATTR_COLD; + virtual void shadow_io_map(address_map &map) override ATTR_COLD; protected: virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; @@ -33,8 +33,6 @@ class smuc_device : public device_t, public device_zxbus_card_interface virtual void device_reset() override ATTR_COLD; private: - void map_io(address_map &map) ATTR_COLD {} - void port_ffba_w(offs_t offset, u8 data); u8 ata_r(offs_t offset); void ata_w(offs_t offset, u8 data); @@ -83,7 +81,7 @@ void smuc_device::ata_w(offs_t offset, u8 data) m_ata->cs0_w(ata_offset, ata_data); } -void smuc_device::map_shadow_io(address_map &map) +void smuc_device::shadow_io_map(address_map &map) { map(0x18a2, 0x18a2).mirror(0x4718) // 5fba | 0x011xxx101xx010 | Version: 2 .lr8(NAME([]() { return 0x40; })); @@ -125,8 +123,6 @@ void smuc_device::device_start() save_item(NAME(m_port_7fba_data)); save_item(NAME(m_port_ffba_data)); save_item(NAME(m_ide_hi)); - - m_zxbus->install_device(0x0000, 0xffff, *this, &smuc_device::map_io); } void smuc_device::device_reset() diff --git a/src/devices/bus/spectrum/zxbus.cpp b/src/devices/bus/spectrum/zxbus.cpp index ac5e83436ddac..67beb56fb3752 100644 --- a/src/devices/bus/spectrum/zxbus.cpp +++ b/src/devices/bus/spectrum/zxbus.cpp @@ -40,8 +40,8 @@ zxbus_device::zxbus_device(const machine_config &mconfig, const char *tag, devic zxbus_device::zxbus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : device_t(mconfig, type, tag, owner, clock) - , m_iospace(*this, finder_base::DUMMY_TAG, -1) - , m_shadow_io_view(nullptr) + , m_io(nullptr) + , m_shadow_io(nullptr) { } @@ -52,10 +52,14 @@ void zxbus_device::device_start() void zxbus_device::add_slot(zxbus_slot_device &slot) { m_slot_list.push_front(&slot); - if (m_shadow_io_view) + + device_zxbus_card_interface *card = slot.get_card_device(); + if (card) { - device_zxbus_card_interface *dev = slot.get_card_device(); - (*m_shadow_io_view).install_device(0x0000, 0xffff, *dev, &device_zxbus_card_interface::map_shadow_io); + if (m_io) + m_io->install_device(0x0000, 0xffff, *card, &device_zxbus_card_interface::io_map); + if (m_shadow_io) + m_shadow_io->install_device(0x0000, 0xffff, *card, &device_zxbus_card_interface::shadow_io_map); } } @@ -65,11 +69,6 @@ device_zxbus_card_interface::device_zxbus_card_interface(const machine_config &m { } -void zxbus_device::install_shadow_io(memory_view::memory_view_entry &io_view) -{ - m_shadow_io_view = &io_view; -} - void device_zxbus_card_interface::interface_pre_start() { if (!m_zxbus) diff --git a/src/devices/bus/spectrum/zxbus.h b/src/devices/bus/spectrum/zxbus.h index ddaa176cf9e54..5caa0f023ef07 100644 --- a/src/devices/bus/spectrum/zxbus.h +++ b/src/devices/bus/spectrum/zxbus.h @@ -85,14 +85,13 @@ class zxbus_device : public device_t public: zxbus_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); - template void set_iospace(T &&tag, int spacenum) { m_iospace.set_tag(std::forward(tag), spacenum); } - template void install_device(offs_t addrstart, offs_t addrend, T &device, void (T::*map)(class address_map &map), u64 unitmask = ~u64(0)) + void set_io_space(address_space_installer &io, address_space_installer &shadow_io) { - m_iospace->install_device(addrstart, addrend, device, map, unitmask); + m_io = &io; + m_shadow_io = &shadow_io; } void add_slot(zxbus_slot_device &slot); - void install_shadow_io(memory_view::memory_view_entry &io_view); protected: zxbus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); @@ -100,8 +99,8 @@ class zxbus_device : public device_t virtual void device_start() override ATTR_COLD; private: - required_address_space m_iospace; - memory_view::memory_view_entry *m_shadow_io_view; + address_space_installer *m_io; + address_space_installer *m_shadow_io; std::forward_list m_slot_list; }; @@ -114,7 +113,8 @@ class device_zxbus_card_interface : public device_interface friend class zxbus_slot_device; public: - virtual void map_shadow_io(address_map &map) ATTR_COLD {} + virtual void io_map(address_map &map) ATTR_COLD {} + virtual void shadow_io_map(address_map &map) ATTR_COLD {} protected: device_zxbus_card_interface(const machine_config &mconfig, device_t &device); diff --git a/src/mame/sinclair/pentevo.cpp b/src/mame/sinclair/pentevo.cpp index c1ac00173682c..023172734162d 100644 --- a/src/mame/sinclair/pentevo.cpp +++ b/src/mame/sinclair/pentevo.cpp @@ -158,7 +158,7 @@ void pentevo_state::atm_update_io() { if (BIT(m_port_bf_data, 0) || is_dos_active()) { - m_io_view.select(0); + m_io_view.select(1); if (m_beta_drive_selected && m_beta_drive_virtual == m_beta_drive_selected) m_io_dos_view.disable(); else @@ -168,7 +168,7 @@ void pentevo_state::atm_update_io() } else { - m_io_view.disable(); + m_io_view.select(0); if (BIT(m_port_eff7_data, 7)) m_glukrs->enable(); else @@ -623,28 +623,32 @@ void pentevo_state::pentevo_io(address_map &map) map(0xffdf, 0xffdf).lr8(NAME([this]() -> u8 { return ~m_io_mouse[1]->read(); })); map(0x001f, 0x001f).mirror(0xff00).lr8(NAME([]() -> u8 { return 0x00; })); // TODO Kepmston Joystick - // PORTS: Shadow map(0x0000, 0xffff).view(m_io_view); - m_io_view[0](0x0000, 0xffff).view(m_io_dos_view); + m_io_view[0]; + + // PORTS: Shadow + m_io_view[1](0x0000, 0xffff).view(m_io_dos_view); m_io_dos_view[0](0x001f, 0x001f).mirror(0xff00).rw(m_beta, FUNC(beta_disk_device::status_r), FUNC(beta_disk_device::command_w)); m_io_dos_view[0](0x003f, 0x003f).mirror(0xff00).rw(m_beta, FUNC(beta_disk_device::track_r), FUNC(beta_disk_device::track_w)); m_io_dos_view[0](0x005f, 0x005f).mirror(0xff00).rw(m_beta, FUNC(beta_disk_device::sector_r), FUNC(beta_disk_device::sector_w)); m_io_dos_view[0](0x007f, 0x007f).mirror(0xff00).rw(m_beta, FUNC(beta_disk_device::data_r), FUNC(beta_disk_device::data_w)); m_io_dos_view[0](0x00ff, 0x00ff).select(0xff00).r(m_beta, FUNC(beta_disk_device::state_r)); - m_io_view[0](0x00ff, 0x00ff).select(0xff00).w(FUNC(pentevo_state::atm_port_ff_w)); - m_io_view[0](0x0077, 0x0077).select(0xff00).lr8(NAME([]() { return 0xff; })).w(FUNC(pentevo_state::atm_port_77_w)); - m_io_view[0](0x3ff7, 0x3ff7).select(0xc000).w(FUNC(pentevo_state::atm_port_f7_w)); // ATM - m_io_view[0](0x37f7, 0x37f7).select(0xc000).w(FUNC(pentevo_state::pentevo_port_7f7_w)); // PENTEVO - m_io_view[0](0x3bf7, 0x3bf7).select(0xc000).w(FUNC(pentevo_state::pentevo_port_bf7_w)); // RO + m_io_view[1](0x00ff, 0x00ff).select(0xff00).w(FUNC(pentevo_state::atm_port_ff_w)); + m_io_view[1](0x0077, 0x0077).select(0xff00).lr8(NAME([]() { return 0xff; })).w(FUNC(pentevo_state::atm_port_77_w)); + m_io_view[1](0x3ff7, 0x3ff7).select(0xc000).w(FUNC(pentevo_state::atm_port_f7_w)); // ATM + m_io_view[1](0x37f7, 0x37f7).select(0xc000).w(FUNC(pentevo_state::pentevo_port_7f7_w)); // PENTEVO + m_io_view[1](0x3bf7, 0x3bf7).select(0xc000).w(FUNC(pentevo_state::pentevo_port_bf7_w)); // RO // SPI - m_io_view[0](0x0057, 0x0057).select(0xff00) + m_io_view[1](0x0057, 0x0057).select(0xff00) .lw8(NAME([this](offs_t offset, u8 data) { if (BIT(offset, 15)) spi_port_77_w(offset, data); else spi_port_57_w(offset, data); })); // Gluk - m_io_view[0](0xdef7, 0xdef7).lw8(NAME([this](offs_t offset, u8 data) { m_glukrs->address_w(data); } )); - m_io_view[0](0xbef7, 0xbef7).rw(FUNC(pentevo_state::gluk_data_r), FUNC(pentevo_state::gluk_data_w)); + m_io_view[1](0xdef7, 0xdef7).lw8(NAME([this](offs_t offset, u8 data) { m_glukrs->address_w(data); } )); + m_io_view[1](0xbef7, 0xbef7).rw(FUNC(pentevo_state::gluk_data_r), FUNC(pentevo_state::gluk_data_w)); + + subdevice("zxbus")->set_io_space(m_io_view[0], m_io_view[1]); } void pentevo_state::init_mem_write() @@ -786,8 +790,7 @@ void pentevo_state::pentevo(machine_config &config) AT_KEYB(config, m_keyboard, pc_keyboard_device::KEYBOARD_TYPE::AT, 3); zxbus_device &zxbus(ZXBUS(config, "zxbus", 0)); - zxbus.set_iospace("maincpu", AS_IO); - ZXBUS_SLOT(config, "zxbus1", 0, "zxbus", zxbus_cards, nullptr); + ZXBUS_SLOT(config, "zxbus1", 0, zxbus, zxbus_cards, nullptr); } diff --git a/src/mame/sinclair/scorpion.cpp b/src/mame/sinclair/scorpion.cpp index 97f37fdaa2d95..56f322cdddaa5 100644 --- a/src/mame/sinclair/scorpion.cpp +++ b/src/mame/sinclair/scorpion.cpp @@ -243,10 +243,7 @@ void scorpion_state::update_io(bool dos_enable) scorpion_update_memory(); - if (dos()) - m_io_shadow_view.select(0); - else - m_io_shadow_view.disable(); + m_io_shadow_view.select(dos() ? 1 : 0); } u8 scorpion_state::port_ff_r() @@ -337,10 +334,7 @@ void scorpion_state::scorpion_mem(address_map &map) void scorpion_state::scorpion_io(address_map &map) { map.unmap_value_high(); - map(0x0022, 0x0022).select(0xffdc) // FE | xxxxxxxxxx1xxx10 - .rw(FUNC(scorpion_state::spectrum_ula_r), FUNC(scorpion_state::spectrum_ula_w)); - map(0x0023, 0x0023).mirror(0xffdc) // FF | xxxxxxxxxx1xxx11 - .r(FUNC(scorpion_state::port_ff_r)); + map(0x0021, 0x0021).mirror(0x3fdc) // 1FFD | 00xxxxxxxx1xxx01 .w(FUNC(scorpion_state::port_1ffd_w)); map(0x4021, 0x4021).mirror(0x3fdc) // 7FFD | 01xxxxxxxx1xxx01 @@ -351,23 +345,28 @@ void scorpion_state::scorpion_io(address_map &map) map(0xe021, 0xe021).mirror(0x1fdc) // FFFD | 111xxxxxxx1xxx01 .lr8(NAME([this]() { return m_ay[m_ay_selected]->data_r(); })).w(FUNC(scorpion_state::ay_address_w)); - // Mouse - map(0xfadf, 0xfadf).lr8(NAME([this]() -> u8 { return 0x80 | (m_io_mouse[2]->read() & 0x07); })); - map(0xfbdf, 0xfbdf).lr8(NAME([this]() -> u8 { return m_io_mouse[0]->read(); })); - map(0xffdf, 0xffdf).lr8(NAME([this]() -> u8 { return ~m_io_mouse[1]->read(); })); - map(0x0003, 0x0003) // 1F | xxxxxxxx0x0xxx11 + map(0x0000, 0xffff).view(m_io_shadow_view); + + // !Shadow + m_io_shadow_view[0](0x0022, 0x0022).select(0xffdc) // FE | xxxxxxxxxx1xxx10 + .rw(FUNC(scorpion_state::spectrum_ula_r), FUNC(scorpion_state::spectrum_ula_w)); + m_io_shadow_view[0](0x0023, 0x0023).mirror(0xffdc) // FF | xxxxxxxxxx1xxx11 + .r(FUNC(scorpion_state::port_ff_r)); + m_io_shadow_view[0](0xfadf, 0xfadf).lr8(NAME([this]() -> u8 { return 0x80 | (m_io_mouse[2]->read() & 0x07); })); + m_io_shadow_view[0](0xfbdf, 0xfbdf).lr8(NAME([this]() -> u8 { return m_io_mouse[0]->read(); })); + m_io_shadow_view[0](0xffdf, 0xffdf).lr8(NAME([this]() -> u8 { return ~m_io_mouse[1]->read(); })); + m_io_shadow_view[0](0x0003, 0x0003) // 1F | xxxxxxxx0x0xxx11 .select(0xff5c).lr8(NAME([this]() -> u8 { return (m_beta->state_r() & 0xc0) | 0x00; })); // TODO Kepmston Joystick // Shadow // DOS + xxxxxxxx0nnxxx11 - map(0x0000, 0xffff).view(m_io_shadow_view); - m_io_shadow_view[0](0x0003, 0x0003).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::status_r), FUNC(beta_disk_device::command_w)); - m_io_shadow_view[0](0x0023, 0x0023).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::track_r), FUNC(beta_disk_device::track_w)); - m_io_shadow_view[0](0x0043, 0x0043).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::sector_r), FUNC(beta_disk_device::sector_w)); - m_io_shadow_view[0](0x0063, 0x0063).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::data_r), FUNC(beta_disk_device::data_w)); - m_io_shadow_view[0](0x00e3, 0x00e3).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::state_r), FUNC(beta_disk_device::param_w)); + m_io_shadow_view[1](0x0003, 0x0003).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::status_r), FUNC(beta_disk_device::command_w)); + m_io_shadow_view[1](0x0023, 0x0023).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::track_r), FUNC(beta_disk_device::track_w)); + m_io_shadow_view[1](0x0043, 0x0043).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::sector_r), FUNC(beta_disk_device::sector_w)); + m_io_shadow_view[1](0x0063, 0x0063).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::data_r), FUNC(beta_disk_device::data_w)); + m_io_shadow_view[1](0x00e3, 0x00e3).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::state_r), FUNC(beta_disk_device::param_w)); - subdevice("zxbus")->install_shadow_io(m_io_shadow_view[0]); + subdevice("zxbus")->set_io_space(m_io_shadow_view[0], m_io_shadow_view[1]); } void scorpion_state::scorpion_switch(address_map &map) @@ -531,9 +530,8 @@ void scorpion_state::scorpion(machine_config &config) config.device_remove("exp"); zxbus_device &zxbus(ZXBUS(config, "zxbus", 0)); - zxbus.set_iospace("maincpu", AS_IO); - ZXBUS_SLOT(config, "zxbus:1", 0, "zxbus", zxbus_gmx_cards, nullptr); - ZXBUS_SLOT(config, "zxbus:2", 0, "zxbus", zxbus_gmx_cards, nullptr); + ZXBUS_SLOT(config, "zxbus:1", 0, zxbus, zxbus_gmx_cards, nullptr); + ZXBUS_SLOT(config, "zxbus:2", 0, zxbus, zxbus_gmx_cards, nullptr); } void scorpion_state::profi(machine_config &config) diff --git a/src/mame/sinclair/specnext.cpp b/src/mame/sinclair/specnext.cpp index c34a162849456..fa9a025c51540 100644 --- a/src/mame/sinclair/specnext.cpp +++ b/src/mame/sinclair/specnext.cpp @@ -68,6 +68,7 @@ class specnext_state : public spectrum_128_state specnext_state(const machine_config &mconfig, device_type type, const char *tag) : spectrum_128_state(mconfig, type, tag) , m_maincpu(*this, "maincpu") + , m_io_shadow_view(*this, "io_shadow_view") , m_bank_boot_rom(*this, "bootrom") , m_bank_ram(*this, "bank_ram%u", 0U) , m_view0(*this, "mem_view0") @@ -289,6 +290,7 @@ class specnext_state : public spectrum_128_state memory_access<8, 0, 0, ENDIANNESS_LITTLE>::specific m_next_regs; memory_access<16, 0, 0, ENDIANNESS_LITTLE>::specific m_program; memory_access<16, 0, 0, ENDIANNESS_LITTLE>::specific m_io; + memory_view m_io_shadow_view; memory_bank_creator m_bank_boot_rom; memory_bank_array_creator<8> m_bank_ram; memory_view m_view0, m_view1, m_view2, m_view3, m_view4, m_view5, m_view6, m_view7; @@ -2755,6 +2757,10 @@ void specnext_state::map_io(address_map &map) if (m_nr_08_dac_en) m_dac[3]->data_w(data); })); + + map(0x0000, 0xffff).view(m_io_shadow_view); + subdevice("zxbus")->set_io_space(m_io_shadow_view[0], m_io_shadow_view[1]); + m_io_shadow_view.select(0); } void specnext_state::map_regs(address_map &map) @@ -3493,8 +3499,7 @@ void specnext_state::tbblue(machine_config &config) SPECNEXT_DIVMMC(config, m_divmmc, 0); zxbus_device &zxbus(ZXBUS(config, "zxbus", 0)); - zxbus.set_iospace("maincpu", AS_IO); - ZXBUS_SLOT(config, "zxbus:1", 0, "zxbus", zxbus_cards, nullptr); + ZXBUS_SLOT(config, "zxbus:1", 0, zxbus, zxbus_cards, nullptr); const rectangle scr_full = { SCR_320x256.left() - 16, SCR_320x256.right() + 16, SCR_320x256.top() - 8, SCR_320x256.bottom() + 8 }; m_screen->set_raw(28_MHz_XTAL / 2, CYCLES_HORIZ, CYCLES_VERT, scr_full); diff --git a/src/mame/sinclair/sprinter.cpp b/src/mame/sinclair/sprinter.cpp index 20fdadf96cce5..39a65c76a33d7 100644 --- a/src/mame/sinclair/sprinter.cpp +++ b/src/mame/sinclair/sprinter.cpp @@ -46,7 +46,6 @@ Sprinter Sp2000 (Peters Plus Ltd) #include "bus/pc_kbd/pc_kbdc.h" #include "bus/rs232/hlemouse.h" #include "bus/rs232/rs232.h" -#include "bus/spectrum/zxbus.h" #include "cpu/z80/z84c015.h" #include "machine/ds128x.h" #include "sound/ay8910.h" @@ -79,7 +78,7 @@ class sprinter_state : public spectrum_128_state sprinter_state(const machine_config &mconfig, device_type type, const char *tag) : spectrum_128_state(mconfig, type, tag) , m_maincpu(*this, "maincpu") - , m_isa(*this, "isa%u", 0U) + , m_isa(*this, "isa8%u", 0U) , m_rtc(*this, "rtc") , m_ata(*this, "ata%u", 1U) , m_beta(*this, BETA_DISK_TAG) @@ -1709,7 +1708,7 @@ INPUT_PORTS_START( sprinter ) PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("CAPS SHIFT") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1) PORT_CHAR(UCHAR_SHIFT_2) PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("z Z : LN BEEP COPY") PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') PORT_CHAR(':') PORT_CODE(KEYCODE_BACKSLASH) - PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("x X $ EXP INK CLEAR") PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') PORT_CHAR(U'£') + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("x X $ EXP INK CLEAR") PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X') PORT_CHAR('$') PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("c C ? LPRINT PAPER CONT") PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C') PORT_CHAR('?') PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("v V / LLIST FLASH CLS") PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V') PORT_CHAR('/') PORT_CODE(KEYCODE_SLASH) PORT_CODE(KEYCODE_SLASH_PAD) @@ -1893,13 +1892,11 @@ void sprinter_state::sprinter(machine_config &config) ISA8(config, m_isa[0], X_SP / 5); m_isa[0]->set_custom_spaces(); - zxbus_device &zxbus(ZXBUS(config, "zxbus", 0)); - zxbus.set_iospace(m_isa[0], isa8_device::AS_ISA_IO); - ZXBUS_SLOT(config, "zxbus2isa", 0, "zxbus", zxbus_cards, nullptr); + ISA8_SLOT(config, "isa0", 0, m_isa[0], pc_isa8_cards, "zxbus_adapter", false); ISA8(config, m_isa[1], X_SP / 5); m_isa[1]->set_custom_spaces(); - ISA8_SLOT(config, "isa8", 0, m_isa[1], pc_isa8_cards, nullptr, false); + ISA8_SLOT(config, "isa1", 0, m_isa[1], pc_isa8_cards, nullptr, false); m_screen->set_raw(X_SP / 3, SPRINT_WIDTH, SPRINT_HEIGHT, { 0, SPRINT_XVIS - 1, 0, SPRINT_YVIS - 1 }); m_screen->set_screen_update(FUNC(sprinter_state::screen_update)); diff --git a/src/mame/sinclair/tsconf.cpp b/src/mame/sinclair/tsconf.cpp index 5df2573f83007..194d05506da62 100644 --- a/src/mame/sinclair/tsconf.cpp +++ b/src/mame/sinclair/tsconf.cpp @@ -279,9 +279,8 @@ void tsconf_state::tsconf(machine_config &config) m_maincpu->set_vblank_int("screen", FUNC(tsconf_state::tsconf_vblank_interrupt)); zxbus_device &zxbus(ZXBUS(config, "zxbus", 0)); - zxbus.set_iospace("maincpu", AS_IO); - ZXBUS_SLOT(config, "zxbus1", 0, "zxbus", zxbus_cards, nullptr); - //ZXBUS_SLOT(config, "zxbus2", 0, "zxbus", zxbus_cards, nullptr); + ZXBUS_SLOT(config, "zxbus1", 0, zxbus, zxbus_cards, nullptr); + //ZXBUS_SLOT(config, "zxbus2", 0, zxbus, zxbus_cards, nullptr); m_ram->set_default_size("4096K");