diff options
Diffstat (limited to 'src/mame/drivers/quasar.c')
-rw-r--r-- | src/mame/drivers/quasar.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c index 1115910f2bd..48457e41c63 100644 --- a/src/mame/drivers/quasar.c +++ b/src/mame/drivers/quasar.c @@ -112,10 +112,10 @@ static READ8_HANDLER( quasar_IO_r ) { UINT8 ans = 0; - if (IOpage == 0) ans = input_port_read_indexed(machine,0); - if (IOpage == 1) ans = input_port_read_indexed(machine,1); - if (IOpage == 2) ans = input_port_read_indexed(machine,2); - if (IOpage == 3) ans = input_port_read_indexed(machine,3); + if (IOpage == 0) ans = input_port_read(machine, "IN0"); + if (IOpage == 1) ans = input_port_read(machine, "IN1"); + if (IOpage == 2) ans = input_port_read(machine, "DSW0"); + if (IOpage == 3) ans = input_port_read(machine, "DSW1"); return ans; } @@ -147,10 +147,10 @@ static READ8_HANDLER( quasar_sh_command_r ) Quasar_T1 = 0; // Testing ... - // return input_port_read_indexed(machine,5); + // return input_port_read(machine, "DSW2"); // Add in sound DIP switch - return (Quasar_Command) + (input_port_read_indexed(machine, 5) & 0x30); + return (Quasar_Command) + (input_port_read(machine, "DSW2") & 0x30); } static READ8_HANDLER( Quasar_T1_r ) @@ -183,7 +183,7 @@ static ADDRESS_MAP_START( quasar_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x08, 0x0b) AM_WRITE(io_page_select_w) AM_RANGE(S2650_DATA_PORT, S2650_DATA_PORT) AM_READWRITE(cvs_collision_clear, quasar_sh_command_w) AM_RANGE(S2650_CTRL_PORT, S2650_CTRL_PORT) AM_READWRITE(cvs_collision_r, SMH_NOP) - AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ(input_port_4_r) + AM_RANGE(S2650_SENSE_PORT, S2650_SENSE_PORT) AM_READ_PORT("SENSE") ADDRESS_MAP_END /************************************* @@ -218,7 +218,7 @@ ADDRESS_MAP_END ************************************************************************/ static INPUT_PORTS_START( quasar ) - PORT_START /* Controls 0 */ + PORT_START_TAG("IN0") /* Controls 0 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -228,7 +228,7 @@ static INPUT_PORTS_START( quasar ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) /* switch collaudo */ - PORT_START /* Controls 1 */ + PORT_START_TAG("IN1") /* Controls 1 */ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON4 ) /* tavalino */ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_COCKTAIL PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) @@ -238,7 +238,7 @@ static INPUT_PORTS_START( quasar ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START3 ) /* count enable */ - PORT_START /* DSW0 */ + PORT_START_TAG("DSW0") /* DSW0 */ PORT_DIPNAME( 0x0c, 0x04, DEF_STR( Coin_A ) ) /* confirmed */ PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x04, DEF_STR( 1C_1C ) ) @@ -261,7 +261,7 @@ static INPUT_PORTS_START( quasar ) PORT_DIPSETTING( 0x00, "Collisions excluded" ) PORT_DIPSETTING( 0x80, "Collisions included" ) - PORT_START /* DSW1 */ + PORT_START_TAG("DSW1") /* DSW1 */ PORT_DIPNAME( 0x07, 0x01, "High Score" ) PORT_DIPSETTING( 0x00, "No H.S." ) // this option only wants bit 0 OFF PORT_DIPSETTING( 0x01, "Normal H.S." ) @@ -282,10 +282,10 @@ static INPUT_PORTS_START( quasar ) PORT_DIPSETTING( 0x80, "Stop at edge" ) PORT_DIPSETTING( 0x00, "Wrap Around" ) - PORT_START /* SENSE */ + PORT_START_TAG("SENSE") /* SENSE */ PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK ) - PORT_START // Sound DIP switch + PORT_START_TAG("DSW2") /* Sound DIP switch */ #if 0 PORT_DIPNAME( 0x0f, 0x00, "Noise to play" ) PORT_DIPSETTING( 0x00, "00" ) |