diff options
Diffstat (limited to 'src/mame/drivers/midas.c')
-rw-r--r-- | src/mame/drivers/midas.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c index 2fdfbf47acb..d13cd769020 100644 --- a/src/mame/drivers/midas.c +++ b/src/mame/drivers/midas.c @@ -180,7 +180,7 @@ static VIDEO_UPDATE( livequiz ) static READ16_HANDLER( livequiz_eeprom_r ) { - return input_port_read_indexed(machine, 2) | (eeprom_read_bit() << 3); + return input_port_read(machine, "IN2") | (eeprom_read_bit() << 3); } static WRITE16_HANDLER( livequiz_eeprom_w ) @@ -225,10 +225,10 @@ static WRITE16_HANDLER( livequiz_gfxregs_w ) static ADDRESS_MAP_START( mem_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x1fffff) AM_ROM - AM_RANGE(0x900000, 0x900001) AM_READ( input_port_5_word_r ) + AM_RANGE(0x900000, 0x900001) AM_READ_PORT("IN5") AM_RANGE(0x920000, 0x920001) AM_READ( livequiz_eeprom_r ) - AM_RANGE(0x940000, 0x940001) AM_READ( input_port_0_word_r ) - AM_RANGE(0x980000, 0x980001) AM_READ( input_port_1_word_r ) + AM_RANGE(0x940000, 0x940001) AM_READ_PORT("IN0") + AM_RANGE(0x980000, 0x980001) AM_READ_PORT("IN1") AM_RANGE(0x9a0000, 0x9a0001) AM_WRITE( livequiz_eeprom_w ) @@ -245,8 +245,8 @@ static ADDRESS_MAP_START( mem_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xb80008, 0xb80009) AM_WRITE( YMZ280B_register_0_lsb_w ) AM_RANGE(0xb8000a, 0xb8000b) AM_READWRITE( YMZ280B_status_0_lsb_r, YMZ280B_data_0_lsb_w ) - AM_RANGE(0xba0000, 0xba0001) AM_READ( input_port_4_word_r ) - AM_RANGE(0xbc0000, 0xbc0001) AM_READ( input_port_3_word_r ) + AM_RANGE(0xba0000, 0xba0001) AM_READ_PORT("IN4") + AM_RANGE(0xbc0000, 0xbc0001) AM_READ_PORT("IN3") AM_RANGE(0xd00000, 0xd1ffff) AM_RAM @@ -293,7 +293,7 @@ GFXDECODE_END static INPUT_PORTS_START( livequiz ) - PORT_START // IN0 + PORT_START_TAG("IN0") // IN0 PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -312,7 +312,7 @@ static INPUT_PORTS_START( livequiz ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN1 + PORT_START_TAG("IN1") // IN1 PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -331,7 +331,7 @@ static INPUT_PORTS_START( livequiz ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN2 + PORT_START_TAG("IN2") // IN2 PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -350,7 +350,7 @@ static INPUT_PORTS_START( livequiz ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN3 + PORT_START_TAG("IN3") // IN3 PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) @@ -369,7 +369,7 @@ static INPUT_PORTS_START( livequiz ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN4 + PORT_START_TAG("IN4") // IN4 PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START3 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -388,7 +388,7 @@ static INPUT_PORTS_START( livequiz ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START // IN5 - 900000 + PORT_START_TAG("IN5") // IN5 - 900000 PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) |