summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/interpro.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/interpro.cpp')
-rw-r--r--src/mame/drivers/interpro.cpp32
1 files changed, 20 insertions, 12 deletions
diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp
index 3f8dfe1d4a1..9fe4fba37bd 100644
--- a/src/mame/drivers/interpro.cpp
+++ b/src/mame/drivers/interpro.cpp
@@ -532,11 +532,11 @@ void interpro_state::interpro_common_map(address_map &map)
map(0x7f000400, 0x7f00040f).rw(m_scc1, FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)).umask32(0x000000ff);
map(0x7f000410, 0x7f00041f).rw(m_scc2, FUNC(z80scc_device::ba_cd_inv_r), FUNC(z80scc_device::ba_cd_inv_w)).umask32(0x000000ff);
map(0x7f000500, 0x7f000503).lrw8("rtc_rw",
- [this](address_space &space, offs_t offset, u8 mem_mask) {
- return m_rtc->read(space, offset^1, mem_mask);
+ [this](offs_t offset) {
+ return m_rtc->read(offset^1);
},
- [this](address_space &space, offs_t offset, u8 data, u8 mem_mask) {
- m_rtc->write(space, offset^1, data, mem_mask);
+ [this](offs_t offset, u8 data) {
+ m_rtc->write(offset^1, data);
}).umask32(0x000000ff);
map(0x7f000600, 0x7f000600).w(m_rtc, FUNC(mc146818_device::write));
@@ -778,10 +778,10 @@ void interpro_state::ioga(machine_config &config)
// ioga dma and serial dma channels
//m_ioga->dma_r_callback<0>().set(unknown); // plotter
- m_ioga->dma_r_callback<1>().set(INTERPRO_SCSI_DEVICE_TAG, FUNC(ncr53c90a_device::mdma_r));
- m_ioga->dma_w_callback<1>().set(INTERPRO_SCSI_DEVICE_TAG, FUNC(ncr53c90a_device::mdma_w));
- m_ioga->dma_r_callback<2>().set(m_fdc, FUNC(upd765_family_device::mdma_r));
- m_ioga->dma_w_callback<2>().set(m_fdc, FUNC(upd765_family_device::mdma_w));
+ m_ioga->dma_r_callback<1>().set(INTERPRO_SCSI_DEVICE_TAG, FUNC(ncr53c90a_device::dma_r));
+ m_ioga->dma_w_callback<1>().set(INTERPRO_SCSI_DEVICE_TAG, FUNC(ncr53c90a_device::dma_w));
+ m_ioga->dma_r_callback<2>().set(m_fdc, FUNC(upd765_family_device::dma_r));
+ m_ioga->dma_w_callback<2>().set(m_fdc, FUNC(upd765_family_device::dma_w));
m_ioga->serial_dma_r_callback<0>().set(m_scc2, FUNC(z80scc_device::db_r));
m_ioga->serial_dma_w_callback<0>().set(m_scc2, FUNC(z80scc_device::db_w));
m_ioga->serial_dma_r_callback<1>().set(m_scc1, FUNC(z80scc_device::da_r));
@@ -900,7 +900,9 @@ void emerald_state::emerald(machine_config &config)
ioga(config);
// srx bus
- SRX_BUS(config, m_bus, 0, m_maincpu);
+ SRX_BUS(config, m_bus, 0);
+ m_bus->set_main_space(m_maincpu, 0);
+ m_bus->set_io_space(m_maincpu, 1);
m_bus->out_irq0_cb().set(m_ioga, FUNC(interpro_ioga_device::ir3_w));
m_bus->out_irq1_cb().set(m_ioga, FUNC(interpro_ioga_device::ir4_w));
@@ -972,7 +974,9 @@ void turquoise_state::turquoise(machine_config &config)
ioga(config);
// cbus bus
- CBUS_BUS(config, m_bus, 0, m_maincpu);
+ CBUS_BUS(config, m_bus, 0);
+ m_bus->set_main_space(m_maincpu, 0);
+ m_bus->set_io_space(m_maincpu, 1);
m_bus->out_irq0_cb().set(m_ioga, FUNC(interpro_ioga_device::ir3_w));
m_bus->out_irq1_cb().set(m_ioga, FUNC(interpro_ioga_device::ir4_w));
@@ -1064,7 +1068,9 @@ void cbus_sapphire_state::cbus_sapphire(machine_config &config)
m_mse_port->state_func().set(m_ioga, FUNC(interpro_ioga_device::mouse_status_w));
// cbus bus
- CBUS_BUS(config, m_bus, 0, m_maincpu);
+ CBUS_BUS(config, m_bus, 0);
+ m_bus->set_main_space(m_maincpu, 0);
+ m_bus->set_io_space(m_maincpu, 1);
m_bus->out_irq0_cb().set(m_ioga, FUNC(interpro_ioga_device::ir3_w));
m_bus->out_irq1_cb().set(m_ioga, FUNC(interpro_ioga_device::ir4_w));
@@ -1077,7 +1083,9 @@ void srx_sapphire_state::srx_sapphire(machine_config &config)
sapphire(config);
// srx bus
- SRX_BUS(config, m_bus, 0, m_maincpu);
+ SRX_BUS(config, m_bus, 0);
+ m_bus->set_main_space(m_maincpu, 0);
+ m_bus->set_io_space(m_maincpu, 1);
m_bus->out_irq0_cb().set(m_ioga, FUNC(interpro_ioga_device::ir3_w));
m_bus->out_irq1_cb().set(m_ioga, FUNC(interpro_ioga_device::ir4_w));