diff options
81 files changed, 116 insertions, 111 deletions
diff --git a/ChocolArm64/Translation/ILGeneratorEx.cs b/ChocolArm64/Translation/ILGeneratorEx.cs index abb35ec3..61299308 100644 --- a/ChocolArm64/Translation/ILGeneratorEx.cs +++ b/ChocolArm64/Translation/ILGeneratorEx.cs @@ -3,7 +3,7 @@ using System; namespace ChocolArm64 { using System.Reflection.Emit; - + static class ILGeneratorEx { public static void EmitLdc_I4(this ILGenerator Generator,int Value) diff --git a/Ryujinx.Core/OsHle/AppletStateMgr.cs b/Ryujinx.Core/OsHle/AppletStateMgr.cs index cd168b77..25f56c63 100644 --- a/Ryujinx.Core/OsHle/AppletStateMgr.cs +++ b/Ryujinx.Core/OsHle/AppletStateMgr.cs @@ -1,5 +1,5 @@ -using Ryujinx.Core.OsHle.IpcServices.Am; using Ryujinx.Core.OsHle.Handles; +using Ryujinx.Core.OsHle.Services.Am; using System; using System.Collections.Concurrent; diff --git a/Ryujinx.Core/OsHle/Handles/KSession.cs b/Ryujinx.Core/OsHle/Handles/KSession.cs index 6934e522..86ce5ccc 100644 --- a/Ryujinx.Core/OsHle/Handles/KSession.cs +++ b/Ryujinx.Core/OsHle/Handles/KSession.cs @@ -1,4 +1,4 @@ -using Ryujinx.Core.OsHle.IpcServices; +using Ryujinx.Core.OsHle.Services; using System; namespace Ryujinx.Core.OsHle.Handles diff --git a/Ryujinx.Core/OsHle/Process.cs b/Ryujinx.Core/OsHle/Process.cs index 25c10a43..1c31d3e0 100644 --- a/Ryujinx.Core/OsHle/Process.cs +++ b/Ryujinx.Core/OsHle/Process.cs @@ -5,7 +5,7 @@ using Ryujinx.Core.Loaders; using Ryujinx.Core.Loaders.Executables; using Ryujinx.Core.OsHle.Exceptions; using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.IpcServices.NvServices; +using Ryujinx.Core.OsHle.Services.Nv; using Ryujinx.Core.OsHle.Svc; using System; using System.Collections.Concurrent; diff --git a/Ryujinx.Core/OsHle/Services/Acc/IManagerForApplication.cs b/Ryujinx.Core/OsHle/Services/Acc/IManagerForApplication.cs index 9e309142..57f6895f 100644 --- a/Ryujinx.Core/OsHle/Services/Acc/IManagerForApplication.cs +++ b/Ryujinx.Core/OsHle/Services/Acc/IManagerForApplication.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Acc +namespace Ryujinx.Core.OsHle.Services.Acc { class IManagerForApplication : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Acc/IProfile.cs b/Ryujinx.Core/OsHle/Services/Acc/IProfile.cs index bdeadfe8..92e73f78 100644 --- a/Ryujinx.Core/OsHle/Services/Acc/IProfile.cs +++ b/Ryujinx.Core/OsHle/Services/Acc/IProfile.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Acc +namespace Ryujinx.Core.OsHle.Services.Acc { class IProfile : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Acc/ServiceAcc.cs b/Ryujinx.Core/OsHle/Services/Acc/ServiceAcc.cs index 8b0a99d9..59f4e47f 100644 --- a/Ryujinx.Core/OsHle/Services/Acc/ServiceAcc.cs +++ b/Ryujinx.Core/OsHle/Services/Acc/ServiceAcc.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Acc +namespace Ryujinx.Core.OsHle.Services.Acc { class ServiceAcc : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/AmErr.cs b/Ryujinx.Core/OsHle/Services/Am/AmErr.cs index be165874..cb41c2d0 100644 --- a/Ryujinx.Core/OsHle/Services/Am/AmErr.cs +++ b/Ryujinx.Core/OsHle/Services/Am/AmErr.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { static class AmErr { diff --git a/Ryujinx.Core/OsHle/Services/Am/FocusState.cs b/Ryujinx.Core/OsHle/Services/Am/FocusState.cs index 08dffe3b..2585cf2c 100644 --- a/Ryujinx.Core/OsHle/Services/Am/FocusState.cs +++ b/Ryujinx.Core/OsHle/Services/Am/FocusState.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { enum FocusState { diff --git a/Ryujinx.Core/OsHle/Services/Am/IApplicationFunctions.cs b/Ryujinx.Core/OsHle/Services/Am/IApplicationFunctions.cs index 685a7482..29e363be 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IApplicationFunctions.cs +++ b/Ryujinx.Core/OsHle/Services/Am/IApplicationFunctions.cs @@ -2,7 +2,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; using System.IO; -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { class IApplicationFunctions : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IApplicationProxy.cs b/Ryujinx.Core/OsHle/Services/Am/IApplicationProxy.cs index 81bb2711..d9d91600 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IApplicationProxy.cs +++ b/Ryujinx.Core/OsHle/Services/Am/IApplicationProxy.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { class IApplicationProxy : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IAudioController.cs b/Ryujinx.Core/OsHle/Services/Am/IAudioController.cs index aa927d60..8ef71e7e 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IAudioController.cs +++ b/Ryujinx.Core/OsHle/Services/Am/IAudioController.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { class IAudioController : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/ICommonStateGetter.cs b/Ryujinx.Core/OsHle/Services/Am/ICommonStateGetter.cs index ec1fc774..7ce98ef8 100644 --- a/Ryujinx.Core/OsHle/Services/Am/ICommonStateGetter.cs +++ b/Ryujinx.Core/OsHle/Services/Am/ICommonStateGetter.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using static Ryujinx.Core.OsHle.ErrorCode; -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { class ICommonStateGetter : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IDebugFunctions.cs b/Ryujinx.Core/OsHle/Services/Am/IDebugFunctions.cs index 445b57e2..b7c7e9cf 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IDebugFunctions.cs +++ b/Ryujinx.Core/OsHle/Services/Am/IDebugFunctions.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { class IDebugFunctions : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IDisplayController.cs b/Ryujinx.Core/OsHle/Services/Am/IDisplayController.cs index 59956242..a56d1713 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IDisplayController.cs +++ b/Ryujinx.Core/OsHle/Services/Am/IDisplayController.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { class IDisplayController : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/ILibraryAppletCreator.cs b/Ryujinx.Core/OsHle/Services/Am/ILibraryAppletCreator.cs index 02da3156..7b3e12cc 100644 --- a/Ryujinx.Core/OsHle/Services/Am/ILibraryAppletCreator.cs +++ b/Ryujinx.Core/OsHle/Services/Am/ILibraryAppletCreator.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { class ILibraryAppletCreator : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/ISelfController.cs b/Ryujinx.Core/OsHle/Services/Am/ISelfController.cs index c5865009..28047159 100644 --- a/Ryujinx.Core/OsHle/Services/Am/ISelfController.cs +++ b/Ryujinx.Core/OsHle/Services/Am/ISelfController.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { class ISelfController : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IStorage.cs b/Ryujinx.Core/OsHle/Services/Am/IStorage.cs index 8f99ea7d..fef4a237 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IStorage.cs +++ b/Ryujinx.Core/OsHle/Services/Am/IStorage.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { class IStorage : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IStorageAccessor.cs b/Ryujinx.Core/OsHle/Services/Am/IStorageAccessor.cs index 096183ed..1e17d9ba 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IStorageAccessor.cs +++ b/Ryujinx.Core/OsHle/Services/Am/IStorageAccessor.cs @@ -3,7 +3,7 @@ using Ryujinx.Core.OsHle.Ipc; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { class IStorageAccessor : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/IWindowController.cs b/Ryujinx.Core/OsHle/Services/Am/IWindowController.cs index a830f263..1c10fb92 100644 --- a/Ryujinx.Core/OsHle/Services/Am/IWindowController.cs +++ b/Ryujinx.Core/OsHle/Services/Am/IWindowController.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { class IWindowController : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Am/MessageInfo.cs b/Ryujinx.Core/OsHle/Services/Am/MessageInfo.cs index 4c91e54a..45bf4326 100644 --- a/Ryujinx.Core/OsHle/Services/Am/MessageInfo.cs +++ b/Ryujinx.Core/OsHle/Services/Am/MessageInfo.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { enum MessageInfo { diff --git a/Ryujinx.Core/OsHle/Services/Am/OperationMode.cs b/Ryujinx.Core/OsHle/Services/Am/OperationMode.cs index 7103742f..f82a825b 100644 --- a/Ryujinx.Core/OsHle/Services/Am/OperationMode.cs +++ b/Ryujinx.Core/OsHle/Services/Am/OperationMode.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { enum OperationMode { diff --git a/Ryujinx.Core/OsHle/Services/Am/ServiceAppletOE.cs b/Ryujinx.Core/OsHle/Services/Am/ServiceAppletOE.cs index 255f74e6..65cdad42 100644 --- a/Ryujinx.Core/OsHle/Services/Am/ServiceAppletOE.cs +++ b/Ryujinx.Core/OsHle/Services/Am/ServiceAppletOE.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Am +namespace Ryujinx.Core.OsHle.Services.Am { class ServiceAppletOE : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Apm/ISession.cs b/Ryujinx.Core/OsHle/Services/Apm/ISession.cs index dd06e2c9..a2faa01a 100644 --- a/Ryujinx.Core/OsHle/Services/Apm/ISession.cs +++ b/Ryujinx.Core/OsHle/Services/Apm/ISession.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Apm +namespace Ryujinx.Core.OsHle.Services.Apm { class ISession : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Apm/ServiceApm.cs b/Ryujinx.Core/OsHle/Services/Apm/ServiceApm.cs index d7526216..fcd64a2f 100644 --- a/Ryujinx.Core/OsHle/Services/Apm/ServiceApm.cs +++ b/Ryujinx.Core/OsHle/Services/Apm/ServiceApm.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Apm +namespace Ryujinx.Core.OsHle.Services.Apm { class ServiceApm : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Aud/AudioOutData.cs b/Ryujinx.Core/OsHle/Services/Aud/AudioOutData.cs index 6b27f529..9ba93541 100644 --- a/Ryujinx.Core/OsHle/Services/Aud/AudioOutData.cs +++ b/Ryujinx.Core/OsHle/Services/Aud/AudioOutData.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace Ryujinx.Core.OsHle.IpcServices.Aud +namespace Ryujinx.Core.OsHle.Services.Aud { [StructLayout(LayoutKind.Sequential)] struct AudioOutData diff --git a/Ryujinx.Core/OsHle/Services/Aud/IAudioDevice.cs b/Ryujinx.Core/OsHle/Services/Aud/IAudioDevice.cs index b8aa0a6e..546c9eba 100644 --- a/Ryujinx.Core/OsHle/Services/Aud/IAudioDevice.cs +++ b/Ryujinx.Core/OsHle/Services/Aud/IAudioDevice.cs @@ -3,7 +3,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; using System.Text; -namespace Ryujinx.Core.OsHle.IpcServices.Aud +namespace Ryujinx.Core.OsHle.Services.Aud { class IAudioDevice : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Aud/IAudioOut.cs b/Ryujinx.Core/OsHle/Services/Aud/IAudioOut.cs index 9549eb57..b194e76c 100644 --- a/Ryujinx.Core/OsHle/Services/Aud/IAudioOut.cs +++ b/Ryujinx.Core/OsHle/Services/Aud/IAudioOut.cs @@ -5,7 +5,7 @@ using Ryujinx.Core.OsHle.Ipc; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Aud +namespace Ryujinx.Core.OsHle.Services.Aud { class IAudioOut : IpcService, IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/Aud/IAudioRenderer.cs b/Ryujinx.Core/OsHle/Services/Aud/IAudioRenderer.cs index 68fe0f4c..54c1e41f 100644 --- a/Ryujinx.Core/OsHle/Services/Aud/IAudioRenderer.cs +++ b/Ryujinx.Core/OsHle/Services/Aud/IAudioRenderer.cs @@ -3,7 +3,7 @@ using Ryujinx.Core.OsHle.Ipc; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Aud +namespace Ryujinx.Core.OsHle.Services.Aud { class IAudioRenderer : IpcService, IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/Aud/ServiceAudOut.cs b/Ryujinx.Core/OsHle/Services/Aud/ServiceAudOut.cs index 5064398c..dd362c15 100644 --- a/Ryujinx.Core/OsHle/Services/Aud/ServiceAudOut.cs +++ b/Ryujinx.Core/OsHle/Services/Aud/ServiceAudOut.cs @@ -5,7 +5,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; using System.Text; -namespace Ryujinx.Core.OsHle.IpcServices.Aud +namespace Ryujinx.Core.OsHle.Services.Aud { class ServiceAudOut : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Aud/ServiceAudRen.cs b/Ryujinx.Core/OsHle/Services/Aud/ServiceAudRen.cs index 8c7d9525..245d85d8 100644 --- a/Ryujinx.Core/OsHle/Services/Aud/ServiceAudRen.cs +++ b/Ryujinx.Core/OsHle/Services/Aud/ServiceAudRen.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Aud +namespace Ryujinx.Core.OsHle.Services.Aud { class ServiceAudRen : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Bsd/ServiceBsd.cs b/Ryujinx.Core/OsHle/Services/Bsd/ServiceBsd.cs index 825b3b27..94d3370d 100644 --- a/Ryujinx.Core/OsHle/Services/Bsd/ServiceBsd.cs +++ b/Ryujinx.Core/OsHle/Services/Bsd/ServiceBsd.cs @@ -8,7 +8,7 @@ using System.Net; using System.Net.Sockets; using System.Threading.Tasks; -namespace Ryujinx.Core.OsHle.IpcServices.Bsd +namespace Ryujinx.Core.OsHle.Services.Bsd { //bsd_errno == (SocketException.ErrorCode - 10000) diff --git a/Ryujinx.Core/OsHle/Services/Friend/IFriendService.cs b/Ryujinx.Core/OsHle/Services/Friend/IFriendService.cs index f5497f38..c6e29f86 100644 --- a/Ryujinx.Core/OsHle/Services/Friend/IFriendService.cs +++ b/Ryujinx.Core/OsHle/Services/Friend/IFriendService.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Friend +namespace Ryujinx.Core.OsHle.Services.Friend { class IFriendService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Friend/ServiceFriend.cs b/Ryujinx.Core/OsHle/Services/Friend/ServiceFriend.cs index 43baf8bb..1b87d22b 100644 --- a/Ryujinx.Core/OsHle/Services/Friend/ServiceFriend.cs +++ b/Ryujinx.Core/OsHle/Services/Friend/ServiceFriend.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Friend +namespace Ryujinx.Core.OsHle.Services.Friend { class ServiceFriend : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/FspSrv/FsErr.cs b/Ryujinx.Core/OsHle/Services/FspSrv/FsErr.cs index 656d529f..762f6551 100644 --- a/Ryujinx.Core/OsHle/Services/FspSrv/FsErr.cs +++ b/Ryujinx.Core/OsHle/Services/FspSrv/FsErr.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.IpcServices.FspSrv +namespace Ryujinx.Core.OsHle.Services.FspSrv { static class FsErr { diff --git a/Ryujinx.Core/OsHle/Services/FspSrv/IDirectory.cs b/Ryujinx.Core/OsHle/Services/FspSrv/IDirectory.cs index 6563c6aa..fab8c676 100644 --- a/Ryujinx.Core/OsHle/Services/FspSrv/IDirectory.cs +++ b/Ryujinx.Core/OsHle/Services/FspSrv/IDirectory.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.IO; using System.Text; -namespace Ryujinx.Core.OsHle.IpcServices.FspSrv +namespace Ryujinx.Core.OsHle.Services.FspSrv { class IDirectory : IpcService, IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/FspSrv/IFile.cs b/Ryujinx.Core/OsHle/Services/FspSrv/IFile.cs index 7d01b22f..bd7d138f 100644 --- a/Ryujinx.Core/OsHle/Services/FspSrv/IFile.cs +++ b/Ryujinx.Core/OsHle/Services/FspSrv/IFile.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.IO; -namespace Ryujinx.Core.OsHle.IpcServices.FspSrv +namespace Ryujinx.Core.OsHle.Services.FspSrv { class IFile : IpcService, IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/FspSrv/IFileSystem.cs b/Ryujinx.Core/OsHle/Services/FspSrv/IFileSystem.cs index d5c2766e..f65b89ef 100644 --- a/Ryujinx.Core/OsHle/Services/FspSrv/IFileSystem.cs +++ b/Ryujinx.Core/OsHle/Services/FspSrv/IFileSystem.cs @@ -6,7 +6,7 @@ using System.Text; using static Ryujinx.Core.OsHle.ErrorCode; -namespace Ryujinx.Core.OsHle.IpcServices.FspSrv +namespace Ryujinx.Core.OsHle.Services.FspSrv { class IFileSystem : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/FspSrv/IStorage.cs b/Ryujinx.Core/OsHle/Services/FspSrv/IStorage.cs index d0f40333..05181c64 100644 --- a/Ryujinx.Core/OsHle/Services/FspSrv/IStorage.cs +++ b/Ryujinx.Core/OsHle/Services/FspSrv/IStorage.cs @@ -3,7 +3,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; using System.IO; -namespace Ryujinx.Core.OsHle.IpcServices.FspSrv +namespace Ryujinx.Core.OsHle.Services.FspSrv { class IStorage : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/FspSrv/ServiceFspSrv.cs b/Ryujinx.Core/OsHle/Services/FspSrv/ServiceFspSrv.cs index c6f23005..49b7dd23 100644 --- a/Ryujinx.Core/OsHle/Services/FspSrv/ServiceFspSrv.cs +++ b/Ryujinx.Core/OsHle/Services/FspSrv/ServiceFspSrv.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.FspSrv +namespace Ryujinx.Core.OsHle.Services.FspSrv { class ServiceFspSrv : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Hid/IActiveVibrationDeviceList.cs b/Ryujinx.Core/OsHle/Services/Hid/IActiveVibrationDeviceList.cs index ff829172..d02fa17e 100644 --- a/Ryujinx.Core/OsHle/Services/Hid/IActiveVibrationDeviceList.cs +++ b/Ryujinx.Core/OsHle/Services/Hid/IActiveVibrationDeviceList.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Hid +namespace Ryujinx.Core.OsHle.Services.Hid { class IActiveApplicationDeviceList : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Hid/IAppletResource.cs b/Ryujinx.Core/OsHle/Services/Hid/IAppletResource.cs index 2b7e934e..23dfd7a2 100644 --- a/Ryujinx.Core/OsHle/Services/Hid/IAppletResource.cs +++ b/Ryujinx.Core/OsHle/Services/Hid/IAppletResource.cs @@ -2,7 +2,7 @@ using Ryujinx.Core.OsHle.Handles; using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Hid +namespace Ryujinx.Core.OsHle.Services.Hid { class IAppletResource : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Hid/ServiceHid.cs b/Ryujinx.Core/OsHle/Services/Hid/ServiceHid.cs index f15cbcfc..46c868aa 100644 --- a/Ryujinx.Core/OsHle/Services/Hid/ServiceHid.cs +++ b/Ryujinx.Core/OsHle/Services/Hid/ServiceHid.cs @@ -1,8 +1,8 @@ +using Ryujinx.Core.Input; using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -using Ryujinx.Core.Input; -namespace Ryujinx.Core.OsHle.IpcServices.Hid +namespace Ryujinx.Core.OsHle.Services.Hid { class ServiceHid : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/IIpcService.cs b/Ryujinx.Core/OsHle/Services/IIpcService.cs index eebcdfbe..98b5c239 100644 --- a/Ryujinx.Core/OsHle/Services/IIpcService.cs +++ b/Ryujinx.Core/OsHle/Services/IIpcService.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices +namespace Ryujinx.Core.OsHle.Services { interface IIpcService { diff --git a/Ryujinx.Core/OsHle/Services/IpcService.cs b/Ryujinx.Core/OsHle/Services/IpcService.cs index 9dca8114..33300dec 100644 --- a/Ryujinx.Core/OsHle/Services/IpcService.cs +++ b/Ryujinx.Core/OsHle/Services/IpcService.cs @@ -1,10 +1,10 @@ -using Ryujinx.Core.OsHle.Ipc; using Ryujinx.Core.OsHle.Handles; +using Ryujinx.Core.OsHle.Ipc; using System; using System.Collections.Generic; using System.IO; -namespace Ryujinx.Core.OsHle.IpcServices +namespace Ryujinx.Core.OsHle.Services { abstract class IpcService : IIpcService { diff --git a/Ryujinx.Core/OsHle/Services/Lm/ILogger.cs b/Ryujinx.Core/OsHle/Services/Lm/ILogger.cs index c3f5b035..9a0b1aa3 100644 --- a/Ryujinx.Core/OsHle/Services/Lm/ILogger.cs +++ b/Ryujinx.Core/OsHle/Services/Lm/ILogger.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.IO; using System.Text; -namespace Ryujinx.Core.OsHle.IpcServices.Lm +namespace Ryujinx.Core.OsHle.Services.Lm { class ILogger : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Lm/ServiceLm.cs b/Ryujinx.Core/OsHle/Services/Lm/ServiceLm.cs index e23ff565..f1c2204e 100644 --- a/Ryujinx.Core/OsHle/Services/Lm/ServiceLm.cs +++ b/Ryujinx.Core/OsHle/Services/Lm/ServiceLm.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Lm +namespace Ryujinx.Core.OsHle.Services.Lm { class ServiceLm : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Nifm/IGeneralService.cs b/Ryujinx.Core/OsHle/Services/Nifm/IGeneralService.cs index abd1cc20..bda30769 100644 --- a/Ryujinx.Core/OsHle/Services/Nifm/IGeneralService.cs +++ b/Ryujinx.Core/OsHle/Services/Nifm/IGeneralService.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Nifm +namespace Ryujinx.Core.OsHle.Services.Nifm { class IGeneralService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Nifm/IRequest.cs b/Ryujinx.Core/OsHle/Services/Nifm/IRequest.cs index 1e1f13e6..307da1d6 100644 --- a/Ryujinx.Core/OsHle/Services/Nifm/IRequest.cs +++ b/Ryujinx.Core/OsHle/Services/Nifm/IRequest.cs @@ -3,7 +3,7 @@ using Ryujinx.Core.OsHle.Ipc; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Nifm +namespace Ryujinx.Core.OsHle.Services.Nifm { class IRequest : IpcService, IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/Nifm/ServiceNifm.cs b/Ryujinx.Core/OsHle/Services/Nifm/ServiceNifm.cs index b3602e9c..7e5ecacd 100644 --- a/Ryujinx.Core/OsHle/Services/Nifm/ServiceNifm.cs +++ b/Ryujinx.Core/OsHle/Services/Nifm/ServiceNifm.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Nifm +namespace Ryujinx.Core.OsHle.Services.Nifm { class ServiceNifm : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Ns/ServiceNs.cs b/Ryujinx.Core/OsHle/Services/Ns/ServiceNs.cs index acdb92cf..7f8faaa5 100644 --- a/Ryujinx.Core/OsHle/Services/Ns/ServiceNs.cs +++ b/Ryujinx.Core/OsHle/Services/Ns/ServiceNs.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Ns +namespace Ryujinx.Core.OsHle.Services.Ns { class ServiceNs : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvFd.cs b/Ryujinx.Core/OsHle/Services/Nv/NvFd.cs index dbce74ad..1fdbd1a1 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvFd.cs +++ b/Ryujinx.Core/OsHle/Services/Nv/NvFd.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.IpcServices.NvServices +namespace Ryujinx.Core.OsHle.Services.Nv { class NvFd { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvMap.cs b/Ryujinx.Core/OsHle/Services/Nv/NvMap.cs index d5a5a800..9ef70319 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvMap.cs +++ b/Ryujinx.Core/OsHle/Services/Nv/NvMap.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.IpcServices.NvServices +namespace Ryujinx.Core.OsHle.Services.Nv { class NvMap { diff --git a/Ryujinx.Core/OsHle/Services/Nv/NvMapFb.cs b/Ryujinx.Core/OsHle/Services/Nv/NvMapFb.cs index 1066cc95..d8a47418 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/NvMapFb.cs +++ b/Ryujinx.Core/OsHle/Services/Nv/NvMapFb.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.NvServices +namespace Ryujinx.Core.OsHle.Services.Nv { class NvMapFb { diff --git a/Ryujinx.Core/OsHle/Services/Nv/ServiceNvDrv.cs b/Ryujinx.Core/OsHle/Services/Nv/ServiceNvDrv.cs index a1e0e532..2c909b3a 100644 --- a/Ryujinx.Core/OsHle/Services/Nv/ServiceNvDrv.cs +++ b/Ryujinx.Core/OsHle/Services/Nv/ServiceNvDrv.cs @@ -6,7 +6,7 @@ using Ryujinx.Graphics.Gpu; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.NvServices +namespace Ryujinx.Core.OsHle.Services.Nv { class ServiceNvDrv : IpcService, IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/Pctl/IParentalControlService.cs b/Ryujinx.Core/OsHle/Services/Pctl/IParentalControlService.cs index 45216864..28b35b0a 100644 --- a/Ryujinx.Core/OsHle/Services/Pctl/IParentalControlService.cs +++ b/Ryujinx.Core/OsHle/Services/Pctl/IParentalControlService.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Pctl +namespace Ryujinx.Core.OsHle.Services.Pctl { class IParentalControlService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Pctl/ServicePctl.cs b/Ryujinx.Core/OsHle/Services/Pctl/ServicePctl.cs index b648d184..0eb4cb87 100644 --- a/Ryujinx.Core/OsHle/Services/Pctl/ServicePctl.cs +++ b/Ryujinx.Core/OsHle/Services/Pctl/ServicePctl.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Pctl +namespace Ryujinx.Core.OsHle.Services.Pctl { class ServicePctl : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Pl/ServicePl.cs b/Ryujinx.Core/OsHle/Services/Pl/ServicePl.cs index 55637eac..8deaa5f4 100644 --- a/Ryujinx.Core/OsHle/Services/Pl/ServicePl.cs +++ b/Ryujinx.Core/OsHle/Services/Pl/ServicePl.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Pl +namespace Ryujinx.Core.OsHle.Services.Pl { class ServicePl : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Pl/SharedFontType.cs b/Ryujinx.Core/OsHle/Services/Pl/SharedFontType.cs index 29fe02b8..2318b172 100644 --- a/Ryujinx.Core/OsHle/Services/Pl/SharedFontType.cs +++ b/Ryujinx.Core/OsHle/Services/Pl/SharedFontType.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.IpcServices.Pl +namespace Ryujinx.Core.OsHle.Services.Pl { enum SharedFontType { diff --git a/Ryujinx.Core/OsHle/Services/ServiceFactory.cs b/Ryujinx.Core/OsHle/Services/ServiceFactory.cs index 9f43cdf0..e001a3b0 100644 --- a/Ryujinx.Core/OsHle/Services/ServiceFactory.cs +++ b/Ryujinx.Core/OsHle/Services/ServiceFactory.cs @@ -1,26 +1,26 @@ -using Ryujinx.Core.OsHle.IpcServices.Acc; -using Ryujinx.Core.OsHle.IpcServices.Am; -using Ryujinx.Core.OsHle.IpcServices.Apm; -using Ryujinx.Core.OsHle.IpcServices.Aud; -using Ryujinx.Core.OsHle.IpcServices.Bsd; -using Ryujinx.Core.OsHle.IpcServices.Friend; -using Ryujinx.Core.OsHle.IpcServices.FspSrv; -using Ryujinx.Core.OsHle.IpcServices.Hid; -using Ryujinx.Core.OsHle.IpcServices.Lm; -using Ryujinx.Core.OsHle.IpcServices.Nifm; -using Ryujinx.Core.OsHle.IpcServices.Ns; -using Ryujinx.Core.OsHle.IpcServices.NvServices; -using Ryujinx.Core.OsHle.IpcServices.Pctl; -using Ryujinx.Core.OsHle.IpcServices.Pl; -using Ryujinx.Core.OsHle.IpcServices.Set; -using Ryujinx.Core.OsHle.IpcServices.Sfdnsres; -using Ryujinx.Core.OsHle.IpcServices.Sm; -using Ryujinx.Core.OsHle.IpcServices.Ssl; -using Ryujinx.Core.OsHle.IpcServices.Time; -using Ryujinx.Core.OsHle.IpcServices.Vi; +using Ryujinx.Core.OsHle.Services.Acc; +using Ryujinx.Core.OsHle.Services.Am; +using Ryujinx.Core.OsHle.Services.Apm; +using Ryujinx.Core.OsHle.Services.Aud; +using Ryujinx.Core.OsHle.Services.Bsd; +using Ryujinx.Core.OsHle.Services.Friend; +using Ryujinx.Core.OsHle.Services.FspSrv; +using Ryujinx.Core.OsHle.Services.Hid; +using Ryujinx.Core.OsHle.Services.Lm; +using Ryujinx.Core.OsHle.Services.Nifm; +using Ryujinx.Core.OsHle.Services.Ns; +using Ryujinx.Core.OsHle.Services.Nv; +using Ryujinx.Core.OsHle.Services.Pctl; +using Ryujinx.Core.OsHle.Services.Pl; +using Ryujinx.Core.OsHle.Services.Set; +using Ryujinx.Core.OsHle.Services.Sfdnsres; +using Ryujinx.Core.OsHle.Services.Sm; +using Ryujinx.Core.OsHle.Services.Ssl; +using Ryujinx.Core.OsHle.Services.Time; +using Ryujinx.Core.OsHle.Services.Vi; using System; -namespace Ryujinx.Core.OsHle.IpcServices +namespace Ryujinx.Core.OsHle.Services { static class ServiceFactory { diff --git a/Ryujinx.Core/OsHle/Services/Set/ServiceSet.cs b/Ryujinx.Core/OsHle/Services/Set/ServiceSet.cs index 55824357..ab4e040a 100644 --- a/Ryujinx.Core/OsHle/Services/Set/ServiceSet.cs +++ b/Ryujinx.Core/OsHle/Services/Set/ServiceSet.cs @@ -3,7 +3,7 @@ using Ryujinx.Core.OsHle.Ipc; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Set +namespace Ryujinx.Core.OsHle.Services.Set { class ServiceSet : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Set/ServiceSetSys.cs b/Ryujinx.Core/OsHle/Services/Set/ServiceSetSys.cs index 1d6afc4f..e4fcafcc 100644 --- a/Ryujinx.Core/OsHle/Services/Set/ServiceSetSys.cs +++ b/Ryujinx.Core/OsHle/Services/Set/ServiceSetSys.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Set +namespace Ryujinx.Core.OsHle.Services.Set { class ServiceSetSys : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Sfdnsres/ServiceSfdnsres.cs b/Ryujinx.Core/OsHle/Services/Sfdnsres/ServiceSfdnsres.cs index 1f68558e..1ef80829 100644 --- a/Ryujinx.Core/OsHle/Services/Sfdnsres/ServiceSfdnsres.cs +++ b/Ryujinx.Core/OsHle/Services/Sfdnsres/ServiceSfdnsres.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Sfdnsres +namespace Ryujinx.Core.OsHle.Services.Sfdnsres { class ServiceSfdnsres : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Sm/ServiceSm.cs b/Ryujinx.Core/OsHle/Services/Sm/ServiceSm.cs index 770227d5..e7fd4a10 100644 --- a/Ryujinx.Core/OsHle/Services/Sm/ServiceSm.cs +++ b/Ryujinx.Core/OsHle/Services/Sm/ServiceSm.cs @@ -2,7 +2,7 @@ using Ryujinx.Core.OsHle.Handles; using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Sm +namespace Ryujinx.Core.OsHle.Services.Sm { class ServiceSm : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Ssl/ServiceSsl.cs b/Ryujinx.Core/OsHle/Services/Ssl/ServiceSsl.cs index b9513a86..e23811e0 100644 --- a/Ryujinx.Core/OsHle/Services/Ssl/ServiceSsl.cs +++ b/Ryujinx.Core/OsHle/Services/Ssl/ServiceSsl.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Ssl +namespace Ryujinx.Core.OsHle.Services.Ssl { class ServiceSsl : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Time/ISteadyClock.cs b/Ryujinx.Core/OsHle/Services/Time/ISteadyClock.cs index 91d78664..187d7a06 100644 --- a/Ryujinx.Core/OsHle/Services/Time/ISteadyClock.cs +++ b/Ryujinx.Core/OsHle/Services/Time/ISteadyClock.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Time +namespace Ryujinx.Core.OsHle.Services.Time { class ISteadyClock : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Time/ISystemClock.cs b/Ryujinx.Core/OsHle/Services/Time/ISystemClock.cs index f7f710c8..82075ee3 100644 --- a/Ryujinx.Core/OsHle/Services/Time/ISystemClock.cs +++ b/Ryujinx.Core/OsHle/Services/Time/ISystemClock.cs @@ -2,7 +2,7 @@ using Ryujinx.Core.OsHle.Ipc; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Time +namespace Ryujinx.Core.OsHle.Services.Time { class ISystemClock : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Time/ITimeZoneService.cs b/Ryujinx.Core/OsHle/Services/Time/ITimeZoneService.cs index 63329ada..c162d98c 100644 --- a/Ryujinx.Core/OsHle/Services/Time/ITimeZoneService.cs +++ b/Ryujinx.Core/OsHle/Services/Time/ITimeZoneService.cs @@ -2,7 +2,7 @@ using Ryujinx.Core.OsHle.Ipc; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Time +namespace Ryujinx.Core.OsHle.Services.Time { class ITimeZoneService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Time/ServiceTime.cs b/Ryujinx.Core/OsHle/Services/Time/ServiceTime.cs index 1f947939..00defb98 100644 --- a/Ryujinx.Core/OsHle/Services/Time/ServiceTime.cs +++ b/Ryujinx.Core/OsHle/Services/Time/ServiceTime.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Time +namespace Ryujinx.Core.OsHle.Services.Time { class ServiceTime : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Time/SystemClockType.cs b/Ryujinx.Core/OsHle/Services/Time/SystemClockType.cs index 2314942a..7b5074ba 100644 --- a/Ryujinx.Core/OsHle/Services/Time/SystemClockType.cs +++ b/Ryujinx.Core/OsHle/Services/Time/SystemClockType.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.IpcServices.Time +namespace Ryujinx.Core.OsHle.Services.Time { enum SystemClockType { diff --git a/Ryujinx.Core/OsHle/Services/Vi/Display.cs b/Ryujinx.Core/OsHle/Services/Vi/Display.cs index ceadc393..0dbb2eda 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/Display.cs +++ b/Ryujinx.Core/OsHle/Services/Vi/Display.cs @@ -1,4 +1,4 @@ -namespace Ryujinx.Core.OsHle.IpcServices.Vi +namespace Ryujinx.Core.OsHle.Services.Vi { class Display { diff --git a/Ryujinx.Core/OsHle/Services/Vi/GbpBuffer.cs b/Ryujinx.Core/OsHle/Services/Vi/GbpBuffer.cs index 5fe585d0..cae31054 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/GbpBuffer.cs +++ b/Ryujinx.Core/OsHle/Services/Vi/GbpBuffer.cs @@ -1,6 +1,6 @@ using System.IO; -namespace Ryujinx.Core.OsHle.IpcServices.Android +namespace Ryujinx.Core.OsHle.Services.Android { struct GbpBuffer { diff --git a/Ryujinx.Core/OsHle/Services/Vi/IApplicationDisplayService.cs b/Ryujinx.Core/OsHle/Services/Vi/IApplicationDisplayService.cs index 62db23b4..c7e7524c 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/IApplicationDisplayService.cs +++ b/Ryujinx.Core/OsHle/Services/Vi/IApplicationDisplayService.cs @@ -3,9 +3,9 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; using System.IO; -using static Ryujinx.Core.OsHle.IpcServices.Android.Parcel; +using static Ryujinx.Core.OsHle.Services.Android.Parcel; -namespace Ryujinx.Core.OsHle.IpcServices.Vi +namespace Ryujinx.Core.OsHle.Services.Vi { class IApplicationDisplayService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Vi/IHOSBinderDriver.cs b/Ryujinx.Core/OsHle/Services/Vi/IHOSBinderDriver.cs index 4c342006..b1b7a268 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/IHOSBinderDriver.cs +++ b/Ryujinx.Core/OsHle/Services/Vi/IHOSBinderDriver.cs @@ -1,12 +1,12 @@ using ChocolArm64.Memory; using Ryujinx.Core.OsHle.Handles; using Ryujinx.Core.OsHle.Ipc; -using Ryujinx.Core.OsHle.IpcServices.Android; +using Ryujinx.Core.OsHle.Services.Android; using Ryujinx.Graphics.Gal; using System; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Vi +namespace Ryujinx.Core.OsHle.Services.Vi { class IHOSBinderDriver : IpcService, IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/Vi/IManagerDisplayService.cs b/Ryujinx.Core/OsHle/Services/Vi/IManagerDisplayService.cs index 6c7f36ff..3c792501 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/IManagerDisplayService.cs +++ b/Ryujinx.Core/OsHle/Services/Vi/IManagerDisplayService.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Vi +namespace Ryujinx.Core.OsHle.Services.Vi { class IManagerDisplayService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Vi/ISystemDisplayService.cs b/Ryujinx.Core/OsHle/Services/Vi/ISystemDisplayService.cs index 814ed7d1..02aafebb 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/ISystemDisplayService.cs +++ b/Ryujinx.Core/OsHle/Services/Vi/ISystemDisplayService.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Vi +namespace Ryujinx.Core.OsHle.Services.Vi { class ISystemDisplayService : IpcService { diff --git a/Ryujinx.Core/OsHle/Services/Vi/NvFlinger.cs b/Ryujinx.Core/OsHle/Services/Vi/NvFlinger.cs index 550260bb..36030d20 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/NvFlinger.cs +++ b/Ryujinx.Core/OsHle/Services/Vi/NvFlinger.cs @@ -1,16 +1,15 @@ using ChocolArm64.Memory; using Ryujinx.Core.OsHle.Handles; -using Ryujinx.Core.OsHle.IpcServices.NvServices; +using Ryujinx.Core.OsHle.Services.Nv; using Ryujinx.Graphics.Gal; using System; -using System.IO; using System.Collections.Generic; +using System.IO; using System.Text; using System.Threading; +using static Ryujinx.Core.OsHle.Services.Android.Parcel; -using static Ryujinx.Core.OsHle.IpcServices.Android.Parcel; - -namespace Ryujinx.Core.OsHle.IpcServices.Android +namespace Ryujinx.Core.OsHle.Services.Android { class NvFlinger : IDisposable { diff --git a/Ryujinx.Core/OsHle/Services/Vi/Parcel.cs b/Ryujinx.Core/OsHle/Services/Vi/Parcel.cs index 3404c227..1300a741 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/Parcel.cs +++ b/Ryujinx.Core/OsHle/Services/Vi/Parcel.cs @@ -1,7 +1,7 @@ using System; using System.IO; -namespace Ryujinx.Core.OsHle.IpcServices.Android +namespace Ryujinx.Core.OsHle.Services.Android { static class Parcel { diff --git a/Ryujinx.Core/OsHle/Services/Vi/ServiceVi.cs b/Ryujinx.Core/OsHle/Services/Vi/ServiceVi.cs index 360cb6fa..f9f6beef 100644 --- a/Ryujinx.Core/OsHle/Services/Vi/ServiceVi.cs +++ b/Ryujinx.Core/OsHle/Services/Vi/ServiceVi.cs @@ -1,7 +1,7 @@ using Ryujinx.Core.OsHle.Ipc; using System.Collections.Generic; -namespace Ryujinx.Core.OsHle.IpcServices.Vi +namespace Ryujinx.Core.OsHle.Services.Vi { class ServiceVi : IpcService { diff --git a/Ryujinx.Core/OsHle/Svc/SvcSystem.cs b/Ryujinx.Core/OsHle/Svc/SvcSystem.cs index 96bef5e4..8813514f 100644 --- a/Ryujinx.Core/OsHle/Svc/SvcSystem.cs +++ b/Ryujinx.Core/OsHle/Svc/SvcSystem.cs @@ -3,7 +3,7 @@ using ChocolArm64.State; using Ryujinx.Core.OsHle.Exceptions; using Ryujinx.Core.OsHle.Handles; using Ryujinx.Core.OsHle.Ipc; -using Ryujinx.Core.OsHle.IpcServices; +using Ryujinx.Core.OsHle.Services; using System; using System.Threading; diff --git a/Ryujinx.sln b/Ryujinx.sln index 34a5f488..036421f9 100644 --- a/Ryujinx.sln +++ b/Ryujinx.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27130.2027 +VisualStudioVersion = 15.0.26730.8 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx", "Ryujinx\Ryujinx.csproj", "{074045D4-3ED2-4711-9169-E385F2BFB5A0}" EndProject @@ -9,9 +9,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Tests", "Ryujinx.Te EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Core", "Ryujinx.Core\Ryujinx.Core.csproj", "{CB92CFF9-1D62-4D4F-9E88-8130EF61E351}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChocolArm64", "ChocolArm64\ChocolArm64.csproj", "{2345A1A7-8DEF-419B-9AFB-4DFD41D20D05}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChocolArm64", "ChocolArm64\ChocolArm64.csproj", "{2345A1A7-8DEF-419B-9AFB-4DFD41D20D05}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics", "Ryujinx.Graphics\Ryujinx.Graphics.csproj", "{EAAE36AF-7781-4578-A7E0-F0EFD2025569}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics", "Ryujinx.Graphics\Ryujinx.Graphics.csproj", "{EAAE36AF-7781-4578-A7E0-F0EFD2025569}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Audio", "Ryujinx.Audio\Ryujinx.Audio.csproj", "{5C1D818E-682A-46A5-9D54-30006E26C270}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -39,6 +41,10 @@ Global {EAAE36AF-7781-4578-A7E0-F0EFD2025569}.Debug|Any CPU.Build.0 = Debug|Any CPU {EAAE36AF-7781-4578-A7E0-F0EFD2025569}.Release|Any CPU.ActiveCfg = Release|Any CPU {EAAE36AF-7781-4578-A7E0-F0EFD2025569}.Release|Any CPU.Build.0 = Release|Any CPU + {5C1D818E-682A-46A5-9D54-30006E26C270}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5C1D818E-682A-46A5-9D54-30006E26C270}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5C1D818E-682A-46A5-9D54-30006E26C270}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5C1D818E-682A-46A5-9D54-30006E26C270}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE |