VERY experimental Nintendo Switch 2 emulator
C++
hid: service: Implement Last active Npad
german77d6aef45e6d7f
diff --git a/src/core/hid/hid_core.cpp b/src/core/hid/hid_core.cppindex 7d63734144..cf53c04d9a 100644--- a/src/core/hid/hid_core.cpp+++ b/src/core/hid/hid_core.cpp@@ -154,6 +154,14 @@ NpadIdType HIDCore::GetFirstDisconnectedNpadId() const {return NpadIdType::Player1;}+void HIDCore::SetLastActiveController(NpadIdType npad_id) {+ last_active_controller = npad_id;+}++NpadIdType HIDCore::GetLastActiveController() const {+ return last_active_controller;+}+void HIDCore::EnableAllControllerConfiguration() {player_1->EnableConfiguration();player_2->EnableConfiguration();diff --git a/src/core/hid/hid_core.h b/src/core/hid/hid_core.hindex 5fe36551ea..80abab18bb 100644--- a/src/core/hid/hid_core.h+++ b/src/core/hid/hid_core.h@@ -48,6 +48,12 @@ public:/// Returns the first disconnected npad idNpadIdType GetFirstDisconnectedNpadId() const;+ /// Sets the npad id of the last active controller+ void SetLastActiveController(NpadIdType npad_id);++ /// Returns the npad id of the last controller that pushed a button+ NpadIdType GetLastActiveController() const;+/// Sets all emulated controllers into configuring mode.void EnableAllControllerConfiguration();@@ -77,6 +83,7 @@ private:std::unique_ptr<EmulatedConsole> console;std::unique_ptr<EmulatedDevices> devices;NpadStyleTag supported_style_tag{NpadStyleSet::All};+ NpadIdType last_active_controller{NpadIdType::Handheld};};} // namespace Core::HIDdiff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cppindex a894af8ea5..da3220ddcc 100644--- a/src/core/hle/service/hid/controllers/npad.cpp+++ b/src/core/hle/service/hid/controllers/npad.cpp@@ -476,6 +476,10 @@ void Controller_NPad::RequestPadStateUpdate(Core::HID::NpadIdType npad_id) {pad_entry.npad_buttons.l.Assign(button_state.zl);pad_entry.npad_buttons.r.Assign(button_state.zr);}++ if (pad_entry.npad_buttons.raw != Core::HID::NpadButton::None) {+ hid_core.SetLastActiveController(npad_id);+ }}void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing) {diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cppindex fd466db7b4..3657e61d35 100644--- a/src/core/hle/service/hid/hid.cpp+++ b/src/core/hle/service/hid/hid.cpp@@ -2768,7 +2768,7 @@ private:IPC::ResponseBuilder rb{ctx, 3};rb.Push(ResultSuccess);- rb.PushEnum(Core::HID::NpadIdType::Handheld);+ rb.PushEnum(system.HIDCore().GetLastActiveController());}void GetUniquePadsFromNpad(HLERequestContext& ctx) {