From a5c860a5cf9e74380303c0ffd50f2a40b1a92998 Mon Sep 17 00:00:00 2001 From: AJR Date: Wed, 4 Oct 2017 22:37:32 -0400 Subject: tecmo16.cpp: Soundlatch modernization (nw) --- src/mame/drivers/tecmo16.cpp | 17 ++++------------- src/mame/includes/tecmo16.h | 4 ---- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/mame/drivers/tecmo16.cpp b/src/mame/drivers/tecmo16.cpp index 3899058c3cc..a18a336dd4e 100644 --- a/src/mame/drivers/tecmo16.cpp +++ b/src/mame/drivers/tecmo16.cpp @@ -30,22 +30,12 @@ Notes: #include "cpu/m68000/m68000.h" #include "cpu/z80/z80.h" +#include "machine/gen_latch.h" #include "sound/okim6295.h" #include "sound/ym2151.h" #include "speaker.h" -/******************************************************************************/ - -WRITE16_MEMBER(tecmo16_state::sound_command_w) -{ - if (ACCESSING_BITS_0_7) - { - m_soundlatch->write(space, 0x00, data & 0xff); - m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); - } -} - /******************************************************************************/ static ADDRESS_MAP_START( fstarfrc_map, AS_PROGRAM, 16, tecmo16_state ) @@ -60,7 +50,7 @@ static ADDRESS_MAP_START( fstarfrc_map, AS_PROGRAM, 16, tecmo16_state ) AM_RANGE(0x130000, 0x130fff) AM_RAM AM_SHARE("spriteram") AM_RANGE(0x140000, 0x141fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_RANGE(0x150000, 0x150001) AM_WRITE(flipscreen_w) - AM_RANGE(0x150010, 0x150011) AM_WRITE(sound_command_w) + AM_RANGE(0x150010, 0x150011) AM_DEVWRITE8("soundlatch", generic_latch_8_device, write, 0x00ff) AM_RANGE(0x150030, 0x150031) AM_READ_PORT("DSW2") AM_WRITENOP /* ??? */ AM_RANGE(0x150040, 0x150041) AM_READ_PORT("DSW1") AM_RANGE(0x150050, 0x150051) AM_READ_PORT("P1_P2") @@ -83,7 +73,7 @@ static ADDRESS_MAP_START( ginkun_map, AS_PROGRAM, 16, tecmo16_state ) AM_RANGE(0x130000, 0x130fff) AM_RAM AM_SHARE("spriteram") AM_RANGE(0x140000, 0x141fff) AM_RAM_DEVWRITE("palette", palette_device, write) AM_SHARE("palette") AM_RANGE(0x150000, 0x150001) AM_WRITE(flipscreen_w) - AM_RANGE(0x150010, 0x150011) AM_WRITE(sound_command_w) + AM_RANGE(0x150010, 0x150011) AM_DEVWRITE8("soundlatch", generic_latch_8_device, write, 0x00ff) AM_RANGE(0x150020, 0x150021) AM_READ_PORT("EXTRA") AM_WRITENOP /* ??? */ AM_RANGE(0x150030, 0x150031) AM_READ_PORT("DSW2") AM_WRITENOP /* ??? */ AM_RANGE(0x150040, 0x150041) AM_READ_PORT("DSW1") @@ -408,6 +398,7 @@ static MACHINE_CONFIG_START( fstarfrc ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_GENERIC_LATCH_8_ADD("soundlatch") + MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) MCFG_YM2151_ADD("ymsnd", MASTER_CLOCK/6) // 4 MHz MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) diff --git a/src/mame/includes/tecmo16.h b/src/mame/includes/tecmo16.h index a24108d4cf5..9c5c224469d 100644 --- a/src/mame/includes/tecmo16.h +++ b/src/mame/includes/tecmo16.h @@ -1,7 +1,6 @@ // license:BSD-3-Clause // copyright-holders:Hau, Nicola Salmoria -#include "machine/gen_latch.h" #include "video/tecmo_spr.h" #include "video/tecmo_mix.h" #include "screen.h" @@ -18,7 +17,6 @@ public: m_palette(*this, "palette"), m_sprgen(*this, "spritegen"), m_mixer(*this, "mixer"), - m_soundlatch(*this, "soundlatch"), m_videoram(*this, "videoram"), m_colorram(*this, "colorram"), m_videoram2(*this, "videoram2"), @@ -34,7 +32,6 @@ public: required_device m_palette; required_device m_sprgen; required_device m_mixer; - required_device m_soundlatch; required_shared_ptr m_videoram; required_shared_ptr m_colorram; @@ -58,7 +55,6 @@ public: uint16_t m_scroll_char_x_w; uint16_t m_scroll_char_y_w; - DECLARE_WRITE16_MEMBER(sound_command_w); DECLARE_WRITE16_MEMBER(videoram_w); DECLARE_WRITE16_MEMBER(colorram_w); DECLARE_WRITE16_MEMBER(videoram2_w); -- cgit v1.2.3