Added Williams Dac+speech device for system 6,6a,7.

This commit is contained in:
Robbbert 2022-01-24 05:55:35 +11:00
parent 1a3888bb61
commit 20b3496394
5 changed files with 219 additions and 236 deletions

View File

@ -62,6 +62,7 @@ DEFINE_DEVICE_TYPE(WILLIAMS_CVSD_SOUND, williams_cvsd_sound_device, "wmscvsd", "
DEFINE_DEVICE_TYPE(WILLIAMS_NARC_SOUND, williams_narc_sound_device, "wmsnarc", "Williams NARC Sound Board")
DEFINE_DEVICE_TYPE(WILLIAMS_ADPCM_SOUND, williams_adpcm_sound_device, "wmsadpcm", "Williams ADPCM Sound Board")
DEFINE_DEVICE_TYPE(WILLIAMS_S4_SOUND, williams_s4_sound_device, "wmss4", "Williams System 4 Sound Board")
DEFINE_DEVICE_TYPE(WILLIAMS_S6_SOUND, williams_s6_sound_device, "wmss6", "Williams System 6 Sound Board")
@ -956,3 +957,123 @@ ioport_constructor williams_s4_sound_device::device_input_ports() const
}
//**************************************************************************
// S6 SOUND BOARD (s4 with speech, used in system 6/6a/7 pinballs)
//**************************************************************************
//-------------------------------------------------
// williams_s6_sound_device - constructor
//-------------------------------------------------
williams_s6_sound_device::williams_s6_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
: device_t(mconfig, WILLIAMS_S6_SOUND, tag, owner, clock)
, device_mixer_interface(mconfig, *this)
, m_cpu(*this, "cpu")
, m_pia(*this, "pia")
, m_hc(*this, "hc")
{
}
//-------------------------------------------------
// write - handle an external write
//-------------------------------------------------
void williams_s6_sound_device::write(u8 data)
{
// Handle dips
data ^= (ioport("S6")->read() & 0x60);
if ((data & 0x1f) != 0x1f)
{
m_pia->portb_w(data);
m_pia->cb1_w(0);
}
m_pia->cb1_w(1);
}
//-------------------------------------------------
// audio CPU map
//-------------------------------------------------
void williams_s6_sound_device::williams_s6_map(address_map &map)
{
map.global_mask(0x7fff);
map(0x0000, 0x00ff).ram();
map(0x0400, 0x0403).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
map(0x3000, 0x7fff).rom().region("audiocpu", 0);
}
//-------------------------------------------------
// device_add_mconfig - add device configuration
//-------------------------------------------------
void williams_s6_sound_device::device_add_mconfig(machine_config &config)
{
M6802(config, m_cpu, 3580000);
m_cpu->set_addrmap(AS_PROGRAM, &williams_s6_sound_device::williams_s6_map);
MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 0.5);
HC55516(config, m_hc, 0).add_route(ALL_OUTPUTS, *this, 1.00);
PIA6821(config, m_pia, 0);
m_pia->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w));
m_pia->ca2_handler().set(m_hc, FUNC(hc55516_device::digit_w));
m_pia->cb2_handler().set(m_hc, FUNC(hc55516_device::clock_w));
m_pia->irqa_handler().set("audioirq", FUNC(input_merger_device::in_w<1>));
m_pia->irqb_handler().set("audioirq", FUNC(input_merger_device::in_w<2>));
INPUT_MERGER_ANY_HIGH(config, "audioirq").output_handler().set_inputline(m_cpu, M6802_IRQ_LINE);
}
//-------------------------------------------------
// device_start - device-specific startup
//-------------------------------------------------
void williams_s6_sound_device::device_start()
{
// register for save states
save_item(NAME(m_dummy));
}
//-------------------------------------------------
// device_reset - device-specific reset
//-------------------------------------------------
void williams_s6_sound_device::device_reset()
{
// reset interrupt states
m_cpu->set_input_line(M6808_IRQ_LINE, CLEAR_LINE);
}
INPUT_PORTS_START( williams_s6 )
PORT_START("S6")
PORT_DIPNAME( 0x20, 0x20, "Speech" )
PORT_DIPSETTING( 0x00, "Off" )
PORT_DIPSETTING( 0x20, "On" )
PORT_DIPNAME( 0x40, 0x00, "Sounds" )
PORT_DIPSETTING( 0x00, "Set 1" )
PORT_DIPSETTING( 0x40, "Set 2" )
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_9_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, williams_s6_sound_device, audio_nmi, 1)
INPUT_PORTS_END
INPUT_CHANGED_MEMBER( williams_s6_sound_device::audio_nmi )
{
// Diagnostic button sends a pulse to NMI pin
if (newval==CLEAR_LINE)
m_cpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
//-------------------------------------------------
// device_input_ports - return a pointer to
// the device's I/O ports
//-------------------------------------------------
ioport_constructor williams_s6_sound_device::device_input_ports() const
{
return INPUT_PORTS_NAME( williams_s6 );
}

View File

@ -25,6 +25,7 @@ DECLARE_DEVICE_TYPE(WILLIAMS_CVSD_SOUND, williams_cvsd_sound_device)
DECLARE_DEVICE_TYPE(WILLIAMS_NARC_SOUND, williams_narc_sound_device)
DECLARE_DEVICE_TYPE(WILLIAMS_ADPCM_SOUND, williams_adpcm_sound_device)
DECLARE_DEVICE_TYPE(WILLIAMS_S4_SOUND, williams_s4_sound_device)
DECLARE_DEVICE_TYPE(WILLIAMS_S6_SOUND, williams_s6_sound_device)
@ -221,3 +222,33 @@ private:
required_device<pia6821_device> m_pia;
u8 m_dummy = 0; // needed for save-state support
};
// ======================> williams_s6_sound_device
class williams_s6_sound_device : public device_t, public device_mixer_interface
{
public:
// construction/destruction
williams_s6_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
// read/write
void write(u8 data);
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
protected:
// device-level overrides
virtual void device_add_mconfig(machine_config &config) override;
virtual ioport_constructor device_input_ports() const override;
virtual void device_start() override;
virtual void device_reset() override;
private:
// devices
void williams_s6_map(address_map &map);
required_device<m6802_cpu_device> m_cpu;
required_device<pia6821_device> m_pia;
required_device<hc55516_device> m_hc;
u8 m_dummy = 0; // needed for save-state support
};

