diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2017-08-21 11:41:17 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2017-08-21 11:41:17 -0400 |
commit | 27600407666e5222233ae298c88c9da181266937 (patch) | |
tree | 4b83d53efecccda0d3cde396e7c0472990b80cac | |
parent | 00573e79769d743621ed13f71507bd2bc638e059 (diff) |
m72_audio_device: ACCESSING_BITS cleanup (nw)
-rw-r--r-- | src/mame/audio/m72.cpp | 11 | ||||
-rw-r--r-- | src/mame/audio/m72.h | 21 | ||||
-rw-r--r-- | src/mame/drivers/m72.cpp | 12 | ||||
-rw-r--r-- | src/mame/drivers/m90.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/shisen.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/vigilant.cpp | 4 |
6 files changed, 21 insertions, 31 deletions
diff --git a/src/mame/audio/m72.cpp b/src/mame/audio/m72.cpp index ced76a57daf..d7a30e94673 100644 --- a/src/mame/audio/m72.cpp +++ b/src/mame/audio/m72.cpp @@ -125,16 +125,7 @@ WRITE_LINE_MEMBER(m72_audio_device::ym2151_irq_handler) machine().scheduler().synchronize(timer_expired_delegate(FUNC(m72_audio_device::setvector_callback), this), state ? YM2151_ASSERT : YM2151_CLEAR); } -WRITE16_MEMBER( m72_audio_device::sound_command_w ) -{ - if (ACCESSING_BITS_0_7) - { - m_soundlatch->write(*m_space, offset, data); - space.machine().scheduler().synchronize(timer_expired_delegate(FUNC(m72_audio_device::setvector_callback), this), Z80_ASSERT); - } -} - -WRITE8_MEMBER( m72_audio_device::sound_command_byte_w ) +WRITE8_MEMBER( m72_audio_device::sound_command_w ) { m_soundlatch->write(*m_space, offset, data); space.machine().scheduler().synchronize(timer_expired_delegate(FUNC(m72_audio_device::setvector_callback), this), Z80_ASSERT); diff --git a/src/mame/audio/m72.h b/src/mame/audio/m72.h index b5ccf69cb01..b091391d8cf 100644 --- a/src/mame/audio/m72.h +++ b/src/mame/audio/m72.h @@ -27,19 +27,18 @@ public: Z80_CLEAR }; - WRITE_LINE_MEMBER( ym2151_irq_handler ); - DECLARE_WRITE8_MEMBER( sound_command_byte_w ); - DECLARE_WRITE16_MEMBER( sound_command_w ); - DECLARE_WRITE8_MEMBER(sound_irq_ack_w ); - DECLARE_READ8_MEMBER( sample_r ); - DECLARE_WRITE8_MEMBER( sample_w ); + WRITE_LINE_MEMBER(ym2151_irq_handler); + DECLARE_WRITE8_MEMBER(sound_command_w); + DECLARE_WRITE8_MEMBER(sound_irq_ack_w); + DECLARE_READ8_MEMBER(sample_r); + DECLARE_WRITE8_MEMBER(sample_w); /* the port goes to different address bits depending on the game */ - void set_sample_start( int start ); - DECLARE_WRITE8_MEMBER( vigilant_sample_addr_w ); - DECLARE_WRITE8_MEMBER( shisen_sample_addr_w ); - DECLARE_WRITE8_MEMBER( rtype2_sample_addr_w ); - DECLARE_WRITE8_MEMBER( poundfor_sample_addr_w ); + void set_sample_start(int start); + DECLARE_WRITE8_MEMBER(vigilant_sample_addr_w); + DECLARE_WRITE8_MEMBER(shisen_sample_addr_w); + DECLARE_WRITE8_MEMBER(rtype2_sample_addr_w); + DECLARE_WRITE8_MEMBER(poundfor_sample_addr_w); protected: // device-level overrides diff --git a/src/mame/drivers/m72.cpp b/src/mame/drivers/m72.cpp index e3fe87a5a5b..d07c5aceb47 100644 --- a/src/mame/drivers/m72.cpp +++ b/src/mame/drivers/m72.cpp @@ -947,7 +947,7 @@ static ADDRESS_MAP_START( m72_portmap, AS_IO, 16, m72_state ) AM_RANGE(0x00, 0x01) AM_READ_PORT("IN0") AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1") AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW") - AM_RANGE(0x00, 0x01) AM_DEVWRITE("m72", m72_audio_device, sound_command_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE8("m72", m72_audio_device, sound_command_w, 0x00ff) AM_RANGE(0x02, 0x03) AM_WRITE8(port02_w, 0x00ff) /* coin counters, reset sound cpu, other stuff? */ AM_RANGE(0x04, 0x05) AM_WRITE(dmaon_w) AM_RANGE(0x06, 0x07) AM_WRITE(irq_line_w) @@ -963,7 +963,7 @@ static ADDRESS_MAP_START( m84_portmap, AS_IO, 16, m72_state ) AM_RANGE(0x00, 0x01) AM_READ_PORT("IN0") AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1") AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW") - AM_RANGE(0x00, 0x01) AM_DEVWRITE("m72", m72_audio_device, sound_command_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE8("m72", m72_audio_device, sound_command_w, 0x00ff) AM_RANGE(0x02, 0x03) AM_WRITE8(rtype2_port02_w, 0x00ff) AM_RANGE(0x40, 0x43) AM_DEVREADWRITE8("upd71059c", pic8259_device, read, write, 0x00ff) AM_RANGE(0x80, 0x81) AM_WRITE(scrolly1_w) @@ -976,7 +976,7 @@ static ADDRESS_MAP_START( m84_v33_portmap, AS_IO, 16, m72_state ) AM_RANGE(0x00, 0x01) AM_READ_PORT("IN0") AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1") AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW") - AM_RANGE(0x00, 0x01) AM_DEVWRITE("m72", m72_audio_device, sound_command_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE8("m72", m72_audio_device, sound_command_w, 0x00ff) AM_RANGE(0x02, 0x03) AM_WRITE8(rtype2_port02_w, 0x00ff) AM_RANGE(0x80, 0x81) AM_WRITE(scrolly1_w) AM_RANGE(0x82, 0x83) AM_WRITE(scrollx1_w) @@ -991,7 +991,7 @@ static ADDRESS_MAP_START( poundfor_portmap, AS_IO, 16, m72_state ) AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW") AM_RANGE(0x08, 0x0f) AM_DEVREAD8("upd4701l", upd4701_device, read_xy, 0x00ff) AM_RANGE(0x08, 0x0f) AM_DEVREAD8("upd4701h", upd4701_device, read_xy, 0xff00) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("m72", m72_audio_device, sound_command_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE8("m72", m72_audio_device, sound_command_w, 0x00ff) AM_RANGE(0x02, 0x03) AM_WRITE8(poundfor_port02_w, 0x00ff) AM_RANGE(0x40, 0x43) AM_DEVREADWRITE8("upd71059c", pic8259_device, read, write, 0x00ff) AM_RANGE(0x80, 0x81) AM_WRITE(scrolly1_w) @@ -1004,7 +1004,7 @@ static ADDRESS_MAP_START( m82_portmap, AS_IO, 16, m72_state ) AM_RANGE(0x00, 0x01) AM_READ_PORT("IN0") AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1") AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW") - AM_RANGE(0x00, 0x01) AM_DEVWRITE("m72", m72_audio_device, sound_command_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE8("m72", m72_audio_device, sound_command_w, 0x00ff) AM_RANGE(0x02, 0x03) AM_WRITE8(rtype2_port02_w, 0x00ff) AM_RANGE(0x40, 0x43) AM_DEVREADWRITE8("upd71059c", pic8259_device, read, write, 0x00ff) AM_RANGE(0x80, 0x81) AM_WRITE(scrolly1_w) @@ -1021,7 +1021,7 @@ static ADDRESS_MAP_START( m81_portmap, AS_IO, 16, m72_state ) AM_RANGE(0x00, 0x01) AM_READ_PORT("IN0") AM_RANGE(0x02, 0x03) AM_READ_PORT("IN1") AM_RANGE(0x04, 0x05) AM_READ_PORT("DSW") - AM_RANGE(0x00, 0x01) AM_DEVWRITE("m72", m72_audio_device, sound_command_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE8("m72", m72_audio_device, sound_command_w, 0x00ff) AM_RANGE(0x02, 0x03) AM_WRITE8(rtype2_port02_w, 0x00ff) /* coin counters, reset sound cpu, other stuff? */ AM_RANGE(0x04, 0x05) AM_WRITE(dmaon_w) AM_RANGE(0x06, 0x07) AM_WRITE(irq_line_w) diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp index 70768a14263..0d8ce4ac891 100644 --- a/src/mame/drivers/m90.cpp +++ b/src/mame/drivers/m90.cpp @@ -104,7 +104,7 @@ static ADDRESS_MAP_START( bomblord_main_cpu_map, AS_PROGRAM, 16, m90_state ) ADDRESS_MAP_END static ADDRESS_MAP_START( m90_main_cpu_io_map, AS_IO, 16, m90_state ) - AM_RANGE(0x00, 0x01) AM_DEVWRITE("m72", m72_audio_device, sound_command_w) + AM_RANGE(0x00, 0x01) AM_DEVWRITE8("m72", m72_audio_device, sound_command_w, 0x00ff) AM_RANGE(0x00, 0x01) AM_READ_PORT("P1_P2") AM_RANGE(0x02, 0x03) AM_WRITE(m90_coincounter_w) AM_RANGE(0x02, 0x03) AM_READ_PORT("SYSTEM") diff --git a/src/mame/drivers/shisen.cpp b/src/mame/drivers/shisen.cpp index 9318b6c39f2..7297973182b 100644 --- a/src/mame/drivers/shisen.cpp +++ b/src/mame/drivers/shisen.cpp @@ -58,7 +58,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( shisen_io_map, AS_IO, 8, shisen_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x00) AM_READWRITE(dsw1_r, coin_w) - AM_RANGE(0x01, 0x01) AM_READ_PORT("DSW2") AM_DEVWRITE("m72", m72_audio_device, sound_command_byte_w) + AM_RANGE(0x01, 0x01) AM_READ_PORT("DSW2") AM_DEVWRITE("m72", m72_audio_device, sound_command_w) AM_RANGE(0x02, 0x02) AM_READ_PORT("P1") AM_WRITE(bankswitch_w) AM_RANGE(0x03, 0x03) AM_READ_PORT("P2") AM_RANGE(0x04, 0x04) AM_READ_PORT("COIN") diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp index 0982882747f..42991286a71 100644 --- a/src/mame/drivers/vigilant.cpp +++ b/src/mame/drivers/vigilant.cpp @@ -83,7 +83,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( vigilant_io_map, AS_IO, 8, vigilant_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_DEVWRITE("m72", m72_audio_device, sound_command_byte_w) /* SD */ + AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") AM_DEVWRITE("m72", m72_audio_device, sound_command_w) /* SD */ AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") AM_WRITE(vigilant_out2_w) /* OUT2 */ AM_RANGE(0x02, 0x02) AM_READ_PORT("IN2") AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1") @@ -109,7 +109,7 @@ static ADDRESS_MAP_START( kikcubic_io_map, AS_IO, 8, vigilant_state ) AM_RANGE(0x02, 0x02) AM_READ_PORT("IN0") AM_RANGE(0x03, 0x03) AM_READ_PORT("IN1") AM_RANGE(0x04, 0x04) AM_READ_PORT("IN2") AM_WRITE(bank_select_w) - AM_RANGE(0x06, 0x06) AM_DEVWRITE("m72", m72_audio_device, sound_command_byte_w) + AM_RANGE(0x06, 0x06) AM_DEVWRITE("m72", m72_audio_device, sound_command_w) // AM_RANGE(0x07, 0x07) AM_WRITENOP /* ?? */ ADDRESS_MAP_END |