summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid/controllers/npad.cpp
diff options
context:
space:
mode:
authorDavid Marcec <dmarcecguzman@gmail.com>2019-09-22 08:41:34 +0200
committerDavid Marcec <dmarcecguzman@gmail.com>2019-09-22 08:41:34 +0200
commitbd1c4ec9a008af9654385ce4f7a96b81a52c9ff6 (patch)
treeb432d1cdfe0c5d40af58717f126c91a5d7fd2ab4 /src/core/hle/service/hid/controllers/npad.cpp
parentRebase (diff)
downloadyuzu-bd1c4ec9a008af9654385ce4f7a96b81a52c9ff6.tar
yuzu-bd1c4ec9a008af9654385ce4f7a96b81a52c9ff6.tar.gz
yuzu-bd1c4ec9a008af9654385ce4f7a96b81a52c9ff6.tar.bz2
yuzu-bd1c4ec9a008af9654385ce4f7a96b81a52c9ff6.tar.lz
yuzu-bd1c4ec9a008af9654385ce4f7a96b81a52c9ff6.tar.xz
yuzu-bd1c4ec9a008af9654385ce4f7a96b81a52c9ff6.tar.zst
yuzu-bd1c4ec9a008af9654385ce4f7a96b81a52c9ff6.zip
Diffstat (limited to 'src/core/hle/service/hid/controllers/npad.cpp')
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index 104924d03..f7a0aa4ff 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -93,7 +93,7 @@ u32 Controller_NPad::IndexToNPad(std::size_t index) {
};
}
-Controller_NPad::Controller_NPad() = default;
+Controller_NPad::Controller_NPad(Core::System& system) : ControllerBase(system), system(system) {}
Controller_NPad::~Controller_NPad() = default;
void Controller_NPad::InitNewlyAddedControler(std::size_t controller_idx) {
@@ -167,7 +167,7 @@ void Controller_NPad::InitNewlyAddedControler(std::size_t controller_idx) {
controller.battery_level[2] = BATTERY_FULL;
}
-void Controller_NPad::OnInit(Core::System& system) {
+void Controller_NPad::OnInit() {
auto& kernel = system.Kernel();
styleset_changed_event = Kernel::WritableEvent::CreateEventPair(
kernel, Kernel::ResetType::Automatic, "npad:NpadStyleSetChanged");