mirror of
https://github.com/Ryujinx/Ryujinx.git
synced 2024-09-29 19:18:51 +02:00
326749498b
* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Address or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address or silence dotnet format CA2208 warnings * Address or silence dotnet format CA1806 and a few CA1854 warnings * Address dotnet format CA2211 warnings * Address dotnet format CA1822 warnings * Address or silence dotnet format CA1069 warnings * Make dotnet format succeed in style mode * Address or silence dotnet format CA2211 warnings * Address review comments * Address dotnet format CA2208 warnings properly * Make ProcessResult readonly * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Add previously silenced warnings back I have no clue how these disappeared * Revert formatting changes for while and for-loops * Format if-blocks correctly * Run dotnet format style after rebase * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format analyzers after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Disable 'prefer switch expression' rule * Add comments to disabled warnings * Fix a few disabled warnings * Fix naming rule violation, Convert shader properties to auto-property and convert values to const * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Start working on disabled warnings * Fix and silence a few dotnet-format warnings again * Run dotnet format after rebase * Use using declaration instead of block syntax * Address IDE0251 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * First dotnet format pass * Fix naming rule violations * Fix typo * Add trailing commas, use targeted new and use array initializer * Fix build issues * Fix remaining build issues * Remove SuppressMessage for CA1069 where possible * Address dotnet format issues * Address formatting issues Co-authored-by: Ac_K <acoustik666@gmail.com> * Add GetHashCode implementation for RenderingSurfaceInfo * Explicitly silence CA1822 for every affected method in Syscall * Address formatting issues in Demangler.cs * Address review feedback Co-authored-by: Ac_K <acoustik666@gmail.com> * Revert marking service methods as static * Next dotnet format pass * Address review feedback --------- Co-authored-by: Ac_K <acoustik666@gmail.com>
119 lines
6.2 KiB
C#
119 lines
6.2 KiB
C#
using LibHac;
|
|
using LibHac.Bcat;
|
|
using LibHac.Common;
|
|
using LibHac.FsSrv.Impl;
|
|
using LibHac.Loader;
|
|
using LibHac.Ncm;
|
|
using Ryujinx.HLE.FileSystem;
|
|
using Ryujinx.HLE.HOS.Services.Arp;
|
|
using System;
|
|
|
|
namespace Ryujinx.HLE.HOS
|
|
{
|
|
public class LibHacHorizonManager
|
|
{
|
|
private LibHac.Horizon Server { get; set; }
|
|
|
|
public HorizonClient RyujinxClient { get; private set; }
|
|
public HorizonClient ApplicationClient { get; private set; }
|
|
public HorizonClient AccountClient { get; private set; }
|
|
public HorizonClient AmClient { get; private set; }
|
|
public HorizonClient BcatClient { get; private set; }
|
|
public HorizonClient FsClient { get; private set; }
|
|
public HorizonClient NsClient { get; private set; }
|
|
public HorizonClient PmClient { get; private set; }
|
|
public HorizonClient SdbClient { get; private set; }
|
|
|
|
private SharedRef<LibHacIReader> _arpIReader;
|
|
internal LibHacIReader ArpIReader => _arpIReader.Get;
|
|
|
|
public LibHacHorizonManager()
|
|
{
|
|
InitializeServer();
|
|
}
|
|
|
|
private void InitializeServer()
|
|
{
|
|
Server = new LibHac.Horizon(new HorizonConfiguration());
|
|
|
|
RyujinxClient = Server.CreatePrivilegedHorizonClient();
|
|
}
|
|
|
|
public void InitializeArpServer()
|
|
{
|
|
_arpIReader.Reset(new LibHacIReader());
|
|
RyujinxClient.Sm.RegisterService(new LibHacArpServiceObject(ref _arpIReader), "arp:r").ThrowIfFailure();
|
|
}
|
|
|
|
public void InitializeBcatServer()
|
|
{
|
|
BcatClient = Server.CreateHorizonClient(new ProgramLocation(SystemProgramId.Bcat, StorageId.BuiltInSystem), BcatFsPermissions);
|
|
|
|
_ = new BcatServer(BcatClient);
|
|
}
|
|
|
|
public void InitializeFsServer(VirtualFileSystem virtualFileSystem)
|
|
{
|
|
virtualFileSystem.InitializeFsServer(Server, out var fsClient);
|
|
|
|
FsClient = fsClient;
|
|
}
|
|
|
|
public void InitializeSystemClients()
|
|
{
|
|
#pragma warning disable IDE0055 // Disable formatting
|
|
PmClient = Server.CreatePrivilegedHorizonClient();
|
|
AccountClient = Server.CreateHorizonClient(new ProgramLocation(SystemProgramId.Account, StorageId.BuiltInSystem), AccountFsPermissions);
|
|
AmClient = Server.CreateHorizonClient(new ProgramLocation(SystemProgramId.Am, StorageId.BuiltInSystem), AmFsPermissions);
|
|
NsClient = Server.CreateHorizonClient(new ProgramLocation(SystemProgramId.Ns, StorageId.BuiltInSystem), NsFsPermissions);
|
|
SdbClient = Server.CreateHorizonClient(new ProgramLocation(SystemProgramId.Sdb, StorageId.BuiltInSystem), SdbFacData, SdbFacDescriptor);
|
|
#pragma warning restore IDE0055
|
|
}
|
|
|
|
public void InitializeApplicationClient(ProgramId programId, in Npdm npdm)
|
|
{
|
|
ApplicationClient = Server.CreateHorizonClient(new ProgramLocation(programId, StorageId.BuiltInUser), npdm.FsAccessControlData, npdm.FsAccessControlDescriptor);
|
|
}
|
|
|
|
private static AccessControlBits.Bits AccountFsPermissions => AccessControlBits.Bits.SystemSaveData |
|
|
AccessControlBits.Bits.GameCard |
|
|
AccessControlBits.Bits.SaveDataMeta |
|
|
AccessControlBits.Bits.GetRightsId;
|
|
|
|
private static AccessControlBits.Bits AmFsPermissions => AccessControlBits.Bits.SaveDataManagement |
|
|
AccessControlBits.Bits.CreateSaveData |
|
|
AccessControlBits.Bits.SystemData;
|
|
private static AccessControlBits.Bits BcatFsPermissions => AccessControlBits.Bits.SystemSaveData;
|
|
|
|
private static AccessControlBits.Bits NsFsPermissions => AccessControlBits.Bits.ApplicationInfo |
|
|
AccessControlBits.Bits.SystemSaveData |
|
|
AccessControlBits.Bits.GameCard |
|
|
AccessControlBits.Bits.SaveDataManagement |
|
|
AccessControlBits.Bits.ContentManager |
|
|
AccessControlBits.Bits.ImageManager |
|
|
AccessControlBits.Bits.SystemSaveDataManagement |
|
|
AccessControlBits.Bits.SystemUpdate |
|
|
AccessControlBits.Bits.SdCard |
|
|
AccessControlBits.Bits.FormatSdCard |
|
|
AccessControlBits.Bits.GetRightsId |
|
|
AccessControlBits.Bits.RegisterProgramIndexMapInfo |
|
|
AccessControlBits.Bits.MoveCacheStorage;
|
|
|
|
// Sdb has save data access control info so we can't store just its access control bits
|
|
private static ReadOnlySpan<byte> SdbFacData => new byte[]
|
|
{
|
|
0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
|
|
0x03, 0x03, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x09, 0x10, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x01,
|
|
};
|
|
|
|
private static ReadOnlySpan<byte> SdbFacDescriptor => new byte[]
|
|
{
|
|
0x01, 0x00, 0x02, 0x00, 0x08, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
|
0x01, 0x09, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
|
|
};
|
|
}
|
|
}
|