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

Fix save corruption bug in retail nand slot1.

This commit is contained in:
normmatt234 2013-11-13 08:18:34 +00:00
parent 5b6d16da87
commit 59d8d798ef
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
desmume/src/addons/slot1_retail_nand.cpp
View File

@ -46,6 +46,7 @@ private:
u32 mode; u32 mode;
u32 handle_save; u32 handle_save;
u32 save_adr; u32 save_adr;
u32 save_start_adr;
public: public:
virtual Slot1Info const* info() virtual Slot1Info const* info()
@ -85,12 +86,17 @@ public:
{ {
protocol.address = (protocol.command.bytes[1] << 24) | (protocol.command.bytes[2] << 16) | (protocol.command.bytes[3] << 8) | protocol.command.bytes[4]; protocol.address = (protocol.command.bytes[1] << 24) | (protocol.command.bytes[2] << 16) | (protocol.command.bytes[3] << 8) | protocol.command.bytes[4];
//INFO("Start command: %02X%02X%02X%02X%02X%02X%02X%02X\t",
// protocol.command.bytes[0], protocol.command.bytes[1], protocol.command.bytes[2], protocol.command.bytes[3],
// protocol.command.bytes[4], protocol.command.bytes[5], protocol.command.bytes[6], protocol.command.bytes[7]);
//INFO("FROM: %08X\n", NDS_ARM9.instruct_adr);
//pass the normal rom operations along to the rom component //pass the normal rom operations along to the rom component
switch(operation) switch(operation)
{ {
case eSlot1Operation_00_ReadHeader_Unencrypted: case eSlot1Operation_00_ReadHeader_Unencrypted:
case eSlot1Operation_2x_SecureAreaLoad: case eSlot1Operation_2x_SecureAreaLoad:
case eSlot1Operation_B7_Read: //case eSlot1Operation_B7_Read:
rom.start(operation,protocol.address); rom.start(operation,protocol.address);
return; return;
} }
@ -99,10 +105,6 @@ public:
int cmd = protocol.command.bytes[0]; int cmd = protocol.command.bytes[0];
switch(cmd) switch(cmd)
{ {
//Nand Write Page
case 0x81:
break;
// Nand Init // Nand Init
case 0x94: case 0x94:
mode = cmd; mode = cmd;
@ -112,6 +114,16 @@ public:
case 0xD6: case 0xD6:
break; break;
//Nand Write Page
case 0x81:
mode = cmd;
if (save_start_adr != (protocol.address & gameInfo.mask) - subAdr)
{
save_start_adr = save_adr = (protocol.address & gameInfo.mask) - subAdr;
}
handle_save = 1;
break;
case 0x84: //Write disable case 0x84: //Write disable
case 0x85: //Write enable case 0x85: //Write enable
mode = cmd; mode = cmd;
@ -121,9 +133,24 @@ public:
handle_save = 0; handle_save = 0;
break; break;
case 0xB7:
if (handle_save)
{
mode = cmd;
if (save_start_adr != (protocol.address & gameInfo.mask) - subAdr)
{
save_start_adr = save_adr = (protocol.address & gameInfo.mask) - subAdr;
}
}
else
{
rom.start(operation, protocol.address);
}
break;
case 0xB2: //Set save position case 0xB2: //Set save position
mode = cmd; mode = cmd;
save_adr = (protocol.address & gameInfo.mask) - subAdr; save_start_adr = save_adr = (protocol.address & gameInfo.mask) - subAdr;
handle_save = 1; handle_save = 1;
break; break;
} }