summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2019-05-27 02:36:54 +0200
committerZach Hilman <zachhilman@gmail.com>2019-05-27 02:37:13 +0200
commit52b80d231cb3e1b234f1fcfe00cc1577d42cb966 (patch)
tree3a65edec3227263505f810ac53cf274e7fb21379
parentncm: Implement LR OpenRegisteredLocationResolver (1) (diff)
downloadyuzu-52b80d231cb3e1b234f1fcfe00cc1577d42cb966.tar
yuzu-52b80d231cb3e1b234f1fcfe00cc1577d42cb966.tar.gz
yuzu-52b80d231cb3e1b234f1fcfe00cc1577d42cb966.tar.bz2
yuzu-52b80d231cb3e1b234f1fcfe00cc1577d42cb966.tar.lz
yuzu-52b80d231cb3e1b234f1fcfe00cc1577d42cb966.tar.xz
yuzu-52b80d231cb3e1b234f1fcfe00cc1577d42cb966.tar.zst
yuzu-52b80d231cb3e1b234f1fcfe00cc1577d42cb966.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/ncm/ncm.cpp45
1 files changed, 21 insertions, 24 deletions
diff --git a/src/core/hle/service/ncm/ncm.cpp b/src/core/hle/service/ncm/ncm.cpp
index c59bcc2a7..b405a4b66 100644
--- a/src/core/hle/service/ncm/ncm.cpp
+++ b/src/core/hle/service/ncm/ncm.cpp
@@ -4,17 +4,19 @@
#include <memory>
+#include "core/file_sys/romfs_factory.h"
+#include "core/hle/ipc_helpers.h"
#include "core/hle/service/ncm/ncm.h"
#include "core/hle/service/service.h"
#include "core/hle/service/sm/sm.h"
namespace Service::NCM {
-class LocationResolver final : public ServiceFramework<LocationResolver> {
class ILocationResolver final : public ServiceFramework<ILocationResolver> {
public:
explicit ILocationResolver(FileSys::StorageId id)
: ServiceFramework{"ILocationResolver"}, storage(id) {
+ // clang-format off
static const FunctionInfo functions[] = {
{0, nullptr, "ResolveProgramPath"},
{1, nullptr, "RedirectProgramPath"},
@@ -37,6 +39,7 @@ public:
{18, nullptr, ""},
{19, nullptr, ""},
};
+ // clang-format on
RegisterHandlers(functions);
}
@@ -48,6 +51,7 @@ private:
class IRegisteredLocationResolver final : public ServiceFramework<IRegisteredLocationResolver> {
public:
explicit IRegisteredLocationResolver() : ServiceFramework{"IRegisteredLocationResolver"} {
+ // clang-format off
static const FunctionInfo functions[] = {
{0, nullptr, "ResolveProgramPath"},
{1, nullptr, "RegisterProgramPath"},
@@ -59,13 +63,27 @@ public:
{7, nullptr, "RedirectHtmlDocumentPath"},
{8, nullptr, ""},
};
+ // clang-format on
RegisterHandlers(functions);
}
};
+class IAddOnContentLocationResolver final : public ServiceFramework<IAddOnContentLocationResolver> {
public:
- explicit LocationResolver() : ServiceFramework{"lr"} {
+ explicit IAddOnContentLocationResolver() : ServiceFramework{"IAddOnContentLocationResolver"} {
+ // clang-format off
+ static const FunctionInfo functions[] = {
+ {0, nullptr, "ResolveAddOnContentPath"},
+ {1, nullptr, "RegisterAddOnContentStorage"},
+ {2, nullptr, "UnregisterAllAddOnContentPath"},
+ };
+ // clang-format on
+
+ RegisterHandlers(functions);
+ }
+};
+
class LR final : public ServiceFramework<LR> {
public:
explicit LR() : ServiceFramework{"lr"} {
@@ -80,27 +98,6 @@ public:
RegisterHandlers(functions);
}
-
-private:
- void OpenLocationResolver(Kernel::HLERequestContext& ctx) {
- IPC::RequestParser rp{ctx};
- const auto id = rp.PopRaw<FileSys::StorageId>();
-
- LOG_DEBUG(Service_NCM, "called, id={:02X}", static_cast<u8>(id));
-
- IPC::ResponseBuilder rb{ctx, 2, 0, 1};
- rb.Push(RESULT_SUCCESS);
- rb.PushIpcInterface(std::make_shared<ILocationResolver>(id));
- }
-
- void OpenRegisteredLocationResolver(Kernel::HLERequestContext& ctx) {
- LOG_DEBUG(Service_NCM, "called");
-
- IPC::ResponseBuilder rb{ctx, 2, 0, 1};
- rb.Push(RESULT_SUCCESS);
- rb.PushIpcInterface(std::make_shared<IRegisteredLocationResolver>());
- }
-
};
class NCM final : public ServiceFramework<NCM> {
@@ -129,7 +126,7 @@ public:
};
void InstallInterfaces(SM::ServiceManager& sm) {
- std::make_shared<LocationResolver>()->InstallAsService(sm);
+ std::make_shared<LR>()->InstallAsService(sm);
std::make_shared<NCM>()->InstallAsService(sm);
}