Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-30 16:00:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

bus/spectrum/zxbus.cpp: Use memory view instead of bank device for shadow IO handling (#13251)

Browse Source
This commit is contained in:
holub 2025-01-20 09:25:02 -05:00 committed by GitHub
parent 9359d54aee
commit 1191ca9d9c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 96 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/bus/spectrum/nemoide.cpp
View File

@ -53,10 +53,10 @@ void nemoide_device::ata_w(offs_t offset, u8 data)
void nemoide_device::map_io(address_map &map) void nemoide_device::map_io(address_map &map)
{ {
map(0x00011, 0x00011).mirror(0xff00).lrw8(NAME([this]() { return m_ata_data_latch; }) 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; })); , NAME([this](offs_t offset, u8 data) { m_ata_data_latch = data; }));
map(0x00010, 0x00010).select(0xffe0).rw(FUNC(nemoide_device::ata_r), FUNC(nemoide_device::ata_w)); map(0x0010, 0x0010).select(0xffe0).rw(FUNC(nemoide_device::ata_r), FUNC(nemoide_device::ata_w));
map(0x000c8, 0x000c8).mirror(0xff00).lrw8(NAME([this]() { return m_ata->cs1_r(6); }) map(0x00c8, 0x00c8).mirror(0xff00).lrw8(NAME([this]() { return m_ata->cs1_r(6); })
, NAME([this](offs_t offset, u8 data) { m_ata->cs1_w(6, data); })); , NAME([this](offs_t offset, u8 data) { m_ata->cs1_w(6, data); }));
} }
@ -75,7 +75,7 @@ void nemoide_device::device_start()
{ {
save_item(NAME(m_ata_data_latch)); save_item(NAME(m_ata_data_latch));
m_zxbus->install_device(0x00000, 0x1ffff, *this, &nemoide_device::map_io); m_zxbus->install_device(0x0000, 0xffff, *this, &nemoide_device::map_io);
} }
} // anonymous namespace } // anonymous namespace

6
src/devices/bus/spectrum/neogs.cpp
View File

@ -440,9 +440,9 @@ const tiny_rom_entry *neogs_device::device_rom_region() const
void neogs_device::neogsmap(address_map &map) void neogs_device::neogsmap(address_map &map)
{ {
map(0x000bb, 0x000bb).mirror(0xff00).rw(FUNC(neogs_device::neogs_status_r), FUNC(neogs_device::neogs_command_w)); map(0x00bb, 0x00bb).mirror(0xff00).rw(FUNC(neogs_device::neogs_status_r), FUNC(neogs_device::neogs_command_w));
map(0x000b3, 0x000b3).mirror(0xff00).rw(FUNC(neogs_device::neogs_data_r), FUNC(neogs_device::neogs_data_w)); map(0x00b3, 0x00b3).mirror(0xff00).rw(FUNC(neogs_device::neogs_data_r), FUNC(neogs_device::neogs_data_w));
map(0x00033, 0x00033).mirror(0xff00).w(FUNC(neogs_device::neogs_ctrl_w)); map(0x0033, 0x0033).mirror(0xff00).w(FUNC(neogs_device::neogs_ctrl_w));
} }
void neogs_device::device_start() void neogs_device::device_start()

25
src/devices/bus/spectrum/smuc.cpp
View File

