artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

aoc: Rename AOC_U to IAddOnContentManager

Browse source
This commit is contained in:
FearlessTobi 2024-02-19 18:58:57 +01:00
parent a2a0be4246
commit 2786d34dd7
5 changed files with 40 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/CMakeLists.txt
View file

@ -481,8 +481,8 @@ add_library(core STATIC
hle/service/am/service/system_applet_proxy.h hle/service/am/service/system_applet_proxy.h
hle/service/am/service/window_controller.cpp hle/service/am/service/window_controller.cpp
hle/service/am/service/window_controller.h hle/service/am/service/window_controller.h
hle/service/aoc/aoc_u.cpp hle/service/aoc/addon_content_manager.cpp
hle/service/aoc/aoc_u.h hle/service/aoc/addon_content_manager.h
hle/service/aoc/purchase_event_manager.cpp hle/service/aoc/purchase_event_manager.cpp
hle/service/aoc/purchase_event_manager.h hle/service/aoc/purchase_event_manager.h
hle/service/apm/apm.cpp hle/service/apm/apm.cpp

58
src/core/hle/service/aoc/aoc_u.cpp → src/core/hle/service/aoc/addon_content_manager.cpp
View file

@ -15,7 +15,7 @@
#include "core/file_sys/patch_manager.h" #include "core/file_sys/patch_manager.h"
#include "core/file_sys/registered_cache.h" #include "core/file_sys/registered_cache.h"
#include "core/hle/kernel/k_event.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/aoc/purchase_event_manager.h"
#include "core/hle/service/cmif_serialization.h" #include "core/hle/service/cmif_serialization.h"
#include "core/hle/service/ipc_helpers.h" #include "core/hle/service/ipc_helpers.h"
@ -46,28 +46,28 @@ static std::vector<u64> AccumulateAOCTitleIDs(Core::System& system) {
return add_on_content; 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)}, : ServiceFramework{system_, "aoc:u"}, add_on_content{AccumulateAOCTitleIDs(system)},
service_context{system_, "aoc:u"} { service_context{system_, "aoc:u"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, nullptr, "CountAddOnContentByApplicationId"}, {0, nullptr, "CountAddOnContentByApplicationId"},
{1, nullptr, "ListAddOnContentByApplicationId"}, {1, nullptr, "ListAddOnContentByApplicationId"},
{2, D<&AOC_U::CountAddOnContent>, "CountAddOnContent"}, {2, D<&IAddOnContentManager::CountAddOnContent>, "CountAddOnContent"},
{3, D<&AOC_U::ListAddOnContent>, "ListAddOnContent"}, {3, D<&IAddOnContentManager::ListAddOnContent>, "ListAddOnContent"},
{4, nullptr, "GetAddOnContentBaseIdByApplicationId"}, {4, nullptr, "GetAddOnContentBaseIdByApplicationId"},
{5, D<&AOC_U::GetAddOnContentBaseId>, "GetAddOnContentBaseId"}, {5, D<&IAddOnContentManager::GetAddOnContentBaseId>, "GetAddOnContentBaseId"},
{6, nullptr, "PrepareAddOnContentByApplicationId"}, {6, nullptr, "PrepareAddOnContentByApplicationId"},
{7, D<&AOC_U::PrepareAddOnContent>, "PrepareAddOnContent"}, {7, D<&IAddOnContentManager::PrepareAddOnContent>, "PrepareAddOnContent"},
{8, D<&AOC_U::GetAddOnContentListChangedEvent>, "GetAddOnContentListChangedEvent"}, {8, D<&IAddOnContentManager::GetAddOnContentListChangedEvent>, "GetAddOnContentListChangedEvent"},
{9, nullptr, "GetAddOnContentLostErrorCode"}, {9, nullptr, "GetAddOnContentLostErrorCode"},
{10, D<&AOC_U::GetAddOnContentListChangedEventWithProcessId>, "GetAddOnContentListChangedEventWithProcessId"}, {10, D<&IAddOnContentManager::GetAddOnContentListChangedEventWithProcessId>, "GetAddOnContentListChangedEventWithProcessId"},
{11, D<&AOC_U::NotifyMountAddOnContent>, "NotifyMountAddOnContent"}, {11, D<&IAddOnContentManager::NotifyMountAddOnContent>, "NotifyMountAddOnContent"},
{12, D<&AOC_U::NotifyUnmountAddOnContent>, "NotifyUnmountAddOnContent"}, {12, D<&IAddOnContentManager::NotifyUnmountAddOnContent>, "NotifyUnmountAddOnContent"},
{13, nullptr, "IsAddOnContentMountedForDebug"}, {13, nullptr, "IsAddOnContentMountedForDebug"},
{50, D<&AOC_U::CheckAddOnContentMountStatus>, "CheckAddOnContentMountStatus"}, {50, D<&IAddOnContentManager::CheckAddOnContentMountStatus>, "CheckAddOnContentMountStatus"},
{100, D<&AOC_U::CreateEcPurchasedEventManager>, "CreateEcPurchasedEventManager"}, {100, D<&IAddOnContentManager::CreateEcPurchasedEventManager>, "CreateEcPurchasedEventManager"},
{101, D<&AOC_U::CreatePermanentEcPurchasedEventManager>, "CreatePermanentEcPurchasedEventManager"}, {101, D<&IAddOnContentManager::CreatePermanentEcPurchasedEventManager>, "CreatePermanentEcPurchasedEventManager"},
{110, nullptr, "CreateContentsServiceManager"}, {110, nullptr, "CreateContentsServiceManager"},
{200, nullptr, "SetRequiredAddOnContentsOnContentsAvailabilityTransition"}, {200, nullptr, "SetRequiredAddOnContentsOnContentsAvailabilityTransition"},
{300, nullptr, "SetupHostAddOnContent"}, {300, nullptr, "SetupHostAddOnContent"},
@ -81,11 +81,11 @@ AOC_U::AOC_U(Core::System& system_)
aoc_change_event = service_context.CreateEvent("GetAddOnContentListChanged:Event"); aoc_change_event = service_context.CreateEvent("GetAddOnContentListChanged:Event");
} }
AOC_U::~AOC_U() { IAddOnContentManager::~IAddOnContentManager() {
service_context.CloseEvent(aoc_change_event); service_context.CloseEvent(aoc_change_event);
} }
Result AOC_U::CountAddOnContent(Out<u32> out_count, ClientProcessId process_id) { Result IAddOnContentManager::CountAddOnContent(Out<u32> out_count, ClientProcessId process_id) {
LOG_DEBUG(Service_AOC, "called. process_id={}", process_id.pid); LOG_DEBUG(Service_AOC, "called. process_id={}", process_id.pid);
const auto current = system.GetApplicationProcessProgramID(); const auto current = system.GetApplicationProcessProgramID();
@ -103,7 +103,8 @@ Result AOC_U::CountAddOnContent(Out<u32> out_count, ClientProcessId process_id)
R_SUCCEED(); R_SUCCEED();
} }
Result AOC_U::ListAddOnContent(Out<u32> out_count, OutBuffer<BufferAttr_HipcMapAlias> out_addons, Result IAddOnContentManager::ListAddOnContent(Out<u32> out_count,
OutBuffer<BufferAttr_HipcMapAlias> out_addons,
u32 offset, u32 count, ClientProcessId process_id) { u32 offset, u32 count, ClientProcessId process_id) {
LOG_DEBUG(Service_AOC, "called with offset={}, count={}, process_id={}", offset, count, LOG_DEBUG(Service_AOC, "called with offset={}, count={}, process_id={}", offset, count,
process_id.pid); process_id.pid);
@ -128,12 +129,13 @@ Result AOC_U::ListAddOnContent(Out<u32> out_count, OutBuffer<BufferAttr_HipcMapA
*out_count = static_cast<u32>(std::min<size_t>(out.size() - offset, count)); *out_count = static_cast<u32>(std::min<size_t>(out.size() - offset, count));
std::rotate(out.begin(), out.begin() + offset, out.end()); 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(); R_SUCCEED();
} }
Result AOC_U::GetAddOnContentBaseId(Out<u64> out_title_id, ClientProcessId process_id) { Result IAddOnContentManager::GetAddOnContentBaseId(Out<u64> out_title_id,
ClientProcessId process_id) {
LOG_DEBUG(Service_AOC, "called. process_id={}", process_id.pid); LOG_DEBUG(Service_AOC, "called. process_id={}", process_id.pid);
const auto title_id = system.GetApplicationProcessProgramID(); const auto title_id = system.GetApplicationProcessProgramID();
@ -151,14 +153,15 @@ Result AOC_U::GetAddOnContentBaseId(Out<u64> out_title_id, ClientProcessId proce
R_SUCCEED(); 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, LOG_WARNING(Service_AOC, "(STUBBED) called with addon_index={}, process_id={}", addon_index,
process_id.pid); process_id.pid);
R_SUCCEED(); R_SUCCEED();
} }
Result AOC_U::GetAddOnContentListChangedEvent(OutCopyHandle<Kernel::KReadableEvent> out_event) { Result IAddOnContentManager::GetAddOnContentListChangedEvent(
OutCopyHandle<Kernel::KReadableEvent> out_event) {
LOG_WARNING(Service_AOC, "(STUBBED) called"); LOG_WARNING(Service_AOC, "(STUBBED) called");
*out_event = &aoc_change_event->GetReadableEvent(); *out_event = &aoc_change_event->GetReadableEvent();
@ -166,7 +169,7 @@ Result AOC_U::GetAddOnContentListChangedEvent(OutCopyHandle<Kernel::KReadableEve
R_SUCCEED(); R_SUCCEED();
} }
Result AOC_U::GetAddOnContentListChangedEventWithProcessId( Result IAddOnContentManager::GetAddOnContentListChangedEventWithProcessId(
OutCopyHandle<Kernel::KReadableEvent> out_event, ClientProcessId process_id) { OutCopyHandle<Kernel::KReadableEvent> out_event, ClientProcessId process_id) {
LOG_WARNING(Service_AOC, "(STUBBED) called"); LOG_WARNING(Service_AOC, "(STUBBED) called");
@ -175,25 +178,26 @@ Result AOC_U::GetAddOnContentListChangedEventWithProcessId(
R_SUCCEED(); R_SUCCEED();
} }
Result AOC_U::NotifyMountAddOnContent() { Result IAddOnContentManager::NotifyMountAddOnContent() {
LOG_WARNING(Service_AOC, "(STUBBED) called"); LOG_WARNING(Service_AOC, "(STUBBED) called");
R_SUCCEED(); R_SUCCEED();
} }
Result AOC_U::NotifyUnmountAddOnContent() { Result IAddOnContentManager::NotifyUnmountAddOnContent() {
LOG_WARNING(Service_AOC, "(STUBBED) called"); LOG_WARNING(Service_AOC, "(STUBBED) called");
R_SUCCEED(); R_SUCCEED();
} }
Result AOC_U::CheckAddOnContentMountStatus() { Result IAddOnContentManager::CheckAddOnContentMountStatus() {
LOG_WARNING(Service_AOC, "(STUBBED) called"); LOG_WARNING(Service_AOC, "(STUBBED) called");
R_SUCCEED(); R_SUCCEED();
} }
Result AOC_U::CreateEcPurchasedEventManager(OutInterface<IPurchaseEventManager> out_interface) { Result IAddOnContentManager::CreateEcPurchasedEventManager(
OutInterface<IPurchaseEventManager> out_interface) {
LOG_WARNING(Service_AOC, "(STUBBED) called"); LOG_WARNING(Service_AOC, "(STUBBED) called");
*out_interface = std::make_shared<IPurchaseEventManager>(system); *out_interface = std::make_shared<IPurchaseEventManager>(system);
@ -201,7 +205,7 @@ Result AOC_U::CreateEcPurchasedEventManager(OutInterface<IPurchaseEventManager>
R_SUCCEED(); R_SUCCEED();
} }
Result AOC_U::CreatePermanentEcPurchasedEventManager( Result IAddOnContentManager::CreatePermanentEcPurchasedEventManager(
OutInterface<IPurchaseEventManager> out_interface) { OutInterface<IPurchaseEventManager> out_interface) {
LOG_WARNING(Service_AOC, "(STUBBED) called"); LOG_WARNING(Service_AOC, "(STUBBED) called");
@ -212,7 +216,7 @@ Result AOC_U::CreatePermanentEcPurchasedEventManager(
void LoopProcess(Core::System& system) { void LoopProcess(Core::System& system) {
auto server_manager = std::make_unique<ServerManager>(system); auto server_manager = std::make_unique<ServerManager>(system);
server_manager->RegisterNamedService("aoc:u", std::make_shared<AOC_U>(system)); server_manager->RegisterNamedService("aoc:u", std::make_shared<IAddOnContentManager>(system));
ServerManager::RunServer(std::move(server_manager)); ServerManager::RunServer(std::move(server_manager));
} }

6
src/core/hle/service/aoc/aoc_u.h → src/core/hle/service/aoc/addon_content_manager.h
View file

@ -19,10 +19,10 @@ namespace Service::AOC {
class IPurchaseEventManager; class IPurchaseEventManager;
class AOC_U final : public ServiceFramework<AOC_U> { class IAddOnContentManager final : public ServiceFramework<IAddOnContentManager> {
public: public:
explicit AOC_U(Core::System& system); explicit IAddOnContentManager(Core::System& system);
~AOC_U() override; ~IAddOnContentManager() override;
Result CountAddOnContent(Out<u32> out_count, ClientProcessId process_id); Result CountAddOnContent(Out<u32> out_count, ClientProcessId process_id);
Result ListAddOnContent(Out<u32> out_count, OutBuffer<BufferAttr_HipcMapAlias> out_addons, Result ListAddOnContent(Out<u32> out_count, OutBuffer<BufferAttr_HipcMapAlias> out_addons,

4
src/core/hle/service/aoc/purchase_event_manager.cpp
View file

@ -9,8 +9,8 @@ namespace Service::AOC {
constexpr Result ResultNoPurchasedProductInfoAvailable{ErrorModule::NIMShop, 400}; constexpr Result ResultNoPurchasedProductInfoAvailable{ErrorModule::NIMShop, 400};
IPurchaseEventManager::IPurchaseEventManager(Core::System& system_) IPurchaseEventManager::IPurchaseEventManager(Core::System& system_)
: ServiceFramework{system_, "IPurchaseEventManager"}, : ServiceFramework{system_, "IPurchaseEventManager"}, service_context{system,
service_context{system, "IPurchaseEventManager"} { "IPurchaseEventManager"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, D<&IPurchaseEventManager::SetDefaultDeliveryTarget>, "SetDefaultDeliveryTarget"}, {0, D<&IPurchaseEventManager::SetDefaultDeliveryTarget>, "SetDefaultDeliveryTarget"},

2
src/core/hle/service/services.cpp
View file

@ -5,7 +5,7 @@
#include "core/hle/service/acc/acc.h" #include "core/hle/service/acc/acc.h"
#include "core/hle/service/am/am.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/apm/apm.h"
#include "core/hle/service/audio/audio.h" #include "core/hle/service/audio/audio.h"
#include "core/hle/service/bcat/bcat.h" #include "core/hle/service/bcat/bcat.h"