cleanup + added Entex Baseball i/o

src/mess/drivers/hh_tms1k.c

@@ -5,7 +5,46 @@
   This driver is a collection of simple dedicated handheld and tabletop
   toys based around the TMS1000 MCU series. Anything more complex or clearly
   part of a series is (or will be) in its own driver.
+  
+  Let's use this driver for a list of known devices and their serials,
+  excluding TI's own products (see for example ticalc1x.c, tispeak.c)
 
+  serial   device   etc.
+--------------------------------------------------------------------
+ @MP0904A  TMS0970  1977, Milton Bradley Comp IV
+ @MP0905B  TMS0970  1977, Parker Brothers Codename Sector
+ @MP0914   TMS1000  1979, Entex Baseball
+ @MP1030   TMS1100  1980, APF Mathemagician
+ @MP3226   TMS1000  1978, Milton Bradley Simon
+ @MP3403   TMS1100  1978, unknown
+ @MP3404   TMS1100  1978, Parker Brothers Merlin
+ @MP3405   TMS1100  1979, Coleco Amaze-A-Tron
+ @MP3438A  TMS1100  1979, Kenner Star Wars Electronic Battle Command
+  MP3450A  TMS1100  1979, MicroVision cartridge: Blockbuster
+  MP3454   TMS1100  1979, MicroVision cartridge: Star Trek Phaser Strike
+  MP3455   TMS1100  1980, MicroVision cartridge: Pinball
+  MP3457   TMS1100  1979, MicroVision cartridge: Mindbuster
+  MP3474   TMS1100  1979, MicroVision cartridge: Vegas Slots
+  MP3475   TMS1100  1979, MicroVision cartridge: Bowling
+  MP3479   TMS1100  1980, MicroVision cartridge: Baseball
+  MP3481   TMS1100  1979, MicroVision cartridge: Connect Four
+  MP3496   TMS1100  1980, MicroVision cartridge: Sea Duel
+ @MP6100A  TMS0980  1979, Ideal Electronic Detective
+ @MP6101B  TMS0980  1979, Parker Brothers Stop Thief
+ @MP7313   TMS1400  1980, Parker Brothers Bank Shot
+ @MP7314   TMS1400  1980, Parker Brothers Split Second
+ *MP7332   TMS1400  1981, Milton Bradley Dark Tower
+ @MP7334   TMS1400  1981, Coleco Total Control 4
+
+  inconsistent:
+  
+  M34009   TMS1100  1981, MicroVision cartridge: Alien Raiders
+  M34017   TMS1100  1981, MicroVision cartridge: Cosmic Hunter
+  M34047   TMS1100  1982, MicroVision cartridge: Super Blockbuster
+
+  CD7282SL TMS1100  1981, Tandy-12 (serial is similar to TI Speak & Spell series?)
+
+  (* denotes not yet emulated by MESS, @ denotes it's in this driver)
 
 ***************************************************************************/
 
@@ -13,21 +52,24 @@
 #include "cpu/tms0980/tms0980.h"
 #include "sound/speaker.h"
 
+// internal artwork
 #include "amaztron.lh"
 #include "bankshot.lh"
 #include "cnsector.lh"
-#include "ebball.lh"
 #include "elecdet.lh"
 #include "comp4.lh"
 #include "mathmagi.lh"
-#include "merlin.lh"
+#include "merlin.lh" // clickable
-#include "simon.lh"
+#include "simon.lh" // clickable
 #include "splitsec.lh"
 #include "starwbc.lh"
 #include "stopthie.lh"
-#include "tandy12.lh"
+#include "tandy12.lh" // clickable
 #include "tc4.lh"
 
+// test-layouts - use external artwork
+#include "ebball.lh"
+
 
 class hh_tms1k_state : public driver_device
 {
@@ -72,6 +114,7 @@ public:
 
 	TIMER_DEVICE_CALLBACK_MEMBER(display_decay_tick);
 	void display_update();
+	void display_matrix(int maxx, int maxy, UINT32 setx, UINT32 sety);
 	
 	// game-specific handlers
 	void mathmagi_display();
@@ -89,6 +132,11 @@ public:
 	DECLARE_WRITE16_MEMBER(tc4_write_r);
 	DECLARE_WRITE16_MEMBER(tc4_write_o);
 
+	void ebball_display();
+	DECLARE_READ8_MEMBER(ebball_read_k);
+	DECLARE_WRITE16_MEMBER(ebball_write_r);
+	DECLARE_WRITE16_MEMBER(ebball_write_o);
+
 	DECLARE_READ8_MEMBER(elecdet_read_k);
 	DECLARE_WRITE16_MEMBER(elecdet_write_r);
 	DECLARE_WRITE16_MEMBER(elecdet_write_o);
@@ -118,12 +166,10 @@ public:
 	DECLARE_WRITE16_MEMBER(stopthief_write_r);
 	DECLARE_WRITE16_MEMBER(stopthief_write_o);
 
-	void bankshot_display();
 	DECLARE_READ8_MEMBER(bankshot_read_k);
 	DECLARE_WRITE16_MEMBER(bankshot_write_r);
 	DECLARE_WRITE16_MEMBER(bankshot_write_o);
 
-	void splitsec_display();
 	DECLARE_READ8_MEMBER(splitsec_read_k);
 	DECLARE_WRITE16_MEMBER(splitsec_write_r);
 	DECLARE_WRITE16_MEMBER(splitsec_write_o);
@@ -139,6 +185,8 @@ public:
 };
 
 
+// machine_start/reset
+
 void hh_tms1k_state::machine_start()
 {
 	// zerofill
@@ -168,12 +216,13 @@ void hh_tms1k_state::machine_start()
 	save_item(NAME(m_power_on));
 }
 
-
 void hh_tms1k_state::machine_reset()
 {
 	m_power_on = true;
 }
 
+
+
 /***************************************************************************
 
   Helper Functions
@@ -243,17 +292,41 @@ TIMER_DEVICE_CALLBACK_MEMBER(hh_tms1k_state::display_decay_tick)
 	display_update();
 }
 
+void hh_tms1k_state::display_matrix(int maxx, int maxy, UINT32 setx, UINT32 sety)
+{
+	m_display_maxx = maxx;
+	m_display_maxy = maxy;
+
+	// update current state
+	for (int y = 0; y < maxy; y++)
+		m_display_state[y] = (sety >> y & 1) ? setx : 0;
+	
+	display_update();
+}
+
 
 UINT8 hh_tms1k_state::read_inputs(int columns)
 {
-	UINT8 k = 0;
+	UINT8 ret = 0;
 
 	// read selected input rows
 	for (int i = 0; i < columns; i++)
 		if (m_inp_mux >> i & 1)
-			k |= m_inp_matrix[i]->read();
+			ret |= m_inp_matrix[i]->read();
 
-	return k;
+	return ret;
+}
+
+
+// devices with a TMS0980 can auto power-off
+
+WRITE_LINE_MEMBER(hh_tms1k_state::tms0980_auto_power_off)
+{
+	if (state)
+	{
+		m_power_on = false;
+		m_maincpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
+	}
 }
 
 INPUT_CHANGED_MEMBER(hh_tms1k_state::tms0980_power_button)
@@ -262,15 +335,7 @@ INPUT_CHANGED_MEMBER(hh_tms1k_state::tms0980_power_button)
 	m_maincpu->set_input_line(INPUT_LINE_RESET, m_power_on ? CLEAR_LINE : ASSERT_LINE);
 }
 
-WRITE_LINE_MEMBER(hh_tms1k_state::tms0980_auto_power_off)
+
-{
-	// TMS0980 auto power-off opcode
-	if (state)
-	{
-		m_power_on = false;
-		m_maincpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
-	}
-}
 
 /***************************************************************************
 
@@ -331,7 +396,6 @@ READ8_MEMBER(hh_tms1k_state::mathmagi_read_k)
 	return read_inputs(6);
 }
 
-
 WRITE16_MEMBER(hh_tms1k_state::mathmagi_write_r)
 {
 	// R3,R5-R7,R9,R10: input mux
@@ -350,6 +414,7 @@ WRITE16_MEMBER(hh_tms1k_state::mathmagi_write_o)
 	m_o = data;
 }
 
+
 /* physical button layout and labels is like this:
 
     ON     ONE       [SEL] [NXT] [?]   [/]
@@ -399,6 +464,7 @@ static INPUT_PORTS_START( mathmagi )
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
 INPUT_PORTS_END
 
+// output PLA is not dumped
 static const UINT16 mathmagi_output_pla[0x20] =
 {
 	lA+lB+lC+lD+lE+lF,      // 0
@@ -435,7 +501,6 @@ static const UINT16 mathmagi_output_pla[0x20] =
 	lA+lF+lE+lD+lC          // G
 };
 
-
 static MACHINE_CONFIG_START( mathmagi, hh_tms1k_state )
 
 	/* basic machine hardware */
@@ -626,19 +691,14 @@ MACHINE_CONFIG_END
 void hh_tms1k_state::tc4_display()
 {
 	m_display_wait = 50;
-	m_display_maxy = 10;
-	m_display_maxx = 9;
 	
 	// R5,7,8,9 are 7segs
-	for (int y = 0; y < m_display_maxy; y++)
+	for (int y = 0; y < 10; y++)
 		if (y >= 5 && y <= 9 && y != 6)
 			m_7seg_mask[y] = 0x7f;
 	
 	// update current state (note: R6 as extra column!)
-	for (int y = 0; y < m_display_maxy; y++)
+	display_matrix(9, 10, (m_o | (m_r << 2 & 0x100)), m_r);
-		m_display_state[y] = (m_r >> y & 1) ? (m_o | (m_r << 2 & 0x100)) : 0;
-	
-	display_update();
 }
 
 READ8_MEMBER(hh_tms1k_state::tc4_read_k)
@@ -662,14 +722,14 @@ WRITE16_MEMBER(hh_tms1k_state::tc4_write_r)
 	m_inp_mux = data & 0x23f;
 	
 	// R6: led column 8
-	// +other: select leds
+	// +other columns
 	m_r = data;
 	tc4_display();
 }
 
 WRITE16_MEMBER(hh_tms1k_state::tc4_write_o)
 {
-	// O0-O7: leds/7segment
+	// O0-O7: led row
 	m_o = data;
 	tc4_display();
 }
