diff options
| author |  David Marcec | 2018-12-19 14:16:30 +1100 |
|---|---|---|
| committer | David Marcec | 2018-12-19 14:16:30 +1100 |
| commit | 807e7640aa27dbe3ffca45f2c7da5cc14e07106e (patch) | |
| tree | 585c8e7f01d93794d9cf4071a8511a267868705d /src/core | |
| parent | Merge pull request #1913 from MerryMage/default-fpcr (diff) | |
| download | yuzu-807e7640aa27dbe3ffca45f2c7da5cc14e07106e.tar.gz yuzu-807e7640aa27dbe3ffca45f2c7da5cc14e07106e.tar.xz yuzu-807e7640aa27dbe3ffca45f2c7da5cc14e07106e.zip | |
Device handle should not be a random id, instead it's the current npad id
Found during hardware testing
Diffstat (limited to 'src/core')
| -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; |