Merge pull request #109 from bunnei/libnx-fixes

Fix svcGetInfo for libnx
This commit is contained in:
bunnei 2018-01-19 14:48:08 -05:00 committed by GitHub
commit 0f363d37e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 1 deletions

View file

@ -314,7 +314,7 @@ static ResultCode GetInfo(u64* result, u64 info_id, u64 handle, u64 info_sub_id)
*result = g_current_process->allowed_thread_priority_mask; *result = g_current_process->allowed_thread_priority_mask;
break; break;
case GetInfoType::MapRegionBaseAddr: case GetInfoType::MapRegionBaseAddr:
*result = vm_manager.GetAddressSpaceBaseAddr(); *result = vm_manager.GetMapRegionBaseAddr();
break; break;
case GetInfoType::MapRegionSize: case GetInfoType::MapRegionSize:
*result = vm_manager.GetAddressSpaceSize(); *result = vm_manager.GetAddressSpaceSize();

View file

@ -14,7 +14,11 @@ struct MemoryInfo {
u32 type; u32 type;
u32 attributes; u32 attributes;
u32 permission; u32 permission;
u32 device_refcount;
u32 ipc_refcount;
INSERT_PADDING_WORDS(1);
}; };
static_assert(sizeof(MemoryInfo) == 0x28, "MemoryInfo has incorrect size.");
struct PageInfo { struct PageInfo {
u64 flags; u64 flags;

View file

@ -375,6 +375,11 @@ u64 VMManager::GetAddressSpaceSize() {
return MAX_ADDRESS; return MAX_ADDRESS;
} }
VAddr VMManager::GetMapRegionBaseAddr() {
LOG_WARNING(Kernel, "(STUBBED) called");
return Memory::HEAP_VADDR;
}
VAddr VMManager::GetNewMapRegionBaseAddr() { VAddr VMManager::GetNewMapRegionBaseAddr() {
LOG_WARNING(Kernel, "(STUBBED) called"); LOG_WARNING(Kernel, "(STUBBED) called");
return 0x8000000; return 0x8000000;

View file

@ -192,6 +192,9 @@ public:
/// Gets the total address space address size, used by svcGetInfo /// Gets the total address space address size, used by svcGetInfo
u64 GetAddressSpaceSize(); u64 GetAddressSpaceSize();
/// Gets the map region base address, used by svcGetInfo
VAddr GetMapRegionBaseAddr();
/// Gets the base address for a new memory region, used by svcGetInfo /// Gets the base address for a new memory region, used by svcGetInfo
VAddr GetNewMapRegionBaseAddr(); VAddr GetNewMapRegionBaseAddr();

View file

@ -67,6 +67,17 @@ void NVDRV::Initialize(Kernel::HLERequestContext& ctx) {
rb.Push<u32>(0); rb.Push<u32>(0);
} }
void NVDRV::SetClientPID(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx};
u64 pid = rp.Pop<u64>();
u64 unk = rp.Pop<u64>();
LOG_WARNING(Service, "(STUBBED) called, pid=0x%llx, unk=0x%llx", pid, unk);
IPC::RequestBuilder rb{ctx, 2};
rb.Push(RESULT_SUCCESS);
}
NVDRV::NVDRV(std::shared_ptr<Module> nvdrv, const char* name) NVDRV::NVDRV(std::shared_ptr<Module> nvdrv, const char* name)
: ServiceFramework(name), nvdrv(std::move(nvdrv)) { : ServiceFramework(name), nvdrv(std::move(nvdrv)) {
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
@ -74,6 +85,7 @@ NVDRV::NVDRV(std::shared_ptr<Module> nvdrv, const char* name)
{1, &NVDRV::Ioctl, "Ioctl"}, {1, &NVDRV::Ioctl, "Ioctl"},
{2, &NVDRV::Close, "Close"}, {2, &NVDRV::Close, "Close"},
{3, &NVDRV::Initialize, "Initialize"}, {3, &NVDRV::Initialize, "Initialize"},
{8, &NVDRV::SetClientPID, "SetClientPID"},
}; };
RegisterHandlers(functions); RegisterHandlers(functions);
} }

View file

@ -22,6 +22,7 @@ private:
void Ioctl(Kernel::HLERequestContext& ctx); void Ioctl(Kernel::HLERequestContext& ctx);
void Close(Kernel::HLERequestContext& ctx); void Close(Kernel::HLERequestContext& ctx);
void Initialize(Kernel::HLERequestContext& ctx); void Initialize(Kernel::HLERequestContext& ctx);
void SetClientPID(Kernel::HLERequestContext& ctx);
std::shared_ptr<Module> nvdrv; std::shared_ptr<Module> nvdrv;
}; };