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

Also fix IShopServiceAccessSystemInterface being in the wrong namespace.

Ryujinx.HLE/HOS/Services/BluetoothManager/BtmUser/IBtmUserCore.cs

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

Ryujinx.HLE/HOS/Services/BluetoothManager/IBtm.cs

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

Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmDebug.cs

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

Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmSystem.cs

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

Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmUser.cs

@@ -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+
     class IBtmUser : IpcService

Ryujinx.HLE/HOS/Services/BluetoothManager/ResultCode.cs

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

Ryujinx.HLE/HOS/Services/Loader/IDebugMonitorInterface.cs

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

Ryujinx.HLE/HOS/Services/Loader/IProcessManagerInterface.cs

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

Ryujinx.HLE/HOS/Services/Loader/IRoInterface.cs

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

Ryujinx.HLE/HOS/Services/Loader/IShellInterface.cs

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

Ryujinx.HLE/HOS/Services/Loader/ResultCode.cs

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

Ryujinx.HLE/HOS/Services/Loader/Types/NroInfo.cs

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

Ryujinx.HLE/HOS/Services/Loader/Types/NrrHeader.cs

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

Ryujinx.HLE/HOS/Services/Loader/Types/NrrInfo.cs

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

Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessSystemInterface.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/NvFlinger.cs

@@ -11,9 +11,9 @@ using System.Runtime.InteropServices;
 using System.Text;
 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
     {

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Parcel.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/BufferEntry.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/BufferState.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorBytePerPixel.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorComponent.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorDataType.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorFormat.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorShift.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorSpace.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Color/ColorSwizzle.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Fence.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/GbpBuffer.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/GraphicBufferHeader.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/HalTransform.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/MultiFence.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBuffer.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBufferSurface.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/NvGraphicBufferSurfaceArray.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/QueueBufferObject.cs

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

Ryujinx.HLE/HOS/Services/SurfaceFlinger/Types/Rect.cs

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

Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IHOSBinderDriver.cs

@@ -2,7 +2,7 @@ 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 Ryujinx.HLE.HOS.Services.SurfaceFlinger;
 using System;
 
 namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService

Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs

@@ -6,7 +6,7 @@ using System;
 using System.IO;
 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
 {