Mirror/Ryujinx
3
5
Fork 13
mirror of https://github.com/Ryujinx/Ryujinx.git synced 2024-11-20 00:06:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ipc refactor (#9)

Browse source 
* Start refactoring IPC objects (started with IFile and IFileSystem)

* End refactoring IPC objects (#8)

* End refactoring IPC objects

* End refactoring IPC objects

corrections
This commit is contained in:
gdkchan 2018-02-09 21:14:55 -03:00 committed by GitHub
parent 7f4a190665
commit 322f28668d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 935 additions and 619 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

132
Ryujinx/OsHle/Ipc/IpcHandler.cs
View file

@ -10,8 +10,6 @@ namespace Ryujinx.OsHle.Ipc
{
static class IpcHandler
{
private delegate long ServiceProcessRequest(ServiceCtx Context);
private static Dictionary<(string, int), ServiceProcessRequest> ServiceCmds =
new Dictionary<(string, int), ServiceProcessRequest>()
{
@ -71,122 +69,10 @@ namespace Ryujinx.OsHle.Ipc
{ ( "vi:m", 2), Service.ViGetDisplayService },
};
private static Dictionary<(Type, int), ServiceProcessRequest> ObjectCmds =
new Dictionary<(Type, int), ServiceProcessRequest>()
{
//IManagerForApplication
{ (typeof(AccIManagerForApplication), 0), AccIManagerForApplication.CheckAvailability },
{ (typeof(AccIManagerForApplication), 1), AccIManagerForApplication.GetAccountId },
//IProfile
{ (typeof(AccIProfile), 1), AccIProfile.GetBase },
//IApplicationFunctions
{ (typeof(AmIApplicationFunctions), 1), AmIApplicationFunctions.PopLaunchParameter },
{ (typeof(AmIApplicationFunctions), 20), AmIApplicationFunctions.EnsureSaveData },
{ (typeof(AmIApplicationFunctions), 21), AmIApplicationFunctions.GetDesiredLanguage },
{ (typeof(AmIApplicationFunctions), 40), AmIApplicationFunctions.NotifyRunning },
//IApplicationProxy
{ (typeof(AmIApplicationProxy), 0), AmIApplicationProxy.GetCommonStateGetter },
{ (typeof(AmIApplicationProxy), 1), AmIApplicationProxy.GetSelfController },
{ (typeof(AmIApplicationProxy), 2), AmIApplicationProxy.GetWindowController },
{ (typeof(AmIApplicationProxy), 3), AmIApplicationProxy.GetAudioController },
{ (typeof(AmIApplicationProxy), 4), AmIApplicationProxy.GetDisplayController },
{ (typeof(AmIApplicationProxy), 11), AmIApplicationProxy.GetLibraryAppletCreator },
{ (typeof(AmIApplicationProxy), 20), AmIApplicationProxy.GetApplicationFunctions },
{ (typeof(AmIApplicationProxy), 1000), AmIApplicationProxy.GetDebugFunctions },
//ICommonStateGetter
{ (typeof(AmICommonStateGetter), 0), AmICommonStateGetter.GetEventHandle },
{ (typeof(AmICommonStateGetter), 1), AmICommonStateGetter.ReceiveMessage },
{ (typeof(AmICommonStateGetter), 5), AmICommonStateGetter.GetOperationMode },
{ (typeof(AmICommonStateGetter), 6), AmICommonStateGetter.GetPerformanceMode },
{ (typeof(AmICommonStateGetter), 9), AmICommonStateGetter.GetCurrentFocusState },
//ISelfController
{ (typeof(AmISelfController), 11), AmISelfController.SetOperationModeChangedNotification },
{ (typeof(AmISelfController), 12), AmISelfController.SetPerformanceModeChangedNotification },
{ (typeof(AmISelfController), 13), AmISelfController.SetFocusHandlingMode },
{ (typeof(AmISelfController), 16), AmISelfController.SetOutOfFocusSuspendingEnabled },
//IStorage
{ (typeof(AmIStorage), 0), AmIStorage.Open },
//IStorageAccessor
{ (typeof(AmIStorageAccessor), 0), AmIStorageAccessor.GetSize },
{ (typeof(AmIStorageAccessor), 11), AmIStorageAccessor.Read },
//IWindowController
{ (typeof(AmIWindowController), 1), AmIWindowController.GetAppletResourceUserId },
{ (typeof(AmIWindowController), 10), AmIWindowController.AcquireForegroundRights },
//ISession
{ (typeof(ApmISession), 0), ApmISession.SetPerformanceConfiguration },
//IAudioRenderer
{ (typeof(AudIAudioRenderer), 4), AudIAudioRenderer.RequestUpdateAudioRenderer },
{ (typeof(AudIAudioRenderer), 5), AudIAudioRenderer.StartAudioRenderer },
{ (typeof(AudIAudioRenderer), 6), AudIAudioRenderer.StopAudioRenderer },
{ (typeof(AudIAudioRenderer), 7), AudIAudioRenderer.QuerySystemEvent },
//IAudioOut
{ (typeof(AudIAudioOut), 0), AudIAudioOut.GetAudioOutState },
{ (typeof(AudIAudioOut), 1), AudIAudioOut.StartAudioOut },
{ (typeof(AudIAudioOut), 2), AudIAudioOut.StopAudioOut },
{ (typeof(AudIAudioOut), 3), AudIAudioOut.AppendAudioOutBuffer },
{ (typeof(AudIAudioOut), 4), AudIAudioOut.RegisterBufferEvent },
{ (typeof(AudIAudioOut), 5), AudIAudioOut.GetReleasedAudioOutBuffer },
{ (typeof(AudIAudioOut), 6), AudIAudioOut.ContainsAudioOutBuffer },
{ (typeof(AudIAudioOut), 7), AudIAudioOut.AppendAudioOutBuffer_ex },
{ (typeof(AudIAudioOut), 8), AudIAudioOut.GetReleasedAudioOutBuffer_ex },
//IFile
{ (typeof(FspSrvIFile), 0), FspSrvIFile.Read },
{ (typeof(FspSrvIFile), 1), FspSrvIFile.Write },
//IFileSystem
{ (typeof(FspSrvIFileSystem), 7), FspSrvIFileSystem.GetEntryType },
{ (typeof(FspSrvIFileSystem), 8), FspSrvIFileSystem.OpenFile },
{ (typeof(FspSrvIFileSystem), 10), FspSrvIFileSystem.Commit },
//IStorage
{ (typeof(FspSrvIStorage), 0), FspSrvIStorage.Read },
//IAppletResource
{ (typeof(HidIAppletResource), 0), HidIAppletResource.GetSharedMemoryHandle },
//ISystemClock
{ (typeof(TimeISystemClock), 0), TimeISystemClock.GetCurrentTime },
//IApplicationDisplayService
{ (typeof(ViIApplicationDisplayService), 100), ViIApplicationDisplayService.GetRelayService },
{ (typeof(ViIApplicationDisplayService), 101), ViIApplicationDisplayService.GetSystemDisplayService },
{ (typeof(ViIApplicationDisplayService), 102), ViIApplicationDisplayService.GetManagerDisplayService },
{ (typeof(ViIApplicationDisplayService), 103), ViIApplicationDisplayService.GetIndirectDisplayTransactionService },
{ (typeof(ViIApplicationDisplayService), 1010), ViIApplicationDisplayService.OpenDisplay },
{ (typeof(ViIApplicationDisplayService), 2020), ViIApplicationDisplayService.OpenLayer },
{ (typeof(ViIApplicationDisplayService), 2030), ViIApplicationDisplayService.CreateStrayLayer },
{ (typeof(ViIApplicationDisplayService), 2101), ViIApplicationDisplayService.SetLayerScalingMode },
{ (typeof(ViIApplicationDisplayService), 5202), ViIApplicationDisplayService.GetDisplayVSyncEvent },
//IHOSBinderDriver
{ (typeof(ViIHOSBinderDriver), 0), ViIHOSBinderDriver.TransactParcel },
{ (typeof(ViIHOSBinderDriver), 1), ViIHOSBinderDriver.AdjustRefcount },
{ (typeof(ViIHOSBinderDriver), 2), ViIHOSBinderDriver.GetNativeHandle },
//IManagerDisplayService
{ (typeof(ViIManagerDisplayService), 2010), ViIManagerDisplayService.CreateManagedLayer },
{ (typeof(ViIManagerDisplayService), 6000), ViIManagerDisplayService.AddToLayerStack },
//ISystemDisplayService
{ (typeof(ViISystemDisplayService), 2205), ViISystemDisplayService.SetLayerZ },
};
private const long SfciMagic = 'S' << 0 | 'F' << 8 | 'C' << 16 | 'I' << 24;
private const long SfcoMagic = 'S' << 0 | 'F' << 8 | 'C' << 16 | 'O' << 24;
public static void ProcessRequest(
public static void IpcCall(
Switch Ns,
AMemory Memory,
HSession Session,
@ -221,15 +107,15 @@ namespace Ryujinx.OsHle.Ipc
if (Obj is HDomain)
{
DbgServiceName = $"{ServiceName} {CmdId}";
ServiceCmds.TryGetValue((ServiceName, CmdId), out ProcReq);
DbgServiceName = $"{ServiceName} {ProcReq?.Method.Name ?? CmdId.ToString()}";
}
else if (Obj != null)
{
DbgServiceName = $"{ServiceName} {Obj.GetType().Name} {CmdId}";
((IIpcInterface)Obj).Commands.TryGetValue(CmdId, out ProcReq);
ObjectCmds.TryGetValue((Obj.GetType(), CmdId), out ProcReq);
DbgServiceName = $"{ServiceName} {Obj.GetType().Name} {ProcReq?.Method.Name ?? CmdId.ToString()}";
}
}
else if (Request.DomCmd == IpcDomCmd.DeleteObj)
@ -250,15 +136,15 @@ namespace Ryujinx.OsHle.Ipc
{
object Obj = ((HSessionObj)Session).Obj;
DbgServiceName = $"{ServiceName} {Obj.GetType().Name} {CmdId}";
((IIpcInterface)Obj).Commands.TryGetValue(CmdId, out ProcReq);
ObjectCmds.TryGetValue((Obj.GetType(), CmdId), out ProcReq);
DbgServiceName = $"{ServiceName} {Obj.GetType().Name} {ProcReq?.Method.Name ?? CmdId.ToString()}";
}
else
{
DbgServiceName = $"{ServiceName} {CmdId}";
ServiceCmds.TryGetValue((ServiceName, CmdId), out ProcReq);
DbgServiceName = $"{ServiceName} {ProcReq?.Method.Name ?? CmdId.ToString()}";
}
}

4
Ryujinx/OsHle/Ipc/ServiceProcessRequest.cs Normal file
View file

@ -0,0 +1,4 @@
namespace Ryujinx.OsHle.Ipc
{
delegate long ServiceProcessRequest(ServiceCtx Context);
}

33
Ryujinx/OsHle/Objects/Acc/IManagerForApplication.cs Normal file
View file

@ -0,0 +1,33 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Acc
{
class IManagerForApplication : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IManagerForApplication()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 0, CheckAvailability },
{ 1, GetAccountId }
};
}
public long CheckAvailability(ServiceCtx Context)
{
return 0;
}
public long GetAccountId(ServiceCtx Context)
{
Context.ResponseData.Write(0xcafeL);
return 0;
}
}
}

