summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/decocass.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/decocass.cpp')
-rw-r--r--src/mame/machine/decocass.cpp54
1 files changed, 27 insertions, 27 deletions
diff --git a/src/mame/machine/decocass.cpp b/src/mame/machine/decocass.cpp
index 53c42a8559c..fbda017d473 100644
--- a/src/mame/machine/decocass.cpp
+++ b/src/mame/machine/decocass.cpp
@@ -1152,7 +1152,7 @@ READ8_MEMBER(decocass_state::decocass_e5xx_r)
else
{
if (!m_dongle_r.isnull())
- data = (m_dongle_r)(space, offset, mem_mask);
+ data = m_dongle_r(space, offset, mem_mask);
else
data = 0xff;
}
@@ -1163,7 +1163,7 @@ WRITE8_MEMBER(decocass_state::decocass_e5xx_w)
{
if (!m_dongle_w.isnull())
{
- (m_dongle_w)(space, offset, data, mem_mask);
+ m_dongle_w(space, offset, data, mem_mask);
return;
}
@@ -1251,8 +1251,8 @@ void decocass_state::machine_reset()
m_firsttime = 1;
m_latch1 = 0;
- m_dongle_r = read8_delegate();
- m_dongle_w = write8_delegate();
+ m_dongle_r = read8_delegate(*this);
+ m_dongle_w = write8_delegate(*this);
m_decocass_reset = 0;
m_i8041_p1 = 0xff;
@@ -1292,7 +1292,7 @@ void decocass_type1_state::machine_reset()
{
decocass_state::machine_reset();
- m_dongle_r = read8_delegate(FUNC(decocass_type1_state::decocass_type1_r),this);
+ m_dongle_r = read8_delegate(*this, FUNC(decocass_type1_state::decocass_type1_r));
m_type1_inmap = MAKE_MAP(0,1,2,3,4,5,6,7);
m_type1_outmap = MAKE_MAP(0,1,2,3,4,5,6,7);
}
@@ -1309,8 +1309,8 @@ void decocass_type2_state::machine_reset()
decocass_state::machine_reset();
LOG(0,("dongle type #2 (CS82-007)\n"));
- m_dongle_r = read8_delegate(FUNC(decocass_type2_state::decocass_type2_r),this);
- m_dongle_w = write8_delegate(FUNC(decocass_type2_state::decocass_type2_w),this);
+ m_dongle_r = read8_delegate(*this, FUNC(decocass_type2_state::decocass_type2_r));
+ m_dongle_w = write8_delegate(*this, FUNC(decocass_type2_state::decocass_type2_w));
m_type2_d2_latch = 0;
m_type2_xx_latch = 0;
@@ -1329,8 +1329,8 @@ void decocass_type3_state::machine_reset()
{
decocass_state::machine_reset();
- m_dongle_r = read8_delegate(FUNC(decocass_type3_state::decocass_type3_r),this);
- m_dongle_w = write8_delegate(FUNC(decocass_type3_state::decocass_type3_w),this);
+ m_dongle_r = read8_delegate(*this, FUNC(decocass_type3_state::decocass_type3_r));
+ m_dongle_w = write8_delegate(*this, FUNC(decocass_type3_state::decocass_type3_w));
m_type3_ctrs = 0;
m_type3_d0_latch = 0;
@@ -1349,8 +1349,8 @@ void decocass_type4_state::machine_reset()
decocass_state::machine_reset();
LOG(0,("dongle type #4 (32K ROM)\n"));
- m_dongle_r = read8_delegate(FUNC(decocass_type4_state::decocass_type4_r),this);
- m_dongle_w = write8_delegate(FUNC(decocass_type4_state::decocass_type4_w),this);
+ m_dongle_r = read8_delegate(*this, FUNC(decocass_type4_state::decocass_type4_r));
+ m_dongle_w = write8_delegate(*this, FUNC(decocass_type4_state::decocass_type4_w));
m_type4_ctrs = 0;
m_type4_latch = 0;
@@ -1366,8 +1366,8 @@ void decocass_type5_state::machine_reset()
decocass_state::machine_reset();
LOG(0,("dongle type #5 (NOP)\n"));
- m_dongle_r = read8_delegate(FUNC(decocass_type5_state::decocass_type5_r),this);
- m_dongle_w = write8_delegate(FUNC(decocass_type5_state::decocass_type5_w),this);
+ m_dongle_r = read8_delegate(*this, FUNC(decocass_type5_state::decocass_type5_r));
+ m_dongle_w = write8_delegate(*this, FUNC(decocass_type5_state::decocass_type5_w));
m_type5_latch = 0;
}
@@ -1376,7 +1376,7 @@ void decocass_nodong_state::machine_reset()
{
decocass_state::machine_reset();
LOG(0, ("no dongle\n"));
- m_dongle_r = read8_delegate(FUNC(decocass_nodong_state::decocass_nodong_r), this);
+ m_dongle_r = read8_delegate(*this, FUNC(decocass_nodong_state::decocass_nodong_r));
}
MACHINE_RESET_MEMBER(decocass_type1_state,ctsttape)
@@ -1622,8 +1622,8 @@ void decocass_widel_state::machine_reset()
{
decocass_state::machine_reset();
LOG(0,("Deco Multigame Dongle\n"));
- m_dongle_r = read8_delegate(FUNC(decocass_widel_state::decocass_widel_r),this);
- m_dongle_w = write8_delegate(FUNC(decocass_widel_state::decocass_widel_w),this);
+ m_dongle_r = read8_delegate(*this, FUNC(decocass_widel_state::decocass_widel_r));
+ m_dongle_w = write8_delegate(*this, FUNC(decocass_widel_state::decocass_widel_w));
m_widel_ctrs = 0;
m_widel_latch = 0;
@@ -1641,17 +1641,17 @@ WRITE8_MEMBER(decocass_state::i8041_p1_w)
if (data != m_i8041_p1_write_latch)
{
LOG(4,("%10s 8041-PC: %03x i8041_p1_w: $%02x (%s%s%s%s%s%s%s%s)\n",
- machine().time().as_string(6),
- m_maincpu->pcbase(),
- data,
- data & 0x01 ? "" : "DATA-WRT",
- data & 0x02 ? "" : " DATA-CLK",
- data & 0x04 ? "" : " FAST",
- data & 0x08 ? "" : " BIT3",
- data & 0x10 ? "" : " REW",
- data & 0x20 ? "" : " FWD",
- data & 0x40 ? "" : " WREN",
- data & 0x80 ? "" : " REQ"));
+ machine().time().as_string(6),
+ m_maincpu->pcbase(),
+ data,
+ data & 0x01 ? "" : "DATA-WRT",
+ data & 0x02 ? "" : " DATA-CLK",
+ data & 0x04 ? "" : " FAST",
+ data & 0x08 ? "" : " BIT3",
+ data & 0x10 ? "" : " REW",
+ data & 0x20 ? "" : " FWD",
+ data & 0x40 ? "" : " WREN",
+ data & 0x80 ? "" : " REQ"));
m_i8041_p1_write_latch = data;
}