Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-01 08:18:59 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

better solution than previous hack (nw)

Browse Source
This commit is contained in:
David Haywood 2014-06-30 20:46:22 +00:00
parent 866e9562dd
commit 1a2306b683
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mame/drivers/neogeo.c
View File

@ -886,6 +886,11 @@ void neogeo_state::neogeo_audio_cpu_banking_init(int set_entry)
UINT8 *rgn; UINT8 *rgn;
UINT32 address_mask; UINT32 address_mask;
rgn = memregion("audiocpu")->base();
if (!rgn)
printf("rgn not found?\n");
/* audio bios/cartridge selection */ /* audio bios/cartridge selection */
m_bank_audio_main->configure_entry(1, memregion("audiocpu")->base()); m_bank_audio_main->configure_entry(1, memregion("audiocpu")->base());
if (memregion("audiobios")) if (memregion("audiobios"))
@ -893,7 +898,7 @@ void neogeo_state::neogeo_audio_cpu_banking_init(int set_entry)
else /* on hardware with no SM1 ROM, the cart ROM is always enabled */ else /* on hardware with no SM1 ROM, the cart ROM is always enabled */
m_bank_audio_main->configure_entry(0, memregion("audiocpu")->base()); m_bank_audio_main->configure_entry(0, memregion("audiocpu")->base());
if (set_entry || (m_type == NEOGEO_AES)) m_bank_audio_main->set_entry(0); // don't do this when changing slots m_bank_audio_main->set_entry(m_use_cart_audio);
/* audio banking */ /* audio banking */
m_bank_audio_cart[0] = membank("audio_f000"); m_bank_audio_cart[0] = membank("audio_f000");
@ -902,7 +907,7 @@ void neogeo_state::neogeo_audio_cpu_banking_init(int set_entry)
m_bank_audio_cart[3] = membank("audio_8000"); m_bank_audio_cart[3] = membank("audio_8000");
address_mask = (memregion("audiocpu")->bytes() - 0x10000 - 1) & 0x3ffff; address_mask = (memregion("audiocpu")->bytes() - 0x10000 - 1) & 0x3ffff;
rgn = memregion("audiocpu")->base();
for (region = 0; region < 4; region++) for (region = 0; region < 4; region++)
{ {
@ -956,8 +961,9 @@ WRITE8_MEMBER(neogeo_state::system_control_w)
case 0x05: case 0x05:
if (m_type == NEOGEO_MVS) if (m_type == NEOGEO_MVS)
{ {
m_use_cart_audio = bit;
m_sprgen->neogeo_set_fixed_layer_source(bit); m_sprgen->neogeo_set_fixed_layer_source(bit);
m_bank_audio_main->set_entry(bit); m_bank_audio_main->set_entry(m_use_cart_audio);
} }
break; break;

2
src/mame/includes/neogeo.h
View File

@ -202,6 +202,8 @@ protected:
int m_use_cart_vectors; int m_use_cart_vectors;
int m_use_cart_audio;
// cart slots // cart slots
optional_device<neogeo_cart_slot_device> m_cartslot1; optional_device<neogeo_cart_slot_device> m_cartslot1;
optional_device<neogeo_cart_slot_device> m_cartslot2; optional_device<neogeo_cart_slot_device> m_cartslot2;