summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-06-12 16:32:39 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-06-12 16:32:39 +0000
commit72a6f91a8cbd2c5b224de644eef50ef014f652f4 (patch)
tree5da346c32e62f40a4d248a8f9b9e937c55f1f590 /src
parentf874100bc9e1f74f5689a2fb7838e4750066b6fa (diff)
From: Fabio Priuli [mailto:doge.fabio@gmail.com]
Subject: fix for MT bug #01885 I tested almost every set I changed, but it seems I missed astdelux. Here there's a fix. Sorry. Regards Fabio
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/asteroid.c10
-rw-r--r--src/mame/machine/asteroid.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mame/drivers/asteroid.c b/src/mame/drivers/asteroid.c
index 7342dd32954..57c7b83ae62 100644
--- a/src/mame/drivers/asteroid.c
+++ b/src/mame/drivers/asteroid.c
@@ -310,7 +310,7 @@ static INPUT_PORTS_START( asteroid )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_CODE(KEYCODE_RIGHT) PORT_CODE(JOYCODE_X_RIGHT_SWITCH)/* right */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_CODE(KEYCODE_LEFT) PORT_CODE(JOYCODE_X_LEFT_SWITCH) /* left */
- PORT_START_TAG("DSW")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x00, DEF_STR( Language ) ) PORT_DIPLOCATION("SW:1,2")
PORT_DIPSETTING ( 0x00, DEF_STR( English ) )
PORT_DIPSETTING ( 0x01, DEF_STR( German ) )
@@ -356,7 +356,7 @@ static INPUT_PORTS_START( asteroib )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN2 )
PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(JOYCODE_BUTTON1) /* fire */
- PORT_MODIFY("DSW")
+ PORT_MODIFY("DSW1")
PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "SW:4" )
PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "SW:5" )
PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "SW:6" )
@@ -379,7 +379,7 @@ static INPUT_PORTS_START( asterock )
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT )
PORT_SERVICE( 0x80, IP_ACTIVE_LOW )
- PORT_MODIFY("DSW")
+ PORT_MODIFY("DSW1")
PORT_DIPNAME( 0x03, 0x03, DEF_STR( Language ) ) PORT_DIPLOCATION("SW:1,2")
PORT_DIPSETTING( 0x00, DEF_STR( English ) )
PORT_DIPSETTING( 0x01, DEF_STR( French ) )
@@ -512,7 +512,7 @@ static INPUT_PORTS_START( llander )
PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_CODE(KEYCODE_RIGHT) PORT_CODE(JOYCODE_X_RIGHT_SWITCH) /* right */
PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_CODE(KEYCODE_LEFT) PORT_CODE(JOYCODE_X_LEFT_SWITCH) /* left */
- PORT_START_TAG("DSW")
+ PORT_START_TAG("DSW1")
PORT_DIPNAME( 0x03, 0x00, "Right Coin" ) PORT_DIPLOCATION("P8:1,2") /* "Left Coin Mech always registers X 1" */
PORT_DIPSETTING ( 0x00, "X 1" )
PORT_DIPSETTING ( 0x01, "X 4" )
@@ -548,7 +548,7 @@ INPUT_PORTS_END
static INPUT_PORTS_START( llander1 )
PORT_INCLUDE( llander )
- PORT_MODIFY("DSW")
+ PORT_MODIFY("DSW1")
PORT_DIPNAME( 0x10, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("P8:5") /* "Left Coin Mech always registers X 1" */
PORT_DIPSETTING ( 0x00, DEF_STR( Normal ) )
PORT_DIPSETTING ( 0x10, DEF_STR( Free_Play ) )
diff --git a/src/mame/machine/asteroid.c b/src/mame/machine/asteroid.c
index 2dc4c7995e1..841c0331b07 100644
--- a/src/mame/machine/asteroid.c
+++ b/src/mame/machine/asteroid.c
@@ -122,7 +122,7 @@ READ8_HANDLER( asteroid_DSW1_r )
int res;
int res1;
- res1 = input_port_read(machine, "DSW");
+ res1 = input_port_read(machine, "DSW1");
res = 0xfc | ((res1 >> (2 * (3 - (offset & 0x3)))) & 0x3);
return res;