Mirrors/MissionControl
2
0
Fork 0
mirror of https://github.com/ndeadly/MissionControl synced 2025-02-16 21:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

mc.mitm: fix crash when attempting to pair dualshock 3 controllers when pairing database is full

Browse source
This commit is contained in:
ndeadly 2023-04-24 22:28:24 +02:00
parent 7c7dffdf9a
commit 735ca4bc07
2 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mc_mitm/source/mcmitm_initialization.cpp
View file

@ -94,6 +94,11 @@ namespace ams::mitm {
while (R_FAILED(btmsysInitialize())) { while (R_FAILED(btmsysInitialize())) {
os::SleepThread(ams::TimeSpan::FromMilliSeconds(200)); os::SleepThread(ams::TimeSpan::FromMilliSeconds(200));
} }
// Loop until we can initialise btm
while (R_FAILED(btmInitialize())) {
os::SleepThread(ams::TimeSpan::FromMilliSeconds(200));
}
} }

32
mc_mitm/source/usb/mc_usb_handler.cpp
View file

@ -20,6 +20,23 @@ namespace ams::usb {
namespace { namespace {
Result GetOldestPairedDeviceAddress(bluetooth::Address *out_address) {
if (hos::GetVersion() >= hos::Version_13_0_0) {
s32 total_out;
BtmDeviceInfoV13 device_info[10];
R_TRY(btmGetDeviceInfo(BtmProfile_Hid, device_info, 10, &total_out));
*out_address = device_info[0].addr;
} else {
BtmDeviceInfoList device_info_list;
R_TRY(btmLegacyGetDeviceInfo(&device_info_list));
*out_address = device_info_list.devices[0].addr;
}
R_SUCCEED();
}
Result HandleUsbHsInterfaceAvailableEvent() { Result HandleUsbHsInterfaceAvailableEvent() {
s32 total_entries = 0; s32 total_entries = 0;
UsbHsInterface interfaces[8] = {}; UsbHsInterface interfaces[8] = {};
@ -30,6 +47,19 @@ namespace ams::usb {
bool pairing_started = false; bool pairing_started = false;
R_TRY(btmsysIsGamepadPairingStarted(&pairing_started)); R_TRY(btmsysIsGamepadPairingStarted(&pairing_started));
if (pairing_started) { if (pairing_started) {
// Make room for a new device if pairing database is full
u8 paired_count;
R_TRY(btmsysGetPairedGamepadCount(&paired_count));
if (paired_count >= 10) {
// Get the address of the least recently connected device in the pairing database
bluetooth::Address address;
R_TRY(GetOldestPairedDeviceAddress(&address));
// Remove the bonded address to make room for our new pairing
R_TRY(btdrvRemoveBond(address));
}
// Pair the Dualshock 3 controller via USB
R_TRY(controller::Dualshock3Controller::UsbPair(&interfaces[i])); R_TRY(controller::Dualshock3Controller::UsbPair(&interfaces[i]));
} }
} }
@ -39,7 +69,7 @@ namespace ams::usb {
} }
const s32 ThreadPriority = 9; const s32 ThreadPriority = 9;
const size_t ThreadStackSize = 0x2000; const size_t ThreadStackSize = 0x4000;
alignas(os::ThreadStackAlignment) u8 g_thread_stack[ThreadStackSize]; alignas(os::ThreadStackAlignment) u8 g_thread_stack[ThreadStackSize];
os::ThreadType g_thread; os::ThreadType g_thread;