diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-10-18 02:37:45 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-10-18 02:52:45 +0200 |
| commit | aeca22489097879b507a47ada77133b8b867c89e (patch) | |
| tree | dfeb4e72c62abf8dfe45f66083fa38ad4554a65e /src/core/hle/service/hid/controllers | |
| parent | hid/controller: Default the destructors of all controller types in the cpp file (diff) | |
| download | yuzu-aeca22489097879b507a47ada77133b8b867c89e.tar yuzu-aeca22489097879b507a47ada77133b8b867c89e.tar.gz yuzu-aeca22489097879b507a47ada77133b8b867c89e.tar.bz2 yuzu-aeca22489097879b507a47ada77133b8b867c89e.tar.lz yuzu-aeca22489097879b507a47ada77133b8b867c89e.tar.xz yuzu-aeca22489097879b507a47ada77133b8b867c89e.tar.zst yuzu-aeca22489097879b507a47ada77133b8b867c89e.zip | |
Diffstat (limited to 'src/core/hle/service/hid/controllers')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.h | 2 |
2 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 5b70a344d..954869619 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -316,7 +316,7 @@ void Controller_NPad::SetSupportedNPadIdTypes(u8* data, std::size_t length) { std::memcpy(supported_npad_id_types.data(), data, length); } -const void Controller_NPad::GetSupportedNpadIdTypes(u32* data, std::size_t max_length) { +void Controller_NPad::GetSupportedNpadIdTypes(u32* data, std::size_t max_length) { ASSERT(max_length < supported_npad_id_types.size()); std::memcpy(data, supported_npad_id_types.data(), supported_npad_id_types.size()); } diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 63ef766bb..6178a2e4c 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -92,7 +92,7 @@ public: NPadType GetSupportedStyleSet() const; void SetSupportedNPadIdTypes(u8* data, std::size_t length); - const void GetSupportedNpadIdTypes(u32* data, std::size_t max_length); + void GetSupportedNpadIdTypes(u32* data, std::size_t max_length); std::size_t GetSupportedNPadIdTypesSize() const; void SetHoldType(NpadHoldType joy_hold_type); |