From dc0a137e5b502329cd130c70bea093852233d1df Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 5 Feb 2018 23:24:47 -0500 Subject: [PATCH 1/4] acc_u0: Implement ListAllUsers. --- src/core/hle/service/acc/acc_u0.cpp | 16 ++++++++++++++-- src/core/hle/service/acc/acc_u0.h | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/acc/acc_u0.cpp b/src/core/hle/service/acc/acc_u0.cpp index ff9f6cca80..ee7d07aa7a 100644 --- a/src/core/hle/service/acc/acc_u0.cpp +++ b/src/core/hle/service/acc/acc_u0.cpp @@ -9,6 +9,9 @@ namespace Service { namespace Account { +using Uid = std::array; +static constexpr Uid DEFAULT_USER_ID{0x10ull, 0x20ull}; + class IProfile final : public ServiceFramework { public: IProfile() : ServiceFramework("IProfile") { @@ -61,6 +64,15 @@ void ACC_U0::GetUserExistence(Kernel::HLERequestContext& ctx) { rb.Push(true); // TODO: Check when this is supposed to return true and when not } +void ACC_U0::ListAllUsers(Kernel::HLERequestContext& ctx) { + constexpr std::array user_ids{DEFAULT_USER_ID}; + const auto& output_buffer = ctx.BufferDescriptorC()[0]; + Memory::WriteBlock(output_buffer.Address(), user_ids.data(), user_ids.size()); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); + LOG_DEBUG(Service_ACC, "called"); +} + void ACC_U0::GetProfile(Kernel::HLERequestContext& ctx) { IPC::ResponseBuilder rb{ctx, 2, 0, 1}; rb.Push(RESULT_SUCCESS); @@ -85,13 +97,13 @@ void ACC_U0::GetLastOpenedUser(Kernel::HLERequestContext& ctx) { LOG_WARNING(Service_ACC, "(STUBBED) called"); IPC::ResponseBuilder rb{ctx, 6}; rb.Push(RESULT_SUCCESS); - rb.Push(0x0); - rb.Push(0x0); + rb.PushRaw(DEFAULT_USER_ID); } ACC_U0::ACC_U0() : ServiceFramework("acc:u0") { static const FunctionInfo functions[] = { {1, &ACC_U0::GetUserExistence, "GetUserExistence"}, + {2, &ACC_U0::ListAllUsers, "ListAllUsers"}, {4, &ACC_U0::GetLastOpenedUser, "GetLastOpenedUser"}, {5, &ACC_U0::GetProfile, "GetProfile"}, {100, &ACC_U0::InitializeApplicationInfo, "InitializeApplicationInfo"}, diff --git a/src/core/hle/service/acc/acc_u0.h b/src/core/hle/service/acc/acc_u0.h index b38c2f95ec..d7732e75b7 100644 --- a/src/core/hle/service/acc/acc_u0.h +++ b/src/core/hle/service/acc/acc_u0.h @@ -28,6 +28,7 @@ public: private: void GetUserExistence(Kernel::HLERequestContext& ctx); + void ListAllUsers(Kernel::HLERequestContext& ctx); void GetLastOpenedUser(Kernel::HLERequestContext& ctx); void GetProfile(Kernel::HLERequestContext& ctx); void InitializeApplicationInfo(Kernel::HLERequestContext& ctx); From ca990636003d06d43fa0c12c86320e35251f0e59 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 8 Feb 2018 23:17:59 -0500 Subject: [PATCH 2/4] nvhost_ctrl_gpu: Implement ZCullGetInfo. --- .../service/nvdrv/devices/nvhost_ctrl_gpu.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp index d7e0b1bbdc..4776c8aa31 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp @@ -104,8 +104,20 @@ u32 nvhost_ctrl_gpu::ZCullGetCtxSize(const std::vector& input, std::vector& input, std::vector& output) { - LOG_WARNING(Service_NVDRV, "(STUBBED) called"); - std::memset(output.data(), 0, output.size()); + LOG_DEBUG(Service_NVDRV, "called"); + IoctlNvgpuGpuZcullGetInfoArgs params{}; + std::memcpy(¶ms, input.data(), input.size()); + params.width_align_pixels = 0x20; + params.height_align_pixels = 0x20; + params.pixel_squares_by_aliquots = 0x400; + params.aliquot_total = 0x800; + params.region_byte_multiplier = 0x20; + params.region_header_size = 0x20; + params.subregion_header_size = 0xc0; + params.subregion_width_align_pixels = 0x20; + params.subregion_height_align_pixels = 0x40; + params.subregion_count = 0x10; + std::memcpy(output.data(), ¶ms, output.size()); return 0; } From 576f0cf0277de5c6f068770942ff58658c1a1cd0 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 8 Feb 2018 23:20:23 -0500 Subject: [PATCH 3/4] IApplicationDisplayService::CloseDisplay: Fix response params size. --- src/core/hle/service/vi/vi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index cfddd7c416..7508443a87 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -657,7 +657,7 @@ void IApplicationDisplayService::CloseDisplay(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; u64 display_id = rp.Pop(); - IPC::ResponseBuilder rb = rp.MakeBuilder(4, 0, 0); + IPC::ResponseBuilder rb = rp.MakeBuilder(2, 0, 0); rb.Push(RESULT_SUCCESS); } From 22caeee64f762bbeca52c6faebeba2cfb0074e86 Mon Sep 17 00:00:00 2001 From: bunnei Date: Fri, 9 Feb 2018 00:56:45 -0500 Subject: [PATCH 4/4] nvdrv: Fix QueryEvent for libnx. --- src/core/hle/service/nvdrv/interface.cpp | 9 +++++---- src/core/hle/service/nvdrv/interface.h | 3 +++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/core/hle/service/nvdrv/interface.cpp b/src/core/hle/service/nvdrv/interface.cpp index 0edb64cc31..367791da66 100644 --- a/src/core/hle/service/nvdrv/interface.cpp +++ b/src/core/hle/service/nvdrv/interface.cpp @@ -78,11 +78,10 @@ void NVDRV::QueryEvent(Kernel::HLERequestContext& ctx) { u32 event_id = rp.Pop(); LOG_WARNING(Service_NVDRV, "(STUBBED) called, fd=%x, event_id=%x", fd, event_id); - IPC::ResponseBuilder rb{ctx, 2, 1}; + IPC::ResponseBuilder rb{ctx, 3, 1}; rb.Push(RESULT_SUCCESS); - auto event = Kernel::Event::Create(Kernel::ResetType::Pulse, "NVEvent"); - event->Signal(); - rb.PushCopyObjects(event); + rb.PushCopyObjects(query_event); + rb.Push(0); } void NVDRV::SetClientPID(Kernel::HLERequestContext& ctx) { @@ -113,6 +112,8 @@ NVDRV::NVDRV(std::shared_ptr nvdrv, const char* name) {13, &NVDRV::FinishInitialize, "FinishInitialize"}, }; RegisterHandlers(functions); + + query_event = Kernel::Event::Create(Kernel::ResetType::OneShot, "NVDRV::query_event"); } } // namespace Nvidia diff --git a/src/core/hle/service/nvdrv/interface.h b/src/core/hle/service/nvdrv/interface.h index 8c4b068c2d..daf2302af2 100644 --- a/src/core/hle/service/nvdrv/interface.h +++ b/src/core/hle/service/nvdrv/interface.h @@ -6,6 +6,7 @@ #include #include +#include "core/hle/kernel/event.h" #include "core/hle/service/nvdrv/nvdrv.h" #include "core/hle/service/service.h" @@ -29,6 +30,8 @@ private: std::shared_ptr nvdrv; u64 pid{}; + + Kernel::SharedPtr query_event; }; } // namespace Nvidia