33
Ryujinx/OsHle/Objects/Acc/IProfile.cs Normal file
View file

@ -0,0 +1,33 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Acc
{
class IProfile : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IProfile()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 1, GetBase }
};
}
public long GetBase(ServiceCtx Context)
{
Context.ResponseData.Write(0L);
Context.ResponseData.Write(0L);
Context.ResponseData.Write(0L);
Context.ResponseData.Write(0L);
Context.ResponseData.Write(0L);
Context.ResponseData.Write(0L);
Context.ResponseData.Write(0L);
return 0;
}
}
}

17
Ryujinx/OsHle/Objects/AccIManagerForApplication.cs
View file

@ -1,17 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class AccIManagerForApplication
{
public static long CheckAvailability(ServiceCtx Context)
{
return 0;
}
public static long GetAccountId(ServiceCtx Context)
{
Context.ResponseData.Write(0xcafeL);
return 0;
}
}
}

18
Ryujinx/OsHle/Objects/AccIProfile.cs
View file

@ -1,18 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class AccIProfile
{
public static long GetBase(ServiceCtx Context)
{
Context.ResponseData.Write(0L);
Context.ResponseData.Write(0L);
Context.ResponseData.Write(0L);
Context.ResponseData.Write(0L);
Context.ResponseData.Write(0L);
Context.ResponseData.Write(0L);
Context.ResponseData.Write(0L);
return 0;
}
}
}

33
Ryujinx/OsHle/Objects/AmIApplicationFunctions.cs → Ryujinx/OsHle/Objects/Am/IApplicationFunctions.cs
View file

@ -1,22 +1,39 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
using System.IO;
using static Ryujinx.OsHle.Objects.ObjHelper;
namespace Ryujinx.OsHle.Objects
namespace Ryujinx.OsHle.Objects.Am
{
class AmIApplicationFunctions
class IApplicationFunctions : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IApplicationFunctions()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 1, PopLaunchParameter },
{ 20, EnsureSaveData },
{ 21, GetDesiredLanguage },
{ 40, NotifyRunning }
};
}
private const uint LaunchParamsMagic = 0xc79497ca;
public static long PopLaunchParameter(ServiceCtx Context)
public long PopLaunchParameter(ServiceCtx Context)
{
//Only the first 0x18 bytes of the Data seems to be actually used.
MakeObject(Context, new AmIStorage(MakeLaunchParams()));
MakeObject(Context, new IStorage(MakeLaunchParams()));
return 0;
}
public static long EnsureSaveData(ServiceCtx Context)
public long EnsureSaveData(ServiceCtx Context)
{
long UIdLow = Context.RequestData.ReadInt64();
long UIdHigh = Context.RequestData.ReadInt64();
@ -26,7 +43,7 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long GetDesiredLanguage(ServiceCtx Context)
public long GetDesiredLanguage(ServiceCtx Context)
{
//This is an enumerator where each number is a differnet language.
//0 is Japanese and 1 is English, need to figure out the other codes.
@ -35,14 +52,14 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long NotifyRunning(ServiceCtx Context)
public long NotifyRunning(ServiceCtx Context)
{
Context.ResponseData.Write(1);
return 0;
}
private static byte[] MakeLaunchParams()
private byte[] MakeLaunchParams()
{
//Size needs to be at least 0x88 bytes otherwise application errors.
using (MemoryStream MS = new MemoryStream())

86
Ryujinx/OsHle/Objects/Am/IApplicationProxy.cs Normal file
View file

@ -0,0 +1,86 @@
using Ryujinx.OsHle.Ipc;
using Ryujinx.OsHle.Objects.Am;
using System.Collections.Generic;
using static Ryujinx.OsHle.Objects.ObjHelper;
namespace Ryujinx.OsHle.Objects
{
class IApplicationProxy : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IApplicationProxy()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 0, GetCommonStateGetter },
{ 1, GetSelfController },
{ 2, GetWindowController },
{ 3, GetAudioController },
{ 4, GetDisplayController },
{ 11, GetLibraryAppletCreator },
{ 20, GetApplicationFunctions },
{ 1000, GetDebugFunctions }
};
}
public long GetCommonStateGetter(ServiceCtx Context)
{
MakeObject(Context, new ICommonStateGetter());
return 0;
}
public long GetSelfController(ServiceCtx Context)
{
MakeObject(Context, new ISelfController());
return 0;
}
public long GetWindowController(ServiceCtx Context)
{
MakeObject(Context, new IWindowController());
return 0;
}
public long GetAudioController(ServiceCtx Context)
{
MakeObject(Context, new IAudioController());
return 0;
}
public long GetDisplayController(ServiceCtx Context)
{
MakeObject(Context, new IDisplayController());
return 0;
}
public long GetLibraryAppletCreator(ServiceCtx Context)
{
MakeObject(Context, new ILibraryAppletCreator());
return 0;
}
public long GetApplicationFunctions(ServiceCtx Context)
{
MakeObject(Context, new IApplicationFunctions());
return 0;
}
public long GetDebugFunctions(ServiceCtx Context)
{
MakeObject(Context, new IDebugFunctions());
return 0;
}
}
}

20
Ryujinx/OsHle/Objects/Am/IAudioController.cs Normal file
View file

@ -0,0 +1,20 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Am
{
class IAudioController : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IAudioController()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
//...
};
}
}
}

74
Ryujinx/OsHle/Objects/Am/ICommonStateGetter.cs Normal file
View file

@ -0,0 +1,74 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Am
{
class ICommonStateGetter : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ICommonStateGetter()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 0, GetEventHandle },
{ 1, ReceiveMessage },
{ 5, GetOperationMode },
{ 6, GetPerformanceMode },
{ 9, GetCurrentFocusState },
};
}
private enum FocusState
{
InFocus = 1,
OutOfFocus = 2
}
private enum OperationMode
{
Handheld = 0,
Docked = 1
}
public long GetEventHandle(ServiceCtx Context)
{
Context.ResponseData.Write(0L);
return 0;
}
public long ReceiveMessage(ServiceCtx Context)
{
//Program expects 0xF at 0x17ae70 on puyo sdk,
//otherwise runs on a infinite loop until it reads said value.
//What it means is still unknown.
Context.ResponseData.Write(0xfL);
return 0; //0x680;
}
public long GetOperationMode(ServiceCtx Context)
{
Context.ResponseData.Write((byte)OperationMode.Handheld);
return 0;
}
public long GetPerformanceMode(ServiceCtx Context)
{
Context.ResponseData.Write((byte)0);
return 0;
}
public long GetCurrentFocusState(ServiceCtx Context)
{
Context.ResponseData.Write((byte)FocusState.InFocus);
return 0;
}
}
}

20
Ryujinx/OsHle/Objects/Am/IDebugFunctions.cs Normal file
View file

@ -0,0 +1,20 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Am
{
class IDebugFunctions : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IDebugFunctions()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
//...
};
}
}
}

20
Ryujinx/OsHle/Objects/Am/IDisplayController.cs Normal file
View file

@ -0,0 +1,20 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Am
{
class IDisplayController : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IDisplayController()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
//...
};
}
}
}

20
Ryujinx/OsHle/Objects/Am/ILibraryAppletCreator.cs Normal file
View file

@ -0,0 +1,20 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Am
{
class ILibraryAppletCreator : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ILibraryAppletCreator()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
//...
};
}
}
}

20
Ryujinx/OsHle/Objects/Am/IParentalControlService.cs Normal file
View file

@ -0,0 +1,20 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Am
{
class IParentalControlService : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IParentalControlService()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
//...
};
}
}
}

53
Ryujinx/OsHle/Objects/Am/ISelfController.cs Normal file
View file

@ -0,0 +1,53 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Am
{
class ISelfController : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ISelfController()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 11, SetOperationModeChangedNotification },
{ 12, SetPerformanceModeChangedNotification },
{ 13, SetFocusHandlingMode },
{ 16, SetOutOfFocusSuspendingEnabled }
};
}
public long SetOperationModeChangedNotification(ServiceCtx Context)
{
bool Enable = Context.RequestData.ReadByte() != 0 ? true : false;
return 0;
}
public long SetPerformanceModeChangedNotification(ServiceCtx Context)
{
bool Enable = Context.RequestData.ReadByte() != 0 ? true : false;
return 0;
}
public long SetFocusHandlingMode(ServiceCtx Context)
{
bool Flag1 = Context.RequestData.ReadByte() != 0 ? true : false;
bool Flag2 = Context.RequestData.ReadByte() != 0 ? true : false;
bool Flag3 = Context.RequestData.ReadByte() != 0 ? true : false;
return 0;
}
public long SetOutOfFocusSuspendingEnabled(ServiceCtx Context)
{
bool Enable = Context.RequestData.ReadByte() != 0 ? true : false;
return 0;
}
}
}

35
Ryujinx/OsHle/Objects/Am/IStorage.cs Normal file
View file

@ -0,0 +1,35 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
using static Ryujinx.OsHle.Objects.ObjHelper;
namespace Ryujinx.OsHle.Objects.Am
{
class IStorage : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public byte[] Data { get; private set; }
public IStorage(byte[] Data)
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 0, Open }
};
this.Data = Data;
}
public long Open(ServiceCtx Context)
{
IStorage Storage = Context.GetObject<IStorage>();
MakeObject(Context, new IStorageAccessor(Storage));
return 0;
}
}
}

30
Ryujinx/OsHle/Objects/AmIStorageAccessor.cs → Ryujinx/OsHle/Objects/Am/IStorageAccessor.cs
View file

@ -1,31 +1,43 @@
using ChocolArm64.Memory;
using Ryujinx.OsHle.Ipc;
using System;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects
namespace Ryujinx.OsHle.Objects.Am
{
class AmIStorageAccessor
class IStorageAccessor : IIpcInterface
{
public AmIStorage Storage { get; private set; }
private Dictionary<int, ServiceProcessRequest> m_Commands;
public AmIStorageAccessor(AmIStorage Storage)
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IStorage Storage { get; private set; }
public IStorageAccessor(IStorage Storage)
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 0, GetSize },
{ 11, Read }
};
this.Storage = Storage;
}
public static long GetSize(ServiceCtx Context)
public long GetSize(ServiceCtx Context)
{
AmIStorageAccessor Accessor = Context.GetObject<AmIStorageAccessor>();
IStorageAccessor Accessor = Context.GetObject<IStorageAccessor>();
Context.ResponseData.Write((long)Accessor.Storage.Data.Length);
return 0;
}
public static long Read(ServiceCtx Context)
public long Read(ServiceCtx Context)
{
AmIStorageAccessor Accessor = Context.GetObject<AmIStorageAccessor>();
IStorageAccessor Accessor = Context.GetObject<IStorageAccessor>();
AmIStorage Storage = Accessor.Storage;
IStorage Storage = Accessor.Storage;
long ReadPosition = Context.RequestData.ReadInt64();

33
Ryujinx/OsHle/Objects/Am/IWindowController.cs Normal file
View file

@ -0,0 +1,33 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Am
{
class IWindowController : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IWindowController()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 1, GetAppletResourceUserId },
{ 10, AcquireForegroundRights }
};
}
public long GetAppletResourceUserId(ServiceCtx Context)
{
Context.ResponseData.Write(0L);
return 0;
}
public long AcquireForegroundRights(ServiceCtx Context)
{
return 0;
}
}
}

