Merge git://github.com/ekeeke/Genesis-Plus-GX

This commit is contained in:
Twinaphex 2012-08-19 11:34:17 +02:00
commit 35268a50f8
2 changed files with 5 additions and 3 deletions

View File

@ -378,7 +378,8 @@ void gen_tmss_w(unsigned int offset, unsigned int data)
void gen_bankswitch_w(unsigned int data) void gen_bankswitch_w(unsigned int data)
{ {
if (system_hw == SYSTEM_MD) /* check if BOOT ROM is loaded */
if (system_bios & SYSTEM_MD)
{ {
if (data & 1) if (data & 1)
{ {
@ -395,7 +396,8 @@ void gen_bankswitch_w(unsigned int data)
unsigned int gen_bankswitch_r(void) unsigned int gen_bankswitch_r(void)
{ {
if (system_hw == SYSTEM_MD) /* check if BOOT ROM is loaded */
if (system_bios & SYSTEM_MD)
{ {
return (m68k.memory_map[0].base == cart.base); return (m68k.memory_map[0].base == cart.base);
} }

View File

@ -193,7 +193,7 @@ void zbank_write_ctrl_io(unsigned int address, unsigned int data)
case 0x41: /* OS ROM */ case 0x41: /* OS ROM */
{ {
if (address & 1) if ((config.bios & 1) && (address & 1))
{ {
gen_bankswitch_w(data & 1); gen_bankswitch_w(data & 1);
return; return;