Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-25 09:50:04 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Irem Audio: Got rid of gen_latch usage; fixed missing d7 on sound latch; fixed device_reset to correctly clear sound latch; fixed a potential situation where sound cpu /IRQ could be incorrectly cleared [Lord Nightmare]

Browse Source
This commit is contained in:
Lord-Nightmare 2017-05-12 05:29:00 -04:00
parent e88b5e4f9d
commit 899b01ddca
2 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/mame/audio/irem.cpp
View File

@ -22,7 +22,7 @@ irem_audio_device::irem_audio_device(const machine_config &mconfig, device_type
: device_t(mconfig, type, name, tag, owner, clock, shortname, source),
m_port1(0),
m_port2(0),
m_soundlatch(*this, "soundlatch")
m_soundlatch(0)
//m_ay_45L(*this, "ay_45l"),
//m_ay_45M(*this, "ay_45m")
{
@ -62,10 +62,25 @@ void irem_audio_device::device_start()
save_item(NAME(m_port1));
save_item(NAME(m_port2));
save_item(NAME(m_soundlatch));
}
//-------------------------------------------------
// device_reset - device-specific reset
//-------------------------------------------------
void irem_audio_device::device_reset()
{
m_adpcm1->reset();
if (m_adpcm2) m_adpcm2->reset();
m_ay_45L->reset();
m_ay_45M->reset();
subdevice("iremsound")->reset();
m_port1 = 0; // ?
m_port2 = 0; // ?
m_soundlatch = 0;
subdevice("iremsound")->execute().set_input_line(0, ASSERT_LINE);
}
/*************************************
*
@ -76,13 +91,22 @@ void irem_audio_device::device_start()
WRITE8_MEMBER( irem_audio_device::cmd_w )
{
m_soundlatch = data;
if ((data & 0x80) == 0)
m_soundlatch->write(space, 0, data & 0x7f);
else
subdevice("iremsound")->execute().set_input_line(0, ASSERT_LINE);
}
/*************************************
*
* Sound latch read
*
*************************************/
READ8_MEMBER( irem_audio_device::soundlatch_r )
{
return m_soundlatch;
}
/*************************************
*
@ -126,7 +150,7 @@ WRITE8_MEMBER( irem_audio_device::m6803_port2_w )
/*************************************
*
* 6803 input ports ports
* 6803 input ports
*
*************************************/
@ -201,7 +225,8 @@ WRITE8_MEMBER( irem_audio_device::ay8910_45L_porta_w )
WRITE8_MEMBER( irem_audio_device::sound_irq_ack_w )
{
subdevice("iremsound")->execute().set_input_line(0, CLEAR_LINE);
if ((m_soundlatch & 0x80) != 0)
subdevice("iremsound")->execute().set_input_line(0, CLEAR_LINE);
}
@ -413,12 +438,10 @@ static MACHINE_CONFIG_FRAGMENT( irem_audio_base )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_SOUND_ADD("ay_45m", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_RESISTOR_OUTPUT)
MCFG_AY8910_RES_LOADS(2000.0, 2000.0, 2000.0)
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
MCFG_AY8910_PORT_A_READ_CB(READ8(irem_audio_device, soundlatch_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(irem_audio_device, ay8910_45M_portb_w))
MCFG_SOUND_ROUTE_EX(0, "snd_nl", 1.0, 0)
MCFG_SOUND_ROUTE_EX(1, "snd_nl", 1.0, 1)
@ -484,12 +507,10 @@ MACHINE_CONFIG_FRAGMENT( m52_sound_c_audio )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_SOUND_ADD("ay_45m", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
MCFG_AY8910_PORT_A_READ_CB(READ8(irem_audio_device, soundlatch_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(irem_audio_device, ay8910_45M_portb_w))
MCFG_SOUND_ROUTE_EX(0, "filtermix", 1.0, 0)
@ -520,12 +541,10 @@ MACHINE_CONFIG_FRAGMENT( m52_large_audio) /* 10 yard fight */
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_SOUND_ADD("ay_45m", AY8910, XTAL_3_579545MHz/4) /* verified on pcb */
MCFG_AY8910_OUTPUT_TYPE(AY8910_SINGLE_OUTPUT | AY8910_DISCRETE_OUTPUT)
MCFG_AY8910_RES_LOADS(470, 0, 0)
MCFG_AY8910_PORT_A_READ_CB(DEVREAD8("soundlatch", generic_latch_8_device, read))
MCFG_AY8910_PORT_A_READ_CB(READ8(irem_audio_device, soundlatch_r))
MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(irem_audio_device, ay8910_45M_portb_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80)

5
src/mame/audio/irem.h
View File

@ -2,7 +2,6 @@
// copyright-holders:Couriersud
#include "sound/ay8910.h"
#include "sound/msm5205.h"
#include "machine/gen_latch.h"
#include "machine/netlist.h"
#include "audio/nl_kidniki.h"
@ -13,6 +12,7 @@ public:
~irem_audio_device() {}
DECLARE_WRITE8_MEMBER( cmd_w );
DECLARE_READ8_MEMBER( soundlatch_r );
DECLARE_WRITE8_MEMBER( m6803_port1_w );
DECLARE_WRITE8_MEMBER( m6803_port2_w );
DECLARE_READ8_MEMBER( m6803_port1_r );
@ -30,13 +30,14 @@ public:
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_reset() override;
private:
// internal state
uint8_t m_port1;
uint8_t m_port2;
required_device<generic_latch_8_device> m_soundlatch;
uint8_t m_soundlatch;
/* FIXME: using required / optional device would be better */
// required_device<ay8910_device> m_ay_45L;
// required_device<ay8910_device> m_ay_45M;