This commit is contained in:
Starlet 2018-06-02 18:11:46 -04:00
commit 6656b6ebe1
5 changed files with 26 additions and 26 deletions

View file

@ -174,7 +174,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv
private static int ProcessIoctl(ServiceCtx Context, int Cmd, IoctlProcessor Processor) 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!"); Context.Ns.Log.PrintError(LogClass.ServiceNv, "Input buffer is null!");

View file

@ -37,7 +37,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS
private static int BindChannel(ServiceCtx Context) private static int BindChannel(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed.");
@ -47,7 +47,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS
private static int AllocSpace(ServiceCtx Context) private static int AllocSpace(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
NvGpuASAllocSpace Args = AMemoryHelper.Read<NvGpuASAllocSpace>(Context.Memory, InputPosition); NvGpuASAllocSpace Args = AMemoryHelper.Read<NvGpuASAllocSpace>(Context.Memory, InputPosition);
@ -84,7 +84,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS
private static int FreeSpace(ServiceCtx Context) private static int FreeSpace(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
NvGpuASAllocSpace Args = AMemoryHelper.Read<NvGpuASAllocSpace>(Context.Memory, InputPosition); NvGpuASAllocSpace Args = AMemoryHelper.Read<NvGpuASAllocSpace>(Context.Memory, InputPosition);
@ -101,7 +101,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS
private static int UnmapBuffer(ServiceCtx Context) private static int UnmapBuffer(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
NvGpuASUnmapBuffer Args = AMemoryHelper.Read<NvGpuASUnmapBuffer>(Context.Memory, InputPosition); NvGpuASUnmapBuffer Args = AMemoryHelper.Read<NvGpuASUnmapBuffer>(Context.Memory, InputPosition);
@ -118,7 +118,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS
private static int MapBufferEx(ServiceCtx Context) private static int MapBufferEx(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
NvGpuASMapBufferEx Args = AMemoryHelper.Read<NvGpuASMapBufferEx>(Context.Memory, InputPosition); NvGpuASMapBufferEx Args = AMemoryHelper.Read<NvGpuASMapBufferEx>(Context.Memory, InputPosition);
@ -190,7 +190,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS
private static int GetVaRegions(ServiceCtx Context) private static int GetVaRegions(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed.");
@ -200,7 +200,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS
private static int InitializeEx(ServiceCtx Context) private static int InitializeEx(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed.");
@ -210,7 +210,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuAS
private static int Remap(ServiceCtx Context) private static int Remap(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
NvGpuASRemap Args = AMemoryHelper.Read<NvGpuASRemap>(Context.Memory, InputPosition); NvGpuASRemap Args = AMemoryHelper.Read<NvGpuASRemap>(Context.Memory, InputPosition);

View file

@ -77,7 +77,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuGpu
private static int ZbcSetTable(ServiceCtx Context) private static int ZbcSetTable(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed.");
@ -87,7 +87,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuGpu
private static int GetCharacteristics(ServiceCtx Context) private static int GetCharacteristics(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
NvGpuGpuGetCharacteristics Args = AMemoryHelper.Read<NvGpuGpuGetCharacteristics>(Context.Memory, InputPosition); NvGpuGpuGetCharacteristics Args = AMemoryHelper.Read<NvGpuGpuGetCharacteristics>(Context.Memory, InputPosition);
@ -137,7 +137,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvGpuGpu
private static int GetTpcMasks(ServiceCtx Context) private static int GetTpcMasks(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
NvGpuGpuGetTpcMasks Args = AMemoryHelper.Read<NvGpuGpuGetTpcMasks>(Context.Memory, InputPosition); NvGpuGpuGetTpcMasks Args = AMemoryHelper.Read<NvGpuGpuGetTpcMasks>(Context.Memory, InputPosition);

View file

@ -27,7 +27,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel
private static int SetUserData(ServiceCtx Context) private static int SetUserData(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed.");
@ -37,7 +37,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel
private static int SetNvMap(ServiceCtx Context) private static int SetNvMap(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed.");
@ -47,7 +47,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel
private static int SubmitGpfifo(ServiceCtx Context) private static int SubmitGpfifo(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
NvHostChannelSubmitGpfifo Args = AMemoryHelper.Read<NvHostChannelSubmitGpfifo>(Context.Memory, InputPosition); NvHostChannelSubmitGpfifo Args = AMemoryHelper.Read<NvHostChannelSubmitGpfifo>(Context.Memory, InputPosition);
@ -79,7 +79,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel
private static int AllocObjCtx(ServiceCtx Context) private static int AllocObjCtx(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed.");
@ -89,7 +89,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel
private static int ZcullBind(ServiceCtx Context) private static int ZcullBind(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed.");
@ -99,7 +99,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel
private static int SetErrorNotifier(ServiceCtx Context) private static int SetErrorNotifier(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed.");
@ -109,7 +109,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel
private static int SetPriority(ServiceCtx Context) private static int SetPriority(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed.");
@ -119,7 +119,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvHostChannel
private static int AllocGpfifoEx2(ServiceCtx Context) private static int AllocGpfifoEx2(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed."); Context.Ns.Log.PrintStub(LogClass.ServiceNv, "Stubbed.");

View file

@ -36,7 +36,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvMap
private static int Create(ServiceCtx Context) private static int Create(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
NvMapCreate Args = AMemoryHelper.Read<NvMapCreate>(Context.Memory, InputPosition); NvMapCreate Args = AMemoryHelper.Read<NvMapCreate>(Context.Memory, InputPosition);
@ -61,7 +61,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvMap
private static int FromId(ServiceCtx Context) private static int FromId(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
NvMapFromId Args = AMemoryHelper.Read<NvMapFromId>(Context.Memory, InputPosition); NvMapFromId Args = AMemoryHelper.Read<NvMapFromId>(Context.Memory, InputPosition);
@ -86,7 +86,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvMap
private static int Alloc(ServiceCtx Context) private static int Alloc(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
NvMapAlloc Args = AMemoryHelper.Read<NvMapAlloc>(Context.Memory, InputPosition); NvMapAlloc Args = AMemoryHelper.Read<NvMapAlloc>(Context.Memory, InputPosition);
@ -149,7 +149,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvMap
private static int Free(ServiceCtx Context) private static int Free(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
NvMapFree Args = AMemoryHelper.Read<NvMapFree>(Context.Memory, InputPosition); NvMapFree Args = AMemoryHelper.Read<NvMapFree>(Context.Memory, InputPosition);
@ -188,7 +188,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvMap
private static int Param(ServiceCtx Context) private static int Param(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
NvMapParam Args = AMemoryHelper.Read<NvMapParam>(Context.Memory, InputPosition); NvMapParam Args = AMemoryHelper.Read<NvMapParam>(Context.Memory, InputPosition);
@ -222,7 +222,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv.NvMap
private static int GetId(ServiceCtx Context) private static int GetId(ServiceCtx Context)
{ {
long InputPosition = Context.Request.GetBufferType0x21(); long InputPosition = Context.Request.GetBufferType0x21().Position;
long OutputPosition = Context.Request.GetBufferType0x22Position(); long OutputPosition = Context.Request.GetBufferType0x22Position();
NvMapGetId Args = AMemoryHelper.Read<NvMapGetId>(Context.Memory, InputPosition); NvMapGetId Args = AMemoryHelper.Read<NvMapGetId>(Context.Memory, InputPosition);