piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-26 15:50:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

separate firmware files for multiplayer instances

Browse Source
This commit is contained in:
Arisotura
2022-09-16 20:37:03 +02:00
parent 65f1aff453
commit 135524675d
1 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/SPI.cpp
View File

@ -79,6 +79,16 @@ bool VerifyCRC16(u32 start, u32 offset, u32 len, u32 crcoffset)
return (crc_stored == crc_calced); return (crc_stored == crc_calced);
} }
std::string InstanceSuffix()
{
int inst = Platform::InstanceID();
if (inst == 0) return "";
char suffix[16] = {0};
snprintf(suffix, 15, ".%d", inst+1);
return suffix;
}
bool Init() bool Init()
{ {
@ -215,7 +225,8 @@ void LoadDefaultFirmware()
// wifi access points // wifi access points
// TODO: WFC ID?? // TODO: WFC ID??
FILE* f = Platform::OpenLocalFile("wfcsettings.bin", "rb"); FILE* f = Platform::OpenLocalFile("wfcsettings.bin"+InstanceSuffix(), "rb");
if (!f) f = Platform::OpenLocalFile("wfcsettings.bin", "rb");
if (f) if (f)
{ {
u32 apdata = userdata - 0xA00; u32 apdata = userdata - 0xA00;
@ -259,7 +270,7 @@ void LoadDefaultFirmware()
} }
} }
void LoadFirmwareFromFile(FILE* f) void LoadFirmwareFromFile(FILE* f, bool makecopy)
{ {
fseek(f, 0, SEEK_END); fseek(f, 0, SEEK_END);
@ -271,7 +282,9 @@ void LoadFirmwareFromFile(FILE* f)
fread(Firmware, 1, FirmwareLength, f); fread(Firmware, 1, FirmwareLength, f);
// take a backup // take a backup
std::string fwBackupPath = FirmwarePath + ".bak"; std::string fwBackupPath;
if (!makecopy) fwBackupPath = FirmwarePath + ".bak";
else fwBackupPath = FirmwarePath;
FILE* bf = Platform::OpenLocalFile(fwBackupPath, "rb"); FILE* bf = Platform::OpenLocalFile(fwBackupPath, "rb");
if (!bf) if (!bf)
{ {
@ -333,15 +346,24 @@ void Reset()
else else
FirmwarePath = Platform::GetConfigString(Platform::FirmwarePath); FirmwarePath = Platform::GetConfigString(Platform::FirmwarePath);
bool makecopy = false;
std::string origpath = FirmwarePath;
FirmwarePath += InstanceSuffix();
FILE* f = Platform::OpenLocalFile(FirmwarePath, "rb"); FILE* f = Platform::OpenLocalFile(FirmwarePath, "rb");
if (!f) if (!f)
{
f = Platform::OpenLocalFile(origpath, "rb");
makecopy = true;
}
if (!f)
{ {
printf("Firmware not found! Generating default firmware.\n"); printf("Firmware not found! Generating default firmware.\n");
FirmwarePath = ""; FirmwarePath = "";
} }
else else
{ {
LoadFirmwareFromFile(f); LoadFirmwareFromFile(f, makecopy);
fclose(f); fclose(f);
} }
} }
@ -593,7 +615,12 @@ void Write(u8 val, u32 hold)
} }
else else
{ {
FILE* f = Platform::OpenLocalFile("wfcsettings.bin", "wb"); char wfcfile[50] = {0};
int inst = Platform::InstanceID();
if (inst > 0) snprintf(wfcfile, 49, "wfcsettings.bin", Platform::InstanceID());
else strncpy(wfcfile, "wfcsettings.bin", 49);
FILE* f = Platform::OpenLocalFile(wfcfile, "wb");
if (f) if (f)
{ {
u32 cutoff = 0x7F400 & FirmwareMask; u32 cutoff = 0x7F400 & FirmwareMask;