VERY experimental Nintendo Switch 2 emulator
C++
[npad,hid,am] npad WriteEmptyEntry fix, hid function 551 stub, and applet PopOutData rework (#4442)
xbzk07f40d5cac63
diff --git a/src/core/hle/service/am/lifecycle_manager.h b/src/core/hle/service/am/lifecycle_manager.hindex ae041d3e29..15657a36d8 100644--- a/src/core/hle/service/am/lifecycle_manager.h+++ b/src/core/hle/service/am/lifecycle_manager.h@@ -92,6 +92,13 @@ public:}}+ void RequestFocusStateChangedNotification(Kernel::KernelCore& kernel) {+ if (m_focus_state_changed_notification_enabled) {+ m_has_focus_state_changed = true;+ this->SignalSystemEventIfNeeded(kernel);+ }+ }+void OnOperationAndPerformanceModeChanged(Kernel::KernelCore& kernel);public:diff --git a/src/core/hle/service/am/service/library_applet_accessor.cpp b/src/core/hle/service/am/service/library_applet_accessor.cppindex c49b1f3f05..849e5794cf 100644--- a/src/core/hle/service/am/service/library_applet_accessor.cpp+++ b/src/core/hle/service/am/service/library_applet_accessor.cpp@@ -164,15 +164,15 @@ Result ILibraryAppletAccessor::PushInData(SharedPointer<IStorage> storage) {Result ILibraryAppletAccessor::PopOutData(Out<SharedPointer<IStorage>> out_storage) {LOG_DEBUG(Service_AM, "called");+ R_TRY(m_broker->GetOutData().Pop(system.Kernel(), out_storage.Get()));if (auto caller_applet = m_applet->caller_applet.lock(); caller_applet) {- caller_applet->lifecycle_manager.GetSystemEvent().Signal(system.Kernel());- caller_applet->lifecycle_manager.RequestResumeNotification();- caller_applet->lifecycle_manager.GetSystemEvent().Clear(system.Kernel());- caller_applet->lifecycle_manager.UpdateRequestedFocusState();+ std::scoped_lock lk{caller_applet->lock};+ const bool focus_state_changed = caller_applet->lifecycle_manager.UpdateRequestedFocusState();+ const bool is_front_app = m_applet->frontend && caller_applet->lifecycle_manager.IsApplication();+ if (focus_state_changed) caller_applet->lifecycle_manager.SignalSystemEventIfNeeded(system.Kernel());+ else if (is_front_app) caller_applet->lifecycle_manager.RequestFocusStateChangedNotification(system.Kernel());}- R_TRY(m_broker->GetOutData().Pop(system.Kernel(), out_storage.Get()));-if (m_applet->applet_id == AppletId::ProfileSelect && *out_storage) {auto impl = (*out_storage)->GetImpl();diff --git a/src/core/hle/service/hid/hid_system_server.cpp b/src/core/hle/service/hid/hid_system_server.cppindex f3c01b5d89..e544adf03c 100644--- a/src/core/hle/service/hid/hid_system_server.cpp+++ b/src/core/hle/service/hid/hid_system_server.cpp@@ -121,7 +121,7 @@ IHidSystemServer::IHidSystemServer(Core::System& system_, std::shared_ptr<Resour{547, nullptr, "GetAllowedBluetoothLinksCount"},{548, &IHidSystemServer::GetRegisteredDevices, "GetRegisteredDevices"},{549, nullptr, "GetConnectableRegisteredDevices"},- {551, nullptr, "GetRegisteredDevicesForControllerSupport"}, //20.0.0++ {551, &IHidSystemServer::GetRegisteredDevices, "GetRegisteredDevicesForControllerSupport"}, //20.0.0+ //mocked via 548 for Diablo 3 (at least){700, nullptr, "ActivateUniquePad"},{702, &IHidSystemServer::AcquireUniquePadConnectionEventHandle, "AcquireUniquePadConnectionEventHandle"},{703, &IHidSystemServer::GetUniquePadIds, "GetUniquePadIds"},@@ -758,7 +758,7 @@ void IHidSystemServer::AcquireDeviceRegisteredEventForControllerSupport(HLEReque}void IHidSystemServer::GetRegisteredDevices(HLERequestContext& ctx) {- LOG_WARNING(Service_HID, "(STUBBED) called");+ LOG_WARNING(Service_HID, "(STUBBED) called, command={}", ctx.GetCommand()); //548 or 551struct RegisterData {std::array<u8, 0x68> data;diff --git a/src/hid_core/resources/npad/npad.cpp b/src/hid_core/resources/npad/npad.cppindex e7a1ee2bf3..c67f839df1 100644--- a/src/hid_core/resources/npad/npad.cpp+++ b/src/hid_core/resources/npad/npad.cpp@@ -398,21 +398,21 @@ void NPad::InitNewlyAddedController(Kernel::KernelCore& kernel, u64 aruid, Core:void NPad::WriteEmptyEntry(NpadInternalState* npad) {NPadGenericState dummy_pad_state{};NpadGcTriggerState dummy_gc_state{};- dummy_pad_state.sampling_number = npad->fullkey_lifo.ReadCurrentEntry().sampling_number + 1;+ dummy_pad_state.sampling_number = npad->fullkey_lifo.ReadCurrentEntry().state.sampling_number + 1;npad->fullkey_lifo.WriteNextEntry(dummy_pad_state);- dummy_pad_state.sampling_number = npad->handheld_lifo.ReadCurrentEntry().sampling_number + 1;+ dummy_pad_state.sampling_number = npad->handheld_lifo.ReadCurrentEntry().state.sampling_number + 1;npad->handheld_lifo.WriteNextEntry(dummy_pad_state);- dummy_pad_state.sampling_number = npad->joy_dual_lifo.ReadCurrentEntry().sampling_number + 1;+ dummy_pad_state.sampling_number = npad->joy_dual_lifo.ReadCurrentEntry().state.sampling_number + 1;npad->joy_dual_lifo.WriteNextEntry(dummy_pad_state);- dummy_pad_state.sampling_number = npad->joy_left_lifo.ReadCurrentEntry().sampling_number + 1;+ dummy_pad_state.sampling_number = npad->joy_left_lifo.ReadCurrentEntry().state.sampling_number + 1;npad->joy_left_lifo.WriteNextEntry(dummy_pad_state);- dummy_pad_state.sampling_number = npad->joy_right_lifo.ReadCurrentEntry().sampling_number + 1;+ dummy_pad_state.sampling_number = npad->joy_right_lifo.ReadCurrentEntry().state.sampling_number + 1;npad->joy_right_lifo.WriteNextEntry(dummy_pad_state);- dummy_pad_state.sampling_number = npad->palma_lifo.ReadCurrentEntry().sampling_number + 1;+ dummy_pad_state.sampling_number = npad->palma_lifo.ReadCurrentEntry().state.sampling_number + 1;npad->palma_lifo.WriteNextEntry(dummy_pad_state);- dummy_pad_state.sampling_number = npad->system_ext_lifo.ReadCurrentEntry().sampling_number + 1;+ dummy_pad_state.sampling_number = npad->system_ext_lifo.ReadCurrentEntry().state.sampling_number + 1;npad->system_ext_lifo.WriteNextEntry(dummy_pad_state);- dummy_gc_state.sampling_number = npad->gc_trigger_lifo.ReadCurrentEntry().sampling_number + 1;+ dummy_gc_state.sampling_number = npad->gc_trigger_lifo.ReadCurrentEntry().state.sampling_number + 1;npad->gc_trigger_lifo.WriteNextEntry(dummy_gc_state);}