geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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.
main
Sam Lantinga 2022-08-28 23:01:30 -07:00
parent 761b9d1e49
commit 0b8b321f9e
3 changed files with 62 additions and 0 deletions
Show Stats 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)) {

21
src/joystick/SDL_joystick.c
View File

@ -2017,6 +2017,27 @@ SDL_CreateJoystickGUIDForName(const char *name)
return SDL_CreateJoystickGUID(SDL_HARDWARE_BUS_UNKNOWN, 0, 0, 0, name, 0, 0);
}
void SDL_SetJoystickGUIDVendor(SDL_JoystickGUID *guid, Uint16 vendor)
{
Uint16 *guid16 = (Uint16 *)guid->data;
guid16[2] = SDL_SwapLE16(vendor);
}
void SDL_SetJoystickGUIDProduct(SDL_JoystickGUID *guid, Uint16 product)
{
Uint16 *guid16 = (Uint16 *)guid->data;
guid16[4] = SDL_SwapLE16(product);
}
void SDL_SetJoystickGUIDVersion(SDL_JoystickGUID *guid, Uint16 version)
{
Uint16 *guid16 = (Uint16 *)guid->data;
guid16[6] = SDL_SwapLE16(version);
}
void
SDL_SetJoystickGUIDCRC(SDL_JoystickGUID *guid, Uint16 crc)
{

9
src/joystick/SDL_joystick_c.h
View File

@ -65,6 +65,15 @@ extern SDL_JoystickGUID SDL_CreateJoystickGUID(Uint16 bus, Uint16 vendor, Uint16
/* Function to create a GUID for a joystick based on the name, with no VID/PID information */
extern SDL_JoystickGUID SDL_CreateJoystickGUIDForName(const char *name);
/* Function to set the vendor field of a joystick GUID */
extern void SDL_SetJoystickGUIDVendor(SDL_JoystickGUID *guid, Uint16 vendor);
/* Function to set the product field of a joystick GUID */
extern void SDL_SetJoystickGUIDProduct(SDL_JoystickGUID *guid, Uint16 product);
/* Function to set the version field of a joystick GUID */
extern void SDL_SetJoystickGUIDVersion(SDL_JoystickGUID *guid, Uint16 version);
/* Function to set the CRC field of a joystick GUID */
extern void SDL_SetJoystickGUIDCRC(SDL_JoystickGUID *guid, Uint16 crc);