mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 00:53:22 +02:00
Merge pull request #171 from bunnei/libnx-fixes
Various fixes for libnx, etc.
This commit is contained in:
commit
1add3b20c4
@ -9,6 +9,9 @@
|
|||||||
namespace Service {
|
namespace Service {
|
||||||
namespace Account {
|
namespace Account {
|
||||||
|
|
||||||
|
using Uid = std::array<u64, 2>;
|
||||||
|
static constexpr Uid DEFAULT_USER_ID{0x10ull, 0x20ull};
|
||||||
|
|
||||||
class IProfile final : public ServiceFramework<IProfile> {
|
class IProfile final : public ServiceFramework<IProfile> {
|
||||||
public:
|
public:
|
||||||
IProfile() : ServiceFramework("IProfile") {
|
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
|
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<u128, 10> 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) {
|
void ACC_U0::GetProfile(Kernel::HLERequestContext& ctx) {
|
||||||
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
IPC::ResponseBuilder rb{ctx, 2, 0, 1};
|
||||||
rb.Push(RESULT_SUCCESS);
|
rb.Push(RESULT_SUCCESS);
|
||||||
@ -85,13 +97,13 @@ void ACC_U0::GetLastOpenedUser(Kernel::HLERequestContext& ctx) {
|
|||||||
LOG_WARNING(Service_ACC, "(STUBBED) called");
|
LOG_WARNING(Service_ACC, "(STUBBED) called");
|
||||||
IPC::ResponseBuilder rb{ctx, 6};
|
IPC::ResponseBuilder rb{ctx, 6};
|
||||||
rb.Push(RESULT_SUCCESS);
|
rb.Push(RESULT_SUCCESS);
|
||||||
rb.Push<u64>(0x0);
|
rb.PushRaw(DEFAULT_USER_ID);
|
||||||
rb.Push<u64>(0x0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ACC_U0::ACC_U0() : ServiceFramework("acc:u0") {
|
ACC_U0::ACC_U0() : ServiceFramework("acc:u0") {
|
||||||
static const FunctionInfo functions[] = {
|
static const FunctionInfo functions[] = {
|
||||||
{1, &ACC_U0::GetUserExistence, "GetUserExistence"},
|
{1, &ACC_U0::GetUserExistence, "GetUserExistence"},
|
||||||
|
{2, &ACC_U0::ListAllUsers, "ListAllUsers"},
|
||||||
{4, &ACC_U0::GetLastOpenedUser, "GetLastOpenedUser"},
|
{4, &ACC_U0::GetLastOpenedUser, "GetLastOpenedUser"},
|
||||||
{5, &ACC_U0::GetProfile, "GetProfile"},
|
{5, &ACC_U0::GetProfile, "GetProfile"},
|
||||||
{100, &ACC_U0::InitializeApplicationInfo, "InitializeApplicationInfo"},
|
{100, &ACC_U0::InitializeApplicationInfo, "InitializeApplicationInfo"},
|
||||||
|
@ -28,6 +28,7 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
void GetUserExistence(Kernel::HLERequestContext& ctx);
|
void GetUserExistence(Kernel::HLERequestContext& ctx);
|
||||||
|
void ListAllUsers(Kernel::HLERequestContext& ctx);
|
||||||
void GetLastOpenedUser(Kernel::HLERequestContext& ctx);
|
void GetLastOpenedUser(Kernel::HLERequestContext& ctx);
|
||||||
void GetProfile(Kernel::HLERequestContext& ctx);
|
void GetProfile(Kernel::HLERequestContext& ctx);
|
||||||
void InitializeApplicationInfo(Kernel::HLERequestContext& ctx);
|
void InitializeApplicationInfo(Kernel::HLERequestContext& ctx);
|
||||||
|
@ -104,8 +104,20 @@ u32 nvhost_ctrl_gpu::ZCullGetCtxSize(const std::vector<u8>& input, std::vector<u
|
|||||||
}
|
}
|
||||||
|
|
||||||
u32 nvhost_ctrl_gpu::ZCullGetInfo(const std::vector<u8>& input, std::vector<u8>& output) {
|
u32 nvhost_ctrl_gpu::ZCullGetInfo(const std::vector<u8>& input, std::vector<u8>& output) {
|
||||||
LOG_WARNING(Service_NVDRV, "(STUBBED) called");
|
LOG_DEBUG(Service_NVDRV, "called");
|
||||||
std::memset(output.data(), 0, output.size());
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -78,11 +78,10 @@ void NVDRV::QueryEvent(Kernel::HLERequestContext& ctx) {
|
|||||||
u32 event_id = rp.Pop<u32>();
|
u32 event_id = rp.Pop<u32>();
|
||||||
LOG_WARNING(Service_NVDRV, "(STUBBED) called, fd=%x, event_id=%x", fd, event_id);
|
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);
|
rb.Push(RESULT_SUCCESS);
|
||||||
auto event = Kernel::Event::Create(Kernel::ResetType::Pulse, "NVEvent");
|
rb.PushCopyObjects(query_event);
|
||||||
event->Signal();
|
rb.Push<u32>(0);
|
||||||
rb.PushCopyObjects(event);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void NVDRV::SetClientPID(Kernel::HLERequestContext& ctx) {
|
void NVDRV::SetClientPID(Kernel::HLERequestContext& ctx) {
|
||||||
@ -113,6 +112,8 @@ NVDRV::NVDRV(std::shared_ptr<Module> nvdrv, const char* name)
|
|||||||
{13, &NVDRV::FinishInitialize, "FinishInitialize"},
|
{13, &NVDRV::FinishInitialize, "FinishInitialize"},
|
||||||
};
|
};
|
||||||
RegisterHandlers(functions);
|
RegisterHandlers(functions);
|
||||||
|
|
||||||
|
query_event = Kernel::Event::Create(Kernel::ResetType::OneShot, "NVDRV::query_event");
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Nvidia
|
} // namespace Nvidia
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include "core/hle/kernel/event.h"
|
||||||
#include "core/hle/service/nvdrv/nvdrv.h"
|
#include "core/hle/service/nvdrv/nvdrv.h"
|
||||||
#include "core/hle/service/service.h"
|
#include "core/hle/service/service.h"
|
||||||
|
|
||||||
@ -29,6 +30,8 @@ private:
|
|||||||
std::shared_ptr<Module> nvdrv;
|
std::shared_ptr<Module> nvdrv;
|
||||||
|
|
||||||
u64 pid{};
|
u64 pid{};
|
||||||
|
|
||||||
|
Kernel::SharedPtr<Kernel::Event> query_event;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Nvidia
|
} // namespace Nvidia
|
||||||
|
@ -657,7 +657,7 @@ void IApplicationDisplayService::CloseDisplay(Kernel::HLERequestContext& ctx) {
|
|||||||
IPC::RequestParser rp{ctx};
|
IPC::RequestParser rp{ctx};
|
||||||
u64 display_id = rp.Pop<u64>();
|
u64 display_id = rp.Pop<u64>();
|
||||||
|
|
||||||
IPC::ResponseBuilder rb = rp.MakeBuilder(4, 0, 0);
|
IPC::ResponseBuilder rb = rp.MakeBuilder(2, 0, 0);
|
||||||
rb.Push(RESULT_SUCCESS);
|
rb.Push(RESULT_SUCCESS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user