Fix GetAudioRenderersProcessMasterVolume which was totally wrong
This commit is contained in:
parent
e32f27158f
commit
d88b5c7621
3 changed files with 80 additions and 6 deletions
ChocolArm64/Instruction
Ryujinx.Core/OsHle/Services/Aud
|
@ -89,6 +89,9 @@ namespace ChocolArm64.Instruction
|
|||
//We treat it as no-op here since we don't have any cache being emulated anyway.
|
||||
AOpCodeSystem Op = (AOpCodeSystem)Context.CurrOp;
|
||||
|
||||
//TODO: We should throw on unimplemented sys instructions here,
|
||||
//since it causing some problems when the programs expects some values
|
||||
//that never return.
|
||||
switch (GetPackedId(Op))
|
||||
{
|
||||
case 0b11_011_0111_0100_001:
|
||||
|
@ -97,7 +100,7 @@ namespace ChocolArm64.Instruction
|
|||
for (int Offs = 0; Offs < (4 << AThreadState.DczSizeLog2); Offs += 8)
|
||||
{
|
||||
Context.EmitLdarg(ATranslatedSub.MemoryArgIdx);
|
||||
Context.EmitLdint(Op.Rt);
|
||||
Context.EmitLdintzr(Op.Rt);
|
||||
Context.EmitLdc_I(Offs);
|
||||
|
||||
Context.Emit(OpCodes.Add);
|
||||
|
@ -106,8 +109,13 @@ namespace ChocolArm64.Instruction
|
|||
|
||||
AInstEmitMemoryHelper.EmitWriteCall(Context, 3);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
//No-op
|
||||
case 0b11_011_0111_1110_001: //DC CIVAC
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
63
Ryujinx.Core/OsHle/Services/Aud/IAudioDeviceService.cs
Normal file
63
Ryujinx.Core/OsHle/Services/Aud/IAudioDeviceService.cs
Normal file
|
@ -0,0 +1,63 @@
|
|||
using ChocolArm64.Memory;
|
||||
using Ryujinx.Core.OsHle.Ipc;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace Ryujinx.Core.OsHle.IpcServices.Aud
|
||||
{
|
||||
class IAudioDevice : IIpcService
|
||||
{
|
||||
private Dictionary<int, ServiceProcessRequest> m_Commands;
|
||||
|
||||
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
|
||||
|
||||
public IAudioDevice()
|
||||
{
|
||||
m_Commands = new Dictionary<int, ServiceProcessRequest>()
|
||||
{
|
||||
{ 0, ListAudioDeviceName },
|
||||
{ 1, SetAudioDeviceOutputVolume },
|
||||
};
|
||||
}
|
||||
|
||||
public long ListAudioDeviceName(ServiceCtx Context)
|
||||
{
|
||||
string[] Names = new string[] { "FIXME" };
|
||||
|
||||
Context.ResponseData.Write(Names.Length);
|
||||
|
||||
long Position = Context.Request.ReceiveBuff[0].Position;
|
||||
long Size = Context.Request.ReceiveBuff[0].Size;
|
||||
|
||||
long BasePosition = Position;
|
||||
|
||||
foreach (string Name in Names)
|
||||
{
|
||||
byte[] Buffer = Encoding.ASCII.GetBytes(Name + '\0');
|
||||
|
||||
if ((Position - BasePosition) + Buffer.Length > Size)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
AMemoryHelper.WriteBytes(Context.Memory, Position, Buffer);
|
||||
|
||||
Position += Buffer.Length;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
public long SetAudioDeviceOutputVolume(ServiceCtx Context)
|
||||
{
|
||||
float Volume = Context.RequestData.ReadSingle();
|
||||
|
||||
long Position = Context.Request.SendBuff[0].Position;
|
||||
long Size = Context.Request.SendBuff[0].Size;
|
||||
|
||||
string Name = AMemoryHelper.ReadAsciiString(Context.Memory, Position, (int)Size);
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -1,3 +1,4 @@
|
|||
using Ryujinx.Core.OsHle.Handles;
|
||||
using Ryujinx.Core.OsHle.Ipc;
|
||||
using System.Collections.Generic;
|
||||
|
||||
|
@ -17,7 +18,7 @@ namespace Ryujinx.Core.OsHle.IpcServices.Aud
|
|||
{
|
||||
{ 0, OpenAudioRenderer },
|
||||
{ 1, GetAudioRendererWorkBufferSize },
|
||||
{ 2, GetAudioRenderersProcessMasterVolume }
|
||||
{ 2, GetAudioDevice }
|
||||
};
|
||||
}
|
||||
|
||||
|
@ -49,9 +50,11 @@ namespace Ryujinx.Core.OsHle.IpcServices.Aud
|
|||
return 0;
|
||||
}
|
||||
|
||||
public long GetAudioRenderersProcessMasterVolume(ServiceCtx Context)
|
||||
public long GetAudioDevice(ServiceCtx Context)
|
||||
{
|
||||
Context.ResponseData.Write(0);
|
||||
long UserId = Context.RequestData.ReadInt64();
|
||||
|
||||
MakeObject(Context, new IAudioDevice());
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue