VERY experimental Nintendo Switch 2 emulator
C++
ns: move IECommerceInterface
Liam40771d1ece15
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txtindex 1f2c8183e7..96da6ac263 100644--- a/src/core/CMakeLists.txt+++ b/src/core/CMakeLists.txt@@ -743,6 +743,8 @@ add_library(core STATIChle/service/ns/account_proxy_interface.hhle/service/ns/application_version_interface.cpphle/service/ns/application_version_interface.h+ hle/service/ns/ecommerce_interface.cpp+ hle/service/ns/ecommerce_interface.hhle/service/ns/language.cpphle/service/ns/language.hhle/service/ns/ns_results.hdiff --git a/src/core/hle/service/ns/ecommerce_interface.cpp b/src/core/hle/service/ns/ecommerce_interface.cppnew file mode 100644index 0000000000..76fc425f0c--- /dev/null+++ b/src/core/hle/service/ns/ecommerce_interface.cpp@@ -0,0 +1,27 @@+// SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project+// SPDX-License-Identifier: GPL-2.0-or-later++#include "core/hle/service/ns/ecommerce_interface.h"++namespace Service::NS {++IECommerceInterface::IECommerceInterface(Core::System& system_)+ : ServiceFramework{system_, "IECommerceInterface"} {+ // clang-format off+ static const FunctionInfo functions[] = {+ {0, nullptr, "RequestLinkDevice"},+ {1, nullptr, "RequestCleanupAllPreInstalledApplications"},+ {2, nullptr, "RequestCleanupPreInstalledApplication"},+ {3, nullptr, "RequestSyncRights"},+ {4, nullptr, "RequestUnlinkDevice"},+ {5, nullptr, "RequestRevokeAllELicense"},+ {6, nullptr, "RequestSyncRightsBasedOnAssignedELicenses"},+ };+ // clang-format on++ RegisterHandlers(functions);+}++IECommerceInterface::~IECommerceInterface() = default;++} // namespace Service::NSdiff --git a/src/core/hle/service/ns/ecommerce_interface.h b/src/core/hle/service/ns/ecommerce_interface.hnew file mode 100644index 0000000000..4352101f4a--- /dev/null+++ b/src/core/hle/service/ns/ecommerce_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 IECommerceInterface final : public ServiceFramework<IECommerceInterface> {+public:+ explicit IECommerceInterface(Core::System& system_);+ ~IECommerceInterface() override;+};++} // namespace Service::NSdiff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cppindex 7a28df1473..3b13715b87 100644--- a/src/core/hle/service/ns/ns.cpp+++ b/src/core/hle/service/ns/ns.cpp@@ -13,6 +13,7 @@#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/ecommerce_interface.h"#include "core/hle/service/ns/language.h"#include "core/hle/service/ns/ns.h"#include "core/hle/service/ns/ns_results.h"@@ -566,25 +567,6 @@ IDownloadTaskInterface::IDownloadTaskInterface(Core::System& system_)IDownloadTaskInterface::~IDownloadTaskInterface() = default;-IECommerceInterface::IECommerceInterface(Core::System& system_)- : ServiceFramework{system_, "IECommerceInterface"} {- // clang-format off- static const FunctionInfo functions[] = {- {0, nullptr, "RequestLinkDevice"},- {1, nullptr, "RequestCleanupAllPreInstalledApplications"},- {2, nullptr, "RequestCleanupPreInstalledApplication"},- {3, nullptr, "RequestSyncRights"},- {4, nullptr, "RequestUnlinkDevice"},- {5, nullptr, "RequestRevokeAllELicense"},- {6, nullptr, "RequestSyncRightsBasedOnAssignedELicenses"},- };- // clang-format on-- RegisterHandlers(functions);-}--IECommerceInterface::~IECommerceInterface() = default;-IFactoryResetInterface::IFactoryResetInterface(Core::System& system_): ServiceFramework{system_, "IFactoryResetInterface"} {// clang-format offdiff --git a/src/core/hle/service/ns/ns.h b/src/core/hle/service/ns/ns.hindex d017f10fc1..f8c6af3866 100644--- a/src/core/hle/service/ns/ns.h+++ b/src/core/hle/service/ns/ns.h@@ -58,12 +58,6 @@ public:~IDownloadTaskInterface() override;};-class IECommerceInterface final : public ServiceFramework<IECommerceInterface> {-public:- explicit IECommerceInterface(Core::System& system_);- ~IECommerceInterface() override;-};-class IFactoryResetInterface final : public ServiceFramework<IFactoryResetInterface> {public:explicit IFactoryResetInterface(Core::System& system_);