@ -25,13 +25,15 @@ public:
, m_ata(*this, "ata") , m_ata(*this, "ata")
{ } { }
virtual void map_shadow_io(address_map &map) override ATTR_COLD;
protected: protected:
virtual void device_add_mconfig(machine_config &config) override ATTR_COLD; virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
virtual void device_start() override ATTR_COLD; virtual void device_start() override ATTR_COLD;
virtual void device_reset() override ATTR_COLD; virtual void device_reset() override ATTR_COLD;
private: private:
void map_io(address_map &map) ATTR_COLD; void map_io(address_map &map) ATTR_COLD {}
void port_ffba_w(offs_t offset, u8 data); void port_ffba_w(offs_t offset, u8 data);
u8 ata_r(offs_t offset); u8 ata_r(offs_t offset);
@ -81,26 +83,25 @@ void smuc_device::ata_w(offs_t offset, u8 data)
m_ata->cs0_w(ata_offset, ata_data); m_ata->cs0_w(ata_offset, ata_data);
} }
void smuc_device::map_shadow_io(address_map &map)
void smuc_device::map_io(address_map &map)
{ {
map(0x118a2, 0x118a2).mirror(0x4718) // 5fba | 0x011xxx101xx010 | Version: 2 map(0x18a2, 0x18a2).mirror(0x4718) // 5fba | 0x011xxx101xx010 | Version: 2
.lr8(NAME([]() { return 0x40; })); .lr8(NAME([]() { return 0x40; }));
map(0x118a6, 0x118a6).mirror(0x4718) // 5fbe | 0x011xxx101xx110 | Revision: 0 map(0x18a6, 0x18a6).mirror(0x4718) // 5fbe | 0x011xxx101xx110 | Revision: 0
.lr8(NAME([]() { return 0x28; })); .lr8(NAME([]() { return 0x28; }));
map(0x138a2, 0x138a2).mirror(0x4718) // 7fba | 0x111xxx101xx010 | VirtualFDD map(0x38a2, 0x38a2).mirror(0x4718) // 7fba | 0x111xxx101xx010 | VirtualFDD
.lrw8(NAME([this]() { return m_port_7fba_data | 0x37; }) .lrw8(NAME([this]() { return m_port_7fba_data | 0x37; })
, NAME([this](u8 data) { m_port_7fba_data = data; })); , NAME([this](u8 data) { m_port_7fba_data = data; }));
map(0x138a6, 0x138a6).mirror(0x4718) // 7[ef]be | 0x111xxN101xx110 | i8259 - absent in 2.0 map(0x38a6, 0x38a6).mirror(0x4718) // 7[ef]be | 0x111xxN101xx110 | i8259 - absent in 2.0
.lr8(NAME([]() { return 0x57; })).nopw(); .lr8(NAME([]() { return 0x57; })).nopw();
map(0x198a2, 0x198a2).mirror(0x4718) // dfba | 1x011xxx101xx010 | DS1685RTC map(0x98a2, 0x98a2).mirror(0x4718) // dfba | 1x011xxx101xx010 | DS1685RTC
.lrw8(NAME([this]() { return m_rtc->data_r(); }) .lrw8(NAME([this]() { return m_rtc->data_r(); })
, NAME([this](u8 data) { if (BIT(m_port_ffba_data, 7)) m_rtc->data_w(data); else m_rtc->address_w(data); })); , NAME([this](u8 data) { if (BIT(m_port_ffba_data, 7)) m_rtc->data_w(data); else m_rtc->address_w(data); }));
map(0x198a6, 0x198a6).mirror(0x4718) // d8be | 1x011xxx101xx110 | IDE-Hi map(0x98a6, 0x98a6).mirror(0x4718) // d8be | 1x011xxx101xx110 | IDE-Hi
.lrw8(NAME([this]() { return m_ide_hi; }), NAME([this](u8 data) { m_ide_hi = data; })); .lrw8(NAME([this]() { return m_ide_hi; }), NAME([this](u8 data) { m_ide_hi = data; }));
map(0x1b8a2, 0x1b8a2).mirror(0x4718) // ffba | 1x111xxx101xx010 | SYS map(0xb8a2, 0xb8a2).mirror(0x4718) // ffba | 1x111xxx101xx010 | SYS
.lr8(NAME([this]() { return m_eeprom->read_sda() ? 0xff : 0xbf; })).w(FUNC(smuc_device::port_ffba_w)); .lr8(NAME([this]() { return m_eeprom->read_sda() ? 0xff : 0xbf; })).w(FUNC(smuc_device::port_ffba_w));
map(0x1b8a6, 0x1b8a6).select(0x4718) // f[8-f]be | 1x111NNN101xx110 | IDE#1Fx/#3F6 map(0xb8a6, 0xb8a6).select(0x4718) // f[8-f]be | 1x111NNN101xx110 | IDE#1Fx/#3F6
.rw(FUNC(smuc_device::ata_r), FUNC(smuc_device::ata_w)); .rw(FUNC(smuc_device::ata_r), FUNC(smuc_device::ata_w));
} }
@ -125,7 +126,7 @@ void smuc_device::device_start()
save_item(NAME(m_port_ffba_data)); save_item(NAME(m_port_ffba_data));
save_item(NAME(m_ide_hi)); save_item(NAME(m_ide_hi));
m_zxbus->install_device(0x00000, 0x1ffff, *this, &smuc_device::map_io); m_zxbus->install_device(0x0000, 0xffff, *this, &smuc_device::map_io);
} }
void smuc_device::device_reset() void smuc_device::device_reset()

