diff options
| author | 2015-07-28 08:15:51 -0400 | |
|---|---|---|
| committer | 2015-07-28 08:15:51 -0400 | |
| commit | 8bcbe2981111ac0df78c584645d1534c437e2862 (patch) | |
| tree | 9c78bcc3dde9e28350de22bca983caf95d6131da /src | |
| parent | ac7b1a5d92290a5c5cc8a206540f3f55b7a63623 (diff) | |
namcos1.c: Reduce tagmap lookups, add missing PORT_DIPLOCATION (nw)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mame/drivers/namcos1.c | 13 | ||||
| -rw-r--r-- | src/mame/includes/namcos1.h | 11 | ||||
| -rw-r--r-- | src/mame/machine/namcos1.c | 8 |
3 files changed, 23 insertions, 9 deletions
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c index 60f6c16e2ae..c65e68aba54 100644 --- a/src/mame/drivers/namcos1.c +++ b/src/mame/drivers/namcos1.c @@ -353,7 +353,7 @@ WRITE8_MEMBER(namcos1_state::irq_ack_w) READ8_MEMBER(namcos1_state::dsw_r) { - int ret = ioport("DIPSW")->read(); + int ret = m_io_dipsw->read(); if (!(offset & 2)) ret >>= 4; return 0xf0 | ret; } @@ -871,7 +871,14 @@ static INPUT_PORTS_START( splatter ) // Allow "CPU #0&1 Kick Watchdog in IRQ" = _____oo_ // 12345678 #endif - PORT_DIPNAME( 0x20, 0x20, "Stage Select (ver. SH3 only)" ) +INPUT_PORTS_END + + +static INPUT_PORTS_START( splatter3 ) + PORT_INCLUDE( splatter ) + + PORT_MODIFY( "DIPSW" ) + PORT_DIPNAME( 0x20, 0x20, "Stage Select" ) PORT_DIPLOCATION("SW:3") PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) INPUT_PORTS_END @@ -2836,7 +2843,7 @@ GAME( 1988, berabohmb, berabohm, ns1, berabohm, namcos1_state, berabohm, ROT GAME( 1988, mmaze, 0, ns1, mmaze, namcos1_state, alice, ROT180, "Namco", "Marchen Maze (Japan)", GAME_SUPPORTS_SAVE ) GAME( 1988, bakutotu, 0, ns1, bakutotu, namcos1_state, bakutotu, ROT180, "Namco", "Bakutotsu Kijuutei", GAME_SUPPORTS_SAVE ) GAME( 1988, wldcourt, 0, ns1, wldcourt, namcos1_state, wldcourt, ROT180, "Namco", "World Court (Japan)", GAME_SUPPORTS_SAVE ) -GAME( 1988, splatter, 0, ns1, splatter, namcos1_state, splatter, ROT180, "Namco", "Splatter House (World, new version (SH3))", GAME_SUPPORTS_SAVE ) +GAME( 1988, splatter, 0, ns1, splatter3,namcos1_state, splatter, ROT180, "Namco", "Splatter House (World, new version (SH3))", GAME_SUPPORTS_SAVE ) GAME( 1988, splatter2, splatter, ns1, splatter, namcos1_state, splatter, ROT180, "Namco", "Splatter House (World, old version (SH2))", GAME_SUPPORTS_SAVE ) GAME( 1988, splatterj, splatter, ns1, splatter, namcos1_state, splatter, ROT180, "Namco", "Splatter House (Japan, SH1)", GAME_SUPPORTS_SAVE ) GAME( 1988, faceoff, 0, ns1, faceoff, namcos1_state, faceoff, ROT180, "Namco", "Face Off (Japan)", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/includes/namcos1.h b/src/mame/includes/namcos1.h index 8a5296ca76f..049ef2ae85f 100644 --- a/src/mame/includes/namcos1.h +++ b/src/mame/includes/namcos1.h @@ -23,7 +23,10 @@ public: m_spriteram(*this, "spriteram"), m_playfield_control(*this, "pfcontrol"), m_triram(*this, "triram"), - m_rom(*this, "user1") { } + m_rom(*this, "user1"), + m_soundbank(*this, "soundbank"), + m_mcubank(*this, "mcubank"), + m_io_dipsw(*this, "DIPSW") { } required_device<cpu_device> m_maincpu; required_device<cpu_device> m_subcpu; @@ -39,9 +42,13 @@ public: required_shared_ptr<UINT8> m_spriteram; required_shared_ptr<UINT8> m_playfield_control; required_shared_ptr<UINT8> m_triram; - required_region_ptr<UINT8> m_rom; + required_memory_bank m_soundbank; + required_memory_bank m_mcubank; + + required_ioport m_io_dipsw; + int m_dac0_value; int m_dac1_value; int m_dac0_gain; diff --git a/src/mame/machine/namcos1.c b/src/mame/machine/namcos1.c index 6c6667bd8b8..9d7fa409421 100644 --- a/src/mame/machine/namcos1.c +++ b/src/mame/machine/namcos1.c @@ -477,7 +477,7 @@ WRITE8_MEMBER( namcos1_state::key_type3_w ) WRITE8_MEMBER(namcos1_state::sound_bankswitch_w) { - membank("soundbank")->set_entry((data & 0x70) >> 4); + m_soundbank->set_entry((data & 0x70) >> 4); } @@ -510,8 +510,8 @@ WRITE_LINE_MEMBER(namcos1_state::subres_w) void namcos1_state::machine_start() { - membank("soundbank")->configure_entries(0, 8, memregion("audiocpu")->base(), 0x4000); - membank("mcubank")->configure_entries(0, 24, memregion("voice")->base(), 0x8000); + m_soundbank->configure_entries(0, 8, memregion("audiocpu")->base(), 0x4000); + m_mcubank->configure_entries(0, 24, memregion("voice")->base(), 0x8000); save_item(NAME(m_dac0_value)); save_item(NAME(m_dac1_value)); @@ -568,7 +568,7 @@ WRITE8_MEMBER(namcos1_state::mcu_bankswitch_w) /* bit 0-1 : address line A15-A16 */ bank += (data & 3); - membank("mcubank")->set_entry(bank); + m_mcubank->set_entry(bank); } |