63
Ryujinx/OsHle/Objects/AmIApplicationProxy.cs
View file

@ -1,63 +0,0 @@
using static Ryujinx.OsHle.Objects.ObjHelper;
namespace Ryujinx.OsHle.Objects
{
class AmIApplicationProxy
{
public static long GetCommonStateGetter(ServiceCtx Context)
{
MakeObject(Context, new AmICommonStateGetter());
return 0;
}
public static long GetSelfController(ServiceCtx Context)
{
MakeObject(Context, new AmISelfController());
return 0;
}
public static long GetWindowController(ServiceCtx Context)
{
MakeObject(Context, new AmIWindowController());
return 0;
}
public static long GetAudioController(ServiceCtx Context)
{
MakeObject(Context, new AmIAudioController());
return 0;
}
public static long GetDisplayController(ServiceCtx Context)
{
MakeObject(Context, new AmIDisplayController());
return 0;
}
public static long GetLibraryAppletCreator(ServiceCtx Context)
{
MakeObject(Context, new AmILibraryAppletCreator());
return 0;
}
public static long GetApplicationFunctions(ServiceCtx Context)
{
MakeObject(Context, new AmIApplicationFunctions());
return 0;
}
public static long GetDebugFunctions(ServiceCtx Context)
{
MakeObject(Context, new AmIDebugFunctions());
return 0;
}
}
}

7
Ryujinx/OsHle/Objects/AmIAudioController.cs
View file

@ -1,7 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class AmIAudioController
{
}
}

55
Ryujinx/OsHle/Objects/AmICommonStateGetter.cs
View file

@ -1,55 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class AmICommonStateGetter
{
private enum FocusState
{
InFocus = 1,
OutOfFocus = 2
}
private enum OperationMode
{
Handheld = 0,
Docked = 1
}
public static long GetEventHandle(ServiceCtx Context)
{
Context.ResponseData.Write(0L);
return 0;
}
public static long ReceiveMessage(ServiceCtx Context)
{
//Program expects 0xF at 0x17ae70 on puyo sdk,
//otherwise runs on a infinite loop until it reads said value.
//What it means is still unknown.
Context.ResponseData.Write(0xfL);
return 0; //0x680;
}
public static long GetOperationMode(ServiceCtx Context)
{
Context.ResponseData.Write((byte)OperationMode.Handheld);
return 0;
}
public static long GetPerformanceMode(ServiceCtx Context)
{
Context.ResponseData.Write((byte)0);
return 0;
}
public static long GetCurrentFocusState(ServiceCtx Context)
{
Context.ResponseData.Write((byte)FocusState.InFocus);
return 0;
}
}
}

7
Ryujinx/OsHle/Objects/AmIDebugFunctions.cs
View file

@ -1,7 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class AmIDebugFunctions
{
}
}

7
Ryujinx/OsHle/Objects/AmIDisplayController.cs
View file

@ -1,7 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class AmIDisplayController
{
}
}

7
Ryujinx/OsHle/Objects/AmILibraryAppletCreator.cs
View file

@ -1,7 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class AmILibraryAppletCreator
{
}
}

7
Ryujinx/OsHle/Objects/AmIParentalControlService.cs
View file

@ -1,7 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class AmIParentalControlService
{
}
}

35
Ryujinx/OsHle/Objects/AmISelfController.cs
View file

@ -1,35 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class AmISelfController
{
public static long SetOperationModeChangedNotification(ServiceCtx Context)
{
bool Enable = Context.RequestData.ReadByte() != 0 ? true : false;
return 0;
}
public static long SetPerformanceModeChangedNotification(ServiceCtx Context)
{
bool Enable = Context.RequestData.ReadByte() != 0 ? true : false;
return 0;
}
public static long SetFocusHandlingMode(ServiceCtx Context)
{
bool Flag1 = Context.RequestData.ReadByte() != 0 ? true : false;
bool Flag2 = Context.RequestData.ReadByte() != 0 ? true : false;
bool Flag3 = Context.RequestData.ReadByte() != 0 ? true : false;
return 0;
}
public static long SetOutOfFocusSuspendingEnabled(ServiceCtx Context)
{
bool Enable = Context.RequestData.ReadByte() != 0 ? true : false;
return 0;
}
}
}

23
Ryujinx/OsHle/Objects/AmIStorage.cs
View file

@ -1,23 +0,0 @@
using static Ryujinx.OsHle.Objects.ObjHelper;
namespace Ryujinx.OsHle.Objects
{
class AmIStorage
{
public byte[] Data { get; private set; }
public AmIStorage(byte[] Data)
{
this.Data = Data;
}
public static long Open(ServiceCtx Context)
{
AmIStorage Storage = Context.GetObject<AmIStorage>();
MakeObject(Context, new AmIStorageAccessor(Storage));
return 0;
}
}
}

17
Ryujinx/OsHle/Objects/AmIWindowController.cs
View file

@ -1,17 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class AmIWindowController
{
public static long GetAppletResourceUserId(ServiceCtx Context)
{
Context.ResponseData.Write(0L);
return 0;
}
public static long AcquireForegroundRights(ServiceCtx Context)
{
return 0;
}
}
}

28
Ryujinx/OsHle/Objects/Apm/ISession.cs Normal file
View file

@ -0,0 +1,28 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Apm
{
class ISession : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ISession()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 0, SetPerformanceConfiguration }
};
}
public long SetPerformanceConfiguration(ServiceCtx Context)
{
int PerfMode = Context.RequestData.ReadInt32();
int PerfConfig = Context.RequestData.ReadInt32();
return 0;
}
}
}

13
Ryujinx/OsHle/Objects/ApmISession.cs
View file

@ -1,13 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class ApmISession
{
public static long SetPerformanceConfiguration(ServiceCtx Context)
{
int PerfMode = Context.RequestData.ReadInt32();
int PerfConfig = Context.RequestData.ReadInt32();
return 0;
}
}
}

58
Ryujinx/OsHle/Objects/AudIAudioOut.cs → Ryujinx/OsHle/Objects/Aud/IAudioOut.cs
View file

