restore stupid lock, make ps4sup library

This commit is contained in:
lizzie
2026-01-22 19:13:56 +00:00
parent ae02326341
commit 9fa8494d2a
21 changed files with 71 additions and 43 deletions
@@ -286,7 +286,7 @@ void AbstractPad::Update() {
interface_type = properties_handler.GetInterfaceType();
//std::scoped_lock lock{*applet_resource_holder->shared_mutex};
std::scoped_lock lock{*applet_resource_holder->shared_mutex};
properties_handler.UpdateAllDeviceProperties();
battery_handler.UpdateCoreBatteryState();
button_handler.UpdateCoreBatteryState();
@@ -26,7 +26,7 @@ void DebugPad::OnInit() {}
void DebugPad::OnRelease() {}
void DebugPad::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
//std::scoped_lock shared_lock{*shared_mutex};
std::scoped_lock shared_lock{*shared_mutex};
const u64 aruid = applet_resource->GetActiveAruid();
auto* data = applet_resource->GetAruidData(aruid);
@@ -20,7 +20,7 @@ void Digitizer::OnInit() {}
void Digitizer::OnRelease() {}
void Digitizer::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
//std::scoped_lock shared_lock{*shared_mutex};
std::scoped_lock shared_lock{*shared_mutex};
const u64 aruid = applet_resource->GetActiveAruid();
auto* data = applet_resource->GetAruidData(aruid);
+1 -1
View File
@@ -25,7 +25,7 @@ void Keyboard::OnInit() {}
void Keyboard::OnRelease() {}
void Keyboard::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
//std::scoped_lock shared_lock{*shared_mutex};
std::scoped_lock shared_lock{*shared_mutex};
const u64 aruid = applet_resource->GetActiveAruid();
auto* data = applet_resource->GetAruidData(aruid);
+1 -1
View File
@@ -24,7 +24,7 @@ void DebugMouse::OnInit() {}
void DebugMouse::OnRelease() {}
void DebugMouse::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
//std::scoped_lock shared_lock{*shared_mutex};
std::scoped_lock shared_lock{*shared_mutex};
const u64 aruid = applet_resource->GetActiveAruid();
auto* data = applet_resource->GetAruidData(aruid);
+1 -1
View File
@@ -24,7 +24,7 @@ void Mouse::OnInit() {}
void Mouse::OnRelease() {}
void Mouse::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
//std::scoped_lock shared_lock{*shared_mutex};
std::scoped_lock shared_lock{*shared_mutex};
const u64 aruid = applet_resource->GetActiveAruid();
auto* data = applet_resource->GetAruidData(aruid);
+5 -5
View File
@@ -77,7 +77,7 @@ Result NPad::Activate() {
Result NPad::Activate(u64 aruid) {
std::scoped_lock lock{mutex};
//std::scoped_lock shared_lock{*applet_resource_holder.shared_mutex};
std::scoped_lock shared_lock{*applet_resource_holder.shared_mutex};
auto* data = applet_resource_holder.applet_resource->GetAruidData(aruid);
auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
@@ -417,7 +417,7 @@ void NPad::WriteEmptyEntry(NpadInternalState* npad) {
}
void NPad::RequestPadStateUpdate(Kernel::KernelCore& kernel, u64 aruid, Core::HID::NpadIdType npad_id) {
//std::scoped_lock lock{*applet_resource_holder.shared_mutex};
std::scoped_lock lock{*applet_resource_holder.shared_mutex};
auto& controller = GetControllerFromNpadIdType(aruid, npad_id);
const auto controller_type = controller.device->GetNpadStyleIndex();
@@ -490,7 +490,7 @@ void NPad::OnUpdate(Kernel::KernelCore& kernel, const Core::Timing::CoreTiming&
return;
}
//std::scoped_lock lock{*applet_resource_holder.shared_mutex};
std::scoped_lock lock{*applet_resource_holder.shared_mutex};
for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; ++aruid_index) {
const auto* data = applet_resource_holder.applet_resource->GetAruidDataByIndex(aruid_index);
@@ -1255,7 +1255,7 @@ Result NPad::SetNpadSystemExtStateEnabled(u64 aruid, bool is_enabled) {
const auto result = npad_resource.SetNpadSystemExtStateEnabled(aruid, is_enabled);
if (result.IsSuccess()) {
//std::scoped_lock shared_lock{*applet_resource_holder.shared_mutex};
std::scoped_lock shared_lock{*applet_resource_holder.shared_mutex};
// TODO: abstracted_pad->EnableAppletToGetInput(aruid);
}
@@ -1373,7 +1373,7 @@ void NPad::UpdateHandheldAbstractState() {
void NPad::EnableAppletToGetInput(u64 aruid) {
std::scoped_lock lock{mutex};
//std::scoped_lock shared_lock{*applet_resource_holder.shared_mutex};
std::scoped_lock shared_lock{*applet_resource_holder.shared_mutex};
for (auto& abstract_pad : abstracted_pads) {
abstract_pad.EnableAppletToGetInput(aruid);
}
@@ -23,7 +23,7 @@ void ConsoleSixAxis::OnInit() {}
void ConsoleSixAxis::OnRelease() {}
void ConsoleSixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
//std::scoped_lock shared_lock{*shared_mutex};
std::scoped_lock shared_lock{*shared_mutex};
const u64 aruid = applet_resource->GetActiveAruid();
auto* data = applet_resource->GetAruidData(aruid);
+1 -1
View File
@@ -30,7 +30,7 @@ void SixAxis::OnInit() {}
void SixAxis::OnRelease() {}
void SixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
//std::scoped_lock shared_lock{*shared_mutex};
std::scoped_lock shared_lock{*shared_mutex};
for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; ++aruid_index) {
const auto* data = applet_resource->GetAruidDataByIndex(aruid_index);
@@ -22,7 +22,7 @@ void CaptureButton::OnInit() {}
void CaptureButton::OnRelease() {}
void CaptureButton::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
//std::scoped_lock shared_lock{*shared_mutex};
std::scoped_lock shared_lock{*shared_mutex};
const u64 aruid = applet_resource->GetActiveAruid();
auto* data = applet_resource->GetAruidData(aruid);
@@ -22,7 +22,7 @@ void HomeButton::OnInit() {}
void HomeButton::OnRelease() {}
void HomeButton::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
//std::scoped_lock shared_lock{*shared_mutex};
std::scoped_lock shared_lock{*shared_mutex};
const u64 aruid = applet_resource->GetActiveAruid();
auto* data = applet_resource->GetAruidData(aruid);
@@ -20,7 +20,7 @@ void SleepButton::OnInit() {}
void SleepButton::OnRelease() {}
void SleepButton::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
//std::scoped_lock shared_lock{*shared_mutex};
std::scoped_lock shared_lock{*shared_mutex};
const u64 aruid = applet_resource->GetActiveAruid();
auto* data = applet_resource->GetAruidData(aruid);
@@ -34,7 +34,7 @@ Result TouchResource::ActivateTouch() {
}
if (global_ref_counter == 0) {
//std::scoped_lock lock{*shared_mutex};
std::scoped_lock lock{*shared_mutex};
const auto result = touch_driver->StartTouchSensor();
if (result.IsError()) {
@@ -60,7 +60,7 @@ Result TouchResource::ActivateTouch() {
}
Result TouchResource::ActivateTouch(u64 aruid) {
//std::scoped_lock lock{*shared_mutex};
std::scoped_lock lock{*shared_mutex};
for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; aruid_index++) {
auto* applet_data = applet_resource->GetAruidDataByIndex(aruid_index);
@@ -121,7 +121,7 @@ Result TouchResource::ActivateGesture() {
}
Result TouchResource::ActivateGesture(u64 aruid, u32 basic_gesture_id) {
//std::scoped_lock lock{*shared_mutex};
std::scoped_lock lock{*shared_mutex};
for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; aruid_index++) {
auto* applet_data = applet_resource->GetAruidDataByIndex(aruid_index);
@@ -300,7 +300,7 @@ void TouchResource::SetTouchScreenMagnification(f32 point1_x, f32 point1_y, f32
}
Result TouchResource::SetTouchScreenResolution(u32 width, u32 height, u64 aruid) {
//std::scoped_lock lock{*shared_mutex};
std::scoped_lock lock{*shared_mutex};
for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; aruid_index++) {
const auto* applet_data = applet_resource->GetAruidDataByIndex(aruid_index);
@@ -321,7 +321,7 @@ Result TouchResource::SetTouchScreenResolution(u32 width, u32 height, u64 aruid)
Result TouchResource::SetTouchScreenConfiguration(
const Core::HID::TouchScreenConfigurationForNx& touch_configuration, u64 aruid) {
//std::scoped_lock lock{*shared_mutex};
std::scoped_lock lock{*shared_mutex};
for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; aruid_index++) {
const auto* applet_data = applet_resource->GetAruidDataByIndex(aruid_index);
@@ -341,7 +341,7 @@ Result TouchResource::SetTouchScreenConfiguration(
Result TouchResource::GetTouchScreenConfiguration(
Core::HID::TouchScreenConfigurationForNx& out_touch_configuration, u64 aruid) const {
//std::scoped_lock lock{*shared_mutex};
std::scoped_lock lock{*shared_mutex};
for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; aruid_index++) {
const auto* applet_data = applet_resource->GetAruidDataByIndex(aruid_index);
@@ -508,7 +508,7 @@ void TouchResource::OnTouchUpdate(s64 timestamp) {
gesture_handler.SetTouchState(current_touch_state.states, current_touch_state.entry_count,
timestamp);
//std::scoped_lock lock{*shared_mutex};
std::scoped_lock lock{*shared_mutex};
for (std::size_t aruid_index = 0; aruid_index < AruidIndexMax; aruid_index++) {
const auto* applet_data = applet_resource->GetAruidDataByIndex(aruid_index);