2026-09-27 03:54:16

Signed-off-by: lizzie <lizzie@eden-emu.dev>

src/core/hle/service/psc/time/alarms.cpp

@@ -33,8 +33,7 @@ Alarm::~Alarm() {
 }
 
 Alarms::Alarms(Core::System& system, StandardSteadyClockCore& steady_clock, PowerStateRequestManager& power_state_request_manager)
-    : m_system{system}
-    , m_ctx{system, "Psc:Alarms"}
+    : m_ctx{system, "Psc:Alarms"}
     , m_steady_clock{steady_clock}
     , m_power_state_request_manager{power_state_request_manager}
     , m_event{m_ctx.CreateEvent("Psc:Alarms:Event")}

src/core/hle/service/psc/time/alarms.h

@@ -95,7 +95,6 @@ private:
     void Erase(Kernel::KernelCore& kernel, Alarm& alarm);
     Result UpdateClosestAndSignal(Kernel::KernelCore& kernel);
 
-    Core::System& m_system;
     KernelHelpers::ServiceContext m_ctx;
 
     StandardSteadyClockCore& m_steady_clock;

src/core/hle/service/psc/time/manager.h

@@ -23,20 +23,20 @@ namespace Service::PSC::Time {
 class TimeManager {
 public:
     explicit TimeManager(Core::System& system)
-        : m_system{system}, m_standard_steady_clock{system}, m_tick_based_steady_clock{m_system},
-          m_standard_local_system_clock{m_standard_steady_clock},
-          m_standard_network_system_clock{m_standard_steady_clock},
-          m_standard_user_system_clock{m_system, m_standard_local_system_clock,
-                                       m_standard_network_system_clock},
-          m_ephemeral_network_clock{m_tick_based_steady_clock}, m_shared_memory{m_system},
-          m_power_state_request_manager{m_system}, m_alarms{m_system, m_standard_steady_clock,
-                                                            m_power_state_request_manager},
-          m_local_system_clock_context_writer{m_system, m_shared_memory},
-          m_network_system_clock_context_writer{m_system, m_shared_memory,
-                                                m_standard_user_system_clock},
-          m_ephemeral_network_clock_context_writer{m_system} {}
-
-    Core::System& m_system;
+        : m_standard_steady_clock{system}
+        , m_tick_based_steady_clock{system}
+        , m_standard_local_system_clock{m_standard_steady_clock}
+        , m_standard_network_system_clock{m_standard_steady_clock}
+        , m_standard_user_system_clock{system, m_standard_local_system_clock
+        , m_standard_network_system_clock}
+        , m_ephemeral_network_clock{m_tick_based_steady_clock}
+        , m_shared_memory{system}
+        , m_power_state_request_manager{system}
+        , m_alarms{system, m_standard_steady_clock, m_power_state_request_manager}
+        , m_local_system_clock_context_writer{system, m_shared_memory}
+        , m_network_system_clock_context_writer{system, m_shared_memory, m_standard_user_system_clock}
+        , m_ephemeral_network_clock_context_writer{system}
+    {}
 
     StandardSteadyClockCore m_standard_steady_clock;
     TickBasedSteadyClockCore m_tick_based_steady_clock;

src/core/hle/service/set/system_settings_server.cpp

@@ -346,7 +346,7 @@ std::optional<ServiceFrameworkBase::FunctionInfoBase> ISystemSettingsServer::Fin
 }
 
 ISystemSettingsServer::ISystemSettingsServer(Core::System& system_)
-    : ServiceFramework{system_, "set:sys"}, m_system{system} {
+    : ServiceFramework{system_, "set:sys"} {
     SetupSettings();
 
     m_system_settings.region_code =

src/core/hle/service/set/system_settings_server.h

@@ -180,7 +180,6 @@ private:
     void SetSaveNeeded();
 
     std::optional<FunctionInfoBase> FindRequest(u32 key) override;
-    Core::System& m_system;
     SystemSettings m_system_settings{};
     PrivateSettings m_private_settings{};
     DeviceSettings m_device_settings{};

src/core/hle/service/vi/shared_buffer_manager.h

@@ -18,6 +18,10 @@ class KPageGroup;
 class KReadableEvent;
 } // namespace Kernel
 
+namespace Core {
+class System;
+}
+
 namespace Service::android {
 class BufferQueueProducer;
 }