@@ -745,18 +805,95 @@ MACHINE_CONFIG_END
   Entex Baseball
   * TMS1000NLP MP0914 (die labeled MP0914A)
 
+  NOTE!: MESS external artwork is recommended
+
+  lamp translation table: led LDzz from game PCB = MESS lampyx:
+
+    LD0  = -        LD10 = lamp12   LD20 = lamp42   LD30 = lamp60
+    LD1  = lamp23   LD11 = lamp4    LD21 = lamp41   LD31 = lamp61
+    LD2  = lamp0    LD12 = lamp15   LD22 = lamp40   LD32 = lamp62
+    LD3  = lamp1    LD13 = lamp22   LD23 = lamp43   LD33 = lamp70
+    LD4  = lamp2    LD14 = lamp33   LD24 = lamp53   LD34 = lamp71
+    LD5  = lamp10   LD15 = lamp32   LD25 = lamp52
+    LD6  = lamp13   LD16 = lamp21   LD26 = lamp51
+    LD7  = lamp11   LD17 = lamp31   LD27 = lamp50
+    LD8  = lamp3    LD18 = lamp30   LD28 = lamp72
+    LD9  = lamp14   LD19 = lamp20   LD29 = lamp73
+
 ***************************************************************************/
 
-// inputs
+void hh_tms1k_state::ebball_display()
+{
+	// R8 is a 7seg
+	m_7seg_mask[8] = 0x7f;
+	
+	display_matrix(7, 9, m_o, m_r);
+}
+
+READ8_MEMBER(hh_tms1k_state::ebball_read_k)
+{
+	// note: K8(Vss row) is always on
+	return m_inp_matrix[5]->read() | read_inputs(5);
+}
+
+WRITE16_MEMBER(hh_tms1k_state::ebball_write_r)
+{
+	// R1-R5: input mux
+	m_inp_mux = data >> 1 & 0x1f;
+	
+	// R9: speaker out
+	m_speaker->level_w(data >> 9 & 1);
+	
+	// R0-R8: led columns
+	m_r = data;
+	ebball_display();
+}
+
+WRITE16_MEMBER(hh_tms1k_state::ebball_write_o)
+{
+	// O0-O6: led row
+	// O7: N/C
+	m_o = data;
+	ebball_display();
+}
+
 static INPUT_PORTS_START( ebball )
