diff options
| author | bunnei <bunneidev@gmail.com> | 2023-02-03 15:42:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-03 15:42:18 -0800 |
| commit | 193b513bf544c5dab80d1a849ce62e59e872cd3a (patch) | |
| tree | 665e83a9b6a747f25b30de50350abec1f68d110f /src/core/hle/service/hid/controllers/npad.cpp | |
| parent | 9083ad816fc0fca2e39c8c526ae85e3d09db0229 (diff) | |
| parent | 979e4d9950bc7241460524a06e09e87147904d1a (diff) | |
Merge pull request #9719 from ameerj/hle-ipc-span-copy
Revert #9718, Copy HLE Read Buffer for OutputAccessLogToSdCard
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 3afda9e3f..513ea485a 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -758,11 +758,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) { |
