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

fix obvious crashy bug in NAND cards when booting from firmware, but for some reason the card isn't detected still.

This commit is contained in:
zeromus 2014-09-16 03:53:58 +00:00
parent b781234576
commit dd13e33401
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,8 +83,6 @@ public:
virtual void slot1client_startOperation(eSlot1Operation operation) virtual void slot1client_startOperation(eSlot1Operation operation)
{ {
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", //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[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]); // protocol.command.bytes[4], protocol.command.bytes[5], protocol.command.bytes[6], protocol.command.bytes[7]);
@ -94,8 +92,14 @@ public:
switch(operation) switch(operation)
{ {
case eSlot1Operation_00_ReadHeader_Unencrypted: case eSlot1Operation_00_ReadHeader_Unencrypted:
protocol.address = (protocol.command.bytes[1] << 24) | (protocol.command.bytes[2] << 16) | (protocol.command.bytes[3] << 8) | protocol.command.bytes[4];
break;
//case eSlot1Operation_B7_Read:
//???
case eSlot1Operation_2x_SecureAreaLoad: case eSlot1Operation_2x_SecureAreaLoad:
//case eSlot1Operation_B7_Read: //don't re-generate address here. it was already done, according to different rules, for this operation
rom.start(operation,protocol.address); rom.start(operation,protocol.address);
return; return;
} }