+	PORT_START("IN.0") // R1
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 )
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("IN.1") // R2
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 )
+	PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("IN.2") // R3
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON5 )
+	PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("IN.3") // R4
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON6 )
+	PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("IN.4") // R5
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON7 )
+	PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("IN.5") // Vss!
+	PORT_BIT( 0x07, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON8 )
 INPUT_PORTS_END
 
-// machine config
 static MACHINE_CONFIG_START( ebball, hh_tms1k_state )
 
 	/* basic machine hardware */
 	MCFG_CPU_ADD("maincpu", TMS1000, 350000) // RC osc. R=43K, C=47pf -> ~350kHz
+	MCFG_TMS1XXX_READ_K_CB(READ8(hh_tms1k_state, ebball_read_k))
+	MCFG_TMS1XXX_WRITE_R_CB(WRITE16(hh_tms1k_state, ebball_write_r))
+	MCFG_TMS1XXX_WRITE_O_CB(WRITE16(hh_tms1k_state, ebball_write_o))
 
+	MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1))
 	MCFG_DEFAULT_LAYOUT(layout_ebball)
 
 	/* no video! */
@@ -795,21 +932,14 @@ READ8_MEMBER(hh_tms1k_state::elecdet_read_k)
 
 WRITE16_MEMBER(hh_tms1k_state::elecdet_write_r)
 {
-	m_display_maxy = 7;
-	m_display_maxx = 7;
-
-	// R0-R6: select digit
-	UINT8 o = BITSWAP8(m_o,7,5,2,1,4,0,6,3);
-	for (int y = 0; y < m_display_maxy; y++)
-	{
-		m_7seg_mask[y] = 0x7f;
-		m_display_state[y] = (data >> y & 1) ? o : 0;
-	}
-
-	display_update();
-
 	// R7,R8: speaker on
 	m_speaker->level_w((data & 0x180 && m_o & 0x80) ? 1 : 0);
+
+	// R0-R6: select digit
+	for (int y = 0; y < 7; y++)
+		m_7seg_mask[y] = 0x7f;
+
+	display_matrix(7, 7, BITSWAP8(m_o,7,5,2,1,4,0,6,3), data);
 }
 
 WRITE16_MEMBER(hh_tms1k_state::elecdet_write_o)
