VERY experimental Nintendo Switch 2 emulator
C++
ns: move IApplicationVersionInterface
Liambd69199bdd39
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txtindex 351446eb0c..1f2c8183e7 100644--- a/src/core/CMakeLists.txt+++ b/src/core/CMakeLists.txt@@ -741,6 +741,8 @@ add_library(core STATIChle/service/npns/npns.hhle/service/ns/account_proxy_interface.cpphle/service/ns/account_proxy_interface.h+ hle/service/ns/application_version_interface.cpp+ hle/service/ns/application_version_interface.hhle/service/ns/language.cpphle/service/ns/language.hhle/service/ns/ns_results.hdiff --git a/src/core/hle/service/ns/application_version_interface.cpp b/src/core/hle/service/ns/application_version_interface.cppnew file mode 100644index 0000000000..b89e127dbe--- /dev/null+++ b/src/core/hle/service/ns/application_version_interface.cpp@@ -0,0 +1,33 @@+// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#include "core/hle/service/ns/application_version_interface.h"++namespace Service::NS {++IApplicationVersionInterface::IApplicationVersionInterface(Core::System& system_)+ : ServiceFramework{system_, "IApplicationVersionInterface"} {+ // clang-format off+ static const FunctionInfo functions[] = {+ {0, nullptr, "GetLaunchRequiredVersion"},+ {1, nullptr, "UpgradeLaunchRequiredVersion"},+ {35, nullptr, "UpdateVersionList"},+ {36, nullptr, "PushLaunchVersion"},+ {37, nullptr, "ListRequiredVersion"},+ {800, nullptr, "RequestVersionList"},+ {801, nullptr, "ListVersionList"},+ {802, nullptr, "RequestVersionListData"},+ {900, nullptr, "ImportAutoUpdatePolicyJsonForDebug"},+ {901, nullptr, "ListDefaultAutoUpdatePolicy"},+ {902, nullptr, "ListAutoUpdatePolicyForSpecificApplication"},+ {1000, nullptr, "PerformAutoUpdate"},+ {1001, nullptr, "ListAutoUpdateSchedule"},+ };+ // clang-format on++ RegisterHandlers(functions);+}++IApplicationVersionInterface::~IApplicationVersionInterface() = default;++} // namespace Service::NSdiff --git a/src/core/hle/service/ns/application_version_interface.h b/src/core/hle/service/ns/application_version_interface.hnew file mode 100644index 0000000000..b288cff1be--- /dev/null+++ b/src/core/hle/service/ns/application_version_interface.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 IApplicationVersionInterface final : public ServiceFramework<IApplicationVersionInterface> {+public:+ explicit IApplicationVersionInterface(Core::System& system_);+ ~IApplicationVersionInterface() override;+};++} // namespace Service::NSdiff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cppindex b586fbcf09..7a28df1473 100644--- a/src/core/hle/service/ns/ns.cpp+++ b/src/core/hle/service/ns/ns.cpp@@ -12,6 +12,7 @@#include "core/hle/service/glue/glue_manager.h"#include "core/hle/service/ipc_helpers.h"#include "core/hle/service/ns/account_proxy_interface.h"+#include "core/hle/service/ns/application_version_interface.h"#include "core/hle/service/ns/language.h"#include "core/hle/service/ns/ns.h"#include "core/hle/service/ns/ns_results.h"@@ -461,31 +462,6 @@ Result IApplicationManagerInterface::ConvertApplicationLanguageToLanguageCode(return ResultSuccess;}-IApplicationVersionInterface::IApplicationVersionInterface(Core::System& system_)- : ServiceFramework{system_, "IApplicationVersionInterface"} {- // clang-format off- static const FunctionInfo functions[] = {- {0, nullptr, "GetLaunchRequiredVersion"},- {1, nullptr, "UpgradeLaunchRequiredVersion"},- {35, nullptr, "UpdateVersionList"},- {36, nullptr, "PushLaunchVersion"},- {37, nullptr, "ListRequiredVersion"},- {800, nullptr, "RequestVersionList"},- {801, nullptr, "ListVersionList"},- {802, nullptr, "RequestVersionListData"},- {900, nullptr, "ImportAutoUpdatePolicyJsonForDebug"},- {901, nullptr, "ListDefaultAutoUpdatePolicy"},- {902, nullptr, "ListAutoUpdatePolicyForSpecificApplication"},- {1000, nullptr, "PerformAutoUpdate"},- {1001, nullptr, "ListAutoUpdateSchedule"},- };- // clang-format on-- RegisterHandlers(functions);-}--IApplicationVersionInterface::~IApplicationVersionInterface() = default;-IContentManagementInterface::IContentManagementInterface(Core::System& system_): ServiceFramework{system_, "IContentManagementInterface"} {// clang-format offdiff --git a/src/core/hle/service/ns/ns.h b/src/core/hle/service/ns/ns.hindex cd2fbc8f47..d017f10fc1 100644--- a/src/core/hle/service/ns/ns.h+++ b/src/core/hle/service/ns/ns.h@@ -32,12 +32,6 @@ private:void ConvertApplicationLanguageToLanguageCode(HLERequestContext& ctx);};-class IApplicationVersionInterface final : public ServiceFramework<IApplicationVersionInterface> {-public:- explicit IApplicationVersionInterface(Core::System& system_);- ~IApplicationVersionInterface() override;-};-class IContentManagementInterface final : public ServiceFramework<IContentManagementInterface> {public:explicit IContentManagementInterface(Core::System& system_);