mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 16:43:24 +02:00
Merge pull request #499 from bunnei/am-stuff
am: Implement CreateStorage, PushInData, etc.
This commit is contained in:
commit
049ce242a4
@ -3,6 +3,7 @@
|
|||||||
// Refer to the license.txt file included.
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
#include <cinttypes>
|
#include <cinttypes>
|
||||||
|
#include <stack>
|
||||||
#include "core/file_sys/filesystem.h"
|
#include "core/file_sys/filesystem.h"
|
||||||
#include "core/hle/ipc_helpers.h"
|
#include "core/hle/ipc_helpers.h"
|
||||||
#include "core/hle/kernel/event.h"
|
#include "core/hle/kernel/event.h"
|
||||||
@ -348,6 +349,87 @@ void ICommonStateGetter::GetPerformanceMode(Kernel::HLERequestContext& ctx) {
|
|||||||
NGLOG_WARNING(Service_AM, "(STUBBED) called");
|
NGLOG_WARNING(Service_AM, "(STUBBED) called");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class IStorageAccessor final : public ServiceFramework<IStorageAccessor> {
|
||||||
|
public:
|
||||||
|
explicit IStorageAccessor(std::vector<u8> buffer)
|
||||||
|
: ServiceFramework("IStorageAccessor"), buffer(std::move(buffer)) {
|
||||||
|
static const FunctionInfo functions[] = {
|
||||||
|
{0, &IStorageAccessor::GetSize, "GetSize"},
|
||||||
|
{10, &IStorageAccessor::Write, "Write"},
|
||||||
|
{11, &IStorageAccessor::Read, "Read"},
|
||||||
|
};
|
||||||
|
RegisterHandlers(functions);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::vector<u8> buffer;
|
||||||
|
|
||||||
|
void GetSize(Kernel::HLERequestContext& ctx) {
|
||||||
|
IPC::ResponseBuilder rb{ctx, 4};
|
||||||
|
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
rb.Push(static_cast<u64>(buffer.size()));
|
||||||
|
|
||||||
|
NGLOG_DEBUG(Service_AM, "called");
|
||||||
|
}
|
||||||
|
|
||||||
|
void Write(Kernel::HLERequestContext& ctx) {
|
||||||
|
IPC::RequestParser rp{ctx};
|
||||||
|
|
||||||
|
const u64 offset{rp.Pop<u64>()};
|
||||||
|
const std::vector<u8> data{ctx.ReadBuffer()};
|
||||||
|
|
||||||
|
ASSERT(offset + data.size() <= buffer.size());
|
||||||
|
|
||||||
|
std::memcpy(&buffer[offset], data.data(), data.size());
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{rp.MakeBuilder(2, 0, 0)};
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
|
||||||
|
NGLOG_DEBUG(Service_AM, "called, offset={}", offset);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Read(Kernel::HLERequestContext& ctx) {
|
||||||
|
IPC::RequestParser rp{ctx};
|
||||||
|
|
||||||
|
const u64 offset{rp.Pop<u64>()};
|
||||||
|
const size_t size{ctx.GetWriteBufferSize()};
|
||||||
|
|
||||||
|
ASSERT(offset + size <= buffer.size());
|
||||||
|
|
||||||
|
ctx.WriteBuffer(buffer.data() + offset, size);
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{rp.MakeBuilder(2, 0, 0)};
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
|
||||||
|
NGLOG_DEBUG(Service_AM, "called, offset={}", offset);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
class IStorage final : public ServiceFramework<IStorage> {
|
||||||
|
public:
|
||||||
|
explicit IStorage(std::vector<u8> buffer)
|
||||||
|
: ServiceFramework("IStorage"), buffer(std::move(buffer)) {
|
||||||
|
static const FunctionInfo functions[] = {
|
||||||
|
{0, &IStorage::Open, "Open"},
|
||||||
|
{1, nullptr, "OpenTransferStorage"},
|
||||||
|
};
|
||||||
|
RegisterHandlers(functions);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::vector<u8> buffer;
|
||||||
|
|
||||||
|
void Open(Kernel::HLERequestContext& ctx) {
|
||||||
|
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||||
|
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
rb.PushIpcInterface<AM::IStorageAccessor>(buffer);
|
||||||
|
|
||||||
|
NGLOG_DEBUG(Service_AM, "called");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
class ILibraryAppletAccessor final : public ServiceFramework<ILibraryAppletAccessor> {
|
class ILibraryAppletAccessor final : public ServiceFramework<ILibraryAppletAccessor> {
|
||||||
public:
|
public:
|
||||||
explicit ILibraryAppletAccessor() : ServiceFramework("ILibraryAppletAccessor") {
|
explicit ILibraryAppletAccessor() : ServiceFramework("ILibraryAppletAccessor") {
|
||||||
@ -359,7 +441,7 @@ public:
|
|||||||
{25, nullptr, "Terminate"},
|
{25, nullptr, "Terminate"},
|
||||||
{30, nullptr, "GetResult"},
|
{30, nullptr, "GetResult"},
|
||||||
{50, nullptr, "SetOutOfFocusApplicationSuspendingEnabled"},
|
{50, nullptr, "SetOutOfFocusApplicationSuspendingEnabled"},
|
||||||
{100, nullptr, "PushInData"},
|
{100, &ILibraryAppletAccessor::PushInData, "PushInData"},
|
||||||
{101, nullptr, "PopOutData"},
|
{101, nullptr, "PopOutData"},
|
||||||
{102, nullptr, "PushExtraStorage"},
|
{102, nullptr, "PushExtraStorage"},
|
||||||
{103, nullptr, "PushInteractiveInData"},
|
{103, nullptr, "PushInteractiveInData"},
|
||||||
@ -388,6 +470,17 @@ private:
|
|||||||
NGLOG_WARNING(Service_AM, "(STUBBED) called");
|
NGLOG_WARNING(Service_AM, "(STUBBED) called");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void PushInData(Kernel::HLERequestContext& ctx) {
|
||||||
|
IPC::RequestParser rp{ctx};
|
||||||
|
storage_stack.push(rp.PopIpcInterface<AM::IStorage>());
|
||||||
|
|
||||||
|
IPC::ResponseBuilder rb{rp.MakeBuilder(2, 0, 0)};
|
||||||
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
|
||||||
|
NGLOG_DEBUG(Service_AM, "called");
|
||||||
|
}
|
||||||
|
|
||||||
|
std::stack<std::shared_ptr<AM::IStorage>> storage_stack;
|
||||||
Kernel::SharedPtr<Kernel::Event> state_changed_event;
|
Kernel::SharedPtr<Kernel::Event> state_changed_event;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -396,7 +489,7 @@ ILibraryAppletCreator::ILibraryAppletCreator() : ServiceFramework("ILibraryApple
|
|||||||
{0, &ILibraryAppletCreator::CreateLibraryApplet, "CreateLibraryApplet"},
|
{0, &ILibraryAppletCreator::CreateLibraryApplet, "CreateLibraryApplet"},
|
||||||
{1, nullptr, "TerminateAllLibraryApplets"},
|
{1, nullptr, "TerminateAllLibraryApplets"},
|
||||||
{2, nullptr, "AreAnyLibraryAppletsLeft"},
|
{2, nullptr, "AreAnyLibraryAppletsLeft"},
|
||||||
{10, nullptr, "CreateStorage"},
|
{10, &ILibraryAppletCreator::CreateStorage, "CreateStorage"},
|
||||||
{11, nullptr, "CreateTransferMemoryStorage"},
|
{11, nullptr, "CreateTransferMemoryStorage"},
|
||||||
{12, nullptr, "CreateHandleStorage"},
|
{12, nullptr, "CreateHandleStorage"},
|
||||||
};
|
};
|
||||||
@ -412,72 +505,17 @@ void ILibraryAppletCreator::CreateLibraryApplet(Kernel::HLERequestContext& ctx)
|
|||||||
NGLOG_DEBUG(Service_AM, "called");
|
NGLOG_DEBUG(Service_AM, "called");
|
||||||
}
|
}
|
||||||
|
|
||||||
class IStorageAccessor final : public ServiceFramework<IStorageAccessor> {
|
void ILibraryAppletCreator::CreateStorage(Kernel::HLERequestContext& ctx) {
|
||||||
public:
|
IPC::RequestParser rp{ctx};
|
||||||
explicit IStorageAccessor(std::vector<u8> buffer)
|
const u64 size{rp.Pop<u64>()};
|
||||||
: ServiceFramework("IStorageAccessor"), buffer(std::move(buffer)) {
|
std::vector<u8> buffer(size);
|
||||||
static const FunctionInfo functions[] = {
|
|
||||||
{0, &IStorageAccessor::GetSize, "GetSize"},
|
|
||||||
{10, nullptr, "Write"},
|
|
||||||
{11, &IStorageAccessor::Read, "Read"},
|
|
||||||
};
|
|
||||||
RegisterHandlers(functions);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
IPC::ResponseBuilder rb{rp.MakeBuilder(2, 0, 1)};
|
||||||
std::vector<u8> buffer;
|
rb.Push(RESULT_SUCCESS);
|
||||||
|
rb.PushIpcInterface<AM::IStorage>(std::move(buffer));
|
||||||
|
|
||||||
void GetSize(Kernel::HLERequestContext& ctx) {
|
NGLOG_DEBUG(Service_AM, "called, size={}", size);
|
||||||
IPC::ResponseBuilder rb{ctx, 4};
|
}
|
||||||
|
|
||||||
rb.Push(RESULT_SUCCESS);
|
|
||||||
rb.Push(static_cast<u64>(buffer.size()));
|
|
||||||
|
|
||||||
NGLOG_DEBUG(Service_AM, "called");
|
|
||||||
}
|
|
||||||
|
|
||||||
void Read(Kernel::HLERequestContext& ctx) {
|
|
||||||
IPC::RequestParser rp{ctx};
|
|
||||||
|
|
||||||
u64 offset = rp.Pop<u64>();
|
|
||||||
|
|
||||||
const size_t size{ctx.GetWriteBufferSize()};
|
|
||||||
|
|
||||||
ASSERT(offset + size <= buffer.size());
|
|
||||||
|
|
||||||
ctx.WriteBuffer(buffer.data() + offset, size);
|
|
||||||
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2};
|
|
||||||
|
|
||||||
rb.Push(RESULT_SUCCESS);
|
|
||||||
|
|
||||||
NGLOG_DEBUG(Service_AM, "called");
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
class IStorage final : public ServiceFramework<IStorage> {
|
|
||||||
public:
|
|
||||||
explicit IStorage(std::vector<u8> buffer)
|
|
||||||
: ServiceFramework("IStorage"), buffer(std::move(buffer)) {
|
|
||||||
static const FunctionInfo functions[] = {
|
|
||||||
{0, &IStorage::Open, "Open"},
|
|
||||||
{1, nullptr, "OpenTransferStorage"},
|
|
||||||
};
|
|
||||||
RegisterHandlers(functions);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
std::vector<u8> buffer;
|
|
||||||
|
|
||||||
void Open(Kernel::HLERequestContext& ctx) {
|
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
|
||||||
|
|
||||||
rb.Push(RESULT_SUCCESS);
|
|
||||||
rb.PushIpcInterface<AM::IStorageAccessor>(buffer);
|
|
||||||
|
|
||||||
NGLOG_DEBUG(Service_AM, "called");
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
IApplicationFunctions::IApplicationFunctions() : ServiceFramework("IApplicationFunctions") {
|
IApplicationFunctions::IApplicationFunctions() : ServiceFramework("IApplicationFunctions") {
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
|
@ -121,6 +121,7 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
void CreateLibraryApplet(Kernel::HLERequestContext& ctx);
|
void CreateLibraryApplet(Kernel::HLERequestContext& ctx);
|
||||||
|
void CreateStorage(Kernel::HLERequestContext& ctx);
|
||||||
};
|
};
|
||||||
|
|
||||||
class IApplicationFunctions final : public ServiceFramework<IApplicationFunctions> {
|
class IApplicationFunctions final : public ServiceFramework<IApplicationFunctions> {
|
||||||
|
Loading…
Reference in New Issue
Block a user