From 95832c8646f00fc99d64e7236d88a6dcb12b1068 Mon Sep 17 00:00:00 2001
From: hap <happppp@users.noreply.github.com>
Date: Fri, 24 Nov 2023 19:46:25 +0100
Subject: tking: change button ordering, small tweak to internal artwork

---
 src/mame/layout/saitek_corona.lay   |  2 +-
 src/mame/layout/saitek_sstar28k.lay | 12 ++---
 src/mame/layout/saitek_stratos.lay  | 18 ++++----
 src/mame/layout/saitek_tking.lay    | 91 ++++++++++++++++++-------------------
 src/mame/layout/saitek_tstar432.lay | 12 ++---
 src/mame/saitek/stratos.cpp         | 40 ++++++++++++++--
 6 files changed, 100 insertions(+), 75 deletions(-)

diff --git a/src/mame/layout/saitek_corona.lay b/src/mame/layout/saitek_corona.lay
index 4c6fa286221..7bd404a9571 100644
--- a/src/mame/layout/saitek_corona.lay
+++ b/src/mame/layout/saitek_corona.lay
@@ -581,7 +581,7 @@ license:CC0-1.0
 <!-- build screen -->
 
 	<view name="Internal Layout">
-		<bounds left="-2.5" right="103" top="8.5" bottom="102" />
+		<bounds left="-3" right="103" top="8.5" bottom="102" />
 
 		<group ref="sb_board"><bounds x="10" y="10" width="80" height="80" /></group>
 		<group ref="sb_ui"><bounds x="-1.5" y="10" width="10" height="80" /></group>
diff --git a/src/mame/layout/saitek_sstar28k.lay b/src/mame/layout/saitek_sstar28k.lay
index ebcaac6597f..49068e16125 100644
--- a/src/mame/layout/saitek_sstar28k.lay
+++ b/src/mame/layout/saitek_sstar28k.lay
@@ -373,8 +373,7 @@ license:CC0-1.0
 		<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
 		<group ref="sb_ui"><bounds x="-11" y="3" width="10" height="80" /></group>
 
-	<!-- chessboard coords (actually, real board does not have this, but I like having them around) -->
-
+		<!-- chessboard coords (actually, real board does not have this, but I like having them around) -->
 		<element ref="text_8"><bounds x="0.3" y="7"  width="2" height="2" /></element>
 		<element ref="text_7"><bounds x="0.3" y="17" width="2" height="2" /></element>
 		<element ref="text_6"><bounds x="0.3" y="27" width="2" height="2" /></element>
@@ -393,8 +392,7 @@ license:CC0-1.0
 		<element ref="text_g"><bounds x="68" y="85.0" width="2" height="2" /></element>
 		<element ref="text_h"><bounds x="78" y="85.0" width="2" height="2" /></element>
 
-	<!-- chessboard leds -->
-
+		<!-- chessboard leds -->
 		<element name="7.1" ref="ledr"><bounds x="2.4" y="7"  width="0.8" height="2" /></element>
 		<element name="6.1" ref="ledr"><bounds x="2.4" y="17" width="0.8" height="2" /></element>
 		<element name="5.1" ref="ledr"><bounds x="2.4" y="27" width="0.8" height="2" /></element>
@@ -413,8 +411,7 @@ license:CC0-1.0
 		<element name="6.0" ref="ledr"><bounds x="68" y="83.8" width="2" height="0.8" /></element>
 		<element name="7.0" ref="ledr"><bounds x="78" y="83.8" width="2" height="0.8" /></element>
 
-	<!-- right side leds -->
-
+		<!-- right side leds -->
 		<element name="9.0" ref="ledr"><bounds x="88" y="37" width="0.8" height="2" /></element>
 		<element name="9.1" ref="ledr"><bounds x="88" y="41" width="0.8" height="2" /></element>
 		<element name="9.2" ref="ledr"><bounds x="88" y="45" width="0.8" height="2" /></element>
@@ -449,8 +446,7 @@ license:CC0-1.0
 		<element ref="text_l5"><bounds x="89.5" y="77.2" width="6" height="1.5" /></element>
 		<element ref="text_l6"><bounds x="89.5" y="81.2" width="6" height="1.5" /></element>
 
