diff options
Diffstat (limited to 'src/mame/drivers/pntnpuzl.c')
-rw-r--r-- | src/mame/drivers/pntnpuzl.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mame/drivers/pntnpuzl.c b/src/mame/drivers/pntnpuzl.c index afb580716fc..d7daf3a7226 100644 --- a/src/mame/drivers/pntnpuzl.c +++ b/src/mame/drivers/pntnpuzl.c @@ -161,7 +161,7 @@ static UINT16 pntnpuzl_eeprom; static READ16_HANDLER( pntnpuzl_eeprom_r ) { /* bit 11 is EEPROM data */ - return (pntnpuzl_eeprom & 0xf4ff) | (eeprom_read_bit()<<11) | (input_port_read_indexed(machine, 3) & 0x0300); + return (pntnpuzl_eeprom & 0xf4ff) | (eeprom_read_bit()<<11) | (input_port_read(machine, "IN1") & 0x0300); } static WRITE16_HANDLER( pntnpuzl_eeprom_w ) @@ -292,7 +292,7 @@ static WRITE16_HANDLER( pntnpuzl_vid_w ) static READ16_HANDLER( pntnpuzl_vblank_r ) { - return (input_port_read_indexed(machine, 0) & 1) << 11; + return (input_port_read(machine, "IN0") & 1) << 11; } @@ -350,11 +350,11 @@ static READ16_HANDLER( pntnpuzl_280014_r ) if (serial_out == 0x11) { static int touchscr[5]; - if (input_port_read_indexed(machine, 0) & 0x10) + if (input_port_read(machine, "IN0") & 0x10) { touchscr[0] = 0x1b; - touchscr[2] = BITSWAP8(input_port_read_indexed(machine, 1),0,1,2,3,4,5,6,7); - touchscr[4] = BITSWAP8(input_port_read_indexed(machine, 2),0,1,2,3,4,5,6,7); + touchscr[2] = BITSWAP8(input_port_read(machine, "TOUCHX"),0,1,2,3,4,5,6,7); + touchscr[4] = BITSWAP8(input_port_read(machine, "TOUCHY"),0,1,2,3,4,5,6,7); } else touchscr[0] = 0; @@ -387,7 +387,7 @@ static ADDRESS_MAP_START( pntnpuzl_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x180000, 0x180001) AM_READ(SMH_NOP) //| AM_RANGE(0x200000, 0x200001) AM_WRITE(pntnpuzl_200000_w) AM_RANGE(0x280000, 0x280001) AM_READ(pntnpuzl_eeprom_r) - AM_RANGE(0x280002, 0x280003) AM_READ(input_port_4_word_r) + AM_RANGE(0x280002, 0x280003) AM_READ_PORT("IN2") AM_RANGE(0x280000, 0x280001) AM_WRITE(pntnpuzl_eeprom_w) AM_RANGE(0x280008, 0x280009) AM_WRITE(SMH_NOP) AM_RANGE(0x28000a, 0x28000b) AM_WRITE(SMH_NOP) @@ -411,16 +411,16 @@ ADDRESS_MAP_END static INTERRUPT_GEN( pntnpuzl_irq ) { - if (input_port_read_indexed(machine, 0) & 0x02) /* coin */ + if (input_port_read(machine, "IN0") & 0x02) /* coin */ cpunum_set_input_line(machine, 0, 1, PULSE_LINE); - else if (input_port_read_indexed(machine, 0) & 0x04) /* service */ + else if (input_port_read(machine, "IN0") & 0x04) /* service */ cpunum_set_input_line(machine, 0, 2, PULSE_LINE); - else if (input_port_read_indexed(machine, 0) & 0x08) /* coin */ + else if (input_port_read(machine, "IN0") & 0x08) /* coin */ cpunum_set_input_line(machine, 0, 4, PULSE_LINE); } static INPUT_PORTS_START( pntnpuzl ) - PORT_START /* fake inputs */ + PORT_START_TAG("IN0") /* fake inputs */ PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_VBLANK ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(1) PORT_SERVICE_NO_TOGGLE( 0x04, IP_ACTIVE_HIGH ) PORT_IMPULSE(1) @@ -428,17 +428,17 @@ static INPUT_PORTS_START( pntnpuzl ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) /* game uses a touch screen */ - PORT_START + PORT_START_TAG("TOUCHX") PORT_BIT( 0x7f, 0x40, IPT_LIGHTGUN_Y ) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_MINMAX(0,0x7f) PORT_SENSITIVITY(25) PORT_KEYDELTA(13) - PORT_START + PORT_START_TAG("TOUCHY") PORT_BIT( 0x7f, 0x40, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(Y, -1.0, 0.0, 0) PORT_MINMAX(0,0x7f) PORT_SENSITIVITY(25) PORT_KEYDELTA(13) - PORT_START + PORT_START_TAG("IN1") PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A) - PORT_START + PORT_START_TAG("IN2") PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_B) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_V) PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_C) |