mirrors/ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nvdrv: Partially implementation of GetStatus (#1215)

Browse source 
* nvdrv: Partially implementation of GetStatus

This implement GetStatus call according to RE.
Since we don't handle tranfert memory on the initialize of the service, it's fine sets fields at 0 for now.
Tested on Undertale.

Fix #635

* Fix struct
This commit is contained in:
Ac_K 2020-05-13 07:29:16 +02:00 committed by GitHub
parent b96aa7574f
commit 1f8e45c2ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs
View file

@ -43,6 +43,8 @@ namespace Ryujinx.HLE.HOS.Services.Nv
private KProcess _owner; private KProcess _owner;
private bool _transferMemInitialized = false;
public INvDrvServices(ServiceCtx context) public INvDrvServices(ServiceCtx context)
{ {
_owner = null; _owner = null;
@ -315,6 +317,9 @@ namespace Ryujinx.HLE.HOS.Services.Nv
long transferMemSize = context.RequestData.ReadInt64(); long transferMemSize = context.RequestData.ReadInt64();
int transferMemHandle = context.Request.HandleDesc.ToCopy[0]; int transferMemHandle = context.Request.HandleDesc.ToCopy[0];
// TODO: When transfer memory will be implemented, this could be removed.
_transferMemInitialized = true;
_owner = context.Process; _owner = context.Process;
context.ResponseData.Write((uint)NvResult.Success); context.ResponseData.Write((uint)NvResult.Success);
@ -389,7 +394,29 @@ namespace Ryujinx.HLE.HOS.Services.Nv
// GetStatus() -> (unknown<0x20>, u32 error_code) // GetStatus() -> (unknown<0x20>, u32 error_code)
public ResultCode GetStatus(ServiceCtx context) public ResultCode GetStatus(ServiceCtx context)
{ {
throw new ServiceNotImplementedException(context); // TODO: When transfer memory will be implemented, check if it's mapped instead.
if (_transferMemInitialized)
{
// TODO: Populate values when more RE will be done.
NvStatus nvStatus = new NvStatus
{
MemoryValue1 = 0, // GetMemStats(transfer_memory + 0x60, 3)
MemoryValue2 = 0, // GetMemStats(transfer_memory + 0x60, 5)
MemoryValue3 = 0, // transfer_memory + 0x78
MemoryValue4 = 0 // transfer_memory + 0x80
};
context.ResponseData.WriteStruct(nvStatus);
context.ResponseData.Write((uint)NvResult.Success);
Logger.PrintStub(LogClass.ServiceNv);
}
else
{
context.ResponseData.Write((uint)NvResult.NotInitialized);
}
return ResultCode.Success;
} }
[Command(7)] [Command(7)]

15
Ryujinx.HLE/HOS/Services/Nv/Types/NvStatus.cs Normal file
View file

@ -0,0 +1,15 @@
using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Nv.Types
{
[StructLayout(LayoutKind.Sequential, Size = 0x20)]
struct NvStatus
{
public uint MemoryValue1;
public uint MemoryValue2;
public uint MemoryValue3;
public uint MemoryValue4;
public long Padding1;
public long Padding2;
}
}