From 7161db4b829eb55fa5f79f7cf0e5d68226f7414e Mon Sep 17 00:00:00 2001 From: cam900 Date: Mon, 4 Feb 2019 07:28:39 +0900 Subject: [PATCH] adc0808.cpp : Remove unnecessary arguments in handlers --- src/devices/machine/adc0808.cpp | 14 +++++++------- src/devices/machine/adc0808.h | 8 ++++---- src/mame/drivers/atarig1.cpp | 4 ++-- src/mame/drivers/atarig42.cpp | 6 +++--- src/mame/drivers/atarigt.cpp | 4 ++-- src/mame/drivers/atarigx2.cpp | 4 ++-- src/mame/drivers/atarisy1.cpp | 4 ++-- src/mame/drivers/backfire.cpp | 2 +- src/mame/drivers/eprom.cpp | 4 ++-- src/mame/drivers/ssv.cpp | 4 ++-- src/mame/drivers/tomcat.cpp | 2 +- src/mame/machine/harddriv.cpp | 2 +- src/mame/machine/vertigo.cpp | 2 +- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/devices/machine/adc0808.cpp b/src/devices/machine/adc0808.cpp index 5f8aeb8f93c..11aafe276fb 100644 --- a/src/devices/machine/adc0808.cpp +++ b/src/devices/machine/adc0808.cpp @@ -156,7 +156,7 @@ void adc0808_device::device_timer(emu_timer &timer, device_timer_id id, int para // INTERFACE //************************************************************************** -READ8_MEMBER( adc0808_device::data_r ) +u8 adc0808_device::data_r() { if (!machine().side_effects_disabled()) { @@ -170,7 +170,7 @@ READ8_MEMBER( adc0808_device::data_r ) return m_sar; } -WRITE8_MEMBER( adc0808_device::address_w ) +void adc0808_device::address_w(u8 data) { m_address = data & 7; } @@ -198,22 +198,22 @@ READ_LINE_MEMBER( adc0808_device::eoc_r ) return m_eoc; } -WRITE8_MEMBER( adc0808_device::address_offset_start_w ) +void adc0808_device::address_offset_start_w(offs_t offset, u8 data) { if (VERBOSE) logerror("address_offset_start_w %02x %02x\n", offset, data); start_w(1); - address_w(space, 0, offset); + address_w(offset); start_w(0); } -WRITE8_MEMBER( adc0808_device::address_data_start_w ) +void adc0808_device::address_data_start_w(u8 data) { if (VERBOSE) - logerror("address_data_start_w %02x %02x\n", offset, data); + logerror("address_data_start_w %02x\n", data); start_w(1); - address_w(space, 0, data); + address_w(data); start_w(0); } diff --git a/src/devices/machine/adc0808.h b/src/devices/machine/adc0808.h index 46943998dca..1fa97aff47e 100644 --- a/src/devices/machine/adc0808.h +++ b/src/devices/machine/adc0808.h @@ -51,14 +51,14 @@ public: auto eoc_ff_callback() { return m_eoc_ff_cb.bind(); } template auto in_callback() { return m_in_cb[Bit].bind(); } - DECLARE_READ8_MEMBER(data_r); - DECLARE_WRITE8_MEMBER(address_w); + u8 data_r(); + void address_w(u8 data); DECLARE_WRITE_LINE_MEMBER(start_w); DECLARE_READ_LINE_MEMBER(eoc_r); // common hookups - DECLARE_WRITE8_MEMBER(address_offset_start_w); // start and ale connected, address to the address bus - DECLARE_WRITE8_MEMBER(address_data_start_w); // start and ale connected, address to the data bus + void address_offset_start_w(offs_t offset, u8 data); // start and ale connected, address to the address bus + void address_data_start_w(u8 data); // start and ale connected, address to the data bus protected: adc0808_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/mame/drivers/atarig1.cpp b/src/mame/drivers/atarig1.cpp index 4e360ca8267..5b74490ba52 100644 --- a/src/mame/drivers/atarig1.cpp +++ b/src/mame/drivers/atarig1.cpp @@ -78,14 +78,14 @@ WRITE16_MEMBER(atarig1_state::mo_command_w) WRITE16_MEMBER(atarig1_state::a2d_select_w) { if (m_adc.found()) - m_adc->address_offset_start_w(space, offset, 0); + m_adc->address_offset_start_w(offset, 0); } READ16_MEMBER(atarig1_state::a2d_data_r) { if (m_adc.found()) - return m_adc->data_r(space, offset) << 8; + return m_adc->data_r() << 8; else return m_in1->read(); } diff --git a/src/mame/drivers/atarig42.cpp b/src/mame/drivers/atarig42.cpp index 520a76e39a8..e068a84576e 100644 --- a/src/mame/drivers/atarig42.cpp +++ b/src/mame/drivers/atarig42.cpp @@ -67,7 +67,7 @@ void atarig42_state::machine_reset() WRITE8_MEMBER(atarig42_state::a2d_select_w) { if (m_adc.found()) - m_adc->address_offset_start_w(space, offset, 0); + m_adc->address_offset_start_w(offset, 0); } @@ -76,9 +76,9 @@ READ8_MEMBER(atarig42_state::a2d_data_r) if (!m_adc.found()) return 0xff; - uint8_t result = m_adc->data_r(space, 0); + uint8_t result = m_adc->data_r(); if (!machine().side_effects_disabled()) - m_adc->address_offset_start_w(space, offset, 0); + m_adc->address_offset_start_w(offset, 0); return result; } diff --git a/src/mame/drivers/atarigt.cpp b/src/mame/drivers/atarigt.cpp index 78ce47bb16a..05cbacb2387 100644 --- a/src/mame/drivers/atarigt.cpp +++ b/src/mame/drivers/atarigt.cpp @@ -185,9 +185,9 @@ READ8_MEMBER(atarigt_state::analog_port_r) return 0xff; } #else - uint8_t result = m_adc->data_r(space, 0); + uint8_t result = m_adc->data_r(); if (!machine().side_effects_disabled()) - m_adc->address_offset_start_w(space, offset, 0); + m_adc->address_offset_start_w(offset, 0); return result; #endif } diff --git a/src/mame/drivers/atarigx2.cpp b/src/mame/drivers/atarigx2.cpp index 330245e37e5..eeff921d54e 100644 --- a/src/mame/drivers/atarigx2.cpp +++ b/src/mame/drivers/atarigx2.cpp @@ -77,9 +77,9 @@ READ32_MEMBER(atarigx2_state::special_port3_r) READ8_MEMBER(atarigx2_state::a2d_data_r) { - uint8_t result = m_adc->data_r(space, 0); + uint8_t result = m_adc->data_r(); if (!machine().side_effects_disabled()) - m_adc->address_offset_start_w(space, offset, 0); + m_adc->address_offset_start_w(offset, 0); return result; } diff --git a/src/mame/drivers/atarisy1.cpp b/src/mame/drivers/atarisy1.cpp index 2c56c093bb1..b2fea90b635 100644 --- a/src/mame/drivers/atarisy1.cpp +++ b/src/mame/drivers/atarisy1.cpp @@ -261,7 +261,7 @@ READ8_MEMBER(atarisy1_state::adc_r) if (!m_adc.found()) return 0xff; - int value = m_adc->data_r(space, 0); + int value = m_adc->data_r(); if (!machine().side_effects_disabled()) adc_w(space, offset, 0); @@ -275,7 +275,7 @@ WRITE8_MEMBER(atarisy1_state::adc_w) if (!m_adc.found()) return; - m_adc->address_offset_start_w(space, offset & 7, 0); + m_adc->address_offset_start_w(offset & 7, 0); /* the A4 bit enables/disables joystick IRQs */ m_ajsint->in_w<0>(!BIT(offset, 3)); diff --git a/src/mame/drivers/backfire.cpp b/src/mame/drivers/backfire.cpp index 7cc6d9a3bc7..10245224097 100644 --- a/src/mame/drivers/backfire.cpp +++ b/src/mame/drivers/backfire.cpp @@ -194,7 +194,7 @@ template WRITE32_MEMBER(backfire_state::pf_rowscroll_w){ data &= 0x00 READ32_MEMBER(backfire_state::pot_select_r) { if (!machine().side_effects_disabled()) - m_adc->address_offset_start_w(space, offset, 0); + m_adc->address_offset_start_w(offset, 0); return 0; } diff --git a/src/mame/drivers/eprom.cpp b/src/mame/drivers/eprom.cpp index e79e96bd01e..8383a941b6a 100644 --- a/src/mame/drivers/eprom.cpp +++ b/src/mame/drivers/eprom.cpp @@ -83,9 +83,9 @@ READ8_MEMBER(eprom_state::adc_r) if (!m_adc.found()) return 0xff; - uint8_t result = m_adc->data_r(space, 0); + uint8_t result = m_adc->data_r(); if (!machine().side_effects_disabled()) - m_adc->address_offset_start_w(space, offset, 0); + m_adc->address_offset_start_w(offset, 0); return result; } diff --git a/src/mame/drivers/ssv.cpp b/src/mame/drivers/ssv.cpp index 1f6e65e7c1c..b3e49b25fe5 100644 --- a/src/mame/drivers/ssv.cpp +++ b/src/mame/drivers/ssv.cpp @@ -455,7 +455,7 @@ void ssv_state::drifto94_map(address_map &map) READ16_MEMBER(ssv_state::gdfs_eeprom_r) { - return m_adc->data_r(space, 0) | (m_eeprom->do_read() << 8); + return m_adc->data_r() | (m_eeprom->do_read() << 8); } WRITE16_MEMBER(ssv_state::gdfs_eeprom_w) @@ -477,7 +477,7 @@ WRITE16_MEMBER(ssv_state::gdfs_eeprom_w) // clock line asserted: write latch or select next bit to read m_eeprom->clk_write(BIT(data, 13) ? ASSERT_LINE : CLEAR_LINE); - m_adc->address_w(space, 0, (data & 0x0700) >> 8); + m_adc->address_w((data & 0x0700) >> 8); m_adc->start_w(BIT(data, 11)); } } diff --git a/src/mame/drivers/tomcat.cpp b/src/mame/drivers/tomcat.cpp index af778e84c07..394b5a34553 100644 --- a/src/mame/drivers/tomcat.cpp +++ b/src/mame/drivers/tomcat.cpp @@ -97,7 +97,7 @@ private: WRITE8_MEMBER(tomcat_state::adcon_w) { - m_adc->address_w(space, 0, data & 7); + m_adc->address_w(data & 7); m_adc->start_w(BIT(data, 3)); } diff --git a/src/mame/machine/harddriv.cpp b/src/mame/machine/harddriv.cpp index fbae3bc7b54..f41f81b0c63 100644 --- a/src/mame/machine/harddriv.cpp +++ b/src/mame/machine/harddriv.cpp @@ -312,7 +312,7 @@ WRITE16_MEMBER( harddriv_state::hd68k_adc_control_w ) COMBINE_DATA(&m_adc_control); /* handle a write to the 8-bit ADC address select */ - m_adc8->address_w(space, 0, m_adc_control & 0x07); + m_adc8->address_w(m_adc_control & 0x07); m_adc8->start_w(BIT(m_adc_control, 3)); /* handle a write to the 12-bit ADC address select */ diff --git a/src/mame/machine/vertigo.cpp b/src/mame/machine/vertigo.cpp index da3ea2c1ef6..887b2a52fab 100644 --- a/src/mame/machine/vertigo.cpp +++ b/src/mame/machine/vertigo.cpp @@ -69,7 +69,7 @@ WRITE_LINE_MEMBER( vertigo_state::adc_eoc_w ) READ16_MEMBER(vertigo_state::vertigo_io_convert) { - m_adc->address_offset_start_w(space, offset, 0); + m_adc->address_offset_start_w(offset, 0); return 0; }