diff --git a/Source/Core/Core/HW/HW.cpp b/Source/Core/Core/HW/HW.cpp index b031d24cad..1b142c2a07 100644 --- a/Source/Core/Core/HW/HW.cpp +++ b/Source/Core/Core/HW/HW.cpp @@ -57,7 +57,7 @@ void Init(Core::System& system, const Sram* override_sram) if (SConfig::GetInstance().bWii) { IOS::Init(); - IOS::HLE::Init(); // Depends on Memory + IOS::HLE::Init(system); // Depends on Memory } } diff --git a/Source/Core/Core/IOS/DI/DI.h b/Source/Core/Core/IOS/DI/DI.h index 117e603768..6a101f4ce2 100644 --- a/Source/Core/Core/IOS/DI/DI.h +++ b/Source/Core/Core/IOS/DI/DI.h @@ -120,7 +120,7 @@ private: }; friend class ::CBoot; - friend void ::IOS::HLE::Init(); + friend void ::IOS::HLE::Init(Core::System&); void ProcessQueuedIOCtl(); std::optional StartIOCtl(const IOCtlRequest& request); diff --git a/Source/Core/Core/IOS/IOS.cpp b/Source/Core/Core/IOS/IOS.cpp index c1f61db88a..a0b7e665ae 100644 --- a/Source/Core/Core/IOS/IOS.cpp +++ b/Source/Core/Core/IOS/IOS.cpp @@ -949,9 +949,8 @@ static void FinishPPCBootstrap(Core::System& system, u64 userdata, s64 cycles_la INFO_LOG_FMT(IOS, "Bootstrapping done."); } -void Init() +void Init(Core::System& system) { - auto& system = Core::System::GetInstance(); auto& core_timing = system.GetCoreTiming(); s_event_enqueue = diff --git a/Source/Core/Core/IOS/IOS.h b/Source/Core/Core/IOS/IOS.h index 96d1b1904f..148be1e850 100644 --- a/Source/Core/Core/IOS/IOS.h +++ b/Source/Core/Core/IOS/IOS.h @@ -216,7 +216,7 @@ private: }; // Used for controlling and accessing an IOS instance that is tied to emulation. -void Init(); +void Init(Core::System& system); void Shutdown(); EmulationKernel* GetIOS();