From 2786d34dd7c03f493b0cdc220189446f63646dfe Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Mon, 19 Feb 2024 18:58:57 +0100 Subject: aoc: Rename AOC_U to IAddOnContentManager --- src/core/CMakeLists.txt | 4 +- src/core/hle/service/aoc/addon_content_manager.cpp | 223 +++++++++++++++++++++ src/core/hle/service/aoc/addon_content_manager.h | 51 +++++ src/core/hle/service/aoc/aoc_u.cpp | 219 -------------------- src/core/hle/service/aoc/aoc_u.h | 51 ----- .../hle/service/aoc/purchase_event_manager.cpp | 4 +- src/core/hle/service/services.cpp | 2 +- 7 files changed, 279 insertions(+), 275 deletions(-) create mode 100644 src/core/hle/service/aoc/addon_content_manager.cpp create mode 100644 src/core/hle/service/aoc/addon_content_manager.h delete mode 100644 src/core/hle/service/aoc/aoc_u.cpp delete mode 100644 src/core/hle/service/aoc/aoc_u.h 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/addon_content_manager.cpp b/src/core/hle/service/aoc/addon_content_manager.cpp new file mode 100644 index 000000000..d47f57d64 --- /dev/null +++ b/src/core/hle/service/aoc/addon_content_manager.cpp @@ -0,0 +1,223 @@ +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include +#include + +#include "common/logging/log.h" +#include "common/settings.h" +#include "core/core.h" +#include "core/file_sys/common_funcs.h" +#include "core/file_sys/content_archive.h" +#include "core/file_sys/control_metadata.h" +#include "core/file_sys/nca_metadata.h" +#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/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" +#include "core/hle/service/server_manager.h" +#include "core/loader/loader.h" + +namespace Service::AOC { + +static bool CheckAOCTitleIDMatchesBase(u64 title_id, u64 base) { + return FileSys::GetBaseTitleID(title_id) == base; +} + +static std::vector AccumulateAOCTitleIDs(Core::System& system) { + std::vector add_on_content; + const auto& rcu = system.GetContentProvider(); + 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::ContentProviderEntry& 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; +} + +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<&IAddOnContentManager::CountAddOnContent>, "CountAddOnContent"}, + {3, D<&IAddOnContentManager::ListAddOnContent>, "ListAddOnContent"}, + {4, nullptr, "GetAddOnContentBaseIdByApplicationId"}, + {5, D<&IAddOnContentManager::GetAddOnContentBaseId>, "GetAddOnContentBaseId"}, + {6, nullptr, "PrepareAddOnContentByApplicationId"}, + {7, D<&IAddOnContentManager::PrepareAddOnContent>, "PrepareAddOnContent"}, + {8, D<&IAddOnContentManager::GetAddOnContentListChangedEvent>, "GetAddOnContentListChangedEvent"}, + {9, nullptr, "GetAddOnContentLostErrorCode"}, + {10, D<&IAddOnContentManager::GetAddOnContentListChangedEventWithProcessId>, "GetAddOnContentListChangedEventWithProcessId"}, + {11, D<&IAddOnContentManager::NotifyMountAddOnContent>, "NotifyMountAddOnContent"}, + {12, D<&IAddOnContentManager::NotifyUnmountAddOnContent>, "NotifyUnmountAddOnContent"}, + {13, nullptr, "IsAddOnContentMountedForDebug"}, + {50, D<&IAddOnContentManager::CheckAddOnContentMountStatus>, "CheckAddOnContentMountStatus"}, + {100, D<&IAddOnContentManager::CreateEcPurchasedEventManager>, "CreateEcPurchasedEventManager"}, + {101, D<&IAddOnContentManager::CreatePermanentEcPurchasedEventManager>, "CreatePermanentEcPurchasedEventManager"}, + {110, nullptr, "CreateContentsServiceManager"}, + {200, nullptr, "SetRequiredAddOnContentsOnContentsAvailabilityTransition"}, + {300, nullptr, "SetupHostAddOnContent"}, + {301, nullptr, "GetRegisteredAddOnContentPath"}, + {302, nullptr, "UpdateCachedList"}, + }; + // clang-format on + + RegisterHandlers(functions); + + aoc_change_event = service_context.CreateEvent("GetAddOnContentListChanged:Event"); +} + +IAddOnContentManager::~IAddOnContentManager() { + service_context.CloseEvent(aoc_change_event); +} + +Result IAddOnContentManager::CountAddOnContent(Out 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()) { + *out_count = 0; + R_SUCCEED(); + } + + *out_count = static_cast( + std::count_if(add_on_content.begin(), add_on_content.end(), + [current](u64 tid) { return CheckAOCTitleIDMatchesBase(tid, current); })); + + R_SUCCEED(); +} + +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); + + const auto current = FileSys::GetBaseTitleID(system.GetApplicationProcessProgramID()); + + std::vector out; + const auto& disabled = Settings::values.disabled_addons[current]; + if (std::find(disabled.begin(), disabled.end(), "DLC") == disabled.end()) { + for (u64 content_id : add_on_content) { + if (FileSys::GetBaseTitleID(content_id) != current) { + continue; + } + + out.push_back(static_cast(FileSys::GetAOCID(content_id))); + } + } + + // TODO(DarkLordZach): Find the correct error code. + R_UNLESS(out.size() >= offset, ResultUnknown); + + *out_count = static_cast(std::min(out.size() - offset, count)); + std::rotate(out.begin(), out.begin() + offset, out.end()); + + std::memcpy(out_addons.data(), out.data(), *out_count * sizeof(u32)); + + R_SUCCEED(); +} + +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(); + const FileSys::PatchManager pm{title_id, system.GetFileSystemController(), + system.GetContentProvider()}; + + const auto res = pm.GetControlMetadata(); + if (res.first == nullptr) { + *out_title_id = FileSys::GetAOCBaseTitleID(title_id); + R_SUCCEED(); + } + + *out_title_id = res.first->GetDLCBaseTitleId(); + + R_SUCCEED(); +} + +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 IAddOnContentManager::GetAddOnContentListChangedEvent( + OutCopyHandle out_event) { + LOG_WARNING(Service_AOC, "(STUBBED) called"); + + *out_event = &aoc_change_event->GetReadableEvent(); + + R_SUCCEED(); +} + +Result IAddOnContentManager::GetAddOnContentListChangedEventWithProcessId( + OutCopyHandle out_event, ClientProcessId process_id) { + LOG_WARNING(Service_AOC, "(STUBBED) called"); + + *out_event = &aoc_change_event->GetReadableEvent(); + + R_SUCCEED(); +} + +Result IAddOnContentManager::NotifyMountAddOnContent() { + LOG_WARNING(Service_AOC, "(STUBBED) called"); + + R_SUCCEED(); +} + +Result IAddOnContentManager::NotifyUnmountAddOnContent() { + LOG_WARNING(Service_AOC, "(STUBBED) called"); + + R_SUCCEED(); +} + +Result IAddOnContentManager::CheckAddOnContentMountStatus() { + LOG_WARNING(Service_AOC, "(STUBBED) called"); + + R_SUCCEED(); +} + +Result IAddOnContentManager::CreateEcPurchasedEventManager( + OutInterface out_interface) { + LOG_WARNING(Service_AOC, "(STUBBED) called"); + + *out_interface = std::make_shared(system); + + R_SUCCEED(); +} + +Result IAddOnContentManager::CreatePermanentEcPurchasedEventManager( + OutInterface out_interface) { + LOG_WARNING(Service_AOC, "(STUBBED) called"); + + *out_interface = std::make_shared(system); + + R_SUCCEED(); +} + +void LoopProcess(Core::System& system) { + auto server_manager = std::make_unique(system); + server_manager->RegisterNamedService("aoc:u", std::make_shared(system)); + ServerManager::RunServer(std::move(server_manager)); +} + +} // namespace Service::AOC diff --git a/src/core/hle/service/aoc/addon_content_manager.h b/src/core/hle/service/aoc/addon_content_manager.h new file mode 100644 index 000000000..91857df4c --- /dev/null +++ b/src/core/hle/service/aoc/addon_content_manager.h @@ -0,0 +1,51 @@ +// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "core/hle/service/cmif_types.h" +#include "core/hle/service/kernel_helpers.h" +#include "core/hle/service/service.h" + +namespace Core { +class System; +} + +namespace Kernel { +class KEvent; +} + +namespace Service::AOC { + +class IPurchaseEventManager; + +class IAddOnContentManager final : public ServiceFramework { +public: + explicit IAddOnContentManager(Core::System& system); + ~IAddOnContentManager() override; + + Result CountAddOnContent(Out out_count, ClientProcessId process_id); + Result ListAddOnContent(Out out_count, OutBuffer out_addons, + u32 offset, u32 count, ClientProcessId process_id); + Result GetAddOnContentBaseId(Out out_title_id, ClientProcessId process_id); + Result PrepareAddOnContent(s32 addon_index, ClientProcessId process_id); + Result GetAddOnContentListChangedEvent(OutCopyHandle out_event); + Result GetAddOnContentListChangedEventWithProcessId( + OutCopyHandle out_event, ClientProcessId process_id); + Result NotifyMountAddOnContent(); + Result NotifyUnmountAddOnContent(); + Result CheckAddOnContentMountStatus(); + Result CreateEcPurchasedEventManager(OutInterface out_interface); + Result CreatePermanentEcPurchasedEventManager( + OutInterface out_interface); + +private: + std::vector add_on_content; + KernelHelpers::ServiceContext service_context; + + Kernel::KEvent* aoc_change_event; +}; + +void LoopProcess(Core::System& system); + +} // namespace Service::AOC diff --git a/src/core/hle/service/aoc/aoc_u.cpp b/src/core/hle/service/aoc/aoc_u.cpp deleted file mode 100644 index 82b95b704..000000000 --- a/src/core/hle/service/aoc/aoc_u.cpp +++ /dev/null @@ -1,219 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#include -#include -#include - -#include "common/logging/log.h" -#include "common/settings.h" -#include "core/core.h" -#include "core/file_sys/common_funcs.h" -#include "core/file_sys/content_archive.h" -#include "core/file_sys/control_metadata.h" -#include "core/file_sys/nca_metadata.h" -#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/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" - -namespace Service::AOC { - -static bool CheckAOCTitleIDMatchesBase(u64 title_id, u64 base) { - return FileSys::GetBaseTitleID(title_id) == base; -} - -static std::vector AccumulateAOCTitleIDs(Core::System& system) { - std::vector add_on_content; - const auto& rcu = system.GetContentProvider(); - 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::ContentProviderEntry& 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(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"}, - {4, nullptr, "GetAddOnContentBaseIdByApplicationId"}, - {5, D<&AOC_U::GetAddOnContentBaseId>, "GetAddOnContentBaseId"}, - {6, nullptr, "PrepareAddOnContentByApplicationId"}, - {7, D<&AOC_U::PrepareAddOnContent>, "PrepareAddOnContent"}, - {8, D<&AOC_U::GetAddOnContentListChangedEvent>, "GetAddOnContentListChangedEvent"}, - {9, nullptr, "GetAddOnContentLostErrorCode"}, - {10, D<&AOC_U::GetAddOnContentListChangedEventWithProcessId>, "GetAddOnContentListChangedEventWithProcessId"}, - {11, D<&AOC_U::NotifyMountAddOnContent>, "NotifyMountAddOnContent"}, - {12, D<&AOC_U::NotifyUnmountAddOnContent>, "NotifyUnmountAddOnContent"}, - {13, nullptr, "IsAddOnContentMountedForDebug"}, - {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"}, - {301, nullptr, "GetRegisteredAddOnContentPath"}, - {302, nullptr, "UpdateCachedList"}, - }; - // clang-format on - - RegisterHandlers(functions); - - aoc_change_event = service_context.CreateEvent("GetAddOnContentListChanged:Event"); -} - -AOC_U::~AOC_U() { - service_context.CloseEvent(aoc_change_event); -} - -Result AOC_U::CountAddOnContent(Out 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()) { - *out_count = 0; - R_SUCCEED(); - } - - *out_count = static_cast( - std::count_if(add_on_content.begin(), add_on_content.end(), - [current](u64 tid) { return CheckAOCTitleIDMatchesBase(tid, current); })); - - R_SUCCEED(); -} - -Result AOC_U::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); - - const auto current = FileSys::GetBaseTitleID(system.GetApplicationProcessProgramID()); - - std::vector out; - const auto& disabled = Settings::values.disabled_addons[current]; - if (std::find(disabled.begin(), disabled.end(), "DLC") == disabled.end()) { - for (u64 content_id : add_on_content) { - if (FileSys::GetBaseTitleID(content_id) != current) { - continue; - } - - out.push_back(static_cast(FileSys::GetAOCID(content_id))); - } - } - - // TODO(DarkLordZach): Find the correct error code. - R_UNLESS(out.size() >= offset, ResultUnknown); - - *out_count = static_cast(std::min(out.size() - offset, count)); - std::rotate(out.begin(), out.begin() + offset, out.end()); - - std::memcpy(out_addons.data(), out.data(), *out_count); - - R_SUCCEED(); -} - -Result AOC_U::GetAddOnContentBaseId(Out 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(), - system.GetContentProvider()}; - - const auto res = pm.GetControlMetadata(); - if (res.first == nullptr) { - *out_title_id = FileSys::GetAOCBaseTitleID(title_id); - R_SUCCEED(); - } - - *out_title_id = res.first->GetDLCBaseTitleId(); - - 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.pid); - - R_SUCCEED(); -} - -Result AOC_U::GetAddOnContentListChangedEvent(OutCopyHandle out_event) { - LOG_WARNING(Service_AOC, "(STUBBED) called"); - - *out_event = &aoc_change_event->GetReadableEvent(); - - R_SUCCEED(); -} - -Result AOC_U::GetAddOnContentListChangedEventWithProcessId( - OutCopyHandle out_event, ClientProcessId process_id) { - LOG_WARNING(Service_AOC, "(STUBBED) called"); - - *out_event = &aoc_change_event->GetReadableEvent(); - - R_SUCCEED(); -} - -Result AOC_U::NotifyMountAddOnContent() { - LOG_WARNING(Service_AOC, "(STUBBED) called"); - - R_SUCCEED(); -} - -Result AOC_U::NotifyUnmountAddOnContent() { - LOG_WARNING(Service_AOC, "(STUBBED) called"); - - R_SUCCEED(); -} - -Result AOC_U::CheckAddOnContentMountStatus() { - LOG_WARNING(Service_AOC, "(STUBBED) called"); - - R_SUCCEED(); -} - -Result AOC_U::CreateEcPurchasedEventManager(OutInterface out_interface) { - LOG_WARNING(Service_AOC, "(STUBBED) called"); - - *out_interface = std::make_shared(system); - - R_SUCCEED(); -} - -Result AOC_U::CreatePermanentEcPurchasedEventManager( - OutInterface out_interface) { - LOG_WARNING(Service_AOC, "(STUBBED) called"); - - *out_interface = std::make_shared(system); - - R_SUCCEED(); -} - -void LoopProcess(Core::System& system) { - auto server_manager = std::make_unique(system); - server_manager->RegisterNamedService("aoc:u", std::make_shared(system)); - ServerManager::RunServer(std::move(server_manager)); -} - -} // namespace Service::AOC diff --git a/src/core/hle/service/aoc/aoc_u.h b/src/core/hle/service/aoc/aoc_u.h deleted file mode 100644 index c7b94a933..000000000 --- a/src/core/hle/service/aoc/aoc_u.h +++ /dev/null @@ -1,51 +0,0 @@ -// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "core/hle/service/cmif_types.h" -#include "core/hle/service/kernel_helpers.h" -#include "core/hle/service/service.h" - -namespace Core { -class System; -} - -namespace Kernel { -class KEvent; -} - -namespace Service::AOC { - -class IPurchaseEventManager; - -class AOC_U final : public ServiceFramework { -public: - explicit AOC_U(Core::System& system); - ~AOC_U() override; - - Result CountAddOnContent(Out out_count, ClientProcessId process_id); - Result ListAddOnContent(Out out_count, OutBuffer out_addons, - u32 offset, u32 count, ClientProcessId process_id); - Result GetAddOnContentBaseId(Out out_title_id, ClientProcessId process_id); - Result PrepareAddOnContent(s32 addon_index, ClientProcessId process_id); - Result GetAddOnContentListChangedEvent(OutCopyHandle out_event); - Result GetAddOnContentListChangedEventWithProcessId( - OutCopyHandle out_event, ClientProcessId process_id); - Result NotifyMountAddOnContent(); - Result NotifyUnmountAddOnContent(); - Result CheckAddOnContentMountStatus(); - Result CreateEcPurchasedEventManager(OutInterface out_interface); - Result CreatePermanentEcPurchasedEventManager( - OutInterface out_interface); - -private: - std::vector add_on_content; - KernelHelpers::ServiceContext service_context; - - Kernel::KEvent* aoc_change_event; -}; - -void LoopProcess(Core::System& system); - -} // namespace Service::AOC 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" -- cgit v1.2.3