View File

@ -56,10 +56,9 @@ ToDo:
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "audio/williams.h"
#include "machine/6821pia.h"
#include "machine/input_merger.h"
#include "sound/dac.h"
#include "sound/hc55516.h"
#include "speaker.h"
#include "s6.lh"
@ -73,16 +72,13 @@ public:
s6_state(const machine_config &mconfig, device_type type, const char *tag)
: genpin_class(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_audiocpu(*this, "audiocpu")
, m_hc55516(*this, "hc55516")
, m_pias(*this, "pias")
, m_s6sound(*this, "s6sound")
, m_pia22(*this, "pia22")
, m_pia24(*this, "pia24")
, m_pia28(*this, "pia28")
, m_pia30(*this, "pia30")
, m_io_keyboard(*this, "X%d", 0U)
, m_dips(*this, "DS%d", 1U)
, m_io_snd(*this, "SND")
, m_digits(*this, "digit%d", 0U)
, m_leds(*this, "led%d", 0U)
, m_io_outputs(*this, "out%d", 0U)
@ -91,7 +87,6 @@ public:
void s6(machine_config &config);
DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
protected:
virtual void machine_start() override;
@ -99,7 +94,6 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
private:
u8 sound_r();
void dig0_w(u8 data);
void dig1_w(u8 data);
void lamp0_w(u8 data);
@ -119,10 +113,8 @@ private:
DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { } //ST3
DECLARE_WRITE_LINE_MEMBER(pia_irq);
void audio_map(address_map &map);
void main_map(address_map &map);
u8 m_sound_data = 0;
u8 m_strobe = 0;
u8 m_row = 0;
bool m_data_ok = 0;
@ -130,16 +122,13 @@ private:
emu_timer* m_irq_timer;
static const device_timer_id TIMER_IRQ = 0;
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<hc55516_device> m_hc55516;
required_device<pia6821_device> m_pias;
required_device<williams_s6_sound_device> m_s6sound;
required_device<pia6821_device> m_pia22;
required_device<pia6821_device> m_pia24;
required_device<pia6821_device> m_pia28;
required_device<pia6821_device> m_pia30;
required_ioport_array<8> m_io_keyboard;
required_ioport_array<2> m_dips;
required_ioport m_io_snd;
output_finder<61> m_digits;
output_finder<2> m_leds;
output_finder<80> m_io_outputs; // 16 solenoids + 64 lamps
@ -157,14 +146,6 @@ void s6_state::main_map(address_map &map)
map(0x6000, 0x7fff).rom().region("maincpu", 0);
}
void s6_state::audio_map(address_map &map)
{
map.global_mask(0x7fff);
map(0x0080, 0x00ff).ram(); // external 6810 RAM
map(0x0400, 0x0403).rw(m_pias, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
map(0x3000, 0x7fff).rom().region("audiocpu", 0);
}
static INPUT_PORTS_START( s6 )
PORT_START("X0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_8) PORT_NAME("Plumb Tilt") // 3 touches before it tilts
@ -246,12 +227,7 @@ static INPUT_PORTS_START( s6 )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_START("SND")
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("Speech") PORT_CODE(KEYCODE_9_PAD) PORT_TOGGLE
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("Music") PORT_CODE(KEYCODE_8_PAD) PORT_TOGGLE
PORT_START("DIAGS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_7_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, s6_state, audio_nmi, 1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Main Diag") PORT_CODE(KEYCODE_0_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, s6_state, main_nmi, 1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Advance") PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Manual/Auto") PORT_CODE(KEYCODE_6_PAD) PORT_TOGGLE
@ -340,13 +316,6 @@ INPUT_CHANGED_MEMBER( s6_state::main_nmi )
m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
INPUT_CHANGED_MEMBER( s6_state::audio_nmi )
{
// Diagnostic button sends a pulse to NMI pin
if (newval==CLEAR_LINE)
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
void s6_state::sol0_w(u8 data)
{
if (BIT(data, 0))
@ -358,14 +327,9 @@ void s6_state::sol0_w(u8 data)
void s6_state::sol1_w(u8 data)
{
u8 sound_data = m_io_snd->read() | (data & 0x1f);
u8 sound_data = data & 0x1f;
bool cb1 = (sound_data & 0x1f);
if (cb1)
m_sound_data = ~sound_data;
m_pias->cb1_w(cb1);
m_s6sound->write(~sound_data);
if (BIT(data, 5))
m_samples->start(0, 6); // knocker
@ -430,11 +394,6 @@ void s6_state::switch_w(u8 data)
m_row = data;
}
u8 s6_state::sound_r()
{
return m_sound_data;
}
WRITE_LINE_MEMBER( s6_state::pia_irq )
{
if(state == CLEAR_LINE)
@ -461,7 +420,6 @@ void s6_state::machine_start()
save_item(NAME(m_row));
save_item(NAME(m_data_ok));
save_item(NAME(m_lamp_data));
save_item(NAME(m_sound_data));
m_irq_timer = timer_alloc(TIMER_IRQ);
m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1);
@ -548,24 +506,8 @@ void s6_state::s6(machine_config &config)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
/* Add the soundcard */
M6802(config, m_audiocpu, 3580000);
m_audiocpu->set_addrmap(AS_PROGRAM, &s6_state::audio_map);
SPEAKER(config, "speaker").front_center();
MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.5);
SPEAKER(config, "speech").front_center();
HC55516(config, m_hc55516, 0).add_route(ALL_OUTPUTS, "speech", 1.00);
PIA6821(config, m_pias, 0);
m_pias->readpb_handler().set(FUNC(s6_state::sound_r));
m_pias->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w));
m_pias->ca2_handler().set(m_hc55516, FUNC(hc55516_device::digit_w));
m_pias->cb2_handler().set(m_hc55516, FUNC(hc55516_device::clock_w));
m_pias->irqa_handler().set("audioirq", FUNC(input_merger_device::in_w<1>));
m_pias->irqb_handler().set("audioirq", FUNC(input_merger_device::in_w<2>));
INPUT_MERGER_ANY_HIGH(config, "audioirq").output_handler().set_inputline(m_audiocpu, M6802_IRQ_LINE);
SPEAKER(config, "mono").front_center();
WILLIAMS_S6_SOUND(config, m_s6sound, 0).add_route(ALL_OUTPUTS, "mono", 1.0);
}
@ -578,7 +520,7 @@ ROM_START(lzbal_l2)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound2.716", 0x4800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
ROM_END
@ -588,7 +530,7 @@ ROM_START(lzbal_l2sp)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("493_s0_laser_ball.716", 0x4800, 0x0800, CRC(726c06eb) SHA1(33bbf6ce3629e933863ac85eac03fd3a906d9de5))
ROM_END
@ -598,7 +540,7 @@ ROM_START(lzbal_t2)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2a.716", 0x1800, 0x0800, CRC(16621eec) SHA1(14e1cf5f7227860a3219b2b79fa66dcf252dce98))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound2.716", 0x4800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
ROM_END
@ -612,7 +554,7 @@ ROM_START(scrpn_l1)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound1.716", 0x4800, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
ROM_END
@ -622,7 +564,7 @@ ROM_START(scrpn_t1)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2a.716", 0x1800, 0x0800, CRC(16621eec) SHA1(14e1cf5f7227860a3219b2b79fa66dcf252dce98))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound1.716", 0x4800, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
ROM_END
@ -636,7 +578,7 @@ ROM_START(blkou_l1)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("v_ic7.532", 0x0000, 0x1000, CRC(87864071) SHA1(d03c71efc0431f30a07c8194c0614c96fb683710))
ROM_LOAD("v_ic5.532", 0x1000, 0x1000, CRC(046a96d8) SHA1(879127a88b3640bbb202c64cbf8678869c964177))
ROM_LOAD("v_ic6.532", 0x2000, 0x1000, CRC(0104e5c4) SHA1(c073cb4bdea189085ae074e9c16872752b6ffba0))
@ -649,7 +591,7 @@ ROM_START(blkou_t1)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2a.716", 0x1800, 0x0800, CRC(16621eec) SHA1(14e1cf5f7227860a3219b2b79fa66dcf252dce98))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("v_ic7.532", 0x0000, 0x1000, CRC(87864071) SHA1(d03c71efc0431f30a07c8194c0614c96fb683710))
ROM_LOAD("v_ic5.532", 0x1000, 0x1000, CRC(046a96d8) SHA1(879127a88b3640bbb202c64cbf8678869c964177))
ROM_LOAD("v_ic6.532", 0x2000, 0x1000, CRC(0104e5c4) SHA1(c073cb4bdea189085ae074e9c16872752b6ffba0))
@ -662,7 +604,7 @@ ROM_START(blkou_f1)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("speech7f.532", 0x0000, 0x1000, CRC(bdc1b0b1) SHA1(c78f8653dfe3ec58722a8a17da7924e4a76cf692))
ROM_LOAD("speech6f.532", 0x1000, 0x1000, CRC(9b7e4ae9) SHA1(137b5ec871162329cb7ca3a62da3193382223d8a))
ROM_LOAD("speech5f.532", 0x2000, 0x1000, CRC(9040f34a) SHA1(529eae0b58f3300f2b9bdf40c5ca7f4b29425dff))
@ -679,7 +621,7 @@ ROM_START(grgar_l1)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("v_ic7.532", 0x0000, 0x1000, CRC(0b1879e3) SHA1(2c34a815f598b4413e9229e8eb1322ec9e7cc9d6))
ROM_LOAD("v_ic5.532", 0x1000, 0x1000, CRC(0ceaef37) SHA1(33b5f5286b8588162d56dbc5c9a8ccb70d3b9090))
ROM_LOAD("v_ic6.532", 0x2000, 0x1000, CRC(218290b9) SHA1(6afeff1413895489e92a4bb1c05f6de5773dbb6a))
@ -692,7 +634,7 @@ ROM_START(grgar_t1)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2a.716", 0x1800, 0x0800, CRC(16621eec) SHA1(14e1cf5f7227860a3219b2b79fa66dcf252dce98))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("v_ic7.532", 0x0000, 0x1000, CRC(0b1879e3) SHA1(2c34a815f598b4413e9229e8eb1322ec9e7cc9d6))
ROM_LOAD("v_ic5.532", 0x1000, 0x1000, CRC(0ceaef37) SHA1(33b5f5286b8588162d56dbc5c9a8ccb70d3b9090))
ROM_LOAD("v_ic6.532", 0x2000, 0x1000, CRC(218290b9) SHA1(6afeff1413895489e92a4bb1c05f6de5773dbb6a))
@ -711,7 +653,7 @@ ROM_START(frpwr_l6)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("v_ic7.532", 0x0000, 0x1000, CRC(94c5c0a7) SHA1(ff7c618d1666c1d5c3319fdd72c1af2846659290))
ROM_LOAD("v_ic5.532", 0x1000, 0x1000, CRC(1737fdd2) SHA1(6307e0ae715e97294ee8aaaeb2e2bebb0cb590c2))
ROM_LOAD("v_ic6.532", 0x2000, 0x1000, CRC(e56f7aa2) SHA1(cb922c3f4d91285dda4ccae880c2d798a82fd51b))
@ -727,7 +669,7 @@ ROM_START(frpwr_t6)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2a.716", 0x1800, 0x0800, CRC(16621eec) SHA1(14e1cf5f7227860a3219b2b79fa66dcf252dce98))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("v_ic7.532", 0x0000, 0x1000, CRC(94c5c0a7) SHA1(ff7c618d1666c1d5c3319fdd72c1af2846659290))
ROM_LOAD("v_ic5.532", 0x1000, 0x1000, CRC(1737fdd2) SHA1(6307e0ae715e97294ee8aaaeb2e2bebb0cb590c2))
ROM_LOAD("v_ic6.532", 0x2000, 0x1000, CRC(e56f7aa2) SHA1(cb922c3f4d91285dda4ccae880c2d798a82fd51b))
@ -743,7 +685,7 @@ ROM_START(frpwr_l2)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("v_ic7.532", 0x0000, 0x1000, CRC(94c5c0a7) SHA1(ff7c618d1666c1d5c3319fdd72c1af2846659290))
ROM_LOAD("v_ic5.532", 0x1000, 0x1000, CRC(1737fdd2) SHA1(6307e0ae715e97294ee8aaaeb2e2bebb0cb590c2))
ROM_LOAD("v_ic6.532", 0x2000, 0x1000, CRC(e56f7aa2) SHA1(cb922c3f4d91285dda4ccae880c2d798a82fd51b))

