VERY experimental Nintendo Switch 2 emulator
C++
ns: rewrite IDownloadTaskInterface
Liam780bd3276f10
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txtindex 29e29f6595..c97d3aa892 100644--- a/src/core/CMakeLists.txt+++ b/src/core/CMakeLists.txt@@ -747,6 +747,8 @@ add_library(core STATIChle/service/ns/content_management_interface.hhle/service/ns/document_interface.cpphle/service/ns/document_interface.h+ hle/service/ns/download_task_interface.cpp+ hle/service/ns/download_task_interface.hhle/service/ns/ecommerce_interface.cpphle/service/ns/ecommerce_interface.hhle/service/ns/factory_reset_interface.cppdiff --git a/src/core/hle/service/ns/download_task_interface.cpp b/src/core/hle/service/ns/download_task_interface.cppnew file mode 100644index 0000000000..62dc7f1874--- /dev/null+++ b/src/core/hle/service/ns/download_task_interface.cpp@@ -0,0 +1,39 @@+// 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/download_task_interface.h"++namespace Service::NS {++IDownloadTaskInterface::IDownloadTaskInterface(Core::System& system_)+ : ServiceFramework{system_, "IDownloadTaskInterface"} {+ // clang-format off+ static const FunctionInfo functions[] = {+ {701, nullptr, "ClearTaskStatusList"},+ {702, nullptr, "RequestDownloadTaskList"},+ {703, nullptr, "RequestEnsureDownloadTask"},+ {704, nullptr, "ListDownloadTaskStatus"},+ {705, nullptr, "RequestDownloadTaskListData"},+ {706, nullptr, "TryCommitCurrentApplicationDownloadTask"},+ {707, D<&IDownloadTaskInterface::EnableAutoCommit>, "EnableAutoCommit"},+ {708, D<&IDownloadTaskInterface::DisableAutoCommit>, "DisableAutoCommit"},+ {709, nullptr, "TriggerDynamicCommitEvent"},+ };+ // clang-format on++ RegisterHandlers(functions);+}++IDownloadTaskInterface::~IDownloadTaskInterface() = default;++Result IDownloadTaskInterface::EnableAutoCommit() {+ LOG_WARNING(Service_NS, "(STUBBED) called");+ R_SUCCEED();+}+Result IDownloadTaskInterface::DisableAutoCommit() {+ LOG_WARNING(Service_NS, "(STUBBED) called");+ R_SUCCEED();+}++} // namespace Service::NSdiff --git a/src/core/hle/service/ns/download_task_interface.h b/src/core/hle/service/ns/download_task_interface.hnew file mode 100644index 0000000000..b1cb69cb86--- /dev/null+++ b/src/core/hle/service/ns/download_task_interface.h@@ -0,0 +1,20 @@+// 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 IDownloadTaskInterface final : public ServiceFramework<IDownloadTaskInterface> {+public:+ explicit IDownloadTaskInterface(Core::System& system_);+ ~IDownloadTaskInterface() override;++private:+ Result EnableAutoCommit();+ Result DisableAutoCommit();+};++} // namespace Service::NSdiff --git a/src/core/hle/service/ns/ns.cpp b/src/core/hle/service/ns/ns.cppindex b98fa2c960..451fc2b8d6 100644--- a/src/core/hle/service/ns/ns.cpp+++ b/src/core/hle/service/ns/ns.cpp@@ -15,6 +15,7 @@#include "core/hle/service/ns/application_version_interface.h"#include "core/hle/service/ns/content_management_interface.h"#include "core/hle/service/ns/document_interface.h"+#include "core/hle/service/ns/download_task_interface.h"#include "core/hle/service/ns/ecommerce_interface.h"#include "core/hle/service/ns/factory_reset_interface.h"#include "core/hle/service/ns/language.h"@@ -466,27 +467,6 @@ Result IApplicationManagerInterface::ConvertApplicationLanguageToLanguageCode(return ResultSuccess;}-IDownloadTaskInterface::IDownloadTaskInterface(Core::System& system_)- : ServiceFramework{system_, "IDownloadTaskInterface"} {- // clang-format off- static const FunctionInfo functions[] = {- {701, nullptr, "ClearTaskStatusList"},- {702, nullptr, "RequestDownloadTaskList"},- {703, nullptr, "RequestEnsureDownloadTask"},- {704, nullptr, "ListDownloadTaskStatus"},- {705, nullptr, "RequestDownloadTaskListData"},- {706, nullptr, "TryCommitCurrentApplicationDownloadTask"},- {707, nullptr, "EnableAutoCommit"},- {708, nullptr, "DisableAutoCommit"},- {709, nullptr, "TriggerDynamicCommitEvent"},- };- // clang-format on-- RegisterHandlers(functions);-}--IDownloadTaskInterface::~IDownloadTaskInterface() = default;-IReadOnlyApplicationRecordInterface::IReadOnlyApplicationRecordInterface(Core::System& system_): ServiceFramework{system_, "IReadOnlyApplicationRecordInterface"} {static const FunctionInfo functions[] = {diff --git a/src/core/hle/service/ns/ns.h b/src/core/hle/service/ns/ns.hindex 3e838373c0..197895cdfe 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 IDownloadTaskInterface final : public ServiceFramework<IDownloadTaskInterface> {-public:- explicit IDownloadTaskInterface(Core::System& system_);- ~IDownloadTaskInterface() override;-};-class IReadOnlyApplicationRecordInterface final: public ServiceFramework<IReadOnlyApplicationRecordInterface> {public: