summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/inder.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/inder.cpp')
-rw-r--r--src/mame/drivers/inder.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/mame/drivers/inder.cpp b/src/mame/drivers/inder.cpp
index 7fef98159a1..a1dc937bad2 100644
--- a/src/mame/drivers/inder.cpp
+++ b/src/mame/drivers/inder.cpp
@@ -121,24 +121,24 @@ private:
void inder_state::brvteam_map(address_map &map)
{
map(0x0000, 0x1fff).rom();
- map(0x2000, 0x20ff).w(this, FUNC(inder_state::disp_w));
+ map(0x2000, 0x20ff).w(FUNC(inder_state::disp_w));
map(0x4000, 0x43ff).ram(); // pair of 2114
map(0x4400, 0x44ff).ram().share("nvram"); // pair of 5101, battery-backed
- map(0x4800, 0x480a).rw(this, FUNC(inder_state::sw_r), FUNC(inder_state::sw_w));
- map(0x4900, 0x4900).w(this, FUNC(inder_state::sol_brvteam_w));
- map(0x4901, 0x4907).w(this, FUNC(inder_state::lamp_w));
- map(0x4b00, 0x4b00).w(this, FUNC(inder_state::sn_w));
+ map(0x4800, 0x480a).rw(FUNC(inder_state::sw_r), FUNC(inder_state::sw_w));
+ map(0x4900, 0x4900).w(FUNC(inder_state::sol_brvteam_w));
+ map(0x4901, 0x4907).w(FUNC(inder_state::lamp_w));
+ map(0x4b00, 0x4b00).w(FUNC(inder_state::sn_w));
}
void inder_state::canasta_map(address_map &map)
{
map(0x0000, 0x1fff).rom();
- map(0x2000, 0x20ff).w(this, FUNC(inder_state::disp_w));
+ map(0x2000, 0x20ff).w(FUNC(inder_state::disp_w));
map(0x4000, 0x43ff).ram(); // pair of 2114
map(0x4400, 0x44ff).ram().share("nvram"); // pair of 5101, battery-backed
- map(0x4800, 0x480a).rw(this, FUNC(inder_state::sw_r), FUNC(inder_state::sw_w));
- map(0x4900, 0x4900).w(this, FUNC(inder_state::sol_canasta_w));
- map(0x4901, 0x4907).w(this, FUNC(inder_state::lamp_w));
+ map(0x4800, 0x480a).rw(FUNC(inder_state::sw_r), FUNC(inder_state::sw_w));
+ map(0x4900, 0x4900).w(FUNC(inder_state::sol_canasta_w));
+ map(0x4901, 0x4907).w(FUNC(inder_state::lamp_w));
map(0x4b00, 0x4b00).w("ay", FUNC(ay8910_device::address_w));
map(0x4b01, 0x4b01).r("ay", FUNC(ay8910_device::data_r));
map(0x4b02, 0x4b02).w("ay", FUNC(ay8910_device::data_w));
@@ -147,13 +147,13 @@ void inder_state::canasta_map(address_map &map)
void inder_state::lapbylap_map(address_map &map)
{
map(0x0000, 0x1fff).rom();
- map(0x2000, 0x20ff).w(this, FUNC(inder_state::disp_w));
+ map(0x2000, 0x20ff).w(FUNC(inder_state::disp_w));
map(0x4000, 0x43ff).ram(); // pair of 2114
map(0x4400, 0x44ff).ram().share("nvram"); // pair of 5101, battery-backed
- map(0x4800, 0x480a).rw(this, FUNC(inder_state::sw_r), FUNC(inder_state::sw_w));
- map(0x4900, 0x4900).w(this, FUNC(inder_state::sol_canasta_w));
- map(0x4901, 0x4907).w(this, FUNC(inder_state::lamp_w));
- map(0x4b00, 0x4b00).w(this, FUNC(inder_state::sndcmd_lapbylap_w));
+ map(0x4800, 0x480a).rw(FUNC(inder_state::sw_r), FUNC(inder_state::sw_w));
+ map(0x4900, 0x4900).w(FUNC(inder_state::sol_canasta_w));
+ map(0x4901, 0x4907).w(FUNC(inder_state::lamp_w));
+ map(0x4b00, 0x4b00).w(FUNC(inder_state::sndcmd_lapbylap_w));
}
void inder_state::lapbylap_sub_map(address_map &map)
@@ -176,8 +176,8 @@ void inder_state::inder_map(address_map &map)
map(0x6400, 0x6403).mirror(0x13fc).rw("ppi64", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x6800, 0x6803).mirror(0x13fc).rw("ppi68", FUNC(i8255_device::read), FUNC(i8255_device::write));
map(0x6c00, 0x6c03).mirror(0x131c).rw("ppi6c", FUNC(i8255_device::read), FUNC(i8255_device::write));
- map(0x6c20, 0x6c3f).mirror(0x1300).w(this, FUNC(inder_state::sndcmd_w));
- map(0x6c60, 0x6c7f).mirror(0x1300).w(this, FUNC(inder_state::disp_w));
+ map(0x6c20, 0x6c3f).mirror(0x1300).w(FUNC(inder_state::sndcmd_w));
+ map(0x6c60, 0x6c7f).mirror(0x1300).w(FUNC(inder_state::disp_w));
map(0x6ce0, 0x6ce0).nopw();
}
@@ -186,8 +186,8 @@ void inder_state::inder_sub_map(address_map &map)
map(0x0000, 0x1fff).rom();
map(0x2000, 0x27ff).mirror(0x1800).ram(); // 6116
map(0x4000, 0x4003).mirror(0x1ffc).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write));
- map(0x6000, 0x6000).w(this, FUNC(inder_state::sndbank_w));
- map(0x8000, 0x8000).r(this, FUNC(inder_state::sndcmd_r));
+ map(0x6000, 0x6000).w(FUNC(inder_state::sndbank_w));
+ map(0x8000, 0x8000).r(FUNC(inder_state::sndcmd_r));
}
static INPUT_PORTS_START( brvteam )
@@ -1140,7 +1140,7 @@ WRITE8_MEMBER( inder_state::sw_w )
WRITE8_MEMBER( inder_state::sn_w )
{
- m_sn->write(space, 0, bitswap<8>(data, 0, 1, 2, 3, 4, 5, 6, 7));
+ m_sn->write(bitswap<8>(data, 0, 1, 2, 3, 4, 5, 6, 7));
}
WRITE8_MEMBER( inder_state::sndcmd_lapbylap_w )
@@ -1265,9 +1265,9 @@ WRITE8_MEMBER( inder_state::sndbank_w )
void inder_state::update_mus()
{
if ((m_sound_addr < 0x40000) && (m_sndbank != 0xff))
- m_13->ba_w(m_p_speech[m_sound_addr]);
+ m_13->write_ba(m_p_speech[m_sound_addr]);
else
- m_13->ba_w(0);
+ m_13->write_ba(0);
}
WRITE_LINE_MEMBER( inder_state::qc7a_w )