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

Also fix IShopServiceAccessSystemInterface being in the wrong namespace.

6 files changed, 0 insertions, 181 deletions

diff --git a/Ryujinx.HLE/HOS/Services/Btm/BtmUser/IBtmUserCore.cs b/Ryujinx.HLE/HOS/Services/Btm/BtmUser/IBtmUserCore.cs
deleted file mode 100644
index 0ab9a3ef..00000000
--- a/Ryujinx.HLE/HOS/Services/Btm/BtmUser/IBtmUserCore.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using Ryujinx.Common.Logging;
-using Ryujinx.HLE.HOS.Ipc;
-using Ryujinx.HLE.HOS.Kernel.Common;
-using Ryujinx.HLE.HOS.Kernel.Threading;
-
-namespace Ryujinx.HLE.HOS.Services.Btm.BtmUser
-{
-    class IBtmUserCore : IpcService
-    {
-        public KEvent _bleScanEvent;
-        public int    _bleScanEventHandle;
-
-        public KEvent _bleConnectionEvent;
-        public int    _bleConnectionEventHandle;
-
-        public KEvent _bleServiceDiscoveryEvent;
-        public int    _bleServiceDiscoveryEventHandle;
-
-        public KEvent _bleMtuConfigEvent;
-        public int    _bleMtuConfigEventHandle;
-
-        public IBtmUserCore() { }
-
-        [Command(0)] // 5.0.0+
-        // AcquireBleScanEvent() -> (byte<1>, handle<copy>)
-        public ResultCode AcquireBleScanEvent(ServiceCtx context)
-        {
-            KernelResult result = KernelResult.Success;
-
-            if (_bleScanEventHandle == 0)
-            {
-                _bleScanEvent = new KEvent(context.Device.System);
-
-                result = context.Process.HandleTable.GenerateHandle(_bleScanEvent.ReadableEvent, out _bleScanEventHandle);
-
-                if (result != KernelResult.Success)
-                {
-                    // NOTE: We use a Logging instead of an exception because the call return a boolean if succeed or not.
-                    Logger.PrintError(LogClass.ServiceBsd, "Out of handles!");
-                }
-            }
-
-            context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_bleScanEventHandle);
-
-            context.ResponseData.Write(result == KernelResult.Success ? 1 : 0);
-
-            return ResultCode.Success;
-        }
-
-        [Command(17)] // 5.0.0+
-        // AcquireBleConnectionEvent() -> (byte<1>, handle<copy>)
-        public ResultCode AcquireBleConnectionEvent(ServiceCtx context)
-        {
-            KernelResult result = KernelResult.Success;
-
-            if (_bleConnectionEventHandle == 0)
-            {
-                _bleConnectionEvent = new KEvent(context.Device.System);
-
-                result = context.Process.HandleTable.GenerateHandle(_bleConnectionEvent.ReadableEvent, out _bleConnectionEventHandle);
-
-                if (result != KernelResult.Success)
-                {
-                    // NOTE: We use a Logging instead of an exception because the call return a boolean if succeed or not.
-                    Logger.PrintError(LogClass.ServiceBsd, "Out of handles!");
-                }
-            }
-
-            context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_bleConnectionEventHandle);
-
-            context.ResponseData.Write(result == KernelResult.Success ? 1 : 0);
-
-            return ResultCode.Success;
-        }
-
-        [Command(26)] // 5.0.0+
-        // AcquireBleServiceDiscoveryEvent() -> (byte<1>, handle<copy>)
-        public ResultCode AcquireBleServiceDiscoveryEvent(ServiceCtx context)
-        {
-            KernelResult result = KernelResult.Success;
-
-            if (_bleServiceDiscoveryEventHandle == 0)
-            {
-                _bleServiceDiscoveryEvent = new KEvent(context.Device.System);
-
-                result = context.Process.HandleTable.GenerateHandle(_bleServiceDiscoveryEvent.ReadableEvent, out _bleServiceDiscoveryEventHandle);
-
-                if (result != KernelResult.Success)
-                {
-                    // NOTE: We use a Logging instead of an exception because the call return a boolean if succeed or not.
-                    Logger.PrintError(LogClass.ServiceBsd, "Out of handles!");
-                }
-            }
-
-            context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_bleServiceDiscoveryEventHandle);
-
-            context.ResponseData.Write(result == KernelResult.Success ? 1 : 0);
-
-            return ResultCode.Success;
-        }
-
-        [Command(33)] // 5.0.0+
-        // AcquireBleMtuConfigEvent() -> (byte<1>, handle<copy>)
-        public ResultCode AcquireBleMtuConfigEvent(ServiceCtx context)
-        {
-            KernelResult result = KernelResult.Success;
-
-            if (_bleMtuConfigEventHandle == 0)
-            {
-                _bleMtuConfigEvent = new KEvent(context.Device.System);
-
-                result = context.Process.HandleTable.GenerateHandle(_bleMtuConfigEvent.ReadableEvent, out _bleMtuConfigEventHandle);
-
-                if (result != KernelResult.Success)
-                {
-                    // NOTE: We use a Logging instead of an exception because the call return a boolean if succeed or not.
-                    Logger.PrintError(LogClass.ServiceBsd, "Out of handles!");
-                }
-            }
-
-            context.Response.HandleDesc = IpcHandleDesc.MakeCopy(_bleMtuConfigEventHandle);
-
-            context.ResponseData.Write(result == KernelResult.Success ? 1 : 0);
-
-            return ResultCode.Success;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Btm/IBtm.cs b/Ryujinx.HLE/HOS/Services/Btm/IBtm.cs
deleted file mode 100644
index 947fee14..00000000
--- a/Ryujinx.HLE/HOS/Services/Btm/IBtm.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Btm
-{
-    [Service("btm")]
-    class IBtm : IpcService
-    {
-        public IBtm(ServiceCtx context) { }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Btm/IBtmDebug.cs b/Ryujinx.HLE/HOS/Services/Btm/IBtmDebug.cs
deleted file mode 100644
index a55b7da8..00000000
--- a/Ryujinx.HLE/HOS/Services/Btm/IBtmDebug.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Btm
-{
-    [Service("btm:dbg")]
-    class IBtmDebug : IpcService
-    {
-        public IBtmDebug(ServiceCtx context) { }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Btm/IBtmSystem.cs b/Ryujinx.HLE/HOS/Services/Btm/IBtmSystem.cs
deleted file mode 100644
index 9120762c..00000000
--- a/Ryujinx.HLE/HOS/Services/Btm/IBtmSystem.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Btm
-{
-    [Service("btm:sys")]
-    class IBtmSystem : IpcService
-    {
-        public IBtmSystem(ServiceCtx context) { }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Btm/IBtmUser.cs b/Ryujinx.HLE/HOS/Services/Btm/IBtmUser.cs
deleted file mode 100644
index 68694187..00000000
--- a/Ryujinx.HLE/HOS/Services/Btm/IBtmUser.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Ryujinx.HLE.HOS.Services.Btm.BtmUser;
-
-namespace Ryujinx.HLE.HOS.Services.Btm
-{
-    [Service("btm:u")] // 5.0.0+
-    class IBtmUser : IpcService
-    {
-        public IBtmUser(ServiceCtx context) { }
-
-        [Command(0)] // 5.0.0+
-        // GetCore() -> object<nn::btm::IBtmUserCore>
-        public ResultCode GetCore(ServiceCtx context)
-        {
-            MakeObject(context, new IBtmUserCore());
-
-            return ResultCode.Success;
-        }
-    }
-}
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Btm/ResultCode.cs b/Ryujinx.HLE/HOS/Services/Btm/ResultCode.cs
deleted file mode 100644
index b222fdc8..00000000
--- a/Ryujinx.HLE/HOS/Services/Btm/ResultCode.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Ryujinx.HLE.HOS.Services.Btm
-{
-    enum ResultCode
-    {
-        ModuleId       = 143,
-        ErrorCodeShift = 9,
-
-        Success = 0
-    }
-}
\ No newline at end of file