From ead98c56a6d2a268652e0de619cee262b0c84cfb Mon Sep 17 00:00:00 2001 From: David Haywood Date: Tue, 4 Aug 2015 11:23:49 +0100 Subject: [PATCH] fix MT06007 --- src/mame/drivers/suna16.c | 14 ++++++-------- src/mame/includes/suna16.h | 10 +++++++++- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c index ba2ae6ee936..fd90aebce16 100644 --- a/src/mame/drivers/suna16.c +++ b/src/mame/drivers/suna16.c @@ -296,8 +296,8 @@ ADDRESS_MAP_END MACHINE_START_MEMBER(suna16_state, bssoccer) { - membank("bank1")->configure_entries(0, 8, memregion("pcm1")->base() + 0x1000, 0x10000); - membank("bank2")->configure_entries(0, 8, memregion("pcm2")->base() + 0x1000, 0x10000); + m_bank1->configure_entries(0, 8, memregion("pcm1")->base() + 0x1000, 0x10000); + m_bank2->configure_entries(0, 8, memregion("pcm2")->base() + 0x1000, 0x10000); } /* Bank Switching */ @@ -306,16 +306,14 @@ WRITE8_MEMBER(suna16_state::bssoccer_pcm_1_bankswitch_w) { const int bank = data & 7; if (bank & ~7) logerror("CPU#2 PC %06X - ROM bank unknown bits: %02X\n", space.device().safe_pc(), data); - printf("%d %d\n", 1, bank); - membank("bank1")->set_entry(bank); + m_bank1->set_entry(bank); } WRITE8_MEMBER(suna16_state::bssoccer_pcm_2_bankswitch_w) { const int bank = data & 7; if (bank & ~7) logerror("CPU#3 PC %06X - ROM bank unknown bits: %02X\n", space.device().safe_pc(), data); - printf("%d %d\n", 2, bank); - membank("bank2")->set_entry(bank); + m_bank2->set_entry(bank); } @@ -380,7 +378,7 @@ WRITE8_MEMBER(suna16_state::uballoon_pcm_1_bankswitch_w) { const int bank = data & 1; if (bank & ~1) logerror("CPU#2 PC %06X - ROM bank unknown bits: %02X\n", space.device().safe_pc(), data); - membank("bank1")->set_entry(bank); + m_bank1->set_entry(bank); } /* Memory maps: Yes, *no* RAM */ @@ -400,7 +398,7 @@ ADDRESS_MAP_END MACHINE_START_MEMBER(suna16_state,uballoon) { - membank("bank1")->configure_entries(0, 2, memregion("pcm1")->base() + 0x400, 0x10000); + m_bank1->configure_entries(0, 2, memregion("pcm1")->base() + 0x400, 0x10000); save_item(NAME(m_prot)); } diff --git a/src/mame/includes/suna16.h b/src/mame/includes/suna16.h index 3683bf6cc1d..572fe87365a 100644 --- a/src/mame/includes/suna16.h +++ b/src/mame/includes/suna16.h @@ -16,7 +16,11 @@ public: m_screen(*this, "screen"), m_palette(*this, "palette"), m_spriteram(*this, "spriteram"), - m_spriteram2(*this, "spriteram2") + m_spriteram2(*this, "spriteram2"), + m_bank1(*this, "bank1"), + m_bank2(*this, "bank2") + + { } required_device m_maincpu; @@ -31,6 +35,10 @@ public: required_shared_ptr m_spriteram; optional_shared_ptr m_spriteram2; + optional_memory_bank m_bank1; + optional_memory_bank m_bank2; + + UINT16 *m_paletteram; int m_color_bank; UINT8 m_prot;