summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-07-24 05:24:28 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-07-24 05:24:28 +0000
commit688829379196674491faeaa6bb52a8fec823df2a (patch)
tree3e6c6cf53632edd09a36ed9658ecb3bee504fd04
parente6da3368973ddc40e06ee2c5a50bfa21c5b847e5 (diff)
From: Fabio Priuli [mailto:doge.fabio@gmail.com]
Sent: Saturday, July 19, 2008 7:46 AM To: submit@mamedev.org Subject: a few bugfixes (or at least proposals of fix) Hi, enclosed please find the following patches for bugs currently in MAME (sorry for the verbose explanations, but I hope it makes faster the verification and not to steal too much time to the reviewer) correct fixes (IMHO) * harddriv.diff : Fixes a bug introduced in u7 which broke racedrvc, hdrivair and their clones (due to some tags not being renamed). Strange no one has noticed this (not even Firevawe when he ran its regtest before 0.126!), anyway now it's fixed... * gstrik2.diff : This patch fixes bug 1568. One of the two service mode keys doesn't give access to the service mode (and in fact it's not read at all in the input test in service mode). I changed it to an unknown dipswitch * atarijsa.diff : This changes the ports #defined in src/mame/audio/atarijsa.h to be EXTERNAL_INPUTS (and modifies accordingly the drivers using them). It allows to remove the SWAPPED version (modified locally in xybots.c) and it allowed me to fix half of bug 818 (duplicated coins in stunrun). Indeed, stunrun and steeltal use their own coin input and the jsa ones are not recognized in Service Mode. Therefore, I removed them through PORT_MODIFY. @Aaron: I left in COIN3, even if those games do not use it, maybe it can be made UNUSED as well proposals: * leland.diff : I noticed that the SERVICE MODE key in leland.c games doesn't do anything service related, but it simply adds a coin. This patch changes them to IPT_COIN3 (because this is the mapping of the same inputs for offroad and pigout). Actually, it could be an IPT_SERVICE1 (but I don't have currently access to any manual to verify it) or there could be a different bug in the driver causing the input to be read as a coin... If one of the latter options sounds more correct to you, please change the IPT or ignore this patch. [Note: this was changed to IPT_SERVICE1] * pc10.diff: This one fixes bug 595, i.e. Start button in playch10.c is currently mapped to key "2". This could be by design, but it's a bit confusing since it works the other way around in vsnes.c. If it was by design and you don't plan to change it, please post at MameTesters so that we can close the report as Not-a-bug. * twotiger.diff : This addresses bug 1448. The wheel is completely centered for any value in the (closed) interval [0x64, 0x69] (goes to left for 0x63 and to right for 0x70). I've chosen 0x67 because it's in between, but I'm not sure 100% about the way analog inputs are managed in the core, so feel free to use another value in that range if it m akes more sense than 0x67. That's all. Thanks for the atention Regards, Fabio
-rw-r--r--src/mame/audio/atarijsa.c43
-rw-r--r--src/mame/audio/atarijsa.h48
-rw-r--r--src/mame/drivers/atarig1.c6
-rw-r--r--src/mame/drivers/atarig42.c4
-rw-r--r--src/mame/drivers/atarigx2.c6
-rw-r--r--src/mame/drivers/batman.c2
-rw-r--r--src/mame/drivers/beathead.c2
-rw-r--r--src/mame/drivers/blstroid.c2
-rw-r--r--src/mame/drivers/cyberbal.c2
-rw-r--r--src/mame/drivers/eprom.c6
-rw-r--r--src/mame/drivers/harddriv.c28
-rw-r--r--src/mame/drivers/leland.c62
-rw-r--r--src/mame/drivers/mcr.c4
-rw-r--r--src/mame/drivers/metro.c4
-rw-r--r--src/mame/drivers/offtwall.c2
-rw-r--r--src/mame/drivers/playch10.c4
-rw-r--r--src/mame/drivers/skullxbo.c2
-rw-r--r--src/mame/drivers/thunderj.c2
-rw-r--r--src/mame/drivers/toobin.c2
-rw-r--r--src/mame/drivers/vindictr.c2
-rw-r--r--src/mame/drivers/xybots.c6
21 files changed, 128 insertions, 111 deletions
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index c91e83f1a52..829c95ab621 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -925,3 +925,46 @@ MACHINE_DRIVER_START( jsa_iiis_stereo )
MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.75)
MACHINE_DRIVER_END
+
+
+/*************************************
+ *
+ * Port definitions
+ *
+ *************************************/
+
+INPUT_PORTS_START( atarijsa_i )
+ PORT_START_TAG("JSAI")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED ) /* speech chip ready */
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED ) /* output buffer full */
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* input buffer full */
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* self test */
+INPUT_PORTS_END
+
+INPUT_PORTS_START( atarijsa_ii )
+ PORT_START_TAG("JSAII")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 )
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED ) /* output buffer full */
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* input buffer full */
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* self test */
+INPUT_PORTS_END
+
+INPUT_PORTS_START( atarijsa_iii )
+ PORT_START_TAG("JSAIII")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_TILT )
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SERVICE )
+ PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED ) /* self test */
+ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED ) /* output buffer full */
+ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) /* input buffer full */
+ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* self test */
+INPUT_PORTS_END
diff --git a/src/mame/audio/atarijsa.h b/src/mame/audio/atarijsa.h
index cde62e318a7..64d0ac321e4 100644
--- a/src/mame/audio/atarijsa.h
+++ b/src/mame/audio/atarijsa.h
@@ -21,48 +21,6 @@ MACHINE_DRIVER_EXTERN( jsa_iiis_stereo );
/* Board-specific port definitions */
-#define JSA_I_PORT \
- PORT_START_TAG("JSAI") \
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) \
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) \
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 ) \
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) \
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED ) /* speech chip ready */\
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED ) /* output buffer full */\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* input buffer full */\
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* self test */
-
-/* used by Xybots */
-#define JSA_I_PORT_SWAPPED \
- PORT_START_TAG("JSAI") \
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 ) \
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 ) \
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 ) \
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) \
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED ) /* speech chip ready */\
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED ) /* output buffer full */\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* input buffer full */\
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* self test */
-
-#define JSA_II_PORT \
- PORT_START_TAG("JSAII") \
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 ) \
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN2 ) \
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN3 ) \
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED ) \
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED ) \
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED ) /* output buffer full */\
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED ) /* input buffer full */\
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* self test */
-
-#define JSA_III_PORT \
- PORT_START_TAG("JSAIII") \
- PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 ) \
- PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 ) \
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_TILT ) \
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SERVICE ) \
- PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED ) /* self test */\
- PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED ) /* output buffer full */\
- PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) /* input buffer full */\
- PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED ) /* self test */
-
+INPUT_PORTS_EXTERN( atarijsa_i );
+INPUT_PORTS_EXTERN( atarijsa_ii );
+INPUT_PORTS_EXTERN( atarijsa_iii );
diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c
index ed4259be7f0..5025f9896a8 100644
--- a/src/mame/drivers/atarig1.c
+++ b/src/mame/drivers/atarig1.c
@@ -275,7 +275,7 @@ static INPUT_PORTS_START( hydra )
PORT_START_TAG("ADC2") /* ADC 2 @ fc8000 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
- JSA_II_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_ii ) /* audio board port */
PORT_MODIFY( "JSAII" )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -320,7 +320,7 @@ static INPUT_PORTS_START( pitfight )
PORT_START_TAG("ADC2") /* not used */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- JSA_II_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_ii ) /* audio board port */
PORT_MODIFY( "JSAII" )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -358,7 +358,7 @@ static INPUT_PORTS_START( pitfighj )
PORT_START_TAG("ADC2") /* not used */
PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
- JSA_II_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_ii ) /* audio board port */
PORT_MODIFY( "JSAII" )
PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/atarig42.c b/src/mame/drivers/atarig42.c
index cf31d82ae12..99a89060c54 100644
--- a/src/mame/drivers/atarig42.c
+++ b/src/mame/drivers/atarig42.c
@@ -399,7 +399,7 @@ static INPUT_PORTS_START( roadriot )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- JSA_III_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_iii ) /* audio board port */
PORT_START_TAG("A2D0") /* analog 0 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
@@ -450,7 +450,7 @@ static INPUT_PORTS_START( guardian )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- JSA_III_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_iii ) /* audio board port */
PORT_START_TAG("A2D0") /* analog 0 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/atarigx2.c b/src/mame/drivers/atarigx2.c
index 95a5d2e55fb..353f6300348 100644
--- a/src/mame/drivers/atarigx2.c
+++ b/src/mame/drivers/atarigx2.c
@@ -1255,7 +1255,7 @@ static INPUT_PORTS_START( spclords )
PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_SPECIAL ) /* +5V */
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- JSA_III_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_iii ) /* audio board port */
PORT_START_TAG("A2D0") /* A2D @ 0xD00000 */
PORT_BIT ( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
@@ -1305,7 +1305,7 @@ static INPUT_PORTS_START( motofren )
PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_SPECIAL ) /* +5V */
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- JSA_III_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_iii ) /* audio board port */
PORT_START_TAG("A2D0") /* A2D @ 0xD00000 */
PORT_BIT( 0xff, 0x00, IPT_PEDAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(16)
@@ -1355,7 +1355,7 @@ static INPUT_PORTS_START( rrreveng )
PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_SPECIAL ) /* +5V */
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- JSA_III_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_iii ) /* audio board port */
PORT_START_TAG("A2D0") /* A2D @ 0xD00000 */
PORT_BIT ( 0x00ff, 0x0010, IPT_PEDAL ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
diff --git a/src/mame/drivers/batman.c b/src/mame/drivers/batman.c
index 01b4ebfc9ba..6bde32c53e0 100644
--- a/src/mame/drivers/batman.c
+++ b/src/mame/drivers/batman.c
@@ -190,7 +190,7 @@ static INPUT_PORTS_START( batman )
PORT_SERVICE( 0x0040, IP_ACTIVE_LOW )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_VBLANK )
- JSA_III_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_iii ) /* audio board port */
INPUT_PORTS_END
diff --git a/src/mame/drivers/beathead.c b/src/mame/drivers/beathead.c
index 4904361b977..22cf30029b1 100644
--- a/src/mame/drivers/beathead.c
+++ b/src/mame/drivers/beathead.c
@@ -395,7 +395,7 @@ static INPUT_PORTS_START( beathead )
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0xfff0, IP_ACTIVE_LOW, IPT_UNUSED )
- JSA_III_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_iii ) /* audio board port */
INPUT_PORTS_END
diff --git a/src/mame/drivers/blstroid.c b/src/mame/drivers/blstroid.c
index 5e0a370479f..f494e4b4f99 100644
--- a/src/mame/drivers/blstroid.c
+++ b/src/mame/drivers/blstroid.c
@@ -150,7 +150,7 @@ static INPUT_PORTS_START( blstroid )
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- JSA_I_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_i ) /* audio port */
INPUT_PORTS_END
diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c
index 350910a33df..cdd9c3272d0 100644
--- a/src/mame/drivers/cyberbal.c
+++ b/src/mame/drivers/cyberbal.c
@@ -352,7 +352,7 @@ static INPUT_PORTS_START( cyberb2p )
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_VBLANK )
PORT_SERVICE( 0x8000, IP_ACTIVE_LOW )
- JSA_II_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_ii ) /* audio board port */
INPUT_PORTS_END
diff --git a/src/mame/drivers/eprom.c b/src/mame/drivers/eprom.c
index a786028eaef..8dfe41bed83 100644
--- a/src/mame/drivers/eprom.c
+++ b/src/mame/drivers/eprom.c
@@ -281,7 +281,7 @@ static INPUT_PORTS_START( eprom )
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2)
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- JSA_I_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_i ) /* audio port */
INPUT_PORTS_END
@@ -313,7 +313,7 @@ static INPUT_PORTS_START( klaxp )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- JSA_II_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_ii ) /* audio board port */
INPUT_PORTS_END
@@ -355,7 +355,7 @@ static INPUT_PORTS_START( guts )
PORT_BIT( 0x00ff, 0x0080, IPT_AD_STICK_X ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) PORT_REVERSE
PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
- JSA_II_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_ii ) /* audio board port */
INPUT_PORTS_END
diff --git a/src/mame/drivers/harddriv.c b/src/mame/drivers/harddriv.c
index 4b91285523e..aca7cebe6bd 100644
--- a/src/mame/drivers/harddriv.c
+++ b/src/mame/drivers/harddriv.c
@@ -694,15 +694,15 @@ static INPUT_PORTS_START( racedrvc )
PORT_START_TAG("8BADC7") /* b00000 - 8 bit ADC 7 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("400000") /* 400000 - steering wheel */
+ PORT_START_TAG("12BADC0") /* 400000 - steering wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5)
/* dummy ADC ports to end up with the same number as the full version */
- PORT_START_TAG("12BADCX")
+ PORT_START_TAG("12BADC1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADCY")
+ PORT_START_TAG("12BADC2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADCZ")
+ PORT_START_TAG("12BADC3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
@@ -761,7 +761,11 @@ static INPUT_PORTS_START( stunrun )
PORT_START_TAG("12BADC3") /* b80000 - 12 bit ADC 3 */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- JSA_II_PORT /* audio port */
+ PORT_INCLUDE( atarijsa_ii ) /* audio board port */
+ /* stunrun has its own coins */
+ PORT_MODIFY("JSAII")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -820,7 +824,11 @@ static INPUT_PORTS_START( steeltal )
PORT_START_TAG("12BADC3") /* b80000 - 12 bit ADC 3 */
PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(10) PORT_PLAYER(2) /* rudder */
- JSA_III_PORT /* audio port */
+ PORT_INCLUDE( atarijsa_iii ) /* audio board port */
+ /* steeltal has its own coins */
+ PORT_MODIFY("JSAIII")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
INPUT_PORTS_END
@@ -937,15 +945,15 @@ static INPUT_PORTS_START( hdrivair )
PORT_START_TAG("8BADC7") /* b00000 - 8 bit ADC 7 - seat adjust */
PORT_BIT( 0xff, 0X80, IPT_UNUSED )
- PORT_START_TAG("400000") /* 400000 - steering wheel */
+ PORT_START_TAG("12BADC0") /* 400000 - steering wheel */
PORT_BIT( 0xff, 0x80, IPT_PADDLE ) PORT_MINMAX(0x10,0xf0) PORT_SENSITIVITY(25) PORT_KEYDELTA(5) PORT_REVERSE
/* dummy ADC ports to end up with the same number as the full version */
- PORT_START_TAG("12BADCX")
+ PORT_START_TAG("12BADC1")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADCY")
+ PORT_START_TAG("12BADC2")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_START_TAG("12BADCZ")
+ PORT_START_TAG("12BADC3")
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/leland.c b/src/mame/drivers/leland.c
index ee0a521bdc9..581a2796c33 100644
--- a/src/mame/drivers/leland.c
+++ b/src/mame/drivers/leland.c
@@ -29,12 +29,14 @@
****************************************************************************
To enter service mode in most games, press 1P start and then press
- the service switch (F2).
+ the service coin.
- For Redline Racer, hold the service switch down and reset the machine.
+ For Redline Racer, hold the service coin down and reset the machine.
For Super Offroad, press the blue nitro button (3P button 1) and then
- press the service switch.
+ press the service switch (F2).
+
+ For Pigout, press 1P start and then press the service switch (F2).
***************************************************************************/
@@ -122,7 +124,7 @@ ADDRESS_MAP_END
/* Helps document the input ports. */
#define IPT_SLAVEHALT IPT_SPECIAL
-#define IPT_eeprom_DATA IPT_SPECIAL
+#define IPT_EEPROM_DATA IPT_SPECIAL
static INPUT_PORTS_START( cerberus ) /* complete, verified from code */
@@ -133,7 +135,7 @@ static INPUT_PORTS_START( cerberus ) /* complete, verified from code */
PORT_START_TAG("IN1") /* 0x81 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
- PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -144,10 +146,10 @@ static INPUT_PORTS_START( cerberus ) /* complete, verified from code */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
PORT_START_TAG("IN3") /* 0x91 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_PLAYER(1)
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_PLAYER(1)
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START_TAG("AN0") /* Analog joystick 1 */
@@ -174,7 +176,7 @@ static INPUT_PORTS_START( mayhem ) /* complete, verified from code */
PORT_START_TAG("IN1") /* 0xC1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
- PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -190,7 +192,7 @@ static INPUT_PORTS_START( mayhem ) /* complete, verified from code */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
PORT_START_TAG("IN3") /* 0xD1 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
@@ -213,7 +215,7 @@ static INPUT_PORTS_START( wseries ) /* complete, verified from code */
PORT_START_TAG("IN1") /* 0x81 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
- PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -223,7 +225,7 @@ static INPUT_PORTS_START( wseries ) /* complete, verified from code */
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Aim") PORT_PLAYER(1)
PORT_START_TAG("IN3") /* 0x91 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_PLAYER(1)
@@ -250,7 +252,7 @@ static INPUT_PORTS_START( alleymas ) /* complete, verified from code */
PORT_START_TAG("IN1") /* 0xC1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
- PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -261,7 +263,7 @@ static INPUT_PORTS_START( alleymas ) /* complete, verified from code */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) /* redundant inputs */
PORT_START_TAG("IN3") /* 0xD1 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_PLAYER(1)
@@ -286,7 +288,7 @@ static INPUT_PORTS_START( upyoural ) /* complete, verified from code */
PORT_START_TAG("IN1") /* 0xC1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
- PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -297,7 +299,7 @@ static INPUT_PORTS_START( upyoural ) /* complete, verified from code */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
PORT_START_TAG("IN3") /* 0xD1 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_PLAYER(1)
@@ -323,7 +325,7 @@ static INPUT_PORTS_START( dangerz ) /* complete, verified from code */
PORT_START_TAG("IN1") /* 0x81 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
- PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -332,7 +334,7 @@ static INPUT_PORTS_START( dangerz ) /* complete, verified from code */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START_TAG("IN3") /* 0x91 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
@@ -354,7 +356,7 @@ static INPUT_PORTS_START( basebal2 ) /* complete, verified from code */
PORT_START_TAG("IN1") /* 0x41/C1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
- PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -367,7 +369,7 @@ static INPUT_PORTS_START( basebal2 ) /* complete, verified from code */
PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Run/Cutoff") PORT_PLAYER(1)
PORT_START_TAG("IN3") /* 0x51/D1 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 ) PORT_PLAYER(1)
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 ) PORT_PLAYER(1)
@@ -393,7 +395,7 @@ static INPUT_PORTS_START( redline ) /* complete, verified in code */
PORT_START_TAG("IN1") /* 0xC1 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
- PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0x70, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -404,7 +406,7 @@ static INPUT_PORTS_START( redline ) /* complete, verified in code */
PORT_BIT( 0xe0, 0x00, IPT_PEDAL ) PORT_MINMAX(0x00,0xe0) PORT_SENSITIVITY(100) PORT_KEYDELTA(64) PORT_PLAYER(2)
PORT_START_TAG("IN3") /* 0xD1 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
@@ -426,7 +428,7 @@ static INPUT_PORTS_START( quarterb ) /* complete, verified in code */
PORT_START_TAG("IN1") /* 0x81 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
- PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -442,7 +444,7 @@ static INPUT_PORTS_START( quarterb ) /* complete, verified in code */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_START_TAG("IN3") /* 0x91 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
@@ -468,7 +470,7 @@ static INPUT_PORTS_START( teamqb ) /* complete, verified in code */
PORT_START_TAG("IN1") /* 0x81 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
- PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -484,7 +486,7 @@ static INPUT_PORTS_START( teamqb ) /* complete, verified in code */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_START_TAG("IN3") /* 0x91 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
@@ -529,7 +531,7 @@ static INPUT_PORTS_START( aafb2p ) /* complete, verified in code */
PORT_START_TAG("IN1") /* 0x81 */
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SLAVEHALT )
- PORT_SERVICE_NO_TOGGLE( 0x02, IP_ACTIVE_LOW )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE1 )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -542,7 +544,7 @@ static INPUT_PORTS_START( aafb2p ) /* complete, verified in code */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
PORT_START_TAG("IN3") /* 0x91 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
@@ -597,7 +599,7 @@ static INPUT_PORTS_START( offroad ) /* complete, verified from code */
PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_START_TAG("IN3") /* 0xD1 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
PORT_SERVICE_NO_TOGGLE( 0x08, IP_ACTIVE_LOW )
@@ -647,7 +649,7 @@ static INPUT_PORTS_START( pigout ) /* complete, verified from code */
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
PORT_START_TAG("IN3") /* 0x51 */
- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_eeprom_DATA )
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_EEPROM_DATA )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_LOW )
PORT_BIT( 0xf8, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c
index fce222123e6..f1761f1f137 100644
--- a/src/mame/drivers/mcr.c
+++ b/src/mame/drivers/mcr.c
@@ -1134,10 +1134,10 @@ static INPUT_PORTS_START( twotiger )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
PORT_START_TAG("SSIO.IP1") /* J4 10-13,15-18 */
- PORT_BIT( 0xff, 0x72, IPT_AD_STICK_X ) PORT_MINMAX(0,228) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
+ PORT_BIT( 0xff, 0x67, IPT_AD_STICK_X ) PORT_MINMAX(0, 206) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
PORT_START_TAG("SSIO.IP2") /* J5 1-8 */
- PORT_BIT( 0xff, 0x72, IPT_AD_STICK_X ) PORT_MINMAX(0,228) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
+ PORT_BIT( 0xff, 0x67, IPT_AD_STICK_X ) PORT_MINMAX(0, 206) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
PORT_START_TAG("SSIO.IP3") /* DIPSW @ B3 */
PORT_DIPNAME( 0x01, 0x00, "Shot Speed" )
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 059cda1a628..511e48a2523 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -2595,7 +2595,9 @@ static INPUT_PORTS_START( gstrik2 )
PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Flip_Screen ) )
PORT_DIPSETTING( 0x4000, DEF_STR( Off ) )
PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_SERVICE_NO_TOGGLE(0x8000, IP_ACTIVE_LOW)
+ PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x8000, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x001f, 0x001f, DEF_STR( Coin_A ) )
diff --git a/src/mame/drivers/offtwall.c b/src/mame/drivers/offtwall.c
index 67377c7801f..3e7caddd953 100644
--- a/src/mame/drivers/offtwall.c
+++ b/src/mame/drivers/offtwall.c
@@ -339,7 +339,7 @@ static INPUT_PORTS_START( offtwall )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
- JSA_III_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_iii ) /* audio board port */
PORT_START_TAG("260010") /* 260010 */
PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c
index 1559bf19993..3e4a0373b7d 100644
--- a/src/mame/drivers/playch10.c
+++ b/src/mame/drivers/playch10.c
@@ -621,8 +621,8 @@ static INPUT_PORTS_START( playch10 )
PORT_START_TAG("P1")
PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P1 Button B")
PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P1 Button A")
- PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Game Select") PORT_CODE(KEYCODE_1)
- PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Start") PORT_CODE(KEYCODE_2)
+ PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Game Select")
+ PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start")
PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
diff --git a/src/mame/drivers/skullxbo.c b/src/mame/drivers/skullxbo.c
index 0a68e86eee1..395d86720d8 100644
--- a/src/mame/drivers/skullxbo.c
+++ b/src/mame/drivers/skullxbo.c
@@ -190,7 +190,7 @@ static INPUT_PORTS_START( skullxbo )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- JSA_II_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_ii ) /* audio board port */
INPUT_PORTS_END
diff --git a/src/mame/drivers/thunderj.c b/src/mame/drivers/thunderj.c
index c20a3f33a1e..459153a86a0 100644
--- a/src/mame/drivers/thunderj.c
+++ b/src/mame/drivers/thunderj.c
@@ -280,7 +280,7 @@ static INPUT_PORTS_START( thunderj )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
- JSA_II_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_ii ) /* audio board port */
INPUT_PORTS_END
diff --git a/src/mame/drivers/toobin.c b/src/mame/drivers/toobin.c
index b7295a54b65..d8bf51de4a3 100644
--- a/src/mame/drivers/toobin.c
+++ b/src/mame/drivers/toobin.c
@@ -173,7 +173,7 @@ static INPUT_PORTS_START( toobin )
PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_VBLANK )
PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
- JSA_I_PORT /* audio board port */
+ PORT_INCLUDE( atarijsa_i ) /* audio port */
INPUT_PORTS_END
diff --git a/src/mame/drivers/vindictr.c b/src/mame/drivers/vindictr.c
index 7d9eac8f0f7..e9d6429d3a6 100644
--- a/src/mame/drivers/vindictr.c
+++ b/src/mame/drivers/vindictr.c
@@ -144,7 +144,7 @@ static INPUT_PORTS_START( vindictr )
PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNUSED )
- JSA_I_PORT /* audio port */
+ PORT_INCLUDE( atarijsa_i ) /* audio port */
INPUT_PORTS_END
diff --git a/src/mame/drivers/xybots.c b/src/mame/drivers/xybots.c
index 2184fabc33f..99a17d23b06 100644
--- a/src/mame/drivers/xybots.c
+++ b/src/mame/drivers/xybots.c
@@ -138,7 +138,11 @@ static INPUT_PORTS_START( xybots )
PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_VBLANK ) /* VBLANK */
PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
- JSA_I_PORT_SWAPPED /* audio port */
+ PORT_INCLUDE( atarijsa_i ) /* audio port */
+ /* Xybots uses a swapped version */
+ PORT_MODIFY("JSAI")
+ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN2 )
+ PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 )
INPUT_PORTS_END