summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-12-19 13:14:43 -0500
committerGitHub <noreply@github.com>2018-12-19 13:14:43 -0500
commit4923df10ccb2afab3a3ccc136b1422d8657f5e0b (patch)
tree083b245915635f24a49e29f72b2ad114323910c0 /src
parent3050f3a7ba72208494e150870dec20b40bc0f411 (diff)
parent807e7640aa27dbe3ffca45f2c7da5cc14e07106e (diff)
Merge pull request #1923 from ogniK5377/nfp-device-list
Device handle should not be a random id, instead it's the current npad id
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/nfp/nfp.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp
index d5df112a0..a7bed0040 100644
--- a/src/core/hle/service/nfp/nfp.cpp
+++ b/src/core/hle/service/nfp/nfp.cpp
@@ -317,8 +317,8 @@ private:
}
bool has_attached_handle{};
- const u64 device_handle{Common::MakeMagic('Y', 'U', 'Z', 'U')};
- const u32 npad_id{0}; // Player 1 controller
+ const u64 device_handle{0}; // Npad device 1
+ const u32 npad_id{0}; // Player 1 controller
State state{State::NonInitialized};
DeviceState device_state{DeviceState::Initialized};
Kernel::EventPair deactivate_event;