The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-28 09:51:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Core/IOS/IOS: Remove global system accessor from Init()

Browse Source 
Removes the final global system accessor from the main IOS code by
passing the system instance through it.
This commit is contained in:
Lioncache 2023-12-18 12:28:18 -05:00
parent 1f50a2fd5b
commit e6db08e03a
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HW/HW.cpp
View File

@ -57,7 +57,7 @@ void Init(Core::System& system, const Sram* override_sram)
if (SConfig::GetInstance().bWii) if (SConfig::GetInstance().bWii)
{ {
IOS::Init(); IOS::Init();
IOS::HLE::Init(); // Depends on Memory IOS::HLE::Init(system); // Depends on Memory
} }
} }

2
Source/Core/Core/IOS/DI/DI.h
View File

@ -120,7 +120,7 @@ private:
}; };
friend class ::CBoot; friend class ::CBoot;
friend void ::IOS::HLE::Init(); friend void ::IOS::HLE::Init(Core::System&);
void ProcessQueuedIOCtl(); void ProcessQueuedIOCtl();
std::optional<DIResult> StartIOCtl(const IOCtlRequest& request); std::optional<DIResult> StartIOCtl(const IOCtlRequest& request);

3
Source/Core/Core/IOS/IOS.cpp
View File

@ -949,9 +949,8 @@ static void FinishPPCBootstrap(Core::System& system, u64 userdata, s64 cycles_la
INFO_LOG_FMT(IOS, "Bootstrapping done."); INFO_LOG_FMT(IOS, "Bootstrapping done.");
} }
void Init() void Init(Core::System& system)
{ {
auto& system = Core::System::GetInstance();
auto& core_timing = system.GetCoreTiming(); auto& core_timing = system.GetCoreTiming();
s_event_enqueue = s_event_enqueue =

2
Source/Core/Core/IOS/IOS.h
View File

@ -216,7 +216,7 @@ private:
}; };
// Used for controlling and accessing an IOS instance that is tied to emulation. // Used for controlling and accessing an IOS instance that is tied to emulation.
void Init(); void Init(Core::System& system);
void Shutdown(); void Shutdown();
EmulationKernel* GetIOS(); EmulationKernel* GetIOS();