summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author hap <happppp@users.noreply.github.com>2021-03-09 15:57:54 +0100
committer hap <happppp@users.noreply.github.com>2021-03-09 15:58:07 +0100
commit9605d491462873127dd7a2782d69da9df3f41a9c (patch)
treef6a56167e37cd9dc249ba6b53a2e7e2b7d58c18d
parent3a2d9b490ed8efd2bd575e4573009bd4f8705de3 (diff)
New working machines
-------------------- Scrabble Sensor - Electronic Word Game [hap, Sean Riddle]
-rw-r--r--src/devices/cpu/pps41/mm76op.cpp4
-rw-r--r--src/devices/cpu/pps41/mm78.cpp2
-rw-r--r--src/devices/cpu/pps41/mm78.h4
-rw-r--r--src/devices/cpu/pps41/mm78op.cpp10
-rw-r--r--src/devices/cpu/pps41/pps41base.cpp2
-rw-r--r--src/mame/drivers/hh_pps41.cpp194
-rw-r--r--src/mame/layout/scrabsen.lay68
-rw-r--r--src/mame/layout/subwars.lay4
-rw-r--r--src/mame/mame.lst1
9 files changed, 256 insertions, 33 deletions
diff --git a/src/devices/cpu/pps41/mm76op.cpp b/src/devices/cpu/pps41/mm76op.cpp
index 65748638f47..3c3278ebcf3 100644
--- a/src/devices/cpu/pps41/mm76op.cpp
+++ b/src/devices/cpu/pps41/mm76op.cpp
@@ -9,12 +9,12 @@
// internal helpers
-inline u8 mm76_device::ram_r()
+u8 mm76_device::ram_r()
{
return m_data->read_byte(m_ram_addr & m_datamask) & 0xf;
}
-inline void mm76_device::ram_w(u8 data)
+void mm76_device::ram_w(u8 data)
{
m_data->write_byte(m_ram_addr & m_datamask, data & 0xf);
}
diff --git a/src/devices/cpu/pps41/mm78.cpp b/src/devices/cpu/pps41/mm78.cpp
index 3657799e3b4..ae5948b9663 100644
--- a/src/devices/cpu/pps41/mm78.cpp
+++ b/src/devices/cpu/pps41/mm78.cpp
@@ -210,7 +210,7 @@ void mm78_device::execute_one()
}
}
- // TAB is delayed by 1 cycle
+ // TAB is delayed by 1 opcode (including a single TR)
if (m_prev_op == 0x2c)
op_tab();
}
diff --git a/src/devices/cpu/pps41/mm78.h b/src/devices/cpu/pps41/mm78.h
index c09bee4a0d6..b4b8868584d 100644
--- a/src/devices/cpu/pps41/mm78.h
+++ b/src/devices/cpu/pps41/mm78.h
@@ -26,8 +26,8 @@
Vss 7 | | 36 DIO3 Vss 7 | | 34 DIO3
N/C 8 | | 35 DIO2 TEST 8 | | 33 DIO2
TEST 9 | | 34 DIO1 PI4 9 | | 32 DIO1
- PI4 10 | MM78 | 33 DIO0 PI8 10 | MM78L | 31 DIO0
- PI8 11 | MM77 | 32 INT1 PI3 11 | MM77L | 30 INT1
+ PI4 10 | MM77 | 33 DIO0 PI8 10 | MM77L | 31 DIO0
+ PI8 11 | MM78 | 32 INT1 PI3 11 | MM78L | 30 INT1
PI3 12 | | 31 INT0 PI7 12 | | 29 INT0
PI7 13 | | 30 DATAI PI6 13 | | 28 DATAI
PI6 14 | | 29 DATAO PI2 14 | | 27 DATAO
diff --git a/src/devices/cpu/pps41/mm78op.cpp b/src/devices/cpu/pps41/mm78op.cpp
index 6b5ef774481..82ec94aa449 100644
--- a/src/devices/cpu/pps41/mm78op.cpp
+++ b/src/devices/cpu/pps41/mm78op.cpp
@@ -116,19 +116,23 @@ void mm78_device::op_tab()
void mm78_device::op_ix()
{
// IX: input to X from channel X(aka B)
- op_todo();
+ m_x = (m_read_r() & m_r_output) >> 4;
}
void mm78_device::op_ox()
{
// OX: output from X to channel X(aka B)
- op_todo();
+ m_r_output = (m_r_output & 0xf) | m_x << 4;
+ m_write_r(m_r_output);
}
void mm78_device::op_ioa()
{
// IOA: exchange A with channel A
- op_todo();
+ u8 a = m_read_r() & m_r_output & 0xf;
+ m_r_output = (m_r_output & ~0xf) | m_a;
+ m_write_r(m_r_output);
+ m_a = a;
}
void mm78_device::op_i1sk()
diff --git a/src/devices/cpu/pps41/pps41base.cpp b/src/devices/cpu/pps41/pps41base.cpp
index 9fdc784c74b..1fb6eba3b82 100644
--- a/src/devices/cpu/pps41/pps41base.cpp
+++ b/src/devices/cpu/pps41/pps41base.cpp
@@ -33,7 +33,7 @@ TODO:
- add extended opcodes to disasm? it's easy to add there, but the emulation goes
through prefixes 1 cycle at the time which means the live disasm gets messy
- documentation discourages long jumps to the subroutine pages, but does not
- explain what would happen
+ explain what would happen. Scrabble Sensor does it, so it's probably ok.
- documentation discourages use of some extended opcodes when in subroutine pages,
but again does not explain why
- documentation is conflicting whether or not MM76/MM75 can (re)set interrupt flip-
diff --git a/src/mame/drivers/hh_pps41.cpp b/src/mame/drivers/hh_pps41.cpp
index 114f9ac99af..b5568301666 100644
--- a/src/mame/drivers/hh_pps41.cpp
+++ b/src/mame/drivers/hh_pps41.cpp
@@ -10,6 +10,7 @@
#include "emu.h"
#include "cpu/pps41/mm75.h"
+#include "cpu/pps41/mm76.h"
#include "video/pwm.h"
#include "sound/spkrdev.h"
#include "speaker.h"
@@ -17,6 +18,7 @@
// internal artwork
#include "mastmind.lh"
#include "memoquiz.lh"
+#include "scrabsen.lh"
//#include "hh_pps41_test.lh" // common test-layout - use external artwork
@@ -36,7 +38,7 @@ public:
required_device<pps41_base_device> m_maincpu;
optional_device<pwm_display_device> m_display;
optional_device<speaker_sound_device> m_speaker;
- optional_ioport_array<5> m_inputs; // max 5
+ optional_ioport_array<6> m_inputs; // max 6
u16 m_inp_mux = 0;
@@ -47,12 +49,15 @@ public:
u8 read_inputs(int columns);
protected:
+ virtual void update_int() { ; }
+
virtual void machine_start() override;
- virtual void machine_reset() override;
+ virtual void machine_reset() override { update_int(); }
+ virtual void device_post_load() override { update_int(); }
};
-// machine start/reset
+// machine start
void hh_pps41_state::machine_start()
{
@@ -62,10 +67,6 @@ void hh_pps41_state::machine_start()
save_item(NAME(m_r));
}
-void hh_pps41_state::machine_reset()
-{
-}
-
/***************************************************************************
@@ -183,7 +184,7 @@ INPUT_PORTS_END
void mastmind_state::mastmind(machine_config &config)
{
/* basic machine hardware */
- MM75(config, m_maincpu, 100000); // approximation
+ MM75(config, m_maincpu, 90000); // approximation
m_maincpu->write_d().set(FUNC(mastmind_state::write_d));
m_maincpu->write_r().set(FUNC(mastmind_state::write_r));
m_maincpu->read_p().set(FUNC(mastmind_state::read_p));
@@ -236,28 +237,19 @@ public:
hh_pps41_state(mconfig, type, tag)
{ }
- DECLARE_INPUT_CHANGED_MEMBER(digits_switch) { set_digits(); }
- void set_digits();
+ DECLARE_INPUT_CHANGED_MEMBER(digits_switch) { update_int(); }
+ virtual void update_int() override;
void update_display();
void write_d(u16 data);
void write_r(u8 data);
u8 read_p();
void memoquiz(machine_config &config);
-
-protected:
- virtual void machine_reset() override;
};
-void memoquiz_state::machine_reset()
-{
- hh_pps41_state::machine_reset();
- set_digits();
-}
-
// handlers
-void memoquiz_state::set_digits()
+void memoquiz_state::update_int()
{
// digits switch is tied to MCU interrupt pins
u8 inp = m_inputs[4]->read();
@@ -277,7 +269,7 @@ void memoquiz_state::write_d(u16 data)
m_inp_mux = data;
update_display();
- // DIO08: N/C, looks like they planned to add sound, but didn't
+ // DIO8: N/C, looks like they planned to add sound, but didn't
}
void memoquiz_state::write_r(u8 data)
@@ -330,7 +322,7 @@ INPUT_PORTS_END
void memoquiz_state::memoquiz(machine_config &config)
{
/* basic machine hardware */
- MM75(config, m_maincpu, 100000); // approximation
+ MM75(config, m_maincpu, 90000); // approximation
m_maincpu->write_d().set(FUNC(memoquiz_state::write_d));
m_maincpu->write_r().set(FUNC(memoquiz_state::write_r));
m_maincpu->read_p().set(FUNC(memoquiz_state::read_p));
@@ -356,6 +348,162 @@ ROM_END
+
+
+/***************************************************************************
+
+ Selchow & Righter Scrabble Sensor
+ * MM76EL MCU (label B8610-11, die label B8610)
+ * 16 leds, 1-bit sound
+
+ The game concept is similar to Mastermind. Enter a word (or press AUTO.)
+ to start the game, then try to guess it.
+
+***************************************************************************/
+
+class scrabsen_state : public hh_pps41_state
+{
+public:
+ scrabsen_state(const machine_config &mconfig, device_type type, const char *tag) :
+ hh_pps41_state(mconfig, type, tag)
+ { }
+
+ DECLARE_INPUT_CHANGED_MEMBER(players_switch) { update_int(); }
+ virtual void update_int() override;
+
+ void update_display();
+ void write_d(u16 data);
+ void write_r(u8 data);
+ u8 read_p();
+ void scrabsen(machine_config &config);
+};
+
+// handlers
+
+void scrabsen_state::update_int()
+{
+ // players switch is tied to MCU INT0
+ m_maincpu->set_input_line(0, (m_inputs[5]->read() & 1) ? ASSERT_LINE : CLEAR_LINE);
+}
+
+void scrabsen_state::update_display()
+{
+ m_display->matrix(m_inp_mux >> 6 & 3, ~m_r);
+}
+
+void scrabsen_state::write_d(u16 data)
+{
+ // DIO0-DIO4: input mux
+ // DIO6,DIO7: led select
+ m_inp_mux = data;
+ update_display();
+
+ // DIO8: speaker out
+ m_speaker->level_w(BIT(data, 8));
+}
+
+void scrabsen_state::write_r(u8 data)
+{
+ // RIO1-RIO8: led data
+ m_r = data;
+ update_display();
+}
+
+u8 scrabsen_state::read_p()
+{
+ // PI1-PI7: multiplexed inputs
+ return ~read_inputs(5);
+}
+
+// config
+
+static INPUT_PORTS_START( scrabsen )
+ PORT_START("IN.0") // DIO0
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CHAR('D')
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('S')
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('N')
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DEL) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8) PORT_NAME("Clear")
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('I')
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+ PORT_START("IN.1") // DIO1
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) PORT_CHAR('A')
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E) PORT_CHAR('E')
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T) PORT_CHAR('T')
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('X')
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('O')
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') PORT_NAME("Space")
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('J')
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+ PORT_START("IN.4") // DIO4
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B) PORT_CHAR('B')
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F) PORT_CHAR('F')
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U) PORT_CHAR('U')
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y')
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P) PORT_CHAR('P')
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('K')
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+ PORT_START("IN.3") // DIO3
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C) PORT_CHAR('C')
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G) PORT_CHAR('G')
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V) PORT_CHAR('V')
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z')
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q')
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_NAME("Auto.")
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('L')
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+ PORT_START("IN.2") // DIO2
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H) PORT_CHAR('H')
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_CHAR('W')
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R) PORT_CHAR('R')
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_CODE(KEYCODE_ENTER_PAD) PORT_CHAR(13) PORT_NAME("Enter")
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CHAR('M')
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+ PORT_START("IN.5") // INT0
+ PORT_CONFNAME( 0x01, 0x01, "Players" ) PORT_CHANGED_MEMBER(DEVICE_SELF, scrabsen_state, players_switch, 0)
+ PORT_CONFSETTING( 0x01, "1" ) // single
+ PORT_CONFSETTING( 0x00, "2" ) // double
+INPUT_PORTS_END
+
+void scrabsen_state::scrabsen(machine_config &config)
+{
+ /* basic machine hardware */
+ MM76EL(config, m_maincpu, 95000); // approximation
+ m_maincpu->write_d().set(FUNC(scrabsen_state::write_d));
+ m_maincpu->write_r().set(FUNC(scrabsen_state::write_r));
+ m_maincpu->read_p().set(FUNC(scrabsen_state::read_p));
+
+ /* video hardware */
+ PWM_DISPLAY(config, m_display).set_size(2, 8);
+ config.set_default_layout(layout_scrabsen);
+
+ /* sound hardware */
+ SPEAKER(config, "mono").front_center();
+ SPEAKER_SOUND(config, m_speaker);
+ m_speaker->add_route(ALL_OUTPUTS, "mono", 0.25);
+}
+
+// roms
+
+ROM_START( scrabsen )
+ ROM_REGION( 0x0400, "maincpu", 0 )
+ ROM_LOAD( "b8610-11", 0x0000, 0x0400, CRC(97c8a466) SHA1(ed5d2cddd2761ed6e3ddc47d97b2ed19a2aaeee9) )
+
+ ROM_REGION( 314, "maincpu:opla", 0 ) // unused
+ ROM_LOAD( "mm76_scrabsen_output.pla", 0, 314, CRC(410fa6d7) SHA1(d46aaf1ec2c942083cba7dbd59d4261dc238d4c8) )
+ROM_END
+
+
+
} // anonymous namespace
/***************************************************************************
@@ -368,3 +516,5 @@ ROM_END
CONS( 1979, mastmind, 0, 0, mastmind, mastmind, mastmind_state, empty_init, "Invicta Plastics", "Electronic Master Mind (Invicta)", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
CONS( 1978, memoquiz, 0, 0, memoquiz, memoquiz, memoquiz_state, empty_init, "M.E.M. Belgium", "Memoquiz", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW )
+
+CONS( 1980, scrabsen, 0, 0, scrabsen, scrabsen, scrabsen_state, empty_init, "Selchow & Righter", "Scrabble Sensor - Electronic Word Game", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/layout/scrabsen.lay b/src/mame/layout/scrabsen.lay
new file mode 100644
index 00000000000..7dab21e4025
--- /dev/null
+++ b/src/mame/layout/scrabsen.lay
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+
+<!-- define elements -->
+
+ <element name="whited"><disk><color red="0.8" green="0.8" blue="0.8" /></disk></element>
+
+ <element name="text_1"><text string="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+ <element name="text_2"><text string="2"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+ <element name="text_3"><text string="3"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+ <element name="text_4"><text string="4"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+ <element name="text_5"><text string="5"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+ <element name="text_6"><text string="6"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+ <element name="text_7"><text string="7"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+
+ <element name="text_l1"><text string="Letters" align="2"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+ <element name="text_l2"><text string="Position" align="2"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+ <element name="text_l3"><text string="Player One" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+ <element name="text_l4"><text string="Player Two" align="2"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+
+ <element name="led" defstate="0">
+ <disk state="0"><color red="0.2" green="0.04" blue="0.05" /></disk>
+ <disk state="1"><color red="1.0" green="0.2" blue="0.23" /></disk>
+ </element>
+
+
+<!-- build screen -->
+
+ <view name="Internal Layout">
+ <bounds left="25" right="190" top="40" bottom="100" />
+
+ <element ref="text_l1"><bounds x="0" y="52" width="47.5" height="6" /></element>
+ <element ref="text_l2"><bounds x="0" y="68" width="47.5" height="6" /></element>
+ <element ref="text_l3"><bounds x="71" y="84" width="90" height="6" /></element>
+ <element ref="text_l4"><bounds x="71" y="84" width="90" height="6" /></element>
+
+ <repeat count="7">
+ <param name="x" start="50" increment="20" />
+ <param name="i" start="1" increment="1" />
+ <element ref="whited"><bounds x="~x~" y="50" width="10" height="10" /></element>
+ <element ref="whited"><bounds x="~x~" y="66" width="10" height="10" /></element>
+ <element ref="text_~i~"><bounds x="~x~" y="60" width="10" height="6" /></element>
+ </repeat>
+
+ <element name="1.0" ref="led"><bounds x="52" y="52" width="6" height="6" /></element>
+ <element name="1.1" ref="led"><bounds x="72" y="52" width="6" height="6" /></element>
+ <element name="1.2" ref="led"><bounds x="92" y="52" width="6" height="6" /></element>
+ <element name="1.3" ref="led"><bounds x="112" y="52" width="6" height="6" /></element>
+ <element name="1.5" ref="led"><bounds x="132" y="52" width="6" height="6" /></element>
+ <element name="1.4" ref="led"><bounds x="152" y="52" width="6" height="6" /></element>
+ <element name="1.6" ref="led"><bounds x="172" y="52" width="6" height="6" /></element>
+
+ <element name="0.0" ref="led"><bounds x="52" y="68" width="6" height="6" /></element>
+ <element name="0.1" ref="led"><bounds x="72" y="68" width="6" height="6" /></element>
+ <element name="0.2" ref="led"><bounds x="92" y="68" width="6" height="6" /></element>
+ <element name="0.3" ref="led"><bounds x="112" y="68" width="6" height="6" /></element>
+ <element name="0.5" ref="led"><bounds x="132" y="68" width="6" height="6" /></element>
+ <element name="0.4" ref="led"><bounds x="152" y="68" width="6" height="6" /></element>
+ <element name="0.6" ref="led"><bounds x="172" y="68" width="6" height="6" /></element>
+
+ <element name="0.7" ref="led"><bounds x="62" y="84" width="6" height="6" /></element>
+ <element name="1.7" ref="led"><bounds x="162" y="84" width="6" height="6" /></element>
+
+ </view>
+</mamelayout>
diff --git a/src/mame/layout/subwars.lay b/src/mame/layout/subwars.lay
index efb0ad90ff2..6a71bd5f50e 100644
--- a/src/mame/layout/subwars.lay
+++ b/src/mame/layout/subwars.lay
@@ -88,8 +88,8 @@ license:CC0
</repeat>
<repeat count="3">
<param name="y" start="44" increment="12" />
- <param name="t" start="0" increment="1" />
- <element ref="text_w~t~"><bounds x="75.7" y="~y~" width="12" height="3.4" /></element>
+ <param name="i" start="0" increment="1" />
+ <element ref="text_w~i~"><bounds x="75.7" y="~y~" width="12" height="3.4" /></element>
</repeat>
<element ref="gray"><bounds x="23.4" y="120" width="116.6" height="13.4" /></element>
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index f21534c64a0..1f0ce802542 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -16174,6 +16174,7 @@ uspbball // US Games
@source:hh_pps41.cpp
mastmind // Invicta
memoquiz // MEM
+scrabsen // Selchow & Righter
@source:hh_sm510.cpp
auslalom // Elektronika