From c406f649b3d2c76d4a13edb5dd5c6da48f564205 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Thu, 10 Nov 2016 18:53:50 -0800
Subject: [PATCH] Added USB VID/PID information to the SDL test programs

---
 test/controllermap.c      | 3 +++
 test/testgamecontroller.c | 6 +++++-
 test/testjoystick.c       | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/test/controllermap.c b/test/controllermap.c
index d626f9f89a6b7..30d88ce55ce68 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 38d2f77084806..34785d5f96763 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 bed27212e11a0..4821e2b31eb1a 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: */