eden-emu/SDL
15
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-05-21 20:28:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Standardized the format of the SDL joystick GUID and added functions to retrieve the USB VID/PID from a joystick and game controller.

Browse source
This commit is contained in:
Sam Lantinga 2016-11-10 17:19:34 -08:00
parent 2898ada338
commit ac74e16cde
13 changed files with 294 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

89
src/joystick/SDL_joystick.c
View file

@ -816,6 +816,41 @@ SDL_JoystickEventState(int state)
#endif /* SDL_EVENTS_DISABLED */
}
static void GetJoystickGUIDInfo(SDL_JoystickGUID guid, Uint16 *vendor, Uint16 *product, Uint16 *version)
{
Uint16 *guid16 = (Uint16 *)guid.data;
/* If the GUID fits the form of BUS 0000 VENDOR 0000 PRODUCT 0000, return the data */
if (/* guid16[0] is device bus type */
guid16[1] == 0x00 &&
/* guid16[2] is vendor ID */
guid16[3] == 0x00 &&
/* guid16[4] is product ID */
guid16[5] == 0x00
/* guid16[6] is product version */
) {
if (vendor) {
*vendor = guid16[2];
}
if (product) {
*product = guid16[4];
}
if (version) {
*version = guid16[6];
}
} else {
if (vendor) {
*vendor = 0;
}
if (product) {
*product = 0;
}
if (version) {
*version = 0;
}
}
}
/* return the guid for this index */
SDL_JoystickGUID SDL_JoystickGetDeviceGUID(int device_index)
{
@ -828,6 +863,33 @@ SDL_JoystickGUID SDL_JoystickGetDeviceGUID(int device_index)
return SDL_SYS_JoystickGetDeviceGUID(device_index);
}
Uint16 SDL_JoystickGetDeviceVendor(int device_index)
{
Uint16 vendor;
SDL_JoystickGUID guid = SDL_JoystickGetDeviceGUID(device_index);
GetJoystickGUIDInfo(guid, &vendor, NULL, NULL);
return vendor;
}
Uint16 SDL_JoystickGetDeviceProduct(int device_index)
{
Uint16 product;
SDL_JoystickGUID guid = SDL_JoystickGetDeviceGUID(device_index);
GetJoystickGUIDInfo(guid, NULL, &product, NULL);
return product;
}
Uint16 SDL_JoystickGetDeviceProductVersion(int device_index)
{
Uint16 version;
SDL_JoystickGUID guid = SDL_JoystickGetDeviceGUID(device_index);
GetJoystickGUIDInfo(guid, NULL, NULL, &version);
return version;
}
/* return the guid for this opened device */
SDL_JoystickGUID SDL_JoystickGetGUID(SDL_Joystick * joystick)
{
@ -839,6 +901,33 @@ SDL_JoystickGUID SDL_JoystickGetGUID(SDL_Joystick * joystick)
return SDL_SYS_JoystickGetGUID(joystick);
}
Uint16 SDL_JoystickGetVendor(SDL_Joystick * joystick)
{
Uint16 vendor;
SDL_JoystickGUID guid = SDL_JoystickGetGUID(joystick);
GetJoystickGUIDInfo(guid, &vendor, NULL, NULL);
return vendor;
}
Uint16 SDL_JoystickGetProduct(SDL_Joystick * joystick)
{
Uint16 product;
SDL_JoystickGUID guid = SDL_JoystickGetGUID(joystick);
GetJoystickGUIDInfo(guid, NULL, &product, NULL);
return product;
}
Uint16 SDL_JoystickGetProductVersion(SDL_Joystick * joystick)
{
Uint16 version;
SDL_JoystickGUID guid = SDL_JoystickGetGUID(joystick);
GetJoystickGUIDInfo(guid, NULL, NULL, &version);
return version;
}
/* convert the guid to a printable string */
void SDL_JoystickGetGUIDString(SDL_JoystickGUID guid, char *pszGUID, int cbGUID)
{