summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2019-03-31 10:35:03 -0400
committer GitHub <noreply@github.com>2019-03-31 10:35:03 -0400
commit7de3997493375cf5a75a9cb90ef5ff724d176d4c (patch)
treee0f9a39559ab6d9eb8fa2df7466ee2ee1ff7cc8f
parente01c9f739dc0a1404d48c0cfb0f83e57eda60eb6 (diff)
parent87666440ee6973878d34e5333ec05de35ec250e3 (diff)
Merge pull request #4829 from cam900/decobsmt_args
decobsmt.cpp : Simplify handlers
-rw-r--r--src/mame/audio/decobsmt.cpp12
-rw-r--r--src/mame/audio/decobsmt.h12
-rw-r--r--src/mame/drivers/de_3.cpp2
-rw-r--r--src/mame/drivers/de_3b.cpp2
-rw-r--r--src/mame/drivers/deco32.cpp2
5 files changed, 15 insertions, 15 deletions
diff --git a/src/mame/audio/decobsmt.cpp b/src/mame/audio/decobsmt.cpp
index a47363b5ff7..1db69037b3b 100644
--- a/src/mame/audio/decobsmt.cpp
+++ b/src/mame/audio/decobsmt.cpp
@@ -97,7 +97,7 @@ void decobsmt_device::device_reset()
m_bsmt_comms = 0;
}
-WRITE8_MEMBER(decobsmt_device::bsmt_reset_w)
+void decobsmt_device::bsmt_reset_w(u8 data)
{
uint8_t diff = data ^ m_bsmt_reset;
m_bsmt_reset = data;
@@ -105,29 +105,29 @@ WRITE8_MEMBER(decobsmt_device::bsmt_reset_w)
m_bsmt->reset();
}
-WRITE8_MEMBER(decobsmt_device::bsmt0_w)
+void decobsmt_device::bsmt0_w(u8 data)
{
m_bsmt_latch = data;
}
-WRITE8_MEMBER(decobsmt_device::bsmt1_w)
+void decobsmt_device::bsmt1_w(offs_t offset, u8 data)
{
m_bsmt->write_reg(offset ^ 0xff);
m_bsmt->write_data((m_bsmt_latch << 8) | data);
m_ourcpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); /* BSMT is not ready */
}
-READ8_MEMBER(decobsmt_device::bsmt_status_r)
+u8 decobsmt_device::bsmt_status_r()
{
return m_bsmt->read_status() << 7;
}
-READ8_MEMBER(decobsmt_device::bsmt_comms_r)
+u8 decobsmt_device::bsmt_comms_r()
{
return m_bsmt_comms;
}
-WRITE8_MEMBER(decobsmt_device::bsmt_comms_w)
+void decobsmt_device::bsmt_comms_w(u8 data)
{
m_bsmt_comms = data;
}
diff --git a/src/mame/audio/decobsmt.h b/src/mame/audio/decobsmt.h
index 8ecac957a3e..b5a9b2bdf56 100644
--- a/src/mame/audio/decobsmt.h
+++ b/src/mame/audio/decobsmt.h
@@ -21,12 +21,12 @@ public:
// construction/destruction
decobsmt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- DECLARE_WRITE8_MEMBER(bsmt_reset_w);
- DECLARE_READ8_MEMBER(bsmt_status_r);
- DECLARE_WRITE8_MEMBER(bsmt0_w);
- DECLARE_WRITE8_MEMBER(bsmt1_w);
- DECLARE_READ8_MEMBER(bsmt_comms_r);
- DECLARE_WRITE8_MEMBER(bsmt_comms_w);
+ void bsmt_reset_w(u8 data);
+ u8 bsmt_status_r();
+ void bsmt0_w(u8 data);
+ void bsmt1_w(offs_t offset, u8 data);
+ u8 bsmt_comms_r();
+ void bsmt_comms_w(u8 data);
DECLARE_WRITE_LINE_MEMBER(bsmt_reset_line);
diff --git a/src/mame/drivers/de_3.cpp b/src/mame/drivers/de_3.cpp
index 2ca8097353d..30574e55965 100644
--- a/src/mame/drivers/de_3.cpp
+++ b/src/mame/drivers/de_3.cpp
@@ -174,7 +174,7 @@ WRITE8_MEMBER( de_3_state::sound_w )
{
m_sound_data = data;
if(m_sound_data != 0xfe)
- m_decobsmt->bsmt_comms_w(space,offset,m_sound_data);
+ m_decobsmt->bsmt_comms_w(m_sound_data);
}
WRITE_LINE_MEMBER( de_3_state::pia21_ca2_w )
diff --git a/src/mame/drivers/de_3b.cpp b/src/mame/drivers/de_3b.cpp
index e2ca54d4bde..2d9823bec9e 100644
--- a/src/mame/drivers/de_3b.cpp
+++ b/src/mame/drivers/de_3b.cpp
@@ -150,7 +150,7 @@ WRITE8_MEMBER( de_3b_state::sound_w )
{
m_sound_data = data;
if(m_sound_data != 0xfe)
- m_decobsmt->bsmt_comms_w(space,offset,m_sound_data);
+ m_decobsmt->bsmt_comms_w(m_sound_data);
}
READ8_MEMBER( de_3b_state::dmd_status_r )
diff --git a/src/mame/drivers/deco32.cpp b/src/mame/drivers/deco32.cpp
index 7d20995e28a..9da85bd3b17 100644
--- a/src/mame/drivers/deco32.cpp
+++ b/src/mame/drivers/deco32.cpp
@@ -791,7 +791,7 @@ WRITE_LINE_MEMBER( nslasher_state::tattass_sound_irq_w )
uint8_t data = m_ioprot->soundlatch_r(machine().dummy_space(), 0);
// Swap bits 0 and 3 to correct for design error from BSMT schematic
data = bitswap<8>(data, 7, 6, 5, 4, 0, 2, 1, 3);
- m_decobsmt->bsmt_comms_w(machine().dummy_space(), 0, data);
+ m_decobsmt->bsmt_comms_w(data);
}
}