-	<!-- right side buttons -->
-
+		<!-- right side buttons -->
 		<element ref="text_p1"><bounds x="99.5" y="36.3" width="3" height="3" /></element>
 		<element ref="text_p2"><bounds x="99.5" y="40.3" width="3" height="3" /></element>
 		<element ref="text_p3"><bounds x="99.5" y="44.3" width="3" height="3" /></element>
diff --git a/src/mame/layout/saitek_stratos.lay b/src/mame/layout/saitek_stratos.lay
index 64744576329..4bd5ed5e7a7 100644
--- a/src/mame/layout/saitek_stratos.lay
+++ b/src/mame/layout/saitek_stratos.lay
@@ -560,7 +560,7 @@ license:CC0-1.0
 <!-- build screen -->
 
 	<view name="Internal Layout">
-		<bounds left="-4" right="103" top="8.5" bottom="103" />
+		<bounds left="-4.5" right="103" top="8.5" bottom="103" />
 
 		<group ref="sb_board"><bounds x="10" y="10" width="80" height="80" /></group>
 		<group ref="sb_ui"><bounds x="-3" y="10" width="10" height="80" /></group>
@@ -570,14 +570,14 @@ license:CC0-1.0
 		<group ref="lcd2"><bounds x="25.14" y="97.5714" width="3.42857" height="3.42857" /></group>
 
 		<!-- chessboard leds -->
-		<element ref="ledo"><bounds x="8.6" y="14.15" width="0.7" height="1.8" /></element>
-		<element ref="ledo"><bounds x="8.6" y="24.15" width="0.7" height="1.8" /></element>
-		<element ref="ledo"><bounds x="8.6" y="34.15" width="0.7" height="1.8" /></element>
-		<element ref="ledo"><bounds x="8.6" y="44.15" width="0.7" height="1.8" /></element>
-		<element ref="ledo"><bounds x="8.6" y="54.15" width="0.7" height="1.8" /></element>
-		<element ref="ledo"><bounds x="8.6" y="64.15" width="0.7" height="1.8" /></element>
-		<element ref="ledo"><bounds x="8.6" y="74.15" width="0.7" height="1.8" /></element>
-		<element ref="ledo"><bounds x="8.6" y="84.15" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="14.1" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="24.1" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="34.1" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="44.1" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="54.1" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="64.1" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="74.1" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="84.1" width="0.7" height="1.8" /></element>
 
 		<element ref="ledr" name="2.7" blend="add"><bounds x="8.6" y="14.1" width="0.7" height="1.8" /></element>
 		<element ref="ledr" name="2.6" blend="add"><bounds x="8.6" y="24.1" width="0.7" height="1.8" /></element>
diff --git a/src/mame/layout/saitek_tking.lay b/src/mame/layout/saitek_tking.lay
index f025e5e3f52..155038e6147 100644
--- a/src/mame/layout/saitek_tking.lay
+++ b/src/mame/layout/saitek_tking.lay
@@ -18,8 +18,10 @@ license:CC0-1.0
 		<rect state="1"><color red="0" green="1" blue="0" /></rect>
 	</element>
 	<element name="ledp" defstate="0">
-		<rect state="0"><color red="0.1" green="0.1" blue="0.1" /></rect>
-		<rect state="1"><color red="1.0" green="0.1" blue="0.1" /></rect>
+		<rect state="0"><bounds x="0.15" y="0" width="0.3" height="1.2" /><color red="0.1" green="0.1" blue="0.1" /></rect>
+		<rect state="0"><bounds x="0" y="0.45" width="0.6" height="0.3" /><color red="0.1" green="0.1" blue="0.1" /></rect>
+		<rect state="1"><bounds x="0.15" y="0" width="0.3" height="1.2" /><color red="1" green="0.1" blue="0.1" /></rect>
+		<rect state="1"><bounds x="0" y="0.45" width="0.6" height="0.3" /><color red="1" green="0.1" blue="0.1" /></rect>
 	</element>
 
 	<element name="ledrf">
@@ -562,17 +564,17 @@ license:CC0-1.0
 		<bounds x="1.5" y="-10" width="33.5" height="64" />
 		<element ref="cwhite"><bounds x="1.5" y="-10" width="33.5" height="64" /></element>
 
