diff options
| author | 2018-12-19 13:14:43 -0500 | |
|---|---|---|
| committer | 2018-12-19 13:14:43 -0500 | |
| commit | 4923df10ccb2afab3a3ccc136b1422d8657f5e0b (patch) | |
| tree | 083b245915635f24a49e29f72b2ad114323910c0 /src | |
| parent | Merge pull request #1909 from heapo/shadow_sampling_fixes (diff) | |
| parent | Device handle should not be a random id, instead it's the current npad id (diff) | |
| download | yuzu-4923df10ccb2afab3a3ccc136b1422d8657f5e0b.tar.gz yuzu-4923df10ccb2afab3a3ccc136b1422d8657f5e0b.tar.xz yuzu-4923df10ccb2afab3a3ccc136b1422d8657f5e0b.zip | |
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.cpp | 4 |
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: | |||
| 317 | } | 317 | } |
| 318 | 318 | ||
| 319 | bool has_attached_handle{}; | 319 | bool has_attached_handle{}; |
| 320 | const u64 device_handle{Common::MakeMagic('Y', 'U', 'Z', 'U')}; | 320 | const u64 device_handle{0}; // Npad device 1 |
| 321 | const u32 npad_id{0}; // Player 1 controller | 321 | const u32 npad_id{0}; // Player 1 controller |
| 322 | State state{State::NonInitialized}; | 322 | State state{State::NonInitialized}; |
| 323 | DeviceState device_state{DeviceState::Initialized}; | 323 | DeviceState device_state{DeviceState::Initialized}; |
| 324 | Kernel::EventPair deactivate_event; | 324 | Kernel::EventPair deactivate_event; |