View File

@ -44,10 +44,9 @@ ToDo:
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "audio/williams.h"
#include "machine/6821pia.h"
#include "machine/input_merger.h"
#include "sound/dac.h"
#include "sound/hc55516.h"
#include "speaker.h"
#include "s6a.lh"
@ -61,16 +60,13 @@ public:
s6a_state(const machine_config &mconfig, device_type type, const char *tag)
: genpin_class(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_audiocpu(*this, "audiocpu")
, m_hc55516(*this, "hc55516")
, m_pias(*this, "pias")
, m_s6sound(*this, "s6sound")
, m_pia22(*this, "pia22")
, m_pia24(*this, "pia24")
, m_pia28(*this, "pia28")
, m_pia30(*this, "pia30")
, m_io_keyboard(*this, "X%d", 0U)
, m_dips(*this, "DS%d", 1U)
, m_io_snd(*this, "SND")
, m_digits(*this, "digit%d", 0U)
, m_leds(*this, "led%d", 0U)
, m_io_outputs(*this, "out%d", 0U)
@ -79,7 +75,6 @@ public:
void s6a(machine_config &config);
DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
protected:
virtual void machine_start() override;
@ -107,10 +102,8 @@ private:
DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { } //ST3
DECLARE_WRITE_LINE_MEMBER(pia_irq);
void audio_map(address_map &map);
void main_map(address_map &map);
u8 m_sound_data = 0;
u8 m_strobe = 0;
u8 m_row = 0;
bool m_data_ok = 0;
@ -118,16 +111,13 @@ private:
emu_timer* m_irq_timer;
static const device_timer_id TIMER_IRQ = 0;
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<hc55516_device> m_hc55516;
required_device<pia6821_device> m_pias;
required_device<williams_s6_sound_device> m_s6sound;
required_device<pia6821_device> m_pia22;
required_device<pia6821_device> m_pia24;
required_device<pia6821_device> m_pia28;
required_device<pia6821_device> m_pia30;
required_ioport_array<8> m_io_keyboard;
required_ioport_array<2> m_dips;
required_ioport m_io_snd;
output_finder<61> m_digits;
output_finder<2> m_leds;
output_finder<80> m_io_outputs; // 16 solenoids + 64 lamps
@ -145,14 +135,6 @@ void s6a_state::main_map(address_map &map)
map(0x6000, 0x7fff).rom().region("maincpu", 0);
}
void s6a_state::audio_map(address_map &map)
{
map.global_mask(0x7fff);
map(0x0080, 0x00ff).ram(); // external 6810 RAM
map(0x0400, 0x0403).rw(m_pias, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
map(0x3000, 0x7fff).rom().region("audiocpu", 0);
}
static INPUT_PORTS_START( s6a )
PORT_START("X0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_8) PORT_NAME("Plumb Tilt") // 3 touches before it tilts
@ -223,12 +205,7 @@ static INPUT_PORTS_START( s6a )
PORT_START("X7") // unused
PORT_START("SND")
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("Speech") PORT_CODE(KEYCODE_9_PAD) PORT_TOGGLE
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("Music") PORT_CODE(KEYCODE_8_PAD) PORT_TOGGLE
PORT_START("DIAGS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_7_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, s6a_state, audio_nmi, 1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Main Diag") PORT_CODE(KEYCODE_0_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, s6a_state, main_nmi, 1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Advance") PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Manual/Auto") PORT_CODE(KEYCODE_6_PAD) PORT_TOGGLE
@ -263,13 +240,6 @@ INPUT_CHANGED_MEMBER( s6a_state::main_nmi )
m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
INPUT_CHANGED_MEMBER( s6a_state::audio_nmi )
{
// Diagnostic button sends a pulse to NMI pin
if (newval==CLEAR_LINE)
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
void s6a_state::sol0_w(u8 data)
{
if (BIT(data, 0))
@ -281,14 +251,9 @@ void s6a_state::sol0_w(u8 data)
void s6a_state::sol1_w(u8 data)
{
u8 sound_data = m_io_snd->read() | (data & 0x1f);
u8 sound_data = data & 0x1f;
bool cb1 = (sound_data & 0x1f);
if (cb1)
m_sound_data = ~sound_data;
m_pias->cb1_w(cb1);
m_s6sound->write(~sound_data);
if (BIT(data, 5))
m_samples->start(0, 6); // knocker
@ -354,11 +319,6 @@ void s6a_state::switch_w(u8 data)
m_row = data;
}
u8 s6a_state::sound_r()
{
return m_sound_data;
}
WRITE_LINE_MEMBER( s6a_state::pia_irq )
{
if(state == CLEAR_LINE)
@ -385,7 +345,6 @@ void s6a_state::machine_start()
save_item(NAME(m_row));
save_item(NAME(m_data_ok));
save_item(NAME(m_lamp_data));
save_item(NAME(m_sound_data));
m_irq_timer = timer_alloc(TIMER_IRQ);
m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1);
@ -472,24 +431,8 @@ void s6a_state::s6a(machine_config &config)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
/* Add the soundcard */
M6802(config, m_audiocpu, 3580000);
m_audiocpu->set_addrmap(AS_PROGRAM, &s6a_state::audio_map);
SPEAKER(config, "speaker").front_center();
MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.5);
SPEAKER(config, "speech").front_center();
HC55516(config, m_hc55516, 0).add_route(ALL_OUTPUTS, "speech", 1.00);
PIA6821(config, m_pias, 0);
m_pias->readpb_handler().set(FUNC(s6a_state::sound_r));
m_pias->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w));
m_pias->ca2_handler().set("hc55516", FUNC(hc55516_device::digit_w));
m_pias->cb2_handler().set("hc55516", FUNC(hc55516_device::clock_w));
m_pias->irqa_handler().set("audioirq", FUNC(input_merger_device::in_w<1>));
m_pias->irqb_handler().set("audioirq", FUNC(input_merger_device::in_w<2>));
INPUT_MERGER_ANY_HIGH(config, "audioirq").output_handler().set_inputline(m_audiocpu, M6802_IRQ_LINE);
SPEAKER(config, "mono").front_center();
WILLIAMS_S6_SOUND(config, m_s6sound, 0).add_route(ALL_OUTPUTS, "mono", 1.0);
}
@ -502,7 +445,7 @@ ROM_START(algar_l1)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound4.716", 0x4800, 0x0800, CRC(67ea12e7) SHA1(f81e97183442736d5766a7e5e074bc6539e8ced0))
ROM_END
@ -515,7 +458,7 @@ ROM_START(alpok_l6)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("v_ic7.532", 0x0000, 0x1000, CRC(a66c7ca6) SHA1(6e90081f853fcf66bfeac0a8ee1c762b3760b90b))
ROM_LOAD("v_ic5.532", 0x1000, 0x1000, CRC(f16a237a) SHA1(a904138fad5cbc19946bcf0de824e27537dcd621))
ROM_LOAD("v_ic6.532", 0x2000, 0x1000, CRC(15a3cc85) SHA1(86002ac78189415ae912e8bc23c92b3b67610d87))
@ -528,7 +471,7 @@ ROM_START(alpok_l2)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("v_ic7.532", 0x0000, 0x1000, CRC(a66c7ca6) SHA1(6e90081f853fcf66bfeac0a8ee1c762b3760b90b))
ROM_LOAD("v_ic5.532", 0x1000, 0x1000, CRC(f16a237a) SHA1(a904138fad5cbc19946bcf0de824e27537dcd621))
ROM_LOAD("v_ic6.532", 0x2000, 0x1000, CRC(15a3cc85) SHA1(86002ac78189415ae912e8bc23c92b3b67610d87))
@ -541,7 +484,7 @@ ROM_START(alpok_f6)
ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("5t5014fr.dat", 0x0000, 0x1000, CRC(1d961517) SHA1(c71ee324becfc8cdbecabd1e64b11b5a39ff2483))
ROM_LOAD("5t5015fr.dat", 0x1000, 0x1000, CRC(8d065f80) SHA1(0ab22c9b20ab6fe41abab620435ad03652db7a8e))
ROM_LOAD("5t5016fr.dat", 0x2000, 0x1000, CRC(0ddf91e9) SHA1(48f5fdfc0c5a66dd318fecb7c90e5f5a684a3876))