-		<element ref="text_rn1"><bounds x="2.3" y="1.9" width="2" height="1.4" /></element>
-		<element ref="text_rn2"><bounds x="2.3" y="5.9" width="2" height="1.4" /></element>
-		<element ref="text_rn3"><bounds x="2.3" y="9.9" width="2" height="1.4" /></element>
-		<element ref="text_rn4"><bounds x="2.3" y="13.9" width="2" height="1.4" /></element>
-		<element ref="text_rn5"><bounds x="2.3" y="17.9" width="2" height="1.4" /></element>
-		<element ref="text_rn6"><bounds x="2.3" y="21.9" width="2" height="1.4" /></element>
+		<element ref="text_rn1"><bounds x="2.3" y="1.9" width="2" height="1.3" /></element>
+		<element ref="text_rn2"><bounds x="2.3" y="5.9" width="2" height="1.3" /></element>
+		<element ref="text_rn3"><bounds x="2.3" y="9.9" width="2" height="1.3" /></element>
+		<element ref="text_rn4"><bounds x="2.3" y="13.9" width="2" height="1.3" /></element>
+		<element ref="text_rn5"><bounds x="2.3" y="17.9" width="2" height="1.3" /></element>
+		<element ref="text_rn6"><bounds x="2.3" y="21.9" width="2" height="1.3" /></element>
 
-		<element ref="text_rl1"><bounds x="7" y="25.9" width="7" height="1.4" /></element>
-		<element ref="text_rl2"><bounds x="7" y="29.9" width="7" height="1.4" /></element>
-		<element ref="text_rl3"><bounds x="7" y="45.9" width="7" height="1.4" /></element>
-		<element ref="text_rl4"><bounds x="7" y="49.9" width="7" height="1.4" /></element>
+		<element ref="text_rl1"><bounds x="7" y="25.9" width="7" height="1.3" /></element>
+		<element ref="text_rl2"><bounds x="7" y="29.9" width="7" height="1.3" /></element>
+		<element ref="text_rl3"><bounds x="7" y="45.9" width="7" height="1.3" /></element>
+		<element ref="text_rl4"><bounds x="7" y="49.9" width="7" height="1.3" /></element>
 
 		<element ref="text_rlm"><bounds x="2.1" y="37.9" width="2.4" height="2.2" /></element>
 		<element ref="text_rlp"><bounds x="2.4" y="45.9" width="2" height="2" /></element>
@@ -580,22 +582,22 @@ license:CC0-1.0
 		<element ref="text_rlp"><bounds x="3.5" y="49.6" width="1" height="1.5" /></element>
 		<element ref="text_rle"><bounds x="2.83" y="50.7" width="1" height="1.5" /></element>
 
-		<element ref="text_rb1"><bounds x="15.3" y="24.4" width="7" height="1.7" /></element>
-		<element ref="text_rb2"><bounds x="15.3" y="28.6" width="7" height="1.4" /></element>
-		<element ref="text_rb3"><bounds x="15.3" y="32.6" width="7" height="1.4" /></element>
-		<element ref="text_rb4"><bounds x="15.3" y="36.6" width="7" height="1.4" /></element>
-		<element ref="text_rb5"><bounds x="15.3" y="40.6" width="7" height="1.4" /></element>
-		<element ref="text_rb6"><bounds x="15.3" y="44.6" width="7" height="1.4" /></element>
-		<element ref="text_rb7"><bounds x="15.3" y="48.6" width="7" height="1.4" /></element>
-
-		<element ref="text_rb8"><bounds x="26.3" y="20.6" width="7" height="1.4" /></element>
-		<element ref="text_rb9"><bounds x="26.3" y="24.4" width="7" height="1.7" /></element>
-		<element ref="text_rb10"><bounds x="26.3" y="28.6" width="7" height="1.4" /></element>
-		<element ref="text_rb11"><bounds x="26.3" y="32.6" width="7" height="1.4" /></element>
-		<element ref="text_rb12"><bounds x="26.3" y="36.6" width="7" height="1.4" /></element>
-		<element ref="text_rb13"><bounds x="26.3" y="40.6" width="7" height="1.4" /></element>
-		<element ref="text_rb14"><bounds x="26.3" y="44.6" width="7" height="1.4" /></element>
-		<element ref="text_rb15"><bounds x="26.3" y="48.6" width="7" height="1.4" /></element>
+		<element ref="text_rb1"><bounds x="15.15" y="24.45" width="7" height="1.6" /></element>
+		<element ref="text_rb2"><bounds x="15.15" y="28.65" width="7" height="1.3" /></element>
+		<element ref="text_rb3"><bounds x="15.15" y="32.65" width="7" height="1.3" /></element>
+		<element ref="text_rb4"><bounds x="15.15" y="36.65" width="7" height="1.3" /></element>
+		<element ref="text_rb5"><bounds x="15.15" y="40.65" width="7" height="1.3" /></element>
+		<element ref="text_rb6"><bounds x="15.15" y="44.65" width="7" height="1.3" /></element>
+		<element ref="text_rb7"><bounds x="15.15" y="48.65" width="7" height="1.3" /></element>
+
+		<element ref="text_rb8"><bounds x="26.15" y="20.65" width="7" height="1.3" /></element>
+		<element ref="text_rb9"><bounds x="26.15" y="24.45" width="7" height="1.6" /></element>
+		<element ref="text_rb10"><bounds x="26.15" y="28.65" width="7" height="1.3" /></element>
+		<element ref="text_rb11"><bounds x="26.15" y="32.65" width="7" height="1.3" /></element>
+		<element ref="text_rb12"><bounds x="26.15" y="36.65" width="7" height="1.3" /></element>
+		<element ref="text_rb13"><bounds x="26.15" y="40.65" width="7" height="1.3" /></element>
+		<element ref="text_rb14"><bounds x="26.15" y="44.65" width="7" height="1.3" /></element>
+		<element ref="text_rb15"><bounds x="26.15" y="48.65" width="7" height="1.3" /></element>
 
 		<element ref="blackb"><bounds x="5" y="2" width="0.8" height="2" /></element>
 		<element ref="blackb"><bounds x="5" y="6" width="0.8" height="2" /></element>
