summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar cam900 <dbtlrchl@naver.com>2019-02-03 20:24:11 +0900
committerGravatarGravatar cam900 <dbtlrchl@naver.com>2019-02-03 20:24:11 +0900
commita3891a04a8ab3b62727070f860a31b7bbd9bb5b9 (patch) (github)
tree8ae41b95aa8dc5922d83bd5a818cc2fe6e88c7d4
parent5e0f160b684eadddb7ac1c7f47cb2d7f7cf16525 (diff)
downloadmame-a3891a04a8ab3b62727070f860a31b7bbd9bb5b9.tar.bz2
mame-a3891a04a8ab3b62727070f860a31b7bbd9bb5b9.zip
adc0844.cpp : Remove unnecessary arguments in handlers
bus/electron/plus1.cpp : Remove unnecessary arguments in some handlers, nw
-rw-r--r--src/devices/bus/electron/plus1.cpp10
-rw-r--r--src/devices/bus/electron/plus1.h2
-rw-r--r--src/devices/machine/adc0844.cpp6
-rw-r--r--src/devices/machine/adc0844.h6
-rw-r--r--src/mame/drivers/mcr3.cpp4
-rw-r--r--src/mame/drivers/mcr68.cpp4
-rw-r--r--src/mame/drivers/midvunit.cpp4
-rw-r--r--src/mame/machine/midyunit.cpp4
8 files changed, 20 insertions, 20 deletions
diff --git a/src/devices/bus/electron/plus1.cpp b/src/devices/bus/electron/plus1.cpp
index 608152c9e7a..3e395722bcd 100644
--- a/src/devices/bus/electron/plus1.cpp
+++ b/src/devices/bus/electron/plus1.cpp
@@ -202,11 +202,11 @@ uint8_t electron_plus1_device::expbus_r(address_space &space, offs_t offset)
if (offset == 0xfc70)
{
- data &= m_adc->read(space, 0);
+ data &= m_adc->read();
}
else if (offset == 0xfc72)
{
- data &= status_r(space, 0);
+ data &= status_r();
}
break;
@@ -255,7 +255,7 @@ void electron_plus1_device::expbus_w(address_space &space, offs_t offset, uint8_
if (offset == 0xfc70)
{
- m_adc->write(space, 0, data);
+ m_adc->write(data);
}
else if (offset == 0xfc71)
{
@@ -283,9 +283,9 @@ void electron_plus1_device::expbus_w(address_space &space, offs_t offset, uint8_
// IMPLEMENTATION
//**************************************************************************
-READ8_MEMBER(electron_plus1_device::status_r)
+u8 electron_plus1_device::status_r()
{
- uint8_t data = 0x0f;
+ u8 data = 0x0f;
// Status: b7: printer Busy
// b6: ADC conversion end
// b5: Fire Button 1
diff --git a/src/devices/bus/electron/plus1.h b/src/devices/bus/electron/plus1.h
index 23485acc10a..63e065446e5 100644
--- a/src/devices/bus/electron/plus1.h
+++ b/src/devices/bus/electron/plus1.h
@@ -41,7 +41,7 @@ protected:
virtual void expbus_w(address_space &space, offs_t offset, uint8_t data) override;
private:
- DECLARE_READ8_MEMBER(status_r);
+ u8 status_r();
DECLARE_WRITE_LINE_MEMBER(busy_w);
DECLARE_WRITE_LINE_MEMBER(ready_w);
diff --git a/src/devices/machine/adc0844.cpp b/src/devices/machine/adc0844.cpp
index 103702a8d14..c3616035927 100644
--- a/src/devices/machine/adc0844.cpp
+++ b/src/devices/machine/adc0844.cpp
@@ -182,14 +182,14 @@ void adc0848_device::device_timer(emu_timer &timer, device_timer_id id, int para
// INTERFACE
//**************************************************************************
-READ8_MEMBER( adc0844_device::read )
+u8 adc0844_device::read()
{
m_intr_cb(CLEAR_LINE);
return m_result;
}
-WRITE8_MEMBER( adc0844_device::write )
+void adc0844_device::write(u8 data)
{
m_intr_cb(CLEAR_LINE);
@@ -198,7 +198,7 @@ WRITE8_MEMBER( adc0844_device::write )
m_conversion_timer->adjust(attotime::from_usec(40));
}
-WRITE8_MEMBER( adc0848_device::write )
+void adc0848_device::write(u8 data)
{
m_intr_cb(CLEAR_LINE);
diff --git a/src/devices/machine/adc0844.h b/src/devices/machine/adc0844.h
index d20d9697a09..51dff681f16 100644
--- a/src/devices/machine/adc0844.h
+++ b/src/devices/machine/adc0844.h
@@ -43,8 +43,8 @@ public:
auto ch3_callback() { return m_ch3_cb.bind(); }
auto ch4_callback() { return m_ch4_cb.bind(); }
- DECLARE_READ8_MEMBER(read);
- virtual DECLARE_WRITE8_MEMBER(write);
+ u8 read();
+ virtual void write(u8 data);
protected:
adc0844_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -78,7 +78,7 @@ public:
auto ch7_callback() { return m_ch7_cb.bind(); }
auto ch8_callback() { return m_ch8_cb.bind(); }
- virtual DECLARE_WRITE8_MEMBER(write) override;
+ virtual void write(u8 data) override;
protected:
// device-level overrides
diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp
index a1bb1aadb9d..4a5cf4f5dfa 100644
--- a/src/mame/drivers/mcr3.cpp
+++ b/src/mame/drivers/mcr3.cpp
@@ -259,11 +259,11 @@ WRITE8_MEMBER(mcr3_state::maxrpm_op6_w)
/* when the read is toggled is when the ADC value is latched */
if (!(data & 0x80))
- m_latched_input = m_maxrpm_adc->read(space, 0);
+ m_latched_input = m_maxrpm_adc->read();
/* when both the write and the enable are low, it's a write to the ADC0844 */
if (!(data & 0x40) && !(data & 0x20))
- m_maxrpm_adc->write(space, 0, bitswap<4>(m_maxrpm_adc_control, 2, 3, 1, 0));
+ m_maxrpm_adc->write(bitswap<4>(m_maxrpm_adc_control, 2, 3, 1, 0));
/* low 5 bits control the turbo CS */
m_turbo_cheap_squeak->write(space, offset, data);
diff --git a/src/mame/drivers/mcr68.cpp b/src/mame/drivers/mcr68.cpp
index dd65f5ce8db..0116142792a 100644
--- a/src/mame/drivers/mcr68.cpp
+++ b/src/mame/drivers/mcr68.cpp
@@ -107,7 +107,7 @@ WRITE16_MEMBER(mcr68_state::blasted_control_w)
READ16_MEMBER(mcr68_state::spyhunt2_port_0_r)
{
int result = ioport("IN0")->read();
- int analog = m_adc->read(space, 0);
+ int analog = m_adc->read();
return result | ((m_sounds_good->read(space, 0) & 1) << 5) | (analog << 8);
}
@@ -130,7 +130,7 @@ WRITE16_MEMBER(mcr68_state::spyhunt2_control_w)
m_sounds_good->reset_write(~m_control_word & 0x2000);
m_sounds_good->write(space, offset, (m_control_word >> 8) & 0x001f);
- m_adc->write(space, 0, (m_control_word >> 3) & 0x0f);
+ m_adc->write((m_control_word >> 3) & 0x0f);
}
diff --git a/src/mame/drivers/midvunit.cpp b/src/mame/drivers/midvunit.cpp
index 53e18a7f9d3..c70bc8301d7 100644
--- a/src/mame/drivers/midvunit.cpp
+++ b/src/mame/drivers/midvunit.cpp
@@ -121,7 +121,7 @@ READ32_MEMBER(midvunit_state::port0_r)
READ32_MEMBER( midvunit_state::adc_r )
{
if (!(m_control_data & 0x40))
- return m_adc->read(space, 0) << m_adc_shift;
+ return m_adc->read() << m_adc_shift;
else
logerror("adc_r without enabling reads!\n");
@@ -131,7 +131,7 @@ READ32_MEMBER( midvunit_state::adc_r )
WRITE32_MEMBER( midvunit_state::adc_w )
{
if (!(m_control_data & 0x20))
- m_adc->write(space, 0, data >> m_adc_shift);
+ m_adc->write(data >> m_adc_shift);
else
logerror("adc_w without enabling writes!\n");
}
diff --git a/src/mame/machine/midyunit.cpp b/src/mame/machine/midyunit.cpp
index d622bd2af74..a959e493516 100644
--- a/src/mame/machine/midyunit.cpp
+++ b/src/mame/machine/midyunit.cpp
@@ -130,7 +130,7 @@ READ16_MEMBER(midyunit_state::term2_input_r)
if (offset != 2)
return m_ports[offset]->read();
- return m_term2_adc->read(space, 0) | 0xff00;
+ return m_term2_adc->read() | 0xff00;
}
WRITE16_MEMBER(midyunit_state::term2_sound_w)
@@ -160,7 +160,7 @@ WRITE16_MEMBER(midyunit_state::term2_sound_w)
}
if (offset == 0)
- m_term2_adc->write(space, 0, ((data >> 12) & 3) | 4);
+ m_term2_adc->write(((data >> 12) & 3) | 4);
m_adpcm_sound->reset_write((~data & 0x100) >> 1);
m_adpcm_sound->write(data);