summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2019-02-01 09:24:46 -0500
committer AJR <ajrhacker@users.noreply.github.com>2019-02-01 09:24:58 -0500
commitb0e926586b5966160e2c0861132ccbeb3a35ebbd (patch)
tree027e83da4dce38cfd89465bc745dea304f86a8b9
parent83b1e31234aa2a9cc483a4c33d40bad1b523db19 (diff)
okim6376, pokey: Remove address_space and mem_mask arguments from read/write handlers (nw)
-rw-r--r--src/devices/bus/a7800/cpuwiz.h4
-rw-r--r--src/devices/bus/a7800/rom.cpp8
-rw-r--r--src/devices/bus/a7800/rom.h16
-rw-r--r--src/devices/bus/a7800/xboard.cpp8
-rw-r--r--src/devices/sound/okim6376.cpp2
-rw-r--r--src/devices/sound/okim6376.h2
-rw-r--r--src/devices/sound/pokey.cpp4
-rw-r--r--src/devices/sound/pokey.h4
-rw-r--r--src/mame/audio/atarijsa.cpp4
-rw-r--r--src/mame/drivers/atari400.cpp2
-rw-r--r--src/mame/drivers/bartop52.cpp2
-rw-r--r--src/mame/drivers/highvdeo.cpp16
-rw-r--r--src/mame/drivers/irobot.cpp4
-rw-r--r--src/mame/drivers/maxaflex.cpp2
-rw-r--r--src/mame/drivers/maygay1b.cpp2
-rw-r--r--src/mame/drivers/mhavoc.cpp8
-rw-r--r--src/mame/drivers/missile.cpp4
-rw-r--r--src/mame/drivers/starwars.cpp2
-rw-r--r--src/mame/machine/mpu4.cpp2
19 files changed, 43 insertions, 53 deletions
diff --git a/src/devices/bus/a7800/cpuwiz.h b/src/devices/bus/a7800/cpuwiz.h
index 1d9b33693d9..e9f52a24d4f 100644
--- a/src/devices/bus/a7800/cpuwiz.h
+++ b/src/devices/bus/a7800/cpuwiz.h
@@ -56,8 +56,8 @@ public:
a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(space, offset & 0x0f); else return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(space, offset & 0x0f, data); }
+ virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; }
+ virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); }
protected:
virtual void device_add_mconfig(machine_config &config) override;
diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp
index b40eea850c4..ea646db2770 100644
--- a/src/devices/bus/a7800/rom.cpp
+++ b/src/devices/bus/a7800/rom.cpp
@@ -229,7 +229,7 @@ READ8_MEMBER(a78_rom_device::read_40xx)
READ8_MEMBER(a78_rom_pokey_device::read_40xx)
{
if (offset < 0x4000)
- return m_pokey->read(space, offset & 0x0f);
+ return m_pokey->read(offset & 0x0f);
if (offset + 0x4000 < m_base_rom)
return 0xff;
@@ -240,7 +240,7 @@ READ8_MEMBER(a78_rom_pokey_device::read_40xx)
WRITE8_MEMBER(a78_rom_pokey_device::write_40xx)
{
if (offset < 0x4000)
- m_pokey->write(space, offset & 0x0f, data);
+ m_pokey->write(offset & 0x0f, data);
}
// TO DO: do we need a PAL variant?!?
@@ -327,7 +327,7 @@ WRITE8_MEMBER(a78_rom_sg_device::write_40xx)
READ8_MEMBER(a78_rom_sg_pokey_device::read_40xx)
{
if (offset < 0x4000)
- return m_pokey->read(space, offset & 0x0f);
+ return m_pokey->read(offset & 0x0f);
else if (offset < 0x8000)
return m_rom[(offset & 0x3fff) + (m_bank * 0x4000)];
else
@@ -337,7 +337,7 @@ READ8_MEMBER(a78_rom_sg_pokey_device::read_40xx)
WRITE8_MEMBER(a78_rom_sg_pokey_device::write_40xx)
{
if (offset < 0x4000)
- m_pokey->write(space, offset & 0x0f, data);
+ m_pokey->write(offset & 0x0f, data);
else if (offset < 0x8000)
m_bank = data & m_bank_mask;
}
diff --git a/src/devices/bus/a7800/rom.h b/src/devices/bus/a7800/rom.h
index 406746c4e93..1ad27663b6f 100644
--- a/src/devices/bus/a7800/rom.h
+++ b/src/devices/bus/a7800/rom.h
@@ -197,8 +197,8 @@ public:
a78_rom_p450_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(space, offset & 0x0f); else return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(space, offset & 0x0f, data); }
+ virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; }
+ virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); }
protected:
virtual void device_add_mconfig(machine_config &config) override;
@@ -216,8 +216,8 @@ public:
a78_rom_p450_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(space, offset & 0x0f); else return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(space, offset & 0x0f, data); }
+ virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; }
+ virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); }
protected:
virtual void device_add_mconfig(machine_config &config) override;
@@ -235,8 +235,8 @@ public:
a78_rom_p450_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(space, offset & 0x0f); else return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(space, offset & 0x0f, data); }
+ virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; }
+ virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); }
protected:
virtual void device_add_mconfig(machine_config &config) override;
@@ -254,8 +254,8 @@ public:
a78_rom_p450_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(space, offset & 0x0f); else return 0xff; }
- virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(space, offset & 0x0f, data); }
+ virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; }
+ virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); }
protected:
virtual void device_add_mconfig(machine_config &config) override;
diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp
index e99feca0e1e..0005e595a88 100644
--- a/src/devices/bus/a7800/xboard.cpp
+++ b/src/devices/bus/a7800/xboard.cpp
@@ -158,7 +158,7 @@ WRITE8_MEMBER(a78_xboard_device::write_40xx)
READ8_MEMBER(a78_xboard_device::read_04xx)
{
if (BIT(m_reg, 4) && offset >= 0x50 && offset < 0x60)
- return m_pokey->read(space, offset & 0x0f);
+ return m_pokey->read(offset & 0x0f);
else if (BIT(m_reg, 4) && offset >= 0x60 && offset < 0x70)
return m_xbslot->read_04xx(space, offset - 0x10); // access second POKEY
else
@@ -168,7 +168,7 @@ READ8_MEMBER(a78_xboard_device::read_04xx)
WRITE8_MEMBER(a78_xboard_device::write_04xx)
{
if (BIT(m_reg, 4) && offset >= 0x50 && offset < 0x60)
- m_pokey->write(space, offset & 0x0f, data);
+ m_pokey->write(offset & 0x0f, data);
else if (BIT(m_reg, 4) && offset >= 0x60 && offset < 0x70)
m_xbslot->write_04xx(space, offset - 0x10, data); // access second POKEY
else if (offset >= 0x70 && offset < 0x80)
@@ -203,7 +203,7 @@ READ8_MEMBER(a78_xm_device::read_30xx)
READ8_MEMBER(a78_xm_device::read_04xx)
{
if (BIT(m_reg, 4) && offset >= 0x50 && offset < 0x60)
- return m_pokey->read(space, offset & 0x0f);
+ return m_pokey->read(offset & 0x0f);
else if (m_ym_enabled && offset >= 0x60 && offset <= 0x61)
return m_ym->read(offset & 1);
else if (BIT(m_reg, 4) && offset >= 0x60 && offset < 0x70)
@@ -215,7 +215,7 @@ READ8_MEMBER(a78_xm_device::read_04xx)
WRITE8_MEMBER(a78_xm_device::write_04xx)
{
if (BIT(m_reg, 4) && offset >= 0x50 && offset < 0x60)
- m_pokey->write(space, offset & 0x0f, data);
+ m_pokey->write(offset & 0x0f, data);
else if (m_ym_enabled && offset >= 0x60 && offset <= 0x61)
m_ym->write(offset & 1, data);
else if (BIT(m_reg, 4) && offset >= 0x60 && offset < 0x70)
diff --git a/src/devices/sound/okim6376.cpp b/src/devices/sound/okim6376.cpp
index 0e33c83d7a8..e04f051b0f5 100644
--- a/src/devices/sound/okim6376.cpp
+++ b/src/devices/sound/okim6376.cpp
@@ -513,7 +513,7 @@ WRITE_LINE_MEMBER( okim6376_device::st_w )
***********************************************************************************************/
-WRITE8_MEMBER( okim6376_device::write )
+void okim6376_device::write(uint8_t data)
{
// The data port is purely used to set the latch, everything else is started by an ST pulse
diff --git a/src/devices/sound/okim6376.h b/src/devices/sound/okim6376.h
index 7efaa337d49..91cb3acf7e6 100644
--- a/src/devices/sound/okim6376.h
+++ b/src/devices/sound/okim6376.h
@@ -13,7 +13,7 @@ class okim6376_device : public device_t,
public:
okim6376_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_WRITE8_MEMBER( write );
+ void write(uint8_t data);
DECLARE_WRITE_LINE_MEMBER( st_w );
DECLARE_WRITE_LINE_MEMBER( ch2_w );
diff --git a/src/devices/sound/pokey.cpp b/src/devices/sound/pokey.cpp
index 487a1b4e83b..9afe7e8dba0 100644
--- a/src/devices/sound/pokey.cpp
+++ b/src/devices/sound/pokey.cpp
@@ -780,7 +780,7 @@ void pokey_device::sound_stream_update(sound_stream &stream, stream_sample_t **i
// read - memory interface for reading the active status
//-------------------------------------------------
-READ8_MEMBER( pokey_device::read )
+uint8_t pokey_device::read(offs_t offset)
{
int data, pot;
@@ -876,7 +876,7 @@ READ8_MEMBER( pokey_device::read )
// write - memory interface for write
//-------------------------------------------------
-WRITE8_MEMBER( pokey_device::write )
+void pokey_device::write(offs_t offset, uint8_t data)
{
synchronize(SYNC_WRITE, (offset << 8) | data);
}
diff --git a/src/devices/sound/pokey.h b/src/devices/sound/pokey.h
index ec1a21b3541..0fa9e21a17d 100644
--- a/src/devices/sound/pokey.h
+++ b/src/devices/sound/pokey.h
@@ -165,8 +165,8 @@ public:
set_interrupt_callback(int_cb_delegate(callback, name, nullptr, static_cast<FunctionClass *>(nullptr)));
}
- 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( sid_w ); // pin 24
void serin_ready(int after);
diff --git a/src/mame/audio/atarijsa.cpp b/src/mame/audio/atarijsa.cpp
index 23b8dacbf5e..27156f8bb4b 100644
--- a/src/mame/audio/atarijsa.cpp
+++ b/src/mame/audio/atarijsa.cpp
@@ -676,7 +676,7 @@ WRITE8_MEMBER( atari_jsa_i_device::tms5220_voice )
READ8_MEMBER( atari_jsa_i_device::pokey_r )
{
if (m_pokey != nullptr)
- return m_pokey->read(space, offset);
+ return m_pokey->read(offset);
return 0xff;
}
@@ -689,7 +689,7 @@ READ8_MEMBER( atari_jsa_i_device::pokey_r )
WRITE8_MEMBER( atari_jsa_i_device::pokey_w )
{
if (m_pokey != nullptr)
- m_pokey->write(space, offset, data);
+ m_pokey->write(offset, data);
}
diff --git a/src/mame/drivers/atari400.cpp b/src/mame/drivers/atari400.cpp
index 03a5c7ba990..6aeec563bfb 100644
--- a/src/mame/drivers/atari400.cpp
+++ b/src/mame/drivers/atari400.cpp
@@ -2018,7 +2018,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( a400_state::a5200_interrupt )
MACHINE_RESET_MEMBER( a400_state, a400 )
{
- m_pokey->write(machine().dummy_space(), 15, 0);
+ m_pokey->write(15, 0);
}
diff --git a/src/mame/drivers/bartop52.cpp b/src/mame/drivers/bartop52.cpp
index 0fd035e6c41..6cfff80a172 100644
--- a/src/mame/drivers/bartop52.cpp
+++ b/src/mame/drivers/bartop52.cpp
@@ -118,7 +118,7 @@ void bartop52_state::machine_reset()
{
atari_common_state::machine_reset();
- m_pokey->write(machine().dummy_space(), 15, 0);
+ m_pokey->write(15, 0);
}
TIMER_DEVICE_CALLBACK_MEMBER( bartop52_state::bartop_interrupt )
diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp
index 11550c5014a..365b5f9385c 100644
--- a/src/mame/drivers/highvdeo.cpp
+++ b/src/mame/drivers/highvdeo.cpp
@@ -170,7 +170,6 @@ private:
DECLARE_WRITE16_MEMBER(fashion_output_w);
DECLARE_WRITE16_MEMBER(tv_oki6376_w);
DECLARE_READ8_MEMBER(tv_oki6376_r);
- DECLARE_WRITE16_MEMBER(tv_ncf_oki6376_w);
DECLARE_WRITE16_MEMBER(tv_ncf_oki6376_st_w);
DECLARE_READ8_MEMBER(nmi_clear_r);
DECLARE_WRITE8_MEMBER(nmi_clear_w);
@@ -299,7 +298,7 @@ WRITE16_MEMBER(highvdeo_state::tv_oki6376_w)
if (ACCESSING_BITS_0_7 && okidata != data)
{
okidata = data;
- m_okim6376->write(space, 0, data & ~0x80);
+ m_okim6376->write(data & ~0x80);
m_okim6376->st_w(data & 0x80);
}
}
@@ -380,15 +379,6 @@ READ16_MEMBER(highvdeo_state::tv_ncf_read1_r)
return (m_inputs[1]->read() & 0xbf) | resetpulse;
}
-WRITE16_MEMBER(highvdeo_state::tv_ncf_oki6376_w)
-{
- static int okidata;
- if (ACCESSING_BITS_0_7 && okidata != data) {
- okidata = data;
- m_okim6376->write( space, 0, data );
- }
-}
-
WRITE16_MEMBER(highvdeo_state::tv_ncf_oki6376_st_w)
{
if (ACCESSING_BITS_0_7)
@@ -408,7 +398,7 @@ void highvdeo_state::tv_ncf_map(address_map &map)
void highvdeo_state::tv_ncf_io(address_map &map)
{
map(0x0000, 0x0001).w(FUNC(highvdeo_state::write1_w)); // lamps
- map(0x0008, 0x0009).w(FUNC(highvdeo_state::tv_ncf_oki6376_w));
+ map(0x0008, 0x0008).w(m_okim6376, FUNC(okim6376_device::write));
map(0x000a, 0x000b).w(FUNC(highvdeo_state::tv_ncf_oki6376_st_w));
map(0x000c, 0x000d).r(FUNC(highvdeo_state::read0_r));
map(0x0010, 0x0011).r(FUNC(highvdeo_state::tv_ncf_read1_r));
@@ -434,7 +424,7 @@ void highvdeo_state::nyjoker_io(address_map &map)
map(0x0002, 0x0003).nopw(); // alternate coin counter (bits 0 and 2)
map(0x0004, 0x0005).w(FUNC(highvdeo_state::nyj_write2_w)); // coin and note counter
// AM_RANGE(0x0006, 0x0007) AM_WRITENOP
- map(0x0008, 0x0009).w(FUNC(highvdeo_state::tv_ncf_oki6376_w));
+ map(0x0008, 0x0008).w(m_okim6376, FUNC(okim6376_device::write));
map(0x000a, 0x000b).w(FUNC(highvdeo_state::tv_ncf_oki6376_st_w));
map(0x000c, 0x000d).portr("IN0");
map(0x000e, 0x000f).portr("DSW");
diff --git a/src/mame/drivers/irobot.cpp b/src/mame/drivers/irobot.cpp
index 99481b24fab..b52033b0518 100644
--- a/src/mame/drivers/irobot.cpp
+++ b/src/mame/drivers/irobot.cpp
@@ -113,7 +113,7 @@ READ8_MEMBER(irobot_state::quad_pokeyn_r)
int control = (offset & 0x20) >> 2;
int pokey_reg = (offset % 8) | control;
- return m_pokey[pokey_num]->read(space, pokey_reg);
+ return m_pokey[pokey_num]->read(pokey_reg);
}
WRITE8_MEMBER(irobot_state::quad_pokeyn_w)
@@ -122,7 +122,7 @@ WRITE8_MEMBER(irobot_state::quad_pokeyn_w)
int control = (offset & 0x20) >> 2;
int pokey_reg = (offset % 8) | control;
- m_pokey[pokey_num]->write(space, pokey_reg, data);
+ m_pokey[pokey_num]->write(pokey_reg, data);
}
diff --git a/src/mame/drivers/maxaflex.cpp b/src/mame/drivers/maxaflex.cpp
index 87e3fcfd91a..1202d575b79 100644
--- a/src/mame/drivers/maxaflex.cpp
+++ b/src/mame/drivers/maxaflex.cpp
@@ -308,7 +308,7 @@ void maxaflex_state::machine_reset()
{
atari_common_state::machine_reset();
- m_pokey->write(machine().dummy_space(), 15, 0);
+ m_pokey->write(15, 0);
// Supervisor board reset
m_portb_out = 0xff;
diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp
index 972831831ef..fc1aa93b1e0 100644
--- a/src/mame/drivers/maygay1b.cpp
+++ b/src/mame/drivers/maygay1b.cpp
@@ -439,7 +439,7 @@ WRITE_LINE_MEMBER(maygay1b_state::srsel_w)
WRITE8_MEMBER(maygay1b_state::latch_ch2_w)
{
- m_msm6376->write(space, 0, data&0x7f);
+ m_msm6376->write(data&0x7f);
m_msm6376->ch2_w(data&0x80);
}
diff --git a/src/mame/drivers/mhavoc.cpp b/src/mame/drivers/mhavoc.cpp
index 6cacca4895f..21b782f8d69 100644
--- a/src/mame/drivers/mhavoc.cpp
+++ b/src/mame/drivers/mhavoc.cpp
@@ -212,7 +212,7 @@ READ8_MEMBER(mhavoc_state::quad_pokeyn_r)
int control = (offset & 0x20) >> 2;
int pokey_reg = (offset & 0x7) | control;
- return m_pokey[pokey_num]->read(space, pokey_reg);
+ return m_pokey[pokey_num]->read(pokey_reg);
}
WRITE8_MEMBER(mhavoc_state::quad_pokeyn_w)
@@ -221,7 +221,7 @@ WRITE8_MEMBER(mhavoc_state::quad_pokeyn_w)
int control = (offset & 0x20) >> 2;
int pokey_reg = (offset & 0x7) | control;
- m_pokey[pokey_num]->write(space, pokey_reg, data);
+ m_pokey[pokey_num]->write(pokey_reg, data);
}
@@ -244,7 +244,7 @@ READ8_MEMBER(mhavoc_state::dual_pokey_r)
int control = (offset & 0x10) >> 1;
int pokey_reg = (offset & 0x7) | control;
- return m_pokey[pokey_num]->read(space, pokey_reg);
+ return m_pokey[pokey_num]->read(pokey_reg);
}
@@ -254,7 +254,7 @@ WRITE8_MEMBER(mhavoc_state::dual_pokey_w)
int control = (offset & 0x10) >> 1;
int pokey_reg = (offset & 0x7) | control;
- m_pokey[pokey_num]->write(space, pokey_reg, data);
+ m_pokey[pokey_num]->write(pokey_reg, data);
}
diff --git a/src/mame/drivers/missile.cpp b/src/mame/drivers/missile.cpp
index 87112ab0d88..2a62d81080f 100644
--- a/src/mame/drivers/missile.cpp
+++ b/src/mame/drivers/missile.cpp
@@ -742,7 +742,7 @@ WRITE8_MEMBER(missile_state::missile_w)
else if (offset < 0x4800)
{
if (m_pokey.found())
- m_pokey->write(space, offset, data, 0xff);
+ m_pokey->write(offset, data);
}
/* OUT0 */
@@ -804,7 +804,7 @@ READ8_MEMBER(missile_state::missile_r)
else if (offset < 0x4800)
{
if (m_pokey.found())
- result = m_pokey->read(space, offset & 0x0f, 0xff);
+ result = m_pokey->read(offset & 0x0f);
}
/* IN0 */
diff --git a/src/mame/drivers/starwars.cpp b/src/mame/drivers/starwars.cpp
index 54a5954f21e..b4f6c12f379 100644
--- a/src/mame/drivers/starwars.cpp
+++ b/src/mame/drivers/starwars.cpp
@@ -48,7 +48,7 @@ WRITE8_MEMBER(starwars_state::quad_pokeyn_w)
int control = (offset & 0x20) >> 2;
int pokey_reg = (offset % 8) | control;
- m_pokey[pokey_num]->write(space, pokey_reg, data);
+ m_pokey[pokey_num]->write(pokey_reg, data);
}
/*************************************
diff --git a/src/mame/machine/mpu4.cpp b/src/mame/machine/mpu4.cpp
index 6e0dbfe9edd..316f9fe9ad6 100644
--- a/src/mame/machine/mpu4.cpp
+++ b/src/mame/machine/mpu4.cpp
@@ -1333,7 +1333,7 @@ WRITE_LINE_MEMBER(mpu4_state::pia_ic8_cb2_w)
WRITE8_MEMBER(mpu4_state::pia_gb_porta_w)
{
LOG_SS(("%s: GAMEBOARD: PIA Port A Set to %2x\n", machine().describe_context(),data));
- m_msm6376->write(space, 0, data);
+ m_msm6376->write(data);
}
WRITE8_MEMBER(mpu4_state::pia_gb_portb_w)