@@ -618,7 +620,6 @@ license:CC0-1.0
 		<element ref="ledo"><bounds x="5.1" y="26.4" width="0.6" height="1.2" /></element>
 		<element ref="ledo"><bounds x="5.1" y="30.4" width="0.6" height="1.2" /></element>
 		<element ref="ledo"><bounds x="5.1" y="38.4" width="0.6" height="1.2" /></element>
-		<element ref="ledo"><bounds x="5.1" y="46.4" width="0.6" height="1.2" /></element>
 		<element ref="ledo"><bounds x="5.1" y="50.4" width="0.6" height="1.2" /></element>
 
 		<element ref="ledg" name="1.7" blend="add"><bounds x="5.1" y="2.4" width="0.6" height="1.2" /></element>
@@ -638,9 +639,8 @@ license:CC0-1.0
 		<element ref="ledr" name="0.1" blend="add"><bounds x="5.1" y="26.4" width="0.6" height="1.2" /></element>
 		<element ref="ledr" name="1.1" blend="add"><bounds x="5.1" y="30.4" width="0.6" height="1.2" /></element>
 		<element ref="ledr" name="0.8" blend="add"><bounds x="5.1" y="38.4" width="0.6" height="1.2" /></element>
-		<element ref="ledr" name="0.0" blend="add"><bounds x="5.1" y="46.4" width="0.6" height="1.2" /></element>
-		<element ref="ledp" name="1.0"><bounds x="5.25" y="50.4" width="0.3" height="1.2" /></element>
-		<element ref="ledp" name="1.0"><bounds x="5.1" y="50.85" width="0.6" height="0.3" /></element>
+		<element ref="ledp" name="0.0"><bounds x="5.1" y="46.4" width="0.6" height="1.2" /></element>
+		<element ref="ledr" name="1.0" blend="add"><bounds x="5.1" y="50.4" width="0.6" height="1.2" /></element>
 
 		<element ref="blackb"><bounds x="13" y="34" width="0.8" height="2" /></element>
 		<element ref="blackb"><bounds x="13" y="38" width="0.8" height="2" /></element>
@@ -702,33 +702,32 @@ license:CC0-1.0
 		<element ref="black2"><bounds x="9.5" y="15.8" width="5" height="0.2" /></element>
 		<element ref="black2"><bounds x="9.5" y="19.8" width="5" height="0.2" /></element>
 		<element ref="black2"><bounds x="9.5" y="23.8" width="5" height="0.2" /></element>
-
 	</group>
 
 
 <!-- build screen -->
 
 	<view name="Internal Layout">
-		<bounds left="-4" right="126.5" top="8.5" bottom="94" />
+		<bounds left="-4.5" right="127.5" top="8.5" bottom="94" />
 
 		<group ref="sb_board"><bounds x="10" y="10" width="80" height="80" /></group>
 		<group ref="sb_ui"><bounds x="-3" y="10" width="10" height="80" /></group>
 
