1 files changed, 24 insertions, 17 deletions
diff --git a/src/core/hle/service/set/system_settings_server.h b/src/core/hle/service/set/system_settings_server.h
index 32716f567..acbda8b8c 100644
--- a/src/core/hle/service/set/system_settings_server.h
+++ b/src/core/hle/service/set/system_settings_server.h
@@ -11,14 +11,13 @@
 #include "common/polyfill_thread.h"
 #include "common/uuid.h"
 #include "core/hle/result.h"
+#include "core/hle/service/psc/time/common.h"
 #include "core/hle/service/service.h"
 #include "core/hle/service/set/setting_formats/appln_settings.h"
 #include "core/hle/service/set/setting_formats/device_settings.h"
 #include "core/hle/service/set/setting_formats/private_settings.h"
 #include "core/hle/service/set/setting_formats/system_settings.h"
 #include "core/hle/service/set/settings_types.h"
-#include "core/hle/service/time/clock_types.h"
-#include "core/hle/service/time/time_zone_types.h"
 
 namespace Core {
 class System;
@@ -49,26 +48,28 @@ public:
         return result;
     }
 
-    Result GetExternalSteadyClockSourceId(Common::UUID& out_id);
-    Result SetExternalSteadyClockSourceId(Common::UUID id);
-    Result GetUserSystemClockContext(Service::Time::Clock::SystemClockContext& out_context);
-    Result SetUserSystemClockContext(Service::Time::Clock::SystemClockContext& context);
-    Result GetDeviceTimeZoneLocationName(Service::Time::TimeZone::LocationName& out_name);
-    Result SetDeviceTimeZoneLocationName(Service::Time::TimeZone::LocationName& name);
-    Result GetNetworkSystemClockContext(Service::Time::Clock::SystemClockContext& out_context);
-    Result SetNetworkSystemClockContext(Service::Time::Clock::SystemClockContext& context);
-    Result IsUserSystemClockAutomaticCorrectionEnabled(bool& out_enabled);
+    Result GetVibrationMasterVolume(f32& out_volume) const;
+    Result SetVibrationMasterVolume(f32 volume);
+    Result GetExternalSteadyClockSourceId(Common::UUID& out_id) const;
+    Result SetExternalSteadyClockSourceId(const Common::UUID& id);
+    Result GetUserSystemClockContext(Service::PSC::Time::SystemClockContext& out_context) const;
+    Result SetUserSystemClockContext(const Service::PSC::Time::SystemClockContext& context);
+    Result GetDeviceTimeZoneLocationName(Service::PSC::Time::LocationName& out_name) const;
+    Result SetDeviceTimeZoneLocationName(const Service::PSC::Time::LocationName& name);
+    Result GetNetworkSystemClockContext(Service::PSC::Time::SystemClockContext& out_context) const;
+    Result SetNetworkSystemClockContext(const Service::PSC::Time::SystemClockContext& context);
+    Result IsUserSystemClockAutomaticCorrectionEnabled(bool& out_enabled) const;
     Result SetUserSystemClockAutomaticCorrectionEnabled(bool enabled);
     Result SetExternalSteadyClockInternalOffset(s64 offset);
-    Result GetExternalSteadyClockInternalOffset(s64& out_offset);
+    Result GetExternalSteadyClockInternalOffset(s64& out_offset) const;
     Result GetDeviceTimeZoneLocationUpdatedTime(
-        Service::Time::Clock::SteadyClockTimePoint& out_time_point);
+        Service::PSC::Time::SteadyClockTimePoint& out_time_point) const;
     Result SetDeviceTimeZoneLocationUpdatedTime(
-        Service::Time::Clock::SteadyClockTimePoint& time_point);
+        const Service::PSC::Time::SteadyClockTimePoint& time_point);
     Result GetUserSystemClockAutomaticCorrectionUpdatedTime(
-        Service::Time::Clock::SteadyClockTimePoint& out_time_point);
+        Service::PSC::Time::SteadyClockTimePoint& out_time_point) const;
     Result SetUserSystemClockAutomaticCorrectionUpdatedTime(
-        Service::Time::Clock::SteadyClockTimePoint time_point);
+        const Service::PSC::Time::SteadyClockTimePoint& time_point);
 
 private:
     void SetLanguageCode(HLERequestContext& ctx);
@@ -90,12 +91,17 @@ private:
     void SetNotificationSettings(HLERequestContext& ctx);
     void GetAccountNotificationSettings(HLERequestContext& ctx);
     void SetAccountNotificationSettings(HLERequestContext& ctx);
+    void GetVibrationMasterVolume(HLERequestContext& ctx);
+    void SetVibrationMasterVolume(HLERequestContext& ctx);
     void GetSettingsItemValueSize(HLERequestContext& ctx);
     void GetSettingsItemValue(HLERequestContext& ctx);
     void GetTvSettings(HLERequestContext& ctx);
     void SetTvSettings(HLERequestContext& ctx);
+    void IsForceMuteOnHeadphoneRemoved(HLERequestContext& ctx);
+    void SetForceMuteOnHeadphoneRemoved(HLERequestContext& ctx);
     void GetDebugModeFlag(HLERequestContext& ctx);
     void GetQuestFlag(HLERequestContext& ctx);
+    void SetQuestFlag(HLERequestContext& ctx);
     void GetDeviceTimeZoneLocationName(HLERequestContext& ctx);
     void SetDeviceTimeZoneLocationName(HLERequestContext& ctx);
     void SetRegionCode(HLERequestContext& ctx);
@@ -104,6 +110,7 @@ private:
     void IsUserSystemClockAutomaticCorrectionEnabled(HLERequestContext& ctx);
     void SetUserSystemClockAutomaticCorrectionEnabled(HLERequestContext& ctx);
     void GetPrimaryAlbumStorage(HLERequestContext& ctx);
+    void SetPrimaryAlbumStorage(HLERequestContext& ctx);
     void GetNfcEnableFlag(HLERequestContext& ctx);
     void SetNfcEnableFlag(HLERequestContext& ctx);
     void GetSleepSettings(HLERequestContext& ctx);
@@ -147,8 +154,8 @@ private:
     PrivateSettings m_private_settings{};
     DeviceSettings m_device_settings{};
     ApplnSettings m_appln_settings{};
-    std::jthread m_save_thread;
     std::mutex m_save_needed_mutex;
+    std::jthread m_save_thread;
     bool m_save_needed{false};
 };