aoc_u: Implement Count, List and Prepare AddOnContent
Commands #2, #3, and #7
This commit is contained in:
parent
aa0c82e405
commit
62225ae050
|
@ -2,12 +2,27 @@
|
||||||
// Licensed under GPLv2 or any later version
|
// Licensed under GPLv2 or any later version
|
||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#include <numeric>
|
||||||
#include "common/logging/log.h"
|
#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/ipc_helpers.h"
|
||||||
|
#include "core/hle/kernel/process.h"
|
||||||
#include "core/hle/service/aoc/aoc_u.h"
|
#include "core/hle/service/aoc/aoc_u.h"
|
||||||
|
#include "core/hle/service/filesystem/filesystem.h"
|
||||||
|
#include "core/loader/loader.h"
|
||||||
|
|
||||||
namespace Service::AOC {
|
namespace Service::AOC {
|
||||||
|
|
||||||
|
constexpr u64 DLC_BASE_TITLE_ID_MASK = 0xFFFFFFFFFFFFE000;
|
||||||
|
constexpr u64 DLC_BASE_TO_AOC_ID_MASK = 0x1000;
|
||||||
|
|
||||||
|
bool CheckAOCTitleIDMatchesBase(u64 base, u64 aoc) {
|
||||||
|
return (aoc & DLC_BASE_TITLE_ID_MASK) == base;
|
||||||
|
}
|
||||||
|
|
||||||
AOC_U::AOC_U() : ServiceFramework("aoc:u") {
|
AOC_U::AOC_U() : ServiceFramework("aoc:u") {
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{0, nullptr, "CountAddOnContentByApplicationId"},
|
{0, nullptr, "CountAddOnContentByApplicationId"},
|
||||||
|
@ -17,10 +32,25 @@ AOC_U::AOC_U() : ServiceFramework("aoc:u") {
|
||||||
{4, nullptr, "GetAddOnContentBaseIdByApplicationId"},
|
{4, nullptr, "GetAddOnContentBaseIdByApplicationId"},
|
||||||
{5, nullptr, "GetAddOnContentBaseId"},
|
{5, nullptr, "GetAddOnContentBaseId"},
|
||||||
{6, nullptr, "PrepareAddOnContentByApplicationId"},
|
{6, nullptr, "PrepareAddOnContentByApplicationId"},
|
||||||
{7, nullptr, "PrepareAddOnContent"},
|
{7, &AOC_U::PrepareAddOnContent, "PrepareAddOnContent"},
|
||||||
{8, nullptr, "GetAddOnContentListChangedEvent"},
|
{8, nullptr, "GetAddOnContentListChangedEvent"},
|
||||||
};
|
};
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
|
|
||||||
|
// Accumulate AOC title ids
|
||||||
|
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());
|
||||||
}
|
}
|
||||||
|
|
||||||
AOC_U::~AOC_U() = default;
|
AOC_U::~AOC_U() = default;
|
||||||
|
@ -28,15 +58,57 @@ AOC_U::~AOC_U() = default;
|
||||||
void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) {
|
void AOC_U::CountAddOnContent(Kernel::HLERequestContext& ctx) {
|
||||||
IPC::ResponseBuilder rb{ctx, 4};
|
IPC::ResponseBuilder rb{ctx, 4};
|
||||||
rb.Push(RESULT_SUCCESS);
|
rb.Push(RESULT_SUCCESS);
|
||||||
rb.Push<u64>(0);
|
|
||||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
const auto current = Core::System::GetInstance().CurrentProcess()->program_id;
|
||||||
|
rb.Push<u32>(std::count_if(add_on_content.begin(), add_on_content.end(), [¤t](u64 tid) {
|
||||||
|
return (tid & DLC_BASE_TITLE_ID_MASK) == current;
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
void AOC_U::ListAddOnContent(Kernel::HLERequestContext& ctx) {
|
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()->program_id;
|
||||||
|
|
||||||
|
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);
|
||||||
|
out = std::vector<u32>(out.begin() + offset, out.begin() + offset + count);
|
||||||
|
|
||||||
|
ctx.WriteBuffer(out);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2};
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
}
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 4};
|
IPC::ResponseBuilder rb{ctx, 4};
|
||||||
rb.Push(RESULT_SUCCESS);
|
rb.Push(RESULT_SUCCESS);
|
||||||
rb.Push<u64>(0);
|
rb.Push<u64>(0);
|
||||||
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
LOG_WARNING(Service_AOC, "(STUBBED) called");
|
||||||
|
|
||||||
|
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) {
|
void InstallInterfaces(SM::ServiceManager& service_manager) {
|
||||||
|
|
|
@ -16,6 +16,9 @@ public:
|
||||||
private:
|
private:
|
||||||
void CountAddOnContent(Kernel::HLERequestContext& ctx);
|
void CountAddOnContent(Kernel::HLERequestContext& ctx);
|
||||||
void ListAddOnContent(Kernel::HLERequestContext& ctx);
|
void ListAddOnContent(Kernel::HLERequestContext& ctx);
|
||||||
|
void PrepareAddOnContent(Kernel::HLERequestContext& ctx);
|
||||||
|
|
||||||
|
std::vector<u64> add_on_content;
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Registers all AOC services with the specified service manager.
|
/// Registers all AOC services with the specified service manager.
|
||||||
|
|
Loading…
Reference in New Issue