diff options
| author | 2023-02-10 21:14:40 -0800 | |
|---|---|---|
| committer | 2023-02-10 21:14:40 -0800 | |
| commit | 023ac943aa0ed94836ca94bb33d49a2735275c3c (patch) | |
| tree | 26c5d15fc0816ed086191ecc626c53acbb4424d1 /src/input_common/helpers/joycon_driver.cpp | |
| parent | Merge pull request #9761 from Morph1984/oops (diff) | |
| parent | input_common: Reintroduce custom pro controller support (diff) | |
| download | yuzu-023ac943aa0ed94836ca94bb33d49a2735275c3c.tar.gz yuzu-023ac943aa0ed94836ca94bb33d49a2735275c3c.tar.xz yuzu-023ac943aa0ed94836ca94bb33d49a2735275c3c.zip | |
Merge pull request #9759 from german77/pro_controller
input_common: Reintroduce custom pro controller support
Diffstat (limited to 'src/input_common/helpers/joycon_driver.cpp')
| -rw-r--r-- | src/input_common/helpers/joycon_driver.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/input_common/helpers/joycon_driver.cpp b/src/input_common/helpers/joycon_driver.cpp index 8f94c9f45..e65b6b845 100644 --- a/src/input_common/helpers/joycon_driver.cpp +++ b/src/input_common/helpers/joycon_driver.cpp | |||
| @@ -543,9 +543,10 @@ void JoyconDriver::SetCallbacks(const JoyconCallbacks& callbacks) { | |||
| 543 | 543 | ||
| 544 | DriverResult JoyconDriver::GetDeviceType(SDL_hid_device_info* device_info, | 544 | DriverResult JoyconDriver::GetDeviceType(SDL_hid_device_info* device_info, |
| 545 | ControllerType& controller_type) { | 545 | ControllerType& controller_type) { |
| 546 | static constexpr std::array<std::pair<u32, ControllerType>, 2> supported_devices{ | 546 | static constexpr std::array<std::pair<u32, ControllerType>, 6> supported_devices{ |
| 547 | std::pair<u32, ControllerType>{0x2006, ControllerType::Left}, | 547 | std::pair<u32, ControllerType>{0x2006, ControllerType::Left}, |
| 548 | {0x2007, ControllerType::Right}, | 548 | {0x2007, ControllerType::Right}, |
| 549 | {0x2009, ControllerType::Pro}, | ||
| 549 | }; | 550 | }; |
| 550 | constexpr u16 nintendo_vendor_id = 0x057e; | 551 | constexpr u16 nintendo_vendor_id = 0x057e; |
| 551 | 552 | ||