diff --git a/Ryujinx.Core/OsHle/Services/Nv/INvDrvServices.cs b/Ryujinx.Core/OsHle/Services/Nv/INvDrvServices.cs index ff7475dd1d..64bbd43012 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/INvDrvServices.cs +++ b/Ryujinx.Core/OsHle/Services/Nv/INvDrvServices.cs @@ -174,7 +174,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv private static int ProcessIoctl(ServiceCtx Context, int Cmd, IoctlProcessor Processor) { - if (CmdIn(Cmd) && Context.Request.GetBufferType0x21() == 0) + if (CmdIn(Cmd) && Context.Request.GetBufferType0x21().Position == 0) { Context.Ns.Log.PrintError(LogClass.ServiceNv, "Input buffer is null!"); diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASIoctl.cs b/Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASIoctl.cs index ff9a21e61e..f3aba0747a 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASIoctl.cs +++ b/Ryujinx.Core/OsHle/Services/Nv/NvGpuAS/NvGpuASIoctl.cs @@ -37,7 +37,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS private static int BindChannel(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); @@ -47,7 +47,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS private static int AllocSpace(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); NvGpuASAllocSpace Args = AMemoryHelper.Read(Context.Memory, InputPosition); @@ -84,7 +84,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS private static int FreeSpace(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); NvGpuASAllocSpace Args = AMemoryHelper.Read(Context.Memory, InputPosition); @@ -101,7 +101,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS private static int UnmapBuffer(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); NvGpuASUnmapBuffer Args = AMemoryHelper.Read(Context.Memory, InputPosition); @@ -118,7 +118,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS private static int MapBufferEx(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); NvGpuASMapBufferEx Args = AMemoryHelper.Read(Context.Memory, InputPosition); @@ -190,7 +190,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS private static int GetVaRegions(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); @@ -200,7 +200,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS private static int InitializeEx(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); @@ -210,7 +210,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS private static int Remap(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; NvGpuASRemap Args = AMemoryHelper.Read(Context.Memory, InputPosition); diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuIoctl.cs b/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuIoctl.cs index 4e56c7cc3f..fec361bcb3 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuIoctl.cs +++ b/Ryujinx.Core/OsHle/Services/Nv/NvGpuGpu/NvGpuGpuIoctl.cs @@ -77,7 +77,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuGpu private static int ZbcSetTable(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); @@ -87,7 +87,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuGpu private static int GetCharacteristics(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); NvGpuGpuGetCharacteristics Args = AMemoryHelper.Read(Context.Memory, InputPosition); @@ -137,7 +137,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuGpu private static int GetTpcMasks(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); NvGpuGpuGetTpcMasks Args = AMemoryHelper.Read(Context.Memory, InputPosition); diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs b/Ryujinx.Core/OsHle/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs index 960146b2b9..38f5fcd4ca 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs +++ b/Ryujinx.Core/OsHle/Services/Nv/NvHostChannel/NvHostChannelIoctl.cs @@ -27,7 +27,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel private static int SetUserData(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); @@ -37,7 +37,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel private static int SetNvMap(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); @@ -47,7 +47,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel private static int SubmitGpfifo(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); NvHostChannelSubmitGpfifo Args = AMemoryHelper.Read(Context.Memory, InputPosition); @@ -79,7 +79,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel private static int AllocObjCtx(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); @@ -89,7 +89,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel private static int ZcullBind(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); @@ -99,7 +99,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel private static int SetErrorNotifier(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); @@ -109,7 +109,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel private static int SetPriority(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); @@ -119,7 +119,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel private static int AllocGpfifoEx2(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapIoctl.cs b/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapIoctl.cs index 4a18d25cef..1b03e68a80 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapIoctl.cs +++ b/Ryujinx.Core/OsHle/Services/Nv/NvMap/NvMapIoctl.cs @@ -36,7 +36,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvMap private static int Create(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); NvMapCreate Args = AMemoryHelper.Read(Context.Memory, InputPosition); @@ -61,7 +61,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvMap private static int FromId(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); NvMapFromId Args = AMemoryHelper.Read(Context.Memory, InputPosition); @@ -86,7 +86,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvMap private static int Alloc(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); NvMapAlloc Args = AMemoryHelper.Read(Context.Memory, InputPosition); @@ -149,7 +149,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvMap private static int Free(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); NvMapFree Args = AMemoryHelper.Read(Context.Memory, InputPosition); @@ -188,7 +188,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvMap private static int Param(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); NvMapParam Args = AMemoryHelper.Read(Context.Memory, InputPosition); @@ -222,7 +222,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvMap private static int GetId(ServiceCtx Context) { - long InputPosition = Context.Request.GetBufferType0x21(); + long InputPosition = Context.Request.GetBufferType0x21().Position; long OutputPosition = Context.Request.GetBufferType0x22Position(); NvMapGetId Args = AMemoryHelper.Read(Context.Memory, InputPosition);