diff options
Diffstat (limited to 'Source/Core/UICommon/USBUtils.cpp')
| -rw-r--r-- | Source/Core/UICommon/USBUtils.cpp | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/Source/Core/UICommon/USBUtils.cpp b/Source/Core/UICommon/USBUtils.cpp index 2264afe82c..42c4bd93fd 100644 --- a/Source/Core/UICommon/USBUtils.cpp +++ b/Source/Core/UICommon/USBUtils.cpp @@ -17,20 +17,33 @@ // Because opening and getting the device name from devices is slow, especially on Windows // with usbdk, we cannot do that for every single device. We should however still show // device names for known Wii peripherals. -static const std::map<std::pair<u16, u16>, std::string_view> s_wii_peripherals{{ +static const std::map<std::pair<u16, u16>, std::string_view> s_known_peripherals{{ {{0x046d, 0x0a03}, "Logitech Microphone"}, {{0x057e, 0x0308}, "Wii Speak"}, {{0x057e, 0x0309}, "Nintendo USB Microphone"}, {{0x057e, 0x030a}, "Ubisoft Motion Tracking Camera"}, {{0x0e6f, 0x0129}, "Disney Infinity Reader (Portal Device)"}, + {{0x12ba, 0x0200}, "Harmonix Guitar for PlayStation 3"}, + {{0x12ba, 0x0210}, "Harmonix Drum Kit for PlayStation 3"}, + {{0x12ba, 0x0218}, "Harmonix Drum Kit for PlayStation 3"}, + {{0x12ba, 0x2330}, "Harmonix RB3 Keyboard for PlayStation 3"}, + {{0x12ba, 0x2338}, "Harmonix RB3 MIDI Keyboard Interface for PlayStation 3"}, + {{0x12ba, 0x2430}, "Harmonix RB3 Mustang Guitar for PlayStation 3"}, + {{0x12ba, 0x2438}, "Harmonix RB3 MIDI Guitar Interface for PlayStation 3"}, + {{0x12ba, 0x2530}, "Harmonix RB3 Squier Guitar for PlayStation 3"}, + {{0x12ba, 0x2538}, "Harmonix RB3 MIDI Guitar Interface for PlayStation 3"}, {{0x1430, 0x0100}, "Tony Hawk Ride Skateboard"}, {{0x1430, 0x0150}, "Skylanders Portal"}, - {{0x1bad, 0x0004}, "Harmonix Guitar Controller"}, - {{0x1bad, 0x3110}, "Rock Band Drum Set"}, + {{0x1bad, 0x0004}, "Harmonix Guitar Controller for Nintendo Wii"}, + {{0x1bad, 0x0005}, "Harmonix Drum Controller for Nintendo Wii"}, + {{0x1bad, 0x3010}, "Harmonix Guitar Controller for Nintendo Wii"}, + {{0x1bad, 0x3110}, "Harmonix Drum Controller for Nintendo Wii"}, {{0x1bad, 0x3138}, "Harmonix Drum Controller for Nintendo Wii"}, {{0x1bad, 0x3330}, "Harmonix RB3 Keyboard for Nintendo Wii"}, {{0x1bad, 0x3338}, "Harmonix RB3 MIDI Keyboard Interface for Nintendo Wii"}, {{0x1bad, 0x3430}, "Harmonix RB3 Mustang Guitar for Nintendo Wii"}, + {{0x1bad, 0x3438}, "Harmonix RB3 MIDI Guitar Interface for Nintendo Wii"}, + {{0x1bad, 0x3530}, "Harmonix RB3 Squier Guitar for Nintendo Wii"}, {{0x1bad, 0x3538}, "Harmonix RB3 MIDI Guitar Interface for Nintendo Wii"}, {{0x21a4, 0xac40}, "EA Active NFL"}, }}; @@ -62,8 +75,9 @@ std::map<std::pair<u16, u16>, std::string> GetInsertedDevices() std::string GetDeviceName(const std::pair<u16, u16> vid_pid) { - const auto iter = s_wii_peripherals.find(vid_pid); - const std::string_view device_name = iter == s_wii_peripherals.cend() ? "Unknown" : iter->second; + const auto iter = s_known_peripherals.find(vid_pid); + const std::string_view device_name = + iter == s_known_peripherals.cend() ? "Unknown" : iter->second; return fmt::format("{:04x}:{:04x} - {}", vid_pid.first, vid_pid.second, device_name); } } // namespace USBUtils |
