N-archive/Ryujinx
1
0
Fork 0
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-07-04 08:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix GetAudioRenderersProcessMasterVolume which was totally wrong

Browse source
This commit is contained in:
gdkchan 2018-03-12 16:29:06 -03:00
parent e32f27158f
commit d88b5c7621
3 changed files with 80 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChocolArm64/Instruction/AInstEmitSystem.cs
View file

@ -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
View 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;
}
}
}

13
Ryujinx.Core/OsHle/Services/Aud/ServiceAudRen.cs
View file

@ -1,3 +1,4 @@
using Ryujinx.Core.OsHle.Handles;
using Ryujinx.Core.OsHle.Ipc;
using System.Collections.Generic;
@ -15,9 +16,9 @@ namespace Ryujinx.Core.OsHle.IpcServices.Aud
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 0, OpenAudioRenderer },
{ 1, GetAudioRendererWorkBufferSize },
{ 2, GetAudioRenderersProcessMasterVolume }
{ 0, OpenAudioRenderer },
{ 1, GetAudioRendererWorkBufferSize },
{ 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;
}