diff options
| author | 2023-02-09 19:59:12 -0600 | |
|---|---|---|
| committer | 2023-02-09 20:08:54 -0600 | |
| commit | acba9a6b769f96a35e02669d87ce7b19fc47b025 (patch) | |
| tree | 7ebd5f331962f67ad037b086c5550c69c6dcaf64 /src/input_common/helpers/joycon_driver.cpp | |
| parent | Merge pull request #9749 from ameerj/pr9559-partial-revert (diff) | |
| download | yuzu-acba9a6b769f96a35e02669d87ce7b19fc47b025.tar.gz yuzu-acba9a6b769f96a35e02669d87ce7b19fc47b025.tar.xz yuzu-acba9a6b769f96a35e02669d87ce7b19fc47b025.zip | |
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 | ||