diff options
| author | bunnei <bunneidev@gmail.com> | 2023-01-30 12:17:09 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-30 12:17:09 -0800 |
| commit | ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a (patch) | |
| tree | 54b6ce04e859b1dee33f4331f392c0d645f4db43 /src/core/hle/service/hid/controllers/npad.cpp | |
| parent | e74660673b68e7226b7e934efe5eac620f7a98e6 (diff) | |
| parent | b0722591c9b8c1aed5b8bfc5e67e7e957b08f209 (diff) | |
Merge pull request #9508 from ameerj/hle-ipc-buffer-span
hle_ipc: Use std::span to avoid heap allocations/copies when calling ReadBuffer
Diffstat (limited to 'src/core/hle/service/hid/controllers/npad.cpp')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 5 |
1 files changed, 3 insertions, 2 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) { |