mctaylors/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

ncm: Implement LR OpenAddOnContentLocationResolver (2)

Browse source 
Returns an object of type IAddOnContentLocationResolver for the provided StorageId.
This commit is contained in:
Zach Hilman 2019-05-26 20:36:54 -04:00
parent e0920ef4ba
commit 52b80d231c
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/core/hle/service/ncm/ncm.cpp
View file

@ -4,17 +4,19 @@
#include <memory> #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/ncm/ncm.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
#include "core/hle/service/sm/sm.h" #include "core/hle/service/sm/sm.h"
namespace Service::NCM { namespace Service::NCM {
class LocationResolver final : public ServiceFramework<LocationResolver> {
class ILocationResolver final : public ServiceFramework<ILocationResolver> { class ILocationResolver final : public ServiceFramework<ILocationResolver> {
public: public:
explicit ILocationResolver(FileSys::StorageId id) explicit ILocationResolver(FileSys::StorageId id)
: ServiceFramework{"ILocationResolver"}, storage(id) { : ServiceFramework{"ILocationResolver"}, storage(id) {
// clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, nullptr, "ResolveProgramPath"}, {0, nullptr, "ResolveProgramPath"},
{1, nullptr, "RedirectProgramPath"}, {1, nullptr, "RedirectProgramPath"},
@ -37,6 +39,7 @@ public:
{18, nullptr, ""}, {18, nullptr, ""},
{19, nullptr, ""}, {19, nullptr, ""},
}; };
// clang-format on
RegisterHandlers(functions); RegisterHandlers(functions);
} }
@ -48,6 +51,7 @@ private:
class IRegisteredLocationResolver final : public ServiceFramework<IRegisteredLocationResolver> { class IRegisteredLocationResolver final : public ServiceFramework<IRegisteredLocationResolver> {
public: public:
explicit IRegisteredLocationResolver() : ServiceFramework{"IRegisteredLocationResolver"} { explicit IRegisteredLocationResolver() : ServiceFramework{"IRegisteredLocationResolver"} {
// clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, nullptr, "ResolveProgramPath"}, {0, nullptr, "ResolveProgramPath"},
{1, nullptr, "RegisterProgramPath"}, {1, nullptr, "RegisterProgramPath"},
@ -59,13 +63,27 @@ public:
{7, nullptr, "RedirectHtmlDocumentPath"}, {7, nullptr, "RedirectHtmlDocumentPath"},
{8, nullptr, ""}, {8, nullptr, ""},
}; };
// clang-format on
RegisterHandlers(functions); RegisterHandlers(functions);
} }
}; };
class IAddOnContentLocationResolver final : public ServiceFramework<IAddOnContentLocationResolver> {
public: 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> { class LR final : public ServiceFramework<LR> {
public: public:
explicit LR() : ServiceFramework{"lr"} { explicit LR() : ServiceFramework{"lr"} {
@ -80,27 +98,6 @@ public:
RegisterHandlers(functions); 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> { class NCM final : public ServiceFramework<NCM> {
@ -129,7 +126,7 @@ public:
}; };
void InstallInterfaces(SM::ServiceManager& sm) { void InstallInterfaces(SM::ServiceManager& sm) {
std::make_shared<LocationResolver>()->InstallAsService(sm); std::make_shared<LR>()->InstallAsService(sm);
std::make_shared<NCM>()->InstallAsService(sm); std::make_shared<NCM>()->InstallAsService(sm);
} }