View File

@ -70,9 +70,8 @@ ToDo:
#include "machine/genpin.h"
#include "cpu/m6800/m6800.h"
#include "audio/williams.h"
#include "machine/6821pia.h"
#include "sound/dac.h"
#include "sound/hc55516.h"
#include "speaker.h"
#include "s7.lh"
@ -86,9 +85,7 @@ public:
s7_state(const machine_config &mconfig, device_type type, const char *tag)
: genpin_class(mconfig, type, tag)
, m_maincpu(*this, "maincpu")
, m_audiocpu(*this, "audiocpu")
, m_hc55516(*this, "hc55516")
, m_pias(*this, "pias")
, m_s6sound(*this, "s6sound")
, m_pia21(*this, "pia21")
, m_pia22(*this, "pia22")
, m_pia24(*this, "pia24")
@ -96,7 +93,6 @@ public:
, m_pia30(*this, "pia30")
, m_io_keyboard(*this, "X%d", 0U)
, m_dips(*this, "DS%d", 1U)
, m_io_snd(*this, "SND")
, m_digits(*this, "digit%d", 0U)
, m_io_outputs(*this, "out%d", 0U)
{ }
@ -105,7 +101,6 @@ public:
void init_1() { m_game = 1; }
DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
DECLARE_INPUT_CHANGED_MEMBER(diag_coin);
protected:
@ -114,7 +109,6 @@ protected:
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
private:
u8 sound_r();
void dig0_w(u8 data);
void dig1_w(u8 data);
void lamp0_w(u8 data);
@ -139,10 +133,8 @@ private:
DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { }; //ST4
DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { }; //ST3
DECLARE_WRITE_LINE_MEMBER(pia_irq);
void audio_map(address_map &map);
void main_map(address_map &map);
u8 m_sound_data = 0;
u8 m_strobe = 0;
u8 m_row = 0;
u8 m_nvram[0x100]{};
@ -153,9 +145,7 @@ private:
emu_timer* m_irq_timer;
static const device_timer_id TIMER_IRQ = 0;
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
required_device<hc55516_device> m_hc55516;
required_device<pia6821_device> m_pias;
required_device<williams_s6_sound_device> m_s6sound;
required_device<pia6821_device> m_pia21;
required_device<pia6821_device> m_pia22;
required_device<pia6821_device> m_pia24;
@ -163,7 +153,6 @@ private:
required_device<pia6821_device> m_pia30;
required_ioport_array<8> m_io_keyboard;
required_ioport_array<2> m_dips;
required_ioport m_io_snd;
output_finder<61> m_digits;
output_finder<88> m_io_outputs; // 24 solenoids + 64 lamps
};
@ -183,14 +172,6 @@ void s7_state::main_map(address_map &map)
map(0x5000, 0x7fff).rom().region("maincpu", 0 );
}
void s7_state::audio_map(address_map &map)
{
map.global_mask(0x7fff);
map(0x0000, 0x00ff).ram(); // external 6810 RAM
map(0x0400, 0x0403).rw(m_pias, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
map(0x3000, 0x7fff).rom().region("audiocpu", 0);
}
static INPUT_PORTS_START( s7 )
PORT_START("X0")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_8) PORT_NAME("Plumb Tilt") // 3 touches before it tilts
@ -260,12 +241,7 @@ static INPUT_PORTS_START( s7 )
PORT_START("X7")
PORT_START("SND")
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_NAME("Speech") PORT_CODE(KEYCODE_9_PAD) PORT_TOGGLE
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYPAD ) PORT_NAME("Music") PORT_CODE(KEYCODE_8_PAD) PORT_TOGGLE
PORT_START("DIAGS")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_7_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, s7_state, audio_nmi, 1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Main Diag") PORT_CODE(KEYCODE_0_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, s7_state, main_nmi, 1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Advance") PORT_CODE(KEYCODE_1_PAD)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Manual/Auto") PORT_CODE(KEYCODE_6_PAD) PORT_TOGGLE
@ -342,7 +318,7 @@ static INPUT_PORTS_START( pharo )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_A) PORT_NAME("INP38")
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_S) PORT_NAME("INP39")
PORT_MODIFY("X5")
PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_BIT( 0xf2, IP_ACTIVE_HIGH, IPT_UNUSED )
PORT_MODIFY("X6")
PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@ -518,13 +494,6 @@ INPUT_CHANGED_MEMBER( s7_state::main_nmi )
m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
INPUT_CHANGED_MEMBER( s7_state::audio_nmi )
{
// Diagnostic button sends a pulse to NMI pin
if (newval==CLEAR_LINE)
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
INPUT_CHANGED_MEMBER( s7_state::diag_coin )
{
m_memprotect = newval;
@ -559,10 +528,7 @@ void s7_state::sol2_w(u8 data)
void s7_state::sound_w(u8 data)
{
u8 t = m_game ? 0x3f : 0x1f;
m_sound_data = data & t;
bool cb1 = (m_sound_data != t);
m_sound_data |= m_io_snd->read();
m_pias->cb1_w(cb1);
m_s6sound->write(data & t);
// PA7 solenoid
m_io_outputs[23] = BIT(data, 7);
@ -636,11 +602,6 @@ void s7_state::nvram_w(offs_t offset, u8 data)
m_nvram[offset] = data;
}
u8 s7_state::sound_r()
{
return m_sound_data;
}
WRITE_LINE_MEMBER( s7_state::pia_irq )
{
if(state == CLEAR_LINE)
@ -689,7 +650,7 @@ void s7_state::machine_start()
save_item(NAME(m_row));
save_item(NAME(m_data_ok));
save_item(NAME(m_lamp_data));
save_item(NAME(m_sound_data));
save_item(NAME(m_memprotect));
save_item(NAME(m_nvram));
save_item(NAME(m_game));
@ -768,23 +729,8 @@ void s7_state::s7(machine_config &config)
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
/* Add the soundcard */
M6808(config, m_audiocpu, 3580000);
m_audiocpu->set_addrmap(AS_PROGRAM, &s7_state::audio_map);
SPEAKER(config, "speaker").front_center();
MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.5);
SPEAKER(config, "speech").front_center();
HC55516(config, m_hc55516, 0).add_route(ALL_OUTPUTS, "speech", 1.00);
PIA6821(config, m_pias, 0);
m_pias->readpb_handler().set(FUNC(s7_state::sound_r));
m_pias->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w));
m_pias->writepb_handler().set_nop();
m_pias->readca1_handler().set_constant(1);
m_pias->ca2_handler().set(m_hc55516, FUNC(hc55516_device::digit_w));
m_pias->cb2_handler().set(m_hc55516, FUNC(hc55516_device::clock_w));
m_pias->irqb_handler().set_inputline("audiocpu", M6808_IRQ_LINE);
SPEAKER(config, "mono").front_center();
WILLIAMS_S6_SOUND(config, m_s6sound, 0).add_route(ALL_OUTPUTS, "mono", 1.0);
}
@ -799,7 +745,7 @@ ROM_START(bk_l4)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("speech7.532", 0x0000, 0x1000, CRC(c7e229bf) SHA1(3b2ab41031f507963af828639f1690dc350737af))
ROM_LOAD("speech5.532", 0x1000, 0x1000, CRC(411bc92f) SHA1(6c8d26fd13ed5eeba5cc40886d39c65a64beb377))
ROM_LOAD("speech6.532", 0x2000, 0x1000, CRC(fc985005) SHA1(9df4ad12cf98a5a92b8f933e6b6788a292c8776b))
@ -814,7 +760,7 @@ ROM_START(bk_f4)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("speech7f.532", 0x0000, 0x1000, CRC(01debff6) SHA1(dc02199b63ae3309fdac819985f7a40010831634))
ROM_LOAD("speech5f.532", 0x1000, 0x1000, CRC(2d310dce) SHA1(ad2ad3844659787ee9be4db50b17b8af6f5d0d42))
ROM_LOAD("speech6f.532", 0x2000, 0x1000, CRC(96bb719b) SHA1(d602129ce1af1902e46ca26645a9a51324a788d0))
@ -829,7 +775,7 @@ ROM_START(bk_l3)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("speech7.532", 0x0000, 0x1000, CRC(c7e229bf) SHA1(3b2ab41031f507963af828639f1690dc350737af))
ROM_LOAD("speech5.532", 0x1000, 0x1000, CRC(411bc92f) SHA1(6c8d26fd13ed5eeba5cc40886d39c65a64beb377))
ROM_LOAD("speech6.532", 0x2000, 0x1000, CRC(fc985005) SHA1(9df4ad12cf98a5a92b8f933e6b6788a292c8776b))
@ -847,7 +793,7 @@ ROM_START(csmic_l1)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound12.716", 0x4800, 0x0800, CRC(af41737b) SHA1(8be4e7cebe5a821e859550c0350f0fc9cc00b2a9))
ROM_END
@ -861,7 +807,7 @@ ROM_START(jngld_l2)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("speech7.532", 0x0000, 0x1000, CRC(83ffb695) SHA1(f9151bdfdefd5c178ca7eb5122f62b700d64f41a))
ROM_LOAD("speech5.532", 0x1000, 0x1000, CRC(754bd474) SHA1(c05f48bb07085683de469603880eafd28dffd9f5))
ROM_LOAD("speech6.532", 0x2000, 0x1000, CRC(f2ac6a52) SHA1(5b3e743eac382d571fd049f92ea9955342b9ffa0))
@ -875,7 +821,7 @@ ROM_START(jngld_l1)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("speech7.532", 0x0000, 0x1000, CRC(83ffb695) SHA1(f9151bdfdefd5c178ca7eb5122f62b700d64f41a))
ROM_LOAD("speech5.532", 0x1000, 0x1000, CRC(754bd474) SHA1(c05f48bb07085683de469603880eafd28dffd9f5))
ROM_LOAD("speech6.532", 0x2000, 0x1000, CRC(f2ac6a52) SHA1(5b3e743eac382d571fd049f92ea9955342b9ffa0))
@ -892,7 +838,7 @@ ROM_START(pharo_l2)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("speech7.532", 0x0000, 0x1000, CRC(e087f8a1) SHA1(49c2ad60d82d02f0529329f7cb4b57339d6546c6))
ROM_LOAD("speech5.532", 0x1000, 0x1000, CRC(d72863dc) SHA1(e24ad970ed202165230fab999be42bea0f861fdd))
ROM_LOAD("speech6.532", 0x2000, 0x1000, CRC(d29830bd) SHA1(88f6c508f2a7000bbf6c9c26e1029cf9a241d5ca))
@ -910,20 +856,20 @@ ROM_START(solar_l2)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound12.716", 0x4800, 0x0800, CRC(05a2230c) SHA1(c57cd7628310aa8f68ca24217aad1ead066a1a82))
ROM_END
/*-----------------------------------
/ Thunderball - Sys.7 (Game #508) - Prototype
/-----------------------------------*/
ROM_START(thund_p1) // dated 6/22
ROM_START(thund_p1) // dated 1982-06-22
ROM_REGION(0x3000, "maincpu", ROMREGION_ERASEFF)
ROM_LOAD("ic20.532", 0x0000, 0x1000, CRC(aa3f07dc) SHA1(f31662972046f9a874380a8dcd1bc9259de5f6ba))
ROM_LOAD("ic14.532", 0x1000, 0x1000, CRC(1cd34f1f) SHA1(3f5b5a319570c26a3d34d640fef2ac6c04b83b70))
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("speech7.532", 0x0000, 0x1000, CRC(33e1b041) SHA1(f50c0311bde69fa6e8071e297a81cc3ef3dcf44f))
ROM_LOAD("speech5.532", 0x1000, 0x1000, CRC(11780c80) SHA1(bcc5efcd69b4f776feef32484a872863847d64cd))
ROM_LOAD("speech6.532", 0x2000, 0x1000, CRC(ab688698) SHA1(e0cbac44a6fe30a49da478c32500a0b43903cc2b))
@ -931,13 +877,13 @@ ROM_START(thund_p1) // dated 6/22
ROM_LOAD("sound12.532", 0x4000, 0x1000, CRC(cc70af52) SHA1(d9c2840acdcd69aab39fc647dd4819eccc06af33))
ROM_END
ROM_START(thund_p2) // dated 8/31
ROM_START(thund_p2) // dated 1982-08-31
ROM_REGION(0x3000, "maincpu", ROMREGION_ERASEFF)
ROM_LOAD("ic20_831.532", 0x0000, 0x1000, CRC(91ed089b) SHA1(0e47f5a87cb227a6ee8645931bfa807219b388ef))
ROM_LOAD("ic14_831.532", 0x1000, 0x1000, CRC(873ccf24) SHA1(2723aa7d059a111374d8145391fbef0c81043e4b))
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("speech7.532", 0x0000, 0x1000, CRC(33e1b041) SHA1(f50c0311bde69fa6e8071e297a81cc3ef3dcf44f))
ROM_LOAD("speech5.532", 0x1000, 0x1000, CRC(11780c80) SHA1(bcc5efcd69b4f776feef32484a872863847d64cd))
ROM_LOAD("speech6.532", 0x2000, 0x1000, CRC(ab688698) SHA1(e0cbac44a6fe30a49da478c32500a0b43903cc2b))
@ -945,13 +891,13 @@ ROM_START(thund_p2) // dated 8/31
ROM_LOAD("sound12.532", 0x4000, 0x1000, CRC(cc70af52) SHA1(d9c2840acdcd69aab39fc647dd4819eccc06af33))
ROM_END
ROM_START(thund_p3) // dated 9/08
ROM_START(thund_p3) // dated 1982-09-08
ROM_REGION(0x3000, "maincpu", ROMREGION_ERASEFF)
ROM_LOAD("ic20_908.532", 0x0000, 0x1000, CRC(21f87917) SHA1(6cfdd5aadafb2d137f2e959fa047ffbe5c09ac2c))
ROM_LOAD("ic14_908.532", 0x1000, 0x1000, CRC(099e798e) SHA1(38d79622b4d68c69308ee109f47509e0733828ba))
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("speech7.532", 0x0000, 0x1000, CRC(33e1b041) SHA1(f50c0311bde69fa6e8071e297a81cc3ef3dcf44f))
ROM_LOAD("speech5.532", 0x1000, 0x1000, CRC(11780c80) SHA1(bcc5efcd69b4f776feef32484a872863847d64cd))
ROM_LOAD("speech6.532", 0x2000, 0x1000, CRC(ab688698) SHA1(e0cbac44a6fe30a49da478c32500a0b43903cc2b))
@ -969,7 +915,7 @@ ROM_START(hypbl_l4)
ROM_LOAD("ic14.532", 0x1000, 0x1000, CRC(8090fe71) SHA1(0f1f40c0ee8da5b2fd51efeb8be7c20d6465239e))
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(6f4c0c4c) SHA1(1036067e2c85da867983e6e51ee2a7b5135000df))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound12.532", 0x4000, 0x1000, CRC(06051e5e) SHA1(f0ab4be812ceaf771829dd549f2a612156102a93))
ROM_END
@ -979,7 +925,7 @@ ROM_START(hypbl_l3)
ROM_LOAD("ic14-l3.532", 0x1000, 0x1000, CRC(e233bbed) SHA1(bb29acc3e48d6b40b3df2e7702f8a8ff4357c15c))
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(6f4c0c4c) SHA1(1036067e2c85da867983e6e51ee2a7b5135000df))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound12.532", 0x4000, 0x1000, CRC(06051e5e) SHA1(f0ab4be812ceaf771829dd549f2a612156102a93))
ROM_END
@ -989,7 +935,7 @@ ROM_START(hypbl_l2)
ROM_LOAD("ic14-l2.532", 0x1000, 0x1000, CRC(8eb82df4) SHA1(854b3f1fa2112fbdba19f4c843f67989c0572d8c))
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(6f4c0c4c) SHA1(1036067e2c85da867983e6e51ee2a7b5135000df))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound12.532", 0x4000, 0x1000, CRC(06051e5e) SHA1(f0ab4be812ceaf771829dd549f2a612156102a93))
ROM_END
@ -1004,7 +950,7 @@ ROM_START(barra_l1)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound4.716", 0x4800, 0x0800, CRC(67ea12e7) SHA1(f81e97183442736d5766a7e5e074bc6539e8ced0))
ROM_END
@ -1018,7 +964,7 @@ ROM_START(vrkon_l1)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound12.716", 0x4800, 0x0800, CRC(d13db2bb) SHA1(862546bbdd1476906948f7324b7434c29df79baa))
ROM_END
@ -1032,7 +978,7 @@ ROM_START(tmfnt_l5)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound3.716", 0x4800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4))
ROM_END
@ -1046,7 +992,7 @@ ROM_START(wrlok_l3)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound12.716", 0x4800, 0x0800, CRC(5d8e46d6) SHA1(68f8760ad85b8ada81f6ed00eadb9daf37191c53))
ROM_END
@ -1060,7 +1006,7 @@ ROM_START(dfndr_l4)
ROM_LOAD("ic14.532", 0x1000, 0x1000, CRC(959ec419) SHA1(f400d3a1feba0e149d24f4e1a8d240fe900b3f0b))
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound12.716", 0x4800, 0x0800, CRC(cabaec58) SHA1(9605a1c299ed109a4ebcfa7ed6985ecc815c9e0c))
ROM_END
@ -1074,7 +1020,7 @@ ROM_START(jst_l2)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound12.532", 0x4000, 0x1000, CRC(3bbc90bf) SHA1(82154e719ceca5c72d1ab034bc4ff5e3ebb36832))
ROM_END
@ -1085,7 +1031,7 @@ ROM_START(jst_l1)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound12.532", 0x4000, 0x1000, CRC(3bbc90bf) SHA1(82154e719ceca5c72d1ab034bc4ff5e3ebb36832))
ROM_END
@ -1099,7 +1045,7 @@ ROM_START(lsrcu_l2)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound12.716", 0x4800, 0x0800, CRC(1888c635) SHA1(5dcdaee437a69c6027c24310f0cd2cae4e89fa05))
ROM_END
@ -1113,7 +1059,7 @@ ROM_START(fpwr2_l2)
ROM_LOAD("ic20.716", 0x1800, 0x0800, CRC(dfb4b75a) SHA1(bcf017b01236f755cee419e398bbd8955ae3576a) )
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(bb571a17) SHA1(fb0b7f247673dae0744d4188e1a03749a2237165) )
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound3.716", 0x4800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4))
ROM_END
@ -1128,7 +1074,7 @@ ROM_START(wldtexas)
ROM_LOAD("wldtexas.prg", 0x0000, 0x1000, CRC(243e7116) SHA1(c13c261632b3e8693a500d922f151296102e0169))
ROM_CONTINUE(0x0000, 0x3000)
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound3.716", 0x4800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4))
ROM_END
@ -1141,7 +1087,7 @@ ROM_START(strlt_l1)
ROM_LOAD("ic14.532", 0x1000, 0x1000, CRC(292f1c4a) SHA1(0b5d50331364655672be16236d38d72b28f6dec2))
ROM_LOAD("ic17.532", 0x2000, 0x1000, CRC(a43d8518) SHA1(fb2289bb7380838d0d817e78c39e5bcb2709373f))
ROM_REGION(0x5000, "audiocpu", ROMREGION_ERASEFF)
ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF)
ROM_LOAD("sound3.716", 0x4800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4))
ROM_END