hle: Fix some inconsistencies in namespace naming in Services (#808)

Also fix IShopServiceAccessSystemInterface being in the wrong namespace.
This commit is contained in:
Thomas Guillemard 2019-11-03 18:26:29 +01:00 committed by Ac_K
parent 9426ef3f06
commit b29950dbd6
38 changed files with 40 additions and 40 deletions

View File

@ -3,7 +3,7 @@ using Ryujinx.HLE.HOS.Ipc;
using Ryujinx.HLE.HOS.Kernel.Common; using Ryujinx.HLE.HOS.Kernel.Common;
using Ryujinx.HLE.HOS.Kernel.Threading; using Ryujinx.HLE.HOS.Kernel.Threading;
namespace Ryujinx.HLE.HOS.Services.Btm.BtmUser namespace Ryujinx.HLE.HOS.Services.BluetoothManager.BtmUser
{ {
class IBtmUserCore : IpcService class IBtmUserCore : IpcService
{ {

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Btm namespace Ryujinx.HLE.HOS.Services.BluetoothManager
{ {
[Service("btm")] [Service("btm")]
class IBtm : IpcService class IBtm : IpcService

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Btm namespace Ryujinx.HLE.HOS.Services.BluetoothManager
{ {
[Service("btm:dbg")] [Service("btm:dbg")]
class IBtmDebug : IpcService class IBtmDebug : IpcService

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Btm namespace Ryujinx.HLE.HOS.Services.BluetoothManager
{ {
[Service("btm:sys")] [Service("btm:sys")]
class IBtmSystem : IpcService class IBtmSystem : IpcService

View File

@ -1,6 +1,6 @@
using Ryujinx.HLE.HOS.Services.Btm.BtmUser; using Ryujinx.HLE.HOS.Services.BluetoothManager.BtmUser;
namespace Ryujinx.HLE.HOS.Services.Btm namespace Ryujinx.HLE.HOS.Services.BluetoothManager
{ {
[Service("btm:u")] // 5.0.0+ [Service("btm:u")] // 5.0.0+
class IBtmUser : IpcService class IBtmUser : IpcService

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Btm namespace Ryujinx.HLE.HOS.Services.BluetoothManager
{ {
enum ResultCode enum ResultCode
{ {

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Ldr namespace Ryujinx.HLE.HOS.Services.Loader
{ {
[Service("ldr:dmnt")] [Service("ldr:dmnt")]
class IDebugMonitorInterface : IpcService class IDebugMonitorInterface : IpcService

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Ldr namespace Ryujinx.HLE.HOS.Services.Loader
{ {
[Service("ldr:pm")] [Service("ldr:pm")]
class IProcessManagerInterface : IpcService class IProcessManagerInterface : IpcService

View File

@ -10,7 +10,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Security.Cryptography; using System.Security.Cryptography;
namespace Ryujinx.HLE.HOS.Services.Ldr namespace Ryujinx.HLE.HOS.Services.Loader
{ {
[Service("ldr:ro")] [Service("ldr:ro")]
[Service("ro:1")] // 7.0.0+ [Service("ro:1")] // 7.0.0+

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Ldr namespace Ryujinx.HLE.HOS.Services.Loader
{ {
[Service("ldr:shel")] [Service("ldr:shel")]
class IShellInterface : IpcService class IShellInterface : IpcService

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Ldr namespace Ryujinx.HLE.HOS.Services.Loader
{ {
enum ResultCode enum ResultCode
{ {

View File

@ -1,6 +1,6 @@
using Ryujinx.HLE.Loaders.Executables; using Ryujinx.HLE.Loaders.Executables;
namespace Ryujinx.HLE.HOS.Services.Ldr namespace Ryujinx.HLE.HOS.Services.Loader
{ {
class NroInfo class NroInfo
{ {

View File

@ -1,6 +1,6 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Ldr namespace Ryujinx.HLE.HOS.Services.Loader
{ {
[StructLayout(LayoutKind.Explicit, Size = 0x350)] [StructLayout(LayoutKind.Explicit, Size = 0x350)]
unsafe struct NrrHeader unsafe struct NrrHeader

View File

@ -1,6 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace Ryujinx.HLE.HOS.Services.Ldr namespace Ryujinx.HLE.HOS.Services.Loader
{ {
class NrrInfo class NrrInfo
{ {

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Ldr namespace Ryujinx.HLE.HOS.Services.Nim
{ {
[Service("nim:ecas")] // 7.0.0+ [Service("nim:ecas")] // 7.0.0+
class IShopServiceAccessSystemInterface : IpcService class IShopServiceAccessSystemInterface : IpcService

View File

@ -11,9 +11,9 @@ using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using static Ryujinx.HLE.HOS.Services.Android.Parcel; using static Ryujinx.HLE.HOS.Services.SurfaceFlinger.Parcel;
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
class NvFlinger : IDisposable class NvFlinger : IDisposable
{ {

View File

@ -1,7 +1,7 @@
using System; using System;
using System.IO; using System.IO;
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
static class Parcel static class Parcel
{ {

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
struct BufferEntry struct BufferEntry
{ {

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
enum BufferState enum BufferState
{ {

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
enum ColorBytePerPixel enum ColorBytePerPixel
{ {

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
enum ColorComponent : uint enum ColorComponent : uint
{ {

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
enum ColorDataType enum ColorDataType
{ {

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
enum ColorFormat : ulong enum ColorFormat : ulong
{ {

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
class ColorShift class ColorShift
{ {

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
enum ColorSpace : ulong enum ColorSpace : ulong
{ {

View File

@ -1,4 +1,4 @@
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
enum ColorSwizzle enum ColorSwizzle
{ {

View File

@ -1,6 +1,6 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
[StructLayout(LayoutKind.Sequential, Size = 0x8)] [StructLayout(LayoutKind.Sequential, Size = 0x8)]
struct Fence struct Fence

View File

@ -3,7 +3,7 @@ using System;
using System.IO; using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
struct GbpBuffer struct GbpBuffer
{ {

View File

@ -1,6 +1,6 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
[StructLayout(LayoutKind.Sequential, Size = 0x28)] [StructLayout(LayoutKind.Sequential, Size = 0x28)]
struct GraphicBufferHeader struct GraphicBufferHeader

View File

@ -1,6 +1,6 @@
using System; using System;
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
[Flags] [Flags]
enum HalTransform enum HalTransform

View File

@ -1,6 +1,6 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
[StructLayout(LayoutKind.Explicit, Size = 0x24)] [StructLayout(LayoutKind.Explicit, Size = 0x24)]
struct MultiFence struct MultiFence

View File

@ -1,6 +1,6 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
[StructLayout(LayoutKind.Explicit, Size = 0x144)] [StructLayout(LayoutKind.Explicit, Size = 0x144)]
struct NvGraphicBuffer struct NvGraphicBuffer

View File

@ -1,6 +1,6 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
[StructLayout(LayoutKind.Explicit, Size = 0x58)] [StructLayout(LayoutKind.Explicit, Size = 0x58)]
struct NvGraphicBufferSurface struct NvGraphicBufferSurface

View File

@ -1,7 +1,7 @@
using System; using System;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
[StructLayout(LayoutKind.Explicit)] [StructLayout(LayoutKind.Explicit)]
struct NvGraphicBufferSurfaceArray struct NvGraphicBufferSurfaceArray

View File

@ -1,6 +1,6 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
[StructLayout(LayoutKind.Explicit)] [StructLayout(LayoutKind.Explicit)]
struct QueueBufferObject struct QueueBufferObject

View File

@ -1,6 +1,6 @@
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Ryujinx.HLE.HOS.Services.Android namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
{ {
[StructLayout(LayoutKind.Sequential, Size = 0x10)] [StructLayout(LayoutKind.Sequential, Size = 0x10)]
struct Rect struct Rect

View File

@ -2,7 +2,7 @@ using Ryujinx.Graphics.Gal;
using Ryujinx.HLE.HOS.Ipc; using Ryujinx.HLE.HOS.Ipc;
using Ryujinx.HLE.HOS.Kernel.Common; using Ryujinx.HLE.HOS.Kernel.Common;
using Ryujinx.HLE.HOS.Kernel.Threading; using Ryujinx.HLE.HOS.Kernel.Threading;
using Ryujinx.HLE.HOS.Services.Android; using Ryujinx.HLE.HOS.Services.SurfaceFlinger;
using System; using System;
namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService

View File

@ -6,7 +6,7 @@ using System;
using System.IO; using System.IO;
using System.Text; using System.Text;
using static Ryujinx.HLE.HOS.Services.Android.Parcel; using static Ryujinx.HLE.HOS.Services.SurfaceFlinger.Parcel;
namespace Ryujinx.HLE.HOS.Services.Vi.RootService namespace Ryujinx.HLE.HOS.Services.Vi.RootService
{ {