OpenEmu/OpenEmu-SDK
1
0
Fork 0
mirror of https://github.com/OpenEmu/OpenEmu-SDK.git synced 2025-11-01 10:15:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not remove the wrong device handler when re-connecting a switch pro controller via bluetooth after removing the USB cable.

Browse Source
This commit is contained in:
Daniele Cattaneo
2019-09-12 21:26:46 +02:00
parent 5c15314e24
commit bebee4746d
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenEmuSystem/OESwitchProControllerHIDDeviceHandler.m
+6 -20
View File
@@ -291,7 +291,7 @@ static OEHACProControllerStickCalibration OEHACConvertCalibration(
+ (OESwitchProControllerHIDDeviceParser *)sharedInstance;
+ (NSUInteger)_cookieFromUsage:(NSUInteger)usage;
- (BOOL)registerDeviceHandler:(OESwitchProControllerHIDDeviceHandler *)dh;
- (void)registerDeviceHandler:(OESwitchProControllerHIDDeviceHandler *)dh;
@end
@@ -372,9 +372,7 @@ static OEHACProControllerStickCalibration OEHACConvertCalibration(
_internalSerialNumber = [NSData dataWithBytes:status->btMacAddress length:6];
}
BOOL notDuplicated = [[OESwitchProControllerHIDDeviceParser sharedInstance] registerDeviceHandler:self];
if (notDuplicated == NO)
return NO;
[[OESwitchProControllerHIDDeviceParser sharedInstance] registerDeviceHandler:self];
[self _setPlayerLights:0x0F];
[self _requestCalibrationData];
@@ -936,7 +934,7 @@ static void OEHACProControllerHIDReportCallback(
}
- (BOOL)registerDeviceHandler:(OESwitchProControllerHIDDeviceHandler *)dh
- (void)registerDeviceHandler:(OESwitchProControllerHIDDeviceHandler *)dh
{
/* When connecting a Switch Pro Controller via USB, if that same controller
* was already connected via BlueTooth, it can happen that for a brief instant
@@ -954,24 +952,12 @@ static void OEHACProControllerHIDReportCallback(
if (![devm.deviceHandlers containsObject:existing]) {
/* Device is not connected in any other way */
[_serialToHandler setObject:dh forKey:serial];
return YES;
return;
}
if (dh.isUSB && !existing.isUSB) {
/* Remove existing BT device handler */
[[OEDeviceManager sharedDeviceManager] OE_removeDeviceHandler:existing];
[_serialToHandler setObject:dh forKey:serial];
return YES;
}
if (existing.isUSB)
/* Don't connect via BT if we're already connected via USB */
return NO;
/* Should be unreachable; connection method of old and new handlers
* is the same. Keep the most recent handler. */
NSLog(@"Switch Pro Controller %@ is connected both via bluetooth and USB; removing least recent connection", serial);
[[OEDeviceManager sharedDeviceManager] OE_removeDeviceHandler:existing];
[_serialToHandler setObject:dh forKey:serial];
return YES;
}