@@ -833,28 +963,28 @@ WRITE16_MEMBER(hh_tms1k_state::elecdet_write_o)
 */
 
 static INPUT_PORTS_START( elecdet )
-	PORT_START("IN.0") // O0 pin18
+	PORT_START("IN.0") // O0
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD) PORT_NAME("4")
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD) PORT_NAME("6")
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_Q) PORT_NAME("Private Question")
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_5_PAD) PORT_NAME("5")
 
-	PORT_START("IN.1") // O1 pin17
+	PORT_START("IN.1") // O1
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_0) PORT_CODE(KEYCODE_0_PAD) PORT_NAME("0")
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_ENTER) PORT_CODE(KEYCODE_ENTER_PAD) PORT_NAME("Enter")
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED )
 
-	PORT_START("IN.2") // O4 pin14
+	PORT_START("IN.2") // O4
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_7) PORT_CODE(KEYCODE_7_PAD) PORT_NAME("7")
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_NAME("9")
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_A) PORT_NAME("I Accuse")
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_8) PORT_CODE(KEYCODE_8_PAD) PORT_NAME("8")
 
-	PORT_START("IN.3") // O6 pin12
+	PORT_START("IN.3") // O6
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_1_PAD) PORT_NAME("1")
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_3) PORT_CODE(KEYCODE_3_PAD) PORT_NAME("3")
@@ -908,20 +1038,10 @@ MACHINE_CONFIG_END
 
 void hh_tms1k_state::starwbc_display()
 {
-	m_display_maxy = 10;
+	// R6,R8 are 7segs
-	m_display_maxx = 8;
+	m_7seg_mask[6] = m_7seg_mask[8] = 0x7f;
-
+	
-	UINT8 o = (m_o << 4 & 0xf0) | (m_o >> 4 & 0x0f);
+	display_matrix(8, 10, m_o, m_r);
-	for (int y = 0; y < m_display_maxy; y+=2)
-	{
-		m_display_state[y] = (m_r >> y & 1) ? o : 0;
-		
-		// R6,R8 are 7segs
-		if (y == 6 || y == 8)
-			m_7seg_mask[y] = 0x7f;
-	}
-
-	display_update();
 }
 
 READ8_MEMBER(hh_tms1k_state::starwbc_read_k)
