From 5aeda619a25c3c09406fe69c7dc9c84256bba172 Mon Sep 17 00:00:00 2001 From: AJR Date: Mon, 21 Aug 2017 12:35:04 -0400 Subject: brkthru.cpp: Soundlatch modernization (nw) --- src/mame/drivers/brkthru.cpp | 12 ++++-------- src/mame/includes/brkthru.h | 2 -- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/mame/drivers/brkthru.cpp b/src/mame/drivers/brkthru.cpp index 9e1f673f8a8..9680a38e041 100644 --- a/src/mame/drivers/brkthru.cpp +++ b/src/mame/drivers/brkthru.cpp @@ -94,12 +94,6 @@ WRITE8_MEMBER(brkthru_state::darwin_0803_w) /* bit 1 = ? maybe IRQ acknowledge */ } -WRITE8_MEMBER(brkthru_state::brkthru_soundlatch_w) -{ - m_soundlatch->write(space, offset, data); - m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); -} - INPUT_CHANGED_MEMBER(brkthru_state::coin_inserted) { /* coin insertion causes an IRQ */ @@ -125,7 +119,7 @@ static ADDRESS_MAP_START( brkthru_map, AS_PROGRAM, 8, brkthru_state ) AM_RANGE(0x1802, 0x1802) AM_READ_PORT("DSW1") AM_RANGE(0x1803, 0x1803) AM_READ_PORT("DSW2/COIN") AM_RANGE(0x1800, 0x1801) AM_WRITE(brkthru_1800_w) /* bg scroll and color, ROM bank selection, flip screen */ - AM_RANGE(0x1802, 0x1802) AM_WRITE(brkthru_soundlatch_w) + AM_RANGE(0x1802, 0x1802) AM_DEVWRITE("soundlatch", generic_latch_8_device, write) AM_RANGE(0x1803, 0x1803) AM_WRITE(brkthru_1803_w) /* NMI enable, + ? */ AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0xffff) AM_ROM @@ -143,7 +137,7 @@ static ADDRESS_MAP_START( darwin_map, AS_PROGRAM, 8, brkthru_state ) AM_RANGE(0x0802, 0x0802) AM_READ_PORT("DSW1") AM_RANGE(0x0803, 0x0803) AM_READ_PORT("DSW2/COIN") AM_RANGE(0x0800, 0x0801) AM_WRITE(brkthru_1800_w) /* bg scroll and color, ROM bank selection, flip screen */ - AM_RANGE(0x0802, 0x0802) AM_WRITE(brkthru_soundlatch_w) + AM_RANGE(0x0802, 0x0802) AM_DEVWRITE("soundlatch", generic_latch_8_device, write) AM_RANGE(0x0803, 0x0803) AM_WRITE(darwin_0803_w) /* NMI enable, + ? */ AM_RANGE(0x2000, 0x3fff) AM_ROMBANK("bank1") AM_RANGE(0x4000, 0xffff) AM_ROM @@ -403,6 +397,7 @@ static MACHINE_CONFIG_START( brkthru ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_GENERIC_LATCH_8_ADD("soundlatch") + MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) MCFG_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/8) MCFG_SOUND_ROUTE(0, "mono", 0.10) @@ -454,6 +449,7 @@ static MACHINE_CONFIG_START( darwin ) MCFG_SPEAKER_STANDARD_MONO("mono") MCFG_GENERIC_LATCH_8_ADD("soundlatch") + MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI)) MCFG_SOUND_ADD("ym1", YM2203, MASTER_CLOCK/8) MCFG_SOUND_ROUTE(0, "mono", 0.10) diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index 09cbc2433f2..eda08536e94 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -33,7 +33,6 @@ public: int m_bgscroll; int m_bgbasecolor; int m_flipscreen; - //uint8_t *m_brkthru_nmi_enable; /* needs to be tracked down */ /* devices */ required_device m_maincpu; @@ -45,7 +44,6 @@ public: uint8_t m_nmi_mask; DECLARE_WRITE8_MEMBER(brkthru_1803_w); DECLARE_WRITE8_MEMBER(darwin_0803_w); - DECLARE_WRITE8_MEMBER(brkthru_soundlatch_w); DECLARE_WRITE8_MEMBER(brkthru_bgram_w); DECLARE_WRITE8_MEMBER(brkthru_fgram_w); DECLARE_WRITE8_MEMBER(brkthru_1800_w); -- cgit v1.2.3