From 79195d379d10c354731ed9dfe800c27002e22b3c Mon Sep 17 00:00:00 2001 From: cam900 Date: Fri, 1 Feb 2019 20:42:41 +0900 Subject: midwayic.cpp : Reduce unnecessary arguments in handlers --- src/mame/drivers/midvunit.cpp | 12 ++++++------ src/mame/machine/midwayic.cpp | 20 ++++++++++---------- src/mame/machine/midwayic.h | 12 ++++++------ src/mame/machine/midwunit.cpp | 6 +++--- src/mame/machine/midxunit.cpp | 6 +++--- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/mame/drivers/midvunit.cpp b/src/mame/drivers/midvunit.cpp index 53e18a7f9d3..b20b6f80ea6 100644 --- a/src/mame/drivers/midvunit.cpp +++ b/src/mame/drivers/midvunit.cpp @@ -280,14 +280,14 @@ WRITE32_MEMBER(midvunit_state::tms32031_control_w) READ32_MEMBER(midvunit_state::crusnwld_serial_status_r) { - uint16_t in1 = (m_in1->read() & 0x7fff) | (m_midway_serial_pic->status_r(space,0) << 15); + uint16_t in1 = (m_in1->read() & 0x7fff) | (m_midway_serial_pic->status_r() << 15); return in1 | in1 << 16; } READ32_MEMBER(midvunit_state::crusnwld_serial_data_r) { - return m_midway_serial_pic->read(space,0) << 16; + return m_midway_serial_pic->read() << 16; } @@ -298,7 +298,7 @@ WRITE32_MEMBER(midvunit_state::crusnwld_serial_data_w) m_midway_serial_pic->reset_w(1); m_midway_serial_pic->reset_w(0); } - m_midway_serial_pic->write(space,0,data >> 16); + m_midway_serial_pic->write(data >> 16); } @@ -342,20 +342,20 @@ WRITE32_MEMBER(midvunit_state::bit_reset_w) READ32_MEMBER(midvunit_state::offroadc_serial_status_r) { - uint16_t in1 = (m_in1->read() & 0x7fff) | (m_midway_serial_pic2->status_r(space,0) << 15); + uint16_t in1 = (m_in1->read() & 0x7fff) | (m_midway_serial_pic2->status_r() << 15); return in1 | in1 << 16; } READ32_MEMBER(midvunit_state::offroadc_serial_data_r) { - return m_midway_serial_pic2->read(space, 0) << 16; + return m_midway_serial_pic2->read() << 16; } WRITE32_MEMBER(midvunit_state::offroadc_serial_data_w) { - m_midway_serial_pic2->write(space, 0, data >> 16); + m_midway_serial_pic2->write(data >> 16); } READ32_MEMBER(midvunit_state::midvunit_wheel_board_r) diff --git a/src/mame/machine/midwayic.cpp b/src/mame/machine/midwayic.cpp index dad2c5fa7c6..02b727b7acb 100644 --- a/src/mame/machine/midwayic.cpp +++ b/src/mame/machine/midwayic.cpp @@ -183,13 +183,13 @@ WRITE_LINE_MEMBER(midway_serial_pic_device::reset_w) } -READ8_MEMBER(midway_serial_pic_device::status_r) +u8 midway_serial_pic_device::status_r() { return m_status; } -READ8_MEMBER(midway_serial_pic_device::read) +u8 midway_serial_pic_device::read() { logerror("%s:security R = %04X\n", machine().describe_context(), m_buff); m_status = 1; @@ -197,7 +197,7 @@ READ8_MEMBER(midway_serial_pic_device::read) } -WRITE8_MEMBER(midway_serial_pic_device::write) +void midway_serial_pic_device::write(u8 data) { logerror("%s:security W = %04X\n", machine().describe_context(), data); @@ -386,7 +386,7 @@ void midway_serial_pic2_device::set_default_nvram(const uint8_t *nvram) } -READ8_MEMBER(midway_serial_pic2_device::status_r) +u8 midway_serial_pic2_device::status_r() { uint8_t result = 0; @@ -405,7 +405,7 @@ READ8_MEMBER(midway_serial_pic2_device::status_r) } -READ8_MEMBER(midway_serial_pic2_device::read) +u8 midway_serial_pic2_device::read() { uint8_t result = 0; @@ -425,7 +425,7 @@ READ8_MEMBER(midway_serial_pic2_device::read) } -WRITE8_MEMBER(midway_serial_pic2_device::write) +void midway_serial_pic2_device::write(u8 data) { static FILE *nvramlog; if (LOG_NVRAM && !nvramlog) @@ -1060,7 +1060,7 @@ READ32_MEMBER( midway_ioasic_device::read ) break; case IOASIC_PICIN: - result = midway_serial_pic2_device::read(space,0) | (midway_serial_pic2_device::status_r(space,0) << 8); + result = midway_serial_pic2_device::read() | (midway_serial_pic2_device::status_r() << 8); break; default: @@ -1193,11 +1193,11 @@ WRITE32_MEMBER( midway_ioasic_device::write ) case IOASIC_PICOUT: if (m_shuffle_type == MIDWAY_IOASIC_VAPORTRX) - midway_serial_pic2_device::write(space, 0, newreg ^ 0x0a); + midway_serial_pic2_device::write(newreg ^ 0x0a); else if (m_shuffle_type == MIDWAY_IOASIC_SFRUSHRK) - midway_serial_pic2_device::write(space, 0, newreg ^ 0x05); + midway_serial_pic2_device::write(newreg ^ 0x05); else - midway_serial_pic2_device::write(space, 0, newreg); + midway_serial_pic2_device::write(newreg); break; case IOASIC_PICIN: diff --git a/src/mame/machine/midwayic.h b/src/mame/machine/midwayic.h index 420d131d9c8..4e0a18a36d8 100644 --- a/src/mame/machine/midwayic.h +++ b/src/mame/machine/midwayic.h @@ -25,9 +25,9 @@ public: void set_upper(int upper) { m_upper = upper; } - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - DECLARE_READ8_MEMBER( status_r ); + u8 read(); + void write(u8 data); + u8 status_r(); DECLARE_WRITE_LINE_MEMBER( reset_w ); protected: @@ -100,9 +100,9 @@ public: void set_yearoffs(int yearoffs) { m_yearoffs = yearoffs; } - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - DECLARE_READ8_MEMBER( status_r ); + u8 read(); + void write(u8 data); + u8 status_r(); void set_default_nvram(const uint8_t *nvram); diff --git a/src/mame/machine/midwunit.cpp b/src/mame/machine/midwunit.cpp index f37dbe5deee..cacd27d68a9 100644 --- a/src/mame/machine/midwunit.cpp +++ b/src/mame/machine/midwunit.cpp @@ -118,7 +118,7 @@ READ16_MEMBER(midwunit_state::midwunit_io_r) case 4: { int picret = 0; - if (m_midway_serial_pic) picret = m_midway_serial_pic->status_r(space, 0); + if (m_midway_serial_pic) picret = m_midway_serial_pic->status_r(); return (picret << 12) | midwunit_sound_state_r(space, 0, 0xffff); } @@ -335,7 +335,7 @@ void midwunit_state::machine_reset() READ16_MEMBER(midwunit_state::midwunit_security_r) { uint16_t picret = 0; - if (m_midway_serial_pic) picret = m_midway_serial_pic->read(space, 0); + if (m_midway_serial_pic) picret = m_midway_serial_pic->read(); return picret; } @@ -344,7 +344,7 @@ WRITE16_MEMBER(midwunit_state::midwunit_security_w) { if (offset == 0 && ACCESSING_BITS_0_7) { - if (m_midway_serial_pic) m_midway_serial_pic->write(space, 0, data); + if (m_midway_serial_pic) m_midway_serial_pic->write(data); } } diff --git a/src/mame/machine/midxunit.cpp b/src/mame/machine/midxunit.cpp index a597eff9c4e..9ac0370eafa 100644 --- a/src/mame/machine/midxunit.cpp +++ b/src/mame/machine/midxunit.cpp @@ -107,7 +107,7 @@ WRITE_LINE_MEMBER(midxunit_state::adc_int_w) READ16_MEMBER(midxunit_state::midxunit_status_r) { /* low bit indicates whether the ADC is done reading the current input */ - return (m_midway_serial_pic->status_r(space,0) << 1) | (m_adc_int ? 1 : 0); + return (m_midway_serial_pic->status_r() << 1) | (m_adc_int ? 1 : 0); } @@ -280,7 +280,7 @@ void midxunit_state::machine_reset() READ16_MEMBER(midxunit_state::midxunit_security_r) { - return m_midway_serial_pic->read(space,0); + return m_midway_serial_pic->read(); } WRITE16_MEMBER(midxunit_state::midxunit_security_w) @@ -293,7 +293,7 @@ WRITE16_MEMBER(midxunit_state::midxunit_security_w) WRITE16_MEMBER(midxunit_state::midxunit_security_clock_w) { if (offset == 0 && ACCESSING_BITS_0_7) - m_midway_serial_pic->write(space, 0, ((~data & 2) << 3) | m_security_bits); + m_midway_serial_pic->write(((~data & 2) << 3) | m_security_bits); } -- cgit v1.2.3