Commit c406f649b3d2c76d4a13edb5dd5c6da48f564205
2016-11-10T18:53:50
Added USB VID/PID information to the SDL test programs
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
diff --git a/test/controllermap.c b/test/controllermap.c
index d626f9f..30d88ce 100644
--- a/test/controllermap.c
+++ b/test/controllermap.c
@@ -368,6 +368,7 @@ main(int argc, char *argv[])
SDL_Log(" buttons: %d\n", SDL_JoystickNumButtons(joystick));
SDL_Log("instance id: %d\n", SDL_JoystickInstanceID(joystick));
SDL_Log(" guid: %s\n", guid);
+ SDL_Log(" VID/PID: 0x%.4x/0x%.4x\n", SDL_JoystickGetVendor(joystick), SDL_JoystickGetProduct(joystick));
SDL_JoystickClose(joystick);
}
}
@@ -435,3 +436,5 @@ main(int argc, char *argv[])
}
#endif
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testgamecontroller.c b/test/testgamecontroller.c
index 38d2f77..34785d5 100644
--- a/test/testgamecontroller.c
+++ b/test/testgamecontroller.c
@@ -276,7 +276,9 @@ main(int argc, char *argv[])
name = SDL_JoystickNameForIndex(i);
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());
@@ -348,3 +350,5 @@ main(int argc, char *argv[])
}
#endif
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/test/testjoystick.c b/test/testjoystick.c
index bed2721..4821e2b 100644
--- a/test/testjoystick.c
+++ b/test/testjoystick.c
@@ -274,6 +274,7 @@ main(int argc, char *argv[])
SDL_Log(" buttons: %d\n", SDL_JoystickNumButtons(joystick));
SDL_Log("instance id: %d\n", SDL_JoystickInstanceID(joystick));
SDL_Log(" guid: %s\n", guid);
+ SDL_Log(" VID/PID: 0x%.4x/0x%.4x\n", SDL_JoystickGetVendor(joystick), SDL_JoystickGetProduct(joystick));
SDL_JoystickClose(joystick);
}
}
@@ -344,3 +345,5 @@ main(int argc, char *argv[])
}
#endif
+
+/* vi: set ts=4 sw=4 expandtab: */