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

make external-BIOS toggle also explicitly control external firmware

Browse Source 
make things a tad more consistent and explicit
This commit is contained in:
Arisotura
2021-11-18 18:17:48 +01:00
parent 19ddaee13b
commit f73df85d1c
5 changed files with 187 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/SPI.cpp
View File

@ -143,18 +143,16 @@ void LoadFirmwareFromFile(FILE* f)
fseek(f, 0, SEEK_SET);
fread(Firmware, 1, FirmwareLength, f);
fclose(f);
// take a backup
std::string fwBackupPath = FirmwarePath + ".bak";
f = Platform::OpenLocalFile(fwBackupPath, "rb");
if (!f)
FILE* bf = Platform::OpenLocalFile(fwBackupPath, "rb");
if (!bf)
{
f = Platform::OpenLocalFile(fwBackupPath, "wb");
if (f)
bf = Platform::OpenLocalFile(fwBackupPath, "wb");
if (bf)
{
fwrite(Firmware, 1, FirmwareLength, f);
fclose(f);
fwrite(Firmware, 1, FirmwareLength, bf);
fclose(bf);
}
else
{
@ -163,7 +161,7 @@ void LoadFirmwareFromFile(FILE* f)
}
else
{
fclose(f);
fclose(bf);
}
}
@ -197,22 +195,32 @@ void LoadUserSettingsFromConfig()
void Reset()
{
if (Firmware) delete[] Firmware;
Firmware = NULL;
Firmware = nullptr;
FirmwarePath = "";
if (NDS::ConsoleType == 1)
FirmwarePath = Platform::GetConfigString(Platform::DSi_FirmwarePath);
else
FirmwarePath = Platform::GetConfigString(Platform::FirmwarePath);
FILE* f = Platform::OpenLocalFile(FirmwarePath, "rb");
if (!f)
if (Platform::GetConfigBool(Platform::ExternalBIOSEnable))
{
printf("Firmware not found! Generating default firmware.\n");
LoadDefaultFirmware();
if (NDS::ConsoleType == 1)
FirmwarePath = Platform::GetConfigString(Platform::DSi_FirmwarePath);
else
FirmwarePath = Platform::GetConfigString(Platform::FirmwarePath);
FILE* f = Platform::OpenLocalFile(FirmwarePath, "rb");
if (!f)
{
printf("Firmware not found! Generating default firmware.\n");
FirmwarePath = "";
}
else
{
LoadFirmwareFromFile(f);
fclose(f);
}
}
else
if (FirmwarePath.empty())
{
LoadFirmwareFromFile(f);
LoadDefaultFirmware();
}
FirmwareMask = FirmwareLength - 1;
@ -226,7 +234,7 @@ void Reset()
UserSettings = userdata;
if (!f || Platform::GetConfigBool(Platform::Firm_OverrideSettings))
if (FirmwarePath.empty() || Platform::GetConfigBool(Platform::Firm_OverrideSettings))
LoadUserSettingsFromConfig();
// fix touchscreen coords
@ -422,13 +430,16 @@ void Write(u8 val, u32 hold)
if (!hold && (CurCmd == 0x02 || CurCmd == 0x0A))
{
FILE* f = Platform::OpenLocalFile(FirmwarePath, "r+b");
if (f)
if (!FirmwarePath.empty())
{
u32 cutoff = 0x7FA00 & FirmwareMask;
fseek(f, cutoff, SEEK_SET);
fwrite(&Firmware[cutoff], FirmwareLength-cutoff, 1, f);
fclose(f);
FILE* f = Platform::OpenLocalFile(FirmwarePath, "r+b");
if (f)
{
u32 cutoff = 0x7FA00 & FirmwareMask;
fseek(f, cutoff, SEEK_SET);
fwrite(&Firmware[cutoff], FirmwareLength-cutoff, 1, f);
fclose(f);
}
}
}
}