@@ -934,23 +1054,22 @@ WRITE16_MEMBER(hh_tms1k_state::starwbc_write_r)
 	// R0,R1,R3,R5,R7: input mux
 	m_inp_mux = (data & 3) | (data >> 1 & 4) | (data >> 2 & 8) | (data >> 3 & 0x10);
 
-	// R9: piezo speaker
+	// R9: speaker out
 	m_speaker->level_w(data >> 9 & 1);
 
-	// R0,R2,R4,R6,R8: leds
+	// R0,R2,R4,R6,R8: led columns
-	m_r = data;
+	m_r = data & 0x155;
 	starwbc_display();
 }
 
 WRITE16_MEMBER(hh_tms1k_state::starwbc_write_o)
 {
-	// O0-O7: leds state
+	// O0-O7: led row
-	m_o = data;
+	m_o = (data << 4 & 0xf0) | (data >> 4 & 0x0f);
 	starwbc_display();
 }
 
 
-
 /* physical button layout and labels is like this:
 
     (reconnnaissance=yellow)        (tactical reaction=green)
@@ -996,7 +1115,7 @@ INPUT_PORTS_END
 static MACHINE_CONFIG_START( starwbc, hh_tms1k_state )
 
 	/* basic machine hardware */
-	MCFG_CPU_ADD("maincpu", TMS1100, 300000) // RC osc. R=51K, C=47pf -> ~300kHz
+	MCFG_CPU_ADD("maincpu", TMS1100, 325000) // RC osc. R=51K, C=47pf -> ~325kHz
 	MCFG_TMS1XXX_READ_K_CB(READ8(hh_tms1k_state, starwbc_read_k))
 	MCFG_TMS1XXX_WRITE_R_CB(WRITE16(hh_tms1k_state, starwbc_write_r))
 	MCFG_TMS1XXX_WRITE_O_CB(WRITE16(hh_tms1k_state, starwbc_write_o))
@@ -1029,9 +1148,6 @@ MACHINE_CONFIG_END
   Refer to the official manual for more information.
 
 
-  TODO:
-  - MCU clock is unknown
-
 ***************************************************************************/
 
 READ8_MEMBER(hh_tms1k_state::comp4_read_k)
@@ -1047,17 +1163,19 @@ WRITE16_MEMBER(hh_tms1k_state::comp4_write_r)
 	// R2    R7
 	// R1    R6
 	// R0    R5
