summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/core/hle/service/aoc/aoc_u.cpp168
-rw-r--r--src/core/hle/service/aoc/aoc_u.h30
-rw-r--r--src/core/hle/service/aoc/purchase_event_manager.cpp56
-rw-r--r--src/core/hle/service/aoc/purchase_event_manager.h12
4 files changed, 109 insertions, 157 deletions
diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp
index 31c7385ee..82b95b704 100644
--- a/src/core/hle/service/aoc/aoc_u.cpp
+++ b/src/core/hle/service/aoc/aoc_u.cpp
@@ -17,6 +17,7 @@
#include "core/hle/kernel/k_event.h"
#include "core/hle/service/aoc/aoc_u.h"
#include "core/hle/service/aoc/purchase_event_manager.h"
+#include "core/hle/service/cmif_serialization.h"
#include "core/hle/service/ipc_helpers.h"
#include "core/hle/service/server_manager.h"
#include "core/loader/loader.h"
@@ -52,21 +53,21 @@ AOC_U::AOC_U(Core::System& system_)
static const FunctionInfo functions[] = {
{0, nullptr, "CountAddOnContentByApplicationId"},
{1, nullptr, "ListAddOnContentByApplicationId"},
- {2, &AOC_U::CountAddOnContent, "CountAddOnContent"},
- {3, &AOC_U::ListAddOnContent, "ListAddOnContent"},
+ {2, D<&AOC_U::CountAddOnContent>, "CountAddOnContent"},
+ {3, D<&AOC_U::ListAddOnContent>, "ListAddOnContent"},
{4, nullptr, "GetAddOnContentBaseIdByApplicationId"},
- {5, &AOC_U::GetAddOnContentBaseId, "GetAddOnContentBaseId"},
+ {5, D<&AOC_U::GetAddOnContentBaseId>, "GetAddOnContentBaseId"},
{6, nullptr, "PrepareAddOnContentByApplicationId"},
- {7, &AOC_U::PrepareAddOnContent, "PrepareAddOnContent"},
- {8, &AOC_U::GetAddOnContentListChangedEvent, "GetAddOnContentListChangedEvent"},
+ {7, D<&AOC_U::PrepareAddOnContent>, "PrepareAddOnContent"},
+ {8, D<&AOC_U::GetAddOnContentListChangedEvent>, "GetAddOnContentListChangedEvent"},
{9, nullptr, "GetAddOnContentLostErrorCode"},
- {10, &AOC_U::GetAddOnContentListChangedEventWithProcessId, "GetAddOnContentListChangedEventWithProcessId"},
- {11, &AOC_U::NotifyMountAddOnContent, "NotifyMountAddOnContent"},
- {12, &AOC_U::NotifyUnmountAddOnContent, "NotifyUnmountAddOnContent"},
+ {10, D<&AOC_U::GetAddOnContentListChangedEventWithProcessId>, "GetAddOnContentListChangedEventWithProcessId"},
+ {11, D<&AOC_U::NotifyMountAddOnContent>, "NotifyMountAddOnContent"},
+ {12, D<&AOC_U::NotifyUnmountAddOnContent>, "NotifyUnmountAddOnContent"},
{13, nullptr, "IsAddOnContentMountedForDebug"},
- {50, &AOC_U::CheckAddOnContentMountStatus, "CheckAddOnContentMountStatus"},
- {100, &AOC_U::CreateEcPurchasedEventManager, "CreateEcPurchasedEventManager"},
- {101, &AOC_U::CreatePermanentEcPurchasedEventManager, "CreatePermanentEcPurchasedEventManager"},
+ {50, D<&AOC_U::CheckAddOnContentMountStatus>, "CheckAddOnContentMountStatus"},
+ {100, D<&AOC_U::CreateEcPurchasedEventManager>, "CreateEcPurchasedEventManager"},
+ {101, D<&AOC_U::CreatePermanentEcPurchasedEventManager>, "CreatePermanentEcPurchasedEventManager"},
{110, nullptr, "CreateContentsServiceManager"},
{200, nullptr, "SetRequiredAddOnContentsOnContentsAvailabilityTransition"},
{300, nullptr, "SetupHostAddOnContent"},
@@ -84,46 +85,28 @@ AOC_U::~AOC_U() {
service_context.CloseEvent(aoc_change_event);
}
-void AOC_U::CountAddOnContent(HLERequestContext& ctx) {
- struct Parameters {
- u64 process_id;
- };
- static_assert(sizeof(Parameters) == 8);
-
- IPC::RequestParser rp{ctx};
- const auto params = rp.PopRaw<Parameters>();
-
- LOG_DEBUG(Service_AOC, "called. process_id={}", params.process_id);
-
- IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(ResultSuccess);
+Result AOC_U::CountAddOnContent(Out<u32> out_count, ClientProcessId process_id) {
+ LOG_DEBUG(Service_AOC, "called. process_id={}", process_id.pid);
const auto current = system.GetApplicationProcessProgramID();
const auto& disabled = Settings::values.disabled_addons[current];
if (std::find(disabled.begin(), disabled.end(), "DLC") != disabled.end()) {
- rb.Push<u32>(0);
- return;
+ *out_count = 0;
+ R_SUCCEED();
}
- rb.Push<u32>(static_cast<u32>(
+ *out_count = static_cast<u32>(
std::count_if(add_on_content.begin(), add_on_content.end(),
- [current](u64 tid) { return CheckAOCTitleIDMatchesBase(tid, current); })));
-}
+ [current](u64 tid) { return CheckAOCTitleIDMatchesBase(tid, current); }));
-void AOC_U::ListAddOnContent(HLERequestContext& ctx) {
- struct Parameters {
- u32 offset;
- u32 count;
- u64 process_id;
- };
- static_assert(sizeof(Parameters) == 16);
-
- IPC::RequestParser rp{ctx};
- const auto [offset, count, process_id] = rp.PopRaw<Parameters>();
+ R_SUCCEED();
+}
+Result AOC_U::ListAddOnContent(Out<u32> out_count, OutBuffer<BufferAttr_HipcMapAlias> out_addons,
+ u32 offset, u32 count, ClientProcessId process_id) {
LOG_DEBUG(Service_AOC, "called with offset={}, count={}, process_id={}", offset, count,
- process_id);
+ process_id.pid);
const auto current = FileSys::GetBaseTitleID(system.GetApplicationProcessProgramID());
@@ -139,37 +122,19 @@ void AOC_U::ListAddOnContent(HLERequestContext& ctx) {
}
}
- if (out.size() < offset) {
- IPC::ResponseBuilder rb{ctx, 2};
- // TODO(DarkLordZach): Find the correct error code.
- rb.Push(ResultUnknown);
- return;
- }
+ // TODO(DarkLordZach): Find the correct error code.
+ R_UNLESS(out.size() >= offset, ResultUnknown);
- const auto 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());
- out.resize(out_count);
- ctx.WriteBuffer(out);
+ std::memcpy(out_addons.data(), out.data(), *out_count);
- IPC::ResponseBuilder rb{ctx, 3};
- rb.Push(ResultSuccess);
- rb.Push(out_count);
+ R_SUCCEED();
}
-void AOC_U::GetAddOnContentBaseId(HLERequestContext& ctx) {
- struct Parameters {
- u64 process_id;
- };
- static_assert(sizeof(Parameters) == 8);
-
- IPC::RequestParser rp{ctx};
- const auto params = rp.PopRaw<Parameters>();
-
- LOG_DEBUG(Service_AOC, "called. process_id={}", params.process_id);
-
- IPC::ResponseBuilder rb{ctx, 4};
- rb.Push(ResultSuccess);
+Result AOC_U::GetAddOnContentBaseId(Out<u64> out_title_id, ClientProcessId process_id) {
+ LOG_DEBUG(Service_AOC, "called. process_id={}", process_id.pid);
const auto title_id = system.GetApplicationProcessProgramID();
const FileSys::PatchManager pm{title_id, system.GetFileSystemController(),
@@ -177,81 +142,72 @@ void AOC_U::GetAddOnContentBaseId(HLERequestContext& ctx) {
const auto res = pm.GetControlMetadata();
if (res.first == nullptr) {
- rb.Push(FileSys::GetAOCBaseTitleID(title_id));
- return;
+ *out_title_id = FileSys::GetAOCBaseTitleID(title_id);
+ R_SUCCEED();
}
- rb.Push(res.first->GetDLCBaseTitleId());
-}
-
-void AOC_U::PrepareAddOnContent(HLERequestContext& ctx) {
- struct Parameters {
- s32 addon_index;
- u64 process_id;
- };
- static_assert(sizeof(Parameters) == 16);
+ *out_title_id = res.first->GetDLCBaseTitleId();
- IPC::RequestParser rp{ctx};
- const auto [addon_index, process_id] = rp.PopRaw<Parameters>();
+ R_SUCCEED();
+}
+Result AOC_U::PrepareAddOnContent(s32 addon_index, ClientProcessId process_id) {
LOG_WARNING(Service_AOC, "(STUBBED) called with addon_index={}, process_id={}", addon_index,
- process_id);
+ process_id.pid);
- IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(ResultSuccess);
+ R_SUCCEED();
}
-void AOC_U::GetAddOnContentListChangedEvent(HLERequestContext& ctx) {
+Result AOC_U::GetAddOnContentListChangedEvent(OutCopyHandle<Kernel::KReadableEvent> out_event) {
LOG_WARNING(Service_AOC, "(STUBBED) called");
- IPC::ResponseBuilder rb{ctx, 2, 1};
- rb.Push(ResultSuccess);
- rb.PushCopyObjects(aoc_change_event->GetReadableEvent());
+ *out_event = &aoc_change_event->GetReadableEvent();
+
+ R_SUCCEED();
}
-void AOC_U::GetAddOnContentListChangedEventWithProcessId(HLERequestContext& ctx) {
+Result AOC_U::GetAddOnContentListChangedEventWithProcessId(
+ OutCopyHandle<Kernel::KReadableEvent> out_event, ClientProcessId process_id) {
LOG_WARNING(Service_AOC, "(STUBBED) called");
- IPC::ResponseBuilder rb{ctx, 2, 1};
- rb.Push(ResultSuccess);
- rb.PushCopyObjects(aoc_change_event->GetReadableEvent());
+ *out_event = &aoc_change_event->GetReadableEvent();
+
+ R_SUCCEED();
}
-void AOC_U::NotifyMountAddOnContent(HLERequestContext& ctx) {
+Result AOC_U::NotifyMountAddOnContent() {
LOG_WARNING(Service_AOC, "(STUBBED) called");
- IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(ResultSuccess);
+ R_SUCCEED();
}
-void AOC_U::NotifyUnmountAddOnContent(HLERequestContext& ctx) {
+Result AOC_U::NotifyUnmountAddOnContent() {
LOG_WARNING(Service_AOC, "(STUBBED) called");
- IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(ResultSuccess);
+ R_SUCCEED();
}
-void AOC_U::CheckAddOnContentMountStatus(HLERequestContext& ctx) {
+Result AOC_U::CheckAddOnContentMountStatus() {
LOG_WARNING(Service_AOC, "(STUBBED) called");
- IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(ResultSuccess);
+ R_SUCCEED();
}
-void AOC_U::CreateEcPurchasedEventManager(HLERequestContext& ctx) {
+Result AOC_U::CreateEcPurchasedEventManager(OutInterface<IPurchaseEventManager> out_interface) {
LOG_WARNING(Service_AOC, "(STUBBED) called");
- IPC::ResponseBuilder rb{ctx, 2, 0, 1};
- rb.Push(ResultSuccess);
- rb.PushIpcInterface<IPurchaseEventManager>(system);
+ *out_interface = std::make_shared<IPurchaseEventManager>(system);
+
+ R_SUCCEED();
}
-void AOC_U::CreatePermanentEcPurchasedEventManager(HLERequestContext& ctx) {
+Result AOC_U::CreatePermanentEcPurchasedEventManager(
+ OutInterface<IPurchaseEventManager> out_interface) {
LOG_WARNING(Service_AOC, "(STUBBED) called");
- IPC::ResponseBuilder rb{ctx, 2, 0, 1};
- rb.Push(ResultSuccess);
- rb.PushIpcInterface<IPurchaseEventManager>(system);
+ *out_interface = std::make_shared<IPurchaseEventManager>(system);
+
+ R_SUCCEED();
}
void LoopProcess(Core::System& system) {
diff --git a/src/core/hle/service/aoc/aoc_u.h b/src/core/hle/service/aoc/aoc_u.h
index 12ccfeb6a..c7b94a933 100644
--- a/src/core/hle/service/aoc/aoc_u.h
+++ b/src/core/hle/service/aoc/aoc_u.h
@@ -3,6 +3,7 @@
#pragma once
+#include "core/hle/service/cmif_types.h"
#include "core/hle/service/kernel_helpers.h"
#include "core/hle/service/service.h"
@@ -16,24 +17,29 @@ class KEvent;
namespace Service::AOC {
+class IPurchaseEventManager;
+
class AOC_U final : public ServiceFramework<AOC_U> {
public:
explicit AOC_U(Core::System& system);
~AOC_U() override;
-private:
- void CountAddOnContent(HLERequestContext& ctx);
- void ListAddOnContent(HLERequestContext& ctx);
- void GetAddOnContentBaseId(HLERequestContext& ctx);
- void PrepareAddOnContent(HLERequestContext& ctx);
- void GetAddOnContentListChangedEvent(HLERequestContext& ctx);
- void GetAddOnContentListChangedEventWithProcessId(HLERequestContext& ctx);
- void NotifyMountAddOnContent(HLERequestContext& ctx);
- void NotifyUnmountAddOnContent(HLERequestContext& ctx);
- void CheckAddOnContentMountStatus(HLERequestContext& ctx);
- void CreateEcPurchasedEventManager(HLERequestContext& ctx);
- void CreatePermanentEcPurchasedEventManager(HLERequestContext& ctx);
+ Result CountAddOnContent(Out<u32> out_count, ClientProcessId process_id);
+ Result ListAddOnContent(Out<u32> out_count, OutBuffer<BufferAttr_HipcMapAlias> out_addons,
+ u32 offset, u32 count, ClientProcessId process_id);
+ Result GetAddOnContentBaseId(Out<u64> out_title_id, ClientProcessId process_id);
+ Result PrepareAddOnContent(s32 addon_index, ClientProcessId process_id);
+ Result GetAddOnContentListChangedEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
+ Result GetAddOnContentListChangedEventWithProcessId(
+ OutCopyHandle<Kernel::KReadableEvent> out_event, ClientProcessId process_id);
+ Result NotifyMountAddOnContent();
+ Result NotifyUnmountAddOnContent();
+ Result CheckAddOnContentMountStatus();
+ Result CreateEcPurchasedEventManager(OutInterface<IPurchaseEventManager> out_interface);
+ Result CreatePermanentEcPurchasedEventManager(
+ OutInterface<IPurchaseEventManager> out_interface);
+private:
std::vector<u64> add_on_content;
KernelHelpers::ServiceContext service_context;
diff --git a/src/core/hle/service/aoc/purchase_event_manager.cpp b/src/core/hle/service/aoc/purchase_event_manager.cpp
index 83124cd21..1192263f8 100644
--- a/src/core/hle/service/aoc/purchase_event_manager.cpp
+++ b/src/core/hle/service/aoc/purchase_event_manager.cpp
@@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include "core/hle/service/aoc/purchase_event_manager.h"
-#include "core/hle/service/ipc_helpers.h"
+#include "core/hle/service/cmif_serialization.h"
namespace Service::AOC {
@@ -13,11 +13,11 @@ IPurchaseEventManager::IPurchaseEventManager(Core::System& system_)
service_context{system, "IPurchaseEventManager"} {
// clang-format off
static const FunctionInfo functions[] = {
- {0, &IPurchaseEventManager::SetDefaultDeliveryTarget, "SetDefaultDeliveryTarget"},
- {1, &IPurchaseEventManager::SetDeliveryTarget, "SetDeliveryTarget"},
- {2, &IPurchaseEventManager::GetPurchasedEventReadableHandle, "GetPurchasedEventReadableHandle"},
- {3, &IPurchaseEventManager::PopPurchasedProductInfo, "PopPurchasedProductInfo"},
- {4, &IPurchaseEventManager::PopPurchasedProductInfoWithUid, "PopPurchasedProductInfoWithUid"},
+ {0, D<&IPurchaseEventManager::SetDefaultDeliveryTarget>, "SetDefaultDeliveryTarget"},
+ {1, D<&IPurchaseEventManager::SetDeliveryTarget>, "SetDeliveryTarget"},
+ {2, D<&IPurchaseEventManager::GetPurchasedEvent>, "GetPurchasedEvent"},
+ {3, D<&IPurchaseEventManager::PopPurchasedProductInfo>, "PopPurchasedProductInfo"},
+ {4, D<&IPurchaseEventManager::PopPurchasedProductInfoWithUid>, "PopPurchasedProductInfoWithUid"},
};
// clang-format on
@@ -30,50 +30,38 @@ IPurchaseEventManager::~IPurchaseEventManager() {
service_context.CloseEvent(purchased_event);
}
-void IPurchaseEventManager::SetDefaultDeliveryTarget(HLERequestContext& ctx) {
- IPC::RequestParser rp{ctx};
+Result IPurchaseEventManager::SetDefaultDeliveryTarget(
+ ClientProcessId process_id, InBuffer<BufferAttr_HipcMapAlias> in_buffer) {
+ LOG_WARNING(Service_AOC, "(STUBBED) called, process_id={}", process_id.pid);
- const auto unknown_1 = rp.Pop<u64>();
- [[maybe_unused]] const auto unknown_2 = ctx.ReadBuffer();
-
- LOG_WARNING(Service_AOC, "(STUBBED) called, unknown_1={}", unknown_1);
-
- IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(ResultSuccess);
+ R_SUCCEED();
}
-void IPurchaseEventManager::SetDeliveryTarget(HLERequestContext& ctx) {
- IPC::RequestParser rp{ctx};
-
- const auto unknown_1 = rp.Pop<u64>();
- [[maybe_unused]] const auto unknown_2 = ctx.ReadBuffer();
+Result IPurchaseEventManager::SetDeliveryTarget(u64 unknown,
+ InBuffer<BufferAttr_HipcMapAlias> in_buffer) {
+ LOG_WARNING(Service_AOC, "(STUBBED) called, unknown={}", unknown);
- LOG_WARNING(Service_AOC, "(STUBBED) called, unknown_1={}", unknown_1);
-
- IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(ResultSuccess);
+ R_SUCCEED();
}
-void IPurchaseEventManager::GetPurchasedEventReadableHandle(HLERequestContext& ctx) {
+Result IPurchaseEventManager::GetPurchasedEvent(OutCopyHandle<Kernel::KReadableEvent> out_event) {
LOG_WARNING(Service_AOC, "called");
- IPC::ResponseBuilder rb{ctx, 2, 1};
- rb.Push(ResultSuccess);
- rb.PushCopyObjects(purchased_event->GetReadableEvent());
+ *out_event = &purchased_event->GetReadableEvent();
+
+ R_SUCCEED();
}
-void IPurchaseEventManager::PopPurchasedProductInfo(HLERequestContext& ctx) {
+Result IPurchaseEventManager::PopPurchasedProductInfo() {
LOG_DEBUG(Service_AOC, "(STUBBED) called");
- IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(ResultNoPurchasedProductInfoAvailable);
+ R_RETURN(ResultNoPurchasedProductInfoAvailable);
}
-void IPurchaseEventManager::PopPurchasedProductInfoWithUid(HLERequestContext& ctx) {
+Result IPurchaseEventManager::PopPurchasedProductInfoWithUid() {
LOG_DEBUG(Service_AOC, "(STUBBED) called");
- IPC::ResponseBuilder rb{ctx, 2};
- rb.Push(ResultNoPurchasedProductInfoAvailable);
+ R_RETURN(ResultNoPurchasedProductInfoAvailable);
}
} // namespace Service::AOC
diff --git a/src/core/hle/service/aoc/purchase_event_manager.h b/src/core/hle/service/aoc/purchase_event_manager.h
index efde3c8f3..ea3836bc9 100644
--- a/src/core/hle/service/aoc/purchase_event_manager.h
+++ b/src/core/hle/service/aoc/purchase_event_manager.h
@@ -3,6 +3,7 @@
#pragma once
+#include "core/hle/service/cmif_types.h"
#include "core/hle/service/kernel_helpers.h"
#include "core/hle/service/os/event.h"
#include "core/hle/service/service.h"
@@ -14,11 +15,12 @@ public:
explicit IPurchaseEventManager(Core::System& system_);
~IPurchaseEventManager() override;
- void SetDefaultDeliveryTarget(HLERequestContext& ctx);
- void SetDeliveryTarget(HLERequestContext& ctx);
- void GetPurchasedEventReadableHandle(HLERequestContext& ctx);
- void PopPurchasedProductInfo(HLERequestContext& ctx);
- void PopPurchasedProductInfoWithUid(HLERequestContext& ctx);
+ Result SetDefaultDeliveryTarget(ClientProcessId process_id,
+ InBuffer<BufferAttr_HipcMapAlias> in_buffer);
+ Result SetDeliveryTarget(u64 unknown, InBuffer<BufferAttr_HipcMapAlias> in_buffer);
+ Result GetPurchasedEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
+ Result PopPurchasedProductInfo();
+ Result PopPurchasedProductInfoWithUid();
private:
KernelHelpers::ServiceContext service_context;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 13:18:23 +0100