diff options
author | bunnei <bunneidev@gmail.com> | 2023-01-30 21:17:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-30 21:17:09 +0100 |
commit | ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a (patch) | |
tree | 54b6ce04e859b1dee33f4331f392c0d645f4db43 /src/core/hle/service/hid/controllers | |
parent | Merge pull request #9701 from german77/common_protocol (diff) | |
parent | hle_ipc: Use thread_local ReadBuffer (diff) | |
download | yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.gz yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.bz2 yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.lz yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.xz yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.zst yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.zip |
Diffstat (limited to 'src/core/hle/service/hid/controllers')
-rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 5 | ||||
-rw-r--r-- | src/core/hle/service/hid/controllers/npad.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 5713f1288..84edc8839 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -755,11 +755,12 @@ Core::HID::NpadStyleTag Controller_NPad::GetSupportedStyleSet() const { return hid_core.GetSupportedStyleTag(); } -void Controller_NPad::SetSupportedNpadIdTypes(u8* data, std::size_t length) { +void Controller_NPad::SetSupportedNpadIdTypes(std::span<const u8> data) { + const auto length = data.size(); ASSERT(length > 0 && (length % sizeof(u32)) == 0); supported_npad_id_types.clear(); supported_npad_id_types.resize(length / sizeof(u32)); - std::memcpy(supported_npad_id_types.data(), data, length); + std::memcpy(supported_npad_id_types.data(), data.data(), length); } void Controller_NPad::GetSupportedNpadIdTypes(u32* data, std::size_t max_length) { diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index 1a589cca2..1f7d33459 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -6,6 +6,7 @@ #include <array> #include <atomic> #include <mutex> +#include <span> #include "common/bit_field.h" #include "common/common_types.h" @@ -95,7 +96,7 @@ public: void SetSupportedStyleSet(Core::HID::NpadStyleTag style_set); Core::HID::NpadStyleTag GetSupportedStyleSet() const; - void SetSupportedNpadIdTypes(u8* data, std::size_t length); + void SetSupportedNpadIdTypes(std::span<const u8> data); void GetSupportedNpadIdTypes(u32* data, std::size_t max_length); std::size_t GetSupportedNpadIdTypesSize() const; |