summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/s4.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/s4.cpp')
-rw-r--r--src/mame/drivers/s4.cpp304
1 files changed, 160 insertions, 144 deletions
diff --git a/src/mame/drivers/s4.cpp b/src/mame/drivers/s4.cpp
index bad163eaba8..9ce31fb2145 100644
--- a/src/mame/drivers/s4.cpp
+++ b/src/mame/drivers/s4.cpp
@@ -5,7 +5,7 @@
PINBALL
Williams System 4
- Phoenix and Pokerino are listed as System 4 systems, but use System 3 roms.
+ Phoenix and Pokerino are listed as System 4 systems, but use System 3 ROMs.
They have been moved to s3.cpp, and are working there.
The "Shuffle" games consist of a flat board with an air-driven puck and 10
@@ -51,69 +51,95 @@ public:
s4_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_pia22(*this, "pia22")
, m_pia24(*this, "pia24")
, m_pia28(*this, "pia28")
, m_pia30(*this, "pia30")
- , m_pias(*this, "pias")
, m_digits(*this, "digit%u", 0U)
+ , m_leds(*this, "led%u", 0U)
, m_swarray(*this, "SW.%u", 0U)
- { }
+ , m_dips(*this, "DS%u", 1U)
+ {
+ }
void s4(machine_config &config);
- void s4a(machine_config &config);
DECLARE_INPUT_CHANGED_MEMBER(main_nmi);
- DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
protected:
- virtual void machine_start() override { m_digits.resolve(); m_strobe = 0; }
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+
+ required_device<cpu_device> m_maincpu;
+ required_device<pia6821_device> m_pia22;
+ required_device<pia6821_device> m_pia24;
+ required_device<pia6821_device> m_pia28;
+ required_device<pia6821_device> m_pia30;
private:
- uint8_t sound_r();
void dig0_w(uint8_t data);
void dig1_w(uint8_t data);
void lamp0_w(uint8_t data);
void lamp1_w(uint8_t data);
void sol0_w(uint8_t data);
- void sol1_w(uint8_t data);
+ void sol1_chimes_w(uint8_t data);
uint8_t dips_r();
uint8_t switch_r();
void switch_w(uint8_t data);
- DECLARE_READ_LINE_MEMBER(pia28_ca1_r);
- DECLARE_READ_LINE_MEMBER(pia28_cb1_r);
- DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { }; //ST5
- DECLARE_WRITE_LINE_MEMBER(pia22_cb2_w) { }; //ST-solenoids enable
- DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { }; //ST2
- DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { }; //ST1
- DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { }; //diag leds enable
- DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { }; //ST6
- DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { }; //ST4
- DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { }; //ST3
+ DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { } //ST5
+ DECLARE_WRITE_LINE_MEMBER(pia22_cb2_w) { } //ST-solenoids enable
+ DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { } //ST2
+ DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { } //ST1
+ DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { } //diag leds enable
+ DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { } //ST6
+ DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { } //ST4
+ DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { } //ST3
TIMER_DEVICE_CALLBACK_MEMBER(irq);
- DECLARE_MACHINE_RESET(s4);
- DECLARE_MACHINE_RESET(s4a);
- void s4_audio_map(address_map &map);
void s4_main_map(address_map &map);
+ output_finder<32> m_digits;
+ output_finder<2> m_leds;
+ required_ioport_array<8> m_swarray;
+ required_ioport_array<2> m_dips;
+
uint8_t m_t_c;
- uint8_t m_sound_data;
uint8_t m_strobe;
uint8_t m_switch_col;
bool m_data_ok;
- bool m_chimes;
- required_device<cpu_device> m_maincpu;
- optional_device<cpu_device> m_audiocpu;
- required_device<pia6821_device> m_pia22;
- required_device<pia6821_device> m_pia24;
- required_device<pia6821_device> m_pia28;
- required_device<pia6821_device> m_pia30;
- optional_device<pia6821_device> m_pias;
- output_finder<32> m_digits;
- required_ioport_array<8> m_swarray;
};
+
+class s4a_state : public s4_state
+{
+public:
+ s4a_state(const machine_config &mconfig, device_type type, const char *tag)
+ : s4_state(mconfig, type, tag)
+ , m_audiocpu(*this, "audiocpu")
+ , m_pias(*this, "pias")
+ , m_io_snd(*this, "SND")
+ {
+ }
+
+ void s4a(machine_config &config);
+
+ DECLARE_INPUT_CHANGED_MEMBER(audio_nmi);
+
+protected:
+ required_device<cpu_device> m_audiocpu;
+ required_device<pia6821_device> m_pias;
+
+private:
+ uint8_t sound_r();
+ void s4a_sol1_w(uint8_t data);
+
+ void s4_audio_map(address_map &map);
+
+ required_ioport m_io_snd;
+
+ uint8_t m_sound_data;
+};
+
+
void s4_state::s4_main_map(address_map &map)
{
map.global_mask(0x7fff);
@@ -126,7 +152,7 @@ void s4_state::s4_main_map(address_map &map)
map(0x6000, 0x7fff).rom().region("roms", 0);
}
-void s4_state::s4_audio_map(address_map &map)
+void s4a_state::s4_audio_map(address_map &map)
{
map.global_mask(0x0fff);
map(0x0000, 0x00ff).ram();
@@ -134,6 +160,7 @@ void s4_state::s4_audio_map(address_map &map)
map(0x0800, 0x0fff).rom().region("audioroms", 0);
}
+
static INPUT_PORTS_START( s4 )
PORT_START("SW.0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
@@ -201,12 +228,7 @@ static INPUT_PORTS_START( s4 )
PORT_START("SW.7")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_START("SND")
- PORT_BIT( 0xbf, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Music") PORT_CODE(KEYCODE_2_PAD) PORT_TOGGLE
-
PORT_START("DIAGS")
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_1_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, s4_state, audio_nmi, 1)
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Main Diag") PORT_CODE(KEYCODE_4_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, s4_state, main_nmi, 1)
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Advance") PORT_CODE(KEYCODE_5_PAD)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Manual/Auto") PORT_CODE(KEYCODE_6_PAD)
@@ -272,16 +294,29 @@ static INPUT_PORTS_START( s4 )
PORT_DIPSETTING( 0x07, "31" )
INPUT_PORTS_END
-MACHINE_RESET_MEMBER( s4_state, s4 )
+static INPUT_PORTS_START( s4a )
+ PORT_INCLUDE(s4)
+
+ PORT_START("SND")
+ PORT_BIT( 0xbf, IP_ACTIVE_LOW, IPT_UNUSED )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Music") PORT_CODE(KEYCODE_2_PAD) PORT_TOGGLE
+
+ PORT_MODIFY("DIAGS")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_1_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, s4a_state, audio_nmi, 1)
+INPUT_PORTS_END
+
+
+void s4_state::machine_start()
{
- m_t_c = 0;
- m_chimes = 1;
+ m_digits.resolve();
+ m_leds.resolve();
+
+ m_strobe = 0;
}
-MACHINE_RESET_MEMBER( s4_state, s4a )
+void s4_state::machine_reset()
{
m_t_c = 0;
- m_chimes = 0;
}
INPUT_CHANGED_MEMBER( s4_state::main_nmi )
@@ -291,10 +326,10 @@ INPUT_CHANGED_MEMBER( s4_state::main_nmi )
m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
-INPUT_CHANGED_MEMBER( s4_state::audio_nmi )
+INPUT_CHANGED_MEMBER( s4a_state::audio_nmi )
{
// Diagnostic button sends a pulse to NMI pin
- if ((newval==CLEAR_LINE) && !m_chimes)
+ if (newval==CLEAR_LINE)
m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
@@ -304,47 +339,48 @@ void s4_state::sol0_w(uint8_t data)
m_samples->start(2, 5); // outhole
}
-void s4_state::sol1_w(uint8_t data)
+void s4_state::sol1_chimes_w(uint8_t data)
{
- if (m_chimes)
- {
- if (BIT(data, 0))
- m_samples->start(1, 1); // 10 chime
+ if (BIT(data, 0))
+ m_samples->start(1, 1); // 10 chime
- if (BIT(data, 1))
- m_samples->start(2, 2); // 100 chime
+ if (BIT(data, 1))
+ m_samples->start(2, 2); // 100 chime
- if (BIT(data, 2))
- m_samples->start(3, 3); // 1000 chime
+ if (BIT(data, 2))
+ m_samples->start(3, 3); // 1000 chime
- if (BIT(data, 3))
- m_samples->start(1, 4); // 10k chime
- }
- else
- {
- uint8_t sound_data = ioport("SND")->read();
- if (BIT(data, 0))
- sound_data &= 0xfe;
+ if (BIT(data, 3))
+ m_samples->start(1, 4); // 10k chime
- if (BIT(data, 1))
- sound_data &= 0xfd;
+ if (BIT(data, 5))
+ m_samples->start(0, 6); // knocker
+}
- if (BIT(data, 2))
- sound_data &= 0xfb;
+void s4a_state::s4a_sol1_w(uint8_t data)
+{
+ uint8_t sound_data = m_io_snd->read(); // 0xff or 0xbf
+ if (BIT(data, 0))
+ sound_data &= 0xfe;
- if (BIT(data, 3))
- sound_data &= 0xf7;
+ if (BIT(data, 1))
+ sound_data &= 0xfd;
- if (BIT(data, 4))
- sound_data &= 0xef;
+ if (BIT(data, 2))
+ sound_data &= 0xfb;
- bool cb1 = ((sound_data & 0xbf) != 0xbf);
+ if (BIT(data, 3))
+ sound_data &= 0xf7;
- if (cb1)
- m_sound_data = sound_data;
+ if (BIT(data, 4))
+ sound_data &= 0xef;
- m_pias->cb1_w(cb1);
- }
+ bool cb1 = ((sound_data & 0xbf) != 0xbf);
+
+ if (cb1)
+ m_sound_data = sound_data;
+
+ m_pias->cb1_w(cb1);
if (BIT(data, 5))
m_samples->start(0, 6); // knocker
@@ -359,32 +395,11 @@ void s4_state::lamp1_w(uint8_t data)
{
}
-READ_LINE_MEMBER( s4_state::pia28_ca1_r )
-{
- return BIT(ioport("DIAGS")->read(), 2); // advance button
-}
-
-READ_LINE_MEMBER( s4_state::pia28_cb1_r )
-{
- return BIT(ioport("DIAGS")->read(), 3); // auto/manual switch
-}
-
uint8_t s4_state::dips_r()
{
- if (BIT(ioport("DIAGS")->read(), 4) )
- {
- switch (m_strobe)
- {
- case 0:
- return ioport("DS2")->read();
- case 1:
- return ioport("DS2")->read() << 4;
- case 2:
- return ioport("DS1")->read();
- case 3:
- return ioport("DS1")->read() << 4;
- }
- }
+ if (BIT(ioport("DIAGS")->read(), 4))
+ return m_dips[BIT(~m_strobe, 1)]->read() << (BIT(m_strobe, 0) ? 4 : 0);
+
return 0xff;
}
@@ -392,8 +407,8 @@ void s4_state::dig0_w(uint8_t data)
{
m_strobe = data & 15;
m_data_ok = true;
- output().set_value("led0", !BIT(data, 4));
- output().set_value("led1", !BIT(data, 5));
+ m_leds[0] = !BIT(data, 4);
+ m_leds[1] = !BIT(data, 5);
}
void s4_state::dig1_w(uint8_t data)
@@ -426,7 +441,7 @@ void s4_state::switch_w(uint8_t data)
m_switch_col = data;
}
-uint8_t s4_state::sound_r()
+uint8_t s4a_state::sound_r()
{
return m_sound_data;
}
@@ -441,46 +456,45 @@ TIMER_DEVICE_CALLBACK_MEMBER( s4_state::irq )
void s4_state::s4(machine_config &config)
{
- /* basic machine hardware */
+ // basic machine hardware
M6800(config, m_maincpu, 3580000);
m_maincpu->set_addrmap(AS_PROGRAM, &s4_state::s4_main_map);
TIMER(config, "irq").configure_periodic(FUNC(s4_state::irq), attotime::from_hz(250));
- MCFG_MACHINE_RESET_OVERRIDE(s4_state, s4)
- /* Video */
+ // Video
config.set_default_layout(layout_s4);
- /* Sound */
+ // Sound
genpin_audio(config);
- /* Devices */
+ // Devices
PIA6821(config, m_pia22, 0);
m_pia22->writepa_handler().set(FUNC(s4_state::sol0_w));
- m_pia22->writepb_handler().set(FUNC(s4_state::sol1_w));
+ m_pia22->writepb_handler().set(FUNC(s4_state::sol1_chimes_w));
m_pia22->ca2_handler().set(FUNC(s4_state::pia22_ca2_w));
m_pia22->cb2_handler().set(FUNC(s4_state::pia22_cb2_w));
- m_pia22->irqa_handler().set_inputline("maincpu", M6800_IRQ_LINE);
- m_pia22->irqb_handler().set_inputline("maincpu", M6800_IRQ_LINE);
+ m_pia22->irqa_handler().set_inputline(m_maincpu, M6800_IRQ_LINE);
+ m_pia22->irqb_handler().set_inputline(m_maincpu, M6800_IRQ_LINE);
PIA6821(config, m_pia24, 0);
m_pia24->writepa_handler().set(FUNC(s4_state::lamp0_w));
m_pia24->writepb_handler().set(FUNC(s4_state::lamp1_w));
m_pia24->ca2_handler().set(FUNC(s4_state::pia24_ca2_w));
m_pia24->cb2_handler().set(FUNC(s4_state::pia24_cb2_w));
- m_pia24->irqa_handler().set_inputline("maincpu", M6800_IRQ_LINE);
- m_pia24->irqb_handler().set_inputline("maincpu", M6800_IRQ_LINE);
+ m_pia24->irqa_handler().set_inputline(m_maincpu, M6800_IRQ_LINE);
+ m_pia24->irqb_handler().set_inputline(m_maincpu, M6800_IRQ_LINE);
PIA6821(config, m_pia28, 0);
m_pia28->readpa_handler().set(FUNC(s4_state::dips_r));
m_pia28->set_port_a_input_overrides_output_mask(0xff);
- m_pia28->readca1_handler().set(FUNC(s4_state::pia28_ca1_r));
- m_pia28->readcb1_handler().set(FUNC(s4_state::pia28_cb1_r));
+ m_pia28->readca1_handler().set_ioport("DIAGS").bit(2); // advance button
+ m_pia28->readcb1_handler().set_ioport("DIAGS").bit(3); // auto/manual switch
m_pia28->writepa_handler().set(FUNC(s4_state::dig0_w));
m_pia28->writepb_handler().set(FUNC(s4_state::dig1_w));
m_pia28->ca2_handler().set(FUNC(s4_state::pia28_ca2_w));
m_pia28->cb2_handler().set(FUNC(s4_state::pia28_cb2_w));
- m_pia28->irqa_handler().set_inputline("maincpu", M6800_IRQ_LINE);
- m_pia28->irqb_handler().set_inputline("maincpu", M6800_IRQ_LINE);
+ m_pia28->irqa_handler().set_inputline(m_maincpu, M6800_IRQ_LINE);
+ m_pia28->irqb_handler().set_inputline(m_maincpu, M6800_IRQ_LINE);
PIA6821(config, m_pia30, 0);
m_pia30->readpa_handler().set(FUNC(s4_state::switch_r));
@@ -488,28 +502,30 @@ void s4_state::s4(machine_config &config)
m_pia30->writepb_handler().set(FUNC(s4_state::switch_w));
m_pia30->ca2_handler().set(FUNC(s4_state::pia30_ca2_w));
m_pia30->cb2_handler().set(FUNC(s4_state::pia30_cb2_w));
- m_pia30->irqa_handler().set_inputline("maincpu", M6800_IRQ_LINE);
- m_pia30->irqb_handler().set_inputline("maincpu", M6800_IRQ_LINE);
+ m_pia30->irqa_handler().set_inputline(m_maincpu, M6800_IRQ_LINE);
+ m_pia30->irqb_handler().set_inputline(m_maincpu, M6800_IRQ_LINE);
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
}
-void s4_state::s4a(machine_config &config)
+void s4a_state::s4a(machine_config &config)
{
s4(config);
- /* Add the soundcard */
+
+ m_pia22->writepb_handler().set(FUNC(s4a_state::s4a_sol1_w));
+
+ // Add the soundcard
M6808(config, m_audiocpu, 3580000);
- m_audiocpu->set_addrmap(AS_PROGRAM, &s4_state::s4_audio_map);
- MCFG_MACHINE_RESET_OVERRIDE(s4_state, s4a)
+ m_audiocpu->set_addrmap(AS_PROGRAM, &s4a_state::s4_audio_map);
SPEAKER(config, "speaker").front_center();
MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.5);
PIA6821(config, m_pias, 0);
- m_pias->readpb_handler().set(FUNC(s4_state::sound_r));
+ m_pias->readpb_handler().set(FUNC(s4a_state::sound_r));
m_pias->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w));
- m_pias->irqa_handler().set_inputline("audiocpu", M6808_IRQ_LINE);
- m_pias->irqb_handler().set_inputline("audiocpu", M6808_IRQ_LINE);
+ m_pias->irqa_handler().set_inputline(m_audiocpu, M6808_IRQ_LINE);
+ m_pias->irqb_handler().set_inputline(m_audiocpu, M6808_IRQ_LINE);
}
@@ -720,21 +736,21 @@ ROM_END
} // Anonymous namespace
-GAME( 1979, flash_l2, 0, s4a, s4, s4_state, empty_init, ROT0, "Williams", "Flash (Williams, L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, flash_l1, flash_l2, s4a, s4, s4_state, empty_init, ROT0, "Williams", "Flash (Williams, L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, flash_t1, flash_l2, s4a, s4, s4_state, empty_init, ROT0, "Williams", "Flash (Williams, T-1) Ted Estes", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1978, trizn_l1, 0, s4a, s4, s4_state, empty_init, ROT0, "Williams", "Tri Zone (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1978, trizn_t1, trizn_l1, s4a, s4, s4_state, empty_init, ROT0, "Williams", "Tri Zone (T-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, tmwrp_l3, 0, s4a, s4, s4_state, empty_init, ROT0, "Williams", "Time Warp (Williams, L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, tmwrp_l2, tmwrp_l3, s4a, s4, s4_state, empty_init, ROT0, "Williams", "Time Warp (Williams, L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, tmwrp_t2, tmwrp_l3, s4a, s4, s4_state, empty_init, ROT0, "Williams", "Time Warp (Williams, T-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, stlwr_l2, 0, s4a, s4, s4_state, empty_init, ROT0, "Williams", "Stellar Wars (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-
-GAME( 1978, pomp_l1, 0, s4a, s4, s4_state, empty_init, ROT0, "Williams", "Pompeii (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1978, arist_l1, 0, s4a, s4, s4_state, empty_init, ROT0, "Williams", "Aristocrat (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1978, topaz_l1, 0, s4a, s4, s4_state, empty_init, ROT0, "Williams", "Topaz (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1979, taurs_l1, 0, s4a, s4, s4_state, empty_init, ROT0, "Williams", "Taurus (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1979, kingt_l1, 0, s4a, s4, s4_state, empty_init, ROT0, "Williams", "King Tut (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1980, omni_l1, 0, s4a, s4, s4_state, empty_init, ROT0, "Williams", "Omni (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME( 1983, bstrk_l1, 0, s4, s4, s4_state, empty_init, ROT0, "Williams", "Big Strike (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME( 1983, tstrk_l1, 0, s4, s4, s4_state, empty_init, ROT0, "Williams", "Triple Strike (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 1979, flash_l2, 0, s4a, s4a, s4a_state, empty_init, ROT0, "Williams", "Flash (Williams, L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, flash_l1, flash_l2, s4a, s4a, s4a_state, empty_init, ROT0, "Williams", "Flash (Williams, L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, flash_t1, flash_l2, s4a, s4a, s4a_state, empty_init, ROT0, "Williams", "Flash (Williams, T-1) Ted Estes", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1978, trizn_l1, 0, s4a, s4a, s4a_state, empty_init, ROT0, "Williams", "Tri Zone (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1978, trizn_t1, trizn_l1, s4a, s4a, s4a_state, empty_init, ROT0, "Williams", "Tri Zone (T-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, tmwrp_l3, 0, s4a, s4a, s4a_state, empty_init, ROT0, "Williams", "Time Warp (Williams, L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, tmwrp_l2, tmwrp_l3, s4a, s4a, s4a_state, empty_init, ROT0, "Williams", "Time Warp (Williams, L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, tmwrp_t2, tmwrp_l3, s4a, s4a, s4a_state, empty_init, ROT0, "Williams", "Time Warp (Williams, T-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, stlwr_l2, 0, s4a, s4a, s4a_state, empty_init, ROT0, "Williams", "Stellar Wars (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+
+GAME( 1978, pomp_l1, 0, s4a, s4a, s4a_state, empty_init, ROT0, "Williams", "Pompeii (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1978, arist_l1, 0, s4a, s4a, s4a_state, empty_init, ROT0, "Williams", "Aristocrat (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1978, topaz_l1, 0, s4a, s4a, s4a_state, empty_init, ROT0, "Williams", "Topaz (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1979, taurs_l1, 0, s4a, s4a, s4a_state, empty_init, ROT0, "Williams", "Taurus (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1979, kingt_l1, 0, s4a, s4a, s4a_state, empty_init, ROT0, "Williams", "King Tut (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1980, omni_l1, 0, s4a, s4a, s4a_state, empty_init, ROT0, "Williams", "Omni (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 1983, bstrk_l1, 0, s4, s4, s4_state, empty_init, ROT0, "Williams", "Big Strike (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 1983, tstrk_l1, 0, s4, s4, s4_state, empty_init, ROT0, "Williams", "Triple Strike (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)