-		<element ref="lcd_bg"><bounds x="96.5" y="11" width="15.36" height="9" /></element>
-		<group ref="lcd1"><bounds x="98.22" y="11.5" width="13.14" height="8" /></group>
-		<group ref="lcd2"><bounds x="97" y="16.0714" width="3.42857" height="3.42857" /></group>
+		<element ref="lcd_bg"><bounds x="97.5" y="11" width="15.36" height="9" /></element>
+		<group ref="lcd1"><bounds x="99.22" y="11.5" width="13.14" height="8" /></group>
+		<group ref="lcd2"><bounds x="98" y="16.0714" width="3.42857" height="3.42857" /></group>
 
-		<group ref="buttons"><bounds x="93" y="30" width="33.5" height="64" /></group>
+		<group ref="buttons"><bounds x="94" y="30" width="33.5" height="64" /></group>
 
 		<!-- chessboard leds -->
-		<element ref="ledo"><bounds x="8.6" y="14.15" width="0.7" height="1.8" /></element>
-		<element ref="ledo"><bounds x="8.6" y="24.15" width="0.7" height="1.8" /></element>
-		<element ref="ledo"><bounds x="8.6" y="34.15" width="0.7" height="1.8" /></element>
-		<element ref="ledo"><bounds x="8.6" y="44.15" width="0.7" height="1.8" /></element>
-		<element ref="ledo"><bounds x="8.6" y="54.15" width="0.7" height="1.8" /></element>
-		<element ref="ledo"><bounds x="8.6" y="64.15" width="0.7" height="1.8" /></element>
-		<element ref="ledo"><bounds x="8.6" y="74.15" width="0.7" height="1.8" /></element>
-		<element ref="ledo"><bounds x="8.6" y="84.15" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="14.1" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="24.1" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="34.1" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="44.1" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="54.1" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="64.1" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="74.1" width="0.7" height="1.8" /></element>
+		<element ref="ledo"><bounds x="8.6" y="84.1" width="0.7" height="1.8" /></element>
 
 		<element ref="ledr" name="2.7" blend="add"><bounds x="8.6" y="14.1" width="0.7" height="1.8" /></element>
 		<element ref="ledr" name="2.6" blend="add"><bounds x="8.6" y="24.1" width="0.7" height="1.8" /></element>
diff --git a/src/mame/layout/saitek_tstar432.lay b/src/mame/layout/saitek_tstar432.lay
index ccb07508756..01554918496 100644
--- a/src/mame/layout/saitek_tstar432.lay
+++ b/src/mame/layout/saitek_tstar432.lay
@@ -356,8 +356,7 @@ license:CC0-1.0
 		<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
 		<group ref="sb_ui"><bounds x="-11" y="3" width="10" height="80" /></group>
 
-	<!-- chessboard coords (actually, real board does not have this, but I like having them around) -->
-
+		<!-- chessboard coords (actually, real board does not have this, but I like having them around) -->
 		<element ref="text_8"><bounds x="0.3" y="7"  width="2" height="2" /></element>
 		<element ref="text_7"><bounds x="0.3" y="17" width="2" height="2" /></element>
 		<element ref="text_6"><bounds x="0.3" y="27" width="2" height="2" /></element>
@@ -376,8 +375,7 @@ license:CC0-1.0
 		<element ref="text_g"><bounds x="68" y="85.0" width="2" height="2" /></element>
 		<element ref="text_h"><bounds x="78" y="85.0" width="2" height="2" /></element>
 
-	<!-- chessboard leds -->
-
+		<!-- chessboard leds -->
 		<element name="7.1" ref="ledr"><bounds x="2.4" y="7"  width="0.8" height="2" /></element>
 		<element name="6.1" ref="ledr"><bounds x="2.4" y="17" width="0.8" height="2" /></element>
 		<element name="5.1" ref="ledr"><bounds x="2.4" y="27" width="0.8" height="2" /></element>
@@ -396,8 +394,7 @@ license:CC0-1.0
 		<element name="6.0" ref="ledr"><bounds x="68" y="83.8" width="2" height="0.8" /></element>
 		<element name="7.0" ref="ledr"><bounds x="78" y="83.8" width="2" height="0.8" /></element>
 
