Refactoring HOS folder structure (#771)

* Refactoring HOS folder structure

Refactoring HOS folder structure:

- Added some subfolders when needed (Following structure decided in private).
- Added some `Types` folders when needed.
- Little cleanup here and there.
- Add services placeholders for every HOS services (close #766 and #753).

* Remove Types namespaces
This commit is contained in:
Ac_K 2019-09-19 02:45:11 +02:00 committed by jduncanator
parent 4af3101b22
commit a0720b5681
393 changed files with 2540 additions and 1299 deletions

View file

@ -0,0 +1,12 @@
namespace Ryujinx.HLE.HOS.Services.Vi
{
class Display
{
public string Name { get; private set; }
public Display(string name)
{
Name = name;
}
}
}

View file

@ -0,0 +1,99 @@
using Ryujinx.Graphics.Gal;
using Ryujinx.HLE.HOS.Ipc;
using Ryujinx.HLE.HOS.Kernel.Common;
using Ryujinx.HLE.HOS.Kernel.Threading;
using Ryujinx.HLE.HOS.Services.Android;
using System;
namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
{
class IHOSBinderDriver : IpcService, IDisposable
{
private KEvent _binderEvent;
private NvFlinger _flinger;
public IHOSBinderDriver(Horizon system, IGalRenderer renderer)
{
_binderEvent = new KEvent(system);
_binderEvent.ReadableEvent.Signal();
_flinger = new NvFlinger(renderer, _binderEvent);
}
[Command(0)]
// TransactParcel(s32, u32, u32, buffer<unknown, 5, 0>) -> buffer<unknown, 6, 0>
public ResultCode TransactParcel(ServiceCtx context)
{
int id = context.RequestData.ReadInt32();
int code = context.RequestData.ReadInt32();
long dataPos = context.Request.SendBuff[0].Position;
long dataSize = context.Request.SendBuff[0].Size;
byte[] data = context.Memory.ReadBytes(dataPos, dataSize);
data = Parcel.GetParcelData(data);
return (ResultCode)_flinger.ProcessParcelRequest(context, data, code);
}
[Command(1)]
// AdjustRefcount(s32, s32, s32)
public ResultCode AdjustRefcount(ServiceCtx context)
{
int id = context.RequestData.ReadInt32();
int addVal = context.RequestData.ReadInt32();
int type = context.RequestData.ReadInt32();
return ResultCode.Success;
}
[Command(2)]
// GetNativeHandle(s32, s32) -> handle<copy>
public ResultCode GetNativeHandle(ServiceCtx context)
{
int id = context.RequestData.ReadInt32();
uint unk = context.RequestData.ReadUInt32();
if (context.Process.HandleTable.GenerateHandle(_binderEvent.ReadableEvent, out int handle) != KernelResult.Success)
{
throw new InvalidOperationException("Out of handles!");
}
context.Response.HandleDesc = IpcHandleDesc.MakeMove(handle);
return ResultCode.Success;
}
[Command(3)] // 3.0.0+
// TransactParcelAuto(s32, u32, u32, buffer<unknown, 21, 0>) -> buffer<unknown, 22, 0>
public ResultCode TransactParcelAuto(ServiceCtx context)
{
int id = context.RequestData.ReadInt32();
int code = context.RequestData.ReadInt32();
(long dataPos, long dataSize) = context.Request.GetBufferType0x21();
byte[] data = context.Memory.ReadBytes(dataPos, dataSize);
data = Parcel.GetParcelData(data);
return (ResultCode)_flinger.ProcessParcelRequest(context, data, code);
}
public void Dispose()
{
Dispose(true);
}
protected virtual void Dispose(bool disposing)
{
if (disposing)
{
_flinger.Dispose();
}
}
}
}

View file

@ -0,0 +1,61 @@
using Ryujinx.Common.Logging;
namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
{
class IManagerDisplayService : IpcService
{
private static IApplicationDisplayService _applicationDisplayService;
public IManagerDisplayService(IApplicationDisplayService applicationDisplayService)
{
_applicationDisplayService = applicationDisplayService;
}
[Command(2010)]
// CreateManagedLayer(u32, u64, nn::applet::AppletResourceUserId) -> u64
public ResultCode CreateManagedLayer(ServiceCtx context)
{
Logger.PrintStub(LogClass.ServiceVi);
context.ResponseData.Write(0L); //LayerId
return ResultCode.Success;
}
[Command(2011)]
// DestroyManagedLayer(u64)
public ResultCode DestroyManagedLayer(ServiceCtx context)
{
Logger.PrintStub(LogClass.ServiceVi);
return ResultCode.Success;
}
[Command(2012)] // 7.0.0+
// CreateStrayLayer(u32, u64) -> (u64, u64, buffer<bytes, 6>)
public ResultCode CreateStrayLayer(ServiceCtx context)
{
Logger.PrintStub(LogClass.ServiceVi);
return _applicationDisplayService.CreateStrayLayer(context);
}
[Command(6000)]
// AddToLayerStack(u32, u64)
public ResultCode AddToLayerStack(ServiceCtx context)
{
Logger.PrintStub(LogClass.ServiceVi);
return ResultCode.Success;
}
[Command(6002)]
// SetLayerVisibility(b8, u64)
public ResultCode SetLayerVisibility(ServiceCtx context)
{
Logger.PrintStub(LogClass.ServiceVi);
return ResultCode.Success;
}
}
}

View file

@ -0,0 +1,54 @@
using Ryujinx.Common.Logging;
namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
{
class ISystemDisplayService : IpcService
{
private static IApplicationDisplayService _applicationDisplayService;
public ISystemDisplayService(IApplicationDisplayService applicationDisplayService)
{
_applicationDisplayService = applicationDisplayService;
}
[Command(2205)]
// SetLayerZ(u64, u64)
public ResultCode SetLayerZ(ServiceCtx context)
{
Logger.PrintStub(LogClass.ServiceVi);
return ResultCode.Success;
}
[Command(2207)]
// SetLayerVisibility(b8, u64)
public ResultCode SetLayerVisibility(ServiceCtx context)
{
Logger.PrintStub(LogClass.ServiceVi);
return ResultCode.Success;
}
[Command(2312)] // 1.0.0-6.2.0
// CreateStrayLayer(u32, u64) -> (u64, u64, buffer<bytes, 6>)
public ResultCode CreateStrayLayer(ServiceCtx context)
{
Logger.PrintStub(LogClass.ServiceVi);
return _applicationDisplayService.CreateStrayLayer(context);
}
[Command(3200)]
// GetDisplayMode(u64) -> nn::vi::DisplayModeInfo
public ResultCode GetDisplayMode(ServiceCtx context)
{
// TODO: De-hardcode resolution.
context.ResponseData.Write(1280);
context.ResponseData.Write(720);
context.ResponseData.Write(60.0f);
context.ResponseData.Write(0);
return ResultCode.Success;
}
}
}

View file

@ -0,0 +1,11 @@
namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
{
enum DestinationScalingMode
{
Freeze,
ScaleToWindow,
ScaleAndCrop,
None,
PreserveAspectRatio
}
}

View file

@ -0,0 +1,11 @@
namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService
{
enum SourceScalingMode
{
None,
Freeze,
ScaleToWindow,
ScaleAndCrop,
PreserveAspectRatio
}
}