Skip to content

Commit 5e2e259

Browse files
committed
isa done
1 parent 3ee33a7 commit 5e2e259

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

src/devices/bus/isa/zxbus_adapter.cpp

+3-9
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,12 @@ zxbus_adapter_device::zxbus_adapter_device(const machine_config &mconfig, const
1313
{
1414
}
1515

16-
void zxbus_adapter_device::map_io(address_map &map)
17-
{
18-
map.unmap_value_high();
19-
map(0x0000, 0xffff).view(m_isa_io_view);
20-
m_zxbus->set_io_space(m_isa_io_view[0], m_isa_io_view[0]);
21-
m_isa_io_view.select(0);
22-
}
23-
2416
void zxbus_adapter_device::device_start()
2517
{
2618
set_isa_device();
27-
m_isa->install_device(0x0000, 0xffff, *this, &zxbus_adapter_device::map_io);
19+
m_isa->space(isa8_device::AS_ISA_IO).install_view(0x0000, 0xffff, m_isa_io_view);
20+
m_zxbus->set_io_space(m_isa_io_view[0], m_isa_io_view[0]);
21+
m_isa_io_view.select(0);
2822
}
2923

3024
void zxbus_adapter_device::device_add_mconfig(machine_config &config)

src/devices/bus/isa/zxbus_adapter.h

-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ class zxbus_adapter_device: public device_t, public device_isa8_card_interface
1616
virtual void device_start() override ATTR_COLD;
1717
virtual void device_add_mconfig(machine_config &config) override ATTR_COLD;
1818

19-
void map_io(address_map &map) ATTR_COLD;
20-
2119
private:
2220
memory_view m_isa_io_view;
2321
required_device<zxbus_device> m_zxbus;

src/mame/sinclair/sprinter.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class sprinter_state : public spectrum_128_state
7878
sprinter_state(const machine_config &mconfig, device_type type, const char *tag)
7979
: spectrum_128_state(mconfig, type, tag)
8080
, m_maincpu(*this, "maincpu")
81-
, m_isa(*this, "isa8%u", 1U)
81+
, m_isa(*this, "isa8%u", 0U)
8282
, m_rtc(*this, "rtc")
8383
, m_ata(*this, "ata%u", 1U)
8484
, m_beta(*this, BETA_DISK_TAG)
@@ -1892,11 +1892,11 @@ void sprinter_state::sprinter(machine_config &config)
18921892

18931893
ISA8(config, m_isa[0], X_SP / 5);
18941894
m_isa[0]->set_custom_spaces();
1895-
ISA8_SLOT(config, "isa1", 0, m_isa[0], pc_isa8_cards, "zxbus_adapter", false);
1895+
ISA8_SLOT(config, "isa0", 0, m_isa[0], pc_isa8_cards, "zxbus_adapter", false);
18961896

18971897
ISA8(config, m_isa[1], X_SP / 5);
18981898
m_isa[1]->set_custom_spaces();
1899-
ISA8_SLOT(config, "isa2", 0, m_isa[1], pc_isa8_cards, nullptr, false);
1899+
ISA8_SLOT(config, "isa1", 0, m_isa[1], pc_isa8_cards, nullptr, false);
19001900

19011901
m_screen->set_raw(X_SP / 3, SPRINT_WIDTH, SPRINT_HEIGHT, { 0, SPRINT_XVIS - 1, 0, SPRINT_YVIS - 1 });
19021902
m_screen->set_screen_update(FUNC(sprinter_state::screen_update));

0 commit comments

Comments
 (0)