From e9a12d091563b77ab2209f0b5d659f73ad1880da Mon Sep 17 00:00:00 2001 From: Robbbert Date: Fri, 18 Feb 2022 15:45:19 +1100 Subject: [PATCH] Merged s6a.cpp into s6.cpp --- scripts/target/mame/arcade.lua | 1 - src/mame/arcade.flt | 1 - src/mame/drivers/de_2.cpp | 2 +- src/mame/drivers/s6.cpp | 125 ++++++-- src/mame/drivers/s6a.cpp | 501 --------------------------------- src/mame/drivers/s7.cpp | 11 +- src/mame/layout/s6a.lay | 8 +- src/mame/mame.lst | 10 +- 8 files changed, 122 insertions(+), 537 deletions(-) delete mode 100644 src/mame/drivers/s6a.cpp diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index ae8a1d4218d..47158d65717 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -4711,7 +4711,6 @@ files { MAME_DIR .. "src/mame/drivers/s3.cpp", MAME_DIR .. "src/mame/drivers/s4.cpp", MAME_DIR .. "src/mame/drivers/s6.cpp", - MAME_DIR .. "src/mame/drivers/s6a.cpp", MAME_DIR .. "src/mame/drivers/s7.cpp", MAME_DIR .. "src/mame/drivers/s8.cpp", MAME_DIR .. "src/mame/drivers/s8a.cpp", diff --git a/src/mame/arcade.flt b/src/mame/arcade.flt index 772d70cb807..0fcc26e5eda 100644 --- a/src/mame/arcade.flt +++ b/src/mame/arcade.flt @@ -1098,7 +1098,6 @@ s11c.cpp s3.cpp s4.cpp s6.cpp -s6a.cpp s7.cpp s8.cpp s8a.cpp diff --git a/src/mame/drivers/de_2.cpp b/src/mame/drivers/de_2.cpp index 2bc5dcbc230..7494756e0d8 100644 --- a/src/mame/drivers/de_2.cpp +++ b/src/mame/drivers/de_2.cpp @@ -31,7 +31,7 @@ King Kong -- Hold CDE, hit 1 CDE **** not emulated (various systems) **** Arnon Milchan Flip Out! 1991 -Joel Silver, the pinball +Joel Silver, the pinball (1991) Kabuki Richie Rich Slap Shot Hockey 0138 diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp index 57fc9b557f9..be361b41eeb 100644 --- a/src/mame/drivers/s6.cpp +++ b/src/mame/drivers/s6.cpp @@ -9,6 +9,7 @@ Differences to system 4: - Some machines have speech (blkou, grgar, frpwr). - Some machines have multiball (scrpn, frpwr). - New soundcard. +- Algar, Alien Poker have 7-digit displays Games: - Laserball (#493) @@ -16,6 +17,8 @@ Games: - Blackout (#495) - Gorgar (#496) - Firepower (#497) +- Algar (#499) +- Alien Poker (#501) The first time run, the display will show the model number. Press F3 to clear this. @@ -23,11 +26,11 @@ Diagnostic actions: - You must be in game over mode. All buttons are in the number-pad. When you are finished, you must reboot. -- Setup: NUM-6 must be in auto/up position. Press NUM-1 to enter setup mode, press - NUM-6 to change direction. +- Setup: NUM-2 must be in auto/up position. Press NUM-1 to enter setup mode, press + NUM-2 to change direction. -- Tests: NUM-6 must be in manual/down position. Press NUM-1 twice and tests will - begin. Press NUM-1 and NUM-6 together to get from test 1 to test 2. Press NUM-6 +- Tests: NUM-2 must be in manual/down position. Press NUM-1 twice and tests will + begin. Press NUM-1 and NUM-2 together to get from test 1 to test 2. Press NUM-2 to switch between auto/manual stepping. - Auto Diag Test: Set Dips to SW6. Press NUM-0. Press NUM-ENTER. Press NUM-1. Tests @@ -62,7 +65,7 @@ ToDo: #include "speaker.h" #include "s6.lh" - +#include "s6a.lh" namespace { @@ -85,6 +88,7 @@ public: { } void s6(machine_config &config); + void s6a(machine_config &config); DECLARE_INPUT_CHANGED_MEMBER(main_nmi); @@ -304,6 +308,26 @@ static INPUT_PORTS_START( frpwr ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) INPUT_PORTS_END +static INPUT_PORTS_START( alpok ) + PORT_INCLUDE(s6) + PORT_MODIFY("X3") + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) // Playfield tilt + PORT_MODIFY("X5") + PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_MODIFY("X6") + PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_MODIFY("X7") + PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) +INPUT_PORTS_END + +static INPUT_PORTS_START( algar ) + PORT_INCLUDE(s6) + PORT_MODIFY("X6") + PORT_BIT( 0xe4, IP_ACTIVE_HIGH, IPT_UNUSED ) + PORT_MODIFY("X7") + PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) +INPUT_PORTS_END + INPUT_CHANGED_MEMBER( s6_state::main_nmi ) { // Diagnostic button sends a pulse to NMI pin @@ -505,6 +529,11 @@ void s6_state::s6(machine_config &config) WILLIAMS_S6_SOUND(config, m_s6sound, 0).add_route(ALL_OUTPUTS, "mono", 1.0); } +void s6_state::s6a(machine_config &config) +{ + s6(config); + config.set_default_layout(layout_s6a); +} /*-------------------------------- / Laser Ball - Sys.6 (Game #493) @@ -687,19 +716,79 @@ ROM_START(frpwr_l2) ROM_LOAD("sound3.716", 0x4800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4)) ROM_END +/*-------------------------- +/ Algar - Sys.6a (Game #499) +/-------------------------*/ +ROM_START(algar_l1) + ROM_REGION(0x2000, "maincpu", ROMREGION_ERASEFF) + ROM_LOAD("gamerom.716", 0x0000, 0x0800, CRC(6711da23) SHA1(80a46f5a2630977bc1c6e17466e8865083eb9a18)) + ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654)) + ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2)) + + ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF) + ROM_LOAD("sound4.716", 0x4800, 0x0800, CRC(67ea12e7) SHA1(f81e97183442736d5766a7e5e074bc6539e8ced0)) +ROM_END + +/*------------------------------- +/ Alien Poker - Sys.6a (Game #501) +/-------------------------------*/ +ROM_START(alpok_l6) + ROM_REGION(0x2000, "maincpu", ROMREGION_ERASEFF) + ROM_LOAD("gamerom6.716", 0x0000, 0x0800, CRC(20538a4a) SHA1(6cdd6b7ded76b3cbd954d371e126e1bbd95a6219)) + ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654)) + ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2)) + + 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)) + ROM_LOAD("sound3.716", 0x4800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4)) +ROM_END + +ROM_START(alpok_l2) + ROM_REGION(0x2000, "maincpu", ROMREGION_ERASEFF) + ROM_LOAD("gamerom.716", 0x0000, 0x0800, CRC(79c07603) SHA1(526a45b139394e475fc052636e98d880a8908168)) + ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654)) + ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2)) + + 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)) + ROM_LOAD("sound3.716", 0x4800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4)) +ROM_END + +ROM_START(alpok_f6) + ROM_REGION(0x2000, "maincpu", ROMREGION_ERASEFF) + ROM_LOAD("gamerom6.716", 0x0000, 0x0800, CRC(20538a4a) SHA1(6cdd6b7ded76b3cbd954d371e126e1bbd95a6219)) + ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654)) + ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2)) + + 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)) + ROM_LOAD("5t5017fr.dat", 0x3000, 0x1000, CRC(7e546dc1) SHA1(58f8286403978b0d929987189089881d754a9a83)) + ROM_LOAD("sound3.716", 0x4800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4)) +ROM_END + } // anonymous namespace -GAME( 1979, lzbal_l2, 0, s6, lzbal, s6_state, empty_init, ROT0, "Williams", "Laser Ball (L-2)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1979, lzbal_l2sp, lzbal_l2, s6, lzbal, s6_state, empty_init, ROT0, "Williams", "Laser Ball (L-2, PROM sound)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1980, lzbal_t2, lzbal_l2, s6, lzbal, s6_state, empty_init, ROT0, "Williams", "Laser Ball (T-2)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1980, scrpn_l1, 0, s6, scrpn, s6_state, empty_init, ROT0, "Williams", "Scorpion (L-1)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1980, scrpn_t1, scrpn_l1, s6, scrpn, s6_state, empty_init, ROT0, "Williams", "Scorpion (T-1)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1979, blkou_l1, 0, s6, blkou, s6_state, empty_init, ROT0, "Williams", "Blackout (L-1)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1979, blkou_t1, blkou_l1, s6, blkou, s6_state, empty_init, ROT0, "Williams", "Blackout (T-1)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1979, blkou_f1, blkou_l1, s6, blkou, s6_state, empty_init, ROT0, "Williams", "Blackout (L-1, French Speech)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1979, grgar_l1, 0, s6, grgar, s6_state, empty_init, ROT0, "Williams", "Gorgar (L-1)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1979, grgar_t1, grgar_l1, s6, grgar, s6_state, empty_init, ROT0, "Williams", "Gorgar (T-1)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1980, frpwr_l6, 0, s6, frpwr, s6_state, empty_init, ROT0, "Williams", "Firepower (L-6)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1980, frpwr_t6, frpwr_l6, s6, frpwr, s6_state, empty_init, ROT0, "Williams", "Firepower (T-6)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1980, frpwr_l2, frpwr_l6, s6, frpwr, s6_state, empty_init, ROT0, "Williams", "Firepower (L-2)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1979, lzbal_l2, 0, s6, lzbal, s6_state, empty_init, ROT0, "Williams", "Laser Ball (L-2)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1979, lzbal_l2sp, lzbal_l2, s6, lzbal, s6_state, empty_init, ROT0, "Williams", "Laser Ball (L-2, PROM sound)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1980, lzbal_t2, lzbal_l2, s6, lzbal, s6_state, empty_init, ROT0, "Williams", "Laser Ball (T-2)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1980, scrpn_l1, 0, s6, scrpn, s6_state, empty_init, ROT0, "Williams", "Scorpion (L-1)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1980, scrpn_t1, scrpn_l1, s6, scrpn, s6_state, empty_init, ROT0, "Williams", "Scorpion (T-1)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1979, blkou_l1, 0, s6, blkou, s6_state, empty_init, ROT0, "Williams", "Blackout (L-1)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1979, blkou_t1, blkou_l1, s6, blkou, s6_state, empty_init, ROT0, "Williams", "Blackout (T-1)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1979, blkou_f1, blkou_l1, s6, blkou, s6_state, empty_init, ROT0, "Williams", "Blackout (L-1, French Speech)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1979, grgar_l1, 0, s6, grgar, s6_state, empty_init, ROT0, "Williams", "Gorgar (L-1)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1979, grgar_t1, grgar_l1, s6, grgar, s6_state, empty_init, ROT0, "Williams", "Gorgar (T-1)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1980, frpwr_l6, 0, s6, frpwr, s6_state, empty_init, ROT0, "Williams", "Firepower (L-6)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1980, frpwr_t6, frpwr_l6, s6, frpwr, s6_state, empty_init, ROT0, "Williams", "Firepower (T-6)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1980, frpwr_l2, frpwr_l6, s6, frpwr, s6_state, empty_init, ROT0, "Williams", "Firepower (L-2)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1980, algar_l1, 0, s6a, algar, s6_state, empty_init, ROT0, "Williams", "Algar (L-1)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1980, alpok_l6, 0, s6a, alpok, s6_state, empty_init, ROT0, "Williams", "Alien Poker (L-6)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1980, alpok_l2, alpok_l6, s6a, alpok, s6_state, empty_init, ROT0, "Williams", "Alien Poker (L-2)", MACHINE_IS_SKELETON_MECHANICAL ) +GAME( 1980, alpok_f6, alpok_l6, s6a, alpok, s6_state, empty_init, ROT0, "Williams", "Alien Poker (L-6 French speech)", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/drivers/s6a.cpp b/src/mame/drivers/s6a.cpp deleted file mode 100644 index fde91c2405c..00000000000 --- a/src/mame/drivers/s6a.cpp +++ /dev/null @@ -1,501 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:Robbbert -/*********************************************************************************** - -PINBALL -Williams System 6a - -Differences to system 6: -- Player score is 7 digits instead of 6. - -Games: -- Algar (#499) -- Alien Poker (#501) - -The first time run, the display will show the model number. Press F3 to clear this. - -Diagnostic actions: -- You must be in game over mode. All buttons are in the number-pad. When you are - finished, you must reboot. - -- Setup: NUM-6 must be in auto/up position. Press NUM-1 to enter setup mode, press - NUM-6 to change direction. - -- Tests: NUM-6 must be in manual/down position. Press NUM-1 twice and tests will - begin. Press NUM-1 and NUM-6 together to get from test 1 to test 2. Press NUM-6 - to switch between auto/manual stepping. - -- Auto Diag Test: Set Dips to SW6. Press NUM-0. Press NUM-ENTER. Press NUM-1. Tests - will begin. - -- Other: Set Dips to SW7 or SW8. Press NUM-0. Press NUM-ENTER. - - -Status: -- All games are playable. - -ToDo: -- Nothing - - -************************************************************************************/ - -#include "emu.h" -#include "machine/genpin.h" - -#include "cpu/m6800/m6800.h" -#include "audio/williams.h" -#include "machine/6821pia.h" -#include "machine/input_merger.h" -#include "speaker.h" - -#include "s6a.lh" - - -namespace { - -class s6a_state : public genpin_class -{ -public: - s6a_state(const machine_config &mconfig, device_type type, const char *tag) - : genpin_class(mconfig, type, tag) - , m_maincpu(*this, "maincpu") - , 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_digits(*this, "digit%d", 0U) - , m_leds(*this, "led%d", 0U) - , m_io_outputs(*this, "out%d", 0U) - { } - - void s6a(machine_config &config); - - DECLARE_INPUT_CHANGED_MEMBER(main_nmi); - -protected: - virtual void machine_start() override; - virtual void machine_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param) override; - -private: - u8 sound_r(); - void dig0_w(u8 data); - void dig1_w(u8 data); - void lamp0_w(u8 data); - void lamp1_w(u8 data); - void sol0_w(u8 data); - void sol1_w(u8 data); - u8 dips_r(); - u8 switch_r(); - void switch_w(u8 data); - DECLARE_WRITE_LINE_MEMBER(pia22_ca2_w) { m_io_outputs[20] = state; } //ST5 - DECLARE_WRITE_LINE_MEMBER(pia22_cb2_w) { } //ST-solenoids enable - DECLARE_WRITE_LINE_MEMBER(pia24_ca2_w) { m_io_outputs[17] = state; } //ST2 - DECLARE_WRITE_LINE_MEMBER(pia24_cb2_w) { m_io_outputs[16] = state; } //ST1 - DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { } //diag leds enable - DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { m_io_outputs[21] = state; } //ST6 - DECLARE_WRITE_LINE_MEMBER(pia30_ca2_w) { m_io_outputs[19] = state; } //ST4 - DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { m_io_outputs[18] = state; } //ST3 - DECLARE_WRITE_LINE_MEMBER(pia_irq); - - void main_map(address_map &map); - - u8 m_strobe = 0; - u8 m_row = 0; - bool m_data_ok = 0; - u8 m_lamp_data = 0; - emu_timer* m_irq_timer; - static const device_timer_id TIMER_IRQ = 0; - required_device m_maincpu; - required_device m_s6sound; - required_device m_pia22; - required_device m_pia24; - required_device m_pia28; - required_device m_pia30; - required_ioport_array<8> m_io_keyboard; - required_ioport_array<2> m_dips; - output_finder<61> m_digits; - output_finder<2> m_leds; - output_finder<86> m_io_outputs; // 22 solenoids + 64 lamps -}; - -void s6a_state::main_map(address_map &map) -{ - map.global_mask(0x7fff); - map(0x0000, 0x00ff).ram(); - map(0x0100, 0x01ff).ram().share("nvram"); - map(0x2200, 0x2203).rw(m_pia22, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // solenoids - map(0x2400, 0x2403).rw(m_pia24, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // lamps - map(0x2800, 0x2803).rw(m_pia28, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // display - map(0x3000, 0x3003).rw(m_pia30, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // inputs - map(0x6000, 0x7fff).rom().region("maincpu", 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 - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_9) PORT_NAME("Tilt") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN3 ) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_COIN2 ) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_COIN1 ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_0) PORT_NAME("Slam Tilt") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_4_PAD) PORT_NAME("High Score Reset") - - PORT_START("X1") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_X) PORT_NAME("Outhole") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_A) PORT_NAME("INP10") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_B) PORT_NAME("INP11") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_C) PORT_NAME("INP12") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_D) PORT_NAME("INP13") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_E) PORT_NAME("INP14") - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_F) PORT_NAME("INP15") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_G) PORT_NAME("INP16") - - PORT_START("X2") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_H) PORT_NAME("INP17") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_I) PORT_NAME("INP18") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_J) PORT_NAME("INP19") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_K) PORT_NAME("INP20") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_L) PORT_NAME("INP21") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_M) PORT_NAME("INP22") - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_N) PORT_NAME("INP23") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_O) PORT_NAME("INP24") - - PORT_START("X3") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_P) PORT_NAME("INP25") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_Q) PORT_NAME("INP26") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_R) PORT_NAME("INP27") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_S) PORT_NAME("INP28") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_T) PORT_NAME("INP29") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_U) PORT_NAME("INP30") - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_V) PORT_NAME("INP31") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_W) PORT_NAME("INP32") - - PORT_START("X4") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_Y) PORT_NAME("INP33") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_Z) PORT_NAME("INP34") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_COMMA) PORT_NAME("INP35") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_STOP) PORT_NAME("INP36") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_SLASH) PORT_NAME("INP37") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_COLON) PORT_NAME("INP38") - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_QUOTE) PORT_NAME("INP39") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_ENTER) PORT_NAME("INP40") - - PORT_START("X5") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_NAME("INP41") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_NAME("INP42") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_NAME("INP43") - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_MINUS) PORT_NAME("INP44") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_EQUALS) PORT_NAME("INP45") - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_BACKSPACE) PORT_NAME("INP46") - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_UP) PORT_NAME("INP47") - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_LEFT) PORT_NAME("INP48") - - PORT_START("X6") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_RIGHT) PORT_NAME("INP49") - PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_DOWN) PORT_NAME("INP50") - PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_PGDN) PORT_NAME("INP52") - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_DEL) PORT_NAME("INP53") - - PORT_START("X7") // unused - - PORT_START("DIAGS") - 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_2_PAD) PORT_TOGGLE - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Enter") PORT_CODE(KEYCODE_ENTER_PAD) - - PORT_START("DS1") // DS1 only 3 switches do anything - PORT_DIPNAME( 0x70, 0x70, "Diagnostic" ) - PORT_DIPSETTING( 0x70, "Off" ) - PORT_DIPSETTING( 0x60, "SW8 - Zero Audit Tables" ) - PORT_DIPSETTING( 0x50, "SW7 - Reset to Defaults" ) - PORT_DIPSETTING( 0x30, "SW6 - Auto Diagnostic Test" ) - PORT_BIT( 0x8f, IP_ACTIVE_LOW, IPT_UNUSED ) - - PORT_START("DS2") // DS2 switches exist but do nothing - PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED ) -INPUT_PORTS_END - -static INPUT_PORTS_START( alpok ) - PORT_INCLUDE(s6a) - PORT_MODIFY("X3") - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) // Playfield tilt - PORT_MODIFY("X5") - PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_MODIFY("X6") - PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED ) -INPUT_PORTS_END - -INPUT_CHANGED_MEMBER( s6a_state::main_nmi ) -{ - // Diagnostic button sends a pulse to NMI pin - if (newval==CLEAR_LINE) - m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero); -} - -void s6a_state::sol0_w(u8 data) -{ - if (BIT(data, 0)) - m_samples->start(5, 5); // outhole - - for (u8 i = 0; i < 8; i++) - m_io_outputs[i] = BIT(data, i); -} - -void s6a_state::sol1_w(u8 data) -{ - u8 sound_data = data & 0x7f; - - m_s6sound->write(~sound_data); - - if (BIT(data, 5)) - m_samples->start(0, 6); // knocker - - for (u8 i = 0; i < 8; i++) - m_io_outputs[8U+i] = BIT(data, i); -} - -void s6a_state::lamp0_w(u8 data) -{ - m_lamp_data = data ^ 0xff; -} - -void s6a_state::lamp1_w(u8 data) -{ - // find out which row is active - for (u8 i = 0; i < 8; i++) - if (BIT(data, i)) - for (u8 j = 0; j < 8; j++) - m_io_outputs[22U+i*8U+j] = BIT(m_lamp_data, j); -} - -u8 s6a_state::dips_r() -{ - if (BIT(ioport("DIAGS")->read(), 4)) - return m_dips[BIT(~m_strobe, 1)]->read() << (BIT(m_strobe, 0) ? 4 : 0); - - return 0xff; -} - -void s6a_state::dig0_w(u8 data) -{ - m_strobe = data & 15; - m_data_ok = true; - m_leds[0] = !BIT(data, 4); - m_leds[1] = !BIT(data, 5); -} - -void s6a_state::dig1_w(u8 data) -{ - static const u8 patterns[16] = { 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7d,0x07,0x7f,0x6f,0,0,0,0,0,0 }; // MC14543 - if (m_data_ok) - { - m_digits[m_strobe+16] = patterns[data&15]; - m_digits[m_strobe] = patterns[data>>4]; - } - m_data_ok = false; -} - -u8 s6a_state::switch_r() -{ - u8 data = 0; - // there's hardware for 8 rows, but machines use 7 max - for (u8 i = 0; i < 7; i++) - if (BIT(m_row, i)) - data |= m_io_keyboard[i]->read(); - - return data; -} - -void s6a_state::switch_w(u8 data) -{ - m_row = data; -} - -WRITE_LINE_MEMBER( s6a_state::pia_irq ) -{ - if(state == CLEAR_LINE) - { - // restart IRQ timer - m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1); - } - else - { - // disable IRQ timer while other IRQs are being handled - // (counter is reset every 32 cycles while a PIA IRQ is handled) - m_irq_timer->adjust(attotime::zero); - } -} - -void s6a_state::machine_start() -{ - genpin_class::machine_start(); - m_io_outputs.resolve(); - m_digits.resolve(); - m_leds.resolve(); - - save_item(NAME(m_strobe)); - save_item(NAME(m_row)); - save_item(NAME(m_data_ok)); - save_item(NAME(m_lamp_data)); - - m_irq_timer = timer_alloc(TIMER_IRQ); - m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1); -} - -void s6a_state::machine_reset() -{ - genpin_class::machine_reset(); - for (u8 i = 0; i < m_io_outputs.size(); i++) - m_io_outputs[i] = 0; -} - -void s6a_state::device_timer(emu_timer &timer, device_timer_id id, int param) -{ - switch(id) - { - case TIMER_IRQ: - if(param == 1) - { - m_maincpu->set_input_line(M6808_IRQ_LINE, ASSERT_LINE); - m_irq_timer->adjust(attotime::from_ticks(32,3580000/4),0); - m_pia28->ca1_w(BIT(ioport("DIAGS")->read(), 2)); // Advance - m_pia28->cb1_w(BIT(ioport("DIAGS")->read(), 3)); // Up/Down - } - else - { - m_maincpu->set_input_line(M6808_IRQ_LINE, CLEAR_LINE); - m_irq_timer->adjust(attotime::from_ticks(980,3580000/4),1); - m_pia28->ca1_w(1); - m_pia28->cb1_w(1); - } - break; - } -} - -void s6a_state::s6a(machine_config &config) -{ - /* basic machine hardware */ - M6808(config, m_maincpu, 3580000); - m_maincpu->set_addrmap(AS_PROGRAM, &s6a_state::main_map); - - /* Video */ - config.set_default_layout(layout_s6a); - - /* Sound */ - genpin_audio(config); - - /* Devices */ - PIA6821(config, m_pia22, 0); - m_pia22->writepa_handler().set(FUNC(s6a_state::sol0_w)); - m_pia22->writepb_handler().set(FUNC(s6a_state::sol1_w)); - m_pia22->ca2_handler().set(FUNC(s6a_state::pia22_ca2_w)); - m_pia22->cb2_handler().set(FUNC(s6a_state::pia22_cb2_w)); - m_pia22->irqa_handler().set(FUNC(s6a_state::pia_irq)); - m_pia22->irqb_handler().set(FUNC(s6a_state::pia_irq)); - - PIA6821(config, m_pia24, 0); - m_pia24->writepa_handler().set(FUNC(s6a_state::lamp0_w)); - m_pia24->writepb_handler().set(FUNC(s6a_state::lamp1_w)); - m_pia24->ca2_handler().set(FUNC(s6a_state::pia24_ca2_w)); - m_pia24->cb2_handler().set(FUNC(s6a_state::pia24_cb2_w)); - m_pia24->irqa_handler().set(FUNC(s6a_state::pia_irq)); - m_pia24->irqb_handler().set(FUNC(s6a_state::pia_irq)); - - PIA6821(config, m_pia28, 0); - m_pia28->readpa_handler().set(FUNC(s6a_state::dips_r)); - m_pia28->set_port_a_input_overrides_output_mask(0xff); - m_pia28->writepa_handler().set(FUNC(s6a_state::dig0_w)); - m_pia28->writepb_handler().set(FUNC(s6a_state::dig1_w)); - m_pia28->ca2_handler().set(FUNC(s6a_state::pia28_ca2_w)); - m_pia28->cb2_handler().set(FUNC(s6a_state::pia28_cb2_w)); - m_pia28->irqa_handler().set(FUNC(s6a_state::pia_irq)); - m_pia28->irqb_handler().set(FUNC(s6a_state::pia_irq)); - - PIA6821(config, m_pia30, 0); - m_pia30->readpa_handler().set(FUNC(s6a_state::switch_r)); - m_pia30->set_port_a_input_overrides_output_mask(0xff); - m_pia30->writepb_handler().set(FUNC(s6a_state::switch_w)); - m_pia30->ca2_handler().set(FUNC(s6a_state::pia30_ca2_w)); - m_pia30->cb2_handler().set(FUNC(s6a_state::pia30_cb2_w)); - m_pia30->irqa_handler().set(FUNC(s6a_state::pia_irq)); - m_pia30->irqb_handler().set(FUNC(s6a_state::pia_irq)); - - NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); - - /* Add the soundcard */ - SPEAKER(config, "mono").front_center(); - WILLIAMS_S6_SOUND(config, m_s6sound, 0).add_route(ALL_OUTPUTS, "mono", 1.0); -} - - -/*-------------------------- -/ Algar - Sys.6a (Game #499) -/-------------------------*/ -ROM_START(algar_l1) - ROM_REGION(0x2000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD("gamerom.716", 0x0000, 0x0800, CRC(6711da23) SHA1(80a46f5a2630977bc1c6e17466e8865083eb9a18)) - ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654)) - ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2)) - - ROM_REGION(0x5000, "s6sound:audiocpu", ROMREGION_ERASEFF) - ROM_LOAD("sound4.716", 0x4800, 0x0800, CRC(67ea12e7) SHA1(f81e97183442736d5766a7e5e074bc6539e8ced0)) -ROM_END - -/*------------------------------- -/ Alien Poker - Sys.6a (Game #501) -/-------------------------------*/ -ROM_START(alpok_l6) - ROM_REGION(0x2000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD("gamerom6.716", 0x0000, 0x0800, CRC(20538a4a) SHA1(6cdd6b7ded76b3cbd954d371e126e1bbd95a6219)) - ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654)) - ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2)) - - 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)) - ROM_LOAD("sound3.716", 0x4800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4)) -ROM_END - -ROM_START(alpok_l2) - ROM_REGION(0x2000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD("gamerom.716", 0x0000, 0x0800, CRC(79c07603) SHA1(526a45b139394e475fc052636e98d880a8908168)) - ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654)) - ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2)) - - 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)) - ROM_LOAD("sound3.716", 0x4800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4)) -ROM_END - -ROM_START(alpok_f6) - ROM_REGION(0x2000, "maincpu", ROMREGION_ERASEFF) - ROM_LOAD("gamerom6.716", 0x0000, 0x0800, CRC(20538a4a) SHA1(6cdd6b7ded76b3cbd954d371e126e1bbd95a6219)) - ROM_LOAD("green1.716", 0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654)) - ROM_LOAD("green2.716", 0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2)) - - 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)) - ROM_LOAD("5t5017fr.dat", 0x3000, 0x1000, CRC(7e546dc1) SHA1(58f8286403978b0d929987189089881d754a9a83)) - ROM_LOAD("sound3.716", 0x4800, 0x0800, CRC(55a10d13) SHA1(521d4cdfb0ed8178b3594cedceae93b772a951a4)) -ROM_END - -} // anonymous namespace - - -GAME( 1980, algar_l1, 0, s6a, s6a, s6a_state, empty_init, ROT0, "Williams", "Algar (L-1)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1980, alpok_l6, 0, s6a, alpok, s6a_state, empty_init, ROT0, "Williams", "Alien Poker (L-6)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1980, alpok_l2, alpok_l6, s6a, alpok, s6a_state, empty_init, ROT0, "Williams", "Alien Poker (L-2)", MACHINE_IS_SKELETON_MECHANICAL ) -GAME( 1980, alpok_f6, alpok_l6, s6a, alpok, s6a_state, empty_init, ROT0, "Williams", "Alien Poker (L-6 French speech)", MACHINE_IS_SKELETON_MECHANICAL ) diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp index 11e8f653d24..e2d75d88245 100644 --- a/src/mame/drivers/s7.cpp +++ b/src/mame/drivers/s7.cpp @@ -5,21 +5,22 @@ PINBALL Williams System 7 -Differences to system 6/6a: +Differences to system 6: - Extra PIA at 0x2100 to handle sound and more solenoids. - Diag digit - Leading zero suppression - Commas +- 7 digits for each player Diagnostic actions: - You must be in game over mode. All buttons are in the number-pad. When you are finished, you must reboot. -- Setup: NUM-6 must be in auto/up position. Press NUM-1 to enter setup mode, press - NUM-6 to change direction. +- Setup: NUM-2 must be in auto/up position. Press NUM-1 to enter setup mode, press + NUM-2 to change direction. -- Tests: NUM-6 must be in manual/down position. Press NUM-1 twice and tests will - begin. Press NUM-1 and NUM-6 together to get from test 1 to test 2. Press NUM-6 +- Tests: NUM-2 must be in manual/down position. Press NUM-1 twice and tests will + begin. Press NUM-1 and NUM-2 together to get from test 1 to test 2. Press NUM-2 to switch between auto/manual stepping. - Auto Diag Test: Set Dips to SW6. Press NUM-0. Press NUM-ENTER. Press NUM-1. Tests diff --git a/src/mame/layout/s6a.lay b/src/mame/layout/s6a.lay index 84fa0b5077e..d3d1cd9045b 100644 --- a/src/mame/layout/s6a.lay +++ b/src/mame/layout/s6a.lay @@ -51,22 +51,22 @@ copyright-holders:Robbbert - + - + - + - + diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 19e52ff24d9..41354ff0373 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -36957,6 +36957,10 @@ trizn_l1 // trizn_t1 // @source:s6.cpp +algar_l1 // +alpok_f6 // +alpok_l2 // +alpok_l6 // blkou_f1 // blkou_l1 // blkou_t1 // @@ -36971,12 +36975,6 @@ lzbal_t2 // scrpn_l1 // scrpn_t1 // -@source:s6a.cpp -algar_l1 // -alpok_f6 // -alpok_l2 // -alpok_l6 // - @source:s7.cpp barra_l1 // bk_f4 //