diff options
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_input_player.cpp | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 04b3a68c3..35dbf12df 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp | |||
| @@ -635,7 +635,7 @@ void Controller_NPad::OnMotionUpdate(const Core::Timing::CoreTiming& core_timing | |||
| 635 | // This buffer only is updated on handheld on HW | 635 | // This buffer only is updated on handheld on HW |
| 636 | npad.sixaxis_handheld_lifo.WriteNextEntry(sixaxis_handheld_state); | 636 | npad.sixaxis_handheld_lifo.WriteNextEntry(sixaxis_handheld_state); |
| 637 | } else { | 637 | } else { |
| 638 | // Hanheld doesn't update this buffer on HW | 638 | // Handheld doesn't update this buffer on HW |
| 639 | npad.sixaxis_fullkey_lifo.WriteNextEntry(sixaxis_fullkey_state); | 639 | npad.sixaxis_fullkey_lifo.WriteNextEntry(sixaxis_fullkey_state); |
| 640 | } | 640 | } |
| 641 | 641 | ||
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp index 16284d5a6..34099bc83 100644 --- a/src/yuzu/configuration/configure_input_player.cpp +++ b/src/yuzu/configuration/configure_input_player.cpp | |||
| @@ -246,15 +246,15 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i | |||
| 246 | if (player_index == 0) { | 246 | if (player_index == 0) { |
| 247 | auto* emulated_controller_p1 = | 247 | auto* emulated_controller_p1 = |
| 248 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1); | 248 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1); |
| 249 | auto* emulated_controller_hanheld = | 249 | auto* emulated_controller_handheld = |
| 250 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld); | 250 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld); |
| 251 | emulated_controller_p1->SaveCurrentConfig(); | 251 | emulated_controller_p1->SaveCurrentConfig(); |
| 252 | emulated_controller_p1->EnableConfiguration(); | 252 | emulated_controller_p1->EnableConfiguration(); |
| 253 | emulated_controller_hanheld->SaveCurrentConfig(); | 253 | emulated_controller_handheld->SaveCurrentConfig(); |
| 254 | emulated_controller_hanheld->EnableConfiguration(); | 254 | emulated_controller_handheld->EnableConfiguration(); |
| 255 | if (emulated_controller_hanheld->IsConnected(true)) { | 255 | if (emulated_controller_handheld->IsConnected(true)) { |
| 256 | emulated_controller_p1->Disconnect(); | 256 | emulated_controller_p1->Disconnect(); |
| 257 | emulated_controller = emulated_controller_hanheld; | 257 | emulated_controller = emulated_controller_handheld; |
| 258 | } else { | 258 | } else { |
| 259 | emulated_controller = emulated_controller_p1; | 259 | emulated_controller = emulated_controller_p1; |
| 260 | } | 260 | } |
| @@ -590,19 +590,19 @@ ConfigureInputPlayer::ConfigureInputPlayer(QWidget* parent, std::size_t player_i | |||
| 590 | if (player_index == 0) { | 590 | if (player_index == 0) { |
| 591 | auto* emulated_controller_p1 = | 591 | auto* emulated_controller_p1 = |
| 592 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1); | 592 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1); |
| 593 | auto* emulated_controller_hanheld = | 593 | auto* emulated_controller_handheld = |
| 594 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld); | 594 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld); |
| 595 | bool is_connected = emulated_controller->IsConnected(true); | 595 | bool is_connected = emulated_controller->IsConnected(true); |
| 596 | 596 | ||
| 597 | emulated_controller_p1->SetNpadStyleIndex(type); | 597 | emulated_controller_p1->SetNpadStyleIndex(type); |
| 598 | emulated_controller_hanheld->SetNpadStyleIndex(type); | 598 | emulated_controller_handheld->SetNpadStyleIndex(type); |
| 599 | if (is_connected) { | 599 | if (is_connected) { |
| 600 | if (type == Core::HID::NpadStyleIndex::Handheld) { | 600 | if (type == Core::HID::NpadStyleIndex::Handheld) { |
| 601 | emulated_controller_p1->Disconnect(); | 601 | emulated_controller_p1->Disconnect(); |
| 602 | emulated_controller_hanheld->Connect(); | 602 | emulated_controller_handheld->Connect(); |
| 603 | emulated_controller = emulated_controller_hanheld; | 603 | emulated_controller = emulated_controller_handheld; |
| 604 | } else { | 604 | } else { |
| 605 | emulated_controller_hanheld->Disconnect(); | 605 | emulated_controller_handheld->Disconnect(); |
| 606 | emulated_controller_p1->Connect(); | 606 | emulated_controller_p1->Connect(); |
| 607 | emulated_controller = emulated_controller_p1; | 607 | emulated_controller = emulated_controller_p1; |
| 608 | } | 608 | } |
| @@ -650,10 +650,10 @@ ConfigureInputPlayer::~ConfigureInputPlayer() { | |||
| 650 | if (player_index == 0) { | 650 | if (player_index == 0) { |
| 651 | auto* emulated_controller_p1 = | 651 | auto* emulated_controller_p1 = |
| 652 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1); | 652 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1); |
| 653 | auto* emulated_controller_hanheld = | 653 | auto* emulated_controller_handheld = |
| 654 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld); | 654 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld); |
| 655 | emulated_controller_p1->DisableConfiguration(); | 655 | emulated_controller_p1->DisableConfiguration(); |
| 656 | emulated_controller_hanheld->DisableConfiguration(); | 656 | emulated_controller_handheld->DisableConfiguration(); |
| 657 | } else { | 657 | } else { |
| 658 | emulated_controller->DisableConfiguration(); | 658 | emulated_controller->DisableConfiguration(); |
| 659 | } | 659 | } |
| @@ -663,14 +663,14 @@ void ConfigureInputPlayer::ApplyConfiguration() { | |||
| 663 | if (player_index == 0) { | 663 | if (player_index == 0) { |
| 664 | auto* emulated_controller_p1 = | 664 | auto* emulated_controller_p1 = |
| 665 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1); | 665 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Player1); |
| 666 | auto* emulated_controller_hanheld = | 666 | auto* emulated_controller_handheld = |
| 667 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld); | 667 | hid_core.GetEmulatedController(Core::HID::NpadIdType::Handheld); |
| 668 | emulated_controller_p1->DisableConfiguration(); | 668 | emulated_controller_p1->DisableConfiguration(); |
| 669 | emulated_controller_p1->SaveCurrentConfig(); | 669 | emulated_controller_p1->SaveCurrentConfig(); |
| 670 | emulated_controller_p1->EnableConfiguration(); | 670 | emulated_controller_p1->EnableConfiguration(); |
| 671 | emulated_controller_hanheld->DisableConfiguration(); | 671 | emulated_controller_handheld->DisableConfiguration(); |
| 672 | emulated_controller_hanheld->SaveCurrentConfig(); | 672 | emulated_controller_handheld->SaveCurrentConfig(); |
| 673 | emulated_controller_hanheld->EnableConfiguration(); | 673 | emulated_controller_handheld->EnableConfiguration(); |
| 674 | return; | 674 | return; |
| 675 | } | 675 | } |
| 676 | emulated_controller->DisableConfiguration(); | 676 | emulated_controller->DisableConfiguration(); |