Rename services with the official interface names

This commit is contained in:
gdkchan 2018-04-06 01:01:52 -03:00
parent f15b1c76a1
commit 69e32e5bbc
29 changed files with 236 additions and 196 deletions

View file

@ -354,11 +354,11 @@ namespace Ryujinx.Core.OsHle
} }
} }
ServiceNvDrv.Fds.DeleteProcess(this); INvDrvServices.Fds.DeleteProcess(this);
ServiceNvDrv.NvMaps .DeleteProcess(this); INvDrvServices.NvMaps .DeleteProcess(this);
ServiceNvDrv.NvMapsById.DeleteProcess(this); INvDrvServices.NvMapsById.DeleteProcess(this);
ServiceNvDrv.NvMapsFb .DeleteProcess(this); INvDrvServices.NvMapsFb .DeleteProcess(this);
Scheduler.Dispose(); Scheduler.Dispose();

View file

@ -3,13 +3,13 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Acc namespace Ryujinx.Core.OsHle.Services.Acc
{ {
class ServiceAcc : IpcService class IAccountServiceForApplication : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServiceAcc() public IAccountServiceForApplication()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -3,13 +3,13 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Am namespace Ryujinx.Core.OsHle.Services.Am
{ {
class ServiceAppletOE : IpcService class IApplicationProxyService : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServiceAppletOE() public IApplicationProxyService()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -3,13 +3,13 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Apm namespace Ryujinx.Core.OsHle.Services.Apm
{ {
class ServiceApm : IpcService class IManager : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServiceApm() public IManager()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -5,13 +5,13 @@ using System.Text;
namespace Ryujinx.Core.OsHle.Services.Aud namespace Ryujinx.Core.OsHle.Services.Aud
{ {
class IAudioDevice : IpcService class IAudioDeviceService : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IAudioDevice() public IAudioDeviceService()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -51,7 +51,7 @@ namespace Ryujinx.Core.OsHle.Services.Aud
{ {
long UserId = Context.RequestData.ReadInt64(); long UserId = Context.RequestData.ReadInt64();
MakeObject(Context, new IAudioDevice()); MakeObject(Context, new IAudioDeviceService());
return 0; return 0;
} }

View file

@ -0,0 +1,8 @@
namespace Ryujinx.Core.OsHle.Services.Bsd
{
//bsd_errno == (SocketException.ErrorCode - 10000)
public enum BsdError
{
Timeout = 60
}
}

View file

@ -0,0 +1,18 @@
using System.Net;
using System.Net.Sockets;
namespace Ryujinx.Core.OsHle.Services.Bsd
{
class BsdSocket
{
public int Family;
public int Type;
public int Protocol;
public IPAddress IpAddress;
public IPEndPoint RemoteEP;
public Socket Handle;
}
}

View file

@ -1,7 +1,6 @@
using ChocolArm64.Memory; using ChocolArm64.Memory;
using Ryujinx.Core.OsHle.Ipc; using Ryujinx.Core.OsHle.Ipc;
using Ryujinx.Core.OsHle.Utilities; using Ryujinx.Core.OsHle.Utilities;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Net; using System.Net;
@ -10,56 +9,15 @@ using System.Threading.Tasks;
namespace Ryujinx.Core.OsHle.Services.Bsd namespace Ryujinx.Core.OsHle.Services.Bsd
{ {
class IClient : IpcService
//bsd_errno == (SocketException.ErrorCode - 10000)
//https://github.com/freebsd/freebsd/blob/master/sys/sys/errno.h
public enum BsdError
{
ENOTSOCK = 38, /* Socket operation on non-socket */
EDESTADDRREQ = 39, /* Destination address required */
EMSGSIZE = 40, /* Message too long */
EPROTOTYPE = 41, /* Protocol wrong type for socket */
ENOPROTOOPT = 42, /* Protocol not available */
EPROTONOSUPPORT = 43, /* Protocol not supported */
ESOCKTNOSUPPORT = 44, /* Socket type not supported */
EOPNOTSUPP = 45, /* Operation not supported */
EPFNOSUPPORT = 46, /* Protocol family not supported */
EAFNOSUPPORT = 47, /* Address family not supported by protocol family */
EADDRINUSE = 48, /* Address already in use */
EADDRNOTAVAIL = 49, /* Can't assign requested address */
ENETDOWN = 50, /* Network is down */
ENETUNREACH = 51, /* Network is unreachable */
ENETRESET = 52, /* Network dropped connection on reset */
ECONNABORTED = 53, /* Software caused connection abort */
ECONNRESET = 54, /* Connection reset by peer */
ENOBUFS = 55, /* No buffer space available */
EISCONN = 56, /* Socket is already connected */
ENOTCONN = 57, /* Socket is not connected */
ESHUTDOWN = 58, /* Can't send after socket shutdown */
ETOOMANYREFS = 59, /* Too many references: can't splice */
ETIMEDOUT = 60, /* Operation timed out */
ECONNREFUSED = 61 /* Connection refused */
}
class SocketBsd
{
public int Family;
public int Type;
public int Protocol;
public IPAddress IpAddress;
public IPEndPoint RemoteEP;
public Socket Handle;
}
class ServiceBsd : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
private List<SocketBsd> Sockets = new List<SocketBsd>(); private List<BsdSocket> Sockets = new List<BsdSocket>();
public ServiceBsd() public IClient()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {
@ -95,11 +53,6 @@ namespace Ryujinx.Core.OsHle.Services.Bsd
} BsdBufferConfig; } BsdBufferConfig;
*/ */
long Pid = Context.RequestData.ReadInt64();
long TransferMemorySize = Context.RequestData.ReadInt64();
// Two other args are unknown!
Context.ResponseData.Write(0); Context.ResponseData.Write(0);
//Todo: Stub //Todo: Stub
@ -118,18 +71,18 @@ namespace Ryujinx.Core.OsHle.Services.Bsd
//(u32 domain, u32 type, u32 protocol) -> (i32 ret, u32 bsd_errno) //(u32 domain, u32 type, u32 protocol) -> (i32 ret, u32 bsd_errno)
public long Socket(ServiceCtx Context) public long Socket(ServiceCtx Context)
{ {
SocketBsd NewBSDSocket = new SocketBsd BsdSocket NewBsdSocket = new BsdSocket
{ {
Family = Context.RequestData.ReadInt32(), Family = Context.RequestData.ReadInt32(),
Type = Context.RequestData.ReadInt32(), Type = Context.RequestData.ReadInt32(),
Protocol = Context.RequestData.ReadInt32() Protocol = Context.RequestData.ReadInt32()
}; };
Sockets.Add(NewBSDSocket); Sockets.Add(NewBsdSocket);
Sockets[Sockets.Count - 1].Handle = new Socket((AddressFamily)Sockets[Sockets.Count - 1].Family, NewBsdSocket.Handle = new Socket((AddressFamily)NewBsdSocket.Family,
(SocketType)Sockets[Sockets.Count - 1].Type, (SocketType)NewBsdSocket.Type,
(ProtocolType)Sockets[Sockets.Count - 1].Protocol); (ProtocolType)NewBsdSocket.Protocol);
Context.ResponseData.Write(Sockets.Count - 1); Context.ResponseData.Write(Sockets.Count - 1);
Context.ResponseData.Write(0); Context.ResponseData.Write(0);
@ -152,9 +105,10 @@ namespace Ryujinx.Core.OsHle.Services.Bsd
byte[] SentBuffer = AMemoryHelper.ReadBytes(Context.Memory, byte[] SentBuffer = AMemoryHelper.ReadBytes(Context.Memory,
Context.Request.SendBuff[0].Position, Context.Request.SendBuff[0].Position,
Context.Request.SendBuff[0].Size); Context.Request.SendBuff[0].Size);
int SocketId = Get32(SentBuffer, 0); int SocketId = Get32(SentBuffer, 0);
short RequestedEvents = (short)Get16(SentBuffer, 4); int RequestedEvents = Get16(SentBuffer, 4);
short ReturnedEvents = (short)Get16(SentBuffer, 6); int ReturnedEvents = Get16(SentBuffer, 6);
//Todo: Stub - Need to implemented the Type-22 buffer. //Todo: Stub - Need to implemented the Type-22 buffer.
@ -166,19 +120,21 @@ namespace Ryujinx.Core.OsHle.Services.Bsd
//(u32 socket, u32 flags) -> (i32 ret, u32 bsd_errno, buffer<i8, 0x22, 0> message) //(u32 socket, u32 flags) -> (i32 ret, u32 bsd_errno, buffer<i8, 0x22, 0> message)
public long Recv(ServiceCtx Context) public long Recv(ServiceCtx Context)
{
try
{ {
int SocketId = Context.RequestData.ReadInt32(); int SocketId = Context.RequestData.ReadInt32();
int SocketFlags = Context.RequestData.ReadInt32(); int SocketFlags = Context.RequestData.ReadInt32();
byte[] ReceivedBuffer = new byte[Context.Request.ReceiveBuff[0].Size]; byte[] ReceivedBuffer = new byte[Context.Request.ReceiveBuff[0].Size];
int ReadedBytes = Sockets[SocketId].Handle.Receive(ReceivedBuffer);
try
{
int BytesRead = Sockets[SocketId].Handle.Receive(ReceivedBuffer);
//Logging.Debug("Received Buffer:" + Environment.NewLine + Logging.HexDump(ReceivedBuffer)); //Logging.Debug("Received Buffer:" + Environment.NewLine + Logging.HexDump(ReceivedBuffer));
AMemoryHelper.WriteBytes(Context.Memory, Context.Request.ReceiveBuff[0].Position, ReceivedBuffer); AMemoryHelper.WriteBytes(Context.Memory, Context.Request.ReceiveBuff[0].Position, ReceivedBuffer);
Context.ResponseData.Write(ReadedBytes); Context.ResponseData.Write(BytesRead);
Context.ResponseData.Write(0); Context.ResponseData.Write(0);
} }
catch (SocketException Ex) catch (SocketException Ex)
@ -195,13 +151,14 @@ namespace Ryujinx.Core.OsHle.Services.Bsd
{ {
int SocketId = Context.RequestData.ReadInt32(); int SocketId = Context.RequestData.ReadInt32();
int SocketFlags = Context.RequestData.ReadInt32(); int SocketFlags = Context.RequestData.ReadInt32();
byte[] SentBuffer = AMemoryHelper.ReadBytes(Context.Memory, byte[] SentBuffer = AMemoryHelper.ReadBytes(Context.Memory,
Context.Request.SendBuff[0].Position, Context.Request.SendBuff[0].Position,
Context.Request.SendBuff[0].Size); Context.Request.SendBuff[0].Size);
try try
{ {
//Logging.Debug("Sended Buffer:" + Environment.NewLine + Logging.HexDump(SendedBuffer)); //Logging.Debug("Sent Buffer:" + Environment.NewLine + Logging.HexDump(SentBuffer));
int BytesSent = Sockets[SocketId].Handle.Send(SentBuffer); int BytesSent = Sockets[SocketId].Handle.Send(SentBuffer);
@ -222,9 +179,11 @@ namespace Ryujinx.Core.OsHle.Services.Bsd
{ {
int SocketId = Context.RequestData.ReadInt32(); int SocketId = Context.RequestData.ReadInt32();
int SocketFlags = Context.RequestData.ReadInt32(); int SocketFlags = Context.RequestData.ReadInt32();
byte[] SentBuffer = AMemoryHelper.ReadBytes(Context.Memory, byte[] SentBuffer = AMemoryHelper.ReadBytes(Context.Memory,
Context.Request.SendBuff[0].Position, Context.Request.SendBuff[0].Position,
Context.Request.SendBuff[0].Size); Context.Request.SendBuff[0].Size);
byte[] AddressBuffer = AMemoryHelper.ReadBytes(Context.Memory, byte[] AddressBuffer = AMemoryHelper.ReadBytes(Context.Memory,
Context.Request.SendBuff[1].Position, Context.Request.SendBuff[1].Position,
Context.Request.SendBuff[1].Size); Context.Request.SendBuff[1].Size);
@ -246,7 +205,7 @@ namespace Ryujinx.Core.OsHle.Services.Bsd
try try
{ {
//Logging.Debug("Sended Buffer:" + Environment.NewLine + Logging.HexDump(SendedBuffer)); //Logging.Debug("Sent Buffer:" + Environment.NewLine + Logging.HexDump(SentBuffer));
int BytesSent = Sockets[SocketId].Handle.Send(SentBuffer); int BytesSent = Sockets[SocketId].Handle.Send(SentBuffer);
@ -266,11 +225,12 @@ namespace Ryujinx.Core.OsHle.Services.Bsd
public long Accept(ServiceCtx Context) public long Accept(ServiceCtx Context)
{ {
int SocketId = Context.RequestData.ReadInt32(); int SocketId = Context.RequestData.ReadInt32();
long AddrBufferPtr = Context.Request.ReceiveBuff[0].Position; long AddrBufferPtr = Context.Request.ReceiveBuff[0].Position;
Socket HandleAccept = null; Socket HandleAccept = null;
var TimeOut = Task.Factory.StartNew(() => Task TimeOut = Task.Factory.StartNew(() =>
{ {
try try
{ {
@ -287,40 +247,38 @@ namespace Ryujinx.Core.OsHle.Services.Bsd
if (HandleAccept != null) if (HandleAccept != null)
{ {
SocketBsd NewBSDSocket = new SocketBsd BsdSocket NewBsdSocket = new BsdSocket
{ {
IpAddress = ((IPEndPoint)Sockets[SocketId].Handle.LocalEndPoint).Address, IpAddress = ((IPEndPoint)Sockets[SocketId].Handle.LocalEndPoint).Address,
RemoteEP = ((IPEndPoint)Sockets[SocketId].Handle.LocalEndPoint), RemoteEP = ((IPEndPoint)Sockets[SocketId].Handle.LocalEndPoint),
Handle = HandleAccept Handle = HandleAccept
}; };
Sockets.Add(NewBSDSocket); Sockets.Add(NewBsdSocket);
using (MemoryStream MS = new MemoryStream()) using (MemoryStream MS = new MemoryStream())
{ {
BinaryWriter Writer = new BinaryWriter(MS); BinaryWriter Writer = new BinaryWriter(MS);
Writer.Write((byte)0); Writer.Write((byte)0);
Writer.Write((byte)Sockets[Sockets.Count - 1].Handle.AddressFamily);
Writer.Write((Int16)((IPEndPoint)Sockets[Sockets.Count - 1].Handle.LocalEndPoint).Port);
string[] IpAdress = Sockets[Sockets.Count - 1].IpAddress.ToString().Split('.'); Writer.Write((byte)NewBsdSocket.Handle.AddressFamily);
Writer.Write(byte.Parse(IpAdress[0]));
Writer.Write(byte.Parse(IpAdress[1]));
Writer.Write(byte.Parse(IpAdress[2]));
Writer.Write(byte.Parse(IpAdress[3]));
AMemoryHelper.WriteBytes(Context.Memory, AddrBufferPtr, MS.ToArray()); Writer.Write((short)((IPEndPoint)NewBsdSocket.Handle.LocalEndPoint).Port);
byte[] IpAdress = NewBsdSocket.IpAddress.GetAddressBytes();
AMemoryHelper.WriteBytes(Context.Memory, AddrBufferPtr, IpAdress);
Context.ResponseData.Write(Sockets.Count - 1); Context.ResponseData.Write(Sockets.Count - 1);
Context.ResponseData.Write(0); Context.ResponseData.Write(0);
Context.ResponseData.Write(MS.Length); Context.ResponseData.Write(IpAdress.Length);
} }
} }
else else
{ {
Context.ResponseData.Write(-1); Context.ResponseData.Write(-1);
Context.ResponseData.Write((int)BsdError.ETIMEDOUT); Context.ResponseData.Write((int)BsdError.Timeout);
} }
return 0; return 0;
@ -405,18 +363,19 @@ namespace Ryujinx.Core.OsHle.Services.Bsd
public long SetSockOpt(ServiceCtx Context) public long SetSockOpt(ServiceCtx Context)
{ {
int SocketId = Context.RequestData.ReadInt32(); int SocketId = Context.RequestData.ReadInt32();
int SocketLevel = Context.RequestData.ReadInt32();
int SocketOptionName = Context.RequestData.ReadInt32(); SocketOptionLevel SocketLevel = (SocketOptionLevel)Context.RequestData.ReadInt32();
SocketOptionName SocketOptionName = (SocketOptionName)Context.RequestData.ReadInt32();
byte[] SocketOptionValue = AMemoryHelper.ReadBytes(Context.Memory, byte[] SocketOptionValue = AMemoryHelper.ReadBytes(Context.Memory,
Context.Request.PtrBuff[0].Position, Context.Request.PtrBuff[0].Position,
Context.Request.PtrBuff[0].Size); Context.Request.PtrBuff[0].Size);
int OptionValue = Get32(SocketOptionValue, 0);
try try
{ {
Sockets[SocketId].Handle.SetSocketOption((SocketOptionLevel)SocketLevel, Sockets[SocketId].Handle.SetSocketOption(SocketLevel, SocketOptionName, OptionValue);
(SocketOptionName)SocketOptionName,
Get32(SocketOptionValue, 0));
Context.ResponseData.Write(0); Context.ResponseData.Write(0);
Context.ResponseData.Write(0); Context.ResponseData.Write(0);
@ -461,10 +420,11 @@ namespace Ryujinx.Core.OsHle.Services.Bsd
int Size = Reader.ReadByte(); int Size = Reader.ReadByte();
int Family = Reader.ReadByte(); int Family = Reader.ReadByte();
int Port = EndianSwap.Swap16(Reader.ReadInt16()); int Port = EndianSwap.Swap16(Reader.ReadInt16());
string IpAddress = Reader.ReadByte().ToString() +
"." + Reader.ReadByte().ToString() + string IpAddress = Reader.ReadByte().ToString() + "." +
"." + Reader.ReadByte().ToString() + Reader.ReadByte().ToString() + "." +
"." + Reader.ReadByte().ToString(); Reader.ReadByte().ToString() + "." +
Reader.ReadByte().ToString();
Logging.Debug($"Try to connect to {IpAddress}:{Port}"); Logging.Debug($"Try to connect to {IpAddress}:{Port}");

View file

@ -3,13 +3,13 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Friend namespace Ryujinx.Core.OsHle.Services.Friend
{ {
class ServiceFriend : IpcService class IServiceCreator : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServiceFriend() public IServiceCreator()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -3,13 +3,13 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.FspSrv namespace Ryujinx.Core.OsHle.Services.FspSrv
{ {
class ServiceFspSrv : IpcService class IFileSystemProxy : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServiceFspSrv() public IFileSystemProxy()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -4,13 +4,13 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Hid namespace Ryujinx.Core.OsHle.Services.Hid
{ {
class ServiceHid : IpcService class IHidServer : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServiceHid() public IHidServer()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -3,13 +3,13 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Lm namespace Ryujinx.Core.OsHle.Services.Lm
{ {
class ServiceLm : IpcService class ILogService : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServiceLm() public ILogService()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -3,13 +3,13 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Nifm namespace Ryujinx.Core.OsHle.Services.Nifm
{ {
class ServiceNifm : IpcService class IStaticService : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServiceNifm() public IStaticService()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -3,13 +3,13 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Ns namespace Ryujinx.Core.OsHle.Services.Ns
{ {
class ServiceNs : IpcService class IAddOnContentManager : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServiceNs() public IAddOnContentManager()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -9,7 +9,7 @@ using System.IO;
namespace Ryujinx.Core.OsHle.Services.Nv namespace Ryujinx.Core.OsHle.Services.Nv
{ {
class ServiceNvDrv : IpcService, IDisposable class INvDrvServices : IpcService, IDisposable
{ {
private delegate long ServiceProcessIoctl(ServiceCtx Context); private delegate long ServiceProcessIoctl(ServiceCtx Context);
@ -27,7 +27,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv
private KEvent Event; private KEvent Event;
public ServiceNvDrv() public INvDrvServices()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {
@ -74,7 +74,7 @@ namespace Ryujinx.Core.OsHle.Services.Nv
Event = new KEvent(); Event = new KEvent();
} }
static ServiceNvDrv() static INvDrvServices()
{ {
Fds = new GlobalStateTable(); Fds = new GlobalStateTable();

View file

@ -3,13 +3,13 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Pctl namespace Ryujinx.Core.OsHle.Services.Pctl
{ {
class ServicePctl : IpcService class IParentalControlServiceFactory : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServicePctl() public IParentalControlServiceFactory()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -3,13 +3,13 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Pl namespace Ryujinx.Core.OsHle.Services.Pl
{ {
class ServicePl : IpcService class ISharedFontManager : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServicePl() public ISharedFontManager()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -7,7 +7,6 @@ using Ryujinx.Core.OsHle.Services.Friend;
using Ryujinx.Core.OsHle.Services.FspSrv; using Ryujinx.Core.OsHle.Services.FspSrv;
using Ryujinx.Core.OsHle.Services.Hid; using Ryujinx.Core.OsHle.Services.Hid;
using Ryujinx.Core.OsHle.Services.Lm; using Ryujinx.Core.OsHle.Services.Lm;
using Ryujinx.Core.OsHle.Services.Nifm;
using Ryujinx.Core.OsHle.Services.Ns; using Ryujinx.Core.OsHle.Services.Ns;
using Ryujinx.Core.OsHle.Services.Nv; using Ryujinx.Core.OsHle.Services.Nv;
using Ryujinx.Core.OsHle.Services.Pctl; using Ryujinx.Core.OsHle.Services.Pctl;
@ -16,7 +15,6 @@ using Ryujinx.Core.OsHle.Services.Set;
using Ryujinx.Core.OsHle.Services.Sfdnsres; using Ryujinx.Core.OsHle.Services.Sfdnsres;
using Ryujinx.Core.OsHle.Services.Sm; using Ryujinx.Core.OsHle.Services.Sm;
using Ryujinx.Core.OsHle.Services.Ssl; using Ryujinx.Core.OsHle.Services.Ssl;
using Ryujinx.Core.OsHle.Services.Time;
using Ryujinx.Core.OsHle.Services.Vi; using Ryujinx.Core.OsHle.Services.Vi;
using System; using System;
@ -29,19 +27,19 @@ namespace Ryujinx.Core.OsHle.Services
switch (Name) switch (Name)
{ {
case "acc:u0": case "acc:u0":
return new ServiceAcc(); return new IAccountServiceForApplication();
case "aoc:u": case "aoc:u":
return new ServiceNs(); return new IAddOnContentManager();
case "apm": case "apm":
return new ServiceApm(); return new IManager();
case "apm:p": case "apm:p":
return new ServiceApm(); return new IManager();
case "appletOE": case "appletOE":
return new ServiceAppletOE(); return new IApplicationProxyService();
case "audout:u": case "audout:u":
return new IAudioOutManager(); return new IAudioOutManager();
@ -50,67 +48,67 @@ namespace Ryujinx.Core.OsHle.Services
return new IAudioRendererManager(); return new IAudioRendererManager();
case "bsd:s": case "bsd:s":
return new ServiceBsd(); return new IClient();
case "bsd:u": case "bsd:u":
return new ServiceBsd(); return new IClient();
case "friend:a": case "friend:a":
return new ServiceFriend(); return new IServiceCreator();
case "fsp-srv": case "fsp-srv":
return new ServiceFspSrv(); return new IFileSystemProxy();
case "hid": case "hid":
return new ServiceHid(); return new IHidServer();
case "lm": case "lm":
return new ServiceLm(); return new ILogService();
case "nifm:u": case "nifm:u":
return new ServiceNifm(); return new Nifm.IStaticService();
case "nvdrv": case "nvdrv":
return new ServiceNvDrv(); return new INvDrvServices();
case "nvdrv:a": case "nvdrv:a":
return new ServiceNvDrv(); return new INvDrvServices();
case "pctl:a": case "pctl:a":
return new ServicePctl(); return new IParentalControlServiceFactory();
case "pl:u": case "pl:u":
return new ServicePl(); return new ISharedFontManager();
case "set": case "set":
return new ServiceSet(); return new ISettingsServer();
case "set:sys": case "set:sys":
return new ServiceSetSys(); return new ISystemSettingsServer();
case "sfdnsres": case "sfdnsres":
return new ServiceSfdnsres(); return new IResolver();
case "sm:": case "sm:":
return new ServiceSm(); return new IUserInterface();
case "ssl": case "ssl":
return new ServiceSsl(); return new ISslService();
case "time:s": case "time:s":
return new ServiceTime(); return new Time.IStaticService();
case "time:u": case "time:u":
return new ServiceTime(); return new Time.IStaticService();
case "vi:m": case "vi:m":
return new ServiceVi(); return new IManagerRootService();
case "vi:s": case "vi:s":
return new ServiceVi(); return new ISystemRootService();
case "vi:u": case "vi:u":
return new ServiceVi(); return new IApplicationRootService();
} }
throw new NotImplementedException(Name); throw new NotImplementedException(Name);

View file

@ -3,7 +3,7 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Set namespace Ryujinx.Core.OsHle.Services.Set
{ {
class ServiceSet : IpcService class ISettingsServer : IpcService
{ {
private static string[] LanguageCodes = new string[] private static string[] LanguageCodes = new string[]
{ {
@ -30,7 +30,7 @@ namespace Ryujinx.Core.OsHle.Services.Set
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServiceSet() public ISettingsServer()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -3,13 +3,13 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Set namespace Ryujinx.Core.OsHle.Services.Set
{ {
class ServiceSetSys : IpcService class ISystemSettingsServer : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServiceSetSys() public ISystemSettingsServer()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -3,17 +3,17 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Sfdnsres namespace Ryujinx.Core.OsHle.Services.Sfdnsres
{ {
class ServiceSfdnsres : IpcService class IResolver : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServiceSfdnsres() public IResolver()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {
//{ 0, Function } //...
}; };
} }
} }

View file

@ -4,7 +4,7 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Sm namespace Ryujinx.Core.OsHle.Services.Sm
{ {
class ServiceSm : IpcService class IUserInterface : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
@ -12,7 +12,7 @@ namespace Ryujinx.Core.OsHle.Services.Sm
private bool IsInitialized; private bool IsInitialized;
public ServiceSm() public IUserInterface()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -3,17 +3,17 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Ssl namespace Ryujinx.Core.OsHle.Services.Ssl
{ {
class ServiceSsl : IpcService class ISslService : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServiceSsl() public ISslService()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {
//{ 0, Function } //...
}; };
} }
} }

View file

@ -3,13 +3,13 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Time namespace Ryujinx.Core.OsHle.Services.Time
{ {
class ServiceTime : IpcService class IStaticService : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServiceTime() public IStaticService()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {

View file

@ -0,0 +1,29 @@
using Ryujinx.Core.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Vi
{
class IApplicationRootService : IpcService
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public IApplicationRootService()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 0, GetDisplayService }
};
}
public long GetDisplayService(ServiceCtx Context)
{
int ServiceType = Context.RequestData.ReadInt32();
MakeObject(Context, new IApplicationDisplayService());
return 0;
}
}
}

View file

@ -3,18 +3,16 @@ using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Vi namespace Ryujinx.Core.OsHle.Services.Vi
{ {
class ServiceVi : IpcService class IManagerRootService : IpcService
{ {
private Dictionary<int, ServiceProcessRequest> m_Commands; private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands; public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ServiceVi() public IManagerRootService()
{ {
m_Commands = new Dictionary<int, ServiceProcessRequest>() m_Commands = new Dictionary<int, ServiceProcessRequest>()
{ {
{ 0, GetDisplayService },
{ 1, GetDisplayService },
{ 2, GetDisplayService } { 2, GetDisplayService }
}; };
} }

View file

@ -0,0 +1,29 @@
using Ryujinx.Core.OsHle.Ipc;
using System.Collections.Generic;
namespace Ryujinx.Core.OsHle.Services.Vi
{
class ISystemRootService : IpcService
{
private Dictionary<int, ServiceProcessRequest> m_Commands;
public override IReadOnlyDictionary<int, ServiceProcessRequest> Commands => m_Commands;
public ISystemRootService()
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
{ 1, GetDisplayService }
};
}
public long GetDisplayService(ServiceCtx Context)
{
int ServiceType = Context.RequestData.ReadInt32();
MakeObject(Context, new IApplicationDisplayService());
return 0;
}
}
}

View file

@ -290,7 +290,7 @@ namespace Ryujinx.Core.OsHle.Services.Android
NvMap Map = GetNvMap(Context, Slot); NvMap Map = GetNvMap(Context, Slot);
NvMapFb MapFb = (NvMapFb)ServiceNvDrv.NvMapsFb.GetData(Context.Process, 0); NvMapFb MapFb = (NvMapFb)INvDrvServices.NvMapsFb.GetData(Context.Process, 0);
long Address = Map.CpuAddress; long Address = Map.CpuAddress;
@ -413,7 +413,7 @@ namespace Ryujinx.Core.OsHle.Services.Android
NvMapHandle = BitConverter.ToInt32(RawValue, 0); NvMapHandle = BitConverter.ToInt32(RawValue, 0);
} }
return ServiceNvDrv.NvMaps.GetData<NvMap>(Context.Process, NvMapHandle); return INvDrvServices.NvMaps.GetData<NvMap>(Context.Process, NvMapHandle);
} }
private int GetFreeSlotBlocking(int Width, int Height) private int GetFreeSlotBlocking(int Width, int Height)