emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

bluetooth: Fix event handle in IBluetoothDriver (#1464)

Browse source 
This fix the InitializeBluetoothLe call who didn't return any event handle
This commit is contained in:
Ac_K 2020-08-13 01:04:59 +02:00 committed by GitHub
parent 58f65b6523
commit 1ad9045c6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Ryujinx.HLE/HOS/Services/Bluetooth/IBluetoothDriver.cs
View file

@ -1,4 +1,5 @@
using Ryujinx.HLE.HOS.Kernel.Common; using Ryujinx.HLE.HOS.Ipc;
using Ryujinx.HLE.HOS.Kernel.Common;
using Ryujinx.HLE.HOS.Kernel.Threading; using Ryujinx.HLE.HOS.Kernel.Threading;
using Ryujinx.HLE.HOS.Services.Bluetooth.BluetoothDriver; using Ryujinx.HLE.HOS.Services.Bluetooth.BluetoothDriver;
using Ryujinx.HLE.HOS.Services.Settings; using Ryujinx.HLE.HOS.Services.Settings;
@ -21,6 +22,8 @@ namespace Ryujinx.HLE.HOS.Services.Bluetooth
{ {
NxSettings.Settings.TryGetValue("bluetooth_debug!skip_boot", out object debugMode); NxSettings.Settings.TryGetValue("bluetooth_debug!skip_boot", out object debugMode);
int initializeEventHandle;
if ((bool)debugMode) if ((bool)debugMode)
{ {
if (BluetoothEventManager.InitializeBleDebugEventHandle == 0) if (BluetoothEventManager.InitializeBleDebugEventHandle == 0)
@ -52,6 +55,8 @@ namespace Ryujinx.HLE.HOS.Services.Bluetooth
throw new InvalidOperationException("Out of handles!"); throw new InvalidOperationException("Out of handles!");
} }
} }
initializeEventHandle = BluetoothEventManager.InitializeBleDebugEventHandle;
} }
else else
{ {
@ -86,8 +91,12 @@ namespace Ryujinx.HLE.HOS.Services.Bluetooth
throw new InvalidOperationException("Out of handles!"); throw new InvalidOperationException("Out of handles!");
} }
} }
initializeEventHandle = BluetoothEventManager.InitializeBleEventHandle;
} }
context.Response.HandleDesc = IpcHandleDesc.MakeCopy(initializeEventHandle);
return ResultCode.Success; return ResultCode.Success;
} }
} }