summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorDavid Marcec <dmarcecguzman@gmail.com>2018-12-19 04:16:30 +0100
committerDavid Marcec <dmarcecguzman@gmail.com>2018-12-19 04:16:30 +0100
commit807e7640aa27dbe3ffca45f2c7da5cc14e07106e (patch)
tree585c8e7f01d93794d9cf4071a8511a267868705d /src/core/hle
parentMerge pull request #1913 from MerryMage/default-fpcr (diff)
downloadyuzu-807e7640aa27dbe3ffca45f2c7da5cc14e07106e.tar
yuzu-807e7640aa27dbe3ffca45f2c7da5cc14e07106e.tar.gz
yuzu-807e7640aa27dbe3ffca45f2c7da5cc14e07106e.tar.bz2
yuzu-807e7640aa27dbe3ffca45f2c7da5cc14e07106e.tar.lz
yuzu-807e7640aa27dbe3ffca45f2c7da5cc14e07106e.tar.xz
yuzu-807e7640aa27dbe3ffca45f2c7da5cc14e07106e.tar.zst
yuzu-807e7640aa27dbe3ffca45f2c7da5cc14e07106e.zip
Diffstat (limited to 'src/core/hle')
-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;