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

System: Allow overriding BIOS in boot parameters

This commit is contained in:
Stenzek 2023-08-30 17:39:41 +10:00
parent 281198e69d
commit bdebd8bdef
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/system.cpp
View File

@ -86,7 +86,7 @@ static bool ReadExecutableFromImage(ISOReader& iso, std::string* out_executable_
static void StallCPU(TickCount ticks); static void StallCPU(TickCount ticks);
static bool LoadBIOS(); static bool LoadBIOS(const std::string& override_bios_path);
static void InternalReset(); static void InternalReset();
static void ClearRunningGame(); static void ClearRunningGame();
static void DestroySystem(); static void DestroySystem();
@ -138,6 +138,7 @@ static std::string s_running_game_serial;
static std::string s_running_game_title; static std::string s_running_game_title;
static System::GameHash s_running_game_hash; static System::GameHash s_running_game_hash;
static bool s_running_unknown_game; static bool s_running_unknown_game;
static bool s_was_fast_booted;
static float s_throttle_frequency = 60.0f; static float s_throttle_frequency = 60.0f;
static float s_target_speed = 1.0f; static float s_target_speed = 1.0f;
@ -329,6 +330,11 @@ bool System::IsRunningUnknownGame()
return s_running_unknown_game; return s_running_unknown_game;
} }
bool System::WasFastBooted()
{
return s_was_fast_booted;
}
const BIOS::ImageInfo* System::GetBIOSImageInfo() const BIOS::ImageInfo* System::GetBIOSImageInfo()
{ {
return s_bios_image_info; return s_bios_image_info;
@ -1241,7 +1247,7 @@ bool System::BootSystem(SystemBootParameters parameters)
#endif #endif
// Load BIOS image. // Load BIOS image.
if (!LoadBIOS()) if (!LoadBIOS(parameters.override_bios))
{ {
s_state = State::Shutdown; s_state = State::Shutdown;
ClearRunningGame(); ClearRunningGame();
@ -1293,9 +1299,15 @@ bool System::BootSystem(SystemBootParameters parameters)
g_settings.bios_patch_fast_boot)) g_settings.bios_patch_fast_boot))
{ {
if (s_bios_image_info && s_bios_image_info->patch_compatible) if (s_bios_image_info && s_bios_image_info->patch_compatible)
{
// TODO: Fast boot without patches...
BIOS::PatchBIOSFastBoot(Bus::g_bios, Bus::BIOS_SIZE); BIOS::PatchBIOSFastBoot(Bus::g_bios, Bus::BIOS_SIZE);
s_was_fast_booted = true;
}
else else
{
Log_ErrorPrintf("Not patching fast boot, as BIOS is not patch compatible."); Log_ErrorPrintf("Not patching fast boot, as BIOS is not patch compatible.");
}
} }
// Good to go. // Good to go.
@ -1517,6 +1529,7 @@ void System::DestroySystem()
s_bios_hash = {}; s_bios_hash = {};
s_bios_image_info = nullptr; s_bios_image_info = nullptr;
s_was_fast_booted = false;
Host::OnSystemDestroyed(); Host::OnSystemDestroyed();
} }
@ -1794,9 +1807,10 @@ bool System::DoState(StateWrapper& sw, GPUTexture** host_texture, bool update_di
return !sw.HasError(); return !sw.HasError();
} }
bool System::LoadBIOS() bool System::LoadBIOS(const std::string& override_bios_path)
{ {
std::optional<BIOS::Image> bios_image(BIOS::GetBIOSImage(s_region)); std::optional<BIOS::Image> bios_image(
override_bios_path.empty() ? BIOS::GetBIOSImage(s_region) : FileSystem::ReadBinaryFile(override_bios_path.c_str()));
if (!bios_image.has_value()) if (!bios_image.has_value())
{ {
Host::ReportFormattedErrorAsync("Error", Host::TranslateString("System", "Failed to load %s BIOS."), Host::ReportFormattedErrorAsync("Error", Host::TranslateString("System", "Failed to load %s BIOS."),

2
src/core/system.h
View File

@ -38,6 +38,7 @@ struct SystemBootParameters
std::string filename; std::string filename;
std::string save_state; std::string save_state;
std::string override_exe; std::string override_exe;
std::string override_bios;
std::optional<bool> override_fast_boot; std::optional<bool> override_fast_boot;
std::optional<bool> override_fullscreen; std::optional<bool> override_fullscreen;
std::optional<bool> override_start_paused; std::optional<bool> override_start_paused;
@ -186,6 +187,7 @@ const std::string& GetGameSerial();
const std::string& GetGameTitle(); const std::string& GetGameTitle();
GameHash GetGameHash(); GameHash GetGameHash();
bool IsRunningUnknownGame(); bool IsRunningUnknownGame();
bool WasFastBooted();
const BIOS::ImageInfo* GetBIOSImageInfo(); const BIOS::ImageInfo* GetBIOSImageInfo();
const BIOS::Hash& GetBIOSHash(); const BIOS::Hash& GetBIOSHash();