yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #10294 from german77/vibration_span 

service: hid: Use span instead of vector reference
This commit is contained in:
liamwhite 2023-05-15 12:03:00 -04:00 committed by GitHub
parent e9069dfe76 6e54615b16
commit 9087fe10e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/hle/service/hid/controllers/npad.cpp
View File

@ -979,8 +979,8 @@ void Controller_NPad::VibrateController(
} }
void Controller_NPad::VibrateControllers( void Controller_NPad::VibrateControllers(
const std::vector<Core::HID::VibrationDeviceHandle>& vibration_device_handles, std::span<const Core::HID::VibrationDeviceHandle> vibration_device_handles,
const std::vector<Core::HID::VibrationValue>& vibration_values) { std::span<const Core::HID::VibrationValue> vibration_values) {
if (!Settings::values.vibration_enabled.GetValue() && !permit_vibration_session_enabled) { if (!Settings::values.vibration_enabled.GetValue() && !permit_vibration_session_enabled) {
return; return;
} }

4
src/core/hle/service/hid/controllers/npad.h
View File

@ -112,8 +112,8 @@ public:
const Core::HID::VibrationValue& vibration_value); const Core::HID::VibrationValue& vibration_value);
void VibrateControllers( void VibrateControllers(
const std::vector<Core::HID::VibrationDeviceHandle>& vibration_device_handles, std::span<const Core::HID::VibrationDeviceHandle> vibration_device_handles,
const std::vector<Core::HID::VibrationValue>& vibration_values); std::span<const Core::HID::VibrationValue> vibration_values);
Core::HID::VibrationValue GetLastVibration( Core::HID::VibrationValue GetLastVibration(
const Core::HID::VibrationDeviceHandle& vibration_device_handle) const; const Core::HID::VibrationDeviceHandle& vibration_device_handle) const;

18
src/core/hle/service/hid/hid.cpp
View File

@ -1601,16 +1601,16 @@ void Hid::SendVibrationValues(HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
const auto applet_resource_user_id{rp.Pop<u64>()}; const auto applet_resource_user_id{rp.Pop<u64>()};
const auto handles = ctx.ReadBuffer(0); const auto handle_data = ctx.ReadBuffer(0);
const auto vibrations = ctx.ReadBuffer(1); 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);
std::vector<Core::HID::VibrationDeviceHandle> vibration_device_handles( auto vibration_device_handles =
handles.size() / sizeof(Core::HID::VibrationDeviceHandle)); std::span(reinterpret_cast<const Core::HID::VibrationDeviceHandle*>(handle_data.data()),
std::vector<Core::HID::VibrationValue> vibration_values(vibrations.size() / handle_count);
sizeof(Core::HID::VibrationValue)); auto vibration_values = std::span(
reinterpret_cast<const Core::HID::VibrationValue*>(vibration_data.data()), vibration_count);
std::memcpy(vibration_device_handles.data(), handles.data(), handles.size());
std::memcpy(vibration_values.data(), vibrations.data(), vibrations.size());
applet_resource->GetController<Controller_NPad>(HidController::NPad) applet_resource->GetController<Controller_NPad>(HidController::NPad)
.VibrateControllers(vibration_device_handles, vibration_values); .VibrateControllers(vibration_device_handles, vibration_values);