diff options
| author | 2024-02-23 12:25:21 -0600 | |
|---|---|---|
| committer | 2024-02-23 18:58:19 -0600 | |
| commit | 0fb26acccc69a339055d4b5f11d980c8b3686193 (patch) | |
| tree | 44d034e3b8c92284695b49927edbdbd62b208012 /src/core/hle | |
| parent | Merge pull request #13141 from liamwhite/swap (diff) | |
| download | yuzu-0fb26acccc69a339055d4b5f11d980c8b3686193.tar.gz yuzu-0fb26acccc69a339055d4b5f11d980c8b3686193.tar.xz yuzu-0fb26acccc69a339055d4b5f11d980c8b3686193.zip | |
service: set: Add default eula setting
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/service/set/settings_types.h | 3 | ||||
| -rw-r--r-- | src/core/hle/service/set/system_settings_server.cpp | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/src/core/hle/service/set/settings_types.h b/src/core/hle/service/set/settings_types.h index 29664e88c..4fd34f46b 100644 --- a/src/core/hle/service/set/settings_types.h +++ b/src/core/hle/service/set/settings_types.h | |||
| @@ -405,8 +405,7 @@ struct EulaVersion { | |||
| 405 | SystemRegionCode region_code; | 405 | SystemRegionCode region_code; |
| 406 | EulaVersionClockType clock_type; | 406 | EulaVersionClockType clock_type; |
| 407 | INSERT_PADDING_BYTES(0x4); | 407 | INSERT_PADDING_BYTES(0x4); |
| 408 | s64 posix_time; | 408 | Service::PSC::Time::SystemClockContext system_clock_context; |
| 409 | Service::PSC::Time::SteadyClockTimePoint timestamp; | ||
| 410 | }; | 409 | }; |
| 411 | static_assert(sizeof(EulaVersion) == 0x30, "EulaVersion is incorrect size"); | 410 | static_assert(sizeof(EulaVersion) == 0x30, "EulaVersion is incorrect size"); |
| 412 | 411 | ||
diff --git a/src/core/hle/service/set/system_settings_server.cpp b/src/core/hle/service/set/system_settings_server.cpp index 93925f783..45def67db 100644 --- a/src/core/hle/service/set/system_settings_server.cpp +++ b/src/core/hle/service/set/system_settings_server.cpp | |||
| @@ -306,6 +306,17 @@ ISystemSettingsServer::ISystemSettingsServer(Core::System& system_) | |||
| 306 | RegisterHandlers(functions); | 306 | RegisterHandlers(functions); |
| 307 | 307 | ||
| 308 | SetupSettings(); | 308 | SetupSettings(); |
| 309 | |||
| 310 | // TODO: Remove this when starter applet is fully functional | ||
| 311 | EulaVersion eula_version{ | ||
| 312 | .version = 0x10000, | ||
| 313 | .region_code = m_system_settings.region_code, | ||
| 314 | .clock_type = EulaVersionClockType::SteadyClock, | ||
| 315 | .system_clock_context = m_system_settings.user_system_clock_context, | ||
| 316 | }; | ||
| 317 | m_system_settings.eula_versions[0] = eula_version; | ||
| 318 | m_system_settings.eula_version_count = 1; | ||
| 319 | |||
| 309 | m_save_thread = | 320 | m_save_thread = |
| 310 | std::jthread([this](std::stop_token stop_token) { StoreSettingsThreadFunc(stop_token); }); | 321 | std::jthread([this](std::stop_token stop_token) { StoreSettingsThreadFunc(stop_token); }); |
| 311 | } | 322 | } |