VERY experimental Nintendo Switch 2 emulator
C++
service: hid: Use span instead of vector reference
german775e95870b1ffb
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cppindex ef4aec4ea8..28818c813d 100644--- a/src/core/hle/service/hid/controllers/npad.cpp+++ b/src/core/hle/service/hid/controllers/npad.cpp@@ -979,8 +979,8 @@ void Controller_NPad::VibrateController(}void Controller_NPad::VibrateControllers(- const std::vector<Core::HID::VibrationDeviceHandle>& vibration_device_handles,- const std::vector<Core::HID::VibrationValue>& vibration_values) {+ std::span<const Core::HID::VibrationDeviceHandle> vibration_device_handles,+ std::span<const Core::HID::VibrationValue> vibration_values) {if (!Settings::values.vibration_enabled.GetValue() && !permit_vibration_session_enabled) {return;}diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.hindex 9cfe298f14..776411261d 100644--- a/src/core/hle/service/hid/controllers/npad.h+++ b/src/core/hle/service/hid/controllers/npad.h@@ -112,8 +112,8 @@ public:const Core::HID::VibrationValue& vibration_value);void VibrateControllers(- const std::vector<Core::HID::VibrationDeviceHandle>& vibration_device_handles,- const std::vector<Core::HID::VibrationValue>& vibration_values);+ std::span<const Core::HID::VibrationDeviceHandle> vibration_device_handles,+ std::span<const Core::HID::VibrationValue> vibration_values);Core::HID::VibrationValue GetLastVibration(const Core::HID::VibrationDeviceHandle& vibration_device_handle) const;diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cppindex 87e7b864a1..2bf1d8a273 100644--- a/src/core/hle/service/hid/hid.cpp+++ b/src/core/hle/service/hid/hid.cpp@@ -1601,16 +1601,16 @@ void Hid::SendVibrationValues(HLERequestContext& ctx) {IPC::RequestParser rp{ctx};const auto applet_resource_user_id{rp.Pop<u64>()};- const auto handles = ctx.ReadBuffer(0);- const auto vibrations = ctx.ReadBuffer(1);-- std::vector<Core::HID::VibrationDeviceHandle> vibration_device_handles(- handles.size() / sizeof(Core::HID::VibrationDeviceHandle));- std::vector<Core::HID::VibrationValue> vibration_values(vibrations.size() /- sizeof(Core::HID::VibrationValue));-- std::memcpy(vibration_device_handles.data(), handles.data(), handles.size());- std::memcpy(vibration_values.data(), vibrations.data(), vibrations.size());+ const auto handle_data = ctx.ReadBuffer(0);+ const auto handle_count = ctx.GetReadBufferNumElements<Core::HID::VibrationDeviceHandle>(0);+ const auto vibration_data = ctx.ReadBuffer(1);+ const auto vibration_count = ctx.GetReadBufferNumElements<Core::HID::VibrationValue>(1);++ auto vibration_device_handles =+ std::span(reinterpret_cast<const Core::HID::VibrationDeviceHandle*>(handle_data.data()),+ handle_count);+ auto vibration_values = std::span(+ reinterpret_cast<const Core::HID::VibrationValue*>(vibration_data.data()), vibration_count);applet_resource->GetController<Controller_NPad>(HidController::NPad).VibrateControllers(vibration_device_handles, vibration_values);