-	m_display_maxx = 11;
+	m_r = data;
-	m_display_state[0] = data;
+	display_matrix(11, 1, m_r, m_o);
-	display_update();
 }
 
 WRITE16_MEMBER(hh_tms1k_state::comp4_write_o)
 {
-	// O0: leds common (always writes 1)
 	// O1-O3: input mux
-	// other bits: N/C
 	m_inp_mux = data >> 1 & 7;
+
+	// O0: leds common
+	// other bits: N/C
+	m_o = data;
+	display_matrix(11, 1, m_r, m_o);
 }
 
 
@@ -1105,7 +1223,7 @@ MACHINE_CONFIG_END
   Milton Bradley Simon, created by Ralph Baer
 
   Revision A hardware:
-  * TMS1000 (has internal ROM), DS75494 lamp driver
+  * TMS1000 (die labeled MP3226), DS75494 lamp driver
 
   Newer revisions have a smaller 16-pin MB4850 chip instead of the TMS1000.
   This one has been decapped too, but we couldn't find an internal ROM.
@@ -1129,9 +1247,7 @@ WRITE16_MEMBER(hh_tms1k_state::simon_write_r)
 	// R5 -> 75494 IN3 -> red lamp
 	// R6 -> 75494 IN5 -> yellow lamp
 	// R7 -> 75494 IN2 -> blue lamp
-	m_display_maxx = 4;
+	display_matrix(4, 1, data >> 4, 1);
-	m_display_state[0] = data >> 4 & 0xf;
-	display_update();
 
 	// R8 -> 75494 IN0 -> speaker
 	m_speaker->level_w(data >> 8 & 1);
@@ -1338,9 +1454,7 @@ WRITE16_MEMBER(hh_tms1k_state::merlin_write_r)
 	R7   R8   R9
 	     R10
 	*/
-	m_display_maxx = 11;
+	display_matrix(11, 1, data, 1);
-	m_display_state[0] = data;
-	display_update();
 }
 
 WRITE16_MEMBER(hh_tms1k_state::merlin_write_o)
@@ -1537,24 +1651,11 @@ MACHINE_CONFIG_END
 
 ***************************************************************************/
 
-void hh_tms1k_state::bankshot_display()
-{
-	m_display_maxy = 11;
-	m_display_maxx = 7;
-	
-	// update current state
-	for (int y = 0; y < m_display_maxy; y++)
-		m_display_state[y] = (m_r >> y & 1) ? m_o : 0;
-	
-	display_update();
-}
-
 READ8_MEMBER(hh_tms1k_state::bankshot_read_k)
 {
 	return read_inputs(2);
 }
 
-
 WRITE16_MEMBER(hh_tms1k_state::bankshot_write_r)
 {
 	// R0: speaker out
@@ -1563,17 +1664,17 @@ WRITE16_MEMBER(hh_tms1k_state::bankshot_write_r)
 	// R2,R3: input mux
 	m_inp_mux = data >> 2 & 3;
 
-	// R2-R10: led rows
+	// R2-R10: led columns
 	m_r = data & ~3;
-	bankshot_display();
+	display_matrix(7, 11, m_o, m_r);
 }
 
 WRITE16_MEMBER(hh_tms1k_state::bankshot_write_o)
 {
-	// O0-O6: led columns
+	// O0-O6: led row
 	// O7: N/C
 	m_o = data;
-	bankshot_display();
+	display_matrix(7, 11, m_o, m_r);
 }
 
 
@@ -1643,10 +1744,7 @@ MACHINE_CONFIG_END
 
   *: higher number indicates higher difficulty
 
-***************************************************************************/
+  display layout, where number xy is lamp R(x),O(y)
-
-
-/* display layout, where number xy is lamp R(x),O(y)
 
        00    02    04
     10 01 12 03 14 05 16
@@ -1659,19 +1757,8 @@ MACHINE_CONFIG_END
        71    73    75
     50 60 52 62 54 64 56
        70    72    74
-*/
 