@ -1,16 +1,36 @@
using ChocolArm64.Memory;
using OpenTK.Audio;
using OpenTK.Audio.OpenAL;
using Ryujinx.OsHle.Handles;
using Ryujinx.OsHle.Ipc;
using OpenTK.Audio;
using OpenTK.Audio.OpenAL;
using System;
using System.Collections.Generic;
using System.IO;
namespace Ryujinx.OsHle.Objects
namespace Ryujinx.OsHle.Objects.Aud
{
class AudIAudioOut
class IAudioOut : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IAudioOut()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 0, GetAudioOutState },
{ 1, StartAudioOut },
{ 2, StopAudioOut },
{ 3, AppendAudioOutBuffer },
{ 4, RegisterBufferEvent },
{ 5, GetReleasedAudioOutBuffer },
{ 6, ContainsAudioOutBuffer },
{ 7, AppendAudioOutBuffer_ex },
{ 8, GetReleasedAudioOutBuffer_ex }
};
}
enum AudioOutState
{
Started,
@ -18,24 +38,24 @@ namespace Ryujinx.OsHle.Objects
};
//IAudioOut
private static AudioOutState State = AudioOutState.Stopped;
private static Queue<long> KeysQueue = new Queue<long>();
private AudioOutState State = AudioOutState.Stopped;
private Queue<long> KeysQueue = new Queue<long>();
//OpenAL
private static bool OpenALInstalled = true;
private static AudioContext AudioCtx;
private static int Source;
private static int Buffer;
private bool OpenALInstalled = true;
private AudioContext AudioCtx;
private int Source;
private int Buffer;
//Return State of IAudioOut
public static long GetAudioOutState(ServiceCtx Context)
public long GetAudioOutState(ServiceCtx Context)
{
Context.ResponseData.Write((int)State);
return 0;
}
public static long StartAudioOut(ServiceCtx Context)
public long StartAudioOut(ServiceCtx Context)
{
if (State == AudioOutState.Stopped)
{
@ -57,7 +77,7 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long StopAudioOut(ServiceCtx Context)
public long StopAudioOut(ServiceCtx Context)
{
if (State == AudioOutState.Started)
{
@ -75,7 +95,7 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long AppendAudioOutBuffer(ServiceCtx Context)
public long AppendAudioOutBuffer(ServiceCtx Context)
{
long BufferId = Context.RequestData.ReadInt64();
@ -109,7 +129,7 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long RegisterBufferEvent(ServiceCtx Context)
public long RegisterBufferEvent(ServiceCtx Context)
{
int Handle = Context.Ns.Os.Handles.GenerateId(new HEvent());
@ -118,7 +138,7 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long GetReleasedAudioOutBuffer(ServiceCtx Context)
public long GetReleasedAudioOutBuffer(ServiceCtx Context)
{
long TempKey = 0;
@ -141,17 +161,17 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long ContainsAudioOutBuffer(ServiceCtx Context)
public long ContainsAudioOutBuffer(ServiceCtx Context)
{
return 0;
}
public static long AppendAudioOutBuffer_ex(ServiceCtx Context)
public long AppendAudioOutBuffer_ex(ServiceCtx Context)
{
return 0;
}
public static long GetReleasedAudioOutBuffer_ex(ServiceCtx Context)
public long GetReleasedAudioOutBuffer_ex(ServiceCtx Context)
{
return 0;
}

30
Ryujinx/OsHle/Objects/AudIAudioRenderer.cs → Ryujinx/OsHle/Objects/Aud/IAudioRenderer.cs
View file

@ -1,13 +1,29 @@
using Ryujinx.OsHle.Handles;
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects
namespace Ryujinx.OsHle.Objects.Aud
{
class AudIAudioRenderer
class IAudioRenderer : IIpcInterface
{
public static long RequestUpdateAudioRenderer(ServiceCtx Context)
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IAudioRenderer()
{
//buffer < unknown, 5, 0 >) -> (buffer < unknown, 6, 0 >, buffer < unknown, 6, 0 >
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 4, RequestUpdateAudioRenderer },
{ 5, StartAudioRenderer },
{ 6, StopAudioRenderer },
{ 7, QuerySystemEvent }
};
}
public long RequestUpdateAudioRenderer(ServiceCtx Context)
{
//(buffer<unknown, 5, 0>) -> (buffer<unknown, 6, 0>, buffer<unknown, 6, 0>)
long Position = Context.Request.ReceiveBuff[0].Position;
@ -28,17 +44,17 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long StartAudioRenderer(ServiceCtx Context)
public long StartAudioRenderer(ServiceCtx Context)
{
return 0;
}
public static long StopAudioRenderer(ServiceCtx Context)
public long StopAudioRenderer(ServiceCtx Context)
{
return 0;
}
public static long QuerySystemEvent(ServiceCtx Context)
public long QuerySystemEvent(ServiceCtx Context)
{
int Handle = Context.Ns.Os.Handles.GenerateId(new HEvent());

20
Ryujinx/OsHle/Objects/Friend/IFriendService.cs Normal file
View file

@ -0,0 +1,20 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Friend
{
class IFriendService : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IFriendService()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
//...
};
}
}
}

7
Ryujinx/OsHle/Objects/FriendIFriendService.cs
View file

@ -1,7 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class FriendIFriendService
{
}
}

35
Ryujinx/OsHle/Objects/FspSrvIFile.cs → Ryujinx/OsHle/Objects/FspSrv/IFile.cs
View file

@ -1,23 +1,32 @@
using ChocolArm64.Memory;
using Ryujinx.OsHle.Ipc;
using System;
using System.Collections.Generic;
using System.IO;
namespace Ryujinx.OsHle.Objects
namespace Ryujinx.OsHle.Objects.FspSrv
{
class FspSrvIFile : IDisposable
class IFile : IIpcInterface, IDisposable
{
public Stream BaseStream { get; private set; }
private Dictionary<int, ServiceProcessRequest> m_Commands;
public FspSrvIFile(Stream BaseStream)
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
private Stream BaseStream;
public IFile(Stream BaseStream)
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 0, Read },
{ 1, Write }
};
this.BaseStream = BaseStream;
}
public static long Read(ServiceCtx Context)
public long Read(ServiceCtx Context)
{
FspSrvIFile File = Context.GetObject<FspSrvIFile>();
long Position = Context.Request.ReceiveBuff[0].Position;
long Zero = Context.RequestData.ReadInt64();
@ -26,7 +35,7 @@ namespace Ryujinx.OsHle.Objects
byte[] Data = new byte[Size];
int ReadSize = File.BaseStream.Read(Data, 0, (int)Size);
int ReadSize = BaseStream.Read(Data, 0, (int)Size);
AMemoryHelper.WriteBytes(Context.Memory, Position, Data);
@ -38,10 +47,8 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long Write(ServiceCtx Context)
public long Write(ServiceCtx Context)
{
FspSrvIFile File = Context.GetObject<FspSrvIFile>();
long Position = Context.Request.SendBuff[0].Position;
long Zero = Context.RequestData.ReadInt64();
@ -50,8 +57,8 @@ namespace Ryujinx.OsHle.Objects
byte[] Data = AMemoryHelper.ReadBytes(Context.Memory, Position, (int)Size);
File.BaseStream.Seek(Offset, SeekOrigin.Begin);
File.BaseStream.Write(Data, 0, (int)Size);
BaseStream.Seek(Offset, SeekOrigin.Begin);
BaseStream.Write(Data, 0, (int)Size);
return 0;
}

39
Ryujinx/OsHle/Objects/FspSrvIFileSystem.cs → Ryujinx/OsHle/Objects/FspSrv/IFileSystem.cs
View file

@ -1,28 +1,39 @@
using ChocolArm64.Memory;
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
using System.IO;
using static Ryujinx.OsHle.Objects.ObjHelper;
namespace Ryujinx.OsHle.Objects
namespace Ryujinx.OsHle.Objects.FspSrv
{
class FspSrvIFileSystem
class IFileSystem : IIpcInterface
{
public string FilePath { get; private set; }
private Dictionary<int, ServiceProcessRequest> m_Commands;
public FspSrvIFileSystem(string Path)
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
private string Path;
public IFileSystem(string Path)
{
this.FilePath = Path;
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 7, GetEntryType },
{ 8, OpenFile },
{ 10, Commit }
};
this.Path = Path;
}
public static long GetEntryType(ServiceCtx Context)
public long GetEntryType(ServiceCtx Context)
{
FspSrvIFileSystem FileSystem = Context.GetObject<FspSrvIFileSystem>();
long Position = Context.Request.PtrBuff[0].Position;
string Name = AMemoryHelper.ReadAsciiString(Context.Memory, Position);
string FileName = Context.Ns.VFs.GetFullPath(FileSystem.FilePath, Name);
string FileName = Context.Ns.VFs.GetFullPath(Path, Name);
if (FileName == null)
{
@ -37,17 +48,15 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long OpenFile(ServiceCtx Context)
public long OpenFile(ServiceCtx Context)
{
FspSrvIFileSystem FileSystem = Context.GetObject<FspSrvIFileSystem>();
long Position = Context.Request.PtrBuff[0].Position;
int FilterFlags = Context.RequestData.ReadInt32();
string Name = AMemoryHelper.ReadAsciiString(Context.Memory, Position);
string FileName = Context.Ns.VFs.GetFullPath(FileSystem.FilePath, Name);
string FileName = Context.Ns.VFs.GetFullPath(Path, Name);
if (FileName == null)
{
@ -57,12 +66,12 @@ namespace Ryujinx.OsHle.Objects
FileStream Stream = new FileStream(FileName, FileMode.OpenOrCreate);
MakeObject(Context, new FspSrvIFile(Stream));
MakeObject(Context, new IFile(Stream));
return 0;
}
public static long Commit(ServiceCtx Context)
public long Commit(ServiceCtx Context)
{
return 0;
}

18
Ryujinx/OsHle/Objects/FspSrvIStorage.cs → Ryujinx/OsHle/Objects/FspSrv/IStorage.cs
View file

@ -1,21 +1,31 @@
using ChocolArm64.Memory;
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
using System.IO;
namespace Ryujinx.OsHle.Objects
namespace Ryujinx.OsHle.Objects.FspSrv
{
class FspSrvIStorage
class IStorage : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public Stream BaseStream { get; private set; }
public FspSrvIStorage(Stream BaseStream)
public IStorage(Stream BaseStream)
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 0, Read }
};
this.BaseStream = BaseStream;
}
public static long Read(ServiceCtx Context)
{
FspSrvIStorage Storage = Context.GetObject<FspSrvIStorage>();
IStorage Storage = Context.GetObject<IStorage>();
long Offset = Context.RequestData.ReadInt64();
long Size = Context.RequestData.ReadInt64();

32
Ryujinx/OsHle/Objects/Hid/IAppletResource.cs Normal file
View file

@ -0,0 +1,32 @@
using Ryujinx.OsHle.Handles;
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Hid
{
class IAppletResource : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public HSharedMem Handle;
public IAppletResource(HSharedMem Handle)
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 0, GetSharedMemoryHandle }
};
this.Handle = Handle;
}
public static long GetSharedMemoryHandle(ServiceCtx Context)
{
Context.Response.HandleDesc = IpcHandleDesc.MakeCopy(Context.Ns.Os.HidHandle);
return 0;
}
}
}

22
Ryujinx/OsHle/Objects/HidIAppletResource.cs
View file

@ -1,22 +0,0 @@
using Ryujinx.OsHle.Handles;
using Ryujinx.OsHle.Ipc;
namespace Ryujinx.OsHle.Objects
{
class HidIAppletResource
{
public HSharedMem Handle;
public HidIAppletResource(HSharedMem Handle)
{
this.Handle = Handle;
}
public static long GetSharedMemoryHandle(ServiceCtx Context)
{
Context.Response.HandleDesc = IpcHandleDesc.MakeCopy(Context.Ns.Os.HidHandle);
return 0;
}
}
}

10
Ryujinx/OsHle/Objects/IIpcInterface.cs Normal file
View file

@ -0,0 +1,10 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects
{
interface IIpcInterface
{
IReadOnlyDictionary<int, ServiceProcessRequest> Commands { get; }
}
}

20
Ryujinx/OsHle/Objects/Time/ISteadyClock.cs Normal file
View file

@ -0,0 +1,20 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Time
{
class ISteadyClock : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ISteadyClock()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
//...
};
}
}
}

