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

btdrv-mitm: modify IsOfficialSwitchControllerName to take size argument

Browse source
This commit is contained in:
ndeadly 2020-09-08 16:20:54 +02:00
parent 80f63dfaf7
commit 1d92d9cabe
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
btdrv-mitm/source/controllers/controller_management.cpp
View file

@ -40,7 +40,7 @@ namespace ams::controller {
ControllerType Identify(const BluetoothDevicesSettings *device) {
if (IsOfficialSwitchControllerName(device->name))
if (IsOfficialSwitchControllerName(device->name, sizeof(device->name)))
return ControllerType_Switch;
for (auto hwId : WiiController::hardware_ids) {
@ -99,15 +99,15 @@ namespace ams::controller {
(((cod->cod[2] & 0x0f) == cod_minor_gamepad) || ((cod->cod[2] & 0x0f) == cod_minor_joystick));
}
bool IsOfficialSwitchControllerName(const char *name) {
return std::strncmp(name, "Joy-Con (L)", sizeof(BluetoothName)) == 0 ||
std::strncmp(name, "Joy-Con (R)", sizeof(BluetoothName)) == 0 ||
std::strncmp(name, "Pro Controller", sizeof(BluetoothName)) == 0 ||
std::strncmp(name, "Lic Pro Controller", sizeof(BluetoothName)) == 0 ||
std::strncmp(name, "NES Controller", sizeof(BluetoothName)) == 0 ||
std::strncmp(name, "HVC Controller", sizeof(BluetoothName)) == 0 ||
std::strncmp(name, "SNES Controller", sizeof(BluetoothName)) == 0 ||
std::strncmp(name, "NintendoGamepad", sizeof(BluetoothName)) == 0 ;
bool IsOfficialSwitchControllerName(const char *name, size_t size) {
return std::strncmp(name, "Joy-Con (L)", size) == 0 ||
std::strncmp(name, "Joy-Con (R)", size) == 0 ||
std::strncmp(name, "Pro Controller", size) == 0 ||
std::strncmp(name, "Lic Pro Controller", size) == 0 ||
std::strncmp(name, "NES Controller", size) == 0 ||
std::strncmp(name, "HVC Controller", size) == 0 ||
std::strncmp(name, "SNES Controller", size) == 0 ||
std::strncmp(name, "NintendoGamepad", size) == 0 ;
}
void AttachHandler(const bluetooth::Address *address) {

2
btdrv-mitm/source/controllers/controller_management.hpp
View file

@ -46,7 +46,7 @@ namespace ams::controller {
ControllerType Identify(const BluetoothDevicesSettings *device);
bool IsGamepad(const bluetooth::DeviceClass *cod);
bool IsOfficialSwitchControllerName(const char *name);
bool IsOfficialSwitchControllerName(const char *name, size_t size);
void AttachHandler(const bluetooth::Address *address);
void RemoveHandler(const bluetooth::Address *address);