eden-emu/SDL
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow the product version to be different when trying to find a controller mapping

Browse source 
This is in the hope that revving the product version doesn't change the mapping, which is the case for some devices. In cases where it does, we just need to provide a mapping for each version of the product.
This commit is contained in:
Sam Lantinga 2022-08-28 23:01:30 -07:00
parent 761b9d1e49
commit 0b8b321f9e
3 changed files with 62 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/joystick/SDL_gamecontroller.c
View file

@ -685,6 +685,38 @@ static ControllerMapping_t *SDL_PrivateGetControllerMappingForGUID(SDL_JoystickG
}
}
if (!exact_match) {
/* Try again, ignoring the version */
Uint16 vendor, product;
SDL_GetJoystickGUIDInfo(guid, &vendor, &product, NULL, NULL);
if (vendor && product) {
SDL_JoystickGUID match_guid;
SDL_memcpy(&match_guid, &guid, sizeof(guid));
SDL_SetJoystickGUIDVersion(&match_guid, 0);
for (mapping = s_pSupportedControllers; mapping; mapping = mapping->next) {
SDL_JoystickGUID mapping_guid;
SDL_memcpy(&mapping_guid, &mapping->guid, sizeof(mapping_guid));
SDL_SetJoystickGUIDVersion(&mapping_guid, 0);
if (SDL_memcmp(&match_guid, &mapping_guid, sizeof(match_guid)) == 0) {
/* Check to see if the CRC matches */
const char *crc_string = SDL_strstr(mapping->mapping, "crc:");
if (crc_string) {
Uint16 mapping_crc = (Uint16)SDL_strtol(crc_string + 4, NULL, 16);
if (crc != mapping_crc) {
continue;
}
}
return mapping;
}
}
}
}
if (!exact_match) {
#if SDL_JOYSTICK_XINPUT
if (SDL_IsJoystickXInput(guid)) {