summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2019-02-19 07:05:57 -0500
committer AJR <ajrhacker@users.noreply.github.com>2019-02-19 07:06:31 -0500
commitb909c6e1a3ab844f2fb51f97e58f589dadf01643 (patch)
treeb268d713218235611ae1aca0e0dd2ee1aa8ca58c
parent75805ea2f09cf5aa4e0572a94da8599b62c3045a (diff)
mos6566, mos6581, bus/plus4: Eliminate address_space argument from handlers (nw)
-rw-r--r--src/devices/bus/acorn/atom/sid.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/beebsid.cpp4
-rw-r--r--src/devices/bus/isa/ssi2001.cpp2
-rw-r--r--src/devices/bus/plus4/c1551.cpp12
-rw-r--r--src/devices/bus/plus4/c1551.h4
-rw-r--r--src/devices/bus/plus4/exp.cpp8
-rw-r--r--src/devices/bus/plus4/exp.h12
-rw-r--r--src/devices/bus/plus4/sid.cpp10
-rw-r--r--src/devices/bus/plus4/sid.h4
-rw-r--r--src/devices/bus/plus4/std.cpp2
-rw-r--r--src/devices/bus/plus4/std.h2
-rw-r--r--src/devices/sound/mos6581.cpp4
-rw-r--r--src/devices/sound/mos6581.h4
-rw-r--r--src/devices/video/mos6566.cpp4
-rw-r--r--src/devices/video/mos6566.h4
-rw-r--r--src/mame/drivers/c128.cpp8
-rw-r--r--src/mame/drivers/c64.cpp8
-rw-r--r--src/mame/drivers/cbm2.cpp12
-rw-r--r--src/mame/drivers/plus4.cpp4
-rw-r--r--src/mame/drivers/vic10.cpp8
20 files changed, 59 insertions, 59 deletions
diff --git a/src/devices/bus/acorn/atom/sid.cpp b/src/devices/bus/acorn/atom/sid.cpp
index 950f4de2c58..8b5cd738cfe 100644
--- a/src/devices/bus/acorn/atom/sid.cpp
+++ b/src/devices/bus/acorn/atom/sid.cpp
@@ -55,5 +55,5 @@ void atom_sid_device::device_start()
{
address_space &space = m_bus->memspace();
- space.install_readwrite_handler(0xbdc0, 0xbddf, read8_delegate(FUNC(mos6581_device::read), m_sid.target()), write8_delegate(FUNC(mos6581_device::write), m_sid.target()));
+ space.install_readwrite_handler(0xbdc0, 0xbddf, read8sm_delegate(FUNC(mos6581_device::read), m_sid.target()), write8sm_delegate(FUNC(mos6581_device::write), m_sid.target()));
}
diff --git a/src/devices/bus/bbc/1mhzbus/beebsid.cpp b/src/devices/bus/bbc/1mhzbus/beebsid.cpp
index c0e6ea62c46..fe1fa7a876a 100644
--- a/src/devices/bus/bbc/1mhzbus/beebsid.cpp
+++ b/src/devices/bus/bbc/1mhzbus/beebsid.cpp
@@ -71,7 +71,7 @@ READ8_MEMBER(bbc_beebsid_device::fred_r)
if (offset >= 0x20 && offset < 0x40)
{
- data = m_sid->read(space, offset);
+ data = m_sid->read(offset);
}
data &= m_1mhzbus->fred_r(space, offset);
@@ -83,7 +83,7 @@ WRITE8_MEMBER(bbc_beebsid_device::fred_w)
{
if (offset >= 0x20 && offset < 0x40)
{
- m_sid->write(space, offset, data);
+ m_sid->write(offset, data);
}
m_1mhzbus->fred_w(space, offset, data);
diff --git a/src/devices/bus/isa/ssi2001.cpp b/src/devices/bus/isa/ssi2001.cpp
index 55adf04b0a2..2c433321847 100644
--- a/src/devices/bus/isa/ssi2001.cpp
+++ b/src/devices/bus/isa/ssi2001.cpp
@@ -30,7 +30,7 @@ void ssi2001_device::device_start()
{
set_isa_device();
m_isa->install_device(0x0200, 0x0207, read8_delegate(FUNC(pc_joy_device::joy_port_r), subdevice<pc_joy_device>("pc_joy")), write8_delegate(FUNC(pc_joy_device::joy_port_w), subdevice<pc_joy_device>("pc_joy")));
- m_isa->install_device(0x0280, 0x029F, read8_delegate(FUNC(mos6581_device::read), subdevice<mos6581_device>("sid6581")), write8_delegate(FUNC(mos6581_device::write), subdevice<mos6581_device>("sid6581")));
+ m_isa->install_device(0x0280, 0x029F, read8sm_delegate(FUNC(mos6581_device::read), subdevice<mos6581_device>("sid6581")), write8sm_delegate(FUNC(mos6581_device::write), subdevice<mos6581_device>("sid6581")));
}
diff --git a/src/devices/bus/plus4/c1551.cpp b/src/devices/bus/plus4/c1551.cpp
index 63cda307f2b..face01447a9 100644
--- a/src/devices/bus/plus4/c1551.cpp
+++ b/src/devices/bus/plus4/c1551.cpp
@@ -524,13 +524,13 @@ bool c1551_device::tpi1_selected(offs_t offset)
// plus4_cd_r - cartridge data read
//-------------------------------------------------
-uint8_t c1551_device::plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
+uint8_t c1551_device::plus4_cd_r(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
- data = m_exp->cd_r(space, offset, data, ba, cs0, c1l, c2l, cs1, c1h, c2h);
+ data = m_exp->cd_r(offset, data, ba, cs0, c1l, c2l, cs1, c1h, c2h);
if (tpi1_selected(offset))
{
- data = m_tpi1->read(space, offset & 0x07);
+ data = m_tpi1->read(machine().dummy_space(), offset & 0x07);
}
return data;
@@ -541,12 +541,12 @@ uint8_t c1551_device::plus4_cd_r(address_space &space, offs_t offset, uint8_t da
// plus4_cd_w - cartridge data write
//-------------------------------------------------
-void c1551_device::plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
+void c1551_device::plus4_cd_w(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
if (tpi1_selected(offset))
{
- m_tpi1->write(space, offset & 0x07, data);
+ m_tpi1->write(machine().dummy_space(), offset & 0x07, data);
}
- m_exp->cd_w(space, offset, data, ba, cs0, c1l, c2l, cs1, c1h, c2h);
+ m_exp->cd_w(offset, data, ba, cs0, c1l, c2l, cs1, c1h, c2h);
}
diff --git a/src/devices/bus/plus4/c1551.h b/src/devices/bus/plus4/c1551.h
index b108fc94ef1..fd84f7398a9 100644
--- a/src/devices/bus/plus4/c1551.h
+++ b/src/devices/bus/plus4/c1551.h
@@ -44,8 +44,8 @@ protected:
virtual ioport_constructor device_input_ports() const override;
// device_plus4_expansion_card_interface overrides
- virtual uint8_t plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
- virtual void plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
+ virtual uint8_t plus4_cd_r(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
+ virtual void plus4_cd_w(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
private:
DECLARE_READ8_MEMBER( port_r );
diff --git a/src/devices/bus/plus4/exp.cpp b/src/devices/bus/plus4/exp.cpp
index d9ee8642eba..83e8ad4277a 100644
--- a/src/devices/bus/plus4/exp.cpp
+++ b/src/devices/bus/plus4/exp.cpp
@@ -167,11 +167,11 @@ std::string plus4_expansion_slot_device::get_default_card_software(get_default_c
// cd_r - cartridge data read
//-------------------------------------------------
-uint8_t plus4_expansion_slot_device::cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
+uint8_t plus4_expansion_slot_device::cd_r(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
if (m_card != nullptr)
{
- data = m_card->plus4_cd_r(space, offset, data, ba, cs0, c1l, c1h, cs1, c2l, c2h);
+ data = m_card->plus4_cd_r(offset, data, ba, cs0, c1l, c1h, cs1, c2l, c2h);
}
return data;
@@ -182,11 +182,11 @@ uint8_t plus4_expansion_slot_device::cd_r(address_space &space, offs_t offset, u
// cd_w - cartridge data write
//-------------------------------------------------
-void plus4_expansion_slot_device::cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
+void plus4_expansion_slot_device::cd_w(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
if (m_card != nullptr)
{
- m_card->plus4_cd_w(space, offset, data, ba, cs0, c1l, c1h, cs1, c2l, c2h);
+ m_card->plus4_cd_w(offset, data, ba, cs0, c1l, c1h, cs1, c2l, c2h);
}
}
diff --git a/src/devices/bus/plus4/exp.h b/src/devices/bus/plus4/exp.h
index aa28eaf3b5d..9f625442d99 100644
--- a/src/devices/bus/plus4/exp.h
+++ b/src/devices/bus/plus4/exp.h
@@ -80,12 +80,12 @@ public:
auto aec_wr_callback() { return m_write_aec.bind(); }
// computer interface
- uint8_t cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h);
- void cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h);
+ uint8_t cd_r(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h);
+ void cd_w(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h);
// cartridge interface
- DECLARE_READ8_MEMBER( dma_cd_r ) { return m_read_dma_cd(offset); }
- DECLARE_WRITE8_MEMBER( dma_cd_w ) { m_write_dma_cd(offset, data); }
+ uint8_t dma_cd_r(offs_t offset) { return m_read_dma_cd(offset); }
+ void dma_cd_w(offs_t offset, uint8_t data) { m_write_dma_cd(offset, data); }
DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); }
DECLARE_WRITE_LINE_MEMBER( aec_w ) { m_write_aec(state); }
int phi2() { return clock(); }
@@ -133,8 +133,8 @@ public:
virtual ~device_plus4_expansion_card_interface();
// runtime
- virtual uint8_t plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) { return data; }
- virtual void plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) { }
+ virtual uint8_t plus4_cd_r(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) { return data; }
+ virtual void plus4_cd_w(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) { }
protected:
device_plus4_expansion_card_interface(const machine_config &mconfig, device_t &device);
diff --git a/src/devices/bus/plus4/sid.cpp b/src/devices/bus/plus4/sid.cpp
index c5c0f3421e0..1ebfdafd657 100644
--- a/src/devices/bus/plus4/sid.cpp
+++ b/src/devices/bus/plus4/sid.cpp
@@ -114,15 +114,15 @@ void plus4_sid_cartridge_device::device_reset()
// plus4_cd_r - cartridge data read
//-------------------------------------------------
-uint8_t plus4_sid_cartridge_device::plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
+uint8_t plus4_sid_cartridge_device::plus4_cd_r(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
if ((offset >= 0xfe80 && offset < 0xfea0) || (offset >= 0xfd40 && offset < 0xfd60))
{
- data = m_sid->read(space, offset & 0x1f);
+ data = m_sid->read(offset & 0x1f);
}
else if (offset >= 0xfd80 && offset < 0xfd90)
{
- data = m_joy->joy_r(space, 0);
+ data = m_joy->joy_r(machine().dummy_space(), 0);
}
return data;
@@ -133,11 +133,11 @@ uint8_t plus4_sid_cartridge_device::plus4_cd_r(address_space &space, offs_t offs
// plus4_cd_w - cartridge data write
//-------------------------------------------------
-void plus4_sid_cartridge_device::plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
+void plus4_sid_cartridge_device::plus4_cd_w(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
if ((offset >= 0xfe80 && offset < 0xfea0) || (offset >= 0xfd40 && offset < 0xfd60))
{
- m_sid->write(space, offset & 0x1f, data);
+ m_sid->write(offset & 0x1f, data);
}
}
diff --git a/src/devices/bus/plus4/sid.h b/src/devices/bus/plus4/sid.h
index 90a22fa15c8..1566381e6d2 100644
--- a/src/devices/bus/plus4/sid.h
+++ b/src/devices/bus/plus4/sid.h
@@ -40,8 +40,8 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
// device_plus4_expansion_card_interface overrides
- virtual uint8_t plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
- virtual void plus4_cd_w(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
+ virtual uint8_t plus4_cd_r(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
+ virtual void plus4_cd_w(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
virtual void plus4_breset_w(int state);
private:
diff --git a/src/devices/bus/plus4/std.cpp b/src/devices/bus/plus4/std.cpp
index 835ecac7d4a..c8efe4b679f 100644
--- a/src/devices/bus/plus4/std.cpp
+++ b/src/devices/bus/plus4/std.cpp
@@ -47,7 +47,7 @@ void plus4_standard_cartridge_device::device_start()
// plus4_cd_r - cartridge data read
//-------------------------------------------------
-uint8_t plus4_standard_cartridge_device::plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
+uint8_t plus4_standard_cartridge_device::plus4_cd_r(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h)
{
if (!c1l && m_c1l.bytes())
{
diff --git a/src/devices/bus/plus4/std.h b/src/devices/bus/plus4/std.h
index d154f0bcadc..f1f3ae75328 100644
--- a/src/devices/bus/plus4/std.h
+++ b/src/devices/bus/plus4/std.h
@@ -33,7 +33,7 @@ protected:
virtual void device_start() override;
// device_plus4_expansion_card_interface overrides
- virtual uint8_t plus4_cd_r(address_space &space, offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
+ virtual uint8_t plus4_cd_r(offs_t offset, uint8_t data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override;
};
diff --git a/src/devices/sound/mos6581.cpp b/src/devices/sound/mos6581.cpp
index 8648e86bbc9..2e4cb1f3cfd 100644
--- a/src/devices/sound/mos6581.cpp
+++ b/src/devices/sound/mos6581.cpp
@@ -119,7 +119,7 @@ void mos6581_device::sound_stream_update(sound_stream &stream, stream_sample_t *
// read -
//-------------------------------------------------
-READ8_MEMBER( mos6581_device::read )
+uint8_t mos6581_device::read(offs_t offset)
{
uint8_t data;
@@ -146,7 +146,7 @@ READ8_MEMBER( mos6581_device::read )
// write -
//-------------------------------------------------
-WRITE8_MEMBER( mos6581_device::write )
+void mos6581_device::write(offs_t offset, uint8_t data)
{
m_token->port_w(offset, data);
}
diff --git a/src/devices/sound/mos6581.h b/src/devices/sound/mos6581.h
index 95af2cbd687..68d319a45df 100644
--- a/src/devices/sound/mos6581.h
+++ b/src/devices/sound/mos6581.h
@@ -53,8 +53,8 @@ public:
auto potx() { return m_read_potx.bind(); }
auto poty() { return m_read_poty.bind(); }
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
protected:
mos6581_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t variant);
diff --git a/src/devices/video/mos6566.cpp b/src/devices/video/mos6566.cpp
index a7c9cb30422..b88cad06c64 100644
--- a/src/devices/video/mos6566.cpp
+++ b/src/devices/video/mos6566.cpp
@@ -2448,7 +2448,7 @@ uint32_t mos6566_device::screen_update(screen_device &screen, bitmap_rgb32 &bitm
// read -
//-------------------------------------------------
-READ8_MEMBER( mos6566_device::read )
+uint8_t mos6566_device::read(offs_t offset)
{
uint8_t val = 0;
@@ -2593,7 +2593,7 @@ READ8_MEMBER( mos6566_device::read )
// write -
//-------------------------------------------------
-WRITE8_MEMBER( mos6566_device::write )
+void mos6566_device::write(offs_t offset, uint8_t data)
{
DBG_LOG(2, "vic write", ("%.2x:%.2x\n", offset, data));
offset &= 0x3f;
diff --git a/src/devices/video/mos6566.h b/src/devices/video/mos6566.h
index 6f3a52dbab5..d1d7338e151 100644
--- a/src/devices/video/mos6566.h
+++ b/src/devices/video/mos6566.h
@@ -199,8 +199,8 @@ public:
virtual space_config_vector memory_space_config() const override;
- DECLARE_READ8_MEMBER( read );
- DECLARE_WRITE8_MEMBER( write );
+ uint8_t read(offs_t offset);
+ void write(offs_t offset, uint8_t data);
DECLARE_WRITE_LINE_MEMBER( lp_w );
diff --git a/src/mame/drivers/c128.cpp b/src/mame/drivers/c128.cpp
index 9a00a31a24d..a17eb633647 100644
--- a/src/mame/drivers/c128.cpp
+++ b/src/mame/drivers/c128.cpp
@@ -406,7 +406,7 @@ uint8_t c128_state::read_memory(address_space &space, offs_t offset, offs_t vma,
}
if (!BIT(plaout, PLA_OUT_VIC))
{
- data = m_vic->read(space, offset & 0x3f);
+ data = m_vic->read(offset & 0x3f);
}
if (!BIT(plaout, PLA_OUT_FROM1) && m_from->exists())
{
@@ -417,7 +417,7 @@ uint8_t c128_state::read_memory(address_space &space, offs_t offset, offs_t vma,
switch ((BIT(offset, 11) << 2) | ((offset >> 8) & 0x03))
{
case 0: // SID
- data = m_sid->read(space, offset & 0x1f);
+ data = m_sid->read(offset & 0x1f);
break;
case 2: // CS8563
@@ -494,14 +494,14 @@ void c128_state::write_memory(address_space &space, offs_t offset, offs_t vma, u
}
if (!BIT(plaout, PLA_OUT_VIC))
{
- m_vic->write(space, offset & 0x3f, data);
+ m_vic->write(offset & 0x3f, data);
}
if (!BIT(plaout, PLA_OUT_IOCS) && BIT(offset, 10))
{
switch ((BIT(offset, 11) << 2) | ((offset >> 8) & 0x03))
{
case 0: // SID
- m_sid->write(space, offset & 0x1f, data);
+ m_sid->write(offset & 0x1f, data);
break;
case 2: // CS8563
diff --git a/src/mame/drivers/c64.cpp b/src/mame/drivers/c64.cpp
index fe6912ce670..e2d38a6d515 100644
--- a/src/mame/drivers/c64.cpp
+++ b/src/mame/drivers/c64.cpp
@@ -332,14 +332,14 @@ uint8_t c64_state::read_memory(address_space &space, offs_t offset, offs_t va, i
case 1:
case 2:
case 3: // VIC
- data = m_vic->read(space, offset & 0x3f);
+ data = m_vic->read(offset & 0x3f);
break;
case 4:
case 5:
case 6:
case 7: // SID
- data = m_sid->read(space, offset & 0x1f);
+ data = m_sid->read(offset & 0x1f);
break;
case 0x8:
@@ -404,14 +404,14 @@ void c64_state::write_memory(address_space &space, offs_t offset, uint8_t data,
case 1:
case 2:
case 3: // VIC
- m_vic->write(space, offset & 0x3f, data);
+ m_vic->write(offset & 0x3f, data);
break;
case 4:
case 5:
case 6:
case 7: // SID
- m_sid->write(space, offset & 0x1f, data);
+ m_sid->write(offset & 0x1f, data);
break;
case 0x8:
diff --git a/src/mame/drivers/cbm2.cpp b/src/mame/drivers/cbm2.cpp
index e7bf8b228f8..072134fccd2 100644
--- a/src/mame/drivers/cbm2.cpp
+++ b/src/mame/drivers/cbm2.cpp
@@ -530,7 +530,7 @@ READ8_MEMBER( cbm2_state::read )
}
if (!sidcs)
{
- data = m_sid->read(space, offset & 0x1f);
+ data = m_sid->read(offset & 0x1f);
}
if (!extprtcs && m_ext_cia)
{
@@ -623,7 +623,7 @@ WRITE8_MEMBER( cbm2_state::write )
}
if (!sidcs)
{
- m_sid->write(space, offset & 0x1f, data);
+ m_sid->write(offset & 0x1f, data);
}
if (!extprtcs && m_ext_cia)
{
@@ -917,11 +917,11 @@ uint8_t p500_state::read_memory(address_space &space, offs_t offset, offs_t va,
}
if (!viccs && !viddaten && viddat_tr)
{
- data = m_vic->read(space, offset & 0x3f);
+ data = m_vic->read(offset & 0x3f);
}
if (!sidcs)
{
- data = m_sid->read(space, offset & 0x1f);
+ data = m_sid->read(offset & 0x1f);
}
if (!ciacs)
{
@@ -1005,11 +1005,11 @@ void p500_state::write_memory(address_space &space, offs_t offset, uint8_t data,
}
if (!viccs && !viddaten && !viddat_tr)
{
- m_vic->write(space, offset & 0x3f, data);
+ m_vic->write(offset & 0x3f, data);
}
if (!sidcs)
{
- m_sid->write(space, offset & 0x1f, data);
+ m_sid->write(offset & 0x1f, data);
}
if (!ciacs)
{
diff --git a/src/mame/drivers/plus4.cpp b/src/mame/drivers/plus4.cpp
index 2db9554bbea..9ff154aacdb 100644
--- a/src/mame/drivers/plus4.cpp
+++ b/src/mame/drivers/plus4.cpp
@@ -371,7 +371,7 @@ uint8_t plus4_state::read_memory(address_space &space, offs_t offset, int ba, in
data = m_ram->pointer()[offset & m_ram->mask()];
}
- return m_exp->cd_r(space, offset, data, ba, cs0, c1l, c1h, cs1, c2l, c2h);
+ return m_exp->cd_r(offset, data, ba, cs0, c1l, c1h, cs1, c2l, c2h);
}
@@ -431,7 +431,7 @@ WRITE8_MEMBER( plus4_state::write )
m_ram->pointer()[offset & m_ram->mask()] = data;
}
- m_exp->cd_w(space, offset, data, ba, cs0, c1l, c1h, cs1, c2l, c2h);
+ m_exp->cd_w(offset, data, ba, cs0, c1l, c1h, cs1, c2l, c2h);
}
diff --git a/src/mame/drivers/vic10.cpp b/src/mame/drivers/vic10.cpp
index 4434e1938b2..b3226566311 100644
--- a/src/mame/drivers/vic10.cpp
+++ b/src/mame/drivers/vic10.cpp
@@ -125,11 +125,11 @@ READ8_MEMBER( vic10_state::read )
}
else if (offset >= 0xd000 && offset < 0xd400)
{
- data = m_vic->read(space, offset & 0x3f);
+ data = m_vic->read(offset & 0x3f);
}
else if (offset >= 0xd400 && offset < 0xd800)
{
- data = m_sid->read(space, offset & 0x1f);
+ data = m_sid->read(offset & 0x1f);
}
else if (offset >= 0xd800 && offset < 0xdc00)
{
@@ -168,11 +168,11 @@ WRITE8_MEMBER( vic10_state::write )
}
else if (offset >= 0xd000 && offset < 0xd400)
{
- m_vic->write(space, offset & 0x3f, data);
+ m_vic->write(offset & 0x3f, data);
}
else if (offset >= 0xd400 && offset < 0xd800)
{
- m_sid->write(space, offset & 0x1f, data);
+ m_sid->write(offset & 0x1f, data);
}
else if (offset >= 0xd800 && offset < 0xdc00)
{