-	<!-- right side leds -->
-
+		<!-- right side leds -->
 		<element name="9.0" ref="ledr"><bounds x="88" y="37" width="0.8" height="2" /></element>
 		<element name="9.1" ref="ledr"><bounds x="88" y="41" width="0.8" height="2" /></element>
 		<element name="9.2" ref="ledr"><bounds x="88" y="45" width="0.8" height="2" /></element>
@@ -432,8 +429,7 @@ license:CC0-1.0
 		<element ref="text_l5"><bounds x="89.5" y="77.2" width="6" height="1.5" /></element>
 		<element ref="text_l6"><bounds x="89.5" y="81.2" width="6" height="1.5" /></element>
 
-	<!-- right side buttons -->
-
+		<!-- right side buttons -->
 		<element ref="text_p1"><bounds x="99.5" y="36.3" width="3" height="3" /></element>
 		<element ref="text_p2"><bounds x="99.5" y="40.3" width="3" height="3" /></element>
 		<element ref="text_p3"><bounds x="99.5" y="44.3" width="3" height="3" /></element>
diff --git a/src/mame/saitek/stratos.cpp b/src/mame/saitek/stratos.cpp
index 7b3d745e744..8a81ff76ec1 100644
--- a/src/mame/saitek/stratos.cpp
+++ b/src/mame/saitek/stratos.cpp
@@ -437,9 +437,43 @@ static INPUT_PORTS_START( stratos )
 	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_CUSTOM) PORT_READ_LINE_DEVICE_MEMBER(DEVICE_SELF, stratos_state, lcd_ready_r)
 INPUT_PORTS_END
 
-static INPUT_PORTS_START( tking2 )
+static INPUT_PORTS_START( tking ) // same buttons, but different locations
 	PORT_INCLUDE( stratos )
 
+	PORT_MODIFY("IN.0")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_T) PORT_NAME("Set Up")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_G) PORT_CODE(KEYCODE_L) PORT_NAME("Level")
+
+	PORT_MODIFY("IN.1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_W) PORT_NAME("Sound")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_J) PORT_NAME("Stop")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_K) PORT_CODE(KEYCODE_N) PORT_NAME("New Game")
+
+	PORT_MODIFY("IN.4")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_F) PORT_NAME("Play Normal")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_A) PORT_NAME("Tab / Color")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_S) PORT_CODE(KEYCODE_MINUS) PORT_CODE(KEYCODE_MINUS_PAD) PORT_NAME("-")
+
+	PORT_MODIFY("IN.5")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_Q) PORT_CODE(KEYCODE_EQUALS) PORT_CODE(KEYCODE_PLUS_PAD) PORT_NAME("+")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_D) PORT_NAME("Function")
+
+	PORT_MODIFY("IN.6")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_H) PORT_NAME("Library")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_U) PORT_NAME("Info")
+
+	PORT_MODIFY("IN.7")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_R) PORT_NAME("Analysis")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_E) PORT_NAME("Normal")
+
+	PORT_MODIFY("RESET")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_Y) PORT_CHANGED_MEMBER(DEVICE_SELF, saitek_stratos_state, go_button, 0) PORT_NAME("Go")
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( tking2 )
+	PORT_INCLUDE( tking )
+
 	PORT_MODIFY("IN.5")
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_CUSTOM)
 
@@ -544,5 +578,5 @@ SYST( 1987, stratos,  0,       0,      stratos, stratos, stratos_state, empty_in
 SYST( 1987, stratosa, stratos, 0,      stratos, stratos, stratos_state, empty_init, "SciSys", "Kasparov Stratos (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
 
 SYST( 1990, tking,    stratos, 0,      tking2,  tking2,  stratos_state, empty_init, "Saitek", "Kasparov Turbo King (ver. D)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // aka Turbo King II
-SYST( 1988, tkinga,   stratos, 0,      tking,   stratos, stratos_state, empty_init, "Saitek", "Kasparov Turbo King (ver. B, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-SYST( 1988, tkingb,   stratos, 0,      tking,   stratos, stratos_state, empty_init, "Saitek", "Kasparov Turbo King (ver. B, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+SYST( 1988, tkinga,   stratos, 0,      tking,   tking,   stratos_state, empty_init, "Saitek", "Kasparov Turbo King (ver. B, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+SYST( 1988, tkingb,   stratos, 0,      tking,   tking,   stratos_state, empty_init, "Saitek", "Kasparov Turbo King (ver. B, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-- 
cgit v1.2.3