diff options
Diffstat (limited to 'src/mame/drivers/tmnt.cpp')
-rw-r--r-- | src/mame/drivers/tmnt.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/mame/drivers/tmnt.cpp b/src/mame/drivers/tmnt.cpp index af60fb44859..622a034b549 100644 --- a/src/mame/drivers/tmnt.cpp +++ b/src/mame/drivers/tmnt.cpp @@ -430,7 +430,7 @@ uint16_t tmnt_state::thndrx2_eeprom_r() /* bit 1 is EEPROM ready */ /* bit 3 is VBLANK (???) */ /* bit 7 is service button */ - res = ioport("P2/EEPROM")->read(); + res = ioport("P2_EEPROM")->read(); m_toggle ^= 0x0800; return (res ^ m_toggle); } @@ -546,10 +546,10 @@ void tmnt_state::punkshot_main_map(address_map &map) map(0x000000, 0x03ffff).rom(); map(0x080000, 0x083fff).ram(); /* main RAM */ map(0x090000, 0x090fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette"); - map(0x0a0000, 0x0a0001).portr("DSW1/DSW2"); - map(0x0a0002, 0x0a0003).portr("COINS/DSW3"); - map(0x0a0004, 0x0a0005).portr("P3/P4"); - map(0x0a0006, 0x0a0007).portr("P1/P2"); + map(0x0a0000, 0x0a0001).portr("DSW1_DSW2"); + map(0x0a0002, 0x0a0003).portr("COINS_DSW3"); + map(0x0a0004, 0x0a0005).portr("P3_P4"); + map(0x0a0006, 0x0a0007).portr("P1_P2"); map(0x0a0020, 0x0a0021).w(FUNC(tmnt_state::punkshot_0a0020_w)); map(0x0a0040, 0x0a0043).rw(m_k053260, FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)).umask16(0x00ff); map(0x0a0060, 0x0a007f).w(m_k053251, FUNC(k053251_device::write)).umask16(0x00ff); @@ -642,10 +642,10 @@ void glfgreat_state::glfgreat_main_map(address_map &map) map(0x114000, 0x11401f).rw(m_k053245, FUNC(k05324x_device::k053244_r), FUNC(k05324x_device::k053244_w)).umask16(0x00ff); /* duplicate! */ map(0x118000, 0x11801f).w(m_k053936, FUNC(k053936_device::ctrl_w)); map(0x11c000, 0x11c01f).w(m_k053251, FUNC(k053251_device::write)).umask16(0xff00); - map(0x120000, 0x120001).portr("P1/P2"); - map(0x120002, 0x120003).portr("P3/P4"); - map(0x120004, 0x120005).portr("COINS/DSW3"); - map(0x120006, 0x120007).portr("DSW1/DSW2"); + map(0x120000, 0x120001).portr("P1_P2"); + map(0x120002, 0x120003).portr("P3_P4"); + map(0x120004, 0x120005).portr("COINS_DSW3"); + map(0x120006, 0x120007).portr("DSW1_DSW2"); map(0x121000, 0x121001).r(FUNC(glfgreat_state::glfgreat_ball_r)); /* returns the color of the center pixel of the roz layer */ map(0x122000, 0x122001).w(FUNC(glfgreat_state::glfgreat_122000_w)); map(0x123000, 0x123000).rw("adc", FUNC(adc0804_device::read), FUNC(adc0804_device::write)); @@ -666,8 +666,8 @@ void prmrsocr_state::prmrsocr_main_map(address_map &map) map(0x114000, 0x11401f).rw(m_k053245, FUNC(k05324x_device::k053244_r), FUNC(k05324x_device::k053244_w)).umask16(0x00ff); /* duplicate! */ map(0x118000, 0x11801f).w(m_k053936, FUNC(k053936_device::ctrl_w)); map(0x11c000, 0x11c01f).w(m_k053251, FUNC(k053251_device::write)).umask16(0xff00); - map(0x120000, 0x120001).portr("P1/COINS"); - map(0x120002, 0x120003).portr("P2/EEPROM"); + map(0x120000, 0x120001).portr("P1_COINS"); + map(0x120002, 0x120003).portr("P2_EEPROM"); map(0x121000, 0x12101f).m("k054321", FUNC(k054321_device::main_map)).umask16(0x00ff); map(0x122000, 0x122001).w(FUNC(prmrsocr_state::prmrsocr_eeprom_w)); /* EEPROM + video control */ map(0x123000, 0x123001).w(FUNC(prmrsocr_state::prmrsocr_sound_irq_w)); @@ -999,7 +999,7 @@ void tmnt_state::thndrx2_main_map(address_map &map) map(0x400000, 0x400003).rw(m_k053260, FUNC(k053260_device::main_read), FUNC(k053260_device::main_write)).umask16(0x00ff); map(0x500000, 0x50003f).rw(m_k054000, FUNC(k054000_device::read), FUNC(k054000_device::write)).umask16(0x00ff); map(0x500100, 0x500101).w(FUNC(tmnt_state::thndrx2_eeprom_w)); - map(0x500200, 0x500201).portr("P1/COINS"); + map(0x500200, 0x500201).portr("P1_COINS"); map(0x500202, 0x500203).r(FUNC(tmnt_state::thndrx2_eeprom_r)); map(0x500300, 0x500301).nopw(); /* watchdog reset? irq enable? */ map(0x600000, 0x607fff).rw(FUNC(tmnt_state::k052109_word_noA12_r), FUNC(tmnt_state::k052109_word_noA12_w)); @@ -1328,7 +1328,7 @@ static INPUT_PORTS_START( tmnt2p ) INPUT_PORTS_END static INPUT_PORTS_START( punkshtj ) // Japan 2 Players - PORT_START("DSW1/DSW2") + PORT_START("DSW1_DSW2") KONAMI_COINAGE_LOC(DEF_STR( Free_Play ), "No Coin B", SW1) PORT_DIPUNUSED_DIPLOC( 0x0100, IP_ACTIVE_LOW, "SW2:1" ) // manual says "not used", but doesn't "should be kept OFF" PORT_DIPUNUSED_DIPLOC( 0x0200, IP_ACTIVE_LOW, "SW2:2" ) // manual says "not used", but doesn't "should be kept OFF" @@ -1347,7 +1347,7 @@ static INPUT_PORTS_START( punkshtj ) // Japan 2 Players PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START("COINS/DSW3") + PORT_START("COINS_DSW3") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -1369,18 +1369,18 @@ static INPUT_PORTS_START( punkshtj ) // Japan 2 Players PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START("P1/P2") + PORT_START("P1_P2") KONAMI16_LSB( 1, IPT_UNKNOWN, IPT_UNKNOWN ) KONAMI16_MSB( 2, IPT_UNKNOWN, IPT_UNKNOWN ) - PORT_START("P3/P4") + PORT_START("P3_P4") PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END static INPUT_PORTS_START( punkshtj4 ) // FICTITIOUS Japan 4 Players PORT_INCLUDE( punkshtj ) - PORT_MODIFY("COINS/DSW3") + PORT_MODIFY("COINS_DSW3") PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_COIN4 ) PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE2 ) @@ -1389,13 +1389,13 @@ static INPUT_PORTS_START( punkshtj4 ) // FICTITIOUS Japan 4 Players PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_MODIFY("P3/P4") + PORT_MODIFY("P3_P4") KONAMI16_LSB( 3, IPT_UNKNOWN, IPT_UNKNOWN ) KONAMI16_MSB( 4, IPT_UNKNOWN, IPT_UNKNOWN ) INPUT_PORTS_END static INPUT_PORTS_START( punksht_us_coinage ) - PORT_MODIFY("DSW1/DSW2") + PORT_MODIFY("DSW1_DSW2") PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1,2,3,4") PORT_DIPSETTING( 0x0000, DEF_STR( 5C_1C ) ) PORT_DIPSETTING( 0x0002, DEF_STR( 4C_1C ) ) @@ -1429,7 +1429,7 @@ static INPUT_PORTS_START( punkshot ) // US 4 Players set1 PORT_INCLUDE( punkshtj4 ) PORT_INCLUDE( punksht_us_coinage ) - PORT_MODIFY("DSW1/DSW2") + PORT_MODIFY("DSW1_DSW2") PORT_DIPNAME( 0x0300, 0x0300, "Energy" ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x0300, "30" ) PORT_DIPSETTING( 0x0200, "40" ) @@ -1451,7 +1451,7 @@ static INPUT_PORTS_START( punksht2 ) // US 2 Players set2 PORT_INCLUDE( punkshtj ) PORT_INCLUDE( punksht_us_coinage ) - PORT_MODIFY("DSW1/DSW2") + PORT_MODIFY("DSW1_DSW2") PORT_DIPNAME( 0x0300, 0x0300, "Energy" ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x0300, "40" ) PORT_DIPSETTING( 0x0200, "50" ) @@ -1566,7 +1566,7 @@ static INPUT_PORTS_START( blswhstl ) INPUT_PORTS_END static INPUT_PORTS_START( glfgreat ) - PORT_START("DSW1/DSW2") + PORT_START("DSW1_DSW2") KONAMI_COINAGE_LOC(DEF_STR( Free_Play ), "No Coin B", SW1) /* "No Coin B" = coins produce sound, but no effect on coin counter */ PORT_DIPNAME( 0x0300, 0x0100, "Players/Controllers" ) PORT_DIPLOCATION("SW2:1,2") @@ -1591,7 +1591,7 @@ static INPUT_PORTS_START( glfgreat ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_START("COINS/DSW3") + PORT_START("COINS_DSW3") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_COIN3 ) @@ -1613,12 +1613,12 @@ static INPUT_PORTS_START( glfgreat ) PORT_SERVICE_DIPLOC( 0x4000, IP_ACTIVE_LOW, "SW3:3" ) PORT_DIPUNUSED_DIPLOC( 0x8000, IP_ACTIVE_LOW, "SW3:4" ) // manual says "not used" - PORT_START("P1/P2") + PORT_START("P1_P2") KONAMI16_LSB_40( 1, IPT_BUTTON3 ) PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("adc", adc0804_device, intr_r) // shown in service mode DIP SW1:9, SW2:9 and SW3:5 KONAMI16_MSB( 2, IPT_BUTTON3, IPT_UNUSED ) PORT_PLAYER(2) - PORT_START("P3/P4") + PORT_START("P3_P4") KONAMI16_LSB( 3, IPT_BUTTON3, IPT_UNUSED ) PORT_PLAYER(3) KONAMI16_MSB( 4, IPT_BUTTON3, IPT_UNUSED ) PORT_PLAYER(4) @@ -1639,7 +1639,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( glfgreatu ) PORT_INCLUDE( glfgreat ) - PORT_MODIFY("DSW1/DSW2") + PORT_MODIFY("DSW1_DSW2") PORT_DIPNAME( 0x1800, 0x1000, "Initial/Maximum Credit" ) PORT_DIPLOCATION("SW2:4,5") PORT_DIPSETTING( 0x1800, "2/2" ) PORT_DIPSETTING( 0x1000, "2/3" ) @@ -1650,7 +1650,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( glfgreatj ) PORT_INCLUDE( glfgreatu ) - PORT_MODIFY("DSW1/DSW2") + PORT_MODIFY("DSW1_DSW2") PORT_DIPNAME( 0x0300, 0x0100, "Players/Controllers" ) PORT_DIPLOCATION("SW2:1,2") PORT_DIPSETTING( 0x0300, "2/1" ) // Upright PORT_DIPSETTING( 0x0200, "2/2" ) // Upright @@ -1660,7 +1660,7 @@ static INPUT_PORTS_START( glfgreatj ) // I/O test in service mode actually returns same mapping as World/US revs // for accuracy we actually map these like the Jp flyer claims // (where stance button is on top of the ball shaped controller) - PORT_MODIFY("P1/P2") + PORT_MODIFY("P1_P2") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 Stance Select Button") @@ -1676,7 +1676,7 @@ static INPUT_PORTS_START( glfgreatj ) PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Right Direction Button") PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_NAME("P2 Club Select Button") - PORT_MODIFY("P3/P4") + PORT_MODIFY("P3_P4") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) PORT_NAME("P3 Stance Select Button") @@ -1838,7 +1838,7 @@ static INPUT_PORTS_START( qgakumon ) INPUT_PORTS_END static INPUT_PORTS_START( thndrx2 ) - PORT_START("P1/COINS") + PORT_START("P1_COINS") KONAMI16_LSB( 1, IPT_UNKNOWN, IPT_START1 ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 ) @@ -1849,7 +1849,7 @@ static INPUT_PORTS_START( thndrx2 ) PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_START("P2/EEPROM") + PORT_START("P2_EEPROM") KONAMI16_LSB( 2, IPT_UNKNOWN, IPT_START2 ) PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_er5911_device, do_read) PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_er5911_device, ready_read) @@ -1867,7 +1867,7 @@ static INPUT_PORTS_START( thndrx2 ) INPUT_PORTS_END static INPUT_PORTS_START( prmrsocr ) - PORT_START("P1/COINS") + PORT_START("P1_COINS") KONAMI16_LSB( 1, IPT_UNKNOWN, IPT_START1 ) PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_SERVICE_NO_TOGGLE( 0x0200, IP_ACTIVE_LOW ) @@ -1880,7 +1880,7 @@ static INPUT_PORTS_START( prmrsocr ) PORT_DIPUNUSED_DIPLOC( 0x4000, IP_ACTIVE_LOW, "SW:3" ) // manual says "not used" PORT_DIPUNUSED_DIPLOC( 0x8000, IP_ACTIVE_LOW, "SW:4" ) // manual says "not used" - PORT_START("P2/EEPROM") + PORT_START("P2_EEPROM") KONAMI16_LSB( 2, IPT_UNKNOWN, IPT_START2 ) PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_er5911_device, do_read) PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_er5911_device, ready_read) |