-void hh_tms1k_state::splitsec_display()
+***************************************************************************/
-{
-	m_display_maxy = 8;
-	m_display_maxx = 7;
-	
-	// update current state
-	for (int y = 0; y < m_display_maxy; y++)
-		m_display_state[y] = (m_r >> y & 1) ? m_o : 0;
-	
-	display_update();
-}
 
 READ8_MEMBER(hh_tms1k_state::splitsec_read_k)
 {
@@ -1686,17 +1773,17 @@ WRITE16_MEMBER(hh_tms1k_state::splitsec_write_r)
 	// R9,R10: input mux
 	m_inp_mux = data >> 9 & 3;
 
-	// R0-R7: led rows
+	// R0-R7: led columns
 	m_r = data;
-	display_update();
+	display_matrix(7, 8, m_o, m_r);
 }
 
 WRITE16_MEMBER(hh_tms1k_state::splitsec_write_o)
 {
-	// O0-O6: led columns
+	// O0-O6: led row
 	// O7: N/C
 	m_o = data;
-	splitsec_display();
+	display_matrix(7, 8, m_o, m_r);
 }
 
 static INPUT_PORTS_START( splitsec )
@@ -1708,8 +1795,8 @@ static INPUT_PORTS_START( splitsec )
 
 	PORT_START("IN.1") // R10
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_16WAY
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Select")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SELECT )
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Start")
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START )
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
 INPUT_PORTS_END
 
@@ -1766,11 +1853,8 @@ MACHINE_CONFIG_END
 
 void hh_tms1k_state::tandy12_display()
 {
-	m_display_maxx = 13;
-	
 	// O0-O7: button lamps 1-8, R0-R3: button lamps 9-12
-	m_display_state[0] = (m_o << 1 & 0x1fe) | (m_r << 9 & 0x1e00);
+	display_matrix(13, 1, (m_o << 1 & 0x1fe) | (m_r << 9 & 0x1e00), 1);
-	display_update();
 }
 
 READ8_MEMBER(hh_tms1k_state::tandy12_read_k)
@@ -1997,7 +2081,7 @@ ROM_END
 
 ROM_START( amaztron )
 	ROM_REGION( 0x0800, "maincpu", 0 )
-	ROM_LOAD( "tms1100nll_mp3405", 0x0000, 0x0800, CRC(9cbc0009) SHA1(17772681271b59280687492f37fa0859998f041d) )
+	ROM_LOAD( "mp3405", 0x0000, 0x0800, CRC(9cbc0009) SHA1(17772681271b59280687492f37fa0859998f041d) )
 
 	ROM_REGION( 867, "maincpu:mpla", 0 )
 	ROM_LOAD( "tms1100_amaztron_mpla.pla", 0, 867, CRC(03574895) SHA1(04407cabfb3adee2ee5e4218612cb06c12c540f4) )
@@ -2010,7 +2094,7 @@ ROM_END
 
 ROM_START( tc4 )
 	ROM_REGION( 0x1000, "maincpu", 0 )
-	ROM_LOAD( "tms1400nll_mp7334", 0x0000, 0x1000, CRC(923f3821) SHA1(a9ae342d7ff8dae1dedcd1e4984bcfae68586581) )
+	ROM_LOAD( "mp7334", 0x0000, 0x1000, CRC(923f3821) SHA1(a9ae342d7ff8dae1dedcd1e4984bcfae68586581) )
 
 	ROM_REGION( 867, "maincpu:mpla", 0 )
 	ROM_LOAD( "tms1100_default_mpla.pla", 0, 867, CRC(62445fc9) SHA1(d6297f2a4bc7a870b76cc498d19dbb0ce7d69fec) )
@@ -2032,7 +2116,7 @@ ROM_END
 
 ROM_START( elecdet )
 	ROM_REGION( 0x1000, "maincpu", 0 )
