encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added USB VID/PID information to the SDL test programs

This commit is contained in:
Sam Lantinga 2016-11-10 18:53:50 -08:00
parent 0cc6207c68
commit c406f649b3
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/controllermap.c
View File

@ -368,6 +368,7 @@ main(int argc, char *argv[])
SDL_Log(" buttons: %d\n", SDL_JoystickNumButtons(joystick)); SDL_Log(" buttons: %d\n", SDL_JoystickNumButtons(joystick));
SDL_Log("instance id: %d\n", SDL_JoystickInstanceID(joystick)); SDL_Log("instance id: %d\n", SDL_JoystickInstanceID(joystick));
SDL_Log(" guid: %s\n", guid); SDL_Log(" guid: %s\n", guid);
SDL_Log(" VID/PID: 0x%.4x/0x%.4x\n", SDL_JoystickGetVendor(joystick), SDL_JoystickGetProduct(joystick));
SDL_JoystickClose(joystick); SDL_JoystickClose(joystick);
} }
} }
@ -435,3 +436,5 @@ main(int argc, char *argv[])
} }
#endif #endif
/* vi: set ts=4 sw=4 expandtab: */

6
test/testgamecontroller.c
View File

@ -276,7 +276,9 @@ main(int argc, char *argv[])
name = SDL_JoystickNameForIndex(i); name = SDL_JoystickNameForIndex(i);
description = "Joystick"; description = "Joystick";
} }
SDL_Log("%s %d: %s (guid %s)\n", description, i, name ? name : "Unknown", guid); SDL_Log("%s %d: %s (guid %s, VID 0x%.4x, PID 0x%.4x)\n",
description, i, name ? name : "Unknown", guid,
SDL_JoystickGetDeviceVendor(i), SDL_JoystickGetDeviceProduct(i));
} }
SDL_Log("There are %d game controller(s) attached (%d joystick(s))\n", nController, SDL_NumJoysticks()); SDL_Log("There are %d game controller(s) attached (%d joystick(s))\n", nController, SDL_NumJoysticks());
@ -348,3 +350,5 @@ main(int argc, char *argv[])
} }
#endif #endif
/* vi: set ts=4 sw=4 expandtab: */

3
test/testjoystick.c
View File

@ -274,6 +274,7 @@ main(int argc, char *argv[])
SDL_Log(" buttons: %d\n", SDL_JoystickNumButtons(joystick)); SDL_Log(" buttons: %d\n", SDL_JoystickNumButtons(joystick));
SDL_Log("instance id: %d\n", SDL_JoystickInstanceID(joystick)); SDL_Log("instance id: %d\n", SDL_JoystickInstanceID(joystick));
SDL_Log(" guid: %s\n", guid); SDL_Log(" guid: %s\n", guid);
SDL_Log(" VID/PID: 0x%.4x/0x%.4x\n", SDL_JoystickGetVendor(joystick), SDL_JoystickGetProduct(joystick));
SDL_JoystickClose(joystick); SDL_JoystickClose(joystick);
} }
} }
@ -344,3 +345,5 @@ main(int argc, char *argv[])
} }
#endif #endif
/* vi: set ts=4 sw=4 expandtab: */