diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2019-07-19 09:51:01 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2019-07-19 09:51:01 -0400 |
commit | 103b33e7380220ad0e62ea9e2c4b1acc97d49bf7 (patch) | |
tree | 520d57e3b68be25284bc939ab9d9011a553d559e | |
parent | a8221fdf4b343a2982e444c5c226bff64306232a (diff) |
bzone, redbaron: Simplify handlers; silence some dummy reads (nw)
-rw-r--r-- | src/mame/audio/bzone.cpp | 2 | ||||
-rw-r--r-- | src/mame/audio/redbaron.cpp | 2 | ||||
-rw-r--r-- | src/mame/audio/redbaron.h | 2 | ||||
-rw-r--r-- | src/mame/drivers/bzone.cpp | 28 | ||||
-rw-r--r-- | src/mame/includes/bzone.h | 18 |
5 files changed, 26 insertions, 26 deletions
diff --git a/src/mame/audio/bzone.cpp b/src/mame/audio/bzone.cpp index 8172d686685..9e0567aa57d 100644 --- a/src/mame/audio/bzone.cpp +++ b/src/mame/audio/bzone.cpp @@ -388,7 +388,7 @@ static DISCRETE_SOUND_START(bzone_discrete) DISCRETE_SOUND_END -WRITE8_MEMBER(bzone_state::bzone_sounds_w) +void bzone_state::bzone_sounds_w(uint8_t data) { m_discrete->write(BZ_INPUT, data); diff --git a/src/mame/audio/redbaron.cpp b/src/mame/audio/redbaron.cpp index edf8a8c901c..4e1f9d2a85b 100644 --- a/src/mame/audio/redbaron.cpp +++ b/src/mame/audio/redbaron.cpp @@ -219,7 +219,7 @@ void redbaron_sound_device::sound_stream_update(sound_stream &stream, stream_sam } -WRITE8_MEMBER( redbaron_sound_device::sounds_w ) +void redbaron_sound_device::sounds_w(uint8_t data) { /* If sound is off, don't bother playing samples */ if( data == m_latch ) diff --git a/src/mame/audio/redbaron.h b/src/mame/audio/redbaron.h index 2294d905fda..c5c81cb3264 100644 --- a/src/mame/audio/redbaron.h +++ b/src/mame/audio/redbaron.h @@ -14,7 +14,7 @@ class redbaron_sound_device : public device_t, public device_sound_interface public: redbaron_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( sounds_w ); + void sounds_w(uint8_t data); protected: // device-level overrides diff --git a/src/mame/drivers/bzone.cpp b/src/mame/drivers/bzone.cpp index ea90f27e544..cc8fc1e7753 100644 --- a/src/mame/drivers/bzone.cpp +++ b/src/mame/drivers/bzone.cpp @@ -242,7 +242,7 @@ void redbaron_state::machine_start() void redbaron_state::machine_reset() { - earom_control_w(machine().dummy_space(), 0, 0); + earom_control_w(0); } @@ -273,7 +273,7 @@ CUSTOM_INPUT_MEMBER(bzone_state::clock_r) } -WRITE8_MEMBER(bzone_state::bzone_coin_counter_w) +void bzone_state::bzone_coin_counter_w(offs_t offset, uint8_t data) { machine().bookkeeping().coin_counter_w(offset,data); } @@ -286,15 +286,15 @@ WRITE8_MEMBER(bzone_state::bzone_coin_counter_w) * *************************************/ -READ8_MEMBER(redbaron_state::redbaron_joy_r) +uint8_t redbaron_state::redbaron_joy_r() { return m_fake_ports[m_rb_input_select ? 0 : 1]->read(); } -WRITE8_MEMBER(redbaron_state::redbaron_joysound_w) +void redbaron_state::redbaron_joysound_w(uint8_t data) { m_rb_input_select = data & 1; - m_redbaronsound->sounds_w(space, offset, data); + m_redbaronsound->sounds_w(data); } @@ -305,18 +305,18 @@ WRITE8_MEMBER(redbaron_state::redbaron_joysound_w) * *************************************/ -READ8_MEMBER(redbaron_state::earom_read) +uint8_t redbaron_state::earom_read() { return m_earom->data(); } -WRITE8_MEMBER(redbaron_state::earom_write) +void redbaron_state::earom_write(offs_t offset, uint8_t data) { m_earom->set_address((offset ^ 0x20) & 0x3f); m_earom->set_data(data); } -WRITE8_MEMBER(redbaron_state::earom_control_w) +void redbaron_state::earom_control_w(uint8_t data) { // CK = EDB0, C1 = /EDB2, C2 = EDB1, CS1 = EDB3, /CS2 = GND m_earom->set_control(BIT(data, 3), 1, !BIT(data, 2), BIT(data, 1)); @@ -369,10 +369,10 @@ void redbaron_state::redbaron_map(address_map &map) map(0x1806, 0x1806).r("mathbox", FUNC(mathbox_device::hi_r)); map(0x1808, 0x1808).w(FUNC(redbaron_state::redbaron_joysound_w)); /* and select joystick pot also */ map(0x180a, 0x180a).nopw(); /* sound reset, yet todo */ - map(0x180c, 0x180c).w(FUNC(redbaron_state::earom_control_w)); + map(0x180c, 0x180c).nopr().w(FUNC(redbaron_state::earom_control_w)); map(0x1810, 0x181f).rw("pokey", FUNC(pokey_device::read), FUNC(pokey_device::write)); map(0x1820, 0x185f).rw(FUNC(redbaron_state::earom_read), FUNC(redbaron_state::earom_write)); - map(0x1860, 0x187f).w("mathbox", FUNC(mathbox_device::go_w)); + map(0x1860, 0x187f).nopr().w("mathbox", FUNC(mathbox_device::go_w)); map(0x2000, 0x2fff).ram().share("avg:vectorram").region("maincpu", 0x2000); map(0x3000, 0x7fff).rom(); } @@ -875,13 +875,13 @@ ROM_END * *************************************/ -READ8_MEMBER(bzone_state::analog_data_r) +uint8_t bzone_state::analog_data_r() { return m_analog_data; } -WRITE8_MEMBER(bzone_state::analog_select_w) +void bzone_state::analog_select_w(offs_t offset, uint8_t data) { static const char *const analog_port[] = { "AN0", "AN1", "AN2" }; @@ -896,8 +896,8 @@ void bzone_state::init_bradley() space.install_ram(0x400, 0x7ff); space.install_read_port(0x1808, 0x1808, "1808"); space.install_read_port(0x1809, 0x1809, "1809"); - space.install_read_handler(0x180a, 0x180a, read8_delegate(FUNC(bzone_state::analog_data_r),this)); - space.install_write_handler(0x1848, 0x1850, write8_delegate(FUNC(bzone_state::analog_select_w),this)); + space.install_read_handler(0x180a, 0x180a, read8smo_delegate(FUNC(bzone_state::analog_data_r),this)); + space.install_write_handler(0x1848, 0x1850, write8sm_delegate(FUNC(bzone_state::analog_select_w),this)); } diff --git a/src/mame/includes/bzone.h b/src/mame/includes/bzone.h index e59b94dd50e..b72ce44ca3a 100644 --- a/src/mame/includes/bzone.h +++ b/src/mame/includes/bzone.h @@ -36,12 +36,12 @@ public: void bzone(machine_config &config); protected: - DECLARE_WRITE8_MEMBER(bzone_coin_counter_w); - DECLARE_READ8_MEMBER(analog_data_r); - DECLARE_WRITE8_MEMBER(analog_select_w); + void bzone_coin_counter_w(offs_t offset, uint8_t data); + uint8_t analog_data_r(); + void analog_select_w(offs_t offset, uint8_t data); virtual void machine_start() override; INTERRUPT_GEN_MEMBER(bzone_interrupt); - DECLARE_WRITE8_MEMBER(bzone_sounds_w); + void bzone_sounds_w(uint8_t data); void bzone_base(machine_config &config); void bzone_audio(machine_config &config); @@ -71,11 +71,11 @@ public: void redbaron(machine_config &config); protected: - DECLARE_READ8_MEMBER(redbaron_joy_r); - DECLARE_WRITE8_MEMBER(redbaron_joysound_w); - DECLARE_READ8_MEMBER(earom_read); - DECLARE_WRITE8_MEMBER(earom_write); - DECLARE_WRITE8_MEMBER(earom_control_w); + uint8_t redbaron_joy_r(); + void redbaron_joysound_w(uint8_t data); + uint8_t earom_read(); + void earom_write(offs_t offset, uint8_t data); + void earom_control_w(uint8_t data); virtual void machine_start() override; virtual void machine_reset() override; |