diff options
Diffstat (limited to 'src/mame/drivers/splash.cpp')
-rw-r--r-- | src/mame/drivers/splash.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp index 5b32c10d8c0..a31da94b4b3 100644 --- a/src/mame/drivers/splash.cpp +++ b/src/mame/drivers/splash.cpp @@ -54,7 +54,7 @@ WRITE16_MEMBER(splash_state::splash_sh_irqtrigger_w) { if (ACCESSING_BITS_0_7) { - soundlatch_byte_w(space, 0, data & 0xff); + m_soundlatch->write(space, 0, data & 0xff); m_audiocpu->set_input_line(0, HOLD_LINE); } } @@ -63,7 +63,7 @@ WRITE16_MEMBER(splash_state::roldf_sh_irqtrigger_w) { if (ACCESSING_BITS_0_7) { - soundlatch_byte_w(space, 0, data & 0xff); + m_soundlatch->write(space, 0, data & 0xff); m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } @@ -121,7 +121,7 @@ static ADDRESS_MAP_START( splash_sound_map, AS_PROGRAM, 8, splash_state ) AM_RANGE(0x0000, 0xd7ff) AM_ROM /* ROM */ AM_RANGE(0xd800, 0xd800) AM_WRITE(splash_adpcm_data_w) /* ADPCM data for the MSM5205 chip */ // AM_RANGE(0xe000, 0xe000) AM_WRITENOP /* ??? */ - AM_RANGE(0xe800, 0xe800) AM_READ(soundlatch_byte_r) /* Sound latch */ + AM_RANGE(0xe800, 0xe800) AM_DEVREAD("soundlatch", generic_latch_8_device, read) /* Sound latch */ AM_RANGE(0xf000, 0xf001) AM_DEVREADWRITE("ymsnd", ym3812_device, read, write) /* YM3812 */ AM_RANGE(0xf800, 0xffff) AM_RAM /* RAM */ ADDRESS_MAP_END @@ -199,7 +199,7 @@ static ADDRESS_MAP_START( roldfrog_sound_io_map, AS_IO, 8, splash_state ) AM_RANGE(0x40, 0x40) AM_NOP AM_RANGE(0x31, 0x31) AM_WRITE(sound_bank_w) AM_RANGE(0x37, 0x37) AM_WRITE(roldfrog_vblank_ack_w ) - AM_RANGE(0x70, 0x70) AM_READ(soundlatch_byte_r) + AM_RANGE(0x70, 0x70) AM_DEVREAD("soundlatch", generic_latch_8_device, read) AM_RANGE(0x0, 0xff) AM_READ(roldfrog_unk_r) ADDRESS_MAP_END @@ -217,7 +217,7 @@ WRITE16_MEMBER(splash_state::spr_write) WRITE16_MEMBER(splash_state::funystrp_sh_irqtrigger_w) { - soundlatch_byte_w(space, 0, data>>8); + m_soundlatch->write(space, 0, data>>8); m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } @@ -280,7 +280,7 @@ static ADDRESS_MAP_START( funystrp_sound_io_map, AS_IO, 8, splash_state ) AM_RANGE(0x00, 0x00) AM_WRITE(msm1_data_w) AM_RANGE(0x01, 0x01) AM_WRITE(msm2_data_w) AM_RANGE(0x02, 0x02) AM_WRITE(sound_bank_w) - AM_RANGE(0x03, 0x03) AM_READ(soundlatch_byte_r) + AM_RANGE(0x03, 0x03) AM_DEVREAD("soundlatch", generic_latch_8_device, read) AM_RANGE(0x04, 0x04) AM_READ(int_source_r) AM_RANGE(0x06, 0x06) AM_WRITE(msm1_interrupt_w) AM_RANGE(0x07, 0x07) AM_WRITE(msm2_interrupt_w) @@ -514,6 +514,8 @@ static MACHINE_CONFIG_START( splash, splash_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_GENERIC_LATCH_8_ADD("soundlatch") + MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_30MHz/8) /* 3.75MHz (30/8) */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) @@ -568,6 +570,8 @@ static MACHINE_CONFIG_START( roldfrog, splash_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_GENERIC_LATCH_8_ADD("soundlatch") + MCFG_SOUND_ADD("ymsnd", YM2203, XTAL_24MHz / 8) MCFG_YM2203_IRQ_HANDLER(WRITELINE(splash_state, ym_irq)) MCFG_SOUND_ROUTE(0, "mono", 0.20) @@ -651,6 +655,8 @@ static MACHINE_CONFIG_START( funystrp, splash_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_GENERIC_LATCH_8_ADD("soundlatch") + MCFG_SOUND_ADD("msm1", MSM5205, XTAL_400kHz) MCFG_MSM5205_VCLK_CB(WRITELINE(splash_state, adpcm_int1)) /* interrupt function */ MCFG_MSM5205_PRESCALER_SELECTOR(MSM5205_S48_4B) /* 1 / 48 */ /* Sample rate = 400kHz/64 */ |