-	ROM_LOAD( "tms0980nll_mp6100a", 0x0000, 0x1000, CRC(6f396bb8) SHA1(1f104d4ca9bee0d4572be4779b7551dfe20c4f04) )
+	ROM_LOAD( "mp6100a", 0x0000, 0x1000, CRC(6f396bb8) SHA1(1f104d4ca9bee0d4572be4779b7551dfe20c4f04) )
 
 	ROM_REGION( 1246, "maincpu:ipla", 0 )
 	ROM_LOAD( "tms0980_default_ipla.pla", 0, 1246, CRC(42db9a38) SHA1(2d127d98028ec8ec6ea10c179c25e447b14ba4d0) )
@@ -2120,7 +2204,7 @@ ROM_END
 
 ROM_START( stopthie )
 	ROM_REGION( 0x1000, "maincpu", 0 )
-	ROM_LOAD( "tms0980nll_mp6101b", 0x0000, 0x1000, CRC(8bde5bb4) SHA1(8c318fcce67acc24c7ae361f575f28ec6f94665a) )
+	ROM_LOAD( "mp6101b", 0x0000, 0x1000, CRC(8bde5bb4) SHA1(8c318fcce67acc24c7ae361f575f28ec6f94665a) )
 
 	ROM_REGION( 1246, "maincpu:ipla", 0 )
 	ROM_LOAD( "tms0980_default_ipla.pla", 0, 1246, CRC(42db9a38) SHA1(2d127d98028ec8ec6ea10c179c25e447b14ba4d0) )
@@ -2148,7 +2232,7 @@ ROM_END
 
 ROM_START( bankshot )
 	ROM_REGION( 0x1000, "maincpu", 0 )
-	ROM_LOAD( "tms1400nll_mp7313", 0x0000, 0x1000, CRC(7a5016a9) SHA1(a8730dc8a282ffaa3d89e675f371d43eb39f39b4) )
+	ROM_LOAD( "mp7313", 0x0000, 0x1000, CRC(7a5016a9) SHA1(a8730dc8a282ffaa3d89e675f371d43eb39f39b4) )
 
 	ROM_REGION( 867, "maincpu:mpla", 0 )
 	ROM_LOAD( "tms1100_default_mpla.pla", 0, 867, CRC(62445fc9) SHA1(d6297f2a4bc7a870b76cc498d19dbb0ce7d69fec) )
@@ -2159,7 +2243,7 @@ ROM_END
 
 ROM_START( splitsec )
 	ROM_REGION( 0x1000, "maincpu", 0 )
-	ROM_LOAD( "tms1400nll_mp7314", 0x0000, 0x1000, CRC(e94b2098) SHA1(f0fc1f56a829252185592a2508740354c50bedf8) )
+	ROM_LOAD( "mp7314", 0x0000, 0x1000, CRC(e94b2098) SHA1(f0fc1f56a829252185592a2508740354c50bedf8) )
 
 	ROM_REGION( 867, "maincpu:mpla", 0 )
 	ROM_LOAD( "tms1100_default_mpla.pla", 0, 867, CRC(62445fc9) SHA1(d6297f2a4bc7a870b76cc498d19dbb0ce7d69fec) )
@@ -2180,7 +2264,7 @@ ROM_END
 
 ROM_START( unk3403 )
 	ROM_REGION( 0x0800, "maincpu", 0 )
-	ROM_LOAD( "tms1100nll_mp3403", 0x0000, 0x0800, CRC(9eabaa7d) SHA1(b1f54587ed7f2bbf3a5d49075c807296384c2b06) )
+	ROM_LOAD( "mp3403", 0x0000, 0x0800, CRC(9eabaa7d) SHA1(b1f54587ed7f2bbf3a5d49075c807296384c2b06) )
 
 	ROM_REGION( 867, "maincpu:mpla", 0 )
 	ROM_LOAD( "tms1100_default_mpla.pla", 0, 867, BAD_DUMP CRC(62445fc9) SHA1(d6297f2a4bc7a870b76cc498d19dbb0ce7d69fec) ) // not verified