16
src/devices/bus/spectrum/zxbus.cpp
View File

@ -41,6 +41,7 @@ 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) 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) : device_t(mconfig, type, tag, owner, clock)
, m_iospace(*this, finder_base::DUMMY_TAG, -1) , m_iospace(*this, finder_base::DUMMY_TAG, -1)
, m_shadow_io_view(nullptr)
{ {
} }
@ -51,6 +52,11 @@ void zxbus_device::device_start()
void zxbus_device::add_slot(zxbus_slot_device &slot) void zxbus_device::add_slot(zxbus_slot_device &slot)
{ {
m_slot_list.push_front(&slot); m_slot_list.push_front(&slot);
if (m_shadow_io_view)
{
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);
}
} }
device_zxbus_card_interface::device_zxbus_card_interface(const machine_config &mconfig, device_t &device) device_zxbus_card_interface::device_zxbus_card_interface(const machine_config &mconfig, device_t &device)
@ -59,6 +65,11 @@ 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() void device_zxbus_card_interface::interface_pre_start()
{ {
if (!m_zxbus) if (!m_zxbus)
@ -74,5 +85,10 @@ void zxbus_cards(device_slot_interface &device)
{ {
device.option_add("nemoide", ZXBUS_NEMOIDE); device.option_add("nemoide", ZXBUS_NEMOIDE);
device.option_add("neogs", ZXBUS_NEOGS); device.option_add("neogs", ZXBUS_NEOGS);
}
void zxbus_gmx_cards(device_slot_interface &device)
{
zxbus_cards(device);
device.option_add("smuc", ZXBUS_SMUC); device.option_add("smuc", ZXBUS_SMUC);
} }

7
src/devices/bus/spectrum/zxbus.h
View File

@ -92,6 +92,7 @@ public:
} }
void add_slot(zxbus_slot_device &slot); void add_slot(zxbus_slot_device &slot);
void install_shadow_io(memory_view::memory_view_entry &io_view);
protected: protected:
zxbus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); zxbus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
@ -100,6 +101,7 @@ protected:
private: private:
required_address_space m_iospace; required_address_space m_iospace;
memory_view::memory_view_entry *m_shadow_io_view;
std::forward_list<zxbus_slot_device *> m_slot_list; std::forward_list<zxbus_slot_device *> m_slot_list;
}; };
@ -111,6 +113,9 @@ class device_zxbus_card_interface : public device_interface
{ {
friend class zxbus_slot_device; friend class zxbus_slot_device;
public:
virtual void map_shadow_io(address_map &map) ATTR_COLD {}
protected: protected:
device_zxbus_card_interface(const machine_config &mconfig, device_t &device); device_zxbus_card_interface(const machine_config &mconfig, device_t &device);
@ -123,6 +128,6 @@ protected:
void zxbus_cards(device_slot_interface &device); void zxbus_cards(device_slot_interface &device);
void zxbus_gmx_cards(device_slot_interface &device);
#endif // MAME_BUS_SPECTRUM_ZXBUS_H #endif // MAME_BUS_SPECTRUM_ZXBUS_H

103
src/mame/sinclair/scorpion.cpp
View File

@ -28,8 +28,8 @@ class scorpion_state : public spectrum_128_state
public: public:
scorpion_state(const machine_config &mconfig, device_type type, const char *tag) scorpion_state(const machine_config &mconfig, device_type type, const char *tag)
: spectrum_128_state(mconfig, type, tag) : spectrum_128_state(mconfig, type, tag)
, m_bankio(*this, "bankio")
, m_bank0_rom(*this, "bank0_rom") , m_bank0_rom(*this, "bank0_rom")
, m_io_shadow_view(*this, "io_shadow_view")
, m_beta(*this, BETA_DISK_TAG) , m_beta(*this, BETA_DISK_TAG)
, m_ay(*this, "ay%u", 0U) , m_ay(*this, "ay%u", 0U)
, m_io_mouse(*this, "mouse_input%u", 1U) , m_io_mouse(*this, "mouse_input%u", 1U)
@ -54,10 +54,9 @@ protected:
bool romram() const { return BIT(m_port_1ffd_data, 0); } bool romram() const { return BIT(m_port_1ffd_data, 0); }
bool rom1() const { return BIT(m_port_7ffd_data, 4); } bool rom1() const { return BIT(m_port_7ffd_data, 4); }
void scorpion_io(address_map &map) ATTR_COLD; virtual void scorpion_io(address_map &map) ATTR_COLD;
void scorpion_mem(address_map &map) ATTR_COLD; void scorpion_mem(address_map &map) ATTR_COLD;
void scorpion_switch(address_map &map) ATTR_COLD; void scorpion_switch(address_map &map) ATTR_COLD;
virtual void scorpion_ioext(address_map &map) ATTR_COLD;
u8 port_ff_r(); u8 port_ff_r();
void port_7ffd_w(u8 data); void port_7ffd_w(u8 data);
void port_1ffd_w(u8 data); void port_1ffd_w(u8 data);
@ -66,11 +65,11 @@ protected:
virtual rectangle get_screen_area() override; virtual rectangle get_screen_area() override;
virtual void scorpion_update_memory(); virtual void scorpion_update_memory();
virtual void do_nmi(); virtual void do_nmi();
void update_io(bool dos_enable);
memory_access<16, 0, 0, ENDIANNESS_LITTLE>::specific m_program; memory_access<16, 0, 0, ENDIANNESS_LITTLE>::specific m_program;
memory_access<17, 0, 0, ENDIANNESS_LITTLE>::specific m_ioext;
required_device<address_map_bank_device> m_bankio;
memory_view m_bank0_rom; memory_view m_bank0_rom;
memory_view m_io_shadow_view;
required_device<beta_disk_device> m_beta; required_device<beta_disk_device> m_beta;
required_device_array<ay8912_device, 2> m_ay; required_device_array<ay8912_device, 2> m_ay;
@ -106,7 +105,7 @@ protected:
virtual void machine_reset() override ATTR_COLD; virtual void machine_reset() override ATTR_COLD;
virtual void video_start() override ATTR_COLD; virtual void video_start() override ATTR_COLD;
virtual void scorpion_ioext(address_map &map) override ATTR_COLD; virtual void scorpion_io(address_map &map) override ATTR_COLD;
virtual void ay_address_w(u8 data) override; virtual void ay_address_w(u8 data) override;
virtual void scorpion_update_memory() override; virtual void scorpion_update_memory() override;
@ -136,7 +135,7 @@ protected:
virtual void machine_reset() override ATTR_COLD; virtual void machine_reset() override ATTR_COLD;
virtual void video_start() override ATTR_COLD; virtual void video_start() override ATTR_COLD;
virtual void scorpion_ioext(address_map &map) override ATTR_COLD; virtual void scorpion_io(address_map &map) override ATTR_COLD;
void global_cfg_w(u8 data); void global_cfg_w(u8 data);
u8 port_78fd_r(); u8 port_78fd_r();
u8 port_7afd_r(); u8 port_7afd_r();
@ -230,12 +229,26 @@ INPUT_CHANGED_MEMBER(scorpion_state::on_nmi)
void scorpion_state::do_nmi() void scorpion_state::do_nmi()
{ {
m_beta->enable(); update_io(true);
scorpion_update_memory();
m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
m_nmi_pending = 0; m_nmi_pending = 0;
} }
void scorpion_state::update_io(bool dos_enable)
{
if (dos_enable)
m_beta->enable();
else
m_beta->disable();
scorpion_update_memory();
if (dos())
m_io_shadow_view.select(0);
else
m_io_shadow_view.disable();
}
u8 scorpion_state::port_ff_r() u8 scorpion_state::port_ff_r()
{ {
if (m_magic_lock && !machine().side_effects_disabled()) if (m_magic_lock && !machine().side_effects_disabled())
@ -287,8 +300,7 @@ u8 scorpion_state::beta_enable_r(offs_t offset)
if (m_is_m1_even && (m_maincpu->total_cycles() & 1)) m_maincpu->eat_cycles(1); if (m_is_m1_even && (m_maincpu->total_cycles() & 1)) m_maincpu->eat_cycles(1);
if (!dos() && rom1()) if (!dos() && rom1())
{ {
m_beta->enable(); update_io(true);
scorpion_update_memory();
} }
} }
return m_program.read_byte(offset + 0x3d00); return m_program.read_byte(offset + 0x3d00);
@ -305,8 +317,7 @@ u8 scorpion_state::beta_disable_r(offs_t offset)
} }
else if (dos()) else if (dos())
{ {
m_beta->disable(); update_io(false);
scorpion_update_memory();
} }
} }
return m_program.read_byte(offset + 0x4000); return m_program.read_byte(offset + 0x4000);
@ -323,21 +334,21 @@ void scorpion_state::scorpion_mem(address_map &map)
map(0xc000, 0xffff).bankr(m_bank_ram[3]).w(FUNC(scorpion_state::spectrum_128_ram_w<3>)); map(0xc000, 0xffff).bankr(m_bank_ram[3]).w(FUNC(scorpion_state::spectrum_128_ram_w<3>));
} }
void scorpion_state::scorpion_ioext(address_map &map) void scorpion_state::scorpion_io(address_map &map)
{ {
map.unmap_value_high(); map.unmap_value_high();
map(0x0022, 0x0022).select(0xffdc) // FE | xxxxxxxxxx1xxx10 map(0x0022, 0x0022).select(0xffdc) // FE | xxxxxxxxxx1xxx10
.rw(FUNC(scorpion_state::spectrum_ula_r), FUNC(scorpion_state::spectrum_ula_w)); .rw(FUNC(scorpion_state::spectrum_ula_r), FUNC(scorpion_state::spectrum_ula_w));
map(0x0023, 0x0023).mirror(0xffdc) // FF | xxxxxxxxxx1xxx11 map(0x0023, 0x0023).mirror(0xffdc) // FF | xxxxxxxxxx1xxx11
.r(FUNC(scorpion_state::port_ff_r)); .r(FUNC(scorpion_state::port_ff_r));
map(0x0021, 0x0021).mirror(0x13fdc) // 1FFD | 00xxxxxxxx1xxx01 map(0x0021, 0x0021).mirror(0x3fdc) // 1FFD | 00xxxxxxxx1xxx01
.w(FUNC(scorpion_state::port_1ffd_w)); .w(FUNC(scorpion_state::port_1ffd_w));
map(0x4021, 0x4021).mirror(0x13fdc) // 7FFD | 01xxxxxxxx1xxx01 map(0x4021, 0x4021).mirror(0x3fdc) // 7FFD | 01xxxxxxxx1xxx01
.w(FUNC(scorpion_state::port_7ffd_w)); .w(FUNC(scorpion_state::port_7ffd_w));
map(0xa021, 0xa021).mirror(0x11fdc) // BFFD | 101xxxxxxx1xxx01 map(0xa021, 0xa021).mirror(0x1fdc) // BFFD | 101xxxxxxx1xxx01
.lw8(NAME([this](u8 data) { m_ay[m_ay_selected]->data_w(data); })); .lw8(NAME([this](u8 data) { m_ay[m_ay_selected]->data_w(data); }));
map(0xe021, 0xe021).mirror(0x11fdc) // FFFD | 111xxxxxxx1xxx01 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)); .lr8(NAME([this]() { return m_ay[m_ay_selected]->data_r(); })).w(FUNC(scorpion_state::ay_address_w));
// Mouse // Mouse
@ -349,18 +360,14 @@ void scorpion_state::scorpion_ioext(address_map &map)
// Shadow // Shadow
// DOS + xxxxxxxx0nnxxx11 // DOS + xxxxxxxx0nnxxx11
map(0x10003, 0x10003).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::status_r), FUNC(beta_disk_device::command_w)); map(0x0000, 0xffff).view(m_io_shadow_view);
map(0x10023, 0x10023).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::track_r), FUNC(beta_disk_device::track_w)); m_io_shadow_view[0](0x0003, 0x0003).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::status_r), FUNC(beta_disk_device::command_w));
map(0x10043, 0x10043).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::sector_r), FUNC(beta_disk_device::sector_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));
map(0x10063, 0x10063).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::data_r), FUNC(beta_disk_device::data_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));
map(0x100e3, 0x100e3).mirror(0xff1c).rw(m_beta, FUNC(beta_disk_device::state_r), FUNC(beta_disk_device::param_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));
void scorpion_state::scorpion_io(address_map &map) subdevice<zxbus_device>("zxbus")->install_shadow_io(m_io_shadow_view[0]);
{
map(0x0000, 0xffff).lrw8(
NAME([this](offs_t offset) { return m_ioext.read_byte((dos() << 16) | offset); }),
NAME([this](offs_t offset, u8 data) { m_ioext.write_byte((dos() << 16) | offset, data); }));
} }
void scorpion_state::scorpion_switch(address_map &map) void scorpion_state::scorpion_switch(address_map &map)
@ -381,7 +388,6 @@ void scorpion_state::machine_start()
save_item(NAME(m_ram_banks)); save_item(NAME(m_ram_banks));
m_maincpu->space(AS_PROGRAM).specific(m_program); m_maincpu->space(AS_PROGRAM).specific(m_program);
m_bankio->space(AS_PROGRAM).specific(m_ioext);
// reconfigure ROMs // reconfigure ROMs
memory_region *rom = memregion("maincpu"); memory_region *rom = memregion("maincpu");
@ -397,7 +403,6 @@ void scorpion_state::machine_reset()
m_nmi_pending = 0; m_nmi_pending = 0;
m_magic_lock = 0; m_magic_lock = 0;
m_ay_selected = 0; m_ay_selected = 0;
m_beta->disable();
m_port_fe_data = 255; m_port_fe_data = 255;
m_port_7ffd_data = 0; m_port_7ffd_data = 0;
@ -405,7 +410,7 @@ void scorpion_state::machine_reset()
m_bank_ram[2]->set_entry(2); m_bank_ram[2]->set_entry(2);
scorpion_update_memory(); update_io(false);
} }
void scorpion_state::video_start() void scorpion_state::video_start()
@ -525,12 +530,10 @@ void scorpion_state::scorpion(machine_config &config)
config.device_remove("exp"); config.device_remove("exp");
ADDRESS_MAP_BANK(config, m_bankio).set_map(&scorpion_state::scorpion_ioext).set_options(ENDIANNESS_LITTLE, 8, 17, 0);
zxbus_device &zxbus(ZXBUS(config, "zxbus", 0)); zxbus_device &zxbus(ZXBUS(config, "zxbus", 0));
zxbus.set_iospace(m_bankio, AS_PROGRAM); zxbus.set_iospace("maincpu", AS_IO);
ZXBUS_SLOT(config, "zxbus:1", 0, "zxbus", zxbus_cards, nullptr); ZXBUS_SLOT(config, "zxbus:1", 0, "zxbus", zxbus_gmx_cards, nullptr);
ZXBUS_SLOT(config, "zxbus:2", 0, "zxbus", zxbus_cards, nullptr); ZXBUS_SLOT(config, "zxbus:2", 0, "zxbus", zxbus_gmx_cards, nullptr);
} }
void scorpion_state::profi(machine_config &config) void scorpion_state::profi(machine_config &config)
@ -648,14 +651,14 @@ void scorpiontb_state::video_start()
}); });
} }
void scorpiontb_state::scorpion_ioext(address_map &map) void scorpiontb_state::scorpion_io(address_map &map)
{ {
scorpion_state::scorpion_ioext(map); scorpion_state::scorpion_io(map);
map(0x0021, 0x0021).mirror(0x13fdc) // 1FFD | 00xxxxxxxx1xxx01 map(0x0021, 0x0021).mirror(0x3fdc) // 1FFD | 00xxxxxxxx1xxx01
.lr8(NAME([this](offs_t offset) -> u8 { m_turbo = 0; m_maincpu->set_clock_scale(1); return 0xff; })); .lr8(NAME([this](offs_t offset) -> u8 { m_turbo = 0; m_maincpu->set_clock_scale(1); return 0xff; }));
map(0x4021, 0x4021).mirror(0x13fdc) // 7FFD | 01xxxxxxxx1xxx01 map(0x4021, 0x4021).mirror(0x3fdc) // 7FFD | 01xxxxxxxx1xxx01
.lr8(NAME([this](offs_t offset) -> u8 { m_turbo = 1; m_maincpu->set_clock_scale(2); return 0xff; })); .lr8(NAME([this](offs_t offset) -> u8 { m_turbo = 1; m_maincpu->set_clock_scale(2); return 0xff; }));
map(0xe021, 0xe021).mirror(0x11fdc) // FFFD | 111xxxxxxx1xxx01 map(0xe021, 0xe021).mirror(0x1fdc) // FFFD | 111xxxxxxx1xxx01
.rw(FUNC(scorpiontb_state::ay_data_r), FUNC(scorpiontb_state::ay_address_w)); .rw(FUNC(scorpiontb_state::ay_data_r), FUNC(scorpiontb_state::ay_address_w));
// Centronics // Centronics
@ -873,20 +876,20 @@ void scorpiongmx_state::video_start()
scorpion_state::video_start(); scorpion_state::video_start();
} }
void scorpiongmx_state::scorpion_ioext(address_map &map) void scorpiongmx_state::scorpion_io(address_map &map)
{ {
scorpiontb_state::scorpion_ioext(map); scorpiontb_state::scorpion_io(map);
map(0x0000, 0x0000).mirror(0xff00).w(FUNC(scorpiongmx_state::global_cfg_w)); map(0x0000, 0x0000).mirror(0xff00).w(FUNC(scorpiongmx_state::global_cfg_w));
map(0x0000, 0x1ffff).view(m_io_gmx); map(0x0000, 0xffff).view(m_io_gmx);
m_io_gmx[0](0x78fd, 0x78fd).mirror(0x10000).r(FUNC(scorpiongmx_state::port_78fd_r)) m_io_gmx[0](0x78fd, 0x78fd).mirror(0x0000).r(FUNC(scorpiongmx_state::port_78fd_r))
.lw8(NAME([this](u8 data) { m_port_78fd_data = data & 0x7f; scorpion_update_memory(); })); .lw8(NAME([this](u8 data) { m_port_78fd_data = data & 0x7f; scorpion_update_memory(); }));
m_io_gmx[0](0x7afd, 0x7afd).mirror(0x10000).r(FUNC(scorpiongmx_state::port_7afd_r)) m_io_gmx[0](0x7afd, 0x7afd).mirror(0x0000).r(FUNC(scorpiongmx_state::port_7afd_r))
.lw8(NAME([this](u8 data) { m_scroll_lo = data & 0xf0; })); .lw8(NAME([this](u8 data) { m_scroll_lo = data & 0xf0; }));
m_io_gmx[0](0x7cfd, 0x7cfd).mirror(0x10000) m_io_gmx[0](0x7cfd, 0x7cfd).mirror(0x0000)
.lw8(NAME([this](u8 data) { m_scroll_hi = data & 0x3f; })); .lw8(NAME([this](u8 data) { m_scroll_hi = data & 0x3f; }));
m_io_gmx[0](0x7efd, 0x7efd).mirror(0x10000).rw(FUNC(scorpiongmx_state::port_7efd_r), FUNC(scorpiongmx_state::port_7efd_w)); m_io_gmx[0](0x7efd, 0x7efd).mirror(0x0000).rw(FUNC(scorpiongmx_state::port_7efd_r), FUNC(scorpiongmx_state::port_7efd_w));
m_io_gmx[0](0xdffd, 0xdffd).mirror(0x10000) m_io_gmx[0](0xdffd, 0xdffd).mirror(0x0000)
.lw8(NAME([this](u8 data) { m_port_dffd_data = data & 0x07; scorpion_update_memory(); })); .lw8(NAME([this](u8 data) { m_port_dffd_data = data & 0x07; scorpion_update_memory(); }));
} }

2
src/mame/sinclair/sprinter.cpp
View File

@ -1709,7 +1709,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(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_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_CODE(KEYCODE_BACKSLASH)
PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(u8"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(U'£')
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(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_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) PORT_CODE(KEYCODE_SLASH) PORT_CODE(KEYCODE_SLASH_PAD)