summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-09-10 04:31:04 +0200
committerGitHub <noreply@github.com>2018-09-10 04:31:04 +0200
commit50c191439d94764bcecb1efed98b4b59d032bfb4 (patch)
tree8744c0ee71140a2a0f0cbeb9abb9214cdeee9506 /src/core/hle
parentMerge pull request #1283 from lioncash/unused (diff)
parenthid: Implement ReloadInputDevices (diff)
downloadyuzu-50c191439d94764bcecb1efed98b4b59d032bfb4.tar
yuzu-50c191439d94764bcecb1efed98b4b59d032bfb4.tar.gz
yuzu-50c191439d94764bcecb1efed98b4b59d032bfb4.tar.bz2
yuzu-50c191439d94764bcecb1efed98b4b59d032bfb4.tar.lz
yuzu-50c191439d94764bcecb1efed98b4b59d032bfb4.tar.xz
yuzu-50c191439d94764bcecb1efed98b4b59d032bfb4.tar.zst
yuzu-50c191439d94764bcecb1efed98b4b59d032bfb4.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/service/hid/hid.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index 0d31abe8b..a8e0c869f 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -2,7 +2,6 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include <atomic>
#include "common/logging/log.h"
#include "core/core.h"
#include "core/core_timing.h"
@@ -78,7 +77,7 @@ private:
SharedMemory mem{};
std::memcpy(&mem, shared_mem->GetPointer(), sizeof(SharedMemory));
- if (is_device_reload_pending.exchange(false))
+ if (Settings::values.is_device_reload_pending.exchange(false))
LoadInputDevices();
// Set up controllers as neon red+blue Joy-Con attached to console
@@ -267,7 +266,6 @@ private:
CoreTiming::EventType* pad_update_event;
// Stored input state info
- std::atomic<bool> is_device_reload_pending{true};
std::array<std::unique_ptr<Input::ButtonDevice>, Settings::NativeButton::NUM_BUTTONS_HID>
buttons;
std::array<std::unique_ptr<Input::AnalogDevice>, Settings::NativeAnalog::NUM_STICKS_HID> sticks;
@@ -797,7 +795,9 @@ public:
}
};
-void ReloadInputDevices() {}
+void ReloadInputDevices() {
+ Settings::values.is_device_reload_pending.store(true);
+}
void InstallInterfaces(SM::ServiceManager& service_manager) {
std::make_shared<Hid>()->InstallAsService(service_manager);