summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/sound
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-06-17 01:50:47 +1000
committer Vas Crabb <vas@vastheman.com>2018-06-17 01:50:47 +1000
commitb0d19b944db2b37b52ea7a636c98b2010c996a81 (patch)
tree42c1dfd2a8148f2d2ec45100083484dfcfda0717 /src/devices/sound
parent67fd77d2442fc4f1b22829171f4642df5b59a623 (diff)
more macro removal and overload disambiguation (nw)
Diffstat (limited to 'src/devices/sound')
-rw-r--r--src/devices/sound/msm5205.cpp21
-rw-r--r--src/devices/sound/msm5205.h4
2 files changed, 10 insertions, 15 deletions
diff --git a/src/devices/sound/msm5205.cpp b/src/devices/sound/msm5205.cpp
index 78884068c0b..05646521f36 100644
--- a/src/devices/sound/msm5205.cpp
+++ b/src/devices/sound/msm5205.cpp
@@ -67,13 +67,13 @@ msm5205_device::msm5205_device(const machine_config &mconfig, const char *tag, d
}
msm5205_device::msm5205_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
- : device_t(mconfig, type, tag, owner, clock),
- device_sound_interface(mconfig, *this),
- m_s1(false),
- m_s2(false),
- m_bitwidth(4),
- m_vck_cb(*this),
- m_vck_legacy_cb(*this)
+ : device_t(mconfig, type, tag, owner, clock)
+ , device_sound_interface(mconfig, *this)
+ , m_s1(false)
+ , m_s2(false)
+ , m_bitwidth(4)
+ , m_vck_cb(*this)
+ , m_vck_legacy_cb(*this)
{
}
@@ -262,7 +262,7 @@ WRITE_LINE_MEMBER(msm5205_device::reset_w)
* Handle an update of the data to the chip
*/
-void msm5205_device::data_w(int data)
+void msm5205_device::write_data(int data)
{
if (m_bitwidth == 4)
m_data = data & 0x0f;
@@ -270,11 +270,6 @@ void msm5205_device::data_w(int data)
m_data = (data & 0x07) << 1; /* unknown */
}
-WRITE8_MEMBER(msm5205_device::data_w)
-{
- data_w(data);
-}
-
int msm5205_device::get_prescaler() const
{
if (m_s1)
diff --git a/src/devices/sound/msm5205.h b/src/devices/sound/msm5205.h
index ec68e7f21b7..7e6ef5f91f9 100644
--- a/src/devices/sound/msm5205.h
+++ b/src/devices/sound/msm5205.h
@@ -51,8 +51,8 @@ public:
DECLARE_WRITE_LINE_MEMBER(reset_w);
// adpcmata is latched after vclk_interrupt callback
- void data_w(int data);
- DECLARE_WRITE8_MEMBER(data_w);
+ void write_data(int data);
+ DECLARE_WRITE8_MEMBER(data_w) { write_data(data); }
// VCLK slave mode option
// if VCLK and reset or data is changed at the same time,