summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/aoc
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-10-01 21:56:39 +0200
committerGitHub <noreply@github.com>2018-10-01 21:56:39 +0200
commitbd14f397ce142f4552018554532ceb230e12bde5 (patch)
treee5eeecea0c234828c669233cea09187da3c8ed74 /src/core/hle/service/aoc
parentMerge pull request #1422 from ReinUsesLisp/fixup-points (diff)
parentaoc_u: Extract AccumulateAOCTitleIDs to separate function (diff)
downloadyuzu-bd14f397ce142f4552018554532ceb230e12bde5.tar
yuzu-bd14f397ce142f4552018554532ceb230e12bde5.tar.gz
yuzu-bd14f397ce142f4552018554532ceb230e12bde5.tar.bz2
yuzu-bd14f397ce142f4552018554532ceb230e12bde5.tar.lz
yuzu-bd14f397ce142f4552018554532ceb230e12bde5.tar.xz
yuzu-bd14f397ce142f4552018554532ceb230e12bde5.tar.zst
yuzu-bd14f397ce142f4552018554532ceb230e12bde5.zip
Diffstat (limited to 'src/core/hle/service/aoc')
-rw-r--r--src/core/hle/service/aoc/aoc_u.cpp93
-rw-r--r--src/core/hle/service/aoc/aoc_u.h4
2 files changed, 90 insertions, 7 deletions
diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp
index d9eeac9ec..cfc28fa0c 100644
--- a/src/core/hle/service/aoc/aoc_u.cpp
+++ b/src/core/hle/service/aoc/aoc_u.cpp
@@ -2,22 +2,57 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <algorithm>
+#include <numeric>
+#include <vector>
#include "common/logging/log.h"
+#include "core/file_sys/content_archive.h"
+#include "core/file_sys/nca_metadata.h"
+#include "core/file_sys/partition_filesystem.h"
+#include "core/file_sys/registered_cache.h"
#include "core/hle/ipc_helpers.h"
+#include "core/hle/kernel/process.h"
#include "core/hle/service/aoc/aoc_u.h"
+#include "core/hle/service/filesystem/filesystem.h"
+#include "core/loader/loader.h"
namespace Service::AOC {
-AOC_U::AOC_U() : ServiceFramework("aoc:u") {
+constexpr u64 DLC_BASE_TITLE_ID_MASK = 0xFFFFFFFFFFFFE000;
+constexpr u64 DLC_BASE_TO_AOC_ID_MASK = 0x1000;
+
+static bool CheckAOCTitleIDMatchesBase(u64 base, u64 aoc) {
+ return (aoc & DLC_BASE_TITLE_ID_MASK) == base;
+}
+
+static std::vector<u64> AccumulateAOCTitleIDs() {
+ std::vector<u64> add_on_content;
+ const auto rcu = FileSystem::GetUnionContents();
+ const auto list =
+ rcu->ListEntriesFilter(FileSys::TitleType::AOC, FileSys::ContentRecordType::Data);
+ std::transform(list.begin(), list.end(), std::back_inserter(add_on_content),
+ [](const FileSys::RegisteredCacheEntry& rce) { return rce.title_id; });
+ add_on_content.erase(
+ std::remove_if(
+ add_on_content.begin(), add_on_content.end(),
+ [&rcu](u64 tid) {
+ return rcu->GetEntry(tid, FileSys::ContentRecordType::Data)->GetStatus() !=
+ Loader::ResultStatus::Success;
+ }),
+ add_on_content.end());
+ return add_on_content;
+}
+
+AOC_U::AOC_U() : ServiceFramework("aoc:u"), add_on_content(AccumulateAOCTitleIDs()) {
static const FunctionInfo functions[] = {
{0, nullptr, "CountAddOnContentByApplicationId"},
{1, nullptr, "ListAddOnContentByApplicationId"},
{2, &AOC_U::CountAddOnContent, "CountAddOnContent"},
{3, &AOC_U::ListAddOnContent, "ListAddOnContent"},
{4, nullptr, "GetAddOnContentBaseIdByApplicationId"},
- {5, nullptr, "GetAddOnContentBaseId"},
+ {5, &AOC_U::GetAddOnContentBaseId, "GetAddOnContentBaseId"},
{6, nullptr, "PrepareAddOnContentByApplicationId"},
- {7, nullptr, "PrepareAddOnContent"},
+ {7, &AOC_U::PrepareAddOnContent, "PrepareAddOnContent"},
{8, nullptr, "GetAddOnContentListChangedEvent"},
};
RegisterHandlers(functions);
@@ -28,15 +63,59 @@ AOC_U::~AOC_U() = default;
void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 4};
rb.Push(RESULT_SUCCESS);
- rb.Push<u64>(0);
- LOG_WARNING(Service_AOC, "(STUBBED) called");
+
+ const auto current = Core::System::GetInstance().CurrentProcess()->GetTitleID();
+ rb.Push<u32>(std::count_if(add_on_content.begin(), add_on_content.end(), [&current](u64 tid) {
+ return (tid & DLC_BASE_TITLE_ID_MASK) == current;
+ }));
}
void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) {
+ IPC::RequestParser rp{ctx};
+
+ const auto offset = rp.PopRaw<u32>();
+ auto count = rp.PopRaw<u32>();
+
+ const auto current = Core::System::GetInstance().CurrentProcess()->GetTitleID();
+
+ std::vector<u32> out;
+ for (size_t i = 0; i < add_on_content.size(); ++i) {
+ if ((add_on_content[i] & DLC_BASE_TITLE_ID_MASK) == current)
+ out.push_back(static_cast<u32>(add_on_content[i] & 0x7FF));
+ }
+
+ if (out.size() <= offset) {
+ IPC::ResponseBuilder rb{ctx, 2};
+ // TODO(DarkLordZach): Find the correct error code.
+ rb.Push(ResultCode(-1));
+ return;
+ }
+
+ count = std::min<size_t>(out.size() - offset, count);
+ std::rotate(out.begin(), out.begin() + offset, out.end());
+ out.resize(count);
+
+ ctx.WriteBuffer(out);
+
+ IPC::ResponseBuilder rb{ctx, 2};
+ rb.Push(RESULT_SUCCESS);
+}
+
+void AOC_U::GetAddOnContentBaseId(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 4};
rb.Push(RESULT_SUCCESS);
- rb.Push<u64>(0);
- LOG_WARNING(Service_AOC, "(STUBBED) called");
+ rb.Push(Core::System::GetInstance().CurrentProcess()->GetTitleID() | DLC_BASE_TO_AOC_ID_MASK);
+}
+
+void AOC_U::PrepareAddOnContent(Kernel::HLERequestContext& ctx) {
+ IPC::RequestParser rp{ctx};
+
+ const auto aoc_id = rp.PopRaw<u32>();
+
+ LOG_WARNING(Service_AOC, "(STUBBED) called with aoc_id={:08X}", aoc_id);
+
+ IPC::ResponseBuilder rb{ctx, 2};
+ rb.Push(RESULT_SUCCESS);
}
void InstallInterfaces(SM::ServiceManager& service_manager) {
diff --git a/src/core/hle/service/aoc/aoc_u.h b/src/core/hle/service/aoc/aoc_u.h
index 29ce8f488..b3c7cab7a 100644
--- a/src/core/hle/service/aoc/aoc_u.h
+++ b/src/core/hle/service/aoc/aoc_u.h
@@ -16,6 +16,10 @@ public:
private:
void CountAddOnContent(Kernel::HLERequestContext& ctx);
void ListAddOnContent(Kernel::HLERequestContext& ctx);
+ void GetAddOnContentBaseId(Kernel::HLERequestContext& ctx);
+ void PrepareAddOnContent(Kernel::HLERequestContext& ctx);
+
+ std::vector<u64> add_on_content;
};
/// Registers all AOC services with the specified service manager.