mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-01 07:28:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the original manufacturer and product strings for the joystick CRC

Browse Source 
This allows the most information possible for the CRC string, which is used to differentiate controllers with the same VID/PID.

Fixes https://github.com/libsdl-org/SDL/issues/8724
This commit is contained in:
Sam Lantinga
2023-12-20 19:05:20 -08:00
parent 4bb5e1f0f9
commit 1f1ee6f77c
14 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/joystick/SDL_joystick.c
View File

@@ -2606,21 +2606,26 @@ char *SDL_CreateJoystickName(Uint16 vendor, Uint16 product, const char *vendor_n
return name;
}
SDL_JoystickGUID SDL_CreateJoystickGUID(Uint16 bus, Uint16 vendor, Uint16 product, Uint16 version, const char *name, Uint8 driver_signature, Uint8 driver_data)
SDL_JoystickGUID SDL_CreateJoystickGUID(Uint16 bus, Uint16 vendor, Uint16 product, Uint16 version, const char *vendor_name, const char *product_name, Uint8 driver_signature, Uint8 driver_data)
{
SDL_JoystickGUID guid;
Uint16 *guid16 = (Uint16 *)guid.data;
Uint16 crc = 0;
SDL_zero(guid);
if (!name) {
name = "";
if (vendor_name && *vendor_name && product_name && *product_name) {
SDL_crc16(crc, vendor_name, SDL_strlen(vendor_name));
SDL_crc16(crc, " ", 1);
SDL_crc16(crc, product_name, SDL_strlen(product_name));
} else if (product_name) {
SDL_crc16(crc, product_name, SDL_strlen(product_name));
}
/* We only need 16 bits for each of these; space them out to fill 128. */
/* Byteswap so devices get same GUID on little/big endian platforms. */
*guid16++ = SDL_SwapLE16(bus);
*guid16++ = SDL_SwapLE16(SDL_crc16(0, name, SDL_strlen(name)));
*guid16++ = SDL_SwapLE16(crc);
if (vendor && product) {
*guid16++ = SDL_SwapLE16(vendor);
@@ -2638,14 +2643,14 @@ SDL_JoystickGUID SDL_CreateJoystickGUID(Uint16 bus, Uint16 vendor, Uint16 produc
guid.data[14] = driver_signature;
guid.data[15] = driver_data;
}
SDL_strlcpy((char *)guid16, name, available_space);
SDL_strlcpy((char *)guid16, product_name, available_space);
}
return guid;
}
SDL_JoystickGUID SDL_CreateJoystickGUIDForName(const char *name)
{
return SDL_CreateJoystickGUID(SDL_HARDWARE_BUS_UNKNOWN, 0, 0, 0, name, 0, 0);
return SDL_CreateJoystickGUID(SDL_HARDWARE_BUS_UNKNOWN, 0, 0, 0, NULL, name, 0, 0);
}
void SDL_SetJoystickGUIDVendor(SDL_JoystickGUID *guid, Uint16 vendor)