ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1039 from Nekokabu/master 

fix for "Writing 0 to a flash ram command register"
This commit is contained in:
zilmar 2016-03-22 03:57:17 +11:00
parent a15046dcc7 aa4cc8afce
commit bdc109b0b8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Project64-core/N64System/Mips/FlashRam.cpp
View File

@ -218,6 +218,7 @@ void CFlashram::WriteToFlashCommand(uint32_t FlashRAM_Command)
m_FlashStatus = 0x1111800100C2001E; m_FlashStatus = 0x1111800100C2001E;
break; break;
case 0xF0000000: case 0xF0000000:
case 0x00000000:
m_FlashFlag = FLASHRAM_MODE_READ; m_FlashFlag = FLASHRAM_MODE_READ;
m_FlashStatus = 0x11118004F0000000; m_FlashStatus = 0x11118004F0000000;
break; break;
@ -241,4 +242,4 @@ void CFlashram::WriteToFlashCommand(uint32_t FlashRAM_Command)
g_Notify->DisplayError(stdstr_f("Writing %X to flash ram command register", FlashRAM_Command).c_str()); g_Notify->DisplayError(stdstr_f("Writing %X to flash ram command register", FlashRAM_Command).c_str());
} }
} }
} }

4
Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp
View File

@ -5578,13 +5578,13 @@ void CMipsMemoryVM::Write32CartridgeDomain2Address2(void)
g_MMU->DmaFromSram(tmp, (m_MemLookupAddress & 0x1FFFFFFF) - 0x08000000, 4); g_MMU->DmaFromSram(tmp, (m_MemLookupAddress & 0x1FFFFFFF) - 0x08000000, 4);
return; return;
} }
if ((m_MemLookupAddress & 0x1FFFFFFF) != 0x08010000) /*if ((m_MemLookupAddress & 0x1FFFFFFF) != 0x08010000)
{ {
if (bHaveDebugger()) if (bHaveDebugger())
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); g_Notify->BreakPoint(__FILE__, __LINE__);
} }
} }*/
if (g_System->m_SaveUsing == SaveChip_Auto) if (g_System->m_SaveUsing == SaveChip_Auto)
{ {
g_System->m_SaveUsing = SaveChip_FlashRam; g_System->m_SaveUsing = SaveChip_FlashRam;