30
Ryujinx/OsHle/Objects/Time/ISystemClock.cs Normal file
View file

@ -0,0 +1,30 @@
using Ryujinx.OsHle.Ipc;
using System;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Time
{
class ISystemClock : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
private static DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
public ISystemClock()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 0, GetCurrentTime }
};
}
public long GetCurrentTime(ServiceCtx Context)
{
Context.ResponseData.Write((long)(DateTime.Now - Epoch).TotalSeconds);
return 0;
}
}
}

20
Ryujinx/OsHle/Objects/Time/ITimeZoneService.cs Normal file
View file

@ -0,0 +1,20 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Time
{
class ITimeZoneService : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ITimeZoneService()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
//...
};
}
}
}

7
Ryujinx/OsHle/Objects/TimeISteadyClock.cs
View file

@ -1,7 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class TimeISteadyClock
{
}
}

16
Ryujinx/OsHle/Objects/TimeISystemClock.cs
View file

@ -1,16 +0,0 @@
using System;
namespace Ryujinx.OsHle.Objects
{
class TimeISystemClock
{
private static DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
public static long GetCurrentTime(ServiceCtx Context)
{
Context.ResponseData.Write((long)(DateTime.Now - Epoch).TotalSeconds);
return 0;
}
}
}

7
Ryujinx/OsHle/Objects/TimeITimeZoneService.cs
View file

@ -1,7 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class TimeITimeZoneService
{
}
}

55
Ryujinx/OsHle/Objects/ViIApplicationDisplayService.cs → Ryujinx/OsHle/Objects/Vi/IApplicationDisplayService.cs
View file

