From 2786d34dd7c03f493b0cdc220189446f63646dfe Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Mon, 19 Feb 2024 18:58:57 +0100 Subject: [PATCH] aoc: Rename AOC_U to IAddOnContentManager --- src/core/CMakeLists.txt | 4 +- .../{aoc_u.cpp => addon_content_manager.cpp} | 60 ++++++++++--------- .../aoc/{aoc_u.h => addon_content_manager.h} | 6 +- .../service/aoc/purchase_event_manager.cpp | 4 +- src/core/hle/service/services.cpp | 2 +- 5 files changed, 40 insertions(+), 36 deletions(-) rename src/core/hle/service/aoc/{aoc_u.cpp => addon_content_manager.cpp} (70%) rename src/core/hle/service/aoc/{aoc_u.h => addon_content_manager.h} (89%) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index d923a9a55..a54325f68 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -481,8 +481,8 @@ add_library(core STATIC hle/service/am/service/system_applet_proxy.h hle/service/am/service/window_controller.cpp hle/service/am/service/window_controller.h - hle/service/aoc/aoc_u.cpp - hle/service/aoc/aoc_u.h + hle/service/aoc/addon_content_manager.cpp + hle/service/aoc/addon_content_manager.h hle/service/aoc/purchase_event_manager.cpp hle/service/aoc/purchase_event_manager.h hle/service/apm/apm.cpp diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/addon_content_manager.cpp similarity index 70% rename from src/core/hle/service/aoc/aoc_u.cpp rename to src/core/hle/service/aoc/addon_content_manager.cpp index 82b95b704..d47f57d64 100644 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ b/src/core/hle/service/aoc/addon_content_manager.cpp @@ -15,7 +15,7 @@ #include "core/file_sys/patch_manager.h" #include "core/file_sys/registered_cache.h" #include "core/hle/kernel/k_event.h" -#include "core/hle/service/aoc/aoc_u.h" +#include "core/hle/service/aoc/addon_content_manager.h" #include "core/hle/service/aoc/purchase_event_manager.h" #include "core/hle/service/cmif_serialization.h" #include "core/hle/service/ipc_helpers.h" @@ -46,28 +46,28 @@ static std::vector AccumulateAOCTitleIDs(Core::System& system) { return add_on_content; } -AOC_U::AOC_U(Core::System& system_) +IAddOnContentManager::IAddOnContentManager(Core::System& system_) : ServiceFramework{system_, "aoc:u"}, add_on_content{AccumulateAOCTitleIDs(system)}, service_context{system_, "aoc:u"} { // clang-format off static const FunctionInfo functions[] = { {0, nullptr, "CountAddOnContentByApplicationId"}, {1, nullptr, "ListAddOnContentByApplicationId"}, - {2, D<&AOC_U::CountAddOnContent>, "CountAddOnContent"}, - {3, D<&AOC_U::ListAddOnContent>, "ListAddOnContent"}, + {2, D<&IAddOnContentManager::CountAddOnContent>, "CountAddOnContent"}, + {3, D<&IAddOnContentManager::ListAddOnContent>, "ListAddOnContent"}, {4, nullptr, "GetAddOnContentBaseIdByApplicationId"}, - {5, D<&AOC_U::GetAddOnContentBaseId>, "GetAddOnContentBaseId"}, + {5, D<&IAddOnContentManager::GetAddOnContentBaseId>, "GetAddOnContentBaseId"}, {6, nullptr, "PrepareAddOnContentByApplicationId"}, - {7, D<&AOC_U::PrepareAddOnContent>, "PrepareAddOnContent"}, - {8, D<&AOC_U::GetAddOnContentListChangedEvent>, "GetAddOnContentListChangedEvent"}, + {7, D<&IAddOnContentManager::PrepareAddOnContent>, "PrepareAddOnContent"}, + {8, D<&IAddOnContentManager::GetAddOnContentListChangedEvent>, "GetAddOnContentListChangedEvent"}, {9, nullptr, "GetAddOnContentLostErrorCode"}, - {10, D<&AOC_U::GetAddOnContentListChangedEventWithProcessId>, "GetAddOnContentListChangedEventWithProcessId"}, - {11, D<&AOC_U::NotifyMountAddOnContent>, "NotifyMountAddOnContent"}, - {12, D<&AOC_U::NotifyUnmountAddOnContent>, "NotifyUnmountAddOnContent"}, + {10, D<&IAddOnContentManager::GetAddOnContentListChangedEventWithProcessId>, "GetAddOnContentListChangedEventWithProcessId"}, + {11, D<&IAddOnContentManager::NotifyMountAddOnContent>, "NotifyMountAddOnContent"}, + {12, D<&IAddOnContentManager::NotifyUnmountAddOnContent>, "NotifyUnmountAddOnContent"}, {13, nullptr, "IsAddOnContentMountedForDebug"}, - {50, D<&AOC_U::CheckAddOnContentMountStatus>, "CheckAddOnContentMountStatus"}, - {100, D<&AOC_U::CreateEcPurchasedEventManager>, "CreateEcPurchasedEventManager"}, - {101, D<&AOC_U::CreatePermanentEcPurchasedEventManager>, "CreatePermanentEcPurchasedEventManager"}, + {50, D<&IAddOnContentManager::CheckAddOnContentMountStatus>, "CheckAddOnContentMountStatus"}, + {100, D<&IAddOnContentManager::CreateEcPurchasedEventManager>, "CreateEcPurchasedEventManager"}, + {101, D<&IAddOnContentManager::CreatePermanentEcPurchasedEventManager>, "CreatePermanentEcPurchasedEventManager"}, {110, nullptr, "CreateContentsServiceManager"}, {200, nullptr, "SetRequiredAddOnContentsOnContentsAvailabilityTransition"}, {300, nullptr, "SetupHostAddOnContent"}, @@ -81,11 +81,11 @@ AOC_U::AOC_U(Core::System& system_) aoc_change_event = service_context.CreateEvent("GetAddOnContentListChanged:Event"); } -AOC_U::~AOC_U() { +IAddOnContentManager::~IAddOnContentManager() { service_context.CloseEvent(aoc_change_event); } -Result AOC_U::CountAddOnContent(Out out_count, ClientProcessId process_id) { +Result IAddOnContentManager::CountAddOnContent(Out out_count, ClientProcessId process_id) { LOG_DEBUG(Service_AOC, "called. process_id={}", process_id.pid); const auto current = system.GetApplicationProcessProgramID(); @@ -103,8 +103,9 @@ Result AOC_U::CountAddOnContent(Out out_count, ClientProcessId process_id) R_SUCCEED(); } -Result AOC_U::ListAddOnContent(Out out_count, OutBuffer out_addons, - u32 offset, u32 count, ClientProcessId process_id) { +Result IAddOnContentManager::ListAddOnContent(Out out_count, + OutBuffer out_addons, + u32 offset, u32 count, ClientProcessId process_id) { LOG_DEBUG(Service_AOC, "called with offset={}, count={}, process_id={}", offset, count, process_id.pid); @@ -128,12 +129,13 @@ Result AOC_U::ListAddOnContent(Out out_count, OutBuffer(std::min(out.size() - offset, count)); std::rotate(out.begin(), out.begin() + offset, out.end()); - std::memcpy(out_addons.data(), out.data(), *out_count); + std::memcpy(out_addons.data(), out.data(), *out_count * sizeof(u32)); R_SUCCEED(); } -Result AOC_U::GetAddOnContentBaseId(Out out_title_id, ClientProcessId process_id) { +Result IAddOnContentManager::GetAddOnContentBaseId(Out out_title_id, + ClientProcessId process_id) { LOG_DEBUG(Service_AOC, "called. process_id={}", process_id.pid); const auto title_id = system.GetApplicationProcessProgramID(); @@ -151,14 +153,15 @@ Result AOC_U::GetAddOnContentBaseId(Out out_title_id, ClientProcessId proce R_SUCCEED(); } -Result AOC_U::PrepareAddOnContent(s32 addon_index, ClientProcessId process_id) { +Result IAddOnContentManager::PrepareAddOnContent(s32 addon_index, ClientProcessId process_id) { LOG_WARNING(Service_AOC, "(STUBBED) called with addon_index={}, process_id={}", addon_index, process_id.pid); R_SUCCEED(); } -Result AOC_U::GetAddOnContentListChangedEvent(OutCopyHandle out_event) { +Result IAddOnContentManager::GetAddOnContentListChangedEvent( + OutCopyHandle out_event) { LOG_WARNING(Service_AOC, "(STUBBED) called"); *out_event = &aoc_change_event->GetReadableEvent(); @@ -166,7 +169,7 @@ Result AOC_U::GetAddOnContentListChangedEvent(OutCopyHandle out_event, ClientProcessId process_id) { LOG_WARNING(Service_AOC, "(STUBBED) called"); @@ -175,25 +178,26 @@ Result AOC_U::GetAddOnContentListChangedEventWithProcessId( R_SUCCEED(); } -Result AOC_U::NotifyMountAddOnContent() { +Result IAddOnContentManager::NotifyMountAddOnContent() { LOG_WARNING(Service_AOC, "(STUBBED) called"); R_SUCCEED(); } -Result AOC_U::NotifyUnmountAddOnContent() { +Result IAddOnContentManager::NotifyUnmountAddOnContent() { LOG_WARNING(Service_AOC, "(STUBBED) called"); R_SUCCEED(); } -Result AOC_U::CheckAddOnContentMountStatus() { +Result IAddOnContentManager::CheckAddOnContentMountStatus() { LOG_WARNING(Service_AOC, "(STUBBED) called"); R_SUCCEED(); } -Result AOC_U::CreateEcPurchasedEventManager(OutInterface out_interface) { +Result IAddOnContentManager::CreateEcPurchasedEventManager( + OutInterface out_interface) { LOG_WARNING(Service_AOC, "(STUBBED) called"); *out_interface = std::make_shared(system); @@ -201,7 +205,7 @@ Result AOC_U::CreateEcPurchasedEventManager(OutInterface R_SUCCEED(); } -Result AOC_U::CreatePermanentEcPurchasedEventManager( +Result IAddOnContentManager::CreatePermanentEcPurchasedEventManager( OutInterface out_interface) { LOG_WARNING(Service_AOC, "(STUBBED) called"); @@ -212,7 +216,7 @@ Result AOC_U::CreatePermanentEcPurchasedEventManager( void LoopProcess(Core::System& system) { auto server_manager = std::make_unique(system); - server_manager->RegisterNamedService("aoc:u", std::make_shared(system)); + server_manager->RegisterNamedService("aoc:u", std::make_shared(system)); ServerManager::RunServer(std::move(server_manager)); } diff --git a/src/core/hle/service/aoc/aoc_u.h b/src/core/hle/service/aoc/addon_content_manager.h similarity index 89% rename from src/core/hle/service/aoc/aoc_u.h rename to src/core/hle/service/aoc/addon_content_manager.h index c7b94a933..91857df4c 100644 --- a/src/core/hle/service/aoc/aoc_u.h +++ b/src/core/hle/service/aoc/addon_content_manager.h @@ -19,10 +19,10 @@ namespace Service::AOC { class IPurchaseEventManager; -class AOC_U final : public ServiceFramework { +class IAddOnContentManager final : public ServiceFramework { public: - explicit AOC_U(Core::System& system); - ~AOC_U() override; + explicit IAddOnContentManager(Core::System& system); + ~IAddOnContentManager() override; Result CountAddOnContent(Out out_count, ClientProcessId process_id); Result ListAddOnContent(Out out_count, OutBuffer out_addons, diff --git a/src/core/hle/service/aoc/purchase_event_manager.cpp b/src/core/hle/service/aoc/purchase_event_manager.cpp index 1192263f8..9e718510b 100644 --- a/src/core/hle/service/aoc/purchase_event_manager.cpp +++ b/src/core/hle/service/aoc/purchase_event_manager.cpp @@ -9,8 +9,8 @@ namespace Service::AOC { constexpr Result ResultNoPurchasedProductInfoAvailable{ErrorModule::NIMShop, 400}; IPurchaseEventManager::IPurchaseEventManager(Core::System& system_) - : ServiceFramework{system_, "IPurchaseEventManager"}, - service_context{system, "IPurchaseEventManager"} { + : ServiceFramework{system_, "IPurchaseEventManager"}, service_context{system, + "IPurchaseEventManager"} { // clang-format off static const FunctionInfo functions[] = { {0, D<&IPurchaseEventManager::SetDefaultDeliveryTarget>, "SetDefaultDeliveryTarget"}, diff --git a/src/core/hle/service/services.cpp b/src/core/hle/service/services.cpp index d6c6eff50..a2a3e556c 100644 --- a/src/core/hle/service/services.cpp +++ b/src/core/hle/service/services.cpp @@ -5,7 +5,7 @@ #include "core/hle/service/acc/acc.h" #include "core/hle/service/am/am.h" -#include "core/hle/service/aoc/aoc_u.h" +#include "core/hle/service/aoc/addon_content_manager.h" #include "core/hle/service/apm/apm.h" #include "core/hle/service/audio/audio.h" #include "core/hle/service/bcat/bcat.h"