VERY experimental Nintendo Switch 2 emulator
C++
ns: move ISystemUpdateControl
Liambea44994ee00
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txtindex 12a6fe2734..fdd1c54acc 100644--- a/src/core/CMakeLists.txt+++ b/src/core/CMakeLists.txt@@ -769,6 +769,8 @@ add_library(core STATIChle/service/ns/read_only_application_control_data_interface.hhle/service/ns/read_only_application_record_interface.cpphle/service/ns/read_only_application_record_interface.h+ hle/service/ns/system_update_control.cpp+ hle/service/ns/system_update_control.hhle/service/ns/vulnerability_manager_interface.cpphle/service/ns/vulnerability_manager_interface.hhle/service/nvdrv/core/container.cppdiff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cppindex 39d3c67c04..89700ae017 100644--- a/src/core/hle/service/ns/ns.cpp+++ b/src/core/hle/service/ns/ns.cpp@@ -26,6 +26,7 @@#include "core/hle/service/ns/platform_service_manager.h"#include "core/hle/service/ns/read_only_application_control_data_interface.h"#include "core/hle/service/ns/read_only_application_record_interface.h"+#include "core/hle/service/ns/system_update_control.h"#include "core/hle/service/ns/vulnerability_manager_interface.h"#include "core/hle/service/server_manager.h"#include "core/hle/service/set/settings_server.h"@@ -528,42 +529,6 @@ public:}};-class ISystemUpdateControl final : public ServiceFramework<ISystemUpdateControl> {-public:- explicit ISystemUpdateControl(Core::System& system_)- : ServiceFramework{system_, "ISystemUpdateControl"} {- // clang-format off- static const FunctionInfo functions[] = {- {0, nullptr, "HasDownloaded"},- {1, nullptr, "RequestCheckLatestUpdate"},- {2, nullptr, "RequestDownloadLatestUpdate"},- {3, nullptr, "GetDownloadProgress"},- {4, nullptr, "ApplyDownloadedUpdate"},- {5, nullptr, "RequestPrepareCardUpdate"},- {6, nullptr, "GetPrepareCardUpdateProgress"},- {7, nullptr, "HasPreparedCardUpdate"},- {8, nullptr, "ApplyCardUpdate"},- {9, nullptr, "GetDownloadedEulaDataSize"},- {10, nullptr, "GetDownloadedEulaData"},- {11, nullptr, "SetupCardUpdate"},- {12, nullptr, "GetPreparedCardUpdateEulaDataSize"},- {13, nullptr, "GetPreparedCardUpdateEulaData"},- {14, nullptr, "SetupCardUpdateViaSystemUpdater"},- {15, nullptr, "HasReceived"},- {16, nullptr, "RequestReceiveSystemUpdate"},- {17, nullptr, "GetReceiveProgress"},- {18, nullptr, "ApplyReceivedUpdate"},- {19, nullptr, "GetReceivedEulaDataSize"},- {20, nullptr, "GetReceivedEulaData"},- {21, nullptr, "SetupToReceiveSystemUpdate"},- {22, nullptr, "RequestCheckLatestUpdateIncludesRebootlessUpdate"},- };- // clang-format on-- RegisterHandlers(functions);- }-};-class NS_SU final : public ServiceFramework<NS_SU> {public:explicit NS_SU(Core::System& system_) : ServiceFramework{system_, "ns:su"} {diff --git a/src/core/hle/service/ns/system_update_control.cpp b/src/core/hle/service/ns/system_update_control.cppnew file mode 100644index 0000000000..f5f5cfd909--- /dev/null+++ b/src/core/hle/service/ns/system_update_control.cpp@@ -0,0 +1,44 @@+// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#include "core/hle/service/cmif_serialization.h"+#include "core/hle/service/ns/system_update_control.h"++namespace Service::NS {++ISystemUpdateControl::ISystemUpdateControl(Core::System& system_)+ : ServiceFramework{system_, "ISystemUpdateControl"} {+ // clang-format off+ static const FunctionInfo functions[] = {+ {0, nullptr, "HasDownloaded"},+ {1, nullptr, "RequestCheckLatestUpdate"},+ {2, nullptr, "RequestDownloadLatestUpdate"},+ {3, nullptr, "GetDownloadProgress"},+ {4, nullptr, "ApplyDownloadedUpdate"},+ {5, nullptr, "RequestPrepareCardUpdate"},+ {6, nullptr, "GetPrepareCardUpdateProgress"},+ {7, nullptr, "HasPreparedCardUpdate"},+ {8, nullptr, "ApplyCardUpdate"},+ {9, nullptr, "GetDownloadedEulaDataSize"},+ {10, nullptr, "GetDownloadedEulaData"},+ {11, nullptr, "SetupCardUpdate"},+ {12, nullptr, "GetPreparedCardUpdateEulaDataSize"},+ {13, nullptr, "GetPreparedCardUpdateEulaData"},+ {14, nullptr, "SetupCardUpdateViaSystemUpdater"},+ {15, nullptr, "HasReceived"},+ {16, nullptr, "RequestReceiveSystemUpdate"},+ {17, nullptr, "GetReceiveProgress"},+ {18, nullptr, "ApplyReceivedUpdate"},+ {19, nullptr, "GetReceivedEulaDataSize"},+ {20, nullptr, "GetReceivedEulaData"},+ {21, nullptr, "SetupToReceiveSystemUpdate"},+ {22, nullptr, "RequestCheckLatestUpdateIncludesRebootlessUpdate"},+ };+ // clang-format on++ RegisterHandlers(functions);+}++ISystemUpdateControl::~ISystemUpdateControl() = default;++} // namespace Service::NSdiff --git a/src/core/hle/service/ns/system_update_control.h b/src/core/hle/service/ns/system_update_control.hnew file mode 100644index 0000000000..a30a090000--- /dev/null+++ b/src/core/hle/service/ns/system_update_control.h@@ -0,0 +1,16 @@+// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#pragma once++#include "core/hle/service/service.h"++namespace Service::NS {++class ISystemUpdateControl final : public ServiceFramework<ISystemUpdateControl> {+public:+ explicit ISystemUpdateControl(Core::System& system_);+ ~ISystemUpdateControl() override;+};++} // namespace Service::NS