@ -1,44 +1,65 @@
using ChocolArm64.Memory;
using Ryujinx.OsHle.Handles;
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
using System.IO;
using static Ryujinx.OsHle.Objects.Android.Parcel;
using static Ryujinx.OsHle.Objects.ObjHelper;
namespace Ryujinx.OsHle.Objects
namespace Ryujinx.OsHle.Objects.Vi
{
class ViIApplicationDisplayService
class IApplicationDisplayService : IIpcInterface
{
public static long GetRelayService(ServiceCtx Context)
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IApplicationDisplayService()
{
MakeObject(Context, new ViIHOSBinderDriver());
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 100, GetRelayService },
{ 101, GetSystemDisplayService },
{ 102, GetManagerDisplayService },
{ 103, GetIndirectDisplayTransactionService },
{ 1010, OpenDisplay },
{ 2020, OpenLayer },
{ 2030, CreateStrayLayer },
{ 2101, SetLayerScalingMode },
{ 5202, GetDisplayVSyncEvent }
};
}
public long GetRelayService(ServiceCtx Context)
{
MakeObject(Context, new IHOSBinderDriver());
return 0;
}
public static long GetSystemDisplayService(ServiceCtx Context)
public long GetSystemDisplayService(ServiceCtx Context)
{
MakeObject(Context, new ViISystemDisplayService());
MakeObject(Context, new ISystemDisplayService());
return 0;
}
public static long GetManagerDisplayService(ServiceCtx Context)
public long GetManagerDisplayService(ServiceCtx Context)
{
MakeObject(Context, new ViIManagerDisplayService());
MakeObject(Context, new IManagerDisplayService());
return 0;
}
public static long GetIndirectDisplayTransactionService(ServiceCtx Context)
public long GetIndirectDisplayTransactionService(ServiceCtx Context)
{
MakeObject(Context, new ViIHOSBinderDriver());
MakeObject(Context, new IHOSBinderDriver());
return 0;
}
public static long OpenDisplay(ServiceCtx Context)
public long OpenDisplay(ServiceCtx Context)
{
string Name = GetDisplayName(Context);
@ -49,7 +70,7 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long OpenLayer(ServiceCtx Context)
public long OpenLayer(ServiceCtx Context)
{
long LayerId = Context.RequestData.ReadInt64();
long UserId = Context.RequestData.ReadInt64();
@ -65,7 +86,7 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long CreateStrayLayer(ServiceCtx Context)
public long CreateStrayLayer(ServiceCtx Context)
{
long LayerFlags = Context.RequestData.ReadInt64();
long DisplayId = Context.RequestData.ReadInt64();
@ -84,7 +105,7 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long SetLayerScalingMode(ServiceCtx Context)
public long SetLayerScalingMode(ServiceCtx Context)
{
int ScalingMode = Context.RequestData.ReadInt32();
long Unknown = Context.RequestData.ReadInt64();
@ -92,7 +113,7 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long GetDisplayVSyncEvent(ServiceCtx Context)
public long GetDisplayVSyncEvent(ServiceCtx Context)
{
string Name = GetDisplayName(Context);
@ -103,7 +124,7 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
private static byte[] MakeIGraphicsBufferProducer(long BasePtr)
private byte[] MakeIGraphicsBufferProducer(long BasePtr)
{
long Id = 0x20;
long CookiePtr = 0L;
@ -133,7 +154,7 @@ namespace Ryujinx.OsHle.Objects
}
}
private static string GetDisplayName(ServiceCtx Context)
private string GetDisplayName(ServiceCtx Context)
{
string Name = string.Empty;

39
Ryujinx/OsHle/Objects/ViIHOSBinderDriver.cs → Ryujinx/OsHle/Objects/Vi/IHOSBinderDriver.cs
View file

@ -9,14 +9,18 @@ using System.Text;
using static Ryujinx.OsHle.Objects.Android.Parcel;
namespace Ryujinx.OsHle.Objects
namespace Ryujinx.OsHle.Objects.Vi
{
class ViIHOSBinderDriver
class IHOSBinderDriver : IIpcInterface
{
private delegate long ServiceProcessRequest(ServiceCtx Context, byte[] ParcelData);
private Dictionary<int, ServiceProcessRequest> m_Commands;
private static Dictionary<(string, int), ServiceProcessRequest> InterfaceMthd =
new Dictionary<(string, int), ServiceProcessRequest>()
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
private delegate long ServiceProcessRequest2(ServiceCtx Context, byte[] ParcelData);
private Dictionary<(string, int), ServiceProcessRequest2> InterfaceMthd =
new Dictionary<(string, int), ServiceProcessRequest2>()
{
{ ("android.gui.IGraphicBufferProducer", 0x1), GraphicBufferProducerRequestBuffer },
{ ("android.gui.IGraphicBufferProducer", 0x3), GraphicBufferProducerDequeueBuffer },
@ -36,12 +40,19 @@ namespace Ryujinx.OsHle.Objects
public byte[] Gbfr;
public ViIHOSBinderDriver()
public IHOSBinderDriver()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 0, TransactParcel },
{ 1, AdjustRefcount },
{ 2, GetNativeHandle }
};
BufferSlots = new IdPoolWithObj();
}
public static long TransactParcel(ServiceCtx Context)
public long TransactParcel(ServiceCtx Context)
{
int Id = Context.RequestData.ReadInt32();
int Code = Context.RequestData.ReadInt32();
@ -63,7 +74,7 @@ namespace Ryujinx.OsHle.Objects
string InterfaceName = Encoding.Unicode.GetString(Data, 8, StrSize * 2);
if (InterfaceMthd.TryGetValue((InterfaceName, Code), out ServiceProcessRequest ProcReq))
if (InterfaceMthd.TryGetValue((InterfaceName, Code), out ServiceProcessRequest2 ProcReq))
{
return ProcReq(Context, Data);
}
@ -76,7 +87,7 @@ namespace Ryujinx.OsHle.Objects
private static long GraphicBufferProducerRequestBuffer(ServiceCtx Context, byte[] ParcelData)
{
ViIHOSBinderDriver BinderDriver = Context.GetObject<ViIHOSBinderDriver>();
IHOSBinderDriver BinderDriver = Context.GetObject<IHOSBinderDriver>();
int GbfrSize = BinderDriver.Gbfr?.Length ?? 0;
@ -92,7 +103,7 @@ namespace Ryujinx.OsHle.Objects
private static long GraphicBufferProducerDequeueBuffer(ServiceCtx Context, byte[] ParcelData)
{
ViIHOSBinderDriver BinderDriver = Context.GetObject<ViIHOSBinderDriver>();
IHOSBinderDriver BinderDriver = Context.GetObject<IHOSBinderDriver>();
//Note: It seems that the maximum number of slots is 64, because if we return
//a Slot number > 63, it seems to cause a buffer overrun and it reads garbage.
@ -109,7 +120,7 @@ namespace Ryujinx.OsHle.Objects
private static long GraphicBufferProducerCancelBuffer(ServiceCtx Context, byte[] ParcelData)
{
ViIHOSBinderDriver BinderDriver = Context.GetObject<ViIHOSBinderDriver>();
IHOSBinderDriver BinderDriver = Context.GetObject<IHOSBinderDriver>();
using (MemoryStream MS = new MemoryStream(ParcelData))
{
@ -137,7 +148,7 @@ namespace Ryujinx.OsHle.Objects
private static long GraphicBufferPreallocateBuffer(ServiceCtx Context, byte[] ParcelData)
{
ViIHOSBinderDriver BinderDriver = Context.GetObject<ViIHOSBinderDriver>();
IHOSBinderDriver BinderDriver = Context.GetObject<IHOSBinderDriver>();
int GbfrSize = ParcelData.Length - 0x54;
@ -188,7 +199,7 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long AdjustRefcount(ServiceCtx Context)
public long AdjustRefcount(ServiceCtx Context)
{
int Id = Context.RequestData.ReadInt32();
int AddVal = Context.RequestData.ReadInt32();
@ -197,7 +208,7 @@ namespace Ryujinx.OsHle.Objects
return 0;
}
public static long GetNativeHandle(ServiceCtx Context)
public long GetNativeHandle(ServiceCtx Context)
{
int Id = Context.RequestData.ReadInt32();
uint Unk = Context.RequestData.ReadUInt32();

33
Ryujinx/OsHle/Objects/Vi/IManagerDisplayService.cs Normal file
View file

@ -0,0 +1,33 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Vi
{
class IManagerDisplayService : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IManagerDisplayService()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 2010, CreateManagedLayer },
{ 6000, AddToLayerStack }
};
}
public static long CreateManagedLayer(ServiceCtx Context)
{
Context.ResponseData.Write(0L); //LayerId
return 0;
}
public static long AddToLayerStack(ServiceCtx Context)
{
return 0;
}
}
}

25
Ryujinx/OsHle/Objects/Vi/ISystemDisplayService.cs Normal file
View file

@ -0,0 +1,25 @@
using Ryujinx.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.OsHle.Objects.Vi
{
class ISystemDisplayService : IIpcInterface
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ISystemDisplayService()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 2205, SetLayerZ }
};
}
public static long SetLayerZ(ServiceCtx Context)
{
return 0;
}
}
}

17
Ryujinx/OsHle/Objects/ViIManagerDisplayService.cs
View file

@ -1,17 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class ViIManagerDisplayService
{
public static long CreateManagedLayer(ServiceCtx Context)
{
Context.ResponseData.Write(0L); //LayerId
return 0;
}
public static long AddToLayerStack(ServiceCtx Context)
{
return 0;
}
}
}

10
Ryujinx/OsHle/Objects/ViISystemDisplayService.cs
View file

@ -1,10 +0,0 @@
namespace Ryujinx.OsHle.Objects
{
class ViISystemDisplayService
{
public static long SetLayerZ(ServiceCtx Context)
{
return 0;
}
}
}

6
Ryujinx/OsHle/Services/ServiceAcc.cs
View file

@ -1,4 +1,4 @@
using Ryujinx.OsHle.Objects;
using Ryujinx.OsHle.Objects.Acc;
using static Ryujinx.OsHle.Objects.ObjHelper;
@ -13,7 +13,7 @@ namespace Ryujinx.OsHle.Services
public static long AccU0GetProfile(ServiceCtx Context)
{
MakeObject(Context, new AccIProfile());
MakeObject(Context, new IProfile());
return 0;
}
@ -25,7 +25,7 @@ namespace Ryujinx.OsHle.Services
public static long AccU0GetBaasAccountManagerForApplication(ServiceCtx Context)
{
MakeObject(Context, new AccIManagerForApplication());
MakeObject(Context, new IManagerForApplication());
return 0;
}

4
Ryujinx/OsHle/Services/ServiceApm.cs
View file

@ -1,4 +1,4 @@
using Ryujinx.OsHle.Objects;
using Ryujinx.OsHle.Objects.Apm;
using static Ryujinx.OsHle.Objects.ObjHelper;
@ -8,7 +8,7 @@ namespace Ryujinx.OsHle.Services
{
public static long ApmOpenSession(ServiceCtx Context)
{
MakeObject(Context, new ApmISession());
MakeObject(Context, new ISession());
return 0;
}

2
Ryujinx/OsHle/Services/ServiceAppletOE.cs
View file

@ -8,7 +8,7 @@ namespace Ryujinx.OsHle.Services
{
public static long AppletOpenApplicationProxy(ServiceCtx Context)
{
MakeObject(Context, new AmIApplicationProxy());
MakeObject(Context, new IApplicationProxy());
return 0;
}

6
Ryujinx/OsHle/Services/ServiceAud.cs
View file

@ -1,5 +1,5 @@
using ChocolArm64.Memory;
using Ryujinx.OsHle.Objects;
using Ryujinx.OsHle.Objects.Aud;
using System.Text;
using static Ryujinx.OsHle.Objects.ObjHelper;
@ -21,7 +21,7 @@ namespace Ryujinx.OsHle.Services
public static long AudOutOpenAudioOut(ServiceCtx Context)
{
MakeObject(Context, new AudIAudioOut());
MakeObject(Context, new IAudioOut());
Context.ResponseData.Write(48000); //Sample Rate
Context.ResponseData.Write(2); //Channel Count
@ -42,7 +42,7 @@ namespace Ryujinx.OsHle.Services
public static long AudRenOpenAudioRenderer(ServiceCtx Context)
{
MakeObject(Context, new AudIAudioRenderer());
MakeObject(Context, new IAudioRenderer());
return 0;
}

4
Ryujinx/OsHle/Services/ServiceFriend.cs
View file

@ -1,4 +1,4 @@
using Ryujinx.OsHle.Objects;
using Ryujinx.OsHle.Objects.Friend;
using static Ryujinx.OsHle.Objects.ObjHelper;
@ -8,7 +8,7 @@ namespace Ryujinx.OsHle.Services
{
public static long FriendCreateFriendService(ServiceCtx Context)
{
MakeObject(Context, new FriendIFriendService());
MakeObject(Context, new IFriendService());
return 0;
}

10
Ryujinx/OsHle/Services/ServiceFspSrv.cs
View file

@ -1,4 +1,4 @@
using Ryujinx.OsHle.Objects;
using Ryujinx.OsHle.Objects.FspSrv;
using static Ryujinx.OsHle.Objects.ObjHelper;
@ -13,28 +13,28 @@ namespace Ryujinx.OsHle.Services
public static long FspSrvMountSdCard(ServiceCtx Context)
{
MakeObject(Context, new FspSrvIFileSystem(Context.Ns.VFs.GetSdCardPath()));
MakeObject(Context, new IFileSystem(Context.Ns.VFs.GetSdCardPath()));
return 0;
}
public static long FspSrvMountSaveData(ServiceCtx Context)
{
MakeObject(Context, new FspSrvIFileSystem(Context.Ns.VFs.GetGameSavesPath()));
MakeObject(Context, new IFileSystem(Context.Ns.VFs.GetGameSavesPath()));
return 0;
}
public static long FspSrvOpenDataStorageByCurrentProcess(ServiceCtx Context)
{
MakeObject(Context, new FspSrvIStorage(Context.Ns.VFs.RomFs));
MakeObject(Context, new IStorage(Context.Ns.VFs.RomFs));
return 0;
}
public static long FspSrvOpenRomStorage(ServiceCtx Context)
{
MakeObject(Context, new FspSrvIStorage(Context.Ns.VFs.RomFs));
MakeObject(Context, new IStorage(Context.Ns.VFs.RomFs));
return 0;
}

4
Ryujinx/OsHle/Services/ServiceHid.cs
View file

@ -1,5 +1,5 @@
using Ryujinx.OsHle.Handles;
using Ryujinx.OsHle.Objects;
using Ryujinx.OsHle.Objects.Hid;
using static Ryujinx.OsHle.Objects.ObjHelper;
@ -11,7 +11,7 @@ namespace Ryujinx.OsHle.Services
{
HSharedMem HidHndData = Context.Ns.Os.Handles.GetData<HSharedMem>(Context.Ns.Os.HidHandle);
MakeObject(Context, new HidIAppletResource(HidHndData));
MakeObject(Context, new IAppletResource(HidHndData));
return 0;
}

4
Ryujinx/OsHle/Services/ServicePctl.cs
View file

@ -1,4 +1,4 @@
using Ryujinx.OsHle.Objects;
using Ryujinx.OsHle.Objects.Am;
using static Ryujinx.OsHle.Objects.ObjHelper;
@ -8,7 +8,7 @@ namespace Ryujinx.OsHle.Services
{
public static long PctlCreateService(ServiceCtx Context)
{
MakeObject(Context, new AmIParentalControlService());
MakeObject(Context, new IParentalControlService());
return 0;
}

10
Ryujinx/OsHle/Services/ServiceTime.cs
View file

@ -1,4 +1,4 @@
using Ryujinx.OsHle.Objects;
using Ryujinx.OsHle.Objects.Time;
using static Ryujinx.OsHle.Objects.ObjHelper;
@ -8,28 +8,28 @@ namespace Ryujinx.OsHle.Services
{
public static long TimeGetStandardUserSystemClock(ServiceCtx Context)
{
MakeObject(Context, new TimeISystemClock());
MakeObject(Context, new ISystemClock());
return 0;
}
public static long TimeGetStandardNetworkSystemClock(ServiceCtx Context)
{
MakeObject(Context, new TimeISystemClock());
MakeObject(Context, new ISystemClock());
return 0;
}
public static long TimeGetStandardSteadyClock(ServiceCtx Context)
{
MakeObject(Context, new TimeISteadyClock());
MakeObject(Context, new ISteadyClock());
return 0;
}
public static long TimeGetTimeZoneService(ServiceCtx Context)
{
MakeObject(Context, new TimeITimeZoneService());
MakeObject(Context, new ITimeZoneService());
return 0;
}

4
Ryujinx/OsHle/Services/ServiceVi.cs
View file

@ -1,4 +1,4 @@
using Ryujinx.OsHle.Objects;
using Ryujinx.OsHle.Objects.Vi;
using static Ryujinx.OsHle.Objects.ObjHelper;
@ -10,7 +10,7 @@ namespace Ryujinx.OsHle.Services
{
int Unknown = Context.RequestData.ReadInt32();
MakeObject(Context, new ViIApplicationDisplayService());
MakeObject(Context, new IApplicationDisplayService());
return 0;
}