From 3e61fb0268ea0f52a37c4513dde0ec1f5a6463a2 Mon Sep 17 00:00:00 2001 From: Ac_K Date: Thu, 22 Apr 2021 23:35:01 +0200 Subject: [PATCH] mm: Cleaned up the service a bit (#2233) --- Ryujinx.HLE/HOS/Services/Mm/IRequest.cs | 18 +++++++++--------- .../Mm/Types/MultiMediaOperationType.cs | 11 +++++------ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Ryujinx.HLE/HOS/Services/Mm/IRequest.cs b/Ryujinx.HLE/HOS/Services/Mm/IRequest.cs index 6cd643d381..bce5211903 100644 --- a/Ryujinx.HLE/HOS/Services/Mm/IRequest.cs +++ b/Ryujinx.HLE/HOS/Services/Mm/IRequest.cs @@ -12,7 +12,7 @@ namespace Ryujinx.HLE.HOS.Services.Mm private static uint _uniqueId = 1; - public IRequest(ServiceCtx context) {} + public IRequest(ServiceCtx context) { } [CommandHipc(0)] // InitializeOld(u32, u32, u32) @@ -50,14 +50,14 @@ namespace Ryujinx.HLE.HOS.Services.Mm public ResultCode SetAndWaitOld(ServiceCtx context) { MultiMediaOperationType operationType = (MultiMediaOperationType)context.RequestData.ReadUInt32(); - uint value = context.RequestData.ReadUInt32(); + uint frequenceHz = context.RequestData.ReadUInt32(); int timeout = context.RequestData.ReadInt32(); - Logger.Stub?.PrintStub(LogClass.ServiceMm, new { operationType, value, timeout }); + Logger.Stub?.PrintStub(LogClass.ServiceMm, new { operationType, frequenceHz, timeout }); lock (_sessionListLock) { - GetSessionByType(operationType)?.SetAndWait(value, timeout); + GetSessionByType(operationType)?.SetAndWait(frequenceHz, timeout); } return ResultCode.Success; @@ -120,15 +120,15 @@ namespace Ryujinx.HLE.HOS.Services.Mm // SetAndWait(u32, u32, u32) public ResultCode SetAndWait(ServiceCtx context) { - uint id = context.RequestData.ReadUInt32(); - uint value = context.RequestData.ReadUInt32(); - int timeout = context.RequestData.ReadInt32(); + uint id = context.RequestData.ReadUInt32(); + uint frequenceHz = context.RequestData.ReadUInt32(); + int timeout = context.RequestData.ReadInt32(); - Logger.Stub?.PrintStub(LogClass.ServiceMm, new { id, value, timeout }); + Logger.Stub?.PrintStub(LogClass.ServiceMm, new { id, frequenceHz, timeout }); lock (_sessionListLock) { - GetSessionById(id)?.SetAndWait(value, timeout); + GetSessionById(id)?.SetAndWait(frequenceHz, timeout); } return ResultCode.Success; diff --git a/Ryujinx.HLE/HOS/Services/Mm/Types/MultiMediaOperationType.cs b/Ryujinx.HLE/HOS/Services/Mm/Types/MultiMediaOperationType.cs index cf4cdf20e0..2742af6c49 100644 --- a/Ryujinx.HLE/HOS/Services/Mm/Types/MultiMediaOperationType.cs +++ b/Ryujinx.HLE/HOS/Services/Mm/Types/MultiMediaOperationType.cs @@ -2,10 +2,9 @@ { enum MultiMediaOperationType : uint { - // TODO: figure out the unknown variants. - Unknown2 = 2, - VideoDecode = 5, - VideoEncode = 6, - Unknown7 = 7 + Ram = 2, + NvEnc = 5, + NvDec = 6, + NvJpg = 7 } -} +} \ No newline at end of file