diff options
Diffstat (limited to 'src/mame/drivers/jack.c')
-rw-r--r-- | src/mame/drivers/jack.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c index acff3f65694..8f6b62d7586 100644 --- a/src/mame/drivers/jack.c +++ b/src/mame/drivers/jack.c @@ -82,7 +82,7 @@ CUSTOM_INPUT_MEMBER(jack_state::sound_check_r) { UINT8 ret = 0; - if ((input_port_read(machine(), "IN2") & 0x80) && !m_joinem_snd_bit) + if ((ioport("IN2")->read() & 0x80) && !m_joinem_snd_bit) ret = 1; return ret; @@ -682,14 +682,14 @@ static INPUT_PORTS_START( striv ) PORT_DIPSETTING( 0x02, "Horizontal" ) PORT_DIPSETTING( 0x00, "Vertical" ) PORT_DIPNAME( 0x05, 0x05, "Gaming Option Number" ) PORT_DIPLOCATION("SW1:!1,!3") - PORT_DIPSETTING( 0x01, "2" ) PORT_CONDITION("DSW1", 0x20, PORTCOND_EQUALS, 0x20) - PORT_DIPSETTING( 0x05, "3" ) PORT_CONDITION("DSW1", 0x20, PORTCOND_EQUALS, 0x20) - PORT_DIPSETTING( 0x00, "4" ) PORT_CONDITION("DSW1", 0x20, PORTCOND_EQUALS, 0x20) - PORT_DIPSETTING( 0x04, "5" ) PORT_CONDITION("DSW1", 0x20, PORTCOND_EQUALS, 0x20) - PORT_DIPSETTING( 0x01, "4" ) PORT_CONDITION("DSW1", 0x20, PORTCOND_NOTEQUALS, 0x20) - PORT_DIPSETTING( 0x05, "5" ) PORT_CONDITION("DSW1", 0x20, PORTCOND_NOTEQUALS, 0x20) - PORT_DIPSETTING( 0x00, "6" ) PORT_CONDITION("DSW1", 0x20, PORTCOND_NOTEQUALS, 0x20) - PORT_DIPSETTING( 0x04, "7" ) PORT_CONDITION("DSW1", 0x20, PORTCOND_NOTEQUALS, 0x20) + PORT_DIPSETTING( 0x01, "2" ) PORT_CONDITION("DSW1", 0x20, EQUALS, 0x20) + PORT_DIPSETTING( 0x05, "3" ) PORT_CONDITION("DSW1", 0x20, EQUALS, 0x20) + PORT_DIPSETTING( 0x00, "4" ) PORT_CONDITION("DSW1", 0x20, EQUALS, 0x20) + PORT_DIPSETTING( 0x04, "5" ) PORT_CONDITION("DSW1", 0x20, EQUALS, 0x20) + PORT_DIPSETTING( 0x01, "4" ) PORT_CONDITION("DSW1", 0x20, NOTEQUALS, 0x20) + PORT_DIPSETTING( 0x05, "5" ) PORT_CONDITION("DSW1", 0x20, NOTEQUALS, 0x20) + PORT_DIPSETTING( 0x00, "6" ) PORT_CONDITION("DSW1", 0x20, NOTEQUALS, 0x20) + PORT_DIPSETTING( 0x04, "7" ) PORT_CONDITION("DSW1", 0x20, NOTEQUALS, 0x20) PORT_DIPNAME( 0x08, 0x08, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:!4") PORT_DIPSETTING( 0x08, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x00, DEF_STR( Cocktail ) ) @@ -857,7 +857,7 @@ MACHINE_CONFIG_END static INTERRUPT_GEN( joinem_vblank_irq ) { /* TODO: looks hackish to me ... */ - if (!(input_port_read(device->machine(), "IN2") & 0x80)) + if (!(device->machine().root_device().ioport("IN2")->read() & 0x80)) device_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } |