From 7d22044105d1556ef89b9121e6d93a1e8f8c17bf Mon Sep 17 00:00:00 2001 From: Robbbert Date: Mon, 29 Oct 2012 09:54:05 +0000 Subject: [PATCH] Williams System 9 : Comet marked as WORKING [Robbbert] --- .gitattributes | 1 + src/mame/drivers/s8.c | 3 +- src/mame/drivers/s9.c | 531 ++++++++++++++++++++++++++++++++++------- src/mame/layout/s8.lay | 2 +- src/mame/layout/s9.lay | 155 ++++++++++++ src/mame/mame.mak | 2 + 6 files changed, 602 insertions(+), 92 deletions(-) create mode 100644 src/mame/layout/s9.lay diff --git a/.gitattributes b/.gitattributes index b21d17942f0..e4a7a5a6a65 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4452,6 +4452,7 @@ src/mame/layout/s4.lay svneol=native#text/plain src/mame/layout/s6.lay svneol=native#text/plain src/mame/layout/s6a.lay svneol=native#text/plain src/mame/layout/s8.lay svneol=native#text/plain +src/mame/layout/s9.lay svneol=native#text/plain src/mame/layout/saiyukip.lay svneol=native#text/plain src/mame/layout/sbrkout.lay svneol=native#text/plain src/mame/layout/sc1_vfd.lay svneol=native#text/plain diff --git a/src/mame/drivers/s8.c b/src/mame/drivers/s8.c index 9ee0fab3e54..fe9f7062082 100644 --- a/src/mame/drivers/s8.c +++ b/src/mame/drivers/s8.c @@ -82,6 +82,7 @@ public: DECLARE_WRITE_LINE_MEMBER(pia_cb2_w); DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w); DECLARE_WRITE_LINE_MEMBER(pia21_cb2_w) { }; // enable solenoids + DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { }; // dummy to stop error log filling up DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { }; // comma3&4 DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { }; // comma1&2 TIMER_DEVICE_CALLBACK_MEMBER(irq); @@ -278,7 +279,7 @@ static const pia6821_interface pia24_intf = DEVCB_DRIVER_MEMBER(s8_state, lamp0_w), /* port A out */ DEVCB_DRIVER_MEMBER(s8_state, lamp1_w), /* port B out */ DEVCB_NULL, /* line CA2 out */ - DEVCB_NULL, /* line CB2 out */ + DEVCB_DRIVER_LINE_MEMBER(s8_state, pia24_cb2_w), /* line CB2 out */ DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */ DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */ }; diff --git a/src/mame/drivers/s9.c b/src/mame/drivers/s9.c index d7e89dc73d6..efc2b1424e1 100644 --- a/src/mame/drivers/s9.c +++ b/src/mame/drivers/s9.c @@ -1,169 +1,520 @@ -/* +/*********************************************************************************** + + Pinball Williams System 9 -*/ -#include "emu.h" + +ToDo: + +************************************************************************************/ + + +#include "machine/genpin.h" #include "cpu/m6800/m6800.h" +#include "machine/6821pia.h" +#include "sound/dac.h" +#include "s9.lh" -class williams_s9_state : public driver_device + +class s9_state : public genpin_class { public: - williams_s9_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") + s9_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_dac(*this, "dac"), + m_pia(*this, "pia"), + m_pia21(*this, "pia21"), + m_pia24(*this, "pia24"), + m_pia28(*this, "pia28"), + m_pia30(*this, "pia30") { } + DECLARE_READ8_MEMBER(dac_r); + DECLARE_WRITE8_MEMBER(dac_w); + DECLARE_WRITE8_MEMBER(dig0_w); + DECLARE_WRITE8_MEMBER(dig1_w); + DECLARE_WRITE8_MEMBER(lamp0_w); + DECLARE_WRITE8_MEMBER(lamp1_w) { }; + DECLARE_WRITE8_MEMBER(sol2_w) { }; // solenoids 8-15 + DECLARE_WRITE8_MEMBER(sol3_w); // solenoids 0-7 + DECLARE_WRITE8_MEMBER(sound_w); + DECLARE_READ8_MEMBER(dips_r); + DECLARE_READ8_MEMBER(switch_r); + DECLARE_WRITE8_MEMBER(switch_w); + DECLARE_READ_LINE_MEMBER(pia_ca1_r); + DECLARE_READ_LINE_MEMBER(pia21_ca1_r); + DECLARE_READ_LINE_MEMBER(pia28_ca1_r); + DECLARE_READ_LINE_MEMBER(pia28_cb1_r); + DECLARE_WRITE_LINE_MEMBER(pia_ca2_w); + DECLARE_WRITE_LINE_MEMBER(pia_cb2_w); + DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w); + DECLARE_WRITE_LINE_MEMBER(pia21_cb2_w) { }; // enable solenoids + DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { }; // dummy to stop error log filling up + DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { }; // comma3&4 + DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { }; // comma1&2 + TIMER_DEVICE_CALLBACK_MEMBER(irq); + DECLARE_INPUT_CHANGED_MEMBER(main_nmi); + DECLARE_INPUT_CHANGED_MEMBER(audio_nmi); + DECLARE_MACHINE_RESET(s9); protected: // devices required_device m_maincpu; - - // driver_device overrides - virtual void machine_reset(); -public: - DECLARE_DRIVER_INIT(williams_s9); + optional_device m_audiocpu; + optional_device m_dac; + optional_device m_pia; + required_device m_pia21; + required_device m_pia24; + required_device m_pia28; + required_device m_pia30; +private: + UINT8 m_t_c; + UINT8 m_sound_data; + UINT8 m_strobe; + UINT8 m_kbdrow; + bool m_ca1; + bool m_data_ok; }; - -static ADDRESS_MAP_START( williams_s9_map, AS_PROGRAM, 8, williams_s9_state ) - AM_RANGE(0x0000, 0xffff) AM_NOP +static ADDRESS_MAP_START( s9_main_map, AS_PROGRAM, 8, s9_state ) + ADDRESS_MAP_GLOBAL_MASK(0x7fff) + AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") + AM_RANGE(0x2100, 0x2103) AM_DEVREADWRITE("pia21", pia6821_device, read, write) // sound+solenoids + AM_RANGE(0x2200, 0x2200) AM_WRITE(sol3_w) // solenoids + AM_RANGE(0x2400, 0x2403) AM_DEVREADWRITE("pia24", pia6821_device, read, write) // lamps + AM_RANGE(0x2800, 0x2803) AM_DEVREADWRITE("pia28", pia6821_device, read, write) // display + AM_RANGE(0x3000, 0x3003) AM_DEVREADWRITE("pia30", pia6821_device, read, write) // inputs + AM_RANGE(0x4000, 0x7fff) AM_ROM ADDRESS_MAP_END -static INPUT_PORTS_START( williams_s9 ) +static ADDRESS_MAP_START( s9_audio_map, AS_PROGRAM, 8, s9_state ) + AM_RANGE(0x0000, 0x07ff) AM_RAM + AM_RANGE(0x2000, 0x2003) AM_DEVREADWRITE("pia", pia6821_device, read, write) + AM_RANGE(0x8000, 0xffff) AM_ROM +ADDRESS_MAP_END + +static INPUT_PORTS_START( s9 ) + PORT_START("X0") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Q) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_W) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_E) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_R) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Y) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_U) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_I) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_O) + + PORT_START("X1") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) + + PORT_START("X2") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_F) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_G) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_H) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_J) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_K) + + PORT_START("X4") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_L) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Z) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_C) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_V) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_B) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_N) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_M) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COMMA) + + PORT_START("X8") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_STOP) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COLON) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_QUOTE) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_X) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_MINUS) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_EQUALS) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSPACE) + + PORT_START("X10") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_OPENBRACE) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_CLOSEBRACE) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSLASH) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_ENTER) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_LEFT) + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_RIGHT) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_UP) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DOWN) + + PORT_START("X20") + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START("X40") + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START("X80") + PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) + + PORT_START("DIAGS") + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_F1) PORT_CHANGED_MEMBER(DEVICE_SELF, s9_state, audio_nmi, 1) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Main Diag") PORT_CODE(KEYCODE_F2) PORT_CHANGED_MEMBER(DEVICE_SELF, s9_state, main_nmi, 1) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Advance") PORT_CODE(KEYCODE_0) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Up/Down") PORT_CODE(KEYCODE_9) INPUT_PORTS_END -void williams_s9_state::machine_reset() +MACHINE_RESET_MEMBER( s9_state, s9 ) { + m_t_c = 0; } -DRIVER_INIT_MEMBER(williams_s9_state,williams_s9) +INPUT_CHANGED_MEMBER( s9_state::main_nmi ) { + // Diagnostic button sends a pulse to NMI pin + if (newval==CLEAR_LINE) + m_maincpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); } -static MACHINE_CONFIG_START( williams_s9, williams_s9_state ) +INPUT_CHANGED_MEMBER( s9_state::audio_nmi ) +{ + // Diagnostic button sends a pulse to NMI pin + if (newval==CLEAR_LINE) + m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE); +} + +WRITE8_MEMBER( s9_state::sol3_w ) +{ +// if (BIT(data, 1)) +// m_samples->start(0, 6); // knocker +} + +WRITE8_MEMBER( s9_state::sound_w ) +{ + m_sound_data = data; +} + +READ_LINE_MEMBER( s9_state::pia21_ca1_r ) +{ +// sound busy + return 1; +} + +WRITE_LINE_MEMBER( s9_state::pia21_ca2_w ) +{ +// sound ns + m_ca1 = state; + m_pia->ca1_w(m_ca1); +} + +static const pia6821_interface pia21_intf = +{ + DEVCB_DRIVER_MEMBER(s9_state, dac_r), /* port A in */ + DEVCB_NULL, /* port B in */ + DEVCB_DRIVER_LINE_MEMBER(s9_state, pia21_ca1_r), /* line CA1 in */ + DEVCB_LINE_GND, /* line CB1 in */ + DEVCB_NULL, /* line CA2 in */ + DEVCB_NULL, /* line CB2 in */ + DEVCB_DRIVER_MEMBER(s9_state, sound_w), /* port A out */ + DEVCB_DRIVER_MEMBER(s9_state, sol2_w), /* port B out */ + DEVCB_DRIVER_LINE_MEMBER(s9_state, pia21_ca2_w), /* line CA2 out */ + DEVCB_DRIVER_LINE_MEMBER(s9_state, pia21_cb2_w), /* line CB2 out */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */ +}; + +WRITE8_MEMBER( s9_state::lamp0_w ) +{ + m_maincpu->set_input_line(M6800_IRQ_LINE, CLEAR_LINE); +} + +static const pia6821_interface pia24_intf = +{ + DEVCB_NULL, /* port A in */ + DEVCB_NULL, /* port B in */ + DEVCB_LINE_GND, /* line CA1 in */ + DEVCB_LINE_GND, /* line CB1 in */ + DEVCB_LINE_VCC, /* line CA2 in */ + DEVCB_LINE_VCC, /* line CB2 in */ + DEVCB_DRIVER_MEMBER(s9_state, lamp0_w), /* port A out */ + DEVCB_DRIVER_MEMBER(s9_state, lamp1_w), /* port B out */ + DEVCB_NULL, /* line CA2 out */ + DEVCB_DRIVER_LINE_MEMBER(s9_state, pia24_cb2_w), /* line CB2 out */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */ +}; + +READ_LINE_MEMBER( s9_state::pia28_ca1_r ) +{ + return BIT(ioport("DIAGS")->read(), 2); // advance button +} + +READ_LINE_MEMBER( s9_state::pia28_cb1_r ) +{ + return BIT(ioport("DIAGS")->read(), 3); // up/down switch +} + +WRITE8_MEMBER( s9_state::dig0_w ) +{ + static const UINT8 patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0x58, 0x4c, 0x62, 0x69, 0x78, 0 }; // 7447 + data &= 0x7f; + m_strobe = data & 15; + m_data_ok = true; + output_set_digit_value(60, patterns[data>>4]); // diag digit +} + +WRITE8_MEMBER( s9_state::dig1_w ) +{ + static const UINT8 patterns[16] = { 0x3f, 0x06, 0x5b, 0x4f, 0x66, 0x6d, 0x7c, 0x07, 0x7f, 0x67, 0, 0, 0, 0, 0, 0 }; // MC14558 + if (m_data_ok) + { + output_set_digit_value(m_strobe+16, patterns[data&15]); + output_set_digit_value(m_strobe, patterns[data>>4]); + } + m_data_ok = false; +} + +static const pia6821_interface pia28_intf = +{ + DEVCB_NULL, /* port A in */ + DEVCB_NULL, /* port B in */ + DEVCB_DRIVER_LINE_MEMBER(s9_state, pia28_ca1_r), /* line CA1 in */ + DEVCB_DRIVER_LINE_MEMBER(s9_state, pia28_cb1_r), /* line CB1 in */ + DEVCB_NULL, /* line CA2 in */ + DEVCB_NULL, /* line CB2 in */ + DEVCB_DRIVER_MEMBER(s9_state, dig0_w), /* port A out */ + DEVCB_DRIVER_MEMBER(s9_state, dig1_w), /* port B out */ + DEVCB_DRIVER_LINE_MEMBER(s9_state, pia28_ca2_w), /* line CA2 out */ + DEVCB_DRIVER_LINE_MEMBER(s9_state, pia28_cb2_w), /* line CB2 out */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */ +}; + +READ8_MEMBER( s9_state::switch_r ) +{ + char kbdrow[8]; + sprintf(kbdrow,"X%X",m_kbdrow); + return ~ioport(kbdrow)->read(); +} + +WRITE8_MEMBER( s9_state::switch_w ) +{ + m_kbdrow = data; +} + +static const pia6821_interface pia30_intf = +{ + DEVCB_DRIVER_MEMBER(s9_state, switch_r), /* port A in */ + DEVCB_NULL, /* port B in */ + DEVCB_LINE_GND, /* line CA1 in */ + DEVCB_LINE_GND, /* line CB1 in */ + DEVCB_LINE_VCC, /* line CA2 in */ + DEVCB_LINE_VCC, /* line CB2 in */ + DEVCB_NULL, /* port A out */ + DEVCB_DRIVER_MEMBER(s9_state, switch_w), /* port B out */ + DEVCB_NULL, /* line CA2 out */ + DEVCB_NULL, /* line CB2 out */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE), /* IRQA */ + DEVCB_CPU_INPUT_LINE("maincpu", M6800_IRQ_LINE) /* IRQB */ +}; + +READ_LINE_MEMBER( s9_state::pia_ca1_r ) +{ + return m_ca1; +} + +WRITE_LINE_MEMBER( s9_state::pia_ca2_w ) +{ +// speech clock +} + +WRITE_LINE_MEMBER( s9_state::pia_cb2_w ) +{ +// speech data +} + +READ8_MEMBER( s9_state::dac_r ) +{ + return m_sound_data; +} + +WRITE8_MEMBER( s9_state::dac_w ) +{ + m_dac->write_unsigned8(data); +} + +static const pia6821_interface pia_intf = +{ + DEVCB_DRIVER_MEMBER(s9_state, dac_r), /* port A in */ + DEVCB_NULL, /* port B in */ + DEVCB_DRIVER_LINE_MEMBER(s9_state, pia_ca1_r), /* line CA1 in */ + DEVCB_LINE_GND, /* line CB1 in */ + DEVCB_NULL, /* line CA2 in */ + DEVCB_NULL, /* line CB2 in */ + DEVCB_DRIVER_MEMBER(s9_state, sound_w), /* port A out */ + DEVCB_DRIVER_MEMBER(s9_state, dac_w), /* port B out */ + DEVCB_DRIVER_LINE_MEMBER(s9_state, pia_ca2_w), /* line CA2 out */ + DEVCB_DRIVER_LINE_MEMBER(s9_state, pia_cb2_w), /* line CB2 out */ + DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE), /* IRQA */ + DEVCB_CPU_INPUT_LINE("audiocpu", M6800_IRQ_LINE) /* IRQB */ +}; + +TIMER_DEVICE_CALLBACK_MEMBER( s9_state::irq) +{ + if (m_t_c > 0x70) + m_maincpu->set_input_line(M6800_IRQ_LINE, ASSERT_LINE); + else + m_t_c++; +} + +static MACHINE_CONFIG_START( s9, s9_state ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M6800, 1000000) - MCFG_CPU_PROGRAM_MAP(williams_s9_map) + MCFG_CPU_ADD("maincpu", M6802, 4000000) + MCFG_CPU_PROGRAM_MAP(s9_main_map) + MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", s9_state, irq, attotime::from_hz(250)) + MCFG_MACHINE_RESET_OVERRIDE(s9_state, s9) + + /* Video */ + MCFG_DEFAULT_LAYOUT(layout_s9) + + /* Sound */ + MCFG_FRAGMENT_ADD( genpin_audio ) + + /* Devices */ + MCFG_PIA6821_ADD("pia21", pia21_intf) + MCFG_PIA6821_ADD("pia24", pia24_intf) + MCFG_PIA6821_ADD("pia28", pia28_intf) + MCFG_PIA6821_ADD("pia30", pia30_intf) + MCFG_NVRAM_ADD_1FILL("nvram") + /* Add the soundcard */ + MCFG_CPU_ADD("audiocpu", M6808, 4000000) + MCFG_CPU_PROGRAM_MAP(s9_audio_map) + MCFG_SPEAKER_STANDARD_MONO("mono") + MCFG_SOUND_ADD("dac", DAC, 0) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) + MCFG_PIA6821_ADD("pia", pia_intf) MACHINE_CONFIG_END -/*-------------------- -/ Comet (S9) 06/85 -/--------------------*/ -ROM_START(comet_l4) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD("cpu_u20.128", 0x8000, 0x4000, CRC(36193600) SHA1(efdc44ef26c2def8f860a0296e27b2c3dac55ec8)) - ROM_RELOAD( 0xc000, 0x4000) - ROM_REGION(0x10000, "cpu2", 0) - ROM_LOAD("cpu_u49.128", 0xc000, 0x4000, CRC(f1db0cbe) SHA1(59b7f36fb2003b90b288abeff56df62ce50f10c6)) - ROM_LOAD("spch_u7.732", 0x8000, 0x1000, CRC(36545b22) SHA1(f4a026f3fa58dce81b439d76120a6769f4632955)) - ROM_LOAD("spch_u5.732", 0x9000, 0x1000, CRC(89f7ede5) SHA1(bbfbd991c9e005c2fa36d8458803b121f4933618)) - ROM_LOAD("spch_u6.732", 0xa000, 0x1000, CRC(6ba2aba6) SHA1(783b4e9b38db8677d91f86cb4805f0fa1ae8f856)) - ROM_LOAD("spch_u4.732", 0xb000, 0x1000, CRC(d0215c49) SHA1(4f0925a826199b6e8baa5e7fbff5cde9e31d505b)) -ROM_END - -ROM_START(comet_l5) - ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD("cpu_u20.l5", 0x8000, 0x4000, CRC(d153d9ab) SHA1(0b97591b8ba35207b1427900486d69078ae122bc)) - ROM_RELOAD( 0xc000, 0x4000) - ROM_REGION(0x10000, "cpu2", 0) - ROM_LOAD("cpu_u49.128", 0xc000, 0x4000, CRC(f1db0cbe) SHA1(59b7f36fb2003b90b288abeff56df62ce50f10c6)) - ROM_LOAD("spch_u7.732", 0x8000, 0x1000, CRC(36545b22) SHA1(f4a026f3fa58dce81b439d76120a6769f4632955)) - ROM_LOAD("spch_u5.732", 0x9000, 0x1000, CRC(89f7ede5) SHA1(bbfbd991c9e005c2fa36d8458803b121f4933618)) - ROM_LOAD("spch_u6.732", 0xa000, 0x1000, CRC(6ba2aba6) SHA1(783b4e9b38db8677d91f86cb4805f0fa1ae8f856)) - ROM_LOAD("spch_u4.732", 0xb000, 0x1000, CRC(d0215c49) SHA1(4f0925a826199b6e8baa5e7fbff5cde9e31d505b)) -ROM_END - -/*-------------------- -/ Sorcerer (S9) 03/85 -/--------------------*/ +/*----------------------------- +/ Sorcerer (S9) 03/85 (#532) +/------------------------------*/ ROM_START(sorcr_l1) ROM_REGION(0x10000, "maincpu", 0) ROM_LOAD("cpu_u19.732", 0x5000, 0x1000, CRC(88b6837d) SHA1(d26b06342741443406a72ba48a70e82df62bb26e)) - ROM_RELOAD( 0xd000, 0x1000) ROM_LOAD("cpu_u20.764", 0x6000, 0x2000, CRC(c235b692) SHA1(d3b97fad2d501c894570601b387933c7644f64e6)) - ROM_RELOAD( 0xe000, 0x2000) - ROM_REGION(0x10000, "cpu2", 0) - ROM_LOAD("cpu_u49.128", 0xc000, 0x4000, CRC(a0bae1e4) SHA1(dc5172aa1d59191d4119da20757cb2c2469f8fe3)) + + ROM_REGION(0x10000, "audiocpu", 0) ROM_LOAD("spch_u7.732", 0x8000, 0x1000, CRC(bba9ed18) SHA1(8e37ba8cb6bbc1e0afeef230088beda4513adddb)) ROM_LOAD("spch_u5.732", 0x9000, 0x1000, CRC(d48c68ad) SHA1(b1391b87519ad47be3dcce7f8581f871e6a3669f)) ROM_LOAD("spch_u6.732", 0xa000, 0x1000, CRC(a5c54d47) SHA1(4e1206412ecf52ae61c9df2055e0715749a6325d)) ROM_LOAD("spch_u4.732", 0xb000, 0x1000, CRC(0c81902d) SHA1(6d8f703327e5c73a321fc4aa3a67ce68fff82d70)) + ROM_LOAD("cpu_u49.128", 0xc000, 0x4000, CRC(a0bae1e4) SHA1(dc5172aa1d59191d4119da20757cb2c2469f8fe3)) ROM_END ROM_START(sorcr_l2) ROM_REGION(0x10000, "maincpu", 0) ROM_LOAD("cpu_u19.l2", 0x5000, 0x1000, CRC(faf738db) SHA1(a3b3f4160dc837ddf5379e1edb0eafeefcc11e3d)) - ROM_RELOAD( 0xd000, 0x1000) ROM_LOAD("cpu_u20.l2", 0x6000, 0x2000, CRC(74fc8117) SHA1(c228c76ade670603f77bb324e6794ec6dd358285)) - ROM_RELOAD( 0xe000, 0x2000) - ROM_REGION(0x10000, "cpu2", 0) - ROM_LOAD("cpu_u49.128", 0xc000, 0x4000, CRC(a0bae1e4) SHA1(dc5172aa1d59191d4119da20757cb2c2469f8fe3)) + + ROM_REGION(0x10000, "audiocpu", 0) ROM_LOAD("spch_u7.732", 0x8000, 0x1000, CRC(bba9ed18) SHA1(8e37ba8cb6bbc1e0afeef230088beda4513adddb)) ROM_LOAD("spch_u5.732", 0x9000, 0x1000, CRC(d48c68ad) SHA1(b1391b87519ad47be3dcce7f8581f871e6a3669f)) ROM_LOAD("spch_u6.732", 0xa000, 0x1000, CRC(a5c54d47) SHA1(4e1206412ecf52ae61c9df2055e0715749a6325d)) ROM_LOAD("spch_u4.732", 0xb000, 0x1000, CRC(0c81902d) SHA1(6d8f703327e5c73a321fc4aa3a67ce68fff82d70)) + ROM_LOAD("cpu_u49.128", 0xc000, 0x4000, CRC(a0bae1e4) SHA1(dc5172aa1d59191d4119da20757cb2c2469f8fe3)) ROM_END -/*-------------------- -/ Space Shuttle (S9) 12/84 -/--------------------*/ +/*--------------------------------- +/ Space Shuttle (S9) 12/84 (#535) +/----------------------------------*/ ROM_START(sshtl_l7) ROM_REGION(0x10000, "maincpu", 0) - ROM_LOAD("cpu_u20.128", 0x8000, 0x4000, CRC(848ad54c) SHA1(4e4ce5fb970da37706472f94a27fd912e1ecb1a0)) - ROM_RELOAD( 0xc000, 0x4000) - ROM_REGION(0x10000, "cpu2", 0) - ROM_LOAD("cpu_u49.128", 0xc000, 0x4000, CRC(8050ae27) SHA1(e3f5e9398f61b075620ecd075617a8dac3c07d0e)) + ROM_LOAD("cpu_u20.128", 0x4000, 0x4000, CRC(848ad54c) SHA1(4e4ce5fb970da37706472f94a27fd912e1ecb1a0)) + + ROM_REGION(0x10000, "audiocpu", 0) ROM_LOAD("spch_u5.732", 0x9000, 0x1000, CRC(13edd4e5) SHA1(46c4052c31ddc20bb87445636f8fe3b6f7bff856)) ROM_LOAD("spch_u6.732", 0xa000, 0x1000, CRC(cf48b2e7) SHA1(fe55419a5d40b3a4e8c02a92746b25a075b8efd3)) ROM_LOAD("spch_u4.732", 0xb000, 0x1000, CRC(b0d03c5e) SHA1(46b952f71a7ecc03e22e427875f6e16a9d124067)) + ROM_LOAD("cpu_u49.128", 0xc000, 0x4000, CRC(8050ae27) SHA1(e3f5e9398f61b075620ecd075617a8dac3c07d0e)) ROM_END -/*-------------------- +/*------------------------- +/ Comet (S9) 06/85 (#540) +/--------------------------*/ +ROM_START(comet_l4) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD("cpu_u20.128", 0x4000, 0x4000, CRC(36193600) SHA1(efdc44ef26c2def8f860a0296e27b2c3dac55ec8)) + + ROM_REGION(0x10000, "audiocpu", 0) + ROM_LOAD("spch_u7.732", 0x8000, 0x1000, CRC(36545b22) SHA1(f4a026f3fa58dce81b439d76120a6769f4632955)) + ROM_LOAD("spch_u5.732", 0x9000, 0x1000, CRC(89f7ede5) SHA1(bbfbd991c9e005c2fa36d8458803b121f4933618)) + ROM_LOAD("spch_u6.732", 0xa000, 0x1000, CRC(6ba2aba6) SHA1(783b4e9b38db8677d91f86cb4805f0fa1ae8f856)) + ROM_LOAD("spch_u4.732", 0xb000, 0x1000, CRC(d0215c49) SHA1(4f0925a826199b6e8baa5e7fbff5cde9e31d505b)) + ROM_LOAD("cpu_u49.128", 0xc000, 0x4000, CRC(f1db0cbe) SHA1(59b7f36fb2003b90b288abeff56df62ce50f10c6)) +ROM_END + +ROM_START(comet_l5) + ROM_REGION(0x10000, "maincpu", 0) + ROM_LOAD("cpu_u20.l5", 0x4000, 0x4000, CRC(d153d9ab) SHA1(0b97591b8ba35207b1427900486d69078ae122bc)) + + ROM_REGION(0x10000, "audiocpu", 0) + ROM_LOAD("spch_u7.732", 0x8000, 0x1000, CRC(36545b22) SHA1(f4a026f3fa58dce81b439d76120a6769f4632955)) + ROM_LOAD("spch_u5.732", 0x9000, 0x1000, CRC(89f7ede5) SHA1(bbfbd991c9e005c2fa36d8458803b121f4933618)) + ROM_LOAD("spch_u6.732", 0xa000, 0x1000, CRC(6ba2aba6) SHA1(783b4e9b38db8677d91f86cb4805f0fa1ae8f856)) + ROM_LOAD("spch_u4.732", 0xb000, 0x1000, CRC(d0215c49) SHA1(4f0925a826199b6e8baa5e7fbff5cde9e31d505b)) + ROM_LOAD("cpu_u49.128", 0xc000, 0x4000, CRC(f1db0cbe) SHA1(59b7f36fb2003b90b288abeff56df62ce50f10c6)) +ROM_END + +/*-------------------------------- / Strike Zone (Shuffle) (#916) -/--------------------*/ +/---------------------------------*/ ROM_START(szone_l5) ROM_REGION(0x10000, "maincpu", 0) ROM_LOAD("sz_u19r5.732", 0x5000, 0x1000, CRC(c79c46cb) SHA1(422ba74ae67bebbe02f85a9a8df0e3072f3cebc0)) - ROM_RELOAD( 0xd000, 0x1000) ROM_LOAD("sz_u20r5.764", 0x6000, 0x2000, CRC(9b5b3be2) SHA1(fce051a60b6eecd9bc07273892b14046b251b372)) - ROM_RELOAD( 0xe000, 0x2000) - ROM_REGION(0x10000, "cpu2", 0) + + ROM_REGION(0x10000, "audiocpu", 0) ROM_LOAD("szs_u49.128", 0xc000, 0x4000, CRC(144c3c07) SHA1(57be6f336f200079cd698b13f8fa4755cf694274)) - ROM_RELOAD(0x8000, 0x4000) ROM_END ROM_START(szone_l2) ROM_REGION(0x10000, "maincpu", 0) ROM_LOAD("sz_u19r2.732", 0x5000, 0x1000, CRC(c0e4238b) SHA1(eae60ccd5b5001671cd6d2685fd588494d052d1e)) - ROM_RELOAD( 0xd000, 0x1000) ROM_LOAD("sz_u20r2.764", 0x6000, 0x2000, CRC(91c08137) SHA1(86da08f346f85810fceceaa7b9824ab76a68da54)) - ROM_RELOAD( 0xe000, 0x2000) - ROM_REGION(0x10000, "cpu2", 0) + + ROM_REGION(0x10000, "audiocpu", 0) ROM_LOAD("szs_u49.128", 0xc000, 0x4000, CRC(144c3c07) SHA1(57be6f336f200079cd698b13f8fa4755cf694274)) - ROM_RELOAD(0x8000, 0x4000) ROM_END -/*-------------------- +/*------------------------------ / Alley Cats (Shuffle) (#918) -/--------------------*/ +/-------------------------------*/ ROM_START(alcat_l7) ROM_REGION(0x10000, "maincpu", 0) ROM_LOAD("u26_rev7.rom", 0x5000, 0x1000, CRC(4d274dd3) SHA1(80d72bd0f85ce2cac04f6d9f59dc1fcccc86d402)) - ROM_RELOAD( 0xd000, 0x1000) ROM_LOAD("u27_rev7.rom", 0x6000, 0x2000, CRC(9c7faf8a) SHA1(dc1a561948b9a303f7924d7bebcd972db766827b)) - ROM_RELOAD( 0xe000, 0x2000) - ROM_REGION(0x10000, "cpu2", ROMREGION_ERASEFF) - ROM_REGION(0x10000, "sound2", 0) + + ROM_REGION(0x10000, "audiocpu", ROMREGION_ERASEFF) + + ROM_REGION(0x10000, "sound2", 0) // System 11 soundboard ROM_LOAD("acs_u21.bin", 0x0000, 0x8000, CRC(c54cd329) SHA1(4b86b10e60a30c4de5d97129074f5657447be676)) ROM_LOAD("acs_u22.bin", 0x8000, 0x8000, CRC(56c1011a) SHA1(c817a3410c643617f3643897b8f529ae78546b0d)) ROM_END -GAME(1985, comet_l4, comet_l5, williams_s9, williams_s9, williams_s9_state, williams_s9, ROT0, "Williams", "Comet (L-4)", GAME_IS_SKELETON_MECHANICAL) -GAME(1985, comet_l5, 0, williams_s9, williams_s9, williams_s9_state, williams_s9, ROT0, "Williams", "Comet (L-5)", GAME_IS_SKELETON_MECHANICAL) -GAME(1985, sorcr_l1, sorcr_l2, williams_s9, williams_s9, williams_s9_state, williams_s9, ROT0, "Williams", "Sorcerer (L-1)", GAME_IS_SKELETON_MECHANICAL) -GAME(1985, sorcr_l2, 0, williams_s9, williams_s9, williams_s9_state, williams_s9, ROT0, "Williams", "Sorcerer (L-2)", GAME_IS_SKELETON_MECHANICAL) -GAME(1984, sshtl_l7, 0, williams_s9, williams_s9, williams_s9_state, williams_s9, ROT0, "Williams", "Space Shuttle (L-7)", GAME_IS_SKELETON_MECHANICAL) -GAME(1985, alcat_l7, 0, williams_s9, williams_s9, williams_s9_state, williams_s9, ROT0, "Williams", "Alley Cats (Shuffle) (L-7)", GAME_IS_SKELETON_MECHANICAL) -GAME(1984, szone_l5, 0, williams_s9, williams_s9, williams_s9_state, williams_s9, ROT0, "Williams", "Strike Zone (Shuffle) (L-5)", GAME_IS_SKELETON_MECHANICAL) -GAME(1984, szone_l2, szone_l5, williams_s9, williams_s9, williams_s9_state, williams_s9, ROT0, "Williams", "Strike Zone (Shuffle) (L-2)", GAME_IS_SKELETON_MECHANICAL) +GAME( 1985, sorcr_l1, sorcr_l2, s9, s9, driver_device, 0, ROT0, "Williams", "Sorcerer (L-1)", GAME_MECHANICAL | GAME_NOT_WORKING) +GAME( 1985, sorcr_l2, 0, s9, s9, driver_device, 0, ROT0, "Williams", "Sorcerer (L-2)", GAME_MECHANICAL | GAME_NOT_WORKING) +GAME( 1984, sshtl_l7, 0, s9, s9, driver_device, 0, ROT0, "Williams", "Space Shuttle (L-7)", GAME_MECHANICAL | GAME_NOT_WORKING) +GAME( 1985, comet_l4, comet_l5, s9, s9, driver_device, 0, ROT0, "Williams", "Comet (L-4)", GAME_MECHANICAL) +GAME( 1985, comet_l5, 0, s9, s9, driver_device, 0, ROT0, "Williams", "Comet (L-5)", GAME_MECHANICAL) +GAME( 1985, alcat_l7, 0, s9, s9, driver_device, 0, ROT0, "Williams", "Alley Cats (Shuffle) (L-7)", GAME_MECHANICAL | GAME_NOT_WORKING | GAME_NO_SOUND) +GAME( 1984, szone_l5, 0, s9, s9, driver_device, 0, ROT0, "Williams", "Strike Zone (Shuffle) (L-5)", GAME_MECHANICAL | GAME_NOT_WORKING) +GAME( 1984, szone_l2, szone_l5, s9, s9, driver_device, 0, ROT0, "Williams", "Strike Zone (Shuffle) (L-2)", GAME_MECHANICAL | GAME_NOT_WORKING) diff --git a/src/mame/layout/s8.lay b/src/mame/layout/s8.lay index 9c840054240..56ee5892c4d 100644 --- a/src/mame/layout/s8.lay +++ b/src/mame/layout/s8.lay @@ -11,7 +11,7 @@ - + diff --git a/src/mame/layout/s9.lay b/src/mame/layout/s9.lay new file mode 100644 index 00000000000..56ab2cef537 --- /dev/null +++ b/src/mame/layout/s9.lay @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mame/mame.mak b/src/mame/mame.mak index 67eb177e3a0..2b4d495c27d 100644 --- a/src/mame/mame.mak +++ b/src/mame/mame.mak @@ -2234,6 +2234,8 @@ $(DRIVERS)/s6a.o: $(LAYOUT)/s6a.lh $(DRIVERS)/s8.o: $(LAYOUT)/s8.lh +$(DRIVERS)/s9.o: $(LAYOUT)/s9.lh + $(DRIVERS)/sbrkout.o: $(LAYOUT)/sbrkout.lh $(DRIVERS)/sderby.o: $(LAYOUT)/sderby.lh \